From 9fa2ad9635d0f91f6c85eb034002bcc035bc2e07 Mon Sep 17 00:00:00 2001 From: Mayeu - Cast Date: Fri, 18 Mar 2016 17:16:37 +0100 Subject: [PATCH 001/109] librest 0.7.92 -> 0.7.93 --- pkgs/desktops/gnome-3/3.18/core/rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix index eada9ab1993..344bc00780f 100644 --- a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: stdenv.mkDerivation rec { - name = "rest-0.7.92"; + name = "rest-0.7.93"; src = fetchurl { url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec"; + sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467"; }; buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; From 8dd955cc10329cbe0461b69bd796ecbd06b8b441 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 21:09:20 +0100 Subject: [PATCH 002/109] 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 003/109] 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 7be460d54cefbd43030f4488e8d7edeea1e2c48b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:19:31 +0100 Subject: [PATCH 004/109] 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 9d5fcad5e7e420f75c85f9e00b1135985b792059 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 21 Mar 2016 22:49:00 +0100 Subject: [PATCH 005/109] 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 006/109] 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 007/109] 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 008/109] 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 d852a23662f31df25c0712bf4af66cf7216a3a38 Mon Sep 17 00:00:00 2001 From: Balletie Date: Tue, 29 Mar 2016 16:40:11 +0200 Subject: [PATCH 009/109] bindfs: Let `mount` find `bindfs` mount helper When mount is used with mount-type "fuse.bindfs", it cannot find the mount helper. If mount can't find `mount.fuse.bindfs`, it executes the `mount.fuse` mount helper and passes `fuse.bindfs` as argument. Then `mount.fuse` tries to execute `bindfs` on its own, but it is not found in the PATH. By creating a `mount.fuse.bindfs` link to the `bindfs` executable, this problem is avoided because `mount` will just execute the `mount.fuse.bindfs` mount helper without `mount.fuse` in the middle. --- pkgs/tools/filesystems/bindfs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 7d79eefb122..80027c7a047 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { dontStrip = true; buildInputs = [ fuse pkgconfig ]; + postFixup = '' + ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs + ''; meta = { description = "A FUSE filesystem for mounting a directory to another location"; From 09fe0e3c810c2cf5162c72fb57810b850139a8b7 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 29 Mar 2016 16:38:38 -0700 Subject: [PATCH 010/109] qgifer: init at 0.2.1 --- pkgs/applications/video/qgifer/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/video/qgifer/default.nix diff --git a/pkgs/applications/video/qgifer/default.nix b/pkgs/applications/video/qgifer/default.nix new file mode 100644 index 00000000000..f528ce99a8a --- /dev/null +++ b/pkgs/applications/video/qgifer/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchsvn, cmake, opencv, qt, giflib }: + +stdenv.mkDerivation rec { + name = "qgifer-${version}"; + version = "0.2.1"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/qgifer/code/tags/${name}"; + sha256 = "0fv40n58xjwfr06ix9ga79hs527rrzfaq1sll3n2xxchpgf3wf4f"; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace "SET(CMAKE_INSTALL_PREFIX" "#" + ''; + + buildInputs = [ cmake opencv qt giflib ]; + + meta = with stdenv.lib; { + description = "Video-based animated GIF creator"; + homepage = https://sourceforge.net/projects/qgifer/; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.andrewrk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d15f689b0f..59c541391f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2937,6 +2937,11 @@ in qt = qt4; }; + qgifer = callPackage ../applications/video/qgifer { + giflib = giflib_4_1; + qt = qt4; + }; + qhull = callPackage ../development/libraries/qhull { }; qjoypad = callPackage ../tools/misc/qjoypad { }; From 449d908b8856bb1a7209425d5bed6824b48bccb4 Mon Sep 17 00:00:00 2001 From: Ben Booth Date: Tue, 29 Mar 2016 10:40:49 -0700 Subject: [PATCH 011/109] 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 21:45:49 +0200 Subject: [PATCH 012/109] 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 f8f16b1a3642978110ba1abf04e3fbddae04d581 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 31 Mar 2016 04:17:19 -0400 Subject: [PATCH 013/109] mesos: 0.27.1 -> 0.28.0 --- pkgs/applications/networking/cluster/mesos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index b1b45185511..7efd34dee56 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -10,7 +10,7 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.27.1"; + version = "0.28.0"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "147iq7vwi09kqblx1h8r6lkrg9g50i257qk1cph1zr5j3rncz7l8"; + sha256 = "05dnj6r5pspizna0fk7yayn38a4w9hlcswgg8l9qmb35m6nq6hby"; }; patches = [ From 7f69d5ed8c47beafc04efb88aeb818b84b48c2e2 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 31 Mar 2016 10:37:02 +0200 Subject: [PATCH 014/109] 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 015/109] 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 016/109] 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 017/109] 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 018/109] 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"; +} From cce37d216460f6a51a66030e162df52c36d53305 Mon Sep 17 00:00:00 2001 From: ne0phyte Date: Thu, 31 Mar 2016 04:26:54 +0200 Subject: [PATCH 019/109] kicad: 2013 stable -> 4.0.2 --- .../science/electronics/kicad/default.nix | 65 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0762002b8a8..56fbf20f52d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,21 +1,39 @@ -{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext }: +{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { - name = "kicad-20131025"; + name = "kicad-${series}"; + series = "4.0"; + version = "4.0.2"; - src = fetchbzr { - url = "https://code.launchpad.net/kicad/stable"; - rev = 4024; - sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5"; - }; + srcs = [ + (fetchurl { + url = "https://code.launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz"; + sha256 = "1fcf91fmxj6ha3mm6gzdb0px50j58m80p8wrncm8ca9shj36kbif"; + }) - srcLibrary = fetchbzr { - url = "http://bazaar.launchpad.net/~kicad-product-committers/kicad/library"; - rev = 293; - sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i"; - }; + (fetchurl { + url = "http://downloads.kicad-pcb.org/libraries/kicad-library-${version}.tar.gz"; + sha256 = "1xk9sxxb3d42chdysqmvizrjcbm0467q7nsq5cahq3j1hci49m6l"; + }) - cmakeFlags = "-DKICAD_STABLE_VERSION=ON"; + (fetchurl { + url = "http://downloads.kicad-pcb.org/libraries/kicad-footprints-${version}.tar.gz"; + sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; + }) + ]; + + sourceRoot = "kicad-${version}"; + + cmakeFlags = '' + -DCMAKE_BUILD_TYPE=Release + -DKICAD_SKIP_BOOST=ON + -DKICAD_BUILD_VERSION=${version} + -DKICAD_REPO_NAME=stable + ''; + + enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory + + buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo openssl boost pkgconfig doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. @@ -23,17 +41,26 @@ stdenv.mkDerivation rec { sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp ''; - #enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory - - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext ]; + postUnpack = '' + pushd $(pwd) + ''; postInstall = '' - mkdir library - cd library - cmake -DCMAKE_INSTALL_PREFIX=$out $srcLibrary + popd + + pushd kicad-library-* + cmake -DCMAKE_INSTALL_PREFIX=$out + make $MAKE_FLAGS make install + popd + + pushd kicad-footprints-* + mkdir -p $out/share/kicad/modules + cp -R *.pretty $out/share/kicad/modules/ + popd ''; + meta = { description = "Free Software EDA Suite"; homepage = "http://www.kicad-pcb.org/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b09a913f8e7..1bd17f83358 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15730,7 +15730,7 @@ in gtkwave = callPackage ../applications/science/electronics/gtkwave { }; kicad = callPackage ../applications/science/electronics/kicad { - wxGTK = wxGTK29; + wxGTK = wxGTK30; }; ngspice = callPackage ../applications/science/electronics/ngspice { }; From 1d09c97ac40dc3c1b780055409d57281c49f234a Mon Sep 17 00:00:00 2001 From: guaraqe Date: Mon, 21 Mar 2016 00:49:59 +0100 Subject: [PATCH 020/109] grive2: init at 0.5.0 grive2: update 0.5.0 grive2: various cosmetic changes --- pkgs/tools/filesystems/grive2/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/filesystems/grive2/default.nix diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix new file mode 100644 index 00000000000..a3ee1b67bab --- /dev/null +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, binutils }: + +stdenv.mkDerivation rec { + version = "0.5.0"; + name = "grive2-${version}"; + + src = fetchFromGitHub { + owner = "vitalif"; + repo = "grive2"; + rev = "v${version}"; + sha256 = "0gyic9228j25l5x8qj9xxxp2cgbw6y4skxqx0xrq6qilhv4lj23c"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libgcrypt yajl curl expat stdenv boost binutils ]; + + meta = with stdenv.lib; { + description = "A console Google Drive client"; + homepage = https://github.com/vitalif/grive2; + license = licenses.gpl2; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9729e2945d3..c3a68903524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1867,6 +1867,8 @@ let json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable }; + grive2 = callPackage ../tools/filesystems/grive2 { }; + groff = callPackage ../tools/text/groff { ghostscript = null; }; From fc1e886f1b97d5eebd267a6bf7af2205a889b381 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 31 Mar 2016 16:05:23 +0200 Subject: [PATCH 021/109] php: 7.0.2 -> 7.0.5 (security) https://secure.php.net/ChangeLog-7.php#7.0.5 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f15aed48451..fc8041b597b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -298,8 +298,8 @@ in { }; php70 = generic { - version = "7.0.2"; - sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv"; + version = "7.0.5"; + sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c"; }; } From 0d091ffd4abb6c7f5fea060e41e8b7d91c4a7b8d Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Thu, 31 Mar 2016 16:14:54 +0200 Subject: [PATCH 022/109] simplify ISSUE_TEMPLATE --- .github/ISSUE_TEMPLATE.md | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 327959fe7a3..5d99147051f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,17 +1,13 @@ -## Basic info +## Issue description -To make sure that we are on the same page: -* Kernel: (run `uname -a`) -* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...) -* Nix version: (run `nix-env --version`) -* Nixpkgs version: (run `nix-instantiate --eval '' -A lib.nixpkgsVersion`) - -## Describe your issue here - -### Expected result - -### Actual result ### Steps to reproduce + + +## Technical details + +* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...) +* Nix version: (run `nix-env --version`) +* Nixpkgs version: (run `nix-instantiate --eval '' -A lib.nixpkgsVersion`) From 011f69992a37982974aabc80186b9d10a2d719af Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 31 Mar 2016 16:22:56 +0200 Subject: [PATCH 023/109] satallax: 1.4 -> 2.7 --- .../science/logic/satallax/default.nix | 107 +++++++++--------- 1 file changed, 51 insertions(+), 56 deletions(-) diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 89a214c3f47..7935be11926 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -1,71 +1,66 @@ -x@{builderDefsPackage - , sbcl, zlib - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}: +stdenv.mkDerivation rec { + name = "satallax-${version}"; + version = "2.7"; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="satallax"; - version="1.4"; - name="${baseName}-${version}"; - url="http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; - hash="0l8dq4nyfw2bdsyqmgb4v6fjw3739p8nqv4bh2gh2924ibzrq5fc"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + buildInputs = [ocaml zlib which eprover makeWrapper coq]; + src = fetchurl { + url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz"; + sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib"; }; - inherit (sourceInfo) name version; - inherit buildInputs; + preConfigure = '' + mkdir fake-tools + echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname + chmod a+x fake-tools/hostname + export PATH="$PATH:$PWD/fake-tools" - phaseNames = ["doDeployMinisat" "doDeploy"]; - - doDeployMinisat = a.fullDepEntry ('' ( - cd minisat/simp + cd picosat-* + ./configure make ) + export PATH="$PATH:$PWD/libexec/satallax" - mkdir -p "$out/bin" - cp minisat/simp/minisat "$out/bin" + mkdir -p "$out/libexec/satallax" + cp picosat-*/picosat picosat-*/picomus "$out/libexec/satallax" - echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp + ( + cd minisat + export MROOT=$PWD + cd core + make + cd ../simp + make + ) + ''; - '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; - doDeploy = a.fullDepEntry ('' - mkdir -p "$out/share/satallax/build-dir" - cp -r * "$out/share/satallax/build-dir" - cd "$out/share/satallax/build-dir" + postBuild = "echo testing; ! (bash ./test | grep ERROR)"; - sbcl --load make.lisp - ! ( ./test | grep ERROR ) + installPhase = '' + mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" + cp bin/satallax.opt "$out/bin/satallax" + wrapProgram "$out/bin/satallax" \ + --suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \ + --add-flags "-M" --add-flags "$out/lib/satallax/modes" - mkdir -p "$out/bin" - cp bin/satallax "$out/bin" - '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; + cp LICENSE README "$out/share/doc/satallax" + + cp bin/*.so "$out/lib" + + cp -r modes "$out/lib/satallax/" + cp -r problems "$out/lib/satallax/" + cp -r coq* "$out/lib/satallax/" + ''; meta = { - description = "A higher-order logic prover"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - license = a.lib.licenses.free; - homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; + inherit version; + description = ''Automated theorem prover for higher-order logic''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; + homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; + updateWalker = true; }; - passthru = { - updateInfo = { - downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/"; - }; - }; -}) x +} From 9c6a69230dff8131130670b46c4590fb30cf6416 Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Thu, 31 Mar 2016 16:57:30 +0200 Subject: [PATCH 024/109] zsh: fix configureFlags #14256 commit 97332d3 introduced non expanding $out/etc/zprofile in zshs compiled in PATH. this commit reverts the change so that $out is expanded at configure time. --- pkgs/shells/zsh/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index d65b7dc80a8..fda3e77c61f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -21,13 +21,9 @@ stdenv.mkDerivation { buildInputs = [ ncurses pcre ]; - configureFlags = [ - "--enable-maildir-support" - "--enable-multibyte" - "--enable-zprofile=$out/etc/zprofile" - "--with-tcsetpgrp" - "--enable-pcre" - ]; + preConfigure = '' + configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" + ''; # the zsh/zpty module is not available on hydra # so skip groups Y Z From d6f9e3568307583a2679b212f745691c38d12280 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 31 Mar 2016 17:16:46 +0200 Subject: [PATCH 025/109] gnupg20: 2.0.29 -> 2.0.30 See https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html --- pkgs/tools/security/gnupg/20.nix | 4 ++-- pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index 117fc41c1ab..65d43ec9dbe 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -12,11 +12,11 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.0.29"; + name = "gnupg-2.0.30"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8"; + sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"; }; buildInputs diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch index b536a4fe50e..4bfdc13ef59 100644 --- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch @@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c index 903fb5b..d5611dc 100644 --- a/tools/gpgkey2ssh.c +++ b/tools/gpgkey2ssh.c -@@ -266,7 +266,7 @@ main (int argc, char **argv) +@@ -268,7 +268,7 @@ main (int argc, char **argv) keyid = argv[1]; ret = asprintf (&command, From 1186bffb7f3ed6f6c24159608cafadba0e04f925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Mar 2016 17:56:24 +0200 Subject: [PATCH 026/109] partimage: fix build with openssl-1.0.2 ...by using patch from Arch (taken from Debian). --- pkgs/tools/backup/partimage/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 009dc90576b..18e8bb40025 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bzip2, zlib, newt, openssl, pkgconfig, slang +{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang , automake, autoconf, libtool, gettext }: stdenv.mkDerivation { @@ -17,6 +17,12 @@ stdenv.mkDerivation { patches = [ ./gentoos-zlib.patch + (fetchpatch { + name = "no-SSLv2.patch"; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk" + + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e"; + sha256 = "1zfixa6g1nb1hqfzn2wvyvxsr38gm7908zfml2iaqnwy6iz6jd8v"; + }) ]; meta = { From 9134f9358a934c9ad24d8e8d03d975af2626b114 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 31 Mar 2016 19:50:53 +0300 Subject: [PATCH 027/109] stdenvAdapters.useOldCXXAbi: add new adapter --- pkgs/stdenv/adapters.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 836dedf1cb1..8398c45400e 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -241,4 +241,11 @@ rec { then pkgs.allStdenvs.stdenvDarwinNaked else pkgs.stdenv; }; + + /* Modify a stdenv so a build uses pre-C++11 ABI by default. */ + useOldCXXAbi = stdenv: stdenv // + { mkDerivation = args: stdenv.mkDerivation (args // { + NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -D_GLIBCXX_USE_CXX11_ABI=0"; + }); + }; } From 9b7edbeb2f4e3494b3c466b5ed97652348b22b2f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 31 Mar 2016 19:51:15 +0300 Subject: [PATCH 028/109] primus: propagate stdenv to primusLibs --- pkgs/tools/X11/primus/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f0a971dde18..88589a05878 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -4,6 +4,7 @@ # same LD_LIBRARY_PATH. # Other distributions do the same. { stdenv +, stdenv_i686 , primusLib , writeScriptBin , primusLib_i686 ? null @@ -11,8 +12,12 @@ }: let - primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; - primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + # We override stdenv in case we need different ABI for libGL + primusLib_ = primusLib.override { inherit stdenv; }; + primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; }; + + primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); in writeScriptBin "primusrun" '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc8896d4c45..b85650072b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14082,6 +14082,7 @@ in }; primus = callPackage ../tools/X11/primus { + stdenv_i686 = pkgsi686Linux.stdenv; primusLib_i686 = if system == "x86_64-linux" then pkgsi686Linux.primusLib else null; From 0276a8b2d2fbb3b69b320530cbe4a5379751bec5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 31 Mar 2016 19:51:52 +0300 Subject: [PATCH 029/109] steam: use old C++ ABI for primus --- pkgs/games/steam/chrootenv.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index e6652d2f023..35b3611812b 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -24,7 +24,10 @@ buildFHSUserEnv { perl ] ++ lib.optional withJava jdk - ++ lib.optional withPrimus primus + ++ lib.optional withPrimus (primus.override { + stdenv = useOldCXXAbi stdenv; + stdenv_i686 = useOldCXXAbi pkgsi686Linux.stdenv; + }) ; multiPkgs = pkgs: with pkgs; [ From 0689ff157484409ee11d0b7481b1e14623f4bdda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 31 Mar 2016 18:59:36 +0200 Subject: [PATCH 030/109] gnucash-2.6: hack around test failures They were most likely triggered by #909. Tested only against 16.03 due to webkitgtk problems on master. --- pkgs/applications/office/gnucash/2.6.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 3c2348bfa8b..844ef927708 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -2,6 +2,7 @@ , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers +, pango, gdk_pixbuf }: /* @@ -78,7 +79,7 @@ stdenv.mkDerivation rec { ''; # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib"; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ]; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; From d58302d5bb9fbb7078464aa48c75c6e44613e4dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:05:06 +0200 Subject: [PATCH 031/109] pythonPackages.numpy: 1.10 -> 1.11 and use current openblas That is, openblas 0.2.17. --- 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 d99977c54b5..2b4eca5cf44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13214,10 +13214,10 @@ in modules // { buildNumpyPackage = callPackage ../development/python-modules/numpy.nix { gfortran = pkgs.gfortran; - blas = pkgs.openblasCompat_2_14; + blas = pkgs.openblasCompat; }; - numpy = self.numpy_1_10; + numpy = self.numpy_1_11; numpy_1_10 = self.buildNumpyPackage rec { version = "1.10.4"; From a4098c1133ebafd61752367a31904be8fb449c2a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:06:17 +0200 Subject: [PATCH 032/109] pythonPackages.pandas_17: remove it --- pkgs/top-level/python-packages.nix | 73 ------------------------------ 1 file changed, 73 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b4eca5cf44..ce1a97dfc9b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14913,79 +14913,6 @@ in modules // { pandas = self.pandas_18; - pandas_17 = let - inherit (pkgs.stdenv.lib) optional optionalString; - inherit (pkgs.stdenv) isDarwin; - in buildPythonPackage rec { - name = "pandas-${version}"; - version = "0.17.1"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz"; - sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837"; - }; - - buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx; - propagatedBuildInputs = with self; [ - dateutil - scipy_0_17 - numexpr - pytz - xlrd - bottleneck - sqlalchemy - lxml - html5lib - modules.sqlite3 - beautifulsoup4 - ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command - - # For OSX, we need to add a dependency on libcxx, which provides - # `complex.h` and other libraries that pandas depends on to build. - patchPhase = optionalString isDarwin '' - cpp_sdk="${pkgs.libcxx}/include/c++/v1"; - echo "Adding $cpp_sdk to the setup.py common_include variable" - substituteInPlace setup.py \ - --replace "['pandas/src/klib', 'pandas/src']" \ - "['pandas/src/klib', 'pandas/src', '$cpp_sdk']" - - # disable clipboard tests since pbcopy/pbpaste are not open source - substituteInPlace pandas/io/tests/test_clipboard.py \ - --replace pandas.util.clipboard no_such_module \ - --replace OSError ImportError - ''; - - # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. - # https://github.com/pydata/pandas/issues/11169 - # https://github.com/pydata/pandas/issues/11287 - # The test_sql checks fail specifically on python 3.5; see here: - # https://github.com/pydata/pandas/issues/11112 - checkPhase = let - testsToSkip = ["test_data" "test_excel" "test_html" "test_json" - "test_frequencies" "test_frame" - "test_read_clipboard_infer_excel" - "test_interp_alt_scipy" "test_nanops" "test_stats"] ++ - optional isPy35 "test_sql"; - in '' - runHook preCheck - # The flag `-A 'not network'` will disable tests that use internet. - # The `-e` flag disables a few problematic tests. - ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \ - -e '${concatStringsSep "|" testsToSkip}' --verbosity=3 - - runHook postCheck - ''; - - meta = { - homepage = "http://pandas.pydata.org/"; - description = "Python Data Analysis Library"; - license = licenses.bsd3; - maintainers = with maintainers; [ raskin fridh ]; - platforms = platforms.unix; - }; - }; - pandas_18 = let inherit (pkgs.stdenv.lib) optional optionalString; inherit (pkgs.stdenv) isDarwin; From 4bd01c5cbd5bbc91050cc9ded817fbd94a5b82f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:07:47 +0200 Subject: [PATCH 033/109] openblas_2_14: remove because we don't need it for numpy anymore. --- .../science/math/openblas/0.2.14.nix | 65 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 67 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.14.nix diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix deleted file mode 100644 index 2fac8a4db08..00000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.14.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, which, config, coreutils -# Most packages depending on openblas expect integer width to match pointer width, -# but some expect to use 32-bit integers always (for compatibility with reference BLAS). -, blas64 ? null -}: - -with stdenv.lib; - -let blas64_ = blas64; in - -let local = config.openblas.preferLocalBuild or false; - binary = - { i686-linux = "32"; - x86_64-linux = "64"; - x86_64-darwin = "64"; - }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - genericFlags = - [ "DYNAMIC_ARCH=1" - "NUM_THREADS=64" - ]; - localFlags = config.openblas.flags or - optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; - blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; - - version = "0.2.14"; -in -stdenv.mkDerivation { - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1"; - name = "openblas-${version}.tar.gz"; - }; - - inherit blas64; - - nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which]; - - makeFlags = - (if local then localFlags else genericFlags) - ++ - optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] - ++ - [ - "FC=gfortran" - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - "CC=${if stdenv.isDarwin then "clang" else "gcc"}" - ''PREFIX="''$(out)"'' - "BINARY=${binary}" - "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" - "INTERFACE64=${if blas64 then "1" else "0"}" - ]; - - doCheck = true; - checkTarget = "tests"; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85650072b8..9148bef349e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15483,12 +15483,10 @@ in liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; openblas = callPackage ../development/libraries/science/math/openblas { }; - openblas_2_14 = callPackage ../development/libraries/science/math/openblas/0.2.14.nix { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with # standard BLAS and LAPACK. openblasCompat = openblas.override { blas64 = false; }; - openblasCompat_2_14 = openblas_2_14.override { blas64 = false; }; openlibm = callPackage ../development/libraries/science/math/openlibm {}; From c39a73b2a21986248514b4e07ff1afd63b32dc54 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:50:49 +0200 Subject: [PATCH 034/109] pythonPackages.pyusb: 1.0.0b2 -> 1.0.0rc1 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce1a97dfc9b..d8e59870254 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23901,11 +23901,11 @@ in modules // { pyusb = buildPythonPackage rec { - name = "pyusb-1.0.0b2"; + name = "pyusb-1.0.0rc1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz"; - sha256 = "14ec66077bdcd6f1aa9e892a0a35a54bb3c1ec56aa740ead64349c18f0186d19"; + sha256 = "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j"; }; # Fix the USB backend library lookup @@ -23915,6 +23915,9 @@ in modules // { sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; + # No tests included + doCheck = false; + meta = { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends homepage = http://pyusb.sourceforge.net/; From 423d3e424483305a3eb8ae661de69f8b9f1c4648 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:52:19 +0200 Subject: [PATCH 035/109] pythonPackages.BlinkStick: broken --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d8e59870254..a84e05bbf99 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23936,6 +23936,10 @@ in modules // { sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408"; }; + # Requires pyusb 1.0.0b1. + # Likely current pyusb will work but we need to patch the hard requirement then. + broken = true; + propagatedBuildInputs = with self; [ pyusb ]; meta = { From 7c92e0a40ffcdf30f13b27c6a6a6b8ed17d569e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:56:14 +0200 Subject: [PATCH 036/109] pythonPackages.pid: fix build --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a84e05bbf99..92d59ffbdc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20042,6 +20042,11 @@ in modules // { sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05"; }; + buildInputs = with self; [ nose ]; + + # No tests included + doCheck = false; + meta = { description = "Pidfile featuring stale detection and file-locking"; homepage = https://github.com/trbs/pid/; From aaad88eccc11395a56e69b5b4e923519e1a74a52 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 17:58:33 +0200 Subject: [PATCH 037/109] pythonPackages.dns: disable py3k --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92d59ffbdc2..f0fffd55d05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4909,6 +4909,10 @@ in modules // { sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3"; }; + # Not supported. + # See instead https://pypi.python.org/pypi/dnspython3/1.12.0 + disabled = isPy3k; + meta = { description = "A DNS toolkit for Python 3.x"; homepage = http://www.dnspython.org; From da27cb67d67d94d6fd5289e92c4321e2b87ddb32 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:02:15 +0200 Subject: [PATCH 038/109] pythonPackages.batinfo: 0.2 -> 0.3 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0fffd55d05..92a838b681c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1572,14 +1572,17 @@ in modules // { }; batinfo = buildPythonPackage rec { - version = "0.2"; + version = "0.3"; name = "batinfo-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz"; - sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8"; + sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499"; }; + # No tests included + doCheck = false; + meta = { homepage = https://github.com/nicolargo/batinfo; description = "A simple Python lib to retrieve battery information"; From 300744cc70931b38685f23c12a1e9e92c9fa130d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:04:07 +0200 Subject: [PATCH 039/109] pythonPackages.colorlog: 2.6.0 -> 2.6.1 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92a838b681c..063f8f110fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1882,13 +1882,16 @@ in modules // { colorlog = buildPythonPackage rec { name = "colorlog-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/colorlog/${name}.tar.gz"; - sha256 = "1s8z9zr4r18igr4rri71nba01arnpppifrkaxhi2xb51500sw0qg"; + sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l"; }; + # No tests included + doCheck = false; + meta = { description = "Log formatting with colors"; homepage = https://github.com/borntyping/python-colorlog; From bdff6bb3f1de6a51310362513ae61c63fcc107d4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:07:29 +0200 Subject: [PATCH 040/109] pythonPackages.dot2tex: disabled for py3k --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 063f8f110fc..1ec3b04a804 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25613,6 +25613,9 @@ in modules // { sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; }; + # Tests fail with 3.x. Furthermore, package is no longer maintained. + disabled = isPy3k; + propagatedBuildInputs = with self; [ pyparsing ]; From 9f34475f933fb9bd35b45d9ab08d202c819c61c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:15:37 +0200 Subject: [PATCH 041/109] pythonPackages.signal: 0.9.2 -> 1.0.1 --- pkgs/top-level/python-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ec3b04a804..f44fad4522b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19746,14 +19746,19 @@ in modules // { }; sigal = buildPythonPackage rec { - name = "sigal-0.9.2"; + name = "sigal-1.0.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; - sha256 = "0mk3bzaxn9snx9lc0pj9zvgdgdyhkza6b8z5x91772mlv84sfw6c"; + sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34"; }; - propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click pytest blinker ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click blinker ]; + + # No tests included + doCheck = false; + meta = { description = "Yet another simple static gallery generator"; From c350b6acc69aa5d9b8d25ce3faec905141b3589f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:38:08 +0200 Subject: [PATCH 042/109] pythonPackages.nibabel: 2.0.1 -> 2.0.2 --- pkgs/top-level/python-packages.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f44fad4522b..f91705ee274 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12801,12 +12801,12 @@ in modules // { }); nibabel = buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; name = "nibabel-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nibabel/${name}.tar.gz"; - sha256 = "e559bcb40ae395c7f75c51079f815a13a94cd8a035a47315fc9fba0d2ae2ecaf"; + sha256 = "0k8mv5zmwb6vc8kwrydl3pp0pnw937rf5mz10figkxczrw6dkk7h"; }; propagatedBuildInputs = with self; [ @@ -12815,17 +12815,10 @@ in modules // { modules.sqlite3 ]; - preCheck = '' - # Test does not work on Py3k because it calls 'python'. - # https://github.com/nipy/nibabel/issues/341 - rm nisext/tests/test_testers.py - # Test fails with numpy 1.10.1: ERROR: nibabel.tests.test_proxy_api.TestPARRECAPI.test_proxy_slicing - # See https://github.com/nipy/nibabel/pull/358 - # and https://github.com/numpy/numpy/issues/6491 - rm nibabel/tests/test_proxy_api.py - # https://github.com/nipy/nibabel/issues/366 - rm nisext/tests/test_doctest_markup.py - ''; + # Failing tests + # nibabel.tests.test_minc1.test_old_namespace + # nisext.tests.test_testers.test_back_tick + doCheck = false; meta = { homepage = http://nipy.org/nibabel/; From 7332740e206ddd24c8ac978d6692adfd81426e31 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:41:37 +0200 Subject: [PATCH 043/109] pythonPackages.llfuse: fix build --- pkgs/top-level/python-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f91705ee274..3274c8f6cf5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11302,7 +11302,16 @@ in modules // { sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"; }; - buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ]; + buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ]; + + propagatedBuildInputs = with self; [ contextlib2 ]; + + checkPhase = '' + py.test + ''; + + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin' + doCheck = false; meta = { description = "Python bindings for the low-level FUSE API"; From a9b80ad72ffadf4158e8d7147b3c2d5d87efb40d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 18:52:51 +0200 Subject: [PATCH 044/109] pythonPackages.pyPdf: disabled py3k --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3274c8f6cf5..ed7bc8ca825 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17736,6 +17736,9 @@ in modules // { buildInputs = with self; [ ]; + # Not supported. Package is no longer maintained. + disabled = isPy3k; + meta = { description = "Pure-Python PDF toolkit"; homepage = "http://pybrary.net/pyPdf/"; From 8886e0ffa0c6cd17632feb8e33b103de2dff3574 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 31 Mar 2016 20:50:28 +0200 Subject: [PATCH 045/109] pythonPackages.pandas: fix tests --- pkgs/top-level/python-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed7bc8ca825..44f62fd6150 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14973,18 +14973,17 @@ in modules // { # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. - # https://github.com/pydata/pandas/issues/11169 - # https://github.com/pydata/pandas/issues/11287 - # The test_sql checks fail specifically on python 3.5; see here: - # https://github.com/pydata/pandas/issues/11112 + + # Disable two tests that are broken since numpy 1.11. Fixed upstream. + checkPhase = let - testsToSkip = []; + testsToSkip = [ "test_range_slice_day" "test_range_slice_seconds" ]; in '' runHook preCheck # The flag `-A 'not network'` will disable tests that use internet. # The `-e` flag disables a few problematic tests. - ${python.executable} setup.py nosetests -A 'not slow and not network' \ - --verbosity=3 + ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \ + -e '${concatStringsSep "|" testsToSkip}' --verbosity=3 runHook postCheck ''; From 29f5b917eabc73b395aa2d0f8b75c16b698f453c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 31 Mar 2016 22:06:12 +0200 Subject: [PATCH 046/109] i2pd: 2.5.1 -> 2.6.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 454d3b41818..3fd4e37c908 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "17qf2pbxf05iw2gzyc5bc2zg3a4ns6zf1pm8q9j7nqhchh1rv4cm"; + sha256 = "0siqg2gf1w85c3j7w6bzjyyjzlxr8z57jk0675gn8yz0xvpkrdys"; }; buildInputs = [ boost zlib openssl ]; From e3e563330798723a8991f0d7011e5c1b74a36e5d Mon Sep 17 00:00:00 2001 From: Corbin Date: Tue, 22 Mar 2016 23:40:35 -0700 Subject: [PATCH 047/109] services: Add Tahoe-LAFS service. Including systemd configuration and much of the standard storage node and introducer configuration. --- nixos/modules/module-list.nix | 1 + .../services/network-filesystems/tahoe.nix | 286 ++++++++++++++++++ 2 files changed, 287 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/tahoe.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9462d72996f..2df612c4f0e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -283,6 +283,7 @@ ./services/network-filesystems/openafs-client/default.nix ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix + ./services/network-filesystems/tahoe.nix ./services/network-filesystems/diod.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix new file mode 100644 index 00000000000..ab441339a56 --- /dev/null +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -0,0 +1,286 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.tahoe; +in + { + options.services.tahoe = { + introducers = mkOption { + default = {}; + type = types.loaOf types.optionSet; + description = '' + The Tahoe introducers. + ''; + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe introducer. + ''; + }; + tub.port = mkOption { + default = 3458; + type = types.int; + description = '' + The port on which the introducer will listen. + ''; + }; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }; + nodes = mkOption { + default = {}; + type = types.loaOf types.optionSet; + description = '' + The Tahoe nodes. + ''; + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe node. + ''; + }; + tub.port = mkOption { + default = 3457; + type = types.int; + description = '' + The port on which the tub will listen. + + This is the correct setting to tweak if you want Tahoe's storage + system to listen on a different port. + ''; + }; + web.port = mkOption { + default = 3456; + type = types.int; + description = '' + The port on which the Web server will listen. + + This is the correct setting to tweak if you want Tahoe's WUI to + listen on a different port. + ''; + }; + client.introducer = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe introducer node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.helper = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe helper node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.shares.needed = mkOption { + default = 3; + type = types.int; + description = '' + The number of shares required to reconstitute a file. + ''; + }; + client.shares.happy = mkOption { + default = 7; + type = types.int; + description = '' + The number of distinct storage nodes required to store + a file. + ''; + }; + client.shares.total = mkOption { + default = 10; + type = types.int; + description = '' + The number of shares required to store a file. + ''; + }; + storage.enable = mkEnableOption "storage service"; + storage.reservedSpace = mkOption { + default = "1G"; + type = types.str; + description = '' + The amount of filesystem space to not use for storage. + ''; + }; + helper.enable = mkEnableOption "helper service"; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }; + }; + config = mkMerge [ + (mkIf (cfg.introducers != {}) { + environment = { + etc = flip mapAttrs' cfg.introducers (node: settings: + nameValuePair "tahoe-lafs/introducer-${node}.cfg" { + mode = "0444"; + text = '' + # This configuration is generated by Nix. Edit at your own + # peril; here be dragons. + + [node] + nickname = ${settings.nickname} + tub.port = ${toString settings.tub.port} + ''; + }); + # Actually require Tahoe, so that we will have it installed. + systemPackages = flip mapAttrsToList cfg.introducers (node: settings: + settings.package + ); + }; + # Open up the firewall. + # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.introducers + # (node: settings: settings.tub.port); + systemd.services = flip mapAttrs' cfg.introducers (node: settings: + let + pidfile = "/run/tahoe.introducer-${node}.pid"; + # This is a directory, but it has no trailing slash. Tahoe commands + # get antsy when there's a trailing slash. + nodedir = "/var/db/tahoe-lafs/introducer-${node}"; + in nameValuePair "tahoe.introducer-${node}" { + description = "Tahoe LAFS node ${node}"; + wantedBy = [ "multi-user.target" ]; + path = [ settings.package ]; + restartTriggers = [ + config.environment.etc."tahoe-lafs/introducer-${node}.cfg".source ]; + serviceConfig = { + Type = "simple"; + PIDFile = pidfile; + }; + preStart = '' + if [ \! -d ${nodedir} ]; then + mkdir -p /var/db/tahoe-lafs + tahoe create-introducer ${nodedir} + fi + + # Tahoe has created a predefined tahoe.cfg which we must now + # scribble over. + # XXX I thought that a symlink would work here, but it doesn't, so + # we must do this on every prestart. Fixes welcome. + # rm ${nodedir}/tahoe.cfg + # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg + ''; + # Believe it or not, Tahoe is very brittle about the order of + # arguments to $(tahoe start). The node directory must come first, + # and arguments which alter Twisted's behavior come afterwards. + script = '' + tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ''; + }); + users.extraUsers = flip mapAttrs' cfg.introducers (node: _: + nameValuePair "tahoe.introducer-${node}" { + description = "Tahoe node user for introducer ${node}"; + isSystemUser = true; + }); + }) + (mkIf (cfg.nodes != {}) { + environment = { + etc = flip mapAttrs' cfg.nodes (node: settings: + nameValuePair "tahoe-lafs/${node}.cfg" { + mode = "0444"; + text = '' + # This configuration is generated by Nix. Edit at your own + # peril; here be dragons. + + [node] + nickname = ${settings.nickname} + tub.port = ${toString settings.tub.port} + # This is a Twisted endpoint. Twisted Web doesn't work on + # non-TCP. ~ C. + web.port = tcp:${toString settings.web.port} + + [client] + ${optionalString (settings.client.introducer != null) + "introducer.furl = ${settings.client.introducer}"} + ${optionalString (settings.client.helper != null) + "helper.furl = ${settings.client.helper}"} + + shares.needed = ${toString settings.client.shares.needed} + shares.happy = ${toString settings.client.shares.happy} + shares.total = ${toString settings.client.shares.total} + + [storage] + enabled = ${if settings.storage.enable then "true" else "false"} + reserved_space = ${settings.storage.reservedSpace} + + [helper] + enabled = ${if settings.helper.enable then "true" else "false"} + ''; + }); + # Actually require Tahoe, so that we will have it installed. + systemPackages = flip mapAttrsToList cfg.nodes (node: settings: + settings.package + ); + }; + # Open up the firewall. + # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.nodes + # (node: settings: settings.tub.port); + systemd.services = flip mapAttrs' cfg.nodes (node: settings: + let + pidfile = "/run/tahoe.${node}.pid"; + # This is a directory, but it has no trailing slash. Tahoe commands + # get antsy when there's a trailing slash. + nodedir = "/var/db/tahoe-lafs/${node}"; + in nameValuePair "tahoe.${node}" { + description = "Tahoe LAFS node ${node}"; + wantedBy = [ "multi-user.target" ]; + path = [ settings.package ]; + restartTriggers = [ + config.environment.etc."tahoe-lafs/${node}.cfg".source ]; + serviceConfig = { + Type = "simple"; + PIDFile = pidfile; + }; + preStart = '' + if [ \! -d ${nodedir} ]; then + mkdir -p /var/db/tahoe-lafs + tahoe create-node ${nodedir} + fi + + # Tahoe has created a predefined tahoe.cfg which we must now + # scribble over. + # XXX I thought that a symlink would work here, but it doesn't, so + # we must do this on every prestart. Fixes welcome. + # rm ${nodedir}/tahoe.cfg + # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg + cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg + ''; + # Believe it or not, Tahoe is very brittle about the order of + # arguments to $(tahoe start). The node directory must come first, + # and arguments which alter Twisted's behavior come afterwards. + script = '' + tahoe start ${nodedir} -n -l- --pidfile=${pidfile} + ''; + }); + users.extraUsers = flip mapAttrs' cfg.nodes (node: _: + nameValuePair "tahoe.${node}" { + description = "Tahoe node user for node ${node}"; + isSystemUser = true; + }); + }) + ]; + } From aff6c3b77d4804d386180578a8b6442b16759d94 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Mar 2016 19:30:09 -0400 Subject: [PATCH 048/109] pydot_ng: init at 1.0.0 --- pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 763e1aa15ff..43712205778 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16721,6 +16721,30 @@ in modules // { }; }; + pydot_ng = buildPythonPackage rec { + name = "pydot_ng-1.0.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pydot-ng/${name}.tar.gz"; + sha256 = "0h8k8wlzvnb40v4js7afgfyhp3wasmb1kg4gr6z7ck63iv8fq864"; + }; + + buildInputs = [ self.pytest self.unittest2 ]; + propagatedBuildInputs = [ pkgs.graphviz self.pyparsing ]; + + checkPhase = '' + mkdir test/my_tests + py.test test + ''; + + meta = { + homepage = "https://pypi.python.org/pypi/pydot-ng"; + description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot"; + license = licenses.mit; + maintainers = [ maintainers.bcdarwin ]; + }; + }; + pyelasticsearch = buildPythonPackage (rec { name = "pyelasticsearch-1.4"; From 33f345eed0f4956971bf2f7945155839d1b6222b Mon Sep 17 00:00:00 2001 From: devhell <^@regexmail.net> Date: Thu, 31 Mar 2016 23:36:50 +0100 Subject: [PATCH 049/109] {lib}mediainfo{-gui}: 0.7.83 -> 0.7.84 Built and tested locally. From the changelog: ``` Version 0.7.84, 2016-03-31 x #I122, MPEG-4/MOV: Crash if mdhd timescale is 0 x MPEG-4/MOV: Infinite loop if malformed stsc / stsz (detected by fuzzing) x MPEG-TS: some DVB Subtitles were not detected x HLS: better handling of media playlists having EXT-X-BYTERANGE ``` --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- pkgs/development/libraries/libmediainfo/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 83130164fd9..a136497de89 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.83"; + version = "0.7.84"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; + sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index cf1a4ce8280..6f4c014fb23 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.83"; + version = "0.7.84"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; + sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index b3d76b1c931..8b8bf61a99b 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.83"; + version = "0.7.84"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417"; + sha256 = "0k657ynfxcw6lvakc8plz0pzfixlqbsiih2idimk9k1dd4xzhq3d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 55a86b799ece27e044afb031057260b86f09d7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Mar 2016 23:46:54 +0100 Subject: [PATCH 050/109] nixos-generate-config.pl: correct path for broadcom-43xx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b01eedaeecd4bd292fd9a22225c9490a285e3b77) Signed-off-by: Domen Kožar --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ec880e08472..d3005cdfd6f 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -165,7 +165,7 @@ sub pciCheck { ) ) { # we need e.g. brcmfmac43602-pcie.bin - push @imports, ""; + push @imports, ""; } # Can't rely on $module here, since the module may not be loaded From b357ee9a6f37c95ddb4299ab61ed9dadf3dac8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Mar 2016 23:00:24 +0100 Subject: [PATCH 051/109] changelog: add all new NixOS modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit d231868990f8b2d471648d76f07e747f396b9421) Signed-off-by: Domen Kožar --- nixos/doc/manual/release-notes/rl-1603.xml | 53 ++++++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 8119470385f..eb67d1e565e 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -58,10 +58,57 @@ has the following highlights: services/monitoring/longview.nix - services/networking/pdnsd.nix - services/web-apps/pump.io.nix - services/security/haka.nix + hardware/video/webcam/facetimehd.nix i18n/inputMethod/default.nix + i18n/inputMethod/fcitx.nix + i18n/inputMethod/ibus.nix + i18n/inputMethod/nabi.nix + i18n/inputMethod/uim.nix + programs/fish.nix + security/acme.nix + security/audit.nix + security/oath.nix + services/hardware/irqbalance.nix + services/mail/dspam.nix + services/mail/opendkim.nix + services/mail/postsrsd.nix + services/mail/rspamd.nix + services/mail/rmilter.nix + services/misc/autofs.nix + services/misc/bepasty.nix + services/misc/calibre-server.nix + services/misc/cfdyndns.nix + services/misc/gammu-smsd.nix + services/misc/mathics.nix + services/misc/matrix-synapse.nix + services/misc/octoprint.nix + services/monitoring/hdaps.nix + services/monitoring/heapster.nix + services/monitoring/longview.nix + services/network-filesystems/netatalk.nix + services/network-filesystems/xtreemfs.nix + services/networking/autossh.nix + services/networking/dnschain.nix + services/networking/gale.nix + services/networking/miniupnpd.nix + services/networking/namecoind.nix + services/networking/ostinato.nix + services/networking/pdnsd.nix + services/networking/shairport-sync.nix + services/networking/supplicant.nix + services/search/kibana.nix + services/security/haka.nix + services/security/physlock.nix + services/web-apps/pump.io.nix + services/x11/hardware/libinput.nix + services/x11/window-managers/windowlab.nix + system/boot/initrd-network.nix + system/boot/initrd-ssh.nix + system/boot/loader/loader.nix + system/boot/networkd.nix + system/boot/resolved.nix + virtualisation/lxd.nix + virtualisation/rkt.nix From 9dfc6829fe18a4ef6316aa33cab57378039985da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Mar 2016 23:08:49 +0100 Subject: [PATCH 052/109] changelog: note release date MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 279557e6d2a1afce8419030ec538c1eb3f42abe4) Signed-off-by: Domen Kožar --- nixos/doc/manual/release-notes/rl-1603.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index eb67d1e565e..4cf3a3716db 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-16.03"> -Release 16.03 (“Emu”, 2016/03/??) +Release 16.03 (“Emu”, 2016/03/31) In addition to numerous new and upgraded packages, this release has the following highlights: From cc25628212514421efb901c80c8f25fbbf70006b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Mar 2016 23:39:01 +0100 Subject: [PATCH 053/109] changelog: note binutils upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 216c840ca8c7a3a0e71244be3b739dafa32a0709) Signed-off-by: Domen Kožar --- nixos/doc/manual/release-notes/rl-1603.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 4cf3a3716db..018dcd42206 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -33,6 +33,10 @@ has the following highlights: Glibc 2.23 (was 2.21). + + Binutils 2.26 (was 2.23.1). See #909 + + Improved support for ensuring bitwise reproducible From d8abfc87c62477fb8e9afaa22bec1c763f80c62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 31 Mar 2016 23:46:54 +0100 Subject: [PATCH 054/109] changelog: correct path to gitit nixos module --- nixos/doc/manual/release-notes/rl-1603.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 018dcd42206..faee3a407da 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -165,7 +165,7 @@ following incompatible changes: ]; + imports = [ ]; } ]]> From a98a918b1053e3808a3d550527443b9b8d38b926 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 1 Apr 2016 01:26:52 +0200 Subject: [PATCH 055/109] syncthing: run daemon with dedicated user as default --- nixos/modules/misc/ids.nix | 2 ++ .../modules/services/networking/syncthing.nix | 33 ++++++++++++++----- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index f71d1e3fe20..2b5008b9ca8 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -257,6 +257,7 @@ radicale = 234; hydra-queue-runner = 235; hydra-www = 236; + syncthing = 237; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -485,6 +486,7 @@ pdnsd = 229; octoprint = 230; radicale = 234; + syncthing = 237; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 67b90516b99..da9a270f30b 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.syncthing; + defaultUser = "syncthing"; in @@ -17,6 +18,7 @@ in services.syncthing = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the Syncthing, self-hosted open-source alternative @@ -26,7 +28,8 @@ in }; user = mkOption { - default = "syncthing"; + type = types.string; + default = defaultUser; description = '' Syncthing will be run under this user (user must exist, this can be your user name). @@ -34,8 +37,8 @@ in }; all_proxy = mkOption { - type = types.string; - default = ""; + type = types.nullOr types.string; + default = null; example = "socks5://address.com:1234"; description = '' Overwrites all_proxy environment variable for the syncthing process to @@ -45,6 +48,7 @@ in }; dataDir = mkOption { + type = types.path; default = "/var/lib/syncthing"; description = '' Path where the settings and keys will exist. @@ -71,20 +75,33 @@ in config = mkIf cfg.enable { + users = mkIf (cfg.user == defaultUser) { + extraUsers."${defaultUser}" = + { group = defaultUser; + home = cfg.dataDir; + createHome = true; + uid = config.ids.uids.syncthing; + description = "Syncthing daemon user"; + }; + + extraGroups."${defaultUser}".gid = + config.ids.gids.syncthing; + }; + systemd.services.syncthing = { description = "Syncthing service"; - after = [ "network.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = { STNORESTART = "yes"; # do not self-restart STNOUPGRADE = "yes"; - } // - (config.networking.proxy.envVars) // - (if cfg.all_proxy != "" then { all_proxy = cfg.all_proxy; } else {}); + inherit (cfg) all_proxy; + } // config.networking.proxy.envVars; serviceConfig = { - User = "${cfg.user}"; + User = cfg.user; + Group = optionalString (cfg.user == defaultUser) defaultUser; PermissionsStartOnly = true; Restart = "on-failure"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; From 4cd54c5ce9ad608a3d7a2fbcd726565b5f8b6781 Mon Sep 17 00:00:00 2001 From: Louis Taylor Date: Fri, 1 Apr 2016 01:51:00 +0100 Subject: [PATCH 056/109] jython: 2.7-rc3 -> 2.7.0 --- pkgs/development/interpreters/jython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix index f9d6271e5d8..80661c3feb9 100644 --- a/pkgs/development/interpreters/jython/default.nix +++ b/pkgs/development/interpreters/jython/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jython-${version}"; - version = "2.7-rc3"; + version = "2.7.0"; src = fetchurl { url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar"; - sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78"; + sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx"; }; buildInputs = [ makeWrapper ]; From a37491386c795563a02917ce6c66766fd16381f0 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 31 Mar 2016 22:35:38 -0400 Subject: [PATCH 057/109] log4cxx: darwin compatibility This patch replicates the patch logic from the brew recipe which is necessary to build on darwin. --- pkgs/development/libraries/log4cxx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index b2e13a1e9ab..cae6e5c0a55 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { }' src/examples/cpp/console.cpp \ src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/namespace std { class locale; }/#include /' src/main/include/log4cxx/helpers/simpledateformat.h + sed -i 's/\(#include \)/\1\n#include /' src/main/cpp/stringhelper.cpp ''; buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; From f58de47cd000f1df43bbd24addd35fd8064a4ab7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 1 Apr 2016 08:19:59 +0200 Subject: [PATCH 058/109] spotify: 1.0.26.125.g64dc8bc6-14 -> 1.0.26.125.g64dc8bc6-15 --- 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 243d1e49c7b..e1eee1cdd8e 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.26.125.g64dc8bc6-14"; + version = "1.0.26.125.g64dc8bc6-15"; 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 = "09wanpml2a6k8asfc0pd56n7fia37amgsplsan1qdh6dwdzr3rv5"; + sha256 = "01y4jr1r928251mj9kz1i7x93ya0ky4xaibm0q08q3zjsafianz1"; }; buildInputs = [ dpkg makeWrapper ]; From bd4fdfd722c1177e8ce76291100120d6a8b339ad Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Thu, 31 Mar 2016 02:17:52 -0700 Subject: [PATCH 059/109] vimPlugins: add vim-jsonnet and zenburn --- pkgs/misc/vim-plugins/default.nix | 22 ++++++++++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 3 +++ 2 files changed, 25 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index fa09d1ca92b..b219e625033 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -464,6 +464,17 @@ rec { }; + vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsonnet-2016-01-21"; + src = fetchgit { + url = "git://github.com/google/vim-jsonnet"; + rev = "5d59d0ba6af2bca4484909e02d72c96fbdd5b220"; + sha256 = "eb7508aedce86bdcb7f104f62490b92bea6e23fb14fafacd251c6aab80aece78"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "idris-vim-2016-01-29"; src = fetchgit { @@ -552,6 +563,17 @@ rec { }; + zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zenburn-2015-09-18"; + src = fetchgit { + url = "git://github.com/jnurmine/zenburn"; + rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179"; + sha256 = "05d7c348dfaf70b8068abb3eaba3bc961b060e4d7a4c99fb6c4538fba5085ad1"; + }; + dependencies = []; + + }; + vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-colorstepper-2016-01-28"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 88e9bbb9594..69a6682e691 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -32,6 +32,7 @@ "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:flazz/vim-colorschemes" +"github:google/vim-jsonnet" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/thumbnail.vim" @@ -41,6 +42,7 @@ "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" "github:jistr/vim-nerdtree-tabs" +"github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" "github:junegunn/limelight.vim" @@ -96,6 +98,7 @@ "surround" "table-mode" "taglist" +"tlib" "undotree" "vim-addon-async" "vim-addon-commenting" From efe33d6e8739ea79efcada98e15da49aeed598b6 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Fri, 1 Apr 2016 08:51:37 +0200 Subject: [PATCH 060/109] openldap: 2.4.42 -> 2.4.44 --- pkgs/development/libraries/openldap/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 7d836cd5a0d..c4f8ef0ee66 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,25 +1,13 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff }: stdenv.mkDerivation rec { - name = "openldap-2.4.42"; + name = "openldap-2.4.44"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf"; + sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"; }; - # Should be removed with >=2.4.43 - patches = [ - ./CVE-2015-6908.patch - ( - fetchurl { - sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3"; - url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch"; - name = "openldap-clang-compilation.patch"; - } - ) - ]; - outputs = [ "out" "man" ]; buildInputs = [ openssl cyrus_sasl db groff ]; From 4f463fe6c1f7c1ceede9056729be1aee7cd238aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Feb 2016 16:12:06 +0100 Subject: [PATCH 061/109] pythonPackages.pygments: 2.1 -> 2.1.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 4bf21a9ed44..e39a23b58d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16916,12 +16916,12 @@ in modules // { }; pygments = buildPythonPackage rec { - version = "2.1"; + version = "2.1.1"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "0yx4p3w9lw1kw24zr87xnaqxm007mdxgwa5wjpwnrcfpmxgyz80k"; + sha256 = "06y0b7xh9h3r0wbxl41ccnnnw8dxfz48zj8x09y4rranbfldkxrd"; }; propagatedBuildInputs = with self; [ docutils ]; From 36aa19b105f607c1013bb49af2ad6e28c6aa2d5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Apr 2016 09:32:40 +0200 Subject: [PATCH 062/109] btrfs-progs: 4.5 -> 4.5.1 Bugfix release. Changes: https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 59935af0a5d..d0fda2da414 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -2,14 +2,14 @@ , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "4.5"; in +let version = "4.5.1"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "04d8w1wqaij6kxhxcirwvy1bkvc7aikkyw981ciwlznblzc16y7f"; + sha256 = "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"; }; buildInputs = [ From 635c99ce878d5009eaf21da80319d5426a534cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 30 Mar 2016 09:47:09 +0200 Subject: [PATCH 063/109] vm: allow overriding QEMU_OPTS / memSize for images. It's nice to be able to create disk images with -smp 4 in qemu. --- pkgs/build-support/vm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index c11c21170e0..56a13d6787a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -414,12 +414,12 @@ rec { fillDiskWithRPMs = { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? "" , runScripts ? true, createRootFS ? defaultCreateRootFS + , QEMU_OPTS ? "", memSize ? 512 , unifiedSystemDir ? false }: runInLinuxVM (stdenv.mkDerivation { - inherit name preInstall postInstall rpms; - memSize = 512; + inherit name preInstall postInstall rpms QEMU_OPTS memSize; preVM = createEmptyImage {inherit size fullName;}; buildCommand = '' @@ -685,10 +685,11 @@ rec { , packages, extraPackages ? [] , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"] , runScripts ? true, createRootFS ? defaultCreateRootFS + , QEMU_OPTS ? "", memSize ? 512 , unifiedSystemDir ? false }: fillDiskWithRPMs { - inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir; + inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir QEMU_OPTS memSize; rpms = import (rpmClosureGenerator { inherit name packagesLists urlPrefixes archs; packages = packages ++ extraPackages; From f07b934c8a9f9bde57efc14eaa348f777220cec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 1 Apr 2016 11:16:02 +0200 Subject: [PATCH 064/109] Updating trigger-rally to 0.6.3 --- pkgs/games/trigger/default.nix | 42 ++++++++++++++++----------------- pkgs/games/trigger/search.patch | 14 +++++++++++ 2 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 pkgs/games/trigger/search.patch diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index ad65b54ddcd..382edb6908b 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,37 +1,35 @@ -{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, jam }: +{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, glew }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.1"; + name = "trigger-rally-0.6.3"; src = fetchurl { - url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2"; - sha256 = "1fvb6dl5bwclmx0y8ygyrfn8jczc5kxawxlyv6mp592smb5x5hjs"; + url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; + sha256 = "103mv4vpq335mrmgzlhahrfncq7ds3b5ip5a52967rv2j6hhzpvy"; }; - srcData = fetchurl { - url = "mirror://sourceforge/trigger-rally/${name}-data.tar.bz2"; - sha256 = "04f9d74gz5xvfx6pnmbfxqhp0kd1p16j5lrgcq12wxvla6py4qaw"; - }; - - buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ]; + buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa glew ]; preConfigure = '' - configureFlags="$configureFlags --datadir=$out/share/${name}-data" + sed s,/usr/local,$out, -i bin/*defs + + cd src + export makeFlags="$makeFlags prefix=$out" ''; - # It has some problems installing the README file, so... out. - patchPhase = '' - sed -i /README/d Jamfile + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/bin + cat < $out/bin/trigger-rally + #!/bin/sh + exec $out/games/trigger-rally "$@" + EOF + chmod +x $out/bin/trigger-rally ''; - buildPhase = "jam"; - - installPhase = '' - jam install - mkdir -p $out/share - pushd $out/share - tar xf $srcData - ''; + # search.patch : fix c++ error. + patches = [ ./search.patch ]; meta = { description = "Rally"; diff --git a/pkgs/games/trigger/search.patch b/pkgs/games/trigger/search.patch new file mode 100644 index 00000000000..60a69b159b5 --- /dev/null +++ b/pkgs/games/trigger/search.patch @@ -0,0 +1,14 @@ +diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp +index 39539e1..680c12c 100644 +--- a/src/Trigger/main.cpp ++++ b/src/Trigger/main.cpp +@@ -890,7 +890,8 @@ bool MainApp::loadAll() + std::smatch mr; // Match Results + std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern + +- if (!std::regex_search(std::string(*fname), mr, pat)) ++ std::string search(*fname); ++ if (!std::regex_search(search, mr, pat)) + continue; + + std::string basefname = mr[1]; From 0de2d2fbcdcea47292662d2509f5d06c81288e48 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 29 Mar 2016 05:27:51 -0700 Subject: [PATCH 065/109] mfi: init at 2.1.11 This package has some outdated dependencies, so old versions of mongodb and v8 had to be re-added as well. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/mfi.nix | 90 +++++++++++++++++++ pkgs/development/libraries/v8/3.14.nix | 28 ++++++ .../v8/fix-GetLocalizedMessage-usage.patch | 27 ++++++ pkgs/servers/mfi/default.nix | 28 ++++++ pkgs/servers/nosql/mongodb/2.4.8.nix | 45 ++++++++++ pkgs/top-level/all-packages.nix | 8 ++ 8 files changed, 229 insertions(+) create mode 100644 nixos/modules/services/networking/mfi.nix create mode 100644 pkgs/development/libraries/v8/3.14.nix create mode 100644 pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch create mode 100644 pkgs/servers/mfi/default.nix create mode 100644 pkgs/servers/nosql/mongodb/2.4.8.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2b5008b9ca8..1e14fe655fc 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -258,6 +258,7 @@ hydra-queue-runner = 235; hydra-www = 236; syncthing = 237; + mfi = 238; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -487,6 +488,7 @@ octoprint = 230; radicale = 234; syncthing = 237; + #mfi = 238; # unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9462d72996f..f5352eb6ed0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -333,6 +333,7 @@ ./services/networking/lambdabot.nix ./services/networking/libreswan.nix ./services/networking/mailpile.nix + ./services/networking/mfi.nix ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix new file mode 100644 index 00000000000..5afb83ed022 --- /dev/null +++ b/nixos/modules/services/networking/mfi.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, utils, ... }: +with lib; +let + name = "Ubiquiti mFi Controller"; + cfg = config.services.mfi; + stateDir = "/var/lib/mfi"; + # XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run. + cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar"; + mountPoints = [ + { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; } + { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; } + { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; } + ]; + systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints; + ports = [ 6080 6880 6443 6843 ]; +in +{ + options = { + services.mfi = { + enable = mkEnableOption name; + openPorts = mkOption { + type = types.bool; + default = true; + description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services."; + }; + }; + }; + + config = mkIf cfg.enable { + + networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports; + + users.users.mfi = { + uid = config.ids.uids.mfi; + description = "mFi controller daemon user"; + home = "${stateDir}"; + }; + + # We must create the binary directories as bind mounts instead of symlinks + # This is because the controller resolves all symlinks to absolute paths + # to be used as the working directory. + systemd.mounts = map ({ what, where }: { + bindsTo = [ "mfi.service" ]; + partOf = [ "mfi.service" ]; + unitConfig.RequiresMountsFor = stateDir; + options = "bind"; + what = what; + where = where; + }) mountPoints; + + systemd.services.mfi = { + description = "mFi controller daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] ++ systemdMountPoints; + partOf = systemdMountPoints; + bindsTo = systemdMountPoints; + unitConfig.RequiresMountsFor = stateDir; + + preStart = '' + # Clear ./webapps each run. + rm -rf "${stateDir}/webapps" + mkdir -p "${stateDir}/webapps" + ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps" + + # Copy initial config only once. + test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf" + test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data" + + # Fix Permissions. + # (Bind-mounts cause errors; ignore exit codes) + chown -fR mfi: "${stateDir}" || true + chmod -fR u=rwX,go= "${stateDir}" || true + ''; + + postStop = '' + rm -rf "${stateDir}/webapps" + ''; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cmd} start"; + ExecStop = "${cmd} stop"; + User = "mfi"; + PermissionsStartOnly = true; + UMask = "0077"; + WorkingDirectory = "${stateDir}"; + }; + }; + }; +} diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix new file mode 100644 index 00000000000..fee0f868ea9 --- /dev/null +++ b/pkgs/development/libraries/v8/3.14.nix @@ -0,0 +1,28 @@ +{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args: +with stdenv.lib; +let + version = "3.14.5.10"; + sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; +in +(callPackage ./generic.nix (args // { + inherit version sha256; +})).overrideDerivation (oldAttrs:{ + patchPhase = [ + oldAttrs.patchPhase + "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8" + ]; + + # http://code.google.com/p/v8/issues/detail?id=2149 + NIX_CFLAGS_COMPILE = concatStringsSep " " [ + oldAttrs.NIX_CFLAGS_COMPILE + "-Wno-unused-local-typedefs" + "-Wno-aggressive-loop-optimizations" + ]; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = "${version}"; + inherit sha256; + }; +}) diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch new file mode 100644 index 00000000000..3bc0fff4d50 --- /dev/null +++ b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch @@ -0,0 +1,27 @@ +From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 +From: Timothy J Fontaine +Date: Thu, 23 May 2013 13:57:59 -0700 +Subject: [PATCH] v8: fix GetLocalizedMessage usage + +As is the backport of the abort on uncaught exception wouldn't compile +because we it was passing in `this` when it was unnecessary. +--- + deps/v8/src/isolate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/isolate.cc b/src/isolate.cc +index 04a438b..5a5293e 100644 +--- a/src/isolate.cc ++++ b/src/isolate.cc +@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { + (report_exception || can_be_caught_externally)) { + fatal_exception_depth++; + fprintf(stderr, "%s\n\nFROM\n", +- *MessageHandler::GetLocalizedMessage(this, message_obj)); ++ *MessageHandler::GetLocalizedMessage(message_obj)); + PrintCurrentStackTrace(stderr); + OS::Abort(); + } +-- +1.8.1.6 + diff --git a/pkgs/servers/mfi/default.nix b/pkgs/servers/mfi/default.nix new file mode 100644 index 00000000000..e431ca993a9 --- /dev/null +++ b/pkgs/servers/mfi/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "mfi-controller-${version}"; + version = "2.1.11"; + + src = fetchurl { + url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip"; + sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90"; + }; + + buildInputs = [ unzip ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp -ar conf data dl lib webapps $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.ubnt.com/; + description = "Controller for Ubiquiti mFi devices"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ elitak ]; + }; +} diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix new file mode 100644 index 00000000000..448d260bdb9 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/2.4.8.nix @@ -0,0 +1,45 @@ +# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0 +# by elitak for use with the Ubiquiti mFi Controller package, which breaks at +# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old +# versions of boost and v8 to build this, as well. +{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre, snappy }: +with stdenv.lib; +let + version = "2.4.8"; +in +stdenv.mkDerivation rec { + name = "mongodb-${version}"; + + src = fetchurl { + url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; + sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; + }; + + nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre snappy ]; + + postPatch = '' + substituteInPlace SConstruct \ + --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \ + --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]' + ''; + + NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs"; + + buildPhase = '' + export SCONSFLAGS="-j$NIX_BUILD_CORES" + scons all --use-system-all + ''; + + installPhase = '' + mkdir -p $out/lib + scons install --use-system-all --full --prefix=$out + ''; + + meta = { + description = "A scalable, high-performance, open source NoSQL database"; + homepage = http://www.mongodb.org; + license = licenses.agpl3; + maintainers = with maintainers; [ bluescreen303 elitak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cca23969c83..1a32ba98d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8907,6 +8907,10 @@ in gnutls = gnutls; }); + v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { + inherit (pythonPackages) gyp; + }; + v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (pythonPackages) gyp; # The build succeeds using gcc5 but it fails to build pkgs.consul-ui @@ -9624,6 +9628,8 @@ in meteor = callPackage ../servers/meteor/default.nix { }; + mfi = callPackage ../servers/mfi { }; + # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; mod_evasive = pkgs.apacheHttpdPackages.mod_evasive; @@ -9741,6 +9747,8 @@ in sasl = cyrus_sasl; }; + mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; + riak = callPackage ../servers/nosql/riak/2.1.1.nix { }; influxdb = (callPackage ../servers/nosql/influxdb { }).bin // { outputs = [ "bin" ]; }; From 8d756babee0bfbd175e4e5cef18852f3a864f4f1 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 1 Apr 2016 12:35:51 +0200 Subject: [PATCH 066/109] nodejs: 5.9.0 -> 5.10.0 --- pkgs/development/web/nodejs/v5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix index c1d45443885..a96e5000829 100644 --- a/pkgs/development/web/nodejs/v5.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -6,7 +6,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.9.0"; + version = "5.10.0"; deps = { inherit openssl zlib libuv; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "0ghgfqs64794g6ggrvsdcqwz2lnhck0yiy2fyyg3in8z91k5l5z5"; + sha256 = "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; From 5c21ca886e3d22b79c99f8cd9c16245c1a1f5fc9 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Fri, 1 Apr 2016 12:51:17 +0200 Subject: [PATCH 067/109] galen: 2.2.3 -> 2.2.4 --- pkgs/development/tools/galen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 7ff283176e1..3ee29f2267a 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.2.3"; + version = "2.2.4"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; - sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq"; + sha256 = "0qx6pza6aw880ph76wbypcgy983pln8k4ad2indagb5qhiz4zw1d"; }; buildInputs = [ unzip ]; From 13a1c7b8c1ae5c4558aa5dc3a173fb15d55d4656 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 13:36:59 +0200 Subject: [PATCH 068/109] useOldCXXAbi: Change into a setup hook Stdenv adapters considered weird. --- pkgs/build-support/setup-hooks/use-old-cxx-abi.sh | 1 + pkgs/games/steam/chrootenv.nix | 4 ++-- pkgs/stdenv/adapters.nix | 6 ------ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 pkgs/build-support/setup-hooks/use-old-cxx-abi.sh diff --git a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh new file mode 100644 index 00000000000..53335d7a9a7 --- /dev/null +++ b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh @@ -0,0 +1 @@ +export NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0" diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 35b3611812b..8bb73fc5cef 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -25,8 +25,8 @@ buildFHSUserEnv { ] ++ lib.optional withJava jdk ++ lib.optional withPrimus (primus.override { - stdenv = useOldCXXAbi stdenv; - stdenv_i686 = useOldCXXAbi pkgsi686Linux.stdenv; + stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; + stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; }) ; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 8398c45400e..87d3938f13d 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -242,10 +242,4 @@ rec { else pkgs.stdenv; }; - /* Modify a stdenv so a build uses pre-C++11 ABI by default. */ - useOldCXXAbi = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -D_GLIBCXX_USE_CXX11_ABI=0"; - }); - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cca23969c83..22303669f9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -325,6 +325,8 @@ in separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + ### TOOLS From 2f0195003ec528c203590012316571e46fa60940 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 13:51:24 +0200 Subject: [PATCH 069/109] firefox-esr: Fix name The Firefox wrapped called itself "firefox" rather than "firefox-esr". Also eliminate a use of splitString which is evil and should never be used. --- pkgs/applications/networking/browsers/firefox/default.nix | 1 + pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 41f8cc155a8..552c8d4d822 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -122,6 +122,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { passthru = { inherit gtk nspr version; isFirefox3Like = true; + browserName = pname; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 91486b608b2..5fb887bda22 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,8 +9,8 @@ }: ## configurability of the wrapper itself -browser : -{ browserName ? (lib.head (lib.splitString "-" browser.name)) # name of the executable +browser: +{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version) , desktopName ? # browserName with first letter capitalized (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) From fd2273e41918f2b6bb72356b20c8cb6186251e37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 13:52:54 +0200 Subject: [PATCH 070/109] Stronger warning against usage of splitString --- lib/strings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/strings.nix b/lib/strings.nix index a2a4be11e1b..01a6f181d03 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -258,7 +258,7 @@ rec { /* Cut a string with a separator and produces a list of strings which were separated by this separator. - NOTE: this function is not performant and should be avoided + NOTE: this function is not performant and should never be used. Example: splitString "." "foo.bar.baz" From 160c7df7512551bf2668f6d5d83d4a8ba5d28176 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 1 Apr 2016 08:08:31 -0400 Subject: [PATCH 071/109] atom: 1.6.0 -> 1.6.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index de857b7a8c6..c6083a89f6c 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1izp2fwxk4rrksdbhcaj8fn0aazi7brid72n1vp7f49adrkqqc1b"; + sha256 = "0g31kw4daysjp4iz1rxlh64hnqxbn561k41n908pxgc7kjwbl2hj"; name = "${name}.deb"; }; From d9798553c69620f772c0fcd5c6ad6f7d34fad65c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 1 Apr 2016 08:09:34 -0400 Subject: [PATCH 072/109] oh-my-zsh: 2016-03-24 -> 2016-03-31 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index a7e57b145d6..4b2a4d4e763 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "oh-my-zsh-git-${version}"; - version = "2016-03-24"; + version = "2016-03-31"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "9280f2c874b1126ee9399c353d1e0184fd39b4e4"; - sha256 = "1rldqfs5vkqxp3r7nn5q1837a363gml0d5pji0zkl7ia49f7bdnk"; + rev = "286c3e5e28b651c3f629e6aaba589a1cf56da4d8"; + sha256 = "1jgbpfk6plj1gkwrv7xl1nsxjnrhyh7k3rjkindxx5s9lbq52f7z"; }; phases = "installPhase"; From 3fb170842736c9c3c10cd53675f98aa3912bf6ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 15:52:59 +0200 Subject: [PATCH 073/109] ssh: Fix support for ssh-dss host keys --- nixos/modules/programs/ssh.nix | 1 + pkgs/tools/networking/openssh/default.nix | 4 +- .../fix-host-key-algorithms-plus.patch | 52 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 1ad45f46803..cc835081c9f 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -189,6 +189,7 @@ in # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) PubkeyAcceptedKeyTypes +ssh-dss + HostKeyAlgorithms +ssh-dss ${cfg.extraConfig} ''; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 957d5e715e7..19b96fdc8dd 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { ''; patches = - [ ./locale_archive.patch ] + [ ./locale_archive.patch + ./fix-host-key-algorithms-plus.patch + ] ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch new file mode 100644 index 00000000000..02846e9bdad --- /dev/null +++ b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch @@ -0,0 +1,52 @@ +Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because +setting any value for HostKeyAlgorithms causes the known host keys to +be ignored for the purpose of determining the priority of algorithms. +This was fixed upstream for HostKeyAlgorithms in sshd_config, but not +in ssh_config. The fix is to apply order_hostkeyalgs() if the user +specifies a HostKeyAlgorithms starting with "+". + +diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c +--- openssh-7.2p2-orig/sshconnect2.c 2016-03-09 19:04:48.000000000 +0100 ++++ openssh-7.2p2/sshconnect2.c 2016-04-01 15:39:45.140945902 +0200 +@@ -100,7 +100,7 @@ + } + + static char * +-order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port) ++order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs) + { + char *oavail, *avail, *first, *last, *alg, *hostname, *ret; + size_t maxlen; +@@ -116,7 +116,7 @@ + for (i = 0; i < options.num_system_hostfiles; i++) + load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]); + +- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG); ++ oavail = avail = xstrdup(algs); + maxlen = strlen(avail) + 1; + first = xmalloc(maxlen); + last = xmalloc(maxlen); +@@ -181,18 +181,21 @@ + myproposal[PROPOSAL_MAC_ALGS_CTOS] = + myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; + if (options.hostkeyalgorithms != NULL) { ++ int append = options.hostkeyalgorithms[0] == '+'; + if (kex_assemble_names(KEX_DEFAULT_PK_ALG, + &options.hostkeyalgorithms) != 0) + fatal("%s: kex_assemble_namelist", __func__); + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = +- compat_pkalg_proposal(options.hostkeyalgorithms); ++ compat_pkalg_proposal(append ++ ? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms) ++ : options.hostkeyalgorithms); + } else { + /* Enforce default */ + options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG); + /* Prefer algorithms that we already have keys for */ + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = + compat_pkalg_proposal( +- order_hostkeyalgs(host, hostaddr, port)); ++ order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG)); + } + + if (options.rekey_limit || options.rekey_interval) From 54eed78450d7b6eed53c036a309f97828b1c5f1a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 1 Apr 2016 09:46:48 +0200 Subject: [PATCH 074/109] timewarrior: init at 2016-03-29 --- .../applications/misc/timewarrior/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/timewarrior/default.nix diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix new file mode 100644 index 00000000000..a7afa6562fa --- /dev/null +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, cmake, libuuid, gnutls }: + +stdenv.mkDerivation rec { + name = "timewarrior-${version}"; + version = "2016-03-29"; + + enableParallelBuilding = true; + + src = fetchgit { + url = "https://git.tasktools.org/scm/tm/timew.git"; + rev = "2175849a81ddd03707dca7b4c9d69d8fa11e35f7"; + sha256 = "1c55a5jsm9n2zcyskklhqiclnlb2pz2h7klbzx481nsn62xd6bbg"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "A command-line time tracker"; + homepage = http://tasktools.org/projects/timewarrior.html; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e726acd2da6..3e3795ea176 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13834,6 +13834,8 @@ in timbreid = callPackage ../applications/audio/pd-plugins/timbreid { }; + timewarrior = callPackage ../applications/misc/timewarrior { }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; From 00a794b9600716d692e3f3a61e3ffa53ca3b59c0 Mon Sep 17 00:00:00 2001 From: Jakob Gillich Date: Fri, 1 Apr 2016 17:02:41 +0200 Subject: [PATCH 075/109] gnome-boxes: add qemu to PATH --- pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix index 6f5af374dbc..1edea6b888b 100644 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix @@ -3,7 +3,7 @@ , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev +, libusb, libarchive, acl, libgudev, qemu }: # TODO: ovirt (optional) @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { wrapProgram "$prog" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin" + --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin" done ''; From e0c225857ffef4142f2478e7d3bda42b92446a8e Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 30 Mar 2016 11:15:20 -0500 Subject: [PATCH 076/109] update skarnet.org packages skalibs: 2.4.7.0 -> 2.3.9.0 execline: 2.1.4.0 -> 2.1.4.5 s6: 2.2.1.0 -> 2.2.4.3 s6-rc: 0.0.1.0 -> 0.0.2.1 s6-portable-utils: 2.0.5.2 -> 2.0.5.3 s6-linux-utils: 2.0.2.0 -> 2.0.2.3 s6-dns: 2.0.0.4 -> 2.0.0.7 s6-networking: 2.1.0.1 -> 2.1.0.4 --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++-- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 4 ++-- pkgs/tools/system/s6-rc/default.nix | 4 ++-- pkgs/tools/system/s6/default.nix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e8b3403df40..1b5a990b19d 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.7.0"; + version = "2.3.9.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx"; + sha256 = "1c5ap14f2yr3izz8s1blgp5g4r898kzppay7xrga2j216i51zfpw"; }; dontDisableStatic = true; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index faf5106c67e..c6065dbfca2 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.2.0"; + version = "2.0.2.3"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "0y6dq4wb5v1c6ps6a7jyq08r2pjksrvz6n3dnfa9c91gzm4m1dxb"; + sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 7478b1e33ee..5d8e36ba83c 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.4.0"; + version = "2.1.4.5"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz"; + sha256 = "1k4db9iyskrqf6wbc4dkiqgpn0wb43qc9rf1br7kvy9rrzq3yrj0"; }; dontDisableStatic = true; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 0ca0774989d..b8107f20005 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.5.2"; + version = "2.0.5.3"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm"; + sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 233425dc3a1..653eee56f09 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.4"; + version = "2.0.0.7"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w"; + sha256 = "033pijilkvj3vw94aqrvavr4mqafm7kcc8ql8lc3ma6lqkx4xyak"; }; dontDisableStatic = true; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 5f24592f030..f102405e5bb 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.0.1"; + version = "2.1.0.4"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "0jdjxwqrp7lzdb85sp1gdkm7s478wyl7wqxb3jfxflgh2bgdgvy2"; + sha256 = "1mvsiiv2zk1mbhway5q593xzjzd3lyzdqg85wrpvv791mv0kk8m9"; }; dontDisableStatic = true; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index a3b244d875b..c86cd7a2f52 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.0.1.0"; + version = "0.0.2.1"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q"; + sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f"; }; dontDisableStatic = true; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 5e29c20339c..04f723fabc0 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.1.0"; + version = "2.2.4.3"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9"; + sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8"; }; dontDisableStatic = true; From f2af8874e8fa2265d1847d8fec9cc271de7f2efa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 17:30:34 +0200 Subject: [PATCH 077/109] Revert "initrd: Use modprobe from busybox" This reverts commit 45c218f893d38f94cd62fc256117b9fb1a0d1749. Busybox's modprobe causes numerous "Unknown symbol" errors in the kernel log, even though the modules do appear to load correctly. --- nixos/modules/system/boot/stage-1.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 757d883373a..7b13a305f03 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -67,6 +67,10 @@ let copy_bin_and_libs $BIN done + # Copy modprobe. + copy_bin_and_libs ${pkgs.kmod}/bin/kmod + ln -sf kmod $out/bin/modprobe + # Copy resize2fs if needed. ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) '' # We need mke2fs in the initrd. From fc1f5d2cf1a4febaa7843284554fd7397c8988bc Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 1 Apr 2016 10:20:13 -0500 Subject: [PATCH 078/109] set target for darwin binary compat in skarnet.org packages skalibs: execline: s6-dns: s6-networking: s6-portable-utils: s6-rc: s6: The above software uses the target triplet from `cc -dumpmachine` as a binary compatibility check. However, on darwin, the output includes the darwin version number, which leads to build failures against a binary skalibs package built a different version of darwin than the current system. Explicitly setting target ensures code can be compiled against a skalibs binary built on a different version of darwin. See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph --- pkgs/development/libraries/skalibs/default.nix | 9 ++++++++- pkgs/tools/misc/execline/default.nix | 4 +++- pkgs/tools/misc/s6-portable-utils/default.nix | 3 ++- pkgs/tools/networking/s6-dns/default.nix | 4 +++- pkgs/tools/networking/s6-networking/default.nix | 3 ++- pkgs/tools/system/s6-rc/default.nix | 4 +++- pkgs/tools/system/s6/default.nix | 4 +++- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 1b5a990b19d..349e5582013 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -23,7 +23,14 @@ in stdenv.mkDerivation rec { "--libdir=\${prefix}/lib" "--includedir=\${prefix}/include" "--sysdepdir=\${prefix}/lib/skalibs/sysdeps" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/skalibs/; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 5d8e36ba83c..1726afca0d0 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/execline/; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index b8107f20005..70b36222cca 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -20,7 +20,8 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ]; + ] + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 653eee56f09..8715cb0c45c 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-dns/; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index f102405e5bb..603b2f61551 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { "--with-dynlib=${execline}/lib" "--with-dynlib=${s6}/lib" "--with-dynlib=${s6Dns}/lib" - ]; + ] + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-networking/; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index c86cd7a2f52..35763e8212e 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -29,7 +29,9 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" "--with-dynlib=${s6}/lib" - ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/s6-rc/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 04f723fabc0..e1e30de5799 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -26,7 +26,9 @@ in stdenv.mkDerivation rec { "--with-lib=${execline}/lib" "--with-dynlib=${skalibs}/lib" "--with-dynlib=${execline}/lib" - ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ]; + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ From e5c4d29f7940f319d70fab8466873e2f119aa19a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 1 Apr 2016 19:00:16 +0200 Subject: [PATCH 079/109] ibus-engines.mozc: build protobuf dependency using clang. Fixes #14261. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d70da4ebf41..abdbce9b13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1067,6 +1067,7 @@ in mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { inherit (pythonPackages) gyp; + protobuf = protobuf.override { stdenv = clangStdenv; }; }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { From bbfad5111a3e2cb273e975945ac4fb4cb30a9cd4 Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Wed, 30 Mar 2016 15:07:29 -0700 Subject: [PATCH 080/109] gradle: Fix gradle-2.12 on Linux to find libstdc++.so reference in native library. --- .../tools/build-managers/gradle/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c2b24c69904..96477e55d26 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -4,6 +4,8 @@ rec { gradleGen = {name, src} : stdenv.mkDerivation rec { inherit name src; + buildPhase = ":"; + installPhase = '' mkdir -pv $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/ @@ -15,7 +17,21 @@ rec { --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; - phases = "unpackPhase installPhase"; + fixupPhase = if (!stdenv.isLinux) then ":" else + let arch = if stdenv.is64bit then "amd64" else "i386"; in '' + mkdir patching + pushd patching + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.10.jar + patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so + jar cf native-platform-linux-${arch}-0.10.jar . + mv native-platform-linux-${arch}-0.10.jar $out/lib/gradle/lib/ + popd + + # The scanner doesn't pick up the runtime dependency in the jar. + # Manually add a reference where it will be found. + mkdir $out/nix-support + echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies + ''; buildInputs = [ unzip jdk makeWrapper ]; From 94396b8d915a9a559cbafa306f398d07847b1c55 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 1 Apr 2016 23:59:34 +0200 Subject: [PATCH 081/109] imlib2: 1.4.6 -> 1.4.8 (security) Fixes: * CVE-2014-9762 * CVE-2014-9763 * CVE-2014-9764 --- pkgs/development/libraries/imlib2/default.nix | 8 +-- .../libraries/imlib2/giflib51.patch | 64 ------------------- 2 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/libraries/imlib2/giflib51.patch diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 3ff608a4ac3..8d79fcc50a8 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,21 +1,17 @@ { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { - name = "imlib2-1.4.6"; + name = "imlib2-1.4.8"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; + sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9"; }; buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; - # From - # https://github.com/PhantomX/slackbuilds/blob/master/imlib2/patches/imlib2-giflib51.patch - patches = [ ./giflib51.patch ]; - preConfigure = '' substituteInPlace imlib2-config.in \ --replace "@my_libs@" "" diff --git a/pkgs/development/libraries/imlib2/giflib51.patch b/pkgs/development/libraries/imlib2/giflib51.patch deleted file mode 100644 index 97eaeb0b96e..00000000000 --- a/pkgs/development/libraries/imlib2/giflib51.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c ---- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 -+++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 -@@ -36,7 +36,7 @@ - #endif - if (fd < 0) - return 0; -- gif = DGifOpenFileHandle(fd); -+ gif = DGifOpenFileHandle(fd, NULL); - if (!gif) - { - close(fd); -@@ -60,13 +60,13 @@ - h = gif->Image.Height; - if (!IMAGE_DIMENSIONS_OK(w, h)) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - rows = malloc(h * sizeof(GifRowType *)); - if (!rows) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - for (i = 0; i < h; i++) -@@ -78,7 +78,7 @@ - rows[i] = malloc(w * sizeof(GifPixelType)); - if (!rows[i]) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - if (rows[i]) -@@ -150,7 +150,7 @@ - im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); - if (!im->data) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - free(rows); - return 0; - } -@@ -181,7 +181,7 @@ - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); -@@ -198,7 +198,7 @@ - { - progress(im, 100, 0, last_y, w, h); - } -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); \ No newline at end of file From a32d5d37558d22b2d9ff878336786f315f4681f9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 1 Apr 2016 16:10:06 -0400 Subject: [PATCH 082/109] lammps: init at 2016-02-16 --- .../molecular-dynamics/lammps/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/science/molecular-dynamics/lammps/default.nix diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix new file mode 100644 index 00000000000..35ab5348368 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -0,0 +1,55 @@ +{ stdenv, writeText, fetchurl, + libpng, fftw, + mpiSupport ? false, mpi ? null +}: + +assert mpiSupport -> mpi != null; + +stdenv.mkDerivation rec { + # LAMMPS has weird versioning converted to ISO 8601 format + version = "2016-02-16"; + name = "lammps-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/lammps/lammps-16Feb16.tar.gz"; + sha256 = "1yzfbkxma3xa1288rnn66h4w0smbmjkwq1fx1y60pjiw0prmk105"; + }; + + passthru = { + inherit mpi; + }; + + buildInputs = [ fftw libpng ] + ++ (stdenv.lib.optionals mpiSupport [ mpi ]); + + # Must do manual build due to LAMMPS requiring a seperate build for + # the libraries and executable + builder = writeText "builder.sh" '' + source $stdenv/setup + + tar xzf $src + cd lammps-*/src + make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng + make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng + + mkdir -p $out/bin + cp -v lmp_* $out/bin/lammps + + mkdir -p $out/lib + cp -v liblammps* $out/lib/ + ''; + + meta = { + description = "Classical Molecular Dynamics simulation code"; + longDescription = '' + LAMMPS is a classical molecular dynamics simulation code designed to + run efficiently on parallel computers. It was developed at Sandia + National Laboratories, a US Department of Energy facility, with + funding from the DOE. It is an open-source code, distributed freely + under the terms of the GNU Public License (GPL). + ''; + homepage = "http://lammps.sandia.gov"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d70da4ebf41..2f583ac5cde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15524,6 +15524,15 @@ in ### SCIENCE/MOLECULAR-DYNAMICS + lammps = callPackage ../applications/science/molecular-dynamics/lammps { + fftw = fftw; + }; + + lammps-mpi = appendToName "mpi" (lammps.override { + mpiSupport = true; + mpi = openmpi; + }); + gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = true; mpiEnabled = false; From 456ce674623e186ca026356635b3711c89e227d6 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 21 Mar 2016 19:19:32 -0500 Subject: [PATCH 083/109] Patch erlang-R17 Fix R17 build on OS X, modeling changes after R18, i.e. inherit Carbon, Cocoa. --- pkgs/development/interpreters/erlang/R17.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index e06b2741d35..8096ca555a4 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, Carbon, Cocoa , odbcSupport ? false, unixODBC ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null , javacSupport ? false, openjdk ? null @@ -27,9 +28,10 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) - ++ optional odbcSupport [ unixODBC ] - ++ optional javacSupport [ openjdk ]; + ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ]) + ++ optional odbcSupport unixODBC + ++ optional javacSupport openjdk + ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f583ac5cde..d75963e066a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5231,10 +5231,21 @@ in erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; - erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; - erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; - erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; - erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; + erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; + erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; + }; + erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + javacSupport = true; odbcSupport = true; + }; erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; From 838217332baed839667a99fd79323eff3099c849 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 2 Apr 2016 02:16:31 +0200 Subject: [PATCH 084/109] bandwidth: 1.1b -> 1.2.0 --- pkgs/tools/misc/bandwidth/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index ff5e47336d3..853c619859d 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -10,11 +10,13 @@ let else null; in stdenv.mkDerivation rec { - name = "bandwidth-1.1b"; + name = "bandwidth-${version}"; + version = "1.2.0"; src = fetchurl { - url = "http://zsmith.co/archives/${name}.tar.gz"; - sha256 = "01c3ca0x3rh65j1s2g6cg5xr9fvm0lp2wpmv71vhz55xwqqqmiz8"; + url = "https://mutineer.org/file.php?id=ee10698c6a675ece26f08ddb5e6001323d6305c1&p=bandwidth"; + name = "${name}.tar.gz"; + sha256 = "1jq6a4n77gcx68bkr8l79agsmgv8saw9nv183297gnah1g67nvw6"; }; buildInputs = [ nasm ]; @@ -30,9 +32,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://zsmith.co/bandwidth.html; - description = "and artificial benchmark for identifying weaknesses in the memory subsystem"; + description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ nckx wkennington ]; }; } From 1ae7281cc31cff834414c07d38df3fa12cc43a74 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 2 Apr 2016 13:29:33 +0900 Subject: [PATCH 085/109] albert: 0.8.0 -> 0.8.7.2 --- pkgs/applications/misc/albert/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index b6c0feede6c..5e6931ce78e 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }: +{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }: stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.8.0"; + version = "0.8.7.2"; src = fetchFromGitHub { owner = "manuelschneid3r"; repo = "albert"; rev = "v${version}"; - sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n"; + sha256 = "04k6cawil6kqkmsilq5mpjy8lwgk0g08s0v23d5a83calpq3ljpc"; }; - buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ]; + buildInputs = [ cmake qtbase qtsvg qtx11extras muparser makeQtWrapper ]; fixupPhase = '' wrapQtProgram $out/bin/albert From a5285ae47794fb4e3563b66469f5191f81e5c302 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 2 Apr 2016 15:58:48 +0900 Subject: [PATCH 086/109] fcitx-engines.mozc: build protobuf dependency using clang --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ccef4ab8b5..4d5abc3e084 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1427,6 +1427,7 @@ in mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { inherit (pythonPackages) gyp; + protobuf = protobuf.override { stdenv = clangStdenv; }; }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; From 3d8f7ccc09776fc43c0955e46c341a58f75375a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 09:59:21 +0200 Subject: [PATCH 087/109] pythonPackages.imagesize: init at 0.7.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e39a23b58d1..86e719b9a81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6115,6 +6115,23 @@ in modules // { }; }; + imagesize = buildPythonPackage rec { + name = "imagesize-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/imagesize/${name}.tar.gz"; + sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv"; + }; + + meta = { + description = "Getting image size from png/jpeg/jpeg2000/gif file"; + homepage = https://github.com/shibukawa/imagesize_py; + license = with licenses; [ mit ]; + }; + + }; + imread = buildPythonPackage rec { name = "python-imread-${version}"; version = "0.5.1"; From 15a2c7e667371c474c6faec93fc60c2e2c658745 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 09:59:35 +0200 Subject: [PATCH 088/109] pythonPackages.flake8: 2.5.1 -> 2.5.4 --- 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 86e719b9a81..43270204e2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8935,11 +8935,11 @@ in modules // { flake8 = buildPythonPackage rec { name = "flake8-${version}"; - version = "2.5.1"; + version = "2.5.4"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz"; - sha256 = "448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603"; + sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"; }; buildInputs = with self; [ nose mock ]; From aed9eb04d03013be34986ce159984e2393c7ddf1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 09:59:56 +0200 Subject: [PATCH 089/109] pythonPackages.mccabe: 0.3 -> 0.4.0 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43270204e2e..ec52499e626 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11665,11 +11665,11 @@ in modules // { mccabe = buildPythonPackage (rec { - name = "mccabe-0.3"; + name = "mccabe-0.4.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; - sha256 = "3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c"; + sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws"; }; # See https://github.com/flintwork/mccabe/issues/31 @@ -11681,6 +11681,8 @@ in modules // { }}" test_mccabe.py ''; + buildInputs = with self; [ pytestrunner pytest ]; + meta = { description = "McCabe checker, plugin for flake8"; homepage = "https://github.com/flintwork/mccabe"; From ff286cf2a271525113f317889b5dd42d9a34bc30 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 10:00:14 +0200 Subject: [PATCH 090/109] pythonPackages.pygments: 2.1.1 -> 2.1.3 --- 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 ec52499e626..3bbf74f2044 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16935,12 +16935,12 @@ in modules // { }; pygments = buildPythonPackage rec { - version = "2.1.1"; + version = "2.1.3"; name = "Pygments-${version}"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz"; - sha256 = "06y0b7xh9h3r0wbxl41ccnnnw8dxfz48zj8x09y4rranbfldkxrd"; + sha256 = "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48"; }; propagatedBuildInputs = with self; [ docutils ]; From 99b8baf036b54cac52d3db79fdc13fa36804509f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 10:02:09 +0200 Subject: [PATCH 091/109] pythonPackages.pytz: 2015.7 -> 2016.3 --- 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 3bbf74f2044..32529f30dba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18145,11 +18145,11 @@ in modules // { pytz = buildPythonPackage rec { name = "pytz-${version}"; - version = "2015.7"; + version = "2016.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.gz"; - sha256 = "99266ef30a37e43932deec2b7ca73e83c8dbc3b9ff703ec73eca6b1dae6befea"; + sha256 = "1a3hjclyylc4m1v1dn04b38wm2vl649ijdswpg0d8m8n0lcxlj9l"; }; meta = { From 2e9a1e263ae45fdfcd9c902d9ce2060c6c29bab9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 10:10:16 +0200 Subject: [PATCH 092/109] pythonPackages.sphinx_rtd_theme: 0.1.8 -> 0.1.9 --- 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 32529f30dba..6765bd29004 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20574,11 +20574,11 @@ in modules // { }; sphinx_rtd_theme = buildPythonPackage (rec { - name = "sphinx_rtd_theme-0.1.8"; + name = "sphinx_rtd_theme-0.1.9"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz"; - sha256 = "12mnb7qscr07mllmyyqfpx37778sr21m8663b4fivnk17bnk7xkl"; + sha256 = "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17"; }; postPatch = '' From 65efc9ee2eaec581766ed5b4384307b17ab016cf Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 1 Apr 2016 11:48:18 -0500 Subject: [PATCH 093/109] pythonPackages.sphinx: 1.3.4 -> 1.3.6 --- .../sphinx-fix-tests-with-pygments-2.1.patch | 63 ------------------- pkgs/top-level/python-packages.nix | 15 +++-- 2 files changed, 7 insertions(+), 71 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch deleted file mode 100644 index 5aa4af873cd..00000000000 --- a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001 -From: Takeshi KOMIYA -Date: Mon, 18 Jan 2016 12:38:02 +0900 -Subject: [PATCH] Fix tests are broken with pygments-2.1 - ---- - tests/test_build_html.py | 2 +- - tests/test_intl.py | 10 ++++++---- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/tests/test_build_html.py b/tests/test_build_html.py -index e330761..17ea089 100644 ---- a/tests/test_build_html.py -+++ b/tests/test_build_html.py -@@ -82,7 +82,7 @@ def checker(nodes): - (".//a[@href='_downloads/img1.png']", ''), - (".//pre", u'"quotes"'), - (".//pre", u"'included'"), -- (".//pre/span[@class='s']", u'üöä'), -+ (".//pre/span[@class='s2']", u'üöä'), - (".//div[@class='inc-pyobj1 highlight-text']//pre", - r'^class Foo:\n pass\n\s*$'), - (".//div[@class='inc-pyobj2 highlight-text']//pre", -diff --git a/tests/test_intl.py b/tests/test_intl.py -index 4c665d4..b24ec65 100644 ---- a/tests/test_intl.py -+++ b/tests/test_intl.py -@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should not be translated but be *C* highlighted -- expected_expr = """#include <stdio.h>""" -+ expected_expr = ("""#include """ -+ """<stdio.h>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ - """import sys """ -- """# sys importing""") -+ """# sys importing""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt -@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning): - yield assert_count(expected_expr, result, 1) - - # C code block with lang should be translated and be *C* highlighted -- expected_expr = """#include <STDIO.H>""" -+ expected_expr = ("""#include """ -+ """<STDIO.H>""") - yield assert_count(expected_expr, result, 1) - - # doctest block should not be translated but be highlighted - expected_expr = ( - """>>> """ - """import sys """ -- """# SYS IMPORTING""") -+ """# SYS IMPORTING""") - yield assert_count(expected_expr, result, 1) - - ## raw.txt diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6765bd29004..561c8e05794 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -785,7 +785,7 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn"; - }; + }; buildInputs = with self; [ zope_interface ]; }; @@ -5386,7 +5386,7 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8"; - }; + }; propagatedBuildInputs = with self; [ greenlet ]; @@ -12244,8 +12244,8 @@ in modules // { url = "http://devel.ag-projects.com/repositories/${pname}"; rev = "release-${version}"; sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd"; - }; - + }; + propagatedBuildInputs = with self; [ eventlib application gnutls ]; }; @@ -20534,14 +20534,13 @@ in modules // { sphinx = buildPythonPackage (rec { - name = "Sphinx-1.3.4"; + name = "Sphinx-1.3.6"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; - sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a"; + sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; }; - patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test @@ -20784,7 +20783,7 @@ in modules // { src = pkgs.fetchFromGitHub { repo = "sqlalchemy-imageattach"; - owner = "crosspop"; + owner = "crosspop"; rev = "${version}"; sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0"; }; From 15e5b83174700daf23a711fdfec72719dffcfc63 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 Apr 2016 10:30:44 +0200 Subject: [PATCH 094/109] pythonPackages.sphinx: add note --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 561c8e05794..24279c41088 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20536,6 +20536,9 @@ in modules // { sphinx = buildPythonPackage (rec { name = "Sphinx-1.3.6"; + # 1.4 is broken + # https://github.com/sphinx-doc/sphinx/issues/2394 + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz"; sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; From b40890a0b5952a5ea36fae9cde999c7cce5c6763 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 1 Apr 2016 10:18:42 +0200 Subject: [PATCH 095/109] godep: 2015-10-15 -> 60 --- pkgs/top-level/go-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 5735aac8ad1..2639cc4ac7a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -3832,12 +3832,12 @@ let subPackages = [ "./" ]; }; - godep = buildFromGitHub { - rev = "5598a9815350896a2cdf9f4f1d0a3003ab9677fb"; - version = "2015-10-15"; + godep = buildFromGitHub rec { + version = "60"; + rev = "v${version}"; owner = "tools"; repo = "godep"; - sha256 = "0zc1ah5cvaqa3zw0ska89a40x445vwl1ixz8v42xi3zicx16ibwz"; + sha256 = "1v05185ikfcb3sz9ygcwm9x8la77i27ml1bg9fs6vvahjzyr0rif"; }; color = buildFromGitHub { From d17dbcb0817edc8f79c117a5794284ceeee023eb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 Apr 2016 14:20:13 +0000 Subject: [PATCH 096/109] atom: 1.6.1 -> 1.6.2 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index c6083a89f6c..33813ca3a66 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0g31kw4daysjp4iz1rxlh64hnqxbn561k41n908pxgc7kjwbl2hj"; + sha256 = "1kl2pc0smacn4lgk5wwlaiw03rm8b0763vaisgp843p35zzsbc9n"; name = "${name}.deb"; }; From 83cb6ec399e067b0d111abc39381204d1796758f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 2 Apr 2016 23:11:57 +0800 Subject: [PATCH 097/109] dbus nixos module: add units for systemd user session This patch makes dbus launch with any user session instead of leaving it up to the desktop environment launch script to run it. It has been tested with KDE, which simply uses the running daemon instead of launching its own. This is upstream's recommended way to run dbus. --- nixos/modules/services/system/dbus.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 77427ce9606..ba34eb25169 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -139,6 +139,30 @@ in systemd.services.dbus.restartTriggers = [ configDir ]; + systemd.user = { + services.dbus = { + description = "D-Bus User Message Bus"; + requires = [ "dbus.socket" ]; + # NixOS doesn't support "Also" so we pull it in manually + # As the .service is supposed to come up at the same time as + # the .socket, we use basic.target instead of default.target + wantedBy = [ "basic.target" ]; + serviceConfig = { + ExecStart = "${pkgs.dbus_daemon}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation"; + ExecReload = "${pkgs.dbus_daemon}/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig"; + }; + }; + + sockets.dbus = { + description = "D-Bus User Message Bus Socket"; + socketConfig = { + ListenStream = "%t/bus"; + ExecStartPost = "-${config.systemd.package}/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus"; + }; + wantedBy = [ "sockets.target" ]; + }; + }; + environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; }; From ca3f82e2587c22d69150639b1eb6703dcc4515e2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 2 Apr 2016 23:05:21 +0800 Subject: [PATCH 098/109] pulseaudio nixos module: run as systemd user service instead Most of the desktop environments will spawn pulseaudio, but we can instead simply run it as a systemd service instead. This patch also makes the system wide service run in foreground as recommended by the systemd projects and allows it to use sd_notify to signal ready instead of reading a pid written to a file. It is now also restarted on failure. The user version has been tested with KDE and works fine there. The system-wide version runs, but I haven't actually used it and upstream does not recommend running in this mode. --- nixos/modules/config/pulseaudio.nix | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 179e826ba05..8b4ad796d0d 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -150,6 +150,29 @@ in { target = "pulse/default.pa"; source = cfg.configFile; }; + + systemd.user = { + services.pulseaudio = { + description = "PulseAudio Server"; + # NixOS doesn't support "Also" so we bring it in manually + wantedBy = [ "default.target" ]; + serviceConfig = { + Type = "notify"; + ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no"; + Restart = "on-failure"; + }; + }; + + sockets.pulseaudio = { + description = "PulseAudio Socket"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + Priority = 6; + Backlog = 5; + ListenStream = "%t/pulse/native"; + }; + }; + }; }) (mkIf systemWide { @@ -171,8 +194,9 @@ in { before = [ "sound.target" ]; environment.PULSE_RUNTIME_PATH = stateDir; serviceConfig = { - ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}"; - PIDFile = "${stateDir}/pid"; + Type = "notify"; + ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; + Restart = "on-failure"; }; }; }) From d6998b06744064deb7ed6ea38a062c51638d33bc Mon Sep 17 00:00:00 2001 From: Rastus Vernon Date: Tue, 22 Mar 2016 22:32:03 -0400 Subject: [PATCH 099/109] nixos manual: recommend use of dd for writing the image Unetbootin works by altering the image and placing a boot loader on it. For this reason, it cannot work with UEFI and the installation guides for other distributions (incl. Debian and Fedora) recommend against using it. Since dd writes the image verbatim to the drive, and not just the files, it is not necessary to change the label after using it for UEFI installations. vcunat: tiny changes to the PR. Close #14139. --- nixos/doc/manual/installation/installing-usb.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml index 5def6e8753f..a4b5dafbed1 100644 --- a/nixos/doc/manual/installation/installing-usb.xml +++ b/nixos/doc/manual/installation/installing-usb.xml @@ -7,10 +7,18 @@ Booting from a USB Drive For systems without CD drive, the NixOS live CD can be booted from -a USB stick. For non-UEFI installations, -unetbootin -will work. For UEFI installations, you should mount the ISO, copy its contents -verbatim to your drive, then either: +a USB stick. You can use the dd utility to write the image: +dd if=path-to-image +of=/dev/sdb. Be careful about specifying the +correct drive; you can use the lsblk command to get a list of +block devices. + +The dd utility will write the image verbatim to the drive, +making it the recommended option for both UEFI and non-UEFI installations. For +non-UEFI installations, you can alternatively use +unetbootin. If you +cannot use dd for a UEFI installation, you can also mount the +ISO, copy its contents verbatim to your drive, then either: From cbca7d5707cc409c60cfc517feb679a80c82e5e2 Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Sat, 2 Apr 2016 18:56:32 +0200 Subject: [PATCH 100/109] Clean-up abc package expressions. --- pkgs/development/compilers/abc/default.nix | 38 +++++++++++----------- pkgs/top-level/all-packages.nix | 9 +---- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix index 1a71b808827..1340e8b5c1a 100644 --- a/pkgs/development/compilers/abc/default.nix +++ b/pkgs/development/compilers/abc/default.nix @@ -1,23 +1,6 @@ -{stdenv, fetchurl, javaCup, jre, apacheAnt, patches} : - -let { - body = - stdenv.mkDerivation { - name = "abc-1.2.0"; - builder = ./builder.sh; - - src = fetchurl { - url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz; - md5 = "aef9e8eac860f904f2a841e18770dc47"; - }; - - inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches; - - meta = { - description = "The AspectBench Compiler for AspectJ"; - }; - }; +{stdenv, fetchurl, javaCup, jre, apacheAnt}: +let soot = import ./soot { inherit stdenv fetchurl apacheAnt polyglot jasmin; @@ -76,4 +59,21 @@ let { md5 = "9810ad8762101ea691a895f0a6b7a5c3"; }; }; +in + +stdenv.mkDerivation { + name = "abc-1.2.0"; + builder = ./builder.sh; + + src = fetchurl { + url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz; + md5 = "aef9e8eac860f904f2a841e18770dc47"; + }; + + inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd; + patches = []; + + meta = { + description = "The AspectBench Compiler for AspectJ"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7df281904f2..ae800662444 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3924,14 +3924,7 @@ in ### DEVELOPMENT / COMPILERS - abc = - abcPatchable []; - - abcPatchable = patches : - callPackage ../development/compilers/abc/default.nix { - inherit patches; - javaCup = callPackage ../development/libraries/java/cup { }; - }; + abc = callPackage ../development/compilers/abc/default.nix { }; aldor = callPackage ../development/compilers/aldor { }; From b573693c03b104d9ab0ebef9ffb76e6da49072d1 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 2 Apr 2016 16:37:54 -0400 Subject: [PATCH 101/109] crashplan: 4.6.0 -. 4.6.0-r2 --- pkgs/applications/backup/crashplan/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index e89de9b4c6a..b9566e9c535 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: -let version = "4.6.0"; +let + version = "4.6.0"; + rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { - name = "crashplan-${version}"; + name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "0h9zk6i1pdvl101c8l4v4x6i7q4wkmkqp2dkm0lq7ha96lrvac47"; + sha256 = "13rmmdj048r8k4v7ig4i6pnvwyzc1vasfgksf070bx6ksklgbq47"; }; srcs = [ crashPlanArchive ]; From 213a8a1e9658778101195e783cdfb91eb81036b3 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 2 Apr 2016 16:40:16 -0400 Subject: [PATCH 102/109] crashplan: fix vardir file existence check --- nixos/modules/services/backup/crashplan.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index 46d4c5192d9..94aa3b17b66 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -50,7 +50,7 @@ with lib; ensureDir ${crashplan.vardir}/log 777 cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do - if [ -e $x ]; then + if [ -e ${crashplan.vardir}/$x ]; then true; else ln -s ${crashplan}/$x ${crashplan.vardir}/$x; From b11d8590d0cb3e2871bd12d0c9cb9c87155e4b49 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Fri, 1 Apr 2016 19:25:54 -0500 Subject: [PATCH 103/109] rebar3-nix-bootstrap: correct homepage URL s/erl-nix/erlang-nix/ --- pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix index 39ec59e849f..ed38d573abf 100644 --- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix +++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Shim command to help bootstrap a rebar3 project on Nix"; license = stdenv.lib.licenses.asl20; - homepage = "https://github.com/erl-nix/rebar3-nix-bootstrap"; + homepage = "https://github.com/erlang-nix/rebar3-nix-bootstrap"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; } From e549aad2f27b310e50cf592410e6d327b228ad58 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sat, 2 Apr 2016 15:46:58 -0500 Subject: [PATCH 104/109] elixir: 1.2.3 -> 1.2.4 --- pkgs/development/interpreters/elixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 3977b32bad7..a9854c7c493 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8"; + sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817"; }; buildInputs = [ erlang rebar makeWrapper ]; From c8865465cceaa215386c281af165f5f30f6bb8bb Mon Sep 17 00:00:00 2001 From: Anders Papitto Date: Sun, 27 Mar 2016 23:01:08 -0700 Subject: [PATCH 105/109] distcc: add libiberty as a buildInput --- pkgs/development/tools/misc/distcc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index cf9d7a01920..ed3ad45c463 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand, gcc, autoconf, automake, which, procps +{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand +, gcc, autoconf, automake, which, procps, libiberty_static , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false }: @@ -15,7 +16,7 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps]; + buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) From 1dae112bb0b9d34e0e989ebd3ddd00c298233a24 Mon Sep 17 00:00:00 2001 From: James Earl Douglas Date: Sat, 2 Apr 2016 15:26:10 -0600 Subject: [PATCH 106/109] irssi: 0.8.17 -> 0.8.19 This enables [SASL authentication][1], which was added in 0.8.18. Tested via `nix-env -f /path/to/nixpkgs -i irssi`, followed by running `irssi`. [1]: https://wiki.archlinux.org/index.php/Irssi#Authenticating_with_SASL --- pkgs/applications/networking/irc/irssi/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 8c26bf8d10e..d6b57b6cb0d 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - name = "irssi-0.8.17"; + + version = "0.8.19"; + name = "irssi-${version}"; src = fetchurl { - urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2" - "http://irssi.org/files/${name}.tar.bz2" - ]; - sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw"; + urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; + sha256 = "0ny8dry1b8siyc5glaxcwzng0d2mxnwxk74v64f8xplqhrvlnkzy"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; From 6a563a424077c7ed07f22ded940cce9ff9a27a2e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 2 Apr 2016 21:48:07 -0500 Subject: [PATCH 107/109] perlPackages.W3CLinkChecker: Add HTTPS support --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5568d45e7cf..3a257dab37c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13331,7 +13331,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ LWP ConfigGeneral NetIP TermReadKey Perl5lib - CryptSSLeay CSSDOM ]; + CryptSSLeay CSSDOM LWPProtocolHttps ]; meta = { homepage = http://validator.w3.org/checklink; description = "A tool to check links and anchors in Web pages or full Web sites"; From 977529f35a13f712caa04eb5dfe938d7522fc633 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 3 Apr 2016 11:29:17 +0200 Subject: [PATCH 108/109] calibre: 2.53.0 -> 2.54.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e66f260af96..bae4c83fb2b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.53.0"; + version = "2.54.0"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0rvfh39a6j5r398p6xzrbzvhxapm1iyhc0d46xk5fwa52kscadhz"; + sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79"; }; inherit python; From b8755a4cdf8dd426ac642c006825d302dfe5f4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 3 Apr 2016 12:07:35 +0200 Subject: [PATCH 109/109] kodiPlugins.svtplay: 4.0.23 -> 4.0.24 --- pkgs/applications/video/kodi/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 0ad638dd705..bb826011e25 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -142,14 +142,14 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.23"; + version = "4.0.24"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "80b6d241adb046c105ceb63d637da3f7f3684f1a"; - sha256 = "1236kanzl4dra78whpwic1r5iifaj3f27qycia9jr54z01id083s"; + rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45"; + sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56"; }; meta = with stdenv.lib; {