From e5b7975fe3af0b62c6ac976895de510ce1673a53 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:28:27 +0900 Subject: [PATCH 001/273] acme module: certs option loaOf -> attrsOf --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 12736e57b4a..3e923940692 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -129,7 +129,7 @@ in certs = mkOption { default = { }; - type = with types; loaOf (submodule certOpts); + type = with types; attrsOf (submodule certOpts); description = '' Attribute set of certificates to get signed and renewed. ''; From 418901a906e57bf558f80ae7b52c19e0f1c39777 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:29:58 +0900 Subject: [PATCH 002/273] logcheck module: ignore, ignoreCron option loaOf -> attrsOf --- nixos/modules/services/logging/logcheck.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 27ed5374f56..2cb0a852377 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -184,7 +184,7 @@ in description = '' This option defines extra ignore rules. ''; - type = with types; loaOf (submodule ignoreOptions); + type = with types; attrsOf (submodule ignoreOptions); }; ignoreCron = mkOption { @@ -192,7 +192,7 @@ in description = '' This option defines extra ignore rules for cronjobs. ''; - type = with types; loaOf (submodule ignoreCronOptions); + type = with types; attrsOf (submodule ignoreCronOptions); }; extraGroups = mkOption { From 2a9de9162f4281428ec64dcd9c2d06e1463a5b7e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:31:05 +0900 Subject: [PATCH 003/273] tahoe module: introducers, nodes option loaOf -> attrsOf --- nixos/modules/services/network-filesystems/tahoe.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f91827c379d..94668c9bb69 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -8,7 +8,7 @@ in options.services.tahoe = { introducers = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; @@ -49,7 +49,7 @@ in }; nodes = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; From b4d1d37b22c056d89456ff8ef3697b3bd6aa9225 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:32:02 +0900 Subject: [PATCH 004/273] tinc module: networks, hosts option loaOf -> attrsOf --- nixos/modules/services/networking/tinc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f8e68fda7fc..6cb40185274 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -18,7 +18,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { extraConfig = mkOption { @@ -59,7 +59,7 @@ in hosts = mkOption { default = { }; - type = types.loaOf types.lines; + type = types.attrsOf types.lines; description = '' The name of the host in the network as well as the configuration for that host. This name should only contain alphanumerics and underscores. From 57c4d6f380ad3cc4f07b598dd838a09a4f38c4d2 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:33:06 +0900 Subject: [PATCH 005/273] znc module: networks option loaOf -> attrsOf --- nixos/modules/services/networking/znc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 76ba78ff366..0d41e3ea92c 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -208,7 +208,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule networkOpts); + type = with types; attrsOf (submodule networkOpts); description = '' IRC networks to connect the user to. ''; From 821e8d46810e44215851696f686bd3ad9b360b8a Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 16 Nov 2016 16:34:00 +0900 Subject: [PATCH 006/273] zope2 module: instance option loaOf -> attrsOf --- nixos/modules/services/web-servers/zope2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 8a453e01557..496e34db4a9 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -74,7 +74,7 @@ in services.zope2.instances = mkOption { default = {}; - type = with types; loaOf (submodule zope2Opts); + type = with types; attrsOf (submodule zope2Opts); example = literalExample '' { plone01 = { From 094ac2d9b1d3c6895a9c9e0e4401919c475f4f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 23 Jan 2017 14:25:19 +0100 Subject: [PATCH 007/273] python-protobuf: enable python3 and enable py3 tests - moved expression out of python-packages - no significant changes how package is built except the supported python versions --- pkgs/development/python-modules/protobuf.nix | 46 ++++++++++++ pkgs/top-level/python-packages.nix | 76 ++++++-------------- 2 files changed, 67 insertions(+), 55 deletions(-) create mode 100644 pkgs/development/python-modules/protobuf.nix diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix new file mode 100644 index 00000000000..8b9d1ddb03c --- /dev/null +++ b/pkgs/development/python-modules/protobuf.nix @@ -0,0 +1,46 @@ +{ stdenv, python, buildPythonPackage +, protobuf, google_apputils +, disabled, doCheck ? true }: + +with stdenv.lib; + +buildPythonPackage rec { + inherit (protobuf) name src; + inherit disabled doCheck; + + propagatedBuildInputs = [ protobuf google_apputils ]; + buildInputs = [ google_apputils ]; + + prePatch = '' + while [ ! -d python ]; do + cd * + done + cd python + ''; + + preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") '' + export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp + export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 + ''; + + preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") '' + ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation + ''; + + installFlags = optional (versionAtLeast protobuf.version "2.6.0") + "--install-option='--cpp_implementation'"; + + # the _message.so isn't installed, so we'll do that manually. + # if someone can figure out a less hacky way to get the _message.so to + # install, please do replace this. + postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") '' + cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext + ''; + + meta = { + description = "Protocol Buffers are Google's data interchange format"; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.protobuf = protobuf; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03977936121..827e85c9419 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9044,6 +9044,8 @@ in { }; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; + # IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in) + doCheck = !isPy3k; meta = { homepage = "https://github.com/tgalal/python-axolotl"; @@ -19289,63 +19291,27 @@ in { }); protobuf = self.protobuf2_6; - protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; }; - protobuf3_0_0b2 = (self.protobufBuild pkgs.protobuf3_0_0b2).override { doCheck = false; }; - protobuf2_6 = self.protobufBuild pkgs.protobuf2_6; - protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; - protobufBuild = protobuf: buildPythonPackage rec { - inherit (protobuf) name src; - disabled = isPy3k || isPyPy; - - propagatedBuildInputs = with self; [ protobuf google_apputils ]; - - prePatch = '' - while [ ! -d python ]; do - cd * - done - cd python - ''; - - preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") '' - export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp - export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2 - ''; - - preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation - ''; - - checkPhase = '' - runHook preCheck - '' + (if versionAtLeast protobuf.version "2.6.0" then '' - ${python.executable} setup.py google_test --cpp_implementation - echo "sanity checking the C extension . . ." - echo "import google.protobuf.descriptor" | ${python.executable} - '' else '' - ${python.executable} setup.py test - '') + '' - runHook postCheck - ''; - - installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'"; - - # the _message.so isn't installed, so we'll do that manually. - # if someone can figure out a less hacky way to get the _message.so to - # install, please do replace this. - postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") '' - cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext - ''; - - doCheck = true; - - meta = { - description = "Protocol Buffers are Google's data interchange format"; - homepage = http://code.google.com/p/protobuf/; - }; - - passthru.protobuf = protobuf; + # only required by tensorflow + protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix { + disabled = isPyPy || isPy3k; + doCheck = isPy3k; + protobuf = pkgs.protobuf3_0_0b2; }; + protobuf3_0 = callPackage ../development/python-modules/protobuf.nix { + disabled = isPyPy; + doCheck = isPy3k; + protobuf = pkgs.protobuf3_0; + }; + protobuf2_6 = callPackage ../development/python-modules/protobuf.nix { + disabled = isPy3k || isPyPy; + doCheck = false; + protobuf = pkgs.protobuf2_6; + }; + protobuf2_5 = callPackage ../development/python-modules/protobuf.nix { + disabled = isPy3k || isPyPy; + protobuf = pkgs.protobuf2_5; + }; psutil = buildPythonPackage rec { name = "psutil-${version}"; From 02cc6797343958c957e476ace2edaf2c6566008a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Jan 2017 22:41:59 +0100 Subject: [PATCH 008/273] libcddb: fix darwin build --- pkgs/development/libraries/libcddb/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 8645fa37c33..6a164ef9055 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,17 +1,19 @@ -{fetchurl, stdenv}: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { name = "libcddb-1.3.2"; - + src = fetchurl { url = "mirror://sourceforge/libcddb/${name}.tar.bz2"; sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; - meta = { + buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + + meta = with stdenv.lib; { description = "C library to access data on a CDDB server (freedb.org)"; - license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; }; } From e20fc5059d518d9b951d700f6ad7d37585cf1f83 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Jan 2017 22:45:08 +0100 Subject: [PATCH 009/273] libcdio: fix darwin build --- pkgs/development/libraries/libcdio/0.82.nix | 13 +++++++------ pkgs/development/libraries/libcdio/default.nix | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix index 9cfc5f307ed..632ee916135 100644 --- a/pkgs/development/libraries/libcdio/0.82.nix +++ b/pkgs/development/libraries/libcdio/0.82.nix @@ -1,19 +1,20 @@ -{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: +{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: stdenv.mkDerivation rec { name = "libcdio-0.82"; - + src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ]; + buildInputs = [ libcddb pkgconfig ncurses help2man ] + ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. #doCheck = true; - meta = { + meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index f0cff815c44..74c95704bbf 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: +{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }: stdenv.mkDerivation rec { name = "libcdio-0.93"; - + src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.bz2"; sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq"; }; - buildInputs = [ libcddb pkgconfig ncurses help2man ]; + buildInputs = [ libcddb pkgconfig ncurses help2man ] + ++ stdenv.lib.optional stdenv.isDarwin libiconv; # Disabled because one test (check_paranoia.sh) fails. #doCheck = true; - meta = { + meta = with stdenv.lib; { description = "A library for OS-independent CD-ROM and CD image access"; longDescription = '' GNU libcdio is a library for OS-independent CD-ROM and @@ -21,8 +22,8 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - license = stdenv.lib.licenses.gpl2Plus; homepage = http://www.gnu.org/software/libcdio/; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; }; } From fb954784dd617cf73a7db2d77f25ac354b920061 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Jan 2017 22:46:17 +0100 Subject: [PATCH 010/273] libcue: enable darwin build --- pkgs/development/libraries/libcue/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index a1639397b5e..22bda89c603 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, cmake, bison, flex }: + stdenv.mkDerivation rec { name = "libcue-${version}"; version = "2.1.0"; @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake bison flex ]; - meta = { + meta = with stdenv.lib; { description = "CUE Sheet Parser Library"; longDescription = '' libcue is intended to parse a so called cue sheet from a char string or @@ -20,8 +21,8 @@ stdenv.mkDerivation rec { available. ''; homepage = http://sourceforge.net/projects/libcue/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.linux ++ platforms.darwin; }; } From 1e324cdd5791acf5bff5cabfa93ac37884049531 Mon Sep 17 00:00:00 2001 From: Michael Phillips Date: Fri, 25 Mar 2016 10:40:01 -0500 Subject: [PATCH 011/273] cmus: add gcc build dep for darwin (cherry picked from commit 597a3898fca1a2dd5875bc6bcf37b6e4e4d37279) --- pkgs/applications/audio/cmus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 8e4a08bcacc..b71ffce61e2 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, pkgconfig +{ stdenv, fetchFromGitHub, ncurses, pkgconfig, gcc , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts; + buildInputs = [ ncurses pkgconfig gcc ] ++ concatMap (a: a.deps) opts; meta = { description = "Small, fast and powerful console music player for Linux and *BSD"; From 5afd6a9bea3fe54c642c42f3a20f7b02bf6f0a77 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 24 Jan 2017 22:39:01 +0100 Subject: [PATCH 012/273] cmus: fix on darwin (using gcc) --- pkgs/applications/audio/cmus/default.nix | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b71ffce61e2..c0fb900e3ee 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, ncurses, pkgconfig, gcc +{ stdenv, fetchFromGitHub, ncurses, pkgconfig +, gcc, libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -18,7 +19,7 @@ , cddbSupport ? true, libcddb ? null , cdioSupport ? true, libcdio ? null , cueSupport ? true, libcue ? null -, discidSupport ? true, libdiscid ? null +, discidSupport ? (!stdenv.isDarwin), libdiscid ? null , ffmpegSupport ? true, ffmpeg ? null , flacSupport ? true, flac ? null , madSupport ? true, libmad ? null @@ -109,13 +110,16 @@ stdenv.mkDerivation rec { "CONFIG_WAV=y" ] ++ concatMap (a: a.flags) opts); - buildInputs = [ ncurses pkgconfig gcc ] ++ concatMap (a: a.deps) opts; + buildInputs = [ ncurses pkgconfig ] + ++ stdenv.lib.optional stdenv.cc.isClang gcc + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] + ++ concatMap (a: a.deps) opts; - meta = { + meta = with stdenv.lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = https://cmus.github.io/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.oxij ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [ maintainers.oxij ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d924df6aea..7fb6e4fef6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12690,6 +12690,7 @@ with pkgs; cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { + inherit (darwin.apple_sdk.frameworks) CoreAudio; libjack = libjack2; libcdio = libcdio082; ffmpeg = ffmpeg_2; From ad6ac35ae45ac0dadccbf3ad826e58e2a7189d2a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Jan 2017 21:33:55 +0100 Subject: [PATCH 013/273] python-pycdio: fix darwin build --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 061dcd68f9b..d285a7febca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19883,9 +19883,8 @@ in { patchShebangs . ''; - buildInputs = [ - self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio - ]; + buildInputs = [ self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio ] + ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv; patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ]; From 50e9921179066d00de84c421332cfd3de2f52d28 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Jan 2017 21:48:43 +0100 Subject: [PATCH 014/273] cmus: use clang's gcc compatibility for a clang based stdenv --- pkgs/applications/audio/cmus/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index c0fb900e3ee..bb2deb71ba2 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, ncurses, pkgconfig -, gcc, libiconv, CoreAudio +{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig +, libiconv, CoreAudio , alsaSupport ? stdenv.isLinux, alsaLib ? null # simple fallback for everyone else @@ -90,6 +90,13 @@ let #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) ]; + clangGCC = runCommand "clang-gcc" {} '' + #! ${stdenv.shell} + mkdir -p $out/bin + ln -s ${stdenv.cc}/bin/clang $out/bin/gcc + ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++ + ''; + in stdenv.mkDerivation rec { @@ -111,7 +118,7 @@ stdenv.mkDerivation rec { ] ++ concatMap (a: a.flags) opts); buildInputs = [ ncurses pkgconfig ] - ++ stdenv.lib.optional stdenv.cc.isClang gcc + ++ stdenv.lib.optional stdenv.cc.isClang clangGCC ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] ++ concatMap (a: a.deps) opts; From 7c27554033b95f3a5bb9796fe457bbfbdcfcb85b Mon Sep 17 00:00:00 2001 From: laMudri Date: Sat, 4 Feb 2017 11:53:11 +0000 Subject: [PATCH 015/273] xfce: make xfwm optional --- nixos/modules/services/x11/desktop-managers/xfce.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 530468be5f9..37523feb414 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -41,6 +41,12 @@ in Shell commands executed just before XFCE is started. ''; }; + + enableXfwm = mkOption { + type = types.bool; + default = true; + description = "Enable the XFWM (default) window manager."; + }; }; }; @@ -87,7 +93,6 @@ in pkgs.xfce.xfce4volumed pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfconf - pkgs.xfce.xfwm4 # This supplies some "abstract" icons such as # "utilities-terminal" and "accessories-text-editor". pkgs.gnome3.defaultIconTheme @@ -99,6 +104,7 @@ in pkgs.xfce.xfce4_appfinder pkgs.xfce.tumbler # found via dbus ] + ++ optional cfg.enableXfwm pkgs.xfce.xfwm4 ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) From 0f905b0dc8553b21d9da5333eb1d6c8be4e2ab9d Mon Sep 17 00:00:00 2001 From: James Alexander Feldman-Crough Date: Sun, 5 Feb 2017 10:57:02 -0800 Subject: [PATCH 016/273] polybar: init at 3.0.4 Polybar is a status bar in the vein of xmobar or i3bar. --- lib/maintainers.nix | 1 + pkgs/applications/misc/polybar/default.nix | 61 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/applications/misc/polybar/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cd9ced5832f..aca3d963c1c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -20,6 +20,7 @@ adolfogc = "Adolfo E. García Castro "; aespinosa = "Allan Espinosa "; aflatter = "Alexander Flatter "; + afldcr = "James Alexander Feldman-Crough "; aforemny = "Alexander Foremny "; afranchuk = "Alex Franchuk "; aherrmann = "Andreas Herrmann "; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix new file mode 100644 index 00000000000..ef08ad2f1b4 --- /dev/null +++ b/pkgs/applications/misc/polybar/default.nix @@ -0,0 +1,61 @@ +{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil +, xcbutilwm, xcbutilxrm + +# optional packages-- override the variables ending in 'Support' to enable or +# disable modules +, alsaSupport ? true, alsaLib ? null +, iwSupport ? true, wirelesstools ? null +, githubSupport ? false, curl ? null +, mpdSupport ? false, mpd_clientlib ? null +, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null +}: + +assert alsaSupport -> alsaLib != null; +assert githubSupport -> curl != null; +assert iwSupport -> wirelesstools != null; +assert mpdSupport -> mpd_clientlib != null; + +assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; +assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; + +stdenv.mkDerivation rec { + name = "polybar-${version}"; + version = "3.0.4"; + src = fetchgit { + url = "https://github.com/jaagr/polybar"; + rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af"; + sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas"; + fetchSubmodules = true; + }; + + meta = with stdenv.lib; { + description = "A fast and easy-to-use tool for creatin status bars."; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. + ''; + license = licenses.mit; + maintainers = [ maintainers.afldcr ]; + platforms = platforms.unix; + }; + + buildInputs = [ + cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil + xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + + (if alsaSupport then alsaLib else null) + (if githubSupport then curl else null) + (if iwSupport then wirelesstools else null) + (if mpdSupport then mpd_clientlib else null) + + (if i3Support || i3GapsSupport then jsoncpp else null) + (if i3Support then i3 else null) + (if i3GapsSupport then i3-gaps else null) + ]; + + nativeBuildInputs = [ + cmake pkgconfig + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef889ed13b..2498ff7d5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14293,6 +14293,8 @@ with pkgs; stdenv = stdenv_32bit; }; + polybar = callPackage ../applications/misc/polybar { }; + scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; shotcut = qt5.callPackage ../applications/video/shotcut { }; From 86ff21af165c23bebf877623e0db65713f93a708 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 8 Feb 2017 14:48:26 +0100 Subject: [PATCH 017/273] paperwork: fix locale path --- pkgs/applications/office/paperwork/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 2c55be55b08..c2481241818 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { }' src/paperwork/frontend/util/__init__.py sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ { - c LOCALE_PATHS = ["'"$out/share/locale"'"] + c LOCALE_PATHS = ["'"$out/share"'"] }' src/paperwork/paperwork.py sed -i -e 's/"icon"/"icon-name"/g' \ From 781022de46fd821ee0683d7e81de1a16f48e9b82 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:47:07 +0300 Subject: [PATCH 018/273] chromium.mkDerivation: use ninja from nativeBuildInputs Also move Python packages there. --- pkgs/applications/networking/browsers/chromium/common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ea66703f166..2acf5627756 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -88,6 +88,11 @@ let nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; + nativeBuildInputs = [ + ninja which perl pkgconfig python + python2Packages.ply python2Packages.jinja2 + ]; + buildInputs = defaultDependencies ++ [ nspr nss systemd utillinux alsaLib @@ -95,7 +100,6 @@ let glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - python2Packages.ply python2Packages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -182,7 +186,7 @@ let buildPhase = let buildCommand = target: '' - "${ninja}/bin/ninja" -C "${buildPath}" \ + ninja -C "${buildPath}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' From 3effe0b9b5458387798961dc510f626bf6e39b0e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:49:02 +0300 Subject: [PATCH 019/273] chromium: export version --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d014999a667..fdc22a5be00 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation { cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; - inherit (chromium.browser) meta packageName; + inherit (chromium.browser) meta packageName version; passthru = { inherit (chromium) upstream-info browser; From b2eb9f4a9609ee319a6e136a1aac3c035c0c079c Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:48:05 +0300 Subject: [PATCH 020/273] chromium.mkDerivation: run {pre,post}Configure This allows us to add custom steps. --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2acf5627756..bc581445450 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -177,11 +177,15 @@ let } // (extraAttrs.gnFlags or {})); configurePhase = '' + runHook preConfigure + # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} gn gen --args=${escapeShellArg gnFlags} out/Release + + runHook postConfigure ''; buildPhase = let From 003fa8fed5480d3e22d518aeeba1d62809809279 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:40:39 +0300 Subject: [PATCH 021/273] gn: remove Chromium depends on bundled versioon of gn. It's also chromium-specific build tool, so it's not feasible to package. --- .../networking/browsers/chromium/common.nix | 10 ++- .../tools/build-managers/gn/default.nix | 80 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 6 insertions(+), 86 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/gn/default.nix diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bc581445450..a99a5059d18 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, gn, ninja, which +{ stdenv, ninja, which # default dependencies , bzip2, flac, speex, libopus @@ -86,10 +86,8 @@ let src = upstream-info.main; - nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; - nativeBuildInputs = [ - ninja which perl pkgconfig python + ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 ]; @@ -179,6 +177,10 @@ let configurePhase = '' runHook preConfigure + # Build gn + python tools/gn/bootstrap/bootstrap.py -v -s --no-clean + PATH="$PWD/out/Release:$PATH" + # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix deleted file mode 100644 index 6fdd250913c..00000000000 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }: - -let - date = "20161008"; - - sourceTree = { - "src/base" = { - rev = "e71a514e60b085cc92bf6ef951ec329f52c79f9f"; - sha256 = "0zycbssmd2za0zij8czcs1fr66fi12f1g5ysc8fzkf8khbs5h6a9"; - }; - "src/build" = { - rev = "17093d45bf738e9ae4b6294492860ee65218a657"; - sha256 = "0i9py78c3f46sc789qvdhmgjgyrghysbqjgr67iypwphw52jv2dz"; - }; - "src/tools/gn" = { - rev = "9ff32cf3f1f4ad0212ac674b6303e7aa68f44f3f"; - sha256 = "14jr45k5fgcqk9d18fd77sijlqavvnv0knndh74zyb0b60464hz1"; - }; - "testing/gtest" = { - rev = "585ec31ea716f08233a815e680fc0d4699843938"; - sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; - }; - }; - - mkDepend = path: attrs: fetchgit { - url = "https://chromium.googlesource.com/chromium/${path}"; - inherit (attrs) rev sha256; - }; - -in stdenv.mkDerivation rec { - name = "gn-${version}"; - version = "0.0.0.${date}"; - - unpackPhase = '' - ${with stdenv.lib; concatStrings (mapAttrsToList (path: sha256: '' - dest=source/${escapeShellArg (removePrefix "src/" path)} - mkdir -p "$(dirname "$dest")" - cp --no-preserve=all -rT ${escapeShellArg (mkDepend path sha256)} "$dest" - '') sourceTree)} - ( mkdir -p source/third_party - cd source/third_party - unpackFile ${xdg-user-dirs.src} - mv * xdg_user - ) - ''; - - sourceRoot = "source"; - - postPatch = '' - # GN's bootstrap script relies on shebangs (which are relying on FHS paths), - # except when on Windows. So instead of patchShebang-ing it, let's just - # force the same behaviour as on Windows. - sed -i -e '/^def *check_call/,/^[^ ]/ { - s/is_win/True/ - }' tools/gn/bootstrap/bootstrap.py - - # Patch out Chromium-bundled libevent and xdg_user_dirs - sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ - tools/gn/bootstrap/bootstrap.py - ''; - - NIX_LDFLAGS = "-levent"; - - nativeBuildInputs = [ python2 ninja ]; - buildInputs = [ libevent ]; - - buildPhase = '' - python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean - ''; - - installPhase = '' - install -vD out_bootstrap/gn "$out/bin/gn" - ''; - - meta = { - description = "A meta-build system that generates NinjaBuild files"; - homepage = "https://chromium.googlesource.com/chromium/src/tools/gn/"; - license = stdenv.lib.licenses.bsd3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e20f795fc..c0295234ffd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6372,8 +6372,6 @@ with pkgs; global = callPackage ../development/tools/misc/global { }; - gn = callPackage ../development/tools/build-managers/gn { }; - gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {}; gnum4 = callPackage ../development/tools/misc/gnum4 { }; From c5b07975d8926a65b433679e00f80e1db8f59fb3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:42:06 +0300 Subject: [PATCH 022/273] chromium.mkDerivation: update flags * Remove libselinux flag: it's no longer supported; * Use new gold flags. --- pkgs/applications/networking/browsers/chromium/common.nix | 7 ++----- pkgs/applications/networking/browsers/chromium/default.nix | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a99a5059d18..8b852d4b6d3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,7 +20,6 @@ , libexif ? null # only needed for Chromium before version 51 # package customization -, enableSELinux ? false, libselinux ? null , enableNaCl ? false , enableHotwording ? false , enableWideVine ? false @@ -100,7 +99,6 @@ let pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optional enableSELinux libselinux ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "56.0.0.0") gtk3; @@ -139,8 +137,8 @@ let gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; - linux_use_bundled_gold = false; - linux_use_gold_flags = true; + use_gold = true; + gold_path = "${stdenv.cc}/bin"; is_debug = false; proprietary_codecs = false; @@ -151,7 +149,6 @@ let enable_nacl = enableNaCl; enable_hotwording = enableHotwording; enable_widevine = enableWideVine; - selinux = enableSELinux; use_cups = cupsSupport; } // { treat_warnings_as_errors = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fdc22a5be00..fdda4f1122e 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,7 +2,6 @@ # package customization , channel ? "stable" -, enableSELinux ? false , enableNaCl ? false , enableHotwording ? false , gnomeSupport ? false, gnome ? null @@ -22,7 +21,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome + inherit enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport enableWideVine; }; From 748e7b287b6a086f289dae9a2acf890168673b2d Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 8 Feb 2017 22:42:42 +0300 Subject: [PATCH 023/273] chromium: update dev and beta chromiumBeta: 56.0.2924.76 -> 57.0.2987.21 chromiumDev: 57.0.2987.19 -> 58.0.3000.4 --- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8b852d4b6d3..dac821a4898 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -104,9 +104,9 @@ let ++ optional (versionAtLeast version "56.0.0.0") gtk3; patches = [ - ./patches/glibc-2.24.patch ./patches/nix_plugin_paths_52.patch - ] ++ optional enableWideVine ./patches/widevine.patch; + ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch + ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 899f66cb2b0..32a3713682e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g"; - sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw"; - version = "56.0.2924.76"; + sha256 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3"; + sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk"; + version = "57.0.2987.21"; }; dev = { - sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh"; - sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp"; - version = "57.0.2987.19"; + sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf"; + sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh"; + version = "58.0.3000.4"; }; stable = { sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s"; From a82b3dd8e22e1d4555bd4f5487192e9d7cd58be6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 Feb 2017 15:22:49 -0600 Subject: [PATCH 024/273] creduce: init at 2.6.0 Also includes perl dependency 'GetOpt::Tabular'. --- .../tools/misc/creduce/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++ pkgs/top-level/perl-packages.nix | 8 +++ 3 files changed, 76 insertions(+) create mode 100644 pkgs/development/tools/misc/creduce/default.nix diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix new file mode 100644 index 00000000000..a9296adf334 --- /dev/null +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, cmake +, llvm, clang-unwrapped +, flex +, zlib +, perl, ExporterLite, FileWhich, GetoptTabular, RegexpCommon, TermReadKey +, utillinux +}: + +assert stdenv.isLinux -> (utillinux != null); + +stdenv.mkDerivation rec { + name = "creduce-${version}"; + version = "2.6.0"; + + src = fetchurl { + url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; + sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"; + }; + + buildInputs = [ + # Ensure stdenv's CC is on PATH before clang-unwrapped + stdenv.cc + # Actual deps: + cmake + llvm clang-unwrapped + flex zlib + ]; + + # On Linux, c-reduce's preferred way to reason about + # the cpu architecture/topology is to use 'lscpu', + # so let's make sure it knows where to find it: + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + substituteInPlace creduce/creduce_utils.pm --replace \ + lscpu ${utillinux}/bin/lscpu + ''; + + perlDeps = [ + perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey + ]; + + propagatedNativeBuildInputs = perlDeps; + propagatedUserEnvPkgs = perlDeps; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A C program reducer"; + homepage = "https://embed.cs.utah.edu/creduce"; + # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING + license = licenses.ncsa; + longDescription = '' + C-Reduce is a tool that takes a large C or C++ program that has a + property of interest (such as triggering a compiler bug) and + automatically produces a much smaller C/C++ program that has the same + property. It is intended for use by people who discover and report + bugs in compilers and other tools that process C/C++ code. + ''; + maintainers = [ maintainers.dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ddc9d3428..8d5fc9dd783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6263,6 +6263,13 @@ with pkgs; cppcheck = callPackage ../development/tools/analysis/cppcheck { }; + creduce = callPackage ../development/tools/misc/creduce { + inherit (perlPackages) perl + ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; + inherit (llvmPackages_39) llvm clang-unwrapped; + utillinux = if stdenv.isLinux then utillinuxMinimal else null; + }; + cscope = callPackage ../development/tools/misc/cscope { }; csslint = callPackage ../development/web/csslint { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f50d5dfe38d..744ca5f53e5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5611,6 +5611,14 @@ let self = _self // overrides; _self = with self; { }; }; + GetoptTabular = buildPerlPackage rec { + name = "Getopt-Tabular-0.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GW/GWARD/${name}.tar.gz"; + sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv"; + }; + }; + GitPurePerl = buildPerlPackage { name = "Git-PurePerl-0.51"; src = fetchurl { From 76a3c30471e57faaa75f4ed957c12f13e9f92d90 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 9 Feb 2017 23:08:48 +0100 Subject: [PATCH 025/273] network-interfaces service: fix bindsTo deps for masters Previously, netdev units for network interfaces defined in the nixos configurations would bindTo the systemd device unit of the interface if not in a container. In situations where you switch to a new nixos configration with changes to network-setup.service (like nameservers) and have stacked interfaces like vlans on a bond, it would fail to propagate restarts to the netdevs correctly resulting with broken networking. The bond would be present but no vlan interfaces rendering the machine unreachable. My fear is that the udev events fail to propagate correctly while a systemd transaction that is also restarting the triggered netdev service is running. This commit changes this behaviour so netdev services bindTo other netdev services if present and otherwise fall back to the previous behaviour. We also noticed that stacked interfaces would sometimes seemingly be stopped in the wrong order. For instance in the above example, the bond interface would be deleted before the vlan interfaces resulting in the vlan interfaces not being present when their service is being stopped. This would cause the systemd transaction to fail and thus break networking. Their postStop hooks are now allowed to fail as we have reached the desired state. --- .../tasks/network-interfaces-scripted.nix | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 062598de83e..cf90f05e8d3 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -47,21 +47,17 @@ in let deviceDependency = dev: - if (config.boot.isContainer == false) - then - # Trust udev when not in the container - optional (dev != null) (subsystemDevice dev) - else - # When in the container, check whether the interface is built from other definitions - if (hasAttr dev cfg.bridges) || - (hasAttr dev cfg.bonds) || - (hasAttr dev cfg.macvlans) || - (hasAttr dev cfg.sits) || - (hasAttr dev cfg.vlans) || - (hasAttr dev cfg.vswitches) || - (hasAttr dev cfg.wlanInterfaces) - then [ "${dev}-netdev.service" ] - else []; + # Use systemd service if we manage device creation, else + # trust udev when not in a container + if (hasAttr dev cfg.bridges) || + (hasAttr dev cfg.bonds) || + (hasAttr dev cfg.macvlans) || + (hasAttr dev cfg.sits) || + (hasAttr dev cfg.vlans) || + (hasAttr dev cfg.vswitches) || + (hasAttr dev cfg.wlanInterfaces) + then [ "${dev}-netdev.service" ] + else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev); networkLocalCommands = { after = [ "network-setup.service" ]; @@ -198,7 +194,7 @@ in user "${i.virtualOwner}" ''; postStop = '' - ip link del ${i.name} + ip link del ${i.name} || true ''; }; @@ -335,7 +331,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); @@ -363,7 +359,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); @@ -387,7 +383,7 @@ in ip link set "${n}" up ''; postStop = '' - ip link delete "${n}" + ip link delete "${n}" || true ''; }); From 035e2028d80eae9b0988c5d26b6b4d4f72e51c45 Mon Sep 17 00:00:00 2001 From: Mikhail Volkhov Date: Mon, 13 Feb 2017 17:13:02 +0300 Subject: [PATCH 026/273] Disable orgmode-parse tests in config-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 81eff1d4250..273e225e9ec 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -340,6 +340,7 @@ self: super: { opaleye = dontCheck super.opaleye; openpgp = dontCheck super.openpgp; optional = dontCheck super.optional; + orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; From 76da40e5a72008acc35383bf9b36113316ea202d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 15 Feb 2017 09:07:25 +0100 Subject: [PATCH 027/273] cups-dymo: init at 1.4.0.5 --- pkgs/misc/cups/drivers/dymo/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/misc/cups/drivers/dymo/default.nix diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix new file mode 100644 index 00000000000..b2801c7ae67 --- /dev/null +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl, cups, ... }: + +stdenv.mkDerivation rec { + name = "cups-dymo-${version}"; + version = "1.4.0.5"; + + # exposed version and 'real' version may differ + # in this case the download states '1.4.0' but the real version is '1.4.0.5' + # this has the potential to break future builds + dl-name = "dymo-cups-drivers-1.4.0"; + + src = fetchurl { + url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${dl-name}.tar.gz"; + sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6"; + }; + + buildInputs = [ cups ]; + makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; + + meta = { + description = "CUPS Linux drivers and SDK for DYMO printers"; + homepage = "http://www.dymo.com/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855de099cba..cb6a495ee68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17474,6 +17474,8 @@ with pkgs; cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + cups-dymo = callPackage ../misc/cups/drivers/dymo {}; + crashplan = callPackage ../applications/backup/crashplan { }; e17gtk = callPackage ../misc/themes/e17gtk { }; From 4ebfc1933563943711e1e4326c964faf30c332be Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Mon, 13 Feb 2017 19:36:12 +0100 Subject: [PATCH 028/273] keepalived: 1.2.19 -> 1.3.2 --- pkgs/tools/networking/keepalived/default.nix | 38 +++++++++----------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index c579d12b6bd..1f5a6216e7b 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchurl, openssl, net_snmp, libnl }: +{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "keepalived-1.2.19"; + name = "keepalived-${version}"; + version = "1.3.2"; - src = fetchurl { - url = "http://keepalived.org/software/${name}.tar.gz"; - sha256 = "0lrq963pxhgh74qmxjyy5hvxdfpm4r50v4vsrp559n0w5irsxyrj"; + src = fetchFromGitHub { + owner = "acassen"; + repo = "keepalived"; + rev = "v${version}"; + sha256 = "1mfw8116b7j8y37l382v154yssm635kbm72f4x8303g5zwg6n6qx"; }; - buildInputs = [ openssl net_snmp libnl ]; + buildInputs = [ + libnfnetlink + libnl + net_snmp + openssl + ]; - postPatch = '' - sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in - ''; - - # It doesn't know about the include/libnl directory - NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3"; - NIX_LDFLAGS="-lnl-3 -lnl-genl-3"; + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ - "--sysconfdir=/etc" - "--localstatedir=/var" - "--enable-snmp" "--enable-sha1" - ]; - - installFlags = [ - "sysconfdir=\${out}/etc" - ]; + "--enable-snmp" + ]; meta = with stdenv.lib; { homepage = http://keepalived.org; From 87650525ce2027698fae192eefd952c84ad98376 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:31:02 +0100 Subject: [PATCH 029/273] bean-add: 2016-12-02 -> 2017-01-20 --- pkgs/applications/office/beancount/bean-add.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 4e73a305ea4..7535b6abf3c 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2016-12-02"; + name = "bean-add-2017-01-20"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9"; - sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09"; + rev = "752674259fb9512e076ef2048927fb791ad21507"; + sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61"; }; propagatedBuildInputs = with python3Packages; [ python ]; From 1017489b9691792bc338793a66612f8a896eebd1 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:33:43 +0100 Subject: [PATCH 030/273] buku: 2.7 -> 2.8 --- pkgs/applications/misc/buku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index a0414786ba4..85d8180983e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -2,14 +2,14 @@ }: with pythonPackages; buildPythonApplication rec { - version = "2.7"; + version = "2.8"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk"; + sha256 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm"; }; buildInputs = [ From f370cbbfdf996d67fcda2f9291d320672e5d13b6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:43:19 +0100 Subject: [PATCH 031/273] hstr: 1.19 -> 1.22 --- pkgs/applications/misc/hstr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index e2290ac01e8..78f3c2f391b 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, ncurses }: let - version = "1.19"; + version = "1.22"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n"; + sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; }; buildInputs = [ readline ncurses ]; From 83d09a333667fb379c5180b8dca12125b8f762df Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:45:58 +0100 Subject: [PATCH 032/273] http-prompt: 0.8.0 -> 0.9.1 --- pkgs/tools/networking/http-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 55ba6b9db55..6f2ca8fc5ba 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.8.0"; + version = "0.9.1"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30"; + sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06"; }; propagatedBuildInputs = with pythonPackages; [ From 7620ea63b9eacf865271b5842560ec871f84c316 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:51:05 +0100 Subject: [PATCH 033/273] khal: 0.8.4 -> 0.9.2 --- pkgs/applications/misc/khal/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 0e93418255e..8d7eeffad31 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -3,13 +3,12 @@ with python3Packages; buildPythonApplication rec { - # Reenable tests for 0.9.0, they are broken at the moment: #15981 - version = "0.8.4"; + version = "0.9.2"; name = "khal-${version}"; src = fetchurl { url = "mirror://pypi/k/khal/khal-${version}.tar.gz"; - sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f"; + sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp"; }; LC_ALL = "en_US.UTF-8"; From 3de22bb760e5ac3d5e93fb648e56fea25e809b59 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 13:55:27 +0100 Subject: [PATCH 034/273] khard: 0.11.1 -> 0.11.3 From the README of khard: # vobject version is pinned to 0.9.2 for now because of bug # https://github.com/eventable/vobject/issues/39 This is why we explicitely pin the dependency "vobject" via a new python package in the expression here. --- pkgs/applications/misc/khard/default.nix | 32 +++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 2a6329b48d7..da6dece237e 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,13 +1,39 @@ -{ stdenv, fetchurl, glibcLocales, python3Packages }: +{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: +let + vobject = python3Packages.buildPythonPackage rec { + version = "0.9.2"; + name = "vobject-${version}"; + + src = fetchFromGitHub { + owner = "eventable"; + repo = "vobject"; + sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; + rev = version; + }; + + disabled = python3Packages.isPyPy; + + propagatedBuildInputs = with python3Packages; [ dateutil ]; + + checkPhase = "${python3Packages.python.interpreter} tests.py"; + + meta = with stdenv.lib; { + description = "Module for reading vCard and vCalendar files"; + homepage = http://eventable.github.io/vobject/; + license = licenses.asl20; + maintainers = [ maintainers.matthiasbeyer ]; + }; + }; +in python3Packages.buildPythonApplication rec { - version = "0.11.1"; + version = "0.11.3"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27"; + sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69"; }; # setup.py reads the UTF-8 encoded readme. From f9d7d29fa939eeba39d5aa497b9703e60a016eab Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 14:18:53 +0100 Subject: [PATCH 035/273] sqlitebrowser: 3.8.0 -> 3.9.1 --- pkgs/development/tools/database/sqlitebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 338f3323d94..8290b57d41b 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.9.1"; name = "sqlitebrowser-${version}"; src = fetchFromGitHub { repo = "sqlitebrowser"; owner = "sqlitebrowser"; rev = "v${version}"; - sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; + sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150"; }; buildInputs = [ qt4 sqlite cmake ]; From b96a2fdd1b4ccec7839c75cd150530cf2cfc3897 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 15 Feb 2017 14:21:52 +0100 Subject: [PATCH 036/273] vdirsyncer: 0.14.0 -> 0.14.1 --- pkgs/tools/misc/vdirsyncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index e32e58fcded..a5abc8bef83 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.14.0"; + version = "0.14.1"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898"; + sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5"; }; propagatedBuildInputs = with pythonPackages; [ From 21430431466df7ae54c9ecea7309f940d0a77c93 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Feb 2017 09:48:26 -0600 Subject: [PATCH 037/273] isyncUnstable: download over https --- pkgs/tools/networking/isync/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index eae7167f2fe..9408546f6a0 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { rev = "46e792"; src = fetchgit { - url = "git://git.code.sf.net/p/isync/isync"; + url = "https://git.code.sf.net/p/isync/isync"; inherit rev; sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1"; }; From 88fec3005bf29145271e21e42b8d21c98d14e3f2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Feb 2017 09:48:45 -0600 Subject: [PATCH 038/273] isyncUnstable: 2015-11-08 -> 20161218 The extra dashes are removed from the version number because Nix treats only the first component as the version, i.e. `2015-11-08` is version `2015` with two tags `-11` and `-08`. --- pkgs/tools/networking/isync/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index 9408546f6a0..c8e4231f7b5 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -2,13 +2,13 @@ , autoconf, automake }: stdenv.mkDerivation rec { - name = "isync-git-2015-11-08"; - rev = "46e792"; + name = "isync-git-20161218"; + rev = "77acc268123b8233843ca9bc3dcf90669efde08f"; src = fetchgit { url = "https://git.code.sf.net/p/isync/isync"; inherit rev; - sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1"; + sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj"; }; buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ]; From 3994004a6f8db87f0deb99afc2081bcc3c975d77 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Feb 2017 09:50:18 -0600 Subject: [PATCH 039/273] isyncUnstable: build with zlib support --- pkgs/tools/networking/isync/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index c8e4231f7b5..cf3882ad83b 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl +{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib , autoconf, automake }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ]; + buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ]; preConfigure = '' touch ChangeLog From 953a1e76a25239577441443848506a5a4c46c457 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 16 Feb 2017 09:50:31 -0600 Subject: [PATCH 040/273] isyncUnstable: add ttuegel to maintainers --- pkgs/tools/networking/isync/unstable.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index cf3882ad83b..a20fa2fe737 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation rec { homepage = http://isync.sourceforge.net/; description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; + maintainers = with maintainers; [ the-kenny ttuegel ]; platforms = platforms.unix; }; } From 2ad43792ad511cc051b7f9d1dc380737a7b5a53f Mon Sep 17 00:00:00 2001 From: James Alexander Feldman-Crough Date: Thu, 16 Feb 2017 08:54:28 -0800 Subject: [PATCH 041/273] Remove redundant "fetchSubmodules" attr --- pkgs/applications/misc/polybar/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index ef08ad2f1b4..aceaf43ac97 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { url = "https://github.com/jaagr/polybar"; rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af"; sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas"; - fetchSubmodules = true; }; meta = with stdenv.lib; { From c37464a9b1e533c723b5a63a016c939dbc921326 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Thu, 16 Feb 2017 13:32:39 -0500 Subject: [PATCH 042/273] ghostscript: fix installed library name on darwin --- pkgs/misc/ghostscript/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 22a148398c5..285a5b4ee49 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -92,6 +92,10 @@ stdenv.mkDerivation rec { mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/" ln -s "${fonts}" "$out/share/ghostscript/fonts" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in $out/lib/*.dylib* ; do + install_name_tool -id "$file" $file + done ''; preFixup = lib.optionalString stdenv.isDarwin '' From 03024b39b7d4b94724faa1a62f21aed3531bb35a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 16 Feb 2017 20:24:56 +0100 Subject: [PATCH 043/273] tex4ht: fixup evaluation errors in the broken package https://github.com/NixOS/nixpkgs/pull/22873#issuecomment-280390590 --- 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 f135d5edaf7..d136fd7dfb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17840,7 +17840,7 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; }; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; From 3f971d9863e4551aca97aefbb59f5d764f09f655 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 01:17:30 +0530 Subject: [PATCH 044/273] vault: 0.6.4 -> 0.6.5 --- pkgs/tools/security/vault/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 1eea59b71f3..0344fc0a74e 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,7 +9,7 @@ let }; in buildGoPackage rec { name = "vault-${version}"; - version = "0.6.4"; + version = "0.6.5"; goPackagePath = "github.com/hashicorp/vault"; @@ -17,7 +17,7 @@ in buildGoPackage rec { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0rrrzkza12zbbfc24q4q7ygfczq1j8ljsjagsa8vpp3375dflzdy"; + sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb"; }; buildFlagsArray = '' @@ -33,6 +33,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { homepage = https://www.vaultproject.io; description = "A tool for managing secrets"; + platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; }; From 9debdaf512bc510f7f5d5450c4902e7d1f713274 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 2 Feb 2017 22:21:03 +0100 Subject: [PATCH 045/273] networking.bonds: add support for arbitrary driverOptions Until now the four attributes available very selectively provided a small subset, while copying upstream documentation. We make driver options an arbitrary key-value set and point to kernel documentation, which is always up-to-date. This way every option can be set. The four already existing options are deprecated with a warning. --- .../tasks/network-interfaces-scripted.nix | 36 +++++++++++++++---- nixos/modules/tasks/network-interfaces.nix | 20 +++++++++++ nixos/tests/networking.nix | 2 +- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 062598de83e..d94d9db54ca 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -37,11 +37,24 @@ let ip link del "${i}" 2>/dev/null || true ''; -in + # warn that these attributes are deprecated (2017-2-2) + # Should be removed in the release after next + bondDeprecation = rec { + deprecated = [ "lacp_rate" "miimon" "mode" "xmit_hash_policy" ]; + filterDeprecated = bond: (filterAttrs (attrName: attr: + elem attrName deprecated && attr != null) bond); + }; -{ + bondWarnings = + let oneBondWarnings = bondName: bond: + mapAttrsToList (bondText bondName) (bondDeprecation.filterDeprecated bond); + bondText = bondName: optName: _: + "${bondName}.${optName} is deprecated, use ${bondName}.driverOptions"; + in { + warnings = flatten (mapAttrsToList oneBondWarnings cfg.bonds); + }; - config = mkIf (!cfg.useNetworkd) { + normalConfig = { systemd.services = let @@ -296,10 +309,11 @@ in echo "Creating new bond ${n}..." ip link add name "${n}" type bond \ - ${optionalString (v.mode != null) "mode ${toString v.mode}"} \ - ${optionalString (v.miimon != null) "miimon ${toString v.miimon}"} \ - ${optionalString (v.xmit_hash_policy != null) "xmit_hash_policy ${toString v.xmit_hash_policy}"} \ - ${optionalString (v.lacp_rate != null) "lacp_rate ${toString v.lacp_rate}"} + ${let opts = (mapAttrs (const toString) + (bondDeprecation.filterDeprecated v)) + // v.driverOptions; + in concatStringsSep "\n" + (mapAttrsToList (set: val: " ${set} ${val} \\") opts)} # !!! There must be a better way to wait for the interface while [ ! -d "/sys/class/net/${n}" ]; do sleep 0.1; done; @@ -410,6 +424,14 @@ in KERNEL=="tun", TAG+="systemd" ''; + }; +in + +{ + config = mkMerge [ + bondWarnings + (mkIf (!cfg.useNetworkd) normalConfig) + ]; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 28c7b358093..898207ef7a3 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -587,11 +587,28 @@ in description = "The interfaces to bond together"; }; + driverOptions = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample { + interfaces = [ "eth0" "wlan0" ]; + miimon = 100; + mode = "active-backup"; + }; + description = '' + Options for the bonding driver. + Documentation can be found in + + ''; + + }; + lacp_rate = mkOption { default = null; example = "fast"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. Option specifying the rate in which we'll ask our link partner to transmit LACPDU packets in 802.3ad mode. ''; @@ -602,6 +619,7 @@ in example = 100; type = types.nullOr types.int; description = '' + DEPRECATED, use `driverOptions`. Miimon is the number of millisecond in between each round of polling by the device driver for failed links. By default polling is not enabled and the driver is trusted to properly detect and handle @@ -614,6 +632,7 @@ in example = "active-backup"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. The mode which the bond will be running. The default mode for the bonding driver is balance-rr, optimizing for throughput. More information about valid modes can be found at @@ -626,6 +645,7 @@ in example = "layer2+3"; type = types.nullOr types.str; description = '' + DEPRECATED, use `driverOptions`. Selects the transmit hash policy to use for slave selection in balance-xor, 802.3ad, and tlb modes. ''; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 83103f35d48..8b573869c15 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -236,8 +236,8 @@ let firewall.allowPing = true; useDHCP = false; bonds.bond = { - mode = "balance-rr"; interfaces = [ "eth1" "eth2" ]; + driverOptions.mode = "balance-rr"; }; interfaces.eth1.ip4 = mkOverride 0 [ ]; interfaces.eth2.ip4 = mkOverride 0 [ ]; From bb797c1390971753f17f33882cfd477bc0f6d186 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 3 Feb 2017 02:20:47 +0100 Subject: [PATCH 046/273] networking.networkd: adjust autmatic mapping of bonds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the bonds interface changed to a lot more possible values we create a mapping of kernel bond attribute names and values to networkd attributes. Those match for the most part, but have to transformed slightly. There is also an assert that unknown options won’t slip through silently. --- nixos/modules/system/boot/networkd.nix | 2 +- .../tasks/network-interfaces-systemd.nix | 68 ++++++++++++++++--- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index be70bdbf0a9..f96dde15361 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -79,7 +79,7 @@ let checkBond = checkUnitConfig "Bond" [ (assertOnlyFields [ "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec" - "UpDelaySec" "DownDelaySec" + "UpDelaySec" "DownDelaySec" "GratuitousARP" ]) (assertValueOneOf "Mode" [ "balance-rr" "active-backup" "balance-xor" diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index cd599d8b894..736292400fd 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -115,17 +115,65 @@ in Name = name; Kind = "bond"; }; - bondConfig = - (optionalAttrs (bond.lacp_rate != null) { - LACPTransmitRate = bond.lacp_rate; - }) // (optionalAttrs (bond.miimon != null) { - MIIMonitorSec = bond.miimon; - }) // (optionalAttrs (bond.mode != null) { - Mode = bond.mode; - }) // (optionalAttrs (bond.xmit_hash_policy != null) { - TransmitHashPolicy = bond.xmit_hash_policy; - }); + bondConfig = let + # manual mapping as of 2017-02-03 + # man 5 systemd.netdev [BOND] + # to https://www.kernel.org/doc/Documentation/networking/bonding.txt + # driver options. + driverOptionMapping = let + trans = f: optName: { valTransform = f; optNames = [optName]; }; + simp = trans id; + ms = trans (v: v + "ms"); + in { + Mode = simp "mode"; + TransmitHashPolixy = simp "xmit_hash_policy"; + LACPTransmitRate = simp "lacp_rate"; + MIIMonitorSec = ms "miimon"; + UpDelaySec = ms "updelay"; + DownDelaySec = ms "downdelay"; + LearnPacketIntervalSec = simp "lp_interval"; + AdSelect = simp "ad_select"; + FailOverMACPolicy = simp "fail_over_mac"; + ARPValidate = simp "arp_validate"; + # apparently in ms for this value?! Upstream bug? + ARPIntervalSec = simp "arp_interval"; + ARPIPTargets = simp "arp_ip_target"; + ARPAllTargets = simp "arp_all_targets"; + PrimaryReselectPolicy = simp "primary_reselect"; + ResendIGMP = simp "resend_igmp"; + PacketsPerSlave = simp "packets_per_slave"; + GratuitousARP = { valTransform = id; + optNames = [ "num_grat_arp" "num_unsol_na" ]; }; + AllSlavesActive = simp "all_slaves_active"; + MinLinks = simp "min_links"; + }; + + do = bond.driverOptions; + assertNoUnknownOption = let + knownOptions = flatten (mapAttrsToList (_: kOpts: kOpts.optNames) + driverOptionMapping); + # options that apparently don’t exist in the networkd config + unknownOptions = [ "primary" ]; + assertTrace = bool: msg: if bool then true else builtins.trace msg false; + in assert all (driverOpt: assertTrace + (elem driverOpt (knownOptions ++ unknownOptions)) + "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd.") + (mapAttrsToList (k: _: k) do); ""; + # get those driverOptions that have been set + filterSystemdOptions = filterAttrs (sysDOpt: kOpts: + any (kOpt: do ? "${kOpt}") kOpts.optNames); + # build final set of systemd options to bond values + buildOptionSet = mapAttrs (_: kOpts: with kOpts; + # we simply take the first set kernel bond option + # (one option has multiple names, which is silly) + head (map (optN: valTransform (do."${optN}")) + # only map those that exist + (filter (o: do ? "${o}") optNames))); + in seq assertNoUnknownOption + (buildOptionSet (filterSystemdOptions driverOptionMapping)); + }; + networks = listToAttrs (flip map bond.interfaces (bi: nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { DHCP = mkOverride 0 (dhcpStr false); From 0cee46dd217641baf09a8dee40e80ff4c32d47d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 16 Feb 2017 21:34:44 +0100 Subject: [PATCH 047/273] brotli: update to 0.5.2 From 0.3.0 --- pkgs/tools/compression/brotli/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index eac4af0ec5f..92180216671 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,25 +1,19 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: # ?TODO: there's also python lib in there stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "0.3.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299"; + sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4"; }; - preConfigure = "cd tools"; - - # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now. - installPhase = '' - mkdir -p "$out/bin" - mv ./bro "$out/bin/" - ''; + buildInputs = [ cmake ]; meta = with stdenv.lib; { inherit (src.meta) homepage; From e62fe375757fb3175b859bb6dc171a23e15726c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 16 Feb 2017 21:46:48 +0100 Subject: [PATCH 048/273] zstd: update to 1.1.3 --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index d966175f50d..dba6e6fc337 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { - sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri"; + sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; From 0c42efd9d70774eafb47212967caada630335731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 16 Feb 2017 22:24:40 +0100 Subject: [PATCH 049/273] SDL2: fix creation of libSDL2main.a It's required by a trigger rally update I will commit next. And other games use that too. --- pkgs/development/libraries/SDL2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 5d818cb315c..719329bd528 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 dontDisableStatic = true; + enableParallelBuilding = true; + # XXX: By default, SDL wants to dlopen() PulseAudio, in which case # we must arrange to add it to its RPATH; however, `patchelf' seems # to fail at doing this, hence `--disable-pulseaudio-shared'. @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { }; postInstall = '' + moveToOutput lib/libSDL2main.a "$dev" rm $out/lib/*.a moveToOutput bin/sdl2-config "$dev" ''; From 1e7da9ec78d11f586fc74747d77b17f91969a7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 16 Feb 2017 22:25:23 +0100 Subject: [PATCH 050/273] trigger: update to 0.6.5 --- pkgs/games/trigger/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 9f7a1844f9e..df005af39e5 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,20 +1,20 @@ -{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, glew }: +{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, mesa, glew }: stdenv.mkDerivation rec { - name = "trigger-rally-0.6.3"; + name = "trigger-rally-0.6.5"; src = fetchurl { url = "mirror://sourceforge/trigger-rally/${name}.tar.gz"; - sha256 = "103mv4vpq335mrmgzlhahrfncq7ds3b5ip5a52967rv2j6hhzpvy"; + sha256 = "095s4sx0s1ijlarkh84rvzlv4nxh9llrsal1lb3m3pf0v228gnzj"; }; - buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa glew ]; + buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib mesa glew ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs cd src - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2" export makeFlags="$makeFlags prefix=$out" ''; @@ -29,9 +29,6 @@ stdenv.mkDerivation rec { chmod +x $out/bin/trigger-rally ''; - # search.patch : fix c++ error. - patches = [ ./search.patch ]; - meta = { description = "Rally"; homepage = http://trigger-rally.sourceforge.net/; From 6e12406e30b263ea7ce49a784c85f5a727b5fc8a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 16 Feb 2017 22:43:49 +0100 Subject: [PATCH 051/273] Revert "nginx: Format the config file" This reverts commit e362a3d5c94ba379d428fbd2cc40470719a61556. See #22883 --- .../services/web-servers/nginx/default.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index aa11a5d5e80..9e93e56b9c2 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -16,20 +16,7 @@ let ) cfg.virtualHosts; enableIPv6 = config.networking.enableIPv6; - configFile = pkgs.runCommand "nginx.conf" { - inherit configFileUnformatted; - passAsFile = [ "configFileUnformatted" ]; - # configFileUnformatted is created locally, therefore so should this be. - preferLocalBuild = true; - allowSubstitutes = false; - } '' - cp ${configFileUnformatted} nginx.conf - chmod u+w nginx.conf - ${pkgs.nginx-config-formatter}/bin/nginxfmt nginx.conf - cp nginx.conf $out - ''; - - configFileUnformatted = pkgs.writeText "nginx.unformatted.conf" '' + configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; error_log stderr; daemon off; From c2a573365422f200e7d99823f29ba5ffec338579 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 Feb 2017 20:26:17 -0500 Subject: [PATCH 052/273] wxPython: fix on darwin --- .../python-modules/wxPython/3.0.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix index 8dc99955af3..defdc920d6e 100644 --- a/pkgs/development/python-modules/wxPython/3.0.nix +++ b/pkgs/development/python-modules/wxPython/3.0.nix @@ -1,8 +1,11 @@ { fetchurl , lib +, stdenv +, darwin , openglSupport ? true , libX11 , wxGTK +, wxmac , pkgconfig , buildPythonPackage , pyopengl @@ -27,15 +30,27 @@ buildPythonPackage rec { hardeningDisable = [ "format" ]; - propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ] ++ lib.optional openglSupport pyopengl; - preConfigure = "cd wxPython"; + propagatedBuildInputs = [ pkgconfig ] + ++ (lib.optional openglSupport pyopengl) + ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ]) + ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ]) + ; + preConfigure = '' + cd wxPython + # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch + substituteInPlace config.py \ + --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" + # this check is supposed to only return false on older systems running non-framework python + substituteInPlace src/osx_cocoa/_core_wrap.cpp \ + --replace "return wxPyTestDisplayAvailable();" "return true;" + ''; - NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; + NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0"; buildPhase = ""; installPhase = '' - ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out + ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out wrapPythonPrograms ''; From 0a44f259b517dd3710882040edf7b347b2889281 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 15 Feb 2017 15:25:18 -0500 Subject: [PATCH 053/273] python27Packages.taskcoach: mark as broken on darwin --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7ee93e21fe..0e88986ee1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25362,6 +25362,7 @@ in { homepage = http://taskcoach.org/; description = "Todo manager to keep track of personal tasks and todo lists"; license = licenses.gpl3Plus; + broken = stdenv.isDarwin; }; }; From 6515854248601b78ef08f52c3de7b80858892d5f Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 00:49:46 +0530 Subject: [PATCH 054/273] awless: init at 0.0.13 --- pkgs/tools/virtualization/awless/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/virtualization/awless/default.nix diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix new file mode 100644 index 00000000000..afc45a2d5a7 --- /dev/null +++ b/pkgs/tools/virtualization/awless/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "awless-${version}"; + version = "0.0.13"; + rev = "${version}"; + + goPackagePath = "github.com/wallix/awless"; + + src = fetchFromGitHub { + inherit rev; + owner = "wallix"; + repo = "awless"; + sha256 = "045n4r2mk40pjggsfcjlxni6q4arybs9x9raghqb9n8dyfg9v5kv"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/wallix/awless/; + description = "A Mighty CLI for AWS"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.asl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d136fd7dfb5..83679710eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -460,6 +460,8 @@ with pkgs; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; + awless = callPackage ../tools/virtualization/awless { }; + ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; From 90d225db766baa997a2ded830de968d27432b9d8 Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 16 Feb 2017 00:11:38 +0100 Subject: [PATCH 055/273] microsoft_gsl: init at 2017-02-13 --- .../libraries/microsoft_gsl/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/microsoft_gsl/default.nix diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix new file mode 100644 index 00000000000..b419eccfe79 --- /dev/null +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake }: + +stdenv.mkDerivation rec { + name = "microsoft_gsl-${version}"; + version = "2017-02-13"; + + src = fetchgit { + url = "https://github.com/Microsoft/GSL.git"; + rev = "3819df6e378ffccf0e29465afe99c3b324c2aa70"; + sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35"; + }; + + # build phase just runs the unit tests + buildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/include + mv ../include/ $out/ + ''; + + meta = with stdenv.lib; { + description = "Functions and types that are suggested for use by the C++ Core Guidelines"; + homepage = https://github.com/Microsoft/GSL; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ xwvvvvwx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83679710eb4..5dea365f485 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8826,6 +8826,8 @@ with pkgs; mhddfs = callPackage ../tools/filesystems/mhddfs { }; + microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; + minizip = callPackage ../development/libraries/minizip { }; miro = callPackage ../applications/video/miro { From cfea4469208ab01d2d60bac080c70ff856241a4d Mon Sep 17 00:00:00 2001 From: Mogria Date: Thu, 16 Feb 2017 18:54:32 +0100 Subject: [PATCH 056/273] phpPackages.memcached: add missing zlib build dependency --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f0ebdf0096c..fb1cd63a4dc 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -51,7 +51,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; + buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; }; # Not released yet @@ -69,7 +69,7 @@ let "--with-libmemcached-dir=${pkgs.libmemcached}" ]; - buildInputs = with pkgs; [ pkgconfig cyrus_sasl ]; + buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ]; }; # No support for PHP 7 yet (and probably never will be) From 3e484e7880679e5217660ee5a6a0489241ea9eb8 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 00:35:46 +0530 Subject: [PATCH 057/273] consul-template: 0.18.0 -> 0.18.1 --- pkgs/tools/system/consul-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index ad7222a67e5..dee99586c31 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-template-${version}"; - version = "0.18.0"; + version = "0.18.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul-template"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "1a1r7jwv0d4l8bcjal9chvr871hmw0ljbihgjqasp6gvjg0hfbx6"; + sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d"; }; meta = with stdenv.lib; { From 7ab871b394c25c37295e26787c9d9f5de5591dcc Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 00:24:08 +0530 Subject: [PATCH 058/273] consul: 0.7.3 -> 0.7.5 --- pkgs/servers/consul/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 25482b2b388..41a0bea1cdd 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.7.3"; + version = "0.7.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,9 +11,17 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "0ab84sm281ibl9h6zfk17mr7yc9vxpi8i2xb4kzi8bg43n05lj4d"; + sha256 = "0zh4j5p0v41v7i6v084dgsdchx1azjs2mjb3dlfdv671rsnwi54z"; }; # Keep consul.ui for backward compatability passthru.ui = consul-ui; + + meta = with stdenv.lib; { + description = "Tool for service discovery, monitoring and configuration"; + homepage = "https://www.consul.io/"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; } From 0ea76ef83126e05b4704328b2a7f8959bcc495fe Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 01:02:06 +0530 Subject: [PATCH 059/273] wuzz: 2017-02-09 -> 0.1.0 --- pkgs/tools/networking/wuzz/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 87b962b9154..994a6f75d54 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -2,15 +2,16 @@ buildGoPackage rec { name = "wuzz-${version}"; - version = "2017-02-09"; + version = "0.1.0"; + rev = "v${version}"; goPackagePath = "https://github.com/asciimoo/wuzz"; src = fetchFromGitHub { owner = "asciimoo"; repo = "wuzz"; - rev = "dd696dc6e014e08b6042a71dca600356eb3156c2"; - sha256 = "0m7jcb6rk0cb3giz1cbfhy3h4nzjl6qrk2k6czhn9267688rznpx"; + inherit rev; + sha256 = "0n55y9dmx4rsccjscvbrgiq2g1qwqxj44lg90589i55b5f7r1ljd"; }; goDeps = ./deps.nix; From c1fb4ec0413c412f2fdb692f21d9737f457a2b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?= Date: Thu, 9 Feb 2017 20:59:26 +0000 Subject: [PATCH 060/273] keybase: 1.0.18 -> 20170209.17b641d --- pkgs/tools/security/keybase/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index fbed233b090..b962a6409b4 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,8 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.18"; - rev = "v${version}"; + version = "20170209.17b641d"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "client"; - inherit rev; - sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h"; + rev = "17b641de629a85ad77621d0efa3e2442661b5ee7"; + sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11"; }; buildFlags = [ "-tags production" ]; From 8561af2db91464de3737592794389acfc99e9648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?= Date: Thu, 9 Feb 2017 20:59:57 +0000 Subject: [PATCH 061/273] kbfs: 1.0.2 -> 20170209.d1db463 --- pkgs/tools/security/kbfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index a38e70df632..e502c296a50 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -1,8 +1,8 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "kbfs-2016-11-18-git"; - version = "1.0.2"; + name = "kbfs-${version}"; + version = "20170209.d1db463"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c"; - sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv"; + rev = "d1db46315d9271f21ca2700a84ca19767e638296"; + sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g"; }; buildFlags = [ "-tags production" ]; From 17f566d1e191290683fac0b3e93428db12e5dd13 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 14 Feb 2017 19:10:42 +1100 Subject: [PATCH 062/273] keybase-gui: init at 20170209.17b641d The GUI requires the keybase and kbfs packages to be installed and running with /keybase as the mount. --- pkgs/tools/security/keybase-gui/default.nix | 91 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 93 insertions(+) create mode 100644 pkgs/tools/security/keybase-gui/default.nix diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix new file mode 100644 index 00000000000..b1d8181da65 --- /dev/null +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups +, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr +, nss, pango, systemd, xorg, utillinuxMinimal }: + +let + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + cairo + cups + dbus + expat + fontconfig + freetype + gcc.cc + gdk_pixbuf + glib + gnome2.GConf + gtk2 + nspr + nss + pango + systemd + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + ]; +in +stdenv.mkDerivation rec { + name = "keybase-gui-${version}"; + version = "1.0.18-20170209170023.17b641d"; + src = fetchurl { + url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; + sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3"; + }; + phases = ["unpackPhase" "installPhase" "fixupPhase"]; + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + installPhase = '' + mkdir -p $out/{bin,share} + mv opt/keybase $out/share/ + + cat > $out/bin/keybase-gui <&2 + exit 1 + } + + if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then + echo "Keybase service doesn't seem to be running." >&2 + echo "You might need to run: keybase service" >&2 + checkFailed + fi + + ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null + if [ "\$?" -ne "0" ]; then + echo "Keybase is not mounted to /keybase." >&2 + echo "You might need to run: kbfsfuse /keybase" >&2 + checkFailed + fi + + exec $out/share/keybase/Keybase "\$@" + EOF + chmod +x $out/bin/keybase-gui + ''; + postFixup = '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase" + ''; + + meta = with stdenv.lib; { + homepage = https://www.keybase.io/; + description = "The Keybase official GUI."; + platforms = platforms.linux; + maintainers = with maintainers; [ puffnfresh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5dea365f485..34532300afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2415,6 +2415,8 @@ with pkgs; kbfs = callPackage ../tools/security/kbfs { }; + keybase-gui = callPackage ../tools/security/keybase-gui { }; + keychain = callPackage ../tools/misc/keychain { }; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; From 53c2e38e0d16fa10db8237bdeef3ed824c3ffef4 Mon Sep 17 00:00:00 2001 From: romildo Date: Thu, 16 Feb 2017 11:10:07 -0200 Subject: [PATCH 063/273] qbittorrent: 3.3.7 -> 3.3.10 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 620b8601d7d..cdafea3be79 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.7"; + version = "3.3.10"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j"; + sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Free Software alternative to µtorrent"; homepage = http://www.qbittorrent.org/; license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; platforms = platforms.linux; + maintainers = with maintainers; [ viric ]; }; } From a9584c9510771f96594b4461e9ea546a75bf59d4 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Fri, 17 Feb 2017 09:39:18 +0530 Subject: [PATCH 064/273] kafka: 0.10.1.0 -> 0.10.1.1 --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index b6f4fef0f05..4041eae6468 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -11,9 +11,9 @@ let scalaVersion = "2.11"; sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; }; - "0.10" = { kafkaVersion = "0.10.1.0"; + "0.10" = { kafkaVersion = "0.10.1.1"; scalaVersion = "2.11"; - sha256 = "144k6bqg8q8f3x3nk05hvaaad8xa32qjifg785i15j69cnp355bd"; + sha256 = "0a89dyvisa5vilfa0h0ljrb00l5n9h730yxy1058z7a2g43q0h0m"; }; }; in From 834de6ebaaa0af9044ae79bd2e8e3e18d0eb55c3 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 17 Feb 2017 12:08:54 +0100 Subject: [PATCH 065/273] glide: output correct version (#22896) It currently displays `0.12.0-dev` instead of the specified version. Signed-off-by: Vincent Demeester --- pkgs/development/tools/glide/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 4f853e900b3..bd83a63e5d6 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -6,6 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/Masterminds/glide"; + buildFlagsArray = '' + -ldflags= + -X main.version=${version} + ''; + src = fetchFromGitHub { rev = "v${version}"; owner = "Masterminds"; From cc4fd4f7156860fc7056fc86f271870394c1f59c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 17 Feb 2017 09:10:42 +0000 Subject: [PATCH 066/273] perl-Net-IMAP-Client: init at 0.9505 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6b3e7d99a98..df7dd3a6011 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9640,6 +9640,19 @@ let self = _self // overrides; _self = with self; { }; }; + NetIMAPClient = buildPerlPackage rec { + name = "Net-IMAP-Client-0.9505"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz"; + sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; + }; + buildInputs = [TestPod TestPodCoverage]; + propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; + meta = { + description = "Not so simple IMAP client library"; + }; + }; + NetIP = buildPerlPackage { name = "Net-IP-1.26"; src = fetchurl { From 47ded42788caf8c8ec939de387341b9c113943e6 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 17 Feb 2017 09:11:03 +0000 Subject: [PATCH 067/273] lumail: init at 2.9 --- .../networking/mailreaders/lumail/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/lumail/default.nix diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix new file mode 100644 index 00000000000..d28144f92ba --- /dev/null +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp +, perl, perlPackages }: + +let + version = "2.9"; +in +stdenv.mkDerivation { + name = "lumail-${version}"; + + src = fetchurl { + url = "https://lumail.org/download/lumail-${version}.tar.gz"; + sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc"; + }; + + buildInputs = [ + pkgconfig lua5_2 file ncurses gmime pcre-cpp + perl perlPackages.JSON perlPackages.NetIMAPClient + ]; + + preConfigure = '' + sed -e 's|"/etc/lumail2|LUMAIL_LUAPATH"/..|' -i src/lumail2.cc src/imap_proxy.cc + + perlFlags= + for i in $(IFS=:; echo $PERL5LIB); do + perlFlags="$perlFlags -I$i" + done + + sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy + ''; + + makeFlags = [ + "LVER=lua" + "PREFIX=$(out)" + "SYSCONFDIR=$(out)/etc" + ]; + + postInstall = '' + cp lumail2.user.lua $out/etc/lumail2/ + ''; + + meta = with stdenv.lib; { + description = "Console-based email client"; + homepage = https://lumail.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [orivej]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 079f3220015..dcec9f6094e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14089,6 +14089,8 @@ with pkgs; gtk = gtk2; }; + lumail = callPackage ../applications/networking/mailreaders/lumail { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; From 336d6cc51332965a7c9c6f9f9feefbcfe9760b18 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 17 Feb 2017 12:47:27 +0100 Subject: [PATCH 068/273] stanchion: remove ssl option --- nixos/modules/services/databases/stanchion.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix index f2dbb78b5c4..a4597cac3cd 100644 --- a/nixos/modules/services/databases/stanchion.nix +++ b/nixos/modules/services/databases/stanchion.nix @@ -76,14 +76,6 @@ in ''; }; - stanchionSsl = mkOption { - type = types.bool; - default = true; - description = '' - Tell stanchion to use SSL. - ''; - }; - distributedCookie = mkOption { type = types.str; default = "riak"; @@ -148,8 +140,6 @@ in distributed_cookie = ${cfg.distributedCookie} - stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"} - ${cfg.extraConfig} ''; From 4798196447669556d259e00849a300e13ae9aa9a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2017 13:45:43 +0100 Subject: [PATCH 069/273] s3fs-fuse: 1.78 -> 1.80 --- pkgs/tools/filesystems/s3fs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index edc8dd00f3e..051d2732100 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}: stdenv.mkDerivation { - name = "s3fs-fuse-1.79"; + name = "s3fs-fuse-1.80"; + src = fetchurl { - url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.79.tar.gz; - sha256 = "0rmzkngzq040g020pv75qqx3jy34vdxzqvxz29k6q8yfb3wpkhb1"; + url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz; + sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy"; }; + preConfigure = "./autogen.sh"; buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ]; From dcc84d8fcf5490e7660df0af3de324e37370f414 Mon Sep 17 00:00:00 2001 From: Octavian Cerna Date: Fri, 17 Feb 2017 15:33:13 +0200 Subject: [PATCH 070/273] quagga: 1.0.20161017 -> 1.2.0 --- pkgs/servers/quagga/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index 45c195c2cb2..b60212dea01 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }: +{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo, + pkgconfig, c-ares }: stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.0.20161017"; + version = "1.2.0"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg"; + sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh"; }; buildInputs = - [ readline net_snmp ] + [ readline net_snmp c-ares ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; - nativeBuildInputs = [ perl texinfo ]; + nativeBuildInputs = [ pkgconfig perl texinfo ]; configureFlags = [ "--sysconfdir=/etc/quagga" From 692f3c18cd83a2bd65692b1ea898339e8ddef2d8 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 17 Feb 2017 13:50:13 +0100 Subject: [PATCH 071/273] riak: 2.1.1 -> 2.2.0 --- pkgs/servers/nosql/riak/2.1.1.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix index b66e99f0afb..b18650fbbca 100644 --- a/pkgs/servers/nosql/riak/2.1.1.nix +++ b/pkgs/servers/nosql/riak/2.1.1.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }: let - solrName = "solr-4.7.0-yz-1.tgz"; - yokozunaJarName = "yokozuna-2.jar"; + solrName = "solr-4.10.4-yz-2.tgz"; + yokozunaJarName = "yokozuna-3.jar"; yzMonitorJarName = "yz_monitor-1.jar"; srcs = { riak = fetchurl { - url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.1/riak-2.1.1.tar.gz"; - sha256 = "1bm5j3zknz82mkyh5zgaap73awflh4mkibdvdz164235mdxlwhdm"; + url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; + sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; }; solr = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}"; - sha256 = "0brml3lb3xk26rmi05rrzpxrw92alfi9gi7p7537ny9lqg3808qp"; + sha256 = "0fy5slnldn628gmr2kilyx606ph0iykf7pz6j0xjcc3wqvrixa2a"; }; yokozunaJar = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}"; - sha256 = "0xzfy181qxv27pc4f5xd0szn8vls5743273awr5rwv3608gkspj2"; + sha256 = "17n6m100fz8affdcxsn4niw2lrpnswgfnd6aszgzipffwbg7v8v5"; }; yzMonitorJar = fetchurl { url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}"; @@ -26,7 +26,7 @@ let in stdenv.mkDerivation rec { - name = "riak-2.1.1"; + name = "riak-2.2.0"; buildInputs = [ which unzip erlangR16 pam From 070825d443a384e8cf2928bab0367d430aaeca75 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 17 Feb 2017 15:41:31 +0100 Subject: [PATCH 072/273] setcapWrapper: add support for setting permissions --- nixos/modules/security/wrappers/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 861ce225257..52f25187660 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -28,6 +28,7 @@ let , source , owner ? "nobody" , group ? "nogroup" + , permissions ? "u+rx,g+x,o+x" , ... }: assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); @@ -45,7 +46,7 @@ let ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program} # Set the executable bit - chmod u+rx,g+x,o+x $wrapperDir/${program} + chmod ${permissions} $wrapperDir/${program} ''; ###### Activation script for the setuid wrappers From 8f3e6fdd8cb68af56d40e646be3077e319769a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 16 Feb 2017 21:53:09 +0100 Subject: [PATCH 073/273] nixos: add programs.wireshark option To be able to use Wireshark as an ordinary user, the 'dumpcap' program must be installed setuid root. This module module simplifies such a configuration to simply: programs.wireshark.enable = true; The setuid wrapper is available for users in the 'wireshark' group. Changes v1 -> v2: - add "defaultText" to the programs.wireshark.package option (AFAIK, that prevents the manual from being needlessly rebuilt when the package changes) --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/programs/wireshark.nix | 57 ++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 nixos/modules/programs/wireshark.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d51b29b99da..a3845737410 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -288,6 +288,7 @@ kresd = 270; rpc = 271; geoip = 272; + #wireshark = 273; # unused # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -545,6 +546,7 @@ kresd = 270; #rpc = 271; # unused #geoip = 272; # unused + wireshark = 273; # 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 81597d91d89..e60f93d52d9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -91,6 +91,7 @@ ./programs/tmux.nix ./programs/venus.nix ./programs/vim.nix + ./programs/wireshark.nix ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix new file mode 100644 index 00000000000..aaaf678d362 --- /dev/null +++ b/nixos/modules/programs/wireshark.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.wireshark; + wireshark = cfg.package; + +in + +{ + + options = { + + programs.wireshark = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add Wireshark to the global environment and configure a + setuid wrapper for 'dumpcap' for users in the 'wireshark' group. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.wireshark-cli; + defaultText = "pkgs.wireshark-cli"; + description = '' + Which Wireshark package to install in the global environment. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ wireshark ]; + + security.wrappers.dumpcap = { + source = "${wireshark}/bin/dumpcap"; + owner = "root"; + group = "wireshark"; + setuid = true; + setgid = false; + permissions = "u+rx,g+x"; + }; + + users.extraGroups.wireshark.gid = config.ids.gids.wireshark; + + }; + +} From 7ec5faa8a4c26beb189c01e27a02d4e2606a4df3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 17 Feb 2017 13:15:59 +0100 Subject: [PATCH 074/273] programs.wireshark: use setcap wrapper --- nixos/modules/misc/ids.nix | 2 -- nixos/modules/programs/wireshark.nix | 25 +++++-------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index a3845737410..d51b29b99da 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -288,7 +288,6 @@ kresd = 270; rpc = 271; geoip = 272; - #wireshark = 273; # unused # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -546,7 +545,6 @@ kresd = 270; #rpc = 271; # unused #geoip = 272; # unused - wireshark = 273; # 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/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix index aaaf678d362..710d223b6f5 100644 --- a/nixos/modules/programs/wireshark.nix +++ b/nixos/modules/programs/wireshark.nix @@ -3,27 +3,19 @@ with lib; let - cfg = config.programs.wireshark; wireshark = cfg.package; - -in - -{ - +in { options = { - programs.wireshark = { - enable = mkOption { type = types.bool; default = false; description = '' Whether to add Wireshark to the global environment and configure a - setuid wrapper for 'dumpcap' for users in the 'wireshark' group. + setcap wrapper for 'dumpcap' for users in the 'wireshark' group. ''; }; - package = mkOption { type = types.package; default = pkgs.wireshark-cli; @@ -32,26 +24,19 @@ in Which Wireshark package to install in the global environment. ''; }; - }; - }; config = mkIf cfg.enable { - environment.systemPackages = [ wireshark ]; - + users.extraGroups.wireshark = {}; + security.wrappers.dumpcap = { source = "${wireshark}/bin/dumpcap"; + capabilities = "cap_net_raw+p"; owner = "root"; group = "wireshark"; - setuid = true; - setgid = false; permissions = "u+rx,g+x"; }; - - users.extraGroups.wireshark.gid = config.ids.gids.wireshark; - }; - } From facb2c0483eb49f8baadadcacff02209659aa9f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 17 Feb 2017 22:48:39 +0800 Subject: [PATCH 075/273] bundler: 1.14.3 -> 1.14.4 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 17ea4d3bc6f..f3737afdb22 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.14.3"; - sha256 = "1znvh83phzvp97l3kcgk9vbwsnq45qc8nrb4dnqv17mrhgcwfqcx"; + version = "1.14.4"; + sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv"; dontPatchShebangs = true; postFixup = '' From 8d1bd281cc02b80e2a1a1297064f33abe770cf75 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 15 Feb 2017 15:49:31 +0100 Subject: [PATCH 076/273] rustc: 1.15 -> 1.15.1 --- pkgs/development/compilers/rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index e3314732fa4..91d7cda1c00 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -6,12 +6,12 @@ let in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.15"; + shortVersion = "1.15.1"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "10893a9a349cdd423f2490a6984acb5b3b7c8046"; - srcSha = "0861iivb98ir9ixq2qzznfc1b2l9khlwdln5n0gf2mp1fi3w4d4f"; + srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892"; + srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7"; patches = [ ./patches/darwin-disable-fragile-tcp-tests.patch From 73112a6e788a0f41190bcf3d3a2247c2fc17a1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 17 Feb 2017 17:00:28 +0100 Subject: [PATCH 077/273] pcsctools: unbreak 'gscriptor' by adding cairo Fixes this: $ gscriptor Can't load '/nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so' for module Pango: /nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so: undefined symbol: cairo_font_type_to_sv at /nix/store/5z1wn7knhckr3a0asb8lzp99sdai09f2-perl-5.22.2/lib/perl5/5.22.2/x86_64-linux-thread-multi/DynaLoader.pm line 193. at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31. Compilation failed in require at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31. BEGIN failed--compilation aborted at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31. Compilation failed in require at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28. BEGIN failed--compilation aborted at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28. --- pkgs/tools/security/pcsctools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 2932143fa0e..585e089b8af 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite , wget, coreutils -, perl, pcscperl, Glib, Gtk2, Pango +, perl, pcscperl, Glib, Gtk2, Pango, Cairo }: let deps = lib.makeBinPath [ wget coreutils ]; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/scriptor \ --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}" + --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}" wrapProgram $out/bin/ATR_analysis \ --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}" wrapProgram $out/bin/pcsc_scan \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f2c5e57d12..47bd30652f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3324,7 +3324,7 @@ with pkgs; }; pcsctools = callPackage ../tools/security/pcsctools { - inherit (perlPackages) pcscperl Glib Gtk2 Pango; + inherit (perlPackages) pcscperl Glib Gtk2 Pango Cairo; }; pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { }; From b510dccc94fe787c295e497ed629cb81601d3617 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 17 Feb 2017 08:03:09 -0600 Subject: [PATCH 078/273] kde5.applications: update instructions --- pkgs/desktops/kde-5/applications/default.nix | 29 ++++++++++++++------ pkgs/top-level/all-packages.nix | 11 ++++++-- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index fab9e2c29f8..228d9443f6d 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -1,11 +1,27 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in the KDE Applications Bundle. All +available packages are listed in `./srcs.nix`, although some are not yet +packaged in Nixpkgs (see below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. A simple example package that +still shows most of the available features is in `./gwenview.nix`. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-applications.sh` and - run that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ @@ -71,11 +87,6 @@ let spectacle = callPackage ./spectacle.nix {}; l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); - - # External packages - kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {}; - ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { }; - libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { }; }; in packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcec9f6094e..5779186d107 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9279,6 +9279,8 @@ with pkgs; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; + libktorrent = callPackage ../development/libraries/libktorrent/5.nix { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -13947,6 +13949,8 @@ with pkgs; ksuperkey = callPackage ../tools/X11/ksuperkey { }; + ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = go_1_6; }; @@ -16845,9 +16849,12 @@ with pkgs; plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; applications = import ../desktops/kde-5/applications { inherit pkgs; }; merged = self: - { plasma = plasma self; + { + plasma = plasma self; frameworks = qt5.kdeFrameworks; - applications = applications self; } + applications = applications self; + kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {}; + } // qt5.kdeFrameworks // plasma self // applications self; From 304da2449aaf113e6dc7e5789296b2a10c8f02b2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 17 Feb 2017 08:04:43 -0600 Subject: [PATCH 079/273] kde5.plasma: update instructions --- pkgs/desktops/kde-5/plasma/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 36850824d63..3ac1c51848e 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -1,11 +1,26 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in KDE Plasma 5. All available packages are +listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see +below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh` and run - that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ From 580bdde06c29a2eb98a82c5f22043411fdcaf845 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 17 Feb 2017 08:05:39 -0600 Subject: [PATCH 080/273] kde5.frameworks: update instructions --- .../libraries/kde-frameworks/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 93a8d62ed1d..ee7614bbcf1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -1,11 +1,26 @@ /* +# New packages + +READ THIS FIRST + +This module is for official packages in KDE Frameworks 5. All available packages +are listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see +below). + +IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. + +Many of the packages released upstream are not yet built in Nixpkgs due to lack +of demand. To add a Nixpkgs build for an upstream package, copy one of the +existing packages here and modify it as necessary. + # Updates -1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh` and - run that script from the top of the Nixpkgs tree. -2. Check that the new packages build correctly. -3. Commit the changes and open a pull request. +1. Update the URL in `./fetch.sh`. +2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks` + from the top of the Nixpkgs tree. +3. Invoke `nix-build -A kde5` and ensure that everything builds. +4. Commit the changes and open a pull request. */ From 73577a2b05c2fe89c7ecaf030caf76f5148301da Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 17 Feb 2017 19:08:14 +0100 Subject: [PATCH 081/273] linux_4_9: 4.9.9 -> 4.9.10 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ac51cb73a91..103c8f6c698 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.9"; + version = "4.9.10"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1vnr6688gg8njmivdzlx21v1f3w02ahca194bjvm15apajcccd96"; + sha256 = "098mcq3rg05gpammcdfhr2xhcy69ggc9h5g18m4ymnfqdx3havmx"; }; kernelPatches = args.kernelPatches; From e8007c0e8911fbcd99268b0b30d3e9f069f22c20 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 17 Feb 2017 19:09:50 +0100 Subject: [PATCH 082/273] linux_4_9: patch for CVE-2017-5986 Seems fairly low impact[1] but we might as well patch it until a new 4.9 version is released [1]: https://bugzilla.redhat.com/show_bug.cgi?id=1420276 --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 33f11ad5ae3..9bc47dd624d 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,4 +175,13 @@ rec { }; }; + sctp_bug_on_CVE_2017_5986 = rec + { name = "sctp_BUG_ON_CVE_2017_5986.patch"; + patch = fetchpatch { + inherit name; + url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2dcab598484185dea7ec22219c76dcdd59e3cb90"; + sha256 = "15np10bfm5yzby9zbkrh23qpm91wnprblsk0xn9yjryypnz8njxh"; + }; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47bd30652f3..1b178665b81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11294,6 +11294,7 @@ with pkgs; # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long + kernelPatches.sctp_bug_on_CVE_2017_5986 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 89a036506396dd869474a32e984f5cab5c07992a Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Fri, 17 Feb 2017 18:59:01 +0100 Subject: [PATCH 083/273] sweethome3d: version compatible with master and 16.09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: let the package function take 'libXxf86vm' as input instead of 'xorg' (the whole set).] --- pkgs/applications/misc/sweethome3d/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4a530a92781..62e66e4ad38 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: let @@ -29,6 +29,13 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; + patchPhase = '' + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so + ''; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' From 5231d0ac290f387885a20ece0c5cbb89ee223472 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Fri, 17 Feb 2017 19:44:04 +0100 Subject: [PATCH 084/273] bluetooth module: add option to power up bluetooth controller (#22685) --- nixos/modules/services/hardware/bluetooth.nix | 47 ++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index de0d4803211..71b3a93a2e0 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -1,8 +1,11 @@ { config, lib, pkgs, ... }: with lib; + let bluez-bluetooth = pkgs.bluez; + cfg = config.hardware.bluetooth; + in { @@ -11,33 +14,53 @@ in options = { - hardware.bluetooth.enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable support for Bluetooth."; + hardware.bluetooth.enable = mkEnableOption "support for Bluetooth."; + + hardware.bluetooth.powerOnBoot = mkOption { + type = types.bool; + default = true; + description = "Whether to power up the default Bluetooth controller on boot."; }; }; ###### implementation - config = mkIf config.hardware.bluetooth.enable { + config = mkIf cfg.enable { environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; services.udev.packages = [ bluez-bluetooth ]; - services.dbus.packages = [ bluez-bluetooth ]; + systemd.packages = [ bluez-bluetooth ]; - systemd.packages = [ bluez-bluetooth ]; + services.udev.extraRules = optionalString cfg.powerOnBoot '' + ACTION=="add", KERNEL=="hci[0-9]*", ENV{SYSTEMD_WANTS}="bluetooth-power@%k.service" + ''; + + systemd.services = { + bluetooth = { + wantedBy = [ "bluetooth.target" ]; + aliases = [ "dbus-org.bluez.service" ]; + }; + + "bluetooth-power@" = mkIf cfg.powerOnBoot { + description = "Power up bluetooth controller"; + after = [ + "bluetooth.service" + "suspend.target" + "sys-subsystem-bluetooth-devices-%i.device" + ]; + wantedBy = [ "suspend.target" ]; + + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = "${pkgs.bluez.out}/bin/hciconfig %i up"; + }; - systemd.services.bluetooth = { - wantedBy = [ "bluetooth.target" ]; - aliases = [ "dbus-org.bluez.service" ]; }; - systemd.user.services.obex = { - aliases = [ "dbus-org.bluez.obex.service" ]; + systemd.user.services = { + obex.aliases = [ "dbus-org.bluez.obex.service" ]; }; }; From a5e9668c5c2a43703a4f49ae673909c66acf7785 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 18:18:16 +0100 Subject: [PATCH 085/273] nixos/test: Fix escaping for copyFileFromHost A long-time issue and one of the reasons I've never used that function before. So let's remove that todo-comment and escape the contents properly. Signed-off-by: aszlig Cc: @edolstra --- nixos/lib/test-driver/Machine.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 85bc376f67f..30664406b26 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -607,7 +607,8 @@ sub waitForWindow { sub copyFileFromHost { my ($self, $from, $to) = @_; my $s = `cat $from` or die; - $self->mustSucceed("echo '$s' > $to"); # !!! escaping + $s =~ s/'/'\\''/g; + $self->mustSucceed("echo '$s' > $to"); } From 32c2e8f4aeea5a35302b450ed4233dd1af6b22c8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 18:20:53 +0100 Subject: [PATCH 086/273] taskserver/helpertool: Fix error message on export The error message displays that a specific user doesn't exist in an organisation, but uses the User object's name attribute to show which user it was. This is basically a very stupid chicken and egg problem and easily fixed by using the user name provided on the command line. Signed-off-by: aszlig --- nixos/modules/services/misc/taskserver/helper-tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index 03e7cdf8987..9c662ef047c 100644 --- a/nixos/modules/services/misc/taskserver/helper-tool.py +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -526,7 +526,7 @@ def export_user(organisation, user): userobj = organisation.get_user(user) if userobj is None: msg = "User {} doesn't exist in organisation {}." - sys.exit(msg.format(userobj.name, organisation.name)) + sys.exit(msg.format(user, organisation.name)) sys.stdout.write(userobj.export()) From 78fe00da7c2d6c4e5746558f366e1c8fbf97fb47 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 19:03:49 +0100 Subject: [PATCH 087/273] taskserver: Allow helper tool in manual config The helper tool so far was only intended for use in automatic PKI handling, but it also is very useful if you have an existing CA. One of the main advantages is that you don't need to specify the data directory anymore and the right permissions are also handled as well. Another advantage is that we now have an uniform management tool for both automatic and manual config, so the documentation in the NixOS manual now applies to the manual PKI config as well. Signed-off-by: aszlig --- .../services/misc/taskserver/default.nix | 4 +- .../modules/services/misc/taskserver/doc.xml | 6 +-- .../services/misc/taskserver/helper-tool.py | 41 ++++++++++++------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index d28c5dc7af8..88331a56fb0 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -154,9 +154,8 @@ let certtool = "${pkgs.gnutls.bin}/bin/certtool"; - nixos-taskserver = pkgs.pythonPackages.buildPythonPackage { + nixos-taskserver = pkgs.pythonPackages.buildPythonApplication { name = "nixos-taskserver"; - namePrefix = ""; src = pkgs.runCommand "nixos-taskserver-src" {} '' mkdir -p "$out" @@ -167,6 +166,7 @@ let certBits = cfg.pki.auto.bits; clientExpiration = cfg.pki.auto.expiration.client; crlExpiration = cfg.pki.auto.expiration.crl; + isAutoConfig = if needToCreateCA then "True" else "False"; }}" > "$out/main.py" cat > "$out/setup.py" < If you set any options within - , the automatic user and - CA management by the nixos-taskserver is disabled and - you need to create certificates and keys by yourself. + , + nixos-taskserver won't issue certificates, but you can + still use it for adding or removing user accounts. diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index 9c662ef047c..b97bc1df74f 100644 --- a/nixos/modules/services/misc/taskserver/helper-tool.py +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -13,6 +13,7 @@ from tempfile import NamedTemporaryFile import click +IS_AUTO_CONFIG = @isAutoConfig@ # NOQA CERTTOOL_COMMAND = "@certtool@" CERT_BITS = "@certBits@" CLIENT_EXPIRATION = "@clientExpiration@" @@ -149,6 +150,12 @@ def create_template(contents): def generate_key(org, user): + if not IS_AUTO_CONFIG: + msg = "Automatic PKI handling is disabled, you need to " \ + "manually issue a client certificate for user {}.\n" + sys.stderr.write(msg.format(user)) + return + basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user) if os.path.exists(basedir): raise OSError("Keyfile directory for {} already exists.".format(user)) @@ -243,26 +250,32 @@ class User(object): self.key = key def export(self): - pubcert = getkey(self.__org, self.name, "public.cert") - privkey = getkey(self.__org, self.name, "private.key") - cacert = getkey("ca.cert") - - keydir = "${TASKDATA:-$HOME/.task}/keys" - credentials = '/'.join([self.__org, self.name, self.key]) allow_unquoted = string.ascii_letters + string.digits + "/-_." if not all((c in allow_unquoted) for c in credentials): credentials = "'" + credentials.replace("'", r"'\''") + "'" - script = [ - "umask 0077", - 'mkdir -p "{}"'.format(keydir), - mktaskkey("certificate", os.path.join(keydir, "public.cert"), - pubcert), - mktaskkey("key", os.path.join(keydir, "private.key"), privkey), - mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert), + script = [] + + if IS_AUTO_CONFIG: + pubcert = getkey(self.__org, self.name, "public.cert") + privkey = getkey(self.__org, self.name, "private.key") + cacert = getkey("ca.cert") + + keydir = "${TASKDATA:-$HOME/.task}/keys" + + script += [ + "umask 0077", + 'mkdir -p "{}"'.format(keydir), + mktaskkey("certificate", os.path.join(keydir, "public.cert"), + pubcert), + mktaskkey("key", os.path.join(keydir, "private.key"), privkey), + mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert) + ] + + script.append( "task config taskd.credentials -- {}".format(credentials) - ] + ) return "\n".join(script) + "\n" From c7bbb93878a0b9772c34a6c19eb3f1b15a82a345 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 19:18:04 +0100 Subject: [PATCH 088/273] taskserver: Pass configuration via command line Putting an include directive in the configuration file referencing a store path with the real configuration file has the disavantage that once we change the real configuration file the store path is also a different one. So we would have to replace that include directive with the new configuration file, which is very much error-prone, because whenever taskd modifies the configuration file on its own it generates a new one with *only* the key/value options and without any include directives. Another problem is that we only added the include directive on the first initalization, so whenever there is *any* configuration change, it won't affect anything. We're now passing all the configuration options via command line, because taskd treats everything in the form of --= to be a configuration directive. This also has the effect that we now no longer have extraConfig, because configuration isn't a file anymore. Instead we now have an attribute set that is mapped down to configuration options. Unfortunately this isn't so easy with the way taskd is configured, because there is an option called "server" and also other options like "server.cert", "server.key" and so on, which do not map very well to attribute sets. So we have an exception for the "server" option, which is now called "server.listen", because it specifies the listening address. Signed-off-by: aszlig Fixes: #22705 --- .../services/misc/taskserver/default.nix | 129 ++++++++++++------ 1 file changed, 84 insertions(+), 45 deletions(-) diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 88331a56fb0..9040cbaf838 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -94,44 +94,6 @@ let in flatten (mapAttrsToList mkSublist attrs); in all isNull (findPkiDefinitions [] manualPkiOptions); - configFile = pkgs.writeText "taskdrc" ('' - # systemd related - daemon = false - log = - - - # logging - ${mkConfLine "debug" cfg.debug} - ${mkConfLine "ip.log" cfg.ipLog} - - # general - ${mkConfLine "ciphers" cfg.ciphers} - ${mkConfLine "confirmation" cfg.confirmation} - ${mkConfLine "extensions" cfg.extensions} - ${mkConfLine "queue.size" cfg.queueSize} - ${mkConfLine "request.limit" cfg.requestLimit} - - # client - ${mkConfLine "client.allow" cfg.allowedClientIDs} - ${mkConfLine "client.deny" cfg.disallowedClientIDs} - - # server - server = ${cfg.listenHost}:${toString cfg.listenPort} - ${mkConfLine "trust" cfg.trust} - - # PKI options - ${if needToCreateCA then '' - ca.cert = ${cfg.dataDir}/keys/ca.cert - server.cert = ${cfg.dataDir}/keys/server.cert - server.key = ${cfg.dataDir}/keys/server.key - server.crl = ${cfg.dataDir}/keys/server.crl - '' else '' - ca.cert = ${cfg.pki.manual.ca.cert} - server.cert = ${cfg.pki.manual.server.cert} - server.key = ${cfg.pki.manual.server.key} - server.crl = ${cfg.pki.manual.server.crl} - ''} - '' + cfg.extraConfig); - orgOptions = { name, ... }: { options.users = mkOption { type = types.uniq (types.listOf types.str); @@ -365,17 +327,54 @@ in { pki.manual = manualPkiOptions; pki.auto = autoPkiOptions; - extraConfig = mkOption { - type = types.lines; - default = ""; - example = "client.cert = /tmp/debugging.cert"; + config = mkOption { + type = types.attrs; + example.client.cert = "/tmp/debugging.cert"; description = '' - Extra lines to append to the taskdrc configuration file. + Configuration options to pass to Taskserver. + + The options here are the same as described in + taskdrc + 5 + , but with one difference: + + The server option is + server.listen here, because the + server option would collide with other options + like server.cert and we would run in a type error + (attribute set versus string). + + Nix types like integers or booleans are automatically converted to + the right values Taskserver would expect. ''; + apply = let + mkKey = path: if path == ["server" "listen"] then "server" + else concatStringsSep "." path; + recurse = path: attrs: let + mapper = name: val: let + newPath = path ++ [ name ]; + scalar = if val == true then "true" + else if val == false then "false" + else toString val; + in if isAttrs val then recurse newPath val + else [ "${mkKey newPath}=${scalar}" ]; + in concatLists (mapAttrsToList mapper attrs); + in recurse []; }; }; }; + imports = [ + (mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' + This option was removed in favor of `services.taskserver.config` with + different semantics (it's now a list of attributes instead of lines). + + Please look up the documentation of `services.taskserver.config' to get + more information about the new way to pass additional configuration + options. + '') + ]; + config = mkMerge [ (mkIf cfg.enable { environment.systemPackages = [ pkgs.taskserver nixos-taskserver ]; @@ -392,6 +391,44 @@ in { gid = config.ids.gids.taskd; }; + services.taskserver.config = { + # systemd related + daemon = false; + log = "-"; + + # logging + debug = cfg.debug; + ip.log = cfg.ipLog; + + # general + ciphers = cfg.ciphers; + confirmation = cfg.confirmation; + extensions = cfg.extensions; + queue.size = cfg.queueSize; + request.limit = cfg.requestLimit; + + # client + client.allow = cfg.allowedClientIDs; + client.deny = cfg.disallowedClientIDs; + + # server + trust = cfg.trust; + server = { + listen = "${cfg.listenHost}:${toString cfg.listenPort}"; + } // (if needToCreateCA then { + cert = "${cfg.dataDir}/keys/server.cert"; + key = "${cfg.dataDir}/keys/server.key"; + crl = "${cfg.dataDir}/keys/server.crl"; + } else { + cert = "${cfg.pki.manual.server.cert}"; + key = "${cfg.pki.manual.server.key}"; + crl = "${cfg.pki.manual.server.crl}"; + }); + + ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" + else "${cfg.pki.manual.ca.cert}"; + }; + systemd.services.taskserver-init = { wantedBy = [ "taskserver.service" ]; before = [ "taskserver.service" ]; @@ -404,7 +441,6 @@ in { script = '' ${taskd} init - echo "include ${configFile}" > "${cfg.dataDir}/config" touch "${cfg.dataDir}/.is_initialized" ''; @@ -436,7 +472,10 @@ in { in "${helperTool} process-json '${jsonFile}'"; serviceConfig = { - ExecStart = "@${taskd} taskd server"; + ExecStart = let + mkCfgFlag = flag: escapeShellArg "--${flag}"; + cfgFlags = concatMapStringsSep " " mkCfgFlag cfg.config; + in "@${taskd} taskd server ${cfgFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Restart = "on-failure"; PermissionsStartOnly = true; From 5af8b120a6d5e8abaf2e0397e9ac077a3ab33897 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 19:28:55 +0100 Subject: [PATCH 089/273] nixos/tests/taskserver: Add test for manual config This subtest actually serves two purposes: 1. Test manual PKI configuration 2. Test changing of configuration files In order to only test manual PKI configuration it would have been enough to just add another server with a manual config. But as the switch from automatic PKI config to manual config is probably one of the most fundamental changes in configuration, so it serves *very* well to also check whether changes in the NixOS configuration actually have an impact in the real system. So instead of adding another server, we now create a dummy "newServer" machine, which is the new configuration for "server" and use switch-to-configuration to switch "server" to the config of "newServer". Signed-off-by: aszlig --- nixos/tests/taskserver.nix | 129 +++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 5 deletions(-) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index d770b20a775..cdccb11d888 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -1,4 +1,62 @@ -import ./make-test.nix { +import ./make-test.nix ({ pkgs, ... }: let + snakeOil = pkgs.runCommand "snakeoil-certs" { + outputs = [ "out" "cacert" "cert" "key" "crl" ]; + buildInputs = [ pkgs.gnutls.bin ]; + caTemplate = pkgs.writeText "snakeoil-ca.template" '' + cn = server + expiration_days = -1 + cert_signing_key + ca + ''; + certTemplate = pkgs.writeText "snakeoil-cert.template" '' + cn = server + expiration_days = -1 + tls_www_server + encryption_key + signing_key + ''; + crlTemplate = pkgs.writeText "snakeoil-crl.template" '' + expiration_days = -1 + ''; + userCertTemplace = pkgs.writeText "snakoil-user-cert.template" '' + organization = snakeoil + cn = server + expiration_days = -1 + tls_www_client + encryption_key + signing_key + ''; + } '' + certtool -p --bits 4096 --outfile ca.key + certtool -s --template "$caTemplate" --load-privkey ca.key \ + --outfile "$cacert" + certtool -p --bits 4096 --outfile "$key" + certtool -c --template "$certTemplate" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --load-privkey "$key" \ + --outfile "$cert" + certtool --generate-crl --template "$crlTemplate" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --outfile "$crl" + + mkdir "$out" + + # Stripping key information before the actual PEM-encoded values is solely + # to make test output a bit less verbose when copying the client key to the + # actual client. + certtool -p --bits 4096 | sed -n \ + -e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key" + + certtool -c --template "$userCertTemplace" \ + --load-privkey "$out/alice.key" \ + --load-ca-privkey ca.key \ + --load-ca-certificate "$cacert" \ + --outfile "$out/alice.cert" + ''; + +in { name = "taskserver"; nodes = rec { @@ -12,6 +70,23 @@ import ./make-test.nix { }; }; + # New generation of the server with manual config + newServer = { lib, nodes, ... }: { + imports = [ server ]; + services.taskserver.pki.manual = { + ca.cert = snakeOil.cacert; + server.cert = snakeOil.cert; + server.key = snakeOil.key; + server.crl = snakeOil.crl; + }; + # This is to avoid assigning a different network address to the new + # generation. + networking = lib.mapAttrs (lib.const lib.mkForce) { + inherit (nodes.server.config.networking) + hostName interfaces primaryIPAddress extraHosts; + }; + }; + client1 = { pkgs, ... }: { environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ]; users.users.alice.isNormalUser = true; @@ -26,6 +101,8 @@ import ./make-test.nix { testScript = { nodes, ... }: let cfg = nodes.server.config.services.taskserver; portStr = toString cfg.listenPort; + newServerSystem = nodes.newServer.config.system.build.toplevel; + switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test"; in '' sub su ($$) { my ($user, $cmd) = @_; @@ -33,8 +110,8 @@ import ./make-test.nix { return "su - $user -c '$esc'"; } - sub setupClientsFor ($$) { - my ($org, $user) = @_; + sub setupClientsFor ($$;$) { + my ($org, $user, $extraInit) = @_; for my $client ($client1, $client2) { $client->nest("initialize client for user $user", sub { @@ -58,6 +135,8 @@ import ./make-test.nix { } }); + eval { &$extraInit($client, $org, $user) }; + $client->succeed(su $user, "task config taskd.server server:${portStr} >&2" ); @@ -104,7 +183,10 @@ import ./make-test.nix { return su $user, $cmd; } - startAll; + # Explicitly start the VMs so that we don't accidentally start newServer + $server->start; + $client1->start; + $client2->start; $server->waitForUnit("taskserver.service"); @@ -162,5 +244,42 @@ import ./make-test.nix { restartServer; testSync "bar"; }; + + subtest "check manual configuration", sub { + $server->succeed('${switchToNewServer} >&2'); + $server->waitForUnit("taskserver.service"); + $server->waitForOpenPort(${portStr}); + + $server->succeed( + "nixos-taskserver org add manualOrg", + "nixos-taskserver user add manualOrg alice" + ); + + setupClientsFor "manualOrg", "alice", sub { + my ($client, $org, $user) = @_; + my $cfgpath = "/home/$user/.task"; + + $client->copyFileFromHost("${snakeOil.cacert}", "$cfgpath/ca.cert"); + for my $file ('alice.key', 'alice.cert') { + $client->copyFileFromHost("${snakeOil}/$file", "$cfgpath/$file"); + } + + for my $file ("$user.key", "$user.cert") { + $client->copyFileFromHost( + "${snakeOil}/$file", "$cfgpath/$file" + ); + } + $client->copyFileFromHost( + "${snakeOil.cacert}", "$cfgpath/ca.cert" + ); + $client->succeed( + (su "alice", "task config taskd.ca $cfgpath/ca.cert"), + (su "alice", "task config taskd.key $cfgpath/$user.key"), + (su $user, "task config taskd.certificate $cfgpath/$user.cert") + ); + }; + + testSync "alice"; + }; ''; -} +}) From 08881b8cbe03a058310eb62aa316dbd095682e59 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 17 Feb 2017 19:36:57 +0100 Subject: [PATCH 090/273] taskserver: Remove taskserver from systemPackages This is deliberate because using the taskd binary to configure Taskserver has a good chance of messing up permissions. The nixos-taskserver tool now can manage even manual configurations, so there really is no need anymore to expose the taskd binary. If people still want to use the taskd binary at their own risk they can still add taskserver to systemPackages themselves. Signed-off-by: aszlig --- nixos/modules/services/misc/taskserver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 9040cbaf838..826f463bbd7 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -377,7 +377,7 @@ in { config = mkMerge [ (mkIf cfg.enable { - environment.systemPackages = [ pkgs.taskserver nixos-taskserver ]; + environment.systemPackages = [ nixos-taskserver ]; users.users = optional (cfg.user == "taskd") { name = "taskd"; From 213356c9278330f32749a06cd8bc5e8727ff6849 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 17 Sep 2016 13:53:12 +0300 Subject: [PATCH 091/273] activation-script service: add utillinux to path --- nixos/modules/system/activation/activation-script.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index dcf105eb784..c2ac731d433 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -19,6 +19,7 @@ let glibc # needed for getent shadow nettools # needed for hostname + utillinux # needed for mount and mountpoint ]; in @@ -168,12 +169,12 @@ in local options="$3" local fsType="$4" - if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then + if mountpoint -q "$mountPoint"; then local options="remount,$options" else mkdir -m 0755 -p "$mountPoint" fi - ${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint" + mount -t "$fsType" -o "$options" "$device" "$mountPoint" } source ${config.system.build.earlyMountScript} ''; From cb96ed615e48d13c165046363623f0f0e7007796 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Fri, 17 Feb 2017 18:56:39 +0000 Subject: [PATCH 092/273] lib: Add a function to filter sources by regular expressions. --- lib/sources.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/sources.nix b/lib/sources.nix index f41abe1e1ea..8f312a9db5c 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -26,6 +26,12 @@ rec { cleanSource = builtins.filterSource cleanSourceFilter; + # Filter sources by a list of regular expressions. + # + # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]` + sourceByRegex = src: regexes: builtins.filterSource (path: type: + let relPath = lib.removePrefix (toString src + "/") (toString path); + in lib.any (re: builtins.match re relPath != null) regexes) src; # Get all files ending with the specified suffices from the given # directory or its descendants. E.g. `sourceFilesBySuffices ./dir From e67416f7e2685ab6136863f96545a1c22f8a23cd Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 16 Feb 2017 18:22:38 -0600 Subject: [PATCH 093/273] awesome-4.0: Add hicolor-icon-theme for theme support Closes #22888. --- .../window-managers/awesome/default.nix | 61 ++++++------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 9fa4d6a6d8e..0a1256d67a4 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,29 +4,17 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs -, libxkbcommon, xcbutilxrm +, libxkbcommon, xcbutilxrm, hicolor_icon_theme }: -let - version = "4.0"; -in with luaPackages; - -stdenv.mkDerivation rec { +with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - + version = "4.0"; src = fetchurl { url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; }; - meta = with stdenv.lib; { - description = "Highly configurable, dynamic window manager for X"; - homepage = https://awesomewm.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 rasendubi ]; - platforms = platforms.linux; - }; - nativeBuildInputs = [ asciidoc cmake @@ -36,33 +24,14 @@ stdenv.mkDerivation rec { pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs ]; - - buildInputs = [ - cairo - dbus - gdk_pixbuf - gobjectIntrospection - git - lgi - libpthreadstubs - libstartup_notification - libxdg_basedir - lua - nettools - pango - xcb-util-cursor - xorg.libXau - xorg.libXdmcp - xorg.libxcb - xorg.libxshmfence - xorg.xcbutil - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - libxkbcommon - xcbutilxrm - ]; + propagatedUserEnvPkgs = [ hicolor_icon_theme ]; + buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection + git lgi libpthreadstubs libstartup_notification + libxdg_basedir lua nettools pango xcb-util-cursor + xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence + xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon + xcbutilxrm ]; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; @@ -86,4 +55,12 @@ stdenv.mkDerivation rec { passthru = { inherit lua; }; + + meta = with stdenv.lib; { + description = "Highly configurable, dynamic window manager for X"; + homepage = https://awesomewm.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 rasendubi ndowens ]; + platforms = platforms.linux; + }; } From bd0d8ed807d29faa3deee96bafcbbd76c8fa4060 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 17 Feb 2017 20:14:59 +0100 Subject: [PATCH 094/273] programs.mtr: init setcap-wrapper --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/mtr.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 nixos/modules/programs/mtr.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 81597d91d89..2195a828a1e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -80,6 +80,7 @@ ./programs/light.nix ./programs/man.nix ./programs/mosh.nix + ./programs/mtr.nix ./programs/nano.nix ./programs/oblogout.nix ./programs/screen.nix diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix new file mode 100644 index 00000000000..927fe68be87 --- /dev/null +++ b/nixos/modules/programs/mtr.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.mtr; +in { + options = { + programs.mtr = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add mtr to the global environment and configure a + setcap wrapper for it. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + security.wrappers.mtr = { + source = "${pkgs.mtr}/bin/mtr"; + capabilities = "cap_net_raw+p"; + }; + }; +} From 7a113e9e83b10b8cf85ed07e10f7c47f5e5c493d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Fri, 17 Feb 2017 19:20:45 +0000 Subject: [PATCH 095/273] fakechroot: 2.17.2 -> 2.19 (with modification) There's a PR I need merged so this is currently pointing at a fork on my GitHub but I'll repoint it to mainline once that gets merged. --- pkgs/tools/system/fakechroot/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 5827a11714d..be3a32de251 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -1,14 +1,19 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl }: stdenv.mkDerivation rec { name = "fakechroot-${version}"; - version = "2.17.2"; + version = "2.19"; - src = fetchurl { - url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz"; - sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3"; + # TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged + src = fetchFromGitHub { + owner = "copumpkin"; + repo = "fakechroot"; + rev = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1"; + sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd"; }; + buildInputs = [ autoreconfHook perl ]; + meta = with stdenv.lib; { homepage = https://github.com/dex4er/fakechroot; description = "Give a fake chroot environment through LD_PRELOAD"; From 376b377775b8c31db48f8eb757c016a7a404f181 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 17 Feb 2017 16:13:18 -0500 Subject: [PATCH 096/273] atom: 1.14.1 -> 1.14.3 --- 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 c91028b7fe4..27ba155ad74 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.14.1"; + version = "1.14.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0dmzqz1j2nfcm459zgfzqym26kmbspdn9lipf77aawbbn2y36xqp"; + sha256 = "16zc1bbvxs9fpd9y3mzgbl789djp3p1664a8b2nn9ann1mbkdgsk"; name = "${name}.deb"; }; From d950e8c084f050f971958e3aeb2d69adba520875 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 17 Feb 2017 20:38:17 +0100 Subject: [PATCH 097/273] fping: 3.15 -> 3.16 --- pkgs/tools/networking/fping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 11e019dfec3..e5764fa421d 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.15"; + name = "fping-3.16"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n"; + sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; From 34c12b1c73c36ad5c1bcc19b1343848e8d1ec09a Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 17 Feb 2017 23:45:52 +0100 Subject: [PATCH 098/273] e2fsprogs: 1.43.3 -> 1.43.4 --- pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 8ff10039449..c44c92efae0 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libuuid }: stdenv.mkDerivation rec { - name = "e2fsprogs-1.43.3"; + name = "e2fsprogs-1.43.4"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf"; + sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d"; }; outputs = [ "bin" "dev" "out" "man" ]; From 19a302f6f6fef39b466e66a5fabf99e62363bf05 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 17 Feb 2017 16:28:54 +0100 Subject: [PATCH 099/273] scummvm: 1.8.0 -> 1.9.0 Use direct download instead of sourceforge mirror which no longer works. --- pkgs/games/scummvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 603e0b0e9e4..29ba75f9aa2 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }: stdenv.mkDerivation rec { - name = "scummvm-1.8.0"; + name = "scummvm-1.9.0"; src = fetchurl { - url = "mirror://sourceforge/scummvm/${name}.tar.bz2"; - sha256 = "0f3zgvz886lk9ps0v333aq74vx6grlx68hg14gfaxcvj55g73v01"; + url = "http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.bz2"; + sha256 = "813d7d8a76e3d05b45001d37451368711dadc32899ecf907df1cc7abfb1754d2"; }; buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ]; From 9cee962c43329c2e458ba91ecebb702c4492eb92 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 17 Feb 2017 22:51:02 -0200 Subject: [PATCH 100/273] youtube-dl: 2017.02.04.1 -> 2017.02.17 --- pkgs/tools/misc/youtube-dl/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 307b1a1592a..175281d2a48 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc -, atomicparsley +{ stdenv, fetchurl, buildPythonApplication +, zip, ffmpeg, rtmpdump, atomicparsley, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the # manpage argument in place in case someone wants to use this derivation to @@ -8,29 +8,31 @@ , generateManPage ? false , ffmpegSupport ? true , rtmpSupport ? true -}: +, makeWrapper }: with stdenv.lib; - buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.02.16"; + version = "2017.02.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0"; + sha256 = "06k0g3s0c27f0kwhvm2gpk01q0q0cbhqh09zvh19svl1zc2ky72b"; }; - buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; + buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails postInstall = let - packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump; + packagesToBinPath = + [ atomicparsley ] + ++ optional ffmpegSupport ffmpeg + ++ optional rtmpSupport rtmpdump; in '' - wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}" + wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}" ''; # Requires network From d26ac6afa4cd264b6c8613a28ff09ca87eff45ee Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sat, 18 Feb 2017 04:07:55 +0100 Subject: [PATCH 101/273] haskellPackages.xmonad-extras: jailbreak to allow xmonad 0.13 (#22927) Fixes https://github.com/NixOS/nixpkgs/issues/22919 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff6dbfa1b09..0a0c7ee0644 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -862,4 +862,7 @@ self: super: { # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8 dirstream = doJailbreak super.dirstream; + + # https://github.com/xmonad/xmonad-extras/issues/3 + xmonad-extras = doJailbreak super.xmonad-extras; } From f308722a0002c83a1ab8a2b7bfd7aac312761e01 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:17:34 -0500 Subject: [PATCH 102/273] netpbm: 10.70.00 -> 10.77.02 for numerous fixes more: https://sourceforge.net/p/netpbm/code/2883/tree/advanced/doc/HISTORY --- pkgs/tools/graphics/netpbm/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 7fafc5218e9..1f1dd363233 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -1,13 +1,16 @@ -{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2 +{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2 , makeWrapper, libtiff , enableX11 ? false, libX11 }: stdenv.mkDerivation rec { - name = "netpbm-10.70.00"; + # Determine version and revision from: + # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced + name = "netpbm-10.77.02"; - src = fetchurl { - url = "mirror://gentoo/distfiles/${name}.tar.xz"; - sha256 = "14vxmzbwsy4rzrqjnzr4cvz1s0amacq69faps3v1j1kr05lcns0j"; + src = fetchsvn { + url = "svn://svn.code.sf.net/p/netpbm/code/advanced"; + rev = 2883; + sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f"; }; postPatch = /* CVE-2005-2471, from Arch */ '' From 6fc38401a28e4638bd840743ae29a2806b68936d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:24:33 -0500 Subject: [PATCH 103/273] tomcat6: drop, no longer supported. --- pkgs/servers/http/tomcat/default.nix | 7 ------- pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 909b26f162b..ac507794a91 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -30,13 +30,6 @@ let }); in { - - tomcat6 = common { - versionMajor = "6"; - versionMinor = "0.48"; - sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc"; - }; - tomcat7 = common { versionMajor = "7"; versionMinor = "0.73"; diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 3562ea1e129..d070a9f1740 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -1,10 +1,10 @@ -{ stdenv, tomcat6, mysql_jdbc }: +{ stdenv, mysql_jdbc }: stdenv.mkDerivation { name = "tomcat-mysql-jdbc"; builder = ./builder.sh; buildInputs = [ mysql_jdbc ]; - + inherit mysql_jdbc; meta = { From c4bbadf2d553088d9fe5a72f543ced6696c72ada Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:25:52 -0500 Subject: [PATCH 104/273] tomcat6: more thoroughly remove tomcat6 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11b76e85305..42fa58a7344 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10777,7 +10777,6 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; inherit (callPackages ../servers/http/tomcat { }) - tomcat6 tomcat7 tomcat8 tomcat85 From 7b17c5bc6e003d7e6dbfa633054e83a557486ff9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:28:01 -0500 Subject: [PATCH 105/273] tomcat7: 7.0.73 -> 7.0.75 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index ac507794a91..e1041a642a5 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,8 +32,8 @@ let in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.73"; - sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f"; + versionMinor = "0.75"; + sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni"; }; tomcat8 = common { From f246ea0de2b914dcc75d14db53b5de2da0b5b217 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:28:34 -0500 Subject: [PATCH 106/273] tomcat8: 8.0.39 -> 8.0.41 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index e1041a642a5..47bd377247a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -38,8 +38,8 @@ in { tomcat8 = common { versionMajor = "8"; - versionMinor = "0.39"; - sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0"; + versionMinor = "0.41"; + sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5"; }; tomcat85 = common { From ae3820bad9594c8d3f522026111a3c87f1c4a21f Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:29:24 -0500 Subject: [PATCH 107/273] tomcat85: 8.5.9 -> 8.5.11 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 47bd377247a..46de5db5b69 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -44,8 +44,8 @@ in { tomcat85 = common { versionMajor = "8"; - versionMinor = "5.9"; - sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np"; + versionMinor = "5.11"; + sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn"; }; tomcatUnstable = common { From 33bf23bbcaabdbba5227a8dbecfca02f74cea90d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 17 Feb 2017 22:30:41 -0500 Subject: [PATCH 108/273] tomcatUnstable: 9.0.0.M15 -> 9.0.0.M17 --- pkgs/servers/http/tomcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 46de5db5b69..12d6f8996ad 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -50,7 +50,7 @@ in { tomcatUnstable = common { versionMajor = "9"; - versionMinor = "0.0.M15"; - sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432"; + versionMinor = "0.0.M17"; + sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg"; }; } From 70cadb6cbd09f1d62d19b3a0381e00449eac53f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Feb 2017 09:04:03 +0100 Subject: [PATCH 109/273] krita: 3.1.1 -> 3.1.2.1 This fixes build after KDE updates in f228ea521 #22698. /cc maintainer @abbradar. I only tested starting it up. --- pkgs/applications/graphics/krita/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index af6d3e492c4..dcd5c28172e 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { name = "krita-${version}"; - version = "3.1.1"; + ver_min = "3.1.2"; + version = "${ver_min}.1"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "13qff9kdd38x81rq6yfmkm3083l8s0yn9h3d5qg3qmhrkd5jrvv2"; + url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz"; + sha256 = "934ed82c3f4e55e7819b327c838ea2f307d3bf3d040722501378b01d76a3992d"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ]; From 43dbd916efa828ccd5ec7f77ef38b16044a3e049 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 18 Feb 2017 16:57:13 +0800 Subject: [PATCH 110/273] calibre: 2.76.0 -> 2.79.1 --- pkgs/applications/misc/calibre/default.nix | 4 +-- .../calibre/dont_build_unrar_plugin.patch | 27 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5c05d1e1787..16ac38b3263 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.76.0"; + version = "2.79.1"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"; + sha256 = "0slk3cili50a8kwwsk6syqqrcz0yx8yjvhm8gyggn2k2kpqjax15"; }; patches = [ diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 522b2e6202c..71cc688f7da 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,13 +1,8 @@ -Author: Dmitry Shachnev -Description: do not build unrar extension as we strip unrar from the tarball -Forwarded: not-needed -Last-Update: 2013-04-04 - -Index: calibre/setup/extensions.json -=================================================================== ---- calibre.orig/setup/extensions.json -+++ calibre/setup/extensions.json -@@ -211,14 +211,5 @@ +diff --git a/setup/extensions.json b/setup/extensions.json +index 1f6d1fb..1273904 100644 +--- a/setup/extensions.json ++++ b/setup/extensions.json +@@ -211,16 +211,5 @@ "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", "libraries": "mtp" @@ -18,15 +13,17 @@ Index: calibre/setup/extensions.json - "inc_dirs": "unrar", - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", - "windows_defines": "SILENT RARDLL UNRAR", +- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE", +- "haiku_libraries": "bsd", - "optimize_level": 2, - "windows_libraries": "User32 Advapi32 kernel32 Shell32" } ] -Index: calibre/src/calibre/ebooks/metadata/archive.py -=================================================================== ---- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 -+++ calibre/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.502954007 +0100 -@@ -42,7 +42,7 @@ +diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py +index 938ab24..1e095f8 100644 +--- a/src/calibre/ebooks/metadata/archive.py ++++ b/src/calibre/ebooks/metadata/archive.py +@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin): description = _('Extract common e-book formats from archives ' '(zip/rar) files. Also try to autodetect if they are actually ' 'cbz/cbr files.') From ae91514b269afc8053d55d8ba8cb1515c6b6683c Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 18 Feb 2017 10:00:04 +0000 Subject: [PATCH 111/273] gapi-ocaml: 0.2.10 -> 0.3.1 --- pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 224f3537a2e..8ead12427fd 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { - name = "gapi-ocaml-0.2.10"; + name = "gapi-ocaml-0.3.1"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; - sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; + url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz"; + sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i"; }; buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; From 1f9d33b9e4e704b0c04adb8566b01375a873bf5c Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 18 Feb 2017 10:01:36 +0000 Subject: [PATCH 112/273] google-drive-ocamlfuse: 0.5.22 -> 0.6.17 --- .../networking/google-drive-ocamlfuse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 0a938766e93..64519ce17d5 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -2,12 +2,12 @@ , ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { - name = "google-drive-ocamlfuse-${version}"; - version = "0.5.22"; + name = "google-drive-ocamlfuse-${version}"; + version = "0.6.17"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1587/${name}.tar.gz"; - sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab"; + url = "https://forge.ocamlcore.org/frs/download.php/1674/${name}.tar.gz"; + sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; }; buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; From 0c488ed8f0d1af52c219f0632d4752d3d9ebb9d9 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 18 Feb 2017 10:10:50 +0000 Subject: [PATCH 113/273] keepass: 2.34 -> 2.35 --- pkgs/applications/misc/keepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 5eaad6514e1..57f6cfc4c4b 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.34"; + version = "2.35"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa"; + sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz"; }; sourceRoot = "."; From db9509767434c29bd83adf455c4d7a98cb1ca8b0 Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 18 Feb 2017 10:39:01 +0000 Subject: [PATCH 114/273] syscall_limiter: 20160105 -> 20170123 --- .../linux/syscall_limiter/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index 658137a569e..a5c69e1d876 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -6,16 +6,14 @@ }: stdenv.mkDerivation rec { - name = "syscall_limiter-${version}"; - version = "${date}-${stdenv.lib.strings.substring 0 7 rev}"; - date = "20160105"; - rev = "b02c0316a2aaff496f712f1467e20337006655cc"; + name = "syscall_limiter-${version}"; + version = "20170123"; src = fetchFromGitHub { - owner = "vi"; - repo = "syscall_limiter"; - inherit rev; - sha256 = "14q5k5c8hk7gnxhgwaamwbibasb3pwj6jnqsxa1bdp16n6jdajxd"; + owner = "vi"; + repo = "syscall_limiter"; + rev = "481c8c883f2e1260ebc83b352b63bf61a930a341"; + sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m"; }; configurePhase = ""; @@ -35,9 +33,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Start Linux programs with only selected syscalls enabled"; - homepage = https://github.com/vi/syscall_limiter; - license = licenses.mit; + homepage = https://github.com/vi/syscall_limiter; + license = licenses.mit; maintainers = with maintainers; [ obadz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } From 92f66c252033c1a4afd4e78bc00ef8d000819cf4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 18 Feb 2017 12:12:22 +0100 Subject: [PATCH 115/273] khard: 0.11.3 -> 0.11.4 --- pkgs/applications/misc/khard/default.nix | 30 ++---------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index da6dece237e..3a87e854dc1 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,39 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }: -let - vobject = python3Packages.buildPythonPackage rec { - version = "0.9.2"; - name = "vobject-${version}"; - - src = fetchFromGitHub { - owner = "eventable"; - repo = "vobject"; - sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; - rev = version; - }; - - disabled = python3Packages.isPyPy; - - propagatedBuildInputs = with python3Packages; [ dateutil ]; - - checkPhase = "${python3Packages.python.interpreter} tests.py"; - - meta = with stdenv.lib; { - description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; - license = licenses.asl20; - maintainers = [ maintainers.matthiasbeyer ]; - }; - }; -in python3Packages.buildPythonApplication rec { - version = "0.11.3"; + version = "0.11.4"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69"; + sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r"; }; # setup.py reads the UTF-8 encoded readme. From 69ea45da63c1e58a9132206df989cafaaa21377e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Feb 2017 12:28:07 +0100 Subject: [PATCH 116/273] lxqt.screengrab: fixup build after KDE updates /cc #22698 and maintainer @romildo. --- pkgs/desktops/lxqt/optional/screengrab/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 99a372553a1..2ef1c7532a5 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + meta = with stdenv.lib; { description = "Crossplatform tool for fast making screenshots"; homepage = https://github.com/lxde/screengrab; From 9d82b3ebebb5752c2ba437e64834692af19f9689 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 28 Jan 2017 20:38:28 -0200 Subject: [PATCH 117/273] Intercal: a little fix Intercal doesn't build with the most recent version of flex - it complains with an "undefined reference to `yywrap'" in the link phase. So, we need to downgrade flex. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b178665b81..c6a7f0d0cdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5143,7 +5143,9 @@ with pkgs; ikarus = callPackage ../development/compilers/ikarus { }; - intercal = callPackage ../development/compilers/intercal { }; + intercal = callPackage ../development/compilers/intercal { + flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3 + }; irony-server = callPackage ../development/tools/irony-server/default.nix { # The repository of irony to use -- must match the version of the employed emacs From 0db10d76d2a28f57ececd36058f13091b88728db Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Sat, 18 Feb 2017 16:31:02 +0530 Subject: [PATCH 118/273] kafka: 0.8.2.1 -> 0.8.2.2 --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 4041eae6468..2d3a74e18aa 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,9 +3,9 @@ let versionMap = { - "0.8" = { kafkaVersion = "0.8.2.1"; + "0.8" = { kafkaVersion = "0.8.2.2"; scalaVersion = "2.10"; - sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9"; + sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v"; }; "0.9" = { kafkaVersion = "0.9.0.1"; scalaVersion = "2.11"; From 47c214cc2ac2bf83dac05b96f6807610a6743fe4 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 18 Feb 2017 00:40:54 +0100 Subject: [PATCH 119/273] fix comments about nixos-hardware-scan It has been renamed to nixos-generate-config in 3ed4173 --- nixos/modules/installer/scan/detected.nix | 2 +- nixos/modules/installer/scan/not-detected.nix | 2 +- nixos/modules/system/boot/kernel.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index f350cd986af..e72c7853294 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -1,4 +1,4 @@ -# List all devices which are detected by nixos-hardware-scan. +# List all devices which are detected by nixos-generate-config. # Common devices are enabled by default. { config, lib, pkgs, ... }: diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix index b30c569ed2a..e1a3052ba95 100644 --- a/nixos/modules/installer/scan/not-detected.nix +++ b/nixos/modules/installer/scan/not-detected.nix @@ -1,4 +1,4 @@ -# List all devices which are _not_ detected by nixos-hardware-scan. +# List all devices which are _not_ detected by nixos-generate-config. # Common devices are enabled by default. { config, lib, pkgs, ... }: diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index e751ff141f7..cf70a891c0c 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -176,7 +176,7 @@ in boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) - # shouldn't be included by default since nixos-hardware-scan + # shouldn't be included by default since nixos-generate-config # detects them, but I'm keeping them for now for backwards # compatibility. From 741770c99abbd6a165b5a7b0d8206aebba671de7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 18 Feb 2017 04:54:15 +0100 Subject: [PATCH 120/273] network-interface service: tuntap ifs have netdev services --- nixos/modules/tasks/network-interfaces-scripted.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index cf90f05e8d3..9264434d843 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -49,7 +49,8 @@ in deviceDependency = dev: # Use systemd service if we manage device creation, else # trust udev when not in a container - if (hasAttr dev cfg.bridges) || + if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) || + (hasAttr dev cfg.bridges) || (hasAttr dev cfg.bonds) || (hasAttr dev cfg.macvlans) || (hasAttr dev cfg.sits) || From 5236e235022ca8542f934938866fe2c9de11bfcc Mon Sep 17 00:00:00 2001 From: Rene Treffer Date: Sat, 18 Feb 2017 13:43:59 +0100 Subject: [PATCH 121/273] prometheus-bind-exporter: init at 20161221 prometheus-bind-exporter: init at 20161221 --- lib/maintainers.nix | 1 + .../monitoring/prometheus/bind-exporter.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 26 insertions(+) create mode 100644 pkgs/servers/monitoring/prometheus/bind-exporter.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cb3ba191a71..89c08872698 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -428,6 +428,7 @@ rongcuid = "Rongcui Dong "; ronny = "Ronny Pfannschmidt "; rszibele = "Richard Szibele "; + rtreffer = "Rene Treffer "; rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix new file mode 100644 index 00000000000..db58c7e14e5 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "bind_exporter-${version}"; + version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; + + goPackagePath = "github.com/digitalocean/bind_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "digitalocean"; + repo = "bind_exporter"; + sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm"; + }; + + meta = with stdenv.lib; { + description = "Prometheus exporter for bind9 server"; + homepage = https://github.com/digitalocean/bind_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ rtreffer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 171ce7a2464..c0c59450d1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10640,6 +10640,7 @@ with pkgs; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; + prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; From 979d20794d8651d7ac5c86ad37b68eacbadc5cc1 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Sat, 18 Feb 2017 22:25:24 +0900 Subject: [PATCH 122/273] buildRebar3: fix buildPhase & cleanup (#22744) --- .../development/beam-modules/build-rebar3.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix index f783683cd4a..de2c6d40d40 100644 --- a/pkgs/development/beam-modules/build-rebar3.nix +++ b/pkgs/development/beam-modules/build-rebar3.nix @@ -26,6 +26,10 @@ let buildInputs = [ drv ]; }; + customPhases = filterAttrs + (_: v: v != null) + { inherit setupHook configurePhase buildPhase installPhase; }; + pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; @@ -41,37 +45,30 @@ let inherit src; - setupHook = if setupHook == null - then writeText "setupHook.sh" '' + setupHook = writeText "setupHook.sh" '' addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" - '' - else setupHook; + ''; postPatch = '' rm -f rebar rebar3 '' + postPatch; - configurePhase = if configurePhase == null - then '' + configurePhase = '' runHook preConfigure ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag} runHook postConfigure - '' - else configurePhase; + ''; - buildPhase = if buildPhase == null - then '' + buildPhase = '' runHook preBuild HOME=. rebar3 compile ${if compilePorts then '' HOME=. rebar3 pc compile '' else ''''} runHook postBuild - '' - else installPhase; + ''; - installPhase = if installPhase == null - then '' + installPhase = '' runHook preInstall mkdir -p "$out/lib/erlang/lib/${name}-${version}" for reldir in src ebin priv include; do @@ -81,8 +78,7 @@ let success=1 done runHook postInstall - '' - else installPhase; + ''; meta = { inherit (erlang.meta) platforms; @@ -93,6 +89,6 @@ let env = shell self; inherit beamDeps; }; - }); + } // customPhases); in fix pkg From 7901a7a65f10c820fbc7b3887e564cc2cd99b975 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sat, 18 Feb 2017 08:25:49 -0500 Subject: [PATCH 123/273] dgsh-unstable: Init at 2017-02-05 (#22657) Dgsh is the directed graph shell --- pkgs/shells/dgsh/default.nix | 41 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/shells/dgsh/default.nix diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix new file mode 100644 index 00000000000..51319aef90a --- /dev/null +++ b/pkgs/shells/dgsh/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, + libtool, check, bison, git, gperf, + perl, texinfo, help2man, gettext, ncurses +}: + +stdenv.mkDerivation rec { + name = "dgsh-unstable-${version}"; + version = "2017-02-05"; + + src = fetchFromGitHub { + owner = "dspinellis"; + repo = "dgsh"; + rev = "bc4fc2e8009c069ee4df5140c32a2fc15d0acdec"; + sha256 = "0k3hmnarz56wphw45mabn5zcc427l5p77jldh1qqy89pxqy1wnql"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig libtool check + bison git gettext gperf perl texinfo help2man ncurses + ]; + + configurePhase = '' + cp -r ./unix-tools/coreutils/gnulib gnulib + perl -pi -e \ + 's#./bootstrap #./bootstrap --no-bootstrap-sync --skip-po --no-git --gnulib-srcdir='$PWD/gnulib' #g' \ + unix-tools/Makefile + find . -name \*.diff | xargs rm -f + rm -rf unix-tools/*/gnulib + patchShebangs unix-tools/diffutils/man/help2man + export RSYNC=true # set to rsync binary, eventhough it is not used. + make PREFIX=$out config + ''; + + meta = with stdenv.lib; { + description = "The Directed Graph Shell"; + homepage = http://www.dmst.aueb.gr/dds/sw/dgsh; + license = with licenses; asl20; + maintainers = with maintainers; [ vrthra ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89a547d3f58..6d48f8972e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -494,6 +494,8 @@ with pkgs; djmount = callPackage ../tools/filesystems/djmount { }; + dgsh = callPackage ../shells/dgsh { }; + elvish = callPackage ../shells/elvish { }; encryptr = callPackage ../tools/security/encryptr { From 17c5ca9018619d819c48e25add78f47d7d575611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 18 Feb 2017 14:33:26 +0100 Subject: [PATCH 124/273] haskell: add nix-specific fixes for various packages in stackage With these overrides, nearly all of the stackage packages in the latest stackage release should compile now. --- .../haskell-modules/configuration-common.nix | 27 +-------- .../haskell-modules/configuration-nix.nix | 60 ++++++++++++++++++- 2 files changed, 61 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0a0c7ee0644..f6c677f0bd0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,6 +41,8 @@ self: super: { nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; + + # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; # This test keeps being aborted because it runs too quietly for too long @@ -228,7 +230,6 @@ self: super: { wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; - hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; @@ -278,7 +279,6 @@ self: super: { dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; - either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw @@ -307,7 +307,6 @@ self: super: { hi = dontCheck super.hi; hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; - hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; @@ -427,9 +426,6 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/afcowie/http-streams/issues/80 - http-streams = dontCheck super.http-streams; - # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; @@ -451,9 +447,6 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # https://github.com/alephcloud/hs-configuration-tools/issues/40 - configuration-tools = dontCheck super.configuration-tools; - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; @@ -695,13 +688,6 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; - # Fix tests which would otherwise fail with "Couldn't launch intero process." - intero = overrideCabal super.intero (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\"" - ''; - }); - # https://github.com/commercialhaskell/stack/issues/3001 stack = doJailbreak super.stack; @@ -736,14 +722,7 @@ self: super: { }); # test suite cannot find its own "idris" binary - idris = overrideCabal super.idris (drv: { - # "idris" binary cannot find Idris library otherwise while building. After - # installing it's completely fine though. This seems like a bug in Idris - # that's related to builds with shared libraries enabled. It would be great - # if someone who knows a thing or two about Idris could look into this. - preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; - doCheck = false; - }); + idris = dontCheck super.idris; # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bd74e0e6e04..c62d2702b44 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,6 +167,13 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; + typed-process = dontCheck super.typed-process; + js-jquery = dontCheck super.js-jquery; + hPDB-examples = dontCheck super.hPDB-examples; + configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40 + tcp-streams = dontCheck super.tcp-streams; + holy-project = dontCheck super.holy-project; + mustache = dontCheck super.mustache; # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; @@ -378,13 +385,62 @@ self: super: builtins.intersectAttrs super { idris = overrideCabal super.idris (drv: { # https://github.com/idris-lang/Idris-dev/issues/2499 librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; + + # tests and build run executable, so need to set LD_LIBRARY_PATH + preBuild = '' + export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" + ''; }); libsystemd-journal = overrideCabal super.libsystemd-journal (old: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); - # Needs network in tests. - typed-process = dontCheck super.typed-process; + # does not specify tests in cabal file, instead has custom runTest cabal hook, + # so cabal2nix will not detect test dependencies. + either-unwrap = overrideCabal super.either-unwrap (drv: { + testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; + }); + hidapi = addExtraLibrary super.hidapi pkgs.libudev; + + hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; + + discount = super.discount.override { markdown = pkgs.discount; }; + + # tests require working stack installation with all-cabal-hashes cloned in $HOME + stackage-curator = dontCheck super.stackage-curator; + + # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59 + io-streams = enableCabalFlag super.io-streams "NoInteractiveTests"; + + # requires autotools to build + secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ]; + + # tests require git + hapistrano = addBuildTool super.hapistrano pkgs.git; + + # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) + gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; + gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; + + # requires valid, writeable $HOME + hatex-guide = overrideCabal super.hatex-guide (drv: { + preConfigure = '' + ${drv.preConfigure or ""} + export HOME=$PWD + ''; + }); + + # Fails to link against with newer gsl versions because a deprecrated function + # was removed + hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; + + # tests run executable, relying on PATH + # without this, tests fail with "Couldn't launch intero process" + intero = overrideCabal super.intero (drv: { + preCheck = '' + export PATH="$PWD/dist/build/intero:$PATH" + ''; + }); } From 405e117d310b2c1e3b281623de2aafca42045a55 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 18 Feb 2017 13:44:56 +0100 Subject: [PATCH 125/273] php70: 7.0.15 -> 7.0.16 --- 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 b7777d55667..f0cb412e026 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -315,8 +315,8 @@ in { }; php70 = generic { - version = "7.0.15"; - sha256 = "1nbxwj4yx30k77qibhmnx0rvqhia1zbkwi5ps5nzm0sn6d3zkj58"; + version = "7.0.16"; + sha256 = "1awp6l5bs7qkvak9hgn1qbwkn6303mprslmgcfjyq3ywfmszbic3"; }; php71 = generic { From 78abfe951b0af77da3d7865e598fc1393d3a6b2f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 18 Feb 2017 13:45:12 +0100 Subject: [PATCH 126/273] php71: 7.1.1 -> 7.1.2 --- 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 f0cb412e026..116d4adf204 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -320,7 +320,7 @@ in { }; php71 = generic { - version = "7.1.1"; - sha256 = "1g3mqscxnsic9ypf641jhiyn95d4d1nz198539245v2lgffx74fp"; + version = "7.1.2"; + sha256 = "013hlvzjmp7ilckqf3851xwmj37xzq6afsqm67i4whv64d723wp0"; }; } From 5e0b978eff60998d9b2ff7152e87e876a3296169 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 18 Feb 2017 06:44:31 -0800 Subject: [PATCH 127/273] mwprocapture: init at 1.2.3269 (#22160) --- .../hardware/video/capture/mwprocapture.nix | 61 +++++++++++++++++ nixos/modules/module-list.nix | 1 + .../linux/mwprocapture/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 130 insertions(+) create mode 100644 nixos/modules/hardware/video/capture/mwprocapture.nix create mode 100644 pkgs/os-specific/linux/mwprocapture/default.nix diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix new file mode 100644 index 00000000000..aee15dcec6e --- /dev/null +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -0,0 +1,61 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.mwProCapture; + + kernelPackages = config.boot.kernelPackages; + +in + +{ + + options.hardware.mwProCapture.enable = mkEnableOption "Magewell Pro Capture family kernel module"; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = versionAtLeast kernelPackages.kernel.version "3.2"; + message = "Magewell Pro Capture family module is not supported for kernels older than 3.2"; + }; + + boot.kernelModules = [ "ProCapture" ]; + + environment.systemPackages = [ kernelPackages.mwprocapture ]; + + boot.extraModulePackages = [ kernelPackages.mwprocapture ]; + + boot.extraModprobeConfig = '' + # Set the png picture to be displayed when no input signal is detected. + options ProCapture nosignal_file=${kernelPackages.mwprocapture}/res/NoSignal.png + + # Set the png picture to be displayed when an unsupported input signal is detected. + options ProCapture unsupported_file=${kernelPackages.mwprocapture}/res/Unsupported.png + + # Set the png picture to be displayed when an loking input signal is detected. + options ProCapture locking_file=${kernelPackages.mwprocapture}/res/Locking.png + + # Message signaled interrupts switch + #options ProCapture disable_msi=0 + + # Set the debug level + #options ProCapture debug_level=0 + + # Force init switch eeprom + #options ProCapture init_switch_eeprom=0 + + # Min frame interval for VIDIOC_ENUM_FRAMEINTERVALS (default: 166666(100ns)) + #options ProCapture enum_frameinterval_min=166666 + + # VIDIOC_ENUM_FRAMESIZES type (1: DISCRETE; 2: STEPWISE; otherwise: CONTINUOUS ) + #options ProCapture enum_framesizes_type=0 + + # Parameters for internal usage + #options ProCapture internal_params="" + ''; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2195a828a1e..5cd60e1b9d7 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -41,6 +41,7 @@ ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix + ./hardware/video/capture/mwprocapture.nix ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix new file mode 100644 index 00000000000..f09e9543c48 --- /dev/null +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, kernel, alsaLib }: + +# The Magewell Pro Capture drivers are not supported for kernels older than 3.2 +assert stdenv.lib.versionAtLeast kernel.version "3.2.0"; + +# this package currently only supports x86 and x86_64, as I have no ARM device to test on +assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux"); + +let + bits = + if stdenv.is64bit then "64" + else "32"; + + libpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ]; + +in +stdenv.mkDerivation rec { + name = "mwprocapture-1.2.${version}-${kernel.version}"; + version = "3269"; + + src = fetchurl { + url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz"; + sha256 = "0i1y50mf559flhxgaxy2gdpa7dvpp12ix9xfzgxa61rc135x0im4"; + }; + + preConfigure = + '' + cd ./src + export INSTALL_MOD_PATH="$out" + ''; + + hardeningDisable = [ "pic" "format" ]; + + makeFlags = [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + postInstall = '' + cd ../ + mkdir -p $out/bin + cp bin/mwcap-control_${bits} $out/bin/mwcap-control + cp bin/mwcap-info_${bits} $out/bin/mwcap-info + mkdir -p $out/lib/udev/rules.d + # source has a filename typo + cp scripts/10-procatpure-event-dev.rules $out/lib/udev/rules.d/10-procapture-event-dev.rules + cp -r src/res $out + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "${libpath}" \ + "$out"/bin/mwcap-control + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "${libpath}" \ + "$out"/bin/mwcap-info + ''; + + meta = with stdenv.lib; { + homepage = http://www.magewell.com/; + description = "Linux driver for the Magewell Pro Capture family"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ MP2E ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d48f8972e1..197b2970b46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11425,6 +11425,8 @@ with pkgs; mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; + mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; /* compiles but has to be integrated into the kernel somehow From 313ccd5be3bfe780356615d22e54428fdb4c165b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 18 Feb 2017 15:51:07 +0100 Subject: [PATCH 128/273] network-interfaces service: fix typo in bonding options --- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 736292400fd..8b85ff0057f 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -126,7 +126,7 @@ in ms = trans (v: v + "ms"); in { Mode = simp "mode"; - TransmitHashPolixy = simp "xmit_hash_policy"; + TransmitHashPolicy = simp "xmit_hash_policy"; LACPTransmitRate = simp "lacp_rate"; MIIMonitorSec = ms "miimon"; UpDelaySec = ms "updelay"; From 31dac10c330faf453ba946cbf558c04ca19102b9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 16 Feb 2017 01:17:31 +0100 Subject: [PATCH 129/273] mpd: add avahi zeroconf support --- pkgs/servers/mpd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index b1aa8034143..e2ec4a7617d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib +, avahiSupport ? true, avahi, dbus , flacSupport ? true, flac , vorbisSupport ? true, libvorbis , madSupport ? true, libmad @@ -26,6 +27,8 @@ , soundcloudSupport ? true, yajl }: +assert avahiSupport -> avahi != null && dbus != null; + let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; @@ -45,6 +48,8 @@ in stdenv.mkDerivation rec { ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib + ++ opt avahiSupport avahi + ++ opt avahiSupport dbus ++ opt flacSupport flac ++ opt vorbisSupport libvorbis # using libmad to decode mp3 files on darwin is causing a segfault -- there @@ -101,6 +106,7 @@ in stdenv.mkDerivation rec { (mkFlag opusSupport "opus") (mkFlag soundcloudSupport "soundcloud") "--enable-debug" + "--with-zeroconf=avahi" ] ++ opt stdenv.isLinux "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; From 2b0469c48f3211425ed06ae3ee5f257f97d9753c Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Thu, 16 Feb 2017 01:17:44 +0100 Subject: [PATCH 130/273] modules/mpd: factor out name & mention man 5 mpd.conf --- nixos/modules/services/audio/mpd.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index a89215d7382..56af8fe152e 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -4,6 +4,8 @@ with lib; let + name = "mpd"; + uid = config.ids.uids.mpd; gid = config.ids.gids.mpd; cfg = config.services.mpd; @@ -54,13 +56,14 @@ in { description = '' Extra directives added to to the end of MPD's configuration file, mpd.conf. Basic configuration like file location and uid/gid - is added automatically to the beginning of the file. + is added automatically to the beginning of the file. For available + options see man 5 mpd.conf'. ''; }; dataDir = mkOption { type = types.path; - default = "/var/lib/mpd"; + default = "/var/lib/${name}"; description = '' The directory where MPD stores its state, tag cache, playlists etc. @@ -69,13 +72,13 @@ in { user = mkOption { type = types.str; - default = "mpd"; + default = name; description = "User account under which MPD runs."; }; group = mkOption { type = types.str; - default = "mpd"; + default = name; description = "Group account under which MPD runs."; }; @@ -131,17 +134,17 @@ in { }; }; - users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton { + users.extraUsers = optionalAttrs (cfg.user == name) (singleton { inherit uid; - name = "mpd"; + inherit name; group = cfg.group; extraGroups = [ "audio" ]; description = "Music Player Daemon user"; home = "${cfg.dataDir}"; }); - users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton { - name = "mpd"; + users.extraGroups = optionalAttrs (cfg.group == name) (singleton { + inherit name; gid = gid; }); }; From f78f207f1775fbf37c67e546b77ba206c107da36 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 17 Feb 2017 18:04:45 +0100 Subject: [PATCH 131/273] nixos.samba: add enableNmbd and enableWinbindd options This allows for disabling these services, in case they are not needed. --- .../services/network-filesystems/samba.nix | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 09a11585bc9..6ae5292fc30 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -91,6 +91,26 @@ in ''; }; + enableNmbd = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Samba's nmbd, which replies to NetBIOS over IP name + service requests. It also participates in the browsing protocols + which make up the Windows "Network Neighborhood" view. + ''; + }; + + enableWinbindd = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Samba's winbindd, which provides a number of services + to the Name Service Switch capability found in most modern C libraries, + to arbitrary applications via PAM and ntlm_auth and to Samba itself. + ''; + }; + package = mkOption { type = types.package; default = pkgs.samba; @@ -185,7 +205,12 @@ in ###### implementation config = mkMerge - [ { # Always provide a smb.conf to shut up programs like smbclient and smbspool. + [ { assertions = + [ { assertion = cfg.nsswins -> cfg.enableWinbindd; + message = "If samba.nsswins is enabled, then samba.enableWinbindd must also be enabled"; + } + ]; + # Always provide a smb.conf to shut up programs like smbclient and smbspool. environment.etc = singleton { source = if cfg.enable then configFile @@ -194,7 +219,7 @@ in }; } - (mkIf config.services.samba.enable { + (mkIf cfg.enable { system.nssModules = optional cfg.nsswins samba; @@ -207,9 +232,9 @@ in }; services = { - "samba-nmbd" = daemonService "nmbd" "-F"; "samba-smbd" = daemonService "smbd" "-F"; - "samba-winbindd" = daemonService "winbindd" "-F"; + "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F"); + "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F"); "samba-setup" = { description = "Samba Setup Task"; script = setupScript; From 713918a094d7d6ad0d75aea16e4b1f5b316f8c59 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 18 Feb 2017 17:47:36 +0300 Subject: [PATCH 132/273] haskellPackages.pointfree: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f6c677f0bd0..34907151f0b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -844,4 +844,10 @@ self: super: { # https://github.com/xmonad/xmonad-extras/issues/3 xmonad-extras = doJailbreak super.xmonad-extras; + + # https://github.com/bmillwood/pointfree/issues/21 + pointfree = appendPatch super.pointfree (pkgs.fetchpatch { + url = "https://github.com/bmillwood/pointfree/pull/22.patch"; + sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; + }); } From 32560d26998fb593d512ac8dce0946486bb299f1 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 18 Feb 2017 19:23:35 +0300 Subject: [PATCH 133/273] haskellPackages.lambdabot: fix build --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 34907151f0b..8b363bfedad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -850,4 +850,16 @@ self: super: { url = "https://github.com/bmillwood/pointfree/pull/22.patch"; sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; }); + + # https://github.com/int-e/QuickCheck-safe/issues/2 + QuickCheck-safe = doJailbreak super.QuickCheck-safe; + + # https://github.com/mokus0/dependent-sum-template/issues/7 + dependent-sum-template = doJailbreak super.dependent-sum-template; + + # https://github.com/jcristovao/newtype-generics/issues/13 + newtype-generics = doJailbreak super.newtype-generics; + + # https://github.com/lambdabot/lambdabot/issues/158 + lambdabot-core = doJailbreak super.lambdabot-core; } From fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 18 Feb 2017 12:48:05 -0600 Subject: [PATCH 134/273] Revert "haskell: add nix-specific fixes for various packages in stackage" This reverts commit 17c5ca9018619d819c48e25add78f47d7d575611. This commit causes an evaluation error due to infinite recursion, which can be tested by running: ``` $ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null ``` --- .../haskell-modules/configuration-common.nix | 27 ++++++++- .../haskell-modules/configuration-nix.nix | 60 +------------------ 2 files changed, 26 insertions(+), 61 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8b363bfedad..a2b4c375212 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,8 +41,6 @@ self: super: { nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; - - # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; # This test keeps being aborted because it runs too quietly for too long @@ -230,6 +228,7 @@ self: super: { wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; + hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; @@ -279,6 +278,7 @@ self: super: { dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; + either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw @@ -307,6 +307,7 @@ self: super: { hi = dontCheck super.hi; hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; + hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; @@ -426,6 +427,9 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); + # https://github.com/afcowie/http-streams/issues/80 + http-streams = dontCheck super.http-streams; + # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; @@ -447,6 +451,9 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; + # https://github.com/alephcloud/hs-configuration-tools/issues/40 + configuration-tools = dontCheck super.configuration-tools; + # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; @@ -688,6 +695,13 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; + # Fix tests which would otherwise fail with "Couldn't launch intero process." + intero = overrideCabal super.intero (drv: { + postPatch = (drv.postPatch or "") + '' + substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\"" + ''; + }); + # https://github.com/commercialhaskell/stack/issues/3001 stack = doJailbreak super.stack; @@ -722,7 +736,14 @@ self: super: { }); # test suite cannot find its own "idris" binary - idris = dontCheck super.idris; + idris = overrideCabal super.idris (drv: { + # "idris" binary cannot find Idris library otherwise while building. After + # installing it's completely fine though. This seems like a bug in Idris + # that's related to builds with shared libraries enabled. It would be great + # if someone who knows a thing or two about Idris could look into this. + preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; + doCheck = false; + }); # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c62d2702b44..bd74e0e6e04 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,13 +167,6 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; - typed-process = dontCheck super.typed-process; - js-jquery = dontCheck super.js-jquery; - hPDB-examples = dontCheck super.hPDB-examples; - configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40 - tcp-streams = dontCheck super.tcp-streams; - holy-project = dontCheck super.holy-project; - mustache = dontCheck super.mustache; # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; @@ -385,62 +378,13 @@ self: super: builtins.intersectAttrs super { idris = overrideCabal super.idris (drv: { # https://github.com/idris-lang/Idris-dev/issues/2499 librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; - - # tests and build run executable, so need to set LD_LIBRARY_PATH - preBuild = '' - export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" - ''; }); libsystemd-journal = overrideCabal super.libsystemd-journal (old: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); - # does not specify tests in cabal file, instead has custom runTest cabal hook, - # so cabal2nix will not detect test dependencies. - either-unwrap = overrideCabal super.either-unwrap (drv: { - testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; - }); + # Needs network in tests. + typed-process = dontCheck super.typed-process; - hidapi = addExtraLibrary super.hidapi pkgs.libudev; - - hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; - - discount = super.discount.override { markdown = pkgs.discount; }; - - # tests require working stack installation with all-cabal-hashes cloned in $HOME - stackage-curator = dontCheck super.stackage-curator; - - # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59 - io-streams = enableCabalFlag super.io-streams "NoInteractiveTests"; - - # requires autotools to build - secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ]; - - # tests require git - hapistrano = addBuildTool super.hapistrano pkgs.git; - - # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) - gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; - gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; - - # requires valid, writeable $HOME - hatex-guide = overrideCabal super.hatex-guide (drv: { - preConfigure = '' - ${drv.preConfigure or ""} - export HOME=$PWD - ''; - }); - - # Fails to link against with newer gsl versions because a deprecrated function - # was removed - hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; - - # tests run executable, relying on PATH - # without this, tests fail with "Couldn't launch intero process" - intero = overrideCabal super.intero (drv: { - preCheck = '' - export PATH="$PWD/dist/build/intero:$PATH" - ''; - }); } From bd97e19d011eeafb4a182018ab2e247d9e6e83a3 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Feb 2017 13:10:00 -0600 Subject: [PATCH 135/273] epic5: changed rm, cp, chmod to use pkgs.coreutils epic5: removed pkgs from pkgs.coreutils modified: pkgs/applications/networking/irc/epic5/default.nix --- pkgs/applications/networking/irc/epic5/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 2daeab5d302..35e436eb715 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl }: +{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }: stdenv.mkDerivation rec { name = "epic5-${version}"; @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { postConfigure = '' substituteInPlace bsdinstall \ - --replace /bin/cp cp \ - --replace /bin/rm rm \ - --replace /bin/chmod chmod + --replace /bin/cp ${coreutils}/bin/cp \ + --replace /bin/rm ${coreutils}/bin/rm \ + --replace /bin/chmod ${coreutils}/bin/chmod \ ''; meta = with stdenv.lib; { - homepage = "http://epicsol.org/"; - description = "a IRC client that offers a great ircII interface"; + homepage = "http://epicsol.org"; + description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; maintainers = [ maintainers.ndowens ]; }; From e3f5ebd38ff18482fc166ad6eef4bd3556d2df6f Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 18 Feb 2017 13:26:18 -0600 Subject: [PATCH 136/273] worker: add version to name and so some minor cleanups (#22949) --- pkgs/applications/misc/worker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index fade4905cfc..00e42fdbba9 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -1,18 +1,18 @@ -{pkgs, stdenv, xorg, fetchurl }: +{ stdenv, libX11, fetchurl }: stdenv.mkDerivation rec { - name = "worker"; + name = "worker-${version}"; version = "3.8.5"; src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz"; + url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz"; sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; }; - buildInputs = with pkgs; [ xorg.libX11 ]; + buildInputs = [ libX11 ]; meta = with stdenv.lib; { - description = "a two-pane file manager with advanced file manipulation features"; + description = "A two-pane file manager with advanced file manipulation features"; homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; license = licenses.gpl2; maintainers = [ maintainers.ndowens ]; From fccea078699c9bef851e630d34fbb6eb9a0acdfa Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 18 Feb 2017 20:27:23 +0100 Subject: [PATCH 137/273] glances: 2.7.1_1 -> 2.8.2 --- 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 b93c25262bd..82d7f848a4f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12205,14 +12205,14 @@ in { glances = buildPythonPackage rec { name = "glances-${version}"; - version = "2.7.1_1"; + version = "2.8.2"; disabled = isPyPy; src = pkgs.fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0gc2qgpzmy7q31z8b11ls4ifb0lwrz94xnz1kj27kc369a01gbxv"; + sha256 = "1jwaq9k6q8wn197wadiwid7d8aik24rhsypmcl5q0jviwkhhiri9"; }; doCheck = false; From 467f7d3f6cc8b0c6080720a4abda1391a82d3b99 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sat, 18 Feb 2017 22:09:06 +0200 Subject: [PATCH 138/273] zmq: v4.2.0 -> v4.2.2 --- pkgs/development/libraries/zeromq/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index ab95f4ec3f3..4352e7f05c2 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "zeromq-${version}"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz"; - sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k"; + sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv"; }; nativeBuildInputs = [ pkgconfig ]; From ca016c26269f130e37d020712b742e365520e328 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 18 Feb 2017 21:59:24 +0100 Subject: [PATCH 139/273] grsecurity: 4.9.10-201702152052 -> 4.9.11-201702181444 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 320af7cb0ba..c185442c772 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.10"; + version = "4.9.11"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "1mqlw5x7ryqb1jlhkn31p5xhilmqi55j5307i94xdj1xgn2411fiym5mpx1h8b0jc42g728jl896qplkrbd682vz5wci7fg4022ry81"; + sha512 = "3lh2nrkq3254diqdjry857gmh39ijxxhd7h8563jdzv9i8awv564zajpdcr6bjpf5swyicjsylifym2b5ww41b0fp6z4pkns9mmppny"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 9bc47dd624d..c94907efc4a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -95,9 +95,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.9.10"; - grrev = "201702152052"; - sha512 = "3whjlrm06r724q9lkycm2jalv3wm9bhxjlvgnglrfnc48rnv3b4j2m6gnq396pc3axnd2mpiinlwjwarw59dhs9qax9l7ddcc3cxd4k"; + { kver = "4.9.11"; + grrev = "201702181444"; + sha512 = "22yfq0w2hdhn0mhw0m2knm368f69z0qsf7vsfid7sw4m9ylmxfwzlnl92vfz15vldfl10hk78y59dcf8nv6jljh8gb5ycv4q61qlph6"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 0860565ee0d95192cea006e49656e33959984e9a Mon Sep 17 00:00:00 2001 From: ikervagyok Date: Sat, 18 Feb 2017 22:20:42 +0100 Subject: [PATCH 140/273] btrfs-dedupe: init at 1.1.0 (#22938) --- .../filesystems/btrfs-dedupe/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/filesystems/btrfs-dedupe/default.nix diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix new file mode 100644 index 00000000000..2cd1e8162c6 --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, rustPlatform, lzo, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "btrfs-dedupe-${version}"; + version = "1.1.0"; + + + src = fetchurl { + url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a"; + sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp"; + }; + + depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a"; + + buildInputs = [ lzo zlib ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe"; + description = "BTRFS deduplication utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ikervagyok ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 197b2970b46..3bdd09ee723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -668,6 +668,8 @@ with pkgs; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { }; + btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {}; + btrbk = callPackage ../tools/backup/btrbk { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; From 492101dfce919350d1897f8c96ff402e7ca53827 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 18 Feb 2017 22:40:31 +0100 Subject: [PATCH 141/273] nixos-container: fix destroy with immutable /var/empty fixes #21573 --- pkgs/tools/virtualization/nixos-container/nixos-container.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index cde79f8a820..65a9c3f5814 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -248,6 +248,7 @@ if ($action eq "destroy") { safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir; + system("chattr", "-i", "$root/var/empty") if -e $root; safeRemoveTree($root) if -e $root; unlink($confFile) or die; } From 3f09f8fa4d32fa532177858cf8c5e6b6ba9e36c4 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sat, 18 Feb 2017 21:24:49 +0200 Subject: [PATCH 142/273] czmq: v3.0.2 -> v4.0.2 --- .../libraries/czmq/{default.nix => 3.x.nix} | 0 pkgs/development/libraries/czmq/4.x.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 9 ++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) rename pkgs/development/libraries/czmq/{default.nix => 3.x.nix} (100%) create mode 100644 pkgs/development/libraries/czmq/4.x.nix diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/3.x.nix similarity index 100% rename from pkgs/development/libraries/czmq/default.nix rename to pkgs/development/libraries/czmq/3.x.nix diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix new file mode 100644 index 00000000000..dd957d07340 --- /dev/null +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zeromq }: + +stdenv.mkDerivation rec { + version = "4.0.2"; + name = "czmq-${version}"; + + src = fetchurl { + url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; + sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340"; + }; + + # Needs to be propagated for the .pc file to work + propagatedBuildInputs = [ zeromq ]; + + meta = with stdenv.lib; { + homepage = "http://czmq.zeromq.org/"; + description = "High-level C Binding for ZeroMQ"; + license = licenses.mpl20; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 197b2970b46..e647d2ab237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -945,6 +945,7 @@ with pkgs; rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken + czmq = czmq3; }; rsyslog-light = callPackage ../tools/system/rsyslog { @@ -9998,9 +9999,13 @@ with pkgs; cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq = callPackage ../development/libraries/czmq { }; + czmq3 = callPackage ../development/libraries/czmq/3.x.nix {}; + czmq4 = callPackage ../development/libraries/czmq/4.x.nix {}; + czmq = czmq4; - czmqpp = callPackage ../development/libraries/czmqpp { }; + czmqpp = callPackage ../development/libraries/czmqpp { + czmq = czmq3; + }; zimlib = callPackage ../development/libraries/zimlib { }; From 9326a89910434f96b3af4dd7758614e0143735e2 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 18 Feb 2017 23:14:52 +0100 Subject: [PATCH 143/273] lvm: add missing dependency fixes #14394 --- pkgs/os-specific/linux/lvm2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 5af100eacb2..9645a2d16b5 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid, enable_dmeventd ? false }: +{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +, thin-provisioning-tools, enable_dmeventd ? false }: let version = "2.02.140"; @@ -22,7 +23,7 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libudev libuuid ]; + buildInputs = [ libudev libuuid thin-provisioning-tools ]; preConfigure = '' From 39aac045f63170f35d9e4a036f2d2dd6c7855821 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sun, 19 Feb 2017 00:39:14 +0200 Subject: [PATCH 144/273] rustPackages: update to latest --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index e35153a3670..faed3a218fc 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-01-27"; - rev = "6a73a15e27364a0c191d61d52406bebb7639b657"; - sha256 = "1dklswbf3acfqid4vv7g2xpqc4gswjgh4ih9xjx3a0m3a69cw9lb"; + version = "2017-02-19"; + rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1"; + sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp"; src = fetchFromGitHub { inherit rev; From 993d2db029577b580741a58b68694d5b05869e19 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 18 Feb 2017 18:20:40 +0800 Subject: [PATCH 145/273] libreoffice-fresh: build on hydra --- pkgs/applications/office/libreoffice/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index b74483b8274..989cf17e276 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -266,6 +266,5 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; - hydraPlatforms = []; }; } From 2423313581c6429b7cab25aa24c8bad848ad164f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 18 Feb 2017 18:33:36 -0500 Subject: [PATCH 146/273] kernel: 4.9.10 -> 4.9.11 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 103c8f6c698..09f0fd72eee 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.10"; + version = "4.9.11"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "098mcq3rg05gpammcdfhr2xhcy69ggc9h5g18m4ymnfqdx3havmx"; + sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index c94907efc4a..824d685378c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -174,14 +174,4 @@ rec { sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; }; }; - - sctp_bug_on_CVE_2017_5986 = rec - { name = "sctp_BUG_ON_CVE_2017_5986.patch"; - patch = fetchpatch { - inherit name; - url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2dcab598484185dea7ec22219c76dcdd59e3cb90"; - sha256 = "15np10bfm5yzby9zbkrh23qpm91wnprblsk0xn9yjryypnz8njxh"; - }; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67072b5128b..d67305f51b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11312,7 +11312,6 @@ with pkgs; # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long - kernelPatches.sctp_bug_on_CVE_2017_5986 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From 7274fc32d2af261f2d0884152140a821b005b56f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 18 Feb 2017 18:40:04 -0500 Subject: [PATCH 147/273] linux: 4.4.48 -> 4.4.50 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index db5aa849f1e..0aac9b43f1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.48"; + version = "4.4.50"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "09c0rfm9ycyjyz0nsz34fa1cvfzx8pyzcmxhyz0dqiw6x4fqal3w"; + sha256 = "1dqnhajciy9vgcx4lz5mngc21j5w73fzpivxx6kn7pqbpfjlr574"; }; kernelPatches = args.kernelPatches; From 523444db38e50fe7ddcf96c7fca6b8a89d3634c4 Mon Sep 17 00:00:00 2001 From: Renato Alves Date: Sat, 18 Feb 2017 22:48:50 +0100 Subject: [PATCH 148/273] luaPackages.luaposix: init at 33.4.0 --- pkgs/top-level/lua-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index a5490970b72..6ad2e288c97 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -151,6 +151,21 @@ let }; }; + luaposix = buildLuaPackage rec { + name = "posix-${version}"; + version = "33.4.0"; + src = fetchurl { + url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz"; + sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21"; + }; + buildInputs = [ perl ]; + meta = { + description = "Lua bindings for POSIX API"; + homepage = "https://github.com/luaposix/luaposix"; + hydraPlatforms = stdenv.lib.platforms.unix; + }; + }; + lpty = buildLuaPackage rec { name = "lpty-${version}"; version = "1.1.1"; From af6c722a7b3f32a3ef78eaedb06a2d9c4eee42b3 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sun, 19 Feb 2017 01:14:43 +0200 Subject: [PATCH 149/273] intecture-cli: init at 0.3.2 --- pkgs/tools/admin/intecture/cli.nix | 32 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/admin/intecture/cli.nix diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix new file mode 100644 index 00000000000..0f530f636d7 --- /dev/null +++ b/pkgs/tools/admin/intecture/cli.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-cli-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "cli"; + rev = version; + sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc"; + }; + + depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + # Needed for tests + USER = "$(whoami)"; + + meta = with lib; { + description = "A developer friendly, language agnostic configuration management tool for server systems"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67072b5128b..1382a5307f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,6 +2301,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; From 1ae9b50a772e7acf5ce61fe55a56b9f4effa73e7 Mon Sep 17 00:00:00 2001 From: Michele Guerini Rocco Date: Sun, 19 Feb 2017 02:11:08 +0100 Subject: [PATCH 150/273] vapoursynth: disable OCR by default (#22943) --- pkgs/development/libraries/vapoursynth/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0922a5e3785..ae43307cf31 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,8 +1,12 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - glibc, zimg, imagemagick, libass, tesseract, yasm, - python3 + glibc, zimg, imagemagick, libass, yasm, python3, + ocrSupport ? false, tesseract }: +assert ocrSupport -> tesseract != null; + +with stdenv.lib; + stdenv.mkDerivation rec { name = "vapoursynth-${version}"; version = "R36"; @@ -18,14 +22,15 @@ stdenv.mkDerivation rec { pkgconfig autoreconfHook zimg imagemagick libass glibc tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) - ]; + ] ++ optional ocrSupport tesseract; configureFlags = [ "--enable-imwri" "--disable-static" + (optionalString (!ocrSupport) "--disable-ocr") ]; - meta = with stdenv.lib; { + meta = { description = "A video processing framework with the future in mind"; homepage = http://www.vapoursynth.com/; license = licenses.lgpl21; From d738ac4fd598fb2983aa336e94df4efa2a5f1e1a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 17 Feb 2017 23:18:48 +0100 Subject: [PATCH 151/273] ocaml-angstrom: init at 0.3.0 --- .../ocaml-modules/angstrom/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/angstrom/default.nix diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix new file mode 100644 index 00000000000..56509ab5786 --- /dev/null +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "ocaml-angstrom-${version}"; + + src = fetchFromGitHub { + owner = "inhabitedtype"; + repo = "angstrom"; + rev = "${version}"; + sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q"; + }; + + createFindlibDestdir = true; + + buildInputs = [ ocaml ocaml_oasis findlib ]; + propagatedBuildInputs = [ result cstruct ]; + + meta = { + homepage = https://github.com/inhabitedtype/angstrom; + description = "OCaml parser combinators built for speed and memory efficiency"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 73669c58b55..941b8ebd65d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -18,6 +18,8 @@ let alcotest = callPackage ../development/ocaml-modules/alcotest {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; apron = callPackage ../development/ocaml-modules/apron { }; From 31d4b7b83041129dffd009323cd87d1feb143762 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sun, 19 Feb 2017 03:05:18 +0200 Subject: [PATCH 152/273] intecture-auth: init at 0.1.0 --- pkgs/tools/admin/intecture/auth.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/admin/intecture/auth.nix diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix new file mode 100644 index 00000000000..88ef137d841 --- /dev/null +++ b/pkgs/tools/admin/intecture/auth.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-auth-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "auth"; + rev = version; + sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py"; + }; + + depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Authentication client/server for Intecture components"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93476b74e8f..3bed76a142f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,6 +2301,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; + intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; ioping = callPackage ../tools/system/ioping { }; From 87cf2231fa9d932cbd8a634ed722f1f73b457cb5 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sun, 19 Feb 2017 03:36:52 +0200 Subject: [PATCH 153/273] intecture-agent: init at 0.3.0 --- pkgs/tools/admin/intecture/agent.nix | 29 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/admin/intecture/agent.nix diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix new file mode 100644 index 00000000000..27891614f4b --- /dev/null +++ b/pkgs/tools/admin/intecture/agent.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, zeromq, czmq, pkgconfig, cmake, zlib }: + +with rustPlatform; + +buildRustPackage rec { + name = "intecture-agent-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "intecture"; + repo = "agent"; + rev = version; + sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6"; + }; + + depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban"; + + buildInputs = [ openssl zeromq czmq zlib ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + + meta = with lib; { + description = "Authentication client/server for Intecture components"; + homepage = https://intecture.io; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bed76a142f..622201ac10d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2301,6 +2301,8 @@ with pkgs; innoextract = callPackage ../tools/archivers/innoextract { }; + intecture-agent = callPackage ../tools/admin/intecture/agent.nix { }; + intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; From 798e0f50f4dd6d26da285a851d1cd08665f60ae5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 18 Feb 2017 19:21:11 -0600 Subject: [PATCH 154/273] creduce: Use wrapper instead of propagatedUserEnvPkgs Friendlier when installed, fixes execution outside of NixOS. --- pkgs/development/tools/misc/creduce/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index a9296adf334..d768f68576c 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake +{ stdenv, fetchurl, cmake, makeWrapper , llvm, clang-unwrapped , flex , zlib @@ -21,9 +21,10 @@ stdenv.mkDerivation rec { # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - cmake + cmake makeWrapper llvm clang-unwrapped flex zlib + perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey ]; # On Linux, c-reduce's preferred way to reason about @@ -34,15 +35,13 @@ stdenv.mkDerivation rec { lscpu ${utillinux}/bin/lscpu ''; - perlDeps = [ - perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey - ]; - - propagatedNativeBuildInputs = perlDeps; - propagatedUserEnvPkgs = perlDeps; enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB" + ''; + meta = with stdenv.lib; { description = "A C program reducer"; homepage = "https://embed.cs.utah.edu/creduce"; From 326fa70896d3184c628676510654144c5c68ef9b Mon Sep 17 00:00:00 2001 From: Gauthier POGAM--LE MONTAGNER Date: Sun, 19 Feb 2017 03:10:50 +0100 Subject: [PATCH 155/273] idea.webstorm: 2016.3.2 -> 2016.3.3 --- pkgs/applications/editors/idea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 12ca97e12c5..2ed8e505d46 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -304,12 +304,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.3.2"; + version = "2016.3.3"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1h3kjvd10j48n9ch2ldqjsizq5n8gkm0vrrvznayc1bz2kjvhavn"; + sha256 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y"; }; wmClass = "jetbrains-webstorm"; }; From 1973a2953681490e4a9b0be4c9da1ac869a475c0 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Sat, 18 Feb 2017 00:50:28 +0530 Subject: [PATCH 156/273] envconsul: init at 0.6.2 --- pkgs/tools/system/envconsul/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/system/envconsul/default.nix diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix new file mode 100644 index 00000000000..fcc3f217d64 --- /dev/null +++ b/pkgs/tools/system/envconsul/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "envconsul-${version}"; + version = "0.6.2"; + rev = "v${version}"; + + goPackagePath = "github.com/hashicorp/envconsul"; + + src = fetchFromGitHub { + inherit rev; + owner = "hashicorp"; + repo = "envconsul"; + sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/hashicorp/envconsul/; + description = "Read and set environmental variables for processes from Consul"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d136fd7dfb5..c35dbd93ec2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -856,6 +856,8 @@ with pkgs; ent = callPackage ../tools/misc/ent { }; + envconsul = callPackage ../tools/system/envconsul { }; + f3 = callPackage ../tools/filesystems/f3 { }; facter = callPackage ../tools/system/facter { From 4f0feb4f5f2f4662a075f015d9675b25865b3ae9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Feb 2017 22:57:45 +0100 Subject: [PATCH 157/273] ocaml-logs: init at 0.6.2 --- .../ocaml-modules/logs/default.nix | 40 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/ocaml-modules/logs/default.nix diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix new file mode 100644 index 00000000000..ab0b6c8579b --- /dev/null +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam +, topkg, result, lwt, cmdliner, fmt }: +let + pname = "logs"; + webpage = "http://erratique.ch/software/${pname}"; +in + +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; + +stdenv.mkDerivation rec { + name = "ocaml-${pname}-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg fmt cmdliner lwt ]; + propagatedBuildInputs = [ result ]; + + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build \ + --with-js_of_ocaml false + ''; + + inherit (topkg) installPhase; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + description = "Logging infrastructure for OCaml"; + homepage = "${webpage}"; + inherit (ocaml.meta) platforms; + maintainers = [ maintainers.sternenseemann ]; + license = licenses.isc; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 941b8ebd65d..615268e3778 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -257,6 +257,10 @@ let llvm = pkgs.llvm_37; }; + logs = callPackage ../development/ocaml-modules/logs { + lwt = ocaml_lwt; + }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; From 44820907afab52221ac7db20bf6e115ee42a927a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Feb 2017 22:52:46 +0100 Subject: [PATCH 158/273] ocaml-ezjsonm: 0.4.1 -> 0.4.3 --- pkgs/development/ocaml-modules/ezjsonm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 4d63b0c3f95..44d8ce393fb 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: -let version = "0.4.1"; in +let version = "0.4.3"; in stdenv.mkDerivation { name = "ocaml-ezjsonm-${version}"; src = fetchzip { url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz"; - sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095"; + sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ]; + buildInputs = [ ocaml findlib lwt ]; + propagatedBuildInputs = [ jsonm hex sexplib ]; createFindlibDestdir = true; configureFlags = "--enable-lwt"; From b322271dd653b477fd400a269d6e7ba6c9afb91a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Feb 2017 11:35:31 +0300 Subject: [PATCH 159/273] pythonPackages.webassets: 0.12 -> 0.12.1 Fixes #22965 --- 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 335d7e9c62d..b0fffe2dc48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26784,11 +26784,11 @@ EOF webassets = buildPythonPackage rec { name = "webassets-${version}"; - version = "0.12.0"; + version = "0.12.1"; src = pkgs.fetchurl { url = "mirror://pypi/w/webassets/${name}.tar.gz"; - sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr"; + sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7"; }; buildInputs = with self; [ nose jinja2 mock pytest ]; From 362ef377c8e5314902c313fbc1d40efabd0c9406 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Feb 2017 11:53:23 +0300 Subject: [PATCH 160/273] nvidia_x11.settings: link dlopen'ed libraries --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index de60c9ccf4f..d088fe5253c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,6 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau +{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau , withGtk2 ? false, withGtk3 ? true }: @@ -15,8 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ gtk2 gtk3 libXv libvdpau ]; + buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ]; + NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; + + makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; preBuild = '' @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \ + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \ $out/bin/nvidia-settings ''; From 03617767646e6a8cb0d1d3e10afd1899afcddf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Feb 2017 09:56:31 +0100 Subject: [PATCH 161/273] pyroute2: 0.4.12 -> 0.4.13 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 7fb7b7f5e68..91bfa97cb97 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,11 +1,11 @@ {stdenv, buildPythonPackage, fetchurl}: buildPythonPackage rec { - name = "pyroute2-0.4.12"; + name = "pyroute2-0.4.13"; src = fetchurl { url = "mirror://pypi/p/pyroute2/${name}.tar.gz"; - sha256 = "0csp6y38pgswhn46rivdgrlqw99dpjzwa0g32h6iiaj12n2f9qlq"; + sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk"; }; # requires root priviledges From 9ed2846e046db0a896145fdee64f22e810a92c90 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 18 Feb 2017 23:30:24 +0100 Subject: [PATCH 162/273] grub module: add extraInitrd option --- nixos/modules/system/boot/loader/grub/grub.nix | 15 ++++++++++++++- .../system/boot/loader/grub/install-grub.pl | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 23b970186a3..5ab2d077551 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -54,7 +54,7 @@ let inherit (efi) canTouchEfiVariables; inherit (cfg) version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber - extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels + extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs @@ -267,6 +267,19 @@ in ''; }; + extraInitrd = mkOption { + type = types.nullOr types.path; + default = null; + example = "/boot/extra_initrafms.gz"; + description = '' + The path to a second initramfs to be supplied to the kernel. + This ramfs will not be copied to the store, so that it can + contain secrets such as LUKS keyfiles or ssh keys. + This implies that rolling back to a previous configuration + won't rollback the state of this file. + ''; + }; + useOSProber = mkOption { default = false; type = types.bool; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c9a51288747..c7559cd634a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -49,6 +49,7 @@ my $extraPrepareConfig = get("extraPrepareConfig"); my $extraPerEntryConfig = get("extraPerEntryConfig"); my $extraEntries = get("extraEntries"); my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true"; +my $extraInitrd = get("extraInitrd"); my $splashImage = get("splashImage"); my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; @@ -226,6 +227,13 @@ my $grubStore; if ($copyKernels == 0) { $grubStore = GrubFs($storePath); } +my $extraInitrdPath; +if ($extraInitrd) { + if (! -f $extraInitrd) { + print STDERR "Warning: the specified extraInitrd " . $extraInitrd . " doesn't exist. Your system won't boot without it.\n"; + } + $extraInitrdPath = GrubFs($extraInitrd); +} # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; @@ -336,6 +344,9 @@ sub addEntry { my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel")); my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd")); + if ($extraInitrd) { + $initrd .= " " .$extraInitrdPath->path; + } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; # FIXME: $confName @@ -358,6 +369,9 @@ sub addEntry { if ($copyKernels == 0) { $conf .= $grubStore->search . "\n"; } + if ($extraInitrd) { + $conf .= $extraInitrdPath->search . "\n"; + } $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; From 785fbfac65b66ff4cef32525c7a6cb2b1c9e58c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 19 Feb 2017 11:34:21 +0100 Subject: [PATCH 163/273] haskell: add nix-specific fixes for various packages in stackage" This reverts commit fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b. http-streams test suite is no longer broken, but still needs to be disabled due to cyclic dependencies (http-streams(test) -> snap -> http-streams) --- .../haskell-modules/configuration-common.nix | 28 ++------- .../haskell-modules/configuration-nix.nix | 60 ++++++++++++++++++- 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a2b4c375212..48fb3e172ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,6 +41,9 @@ self: super: { nanospec = dontCheck super.nanospec; options = dontCheck super.options; statistics = dontCheck super.statistics; + http-streams = dontCheck super.http-streams; + + # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; # This test keeps being aborted because it runs too quietly for too long @@ -228,7 +231,6 @@ self: super: { wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; - hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; wai-cors = dontCheck super.wai-cors; @@ -278,7 +280,6 @@ self: super: { dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; - either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw @@ -307,7 +308,6 @@ self: super: { hi = dontCheck super.hi; hierarchical-clustering = dontCheck super.hierarchical-clustering; hmatrix-tests = dontCheck super.hmatrix-tests; - hPDB-examples = dontCheck super.hPDB-examples; hquery = dontCheck super.hquery; hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; @@ -427,9 +427,6 @@ self: super: { # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); - # https://github.com/afcowie/http-streams/issues/80 - http-streams = dontCheck super.http-streams; - # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; @@ -451,9 +448,6 @@ self: super: { apiary-session = dontCheck super.apiary-session; apiary-websockets = dontCheck super.apiary-websockets; - # https://github.com/alephcloud/hs-configuration-tools/issues/40 - configuration-tools = dontCheck super.configuration-tools; - # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) unlambda = dontHyperlinkSource super.unlambda; @@ -695,13 +689,6 @@ self: super: { cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; - # Fix tests which would otherwise fail with "Couldn't launch intero process." - intero = overrideCabal super.intero (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\"" - ''; - }); - # https://github.com/commercialhaskell/stack/issues/3001 stack = doJailbreak super.stack; @@ -736,14 +723,7 @@ self: super: { }); # test suite cannot find its own "idris" binary - idris = overrideCabal super.idris (drv: { - # "idris" binary cannot find Idris library otherwise while building. After - # installing it's completely fine though. This seems like a bug in Idris - # that's related to builds with shared libraries enabled. It would be great - # if someone who knows a thing or two about Idris could look into this. - preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; - doCheck = false; - }); + idris = dontCheck super.idris; # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bd74e0e6e04..c62d2702b44 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,6 +167,13 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; + typed-process = dontCheck super.typed-process; + js-jquery = dontCheck super.js-jquery; + hPDB-examples = dontCheck super.hPDB-examples; + configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40 + tcp-streams = dontCheck super.tcp-streams; + holy-project = dontCheck super.holy-project; + mustache = dontCheck super.mustache; # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; @@ -378,13 +385,62 @@ self: super: builtins.intersectAttrs super { idris = overrideCabal super.idris (drv: { # https://github.com/idris-lang/Idris-dev/issues/2499 librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; + + # tests and build run executable, so need to set LD_LIBRARY_PATH + preBuild = '' + export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH" + ''; }); libsystemd-journal = overrideCabal super.libsystemd-journal (old: { librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; }); - # Needs network in tests. - typed-process = dontCheck super.typed-process; + # does not specify tests in cabal file, instead has custom runTest cabal hook, + # so cabal2nix will not detect test dependencies. + either-unwrap = overrideCabal super.either-unwrap (drv: { + testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ]; + }); + hidapi = addExtraLibrary super.hidapi pkgs.libudev; + + hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; }; + + discount = super.discount.override { markdown = pkgs.discount; }; + + # tests require working stack installation with all-cabal-hashes cloned in $HOME + stackage-curator = dontCheck super.stackage-curator; + + # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59 + io-streams = enableCabalFlag super.io-streams "NoInteractiveTests"; + + # requires autotools to build + secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ]; + + # tests require git + hapistrano = addBuildTool super.hapistrano pkgs.git; + + # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) + gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; + gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; + + # requires valid, writeable $HOME + hatex-guide = overrideCabal super.hatex-guide (drv: { + preConfigure = '' + ${drv.preConfigure or ""} + export HOME=$PWD + ''; + }); + + # Fails to link against with newer gsl versions because a deprecrated function + # was removed + hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; }; + + # tests run executable, relying on PATH + # without this, tests fail with "Couldn't launch intero process" + intero = overrideCabal super.intero (drv: { + preCheck = '' + export PATH="$PWD/dist/build/intero:$PATH" + ''; + }); } From 27395d33fba08f4352edd3e2601b3aa9316bfdfc Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 07:45:37 -0300 Subject: [PATCH 164/273] lxqt-build-tools: init at 0.3.2 --- .../lxqt/base/lxqt-build-tools/default.nix | 23 +++++++++++++++++++ pkgs/desktops/lxqt/default.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix new file mode 100644 index 00000000000..f8db33bc5a4 --- /dev/null +++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "lxqt-build-tools-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxqt-build-tools"; + rev = version; + sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv"; + }; + + nativeBuildInputs = [ cmake qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "Various packaging tools and scripts for LXQt applications"; + homepage = https://github.com/lxde/lxqt-build-tools; + license = licenses.lgpl21; + platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index d5f5194c48e..3cd8fdf2212 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -28,6 +28,7 @@ let ### BASE libqtxdg = callPackage ./base/libqtxdg { }; + lxqt-build-tools = callPackage ./base/lxqt-build-tools { }; libsysstat = callPackage ./base/libsysstat { }; liblxqt = callPackage ./base/liblxqt { }; From e6472f136001d4ee355a24c902a8774a6ee991eb Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 07:55:45 -0300 Subject: [PATCH 165/273] libsysstat: 0.3.2 -> 0.3.3 --- pkgs/desktops/lxqt/base/libsysstat/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix index 363b3d33d14..2776a53fa83 100644 --- a/pkgs/desktops/lxqt/base/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "libsysstat-${version}"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "lxde"; repo = "libsysstat"; rev = version; - sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n"; + sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ]; buildInputs = [ qt5.qtbase ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Library used to query system info and statistics"; homepage = https://github.com/lxde/libsysstat; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From d2a4a84f00019596006cf218df9f8b143c7d624d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 19 Feb 2017 11:57:24 +0100 Subject: [PATCH 166/273] ocamlPackages.uri: 1.9.1 -> 1.9.2 The old version is also kept, under the attribute `uri_p4`. It is built against `sexplib` version prior to 113.33 and needed by `trv`. --- .../ocaml-modules/cohttp/default.nix | 4 +-- .../ocaml-modules/conduit/default.nix | 4 +-- .../development/ocaml-modules/uri/default.nix | 27 ++++++++++++++----- pkgs/top-level/ocaml-packages.nix | 3 +++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 5a22e37d821..99f101010f3 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4 +{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4 , sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , lwt ? null, async_p4 ? null, async_ssl_p4 ? null @@ -17,7 +17,7 @@ buildOcaml rec { buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ] ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; - propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ]; + propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; buildFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index afe44ea0a7f..22c74d7f92e 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , async_p4 ? null, async_ssl_p4 ? null, lwt ? null }: @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ]; + propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr ]; buildInputs = stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index a6335274f73..c7d991504ec 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,19 +1,32 @@ -{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }: +{ stdenv, fetchzip, ocaml, findlib, re, stringext, ounit +, sexplib, ppx_sexp_conv +, legacyVersion ? false +, sexplib_p4 +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; +assert stdenv.lib.versionAtLeast ocaml.version "4"; -let version = "1.9.1"; in +with + if legacyVersion + then { + version = "1.9.1"; + sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + } else { + version = "1.9.2"; + sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; + }; stdenv.mkDerivation { - name = "ocaml-uri-${version}"; + name = "ocaml${ocaml.version}-uri-${version}"; src = fetchzip { url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + inherit sha256; }; - buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ re sexplib_p4 stringext ]; + buildInputs = [ ocaml findlib ounit ] + ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; + propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = '' diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 615268e3778..41cf8306992 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -510,6 +510,9 @@ let uunf = callPackage ../development/ocaml-modules/uunf { }; uri = callPackage ../development/ocaml-modules/uri { }; + uri_p4 = callPackage ../development/ocaml-modules/uri { + legacyVersion = true; + }; uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; From 2070627040ab1e02abc503c21a59f4e2a79bff88 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:02:25 -0300 Subject: [PATCH 167/273] liblxqt: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/base/liblxqt/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix index b973940b9b6..2d4faee5cf3 100644 --- a/pkgs/desktops/lxqt/base/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix @@ -3,17 +3,18 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liblxqt"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac"; + sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5"; }; nativeBuildInputs = [ cmake + lxqt.lxqt-build-tools ]; buildInputs = [ @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { description = "Core utility library for all LXQt components"; homepage = https://github.com/lxde/liblxqt; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From f1e7a60b168b52c4705366ddf52aaf0c2db539fa Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Feb 2017 12:11:52 +0100 Subject: [PATCH 168/273] dnsutils: +sigchase support for dig Fixes #10728, closes #22989. The dnsutils output got ~60kiB bigger, and I see no extra runtime deps. --- pkgs/servers/dns/bind/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 0741603b3ec..2f8bdd06bf1 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libtool perl libxml2 ] ++ stdenv.lib.optional stdenv.isLinux libseccomp; + STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase + configureFlags = [ "--localstatedir=/var" "--with-libtool" From bed2f5c4a69d852b0c44a0e08183c90eabcf89ec Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:13:36 -0300 Subject: [PATCH 169/273] compton-conf: 0.2.0 -> 0.2.1 --- .../lxqt/optional/compton-conf/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix index 45717fe31e2..c25ee10bd25 100644 --- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix @@ -3,25 +3,24 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "compton-conf"; - version = "0.2.0"; + version = "0.2.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk"; + sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools - qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg libconfig ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "GUI configuration tool for compton X composite manager"; homepage = https://github.com/lxde/compton-conf; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From a452714799b36fae4c34e7167122d2b26ff07747 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 18 Feb 2017 22:58:29 +0100 Subject: [PATCH 170/273] ocaml-cow: init at 2.2.0 --- .../development/ocaml-modules/cow/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cow/default.nix diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix new file mode 100644 index 00000000000..eaf07818aeb --- /dev/null +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib +, ocamlbuild, topkg, opam +, uri, xmlm, omd, ezjsonm }: + +stdenv.mkDerivation rec { + version = "2.2.0"; + name = "ocaml-cow-${version}"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-cow"; + rev = "v${version}"; + sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; + }; + + createFindlibDestdir = true; + + buildInputs = [ ocaml opam ocamlbuild findlib topkg ]; + propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; + + inherit (topkg) buildPhase installPhase; + + meta = with stdenv.lib; { + description = "Caml on the Web"; + longDescription = '' + Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code. + ''; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 41cf8306992..2dd913864a4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -132,6 +132,8 @@ let containers = callPackage ../development/ocaml-modules/containers { }; + cow = callPackage ../development/ocaml-modules/cow { }; + cpdf = callPackage ../development/ocaml-modules/cpdf { }; cppo = callPackage ../development/tools/ocaml/cppo { }; From 160b9539f4cf668f85ec40ba02909c63368b7541 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:23:38 -0300 Subject: [PATCH 171/273] libfm-qt: 0.11.1 -> 0.11.2 --- pkgs/desktops/lxqt/core/libfm-qt/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix index 71b6cff5899..4c7ecbc1804 100644 --- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -4,29 +4,24 @@ libfm, menu-cache }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "libfm-qt"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz"; + sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v"; }; nativeBuildInputs = [ cmake pkgconfig - lxqt.liblxqt - lxqt.libqtxdg + lxqt.lxqt-build-tools ]; buildInputs = [ qt5.qtx11extras qt5.qttools - qt5.qtsvg - kde5.kwindowsystem - xorg.libpthreadstubs - xorg.libXdmcp libfm menu-cache ]; @@ -37,7 +32,7 @@ stdenv.mkDerivation rec { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = https://github.com/lxde/libfm-qt; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 9016be45891fba34f4a29979ec0526d95be17933 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sun, 19 Feb 2017 12:25:33 +0100 Subject: [PATCH 172/273] qtikz: update to Qt5; remove ktikz --- pkgs/applications/graphics/ktikz/default.nix | 116 +++++++++---------- pkgs/top-level/all-packages.nix | 7 +- 2 files changed, 55 insertions(+), 68 deletions(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index e351534f9e6..5d0bbcad54f 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,78 +1,70 @@ -{ withKDE ? true -, stdenv, fetchurl, gettext, poppler_qt4, qt4 -# Qt only (no KDE): -, pkgconfig -# With KDE -, cmake, automoc4, kdelibs -}: +{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: -# Warning: You will also need a working pdflatex installation containing (at -# least) auctex and pgf. +# Warning: You will also need a working pdflatex installation containing +# at least auctex and pgf. -assert withKDE -> kdelibs != null; +# This package only builds ktikz without KDE integration because KDE4 is +# deprecated and upstream does not (yet ?) support KDE5. +# See historical versions of this file for building ktikz with KDE4. -let - version = "0.10"; +stdenv.mkDerivation rec { + version = "unstable-20161122"; + name = "qtikz-${version}"; - qtikz = { - name = "qtikz-${version}"; + src = fetchFromGitHub { + owner = "fhackenberger"; + repo = "ktikz"; + rev = "be66c8b1ff7e6b791b65af65e83c4926f307cf5a"; + sha256 = "15jx53sjlnky4yg3ry1i1c29g28v1jbbvhbz66h7a49pfxa40fj3"; + }; - conf = '' - # installation prefix: - #PREFIX = "" + meta = with stdenv.lib; { + description = "Editor for the TikZ language"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.layus ]; + }; - # install desktop file here (*nix only): - DESKTOPDIR = ''$''${PREFIX}/share/applications + conf = '' + # installation prefix: + PREFIX = @out@ - # install mimetype here: - MIMEDIR = ''$''${PREFIX}/share/mime/packages + # install desktop file here (*nix only): + DESKTOP_INSTALL_DIR = @out@/share/applications - CONFIG -= debug - CONFIG += release + # install mimetype here: + MIME_INSTALL_DIR = @out@/share/mime/packages - # qmake command: - QMAKECOMMAND = qmake - # lrelease command: - LRELEASECOMMAND = lrelease - # qcollectiongenerator command: - #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator + # install doc here: + MAN_INSTALL_DIR = @out@/share/man - # TikZ documentation default file path: - TIKZ_DOCUMENTATION_DEFAULT = ''$''${PREFIX}/share/doc/texmf/pgf/pgfmanual.pdf.gz - ''; + CONFIG -= debug + CONFIG += release - patchPhase = '' - echo "$conf" > conf.pri - ''; + # qmake command: + QMAKECOMMAND = qmake + # lrelease command: + LRELEASECOMMAND = lrelease + # qcollectiongenerator command: + #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator - configurePhase = '' + # TikZ documentation default file path: + TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz + ''; + + # 1. Configuration is done by overwriting qtikzconfig.pri + # 2. Recent Qt removed QString::fromAscii in favor of QString::fromLatin1 + patchPhase = '' + echo "$conf" | sed "s!@out@!$out!g" > qmake/qtikzconfig.pri + find -name "*.cpp" -exec sed -i s/fromAscii/fromLatin1/g "{}" \; + ''; + + configurePhase = '' qmake PREFIX="$out" ./qtikz.pro - ''; + ''; - buildInputs = [ gettext qt4 poppler_qt4 pkgconfig ]; - }; + buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ]; - ktikz = { - name = "ktikz-${version}"; - buildInputs = [ kdelibs cmake qt4 automoc4 gettext poppler_qt4 ]; - }; - - common = { - inherit version; - src = fetchurl { - url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz"; - sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i"; - }; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Editor for the TikZ language"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.layus ]; - }; - }; - -in stdenv.mkDerivation (common // (if withKDE then ktikz else qtikz)) + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1385be2c99f..a106074e97b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3568,10 +3568,7 @@ with pkgs; qshowdiff = callPackage ../tools/text/qshowdiff { }; - qtikz = callPackage ../applications/graphics/ktikz { - withKDE = false; - kdelibs = null; - }; + qtikz = callPackage ../applications/graphics/ktikz { }; quicktun = callPackage ../tools/networking/quicktun { }; @@ -16711,8 +16708,6 @@ with pkgs; konversation = callPackage ../applications/networking/irc/konversation { }; - ktikz = callPackage ../applications/graphics/ktikz { }; - kvirc = callPackage ../applications/networking/irc/kvirc { }; krename = callPackage ../applications/misc/krename/kde4.nix { From 45aa578ee4ac86101533b447717d0eb38b5c07d1 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:34:30 -0300 Subject: [PATCH 173/273] lxqt-common: 0.11.0 -> 0.11.2 --- .../desktops/lxqt/core/lxqt-common/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix index a4b8f000dc7..cc114c31dfd 100644 --- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-common"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b"; + sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ - qt5.qtx11extras - qt5.qttools qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg hicolor_icon_theme xmessage ]; @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { description = "Common files for LXQt"; homepage = https://github.com/lxde/lxqt-common; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 203e3c52924aade143174ee26a762247fbf19a92 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 19 Feb 2017 11:38:29 +0000 Subject: [PATCH 174/273] trv: fix the propagate build inputs --- pkgs/development/tools/misc/trv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index e73d77f772d..c8747e66e39 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find -, cohttp, conduit, magic-mime, uri, tzdata +, cohttp, conduit, magic-mime, tzdata }: assert stdenv.lib.versionOlder "4.02" ocaml.version; @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { }; - buildInputs = [ ocaml findlib camlp4 conduit magic-mime ]; + buildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 async_extra_p4 sexplib_p4 async_shell core_extended_p4 - async_find cohttp uri re2_p4 ]; + async_find cohttp conduit magic-mime re2_p4 ]; createFindlibDestdir = true; dontStrip = true; From ed798060e5dcf2a21e95ad5b42e40d09175f01db Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:39:19 -0300 Subject: [PATCH 175/273] lxqt-l10n: 0.11.0 -> 0.11.2 --- pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix index 477575289bb..b836b9776e6 100644 --- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -1,25 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "lxqt-l10n-${version}"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "lxde"; repo = "lxqt-l10n"; rev = version; - sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk"; + sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h"; }; nativeBuildInputs = [ cmake - qt5.qtbase - qt5.qtx11extras qt5.qttools - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg + lxqt.lxqt-build-tools ]; postPatch = '' @@ -31,7 +26,7 @@ stdenv.mkDerivation rec { description = "Translations of LXQt"; homepage = https://github.com/lxde/lxqt-l10n; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 6f9fec945ba5034f9a6cd418de874f9055eefd33 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 08:50:29 -0300 Subject: [PATCH 176/273] lxqt-qtplugin: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix index e0a95d23c4e..49fa7c61633 100644 --- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-qtplugin"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx"; + sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -20,8 +23,6 @@ stdenv.mkDerivation rec { qt5.qttools qt5.qtsvg qt5.libdbusmenu - kde5.kwindowsystem - lxqt.liblxqt lxqt.libqtxdg ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { description = "LXQt Qt platform integration plugin"; homepage = https://github.com/lxde/lxqt-qtplugin; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From eec3973004a231a1c5b3861914e3d6c1b8aec617 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:22:53 +0100 Subject: [PATCH 177/273] leo2: force ocaml-4.01 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 622201ac10d..f3dc7fbafe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17223,7 +17223,8 @@ with pkgs; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; - leo2 = callPackage ../applications/science/logic/leo2 {}; + leo2 = callPackage ../applications/science/logic/leo2 { + ocaml = ocamlPackages_4_01_0.ocaml;}; logisim = callPackage ../applications/science/logic/logisim {}; From 11e4fcf9413aff12dd4638bc098bfebeb936b2fb Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:27:10 +0100 Subject: [PATCH 178/273] ocamlPackages.llpp: only allow with ocaml-4.04 --- pkgs/top-level/ocaml-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 615268e3778..750fb7324a4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -695,7 +695,11 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - llpp = callPackage ../applications/misc/llpp { }; + llpp = + if lib.versionOlder "4.04" ocaml.version + then callPackage ../applications/misc/llpp { } + else null; + monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (pkgs.gnome2) libgnomecanvas glib; From 47cb2a9f3e43f004719245563742358fecd07fd4 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:41:09 +0100 Subject: [PATCH 179/273] monotone-viz: fix build with ocaml 4.02+ --- pkgs/applications/version-management/monotone-viz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 255192a9128..7b8b0598925 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; name = "monotone-viz-${version}"; - buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper]; + buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz"; sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk"; From ad671eaba9a2031ceb0b752fa8bd78e7721008ad Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:41:33 +0100 Subject: [PATCH 180/273] mldonkey: force ocaml 4.01 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3dc7fbafe4..fc85cf0f835 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14214,7 +14214,9 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { + ocaml = ocamlPackages_4_01_0.ocaml; + }; MMA = callPackage ../applications/audio/MMA { }; From e7953d20d25be0125e9bf981097ac6b2490fb08d Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:55:15 +0100 Subject: [PATCH 181/273] orpie: fix build with ocaml 4.02+ --- pkgs/applications/misc/orpie/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index b04f0f26500..b1df6378f1e 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy"; }; - buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml ]); + buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); meta = { homepage = http://pessimization.com/software/orpie/; From ea68576b7a1cfb48b0a37f88f115746ebe23316b Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:55:33 +0100 Subject: [PATCH 182/273] satallax: force ocaml 4.01 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc85cf0f835..e0c3edad5f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17256,7 +17256,9 @@ with pkgs; proverif = callPackage ../applications/science/logic/proverif { }; - satallax = callPackage ../applications/science/logic/satallax {}; + satallax = callPackage ../applications/science/logic/satallax { + ocaml = ocamlPackages_4_01_0.ocaml; + }; saw-tools = callPackage ../applications/science/logic/saw-tools {}; From b0d7d60fd4afb938fa92294c012f8ae2e5c80294 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 11:55:47 +0100 Subject: [PATCH 183/273] prooftree: force ocaml 4.01 --- pkgs/top-level/ocaml-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 750fb7324a4..aab1f31d68c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -723,7 +723,10 @@ let camlp5 = camlp5_transitional; }; - prooftree = callPackage ../applications/science/logic/prooftree { + prooftree = + if lib.versionOlder "4.01" ocaml.version + then null + else callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; }; }; From 2f46fb2cba87f299c74e45bdd31b9a21d1a0a1fc Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 12:00:24 +0100 Subject: [PATCH 184/273] sks: fix build with ocaml 4.02+ --- pkgs/servers/sks/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix index 9149f050655..1d3b04565c8 100644 --- a/pkgs/servers/sks/default.nix +++ b/pkgs/servers/sks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }: +{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }: stdenv.mkDerivation rec { name = "sks-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; }; - buildInputs = [ ocaml zlib db48 perl ]; + buildInputs = [ ocaml zlib db48 perl camlp4 ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0c3edad5f1..84d8931c02e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3830,7 +3830,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { }; + sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; }; skydns = callPackage ../servers/skydns { }; From ba993ad506d50cd4826b5b4e5c8d070d405d3233 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 12:16:09 +0100 Subject: [PATCH 185/273] coccinelle: build with caml 4.01 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84d8931c02e..ce4db54bbc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6256,7 +6256,9 @@ with pkgs; # Does not actually depend on Qt 5 extra-cmake-modules = qt5.ecmNoHooks; - coccinelle = callPackage ../development/tools/misc/coccinelle { }; + coccinelle = callPackage ../development/tools/misc/coccinelle { + ocamlPackages = ocamlPackages_4_01_0; + }; cpptest = callPackage ../development/libraries/cpptest { }; From 2a17b75fb1f41f58901746121214c3eb43e56e63 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 12:16:49 +0100 Subject: [PATCH 186/273] ocamlPackages.bitsring: associate ocaml versions with bitstring versions univocally --- pkgs/top-level/ocaml-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aab1f31d68c..340ad8ff6cf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -53,13 +53,10 @@ let bolt = callPackage ../development/ocaml-modules/bolt { }; - bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; - bitstring_git = callPackage ../development/ocaml-modules/bitstring { }; - bitstring = if lib.versionOlder "4.02" ocaml.version - then bitstring_git - else bitstring_2_0_4; + then callPackage ../development/ocaml-modules/bitstring { } + else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; From 9d57f1ae9a392f7050b5acfa4decc4875caeb07d Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 15:01:44 +0100 Subject: [PATCH 187/273] frama-c: fix compilation with ocaml 4.02+ --- pkgs/development/tools/analysis/frama-c/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index a1239c6a121..14efe29442b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph - lablgtk coq graphviz zarith why3 apron + lablgtk coq graphviz zarith why3 apron camlp4 ]; @@ -56,13 +56,15 @@ stdenv.mkDerivation rec { patches = [ ./dynamic.diff ]; postPatch = '' # strip absolute paths to /usr/bin - for file in ./configure ./share/Makefile.common ./src/*/configure; do + for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/ substituteInPlace $file --replace '/usr/bin/' "" done substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' cd ../why* + + substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3' substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c" substituteInPlace ./jc/jc_make.ml --replace ' why-dp ' " $out/bin/why-dp " substituteInPlace ./jc/jc_make.ml --replace "?= why@\n" "?= $out/bin/why@\n" From bf13a2cfc6923f6b7ca7d47b604bf2d152619f3a Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 15:03:20 +0100 Subject: [PATCH 188/273] ocamlPackages.camlimages_4_0: only build with ocaml 4.01 --- pkgs/top-level/ocaml-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 340ad8ff6cf..659b9243b6e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -96,7 +96,10 @@ let camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = callPackage ../development/ocaml-modules/camomile { }; - camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { + camlimages_4_0 = + if lib.versionOlder "4.02" ocaml.version + then null + else callPackage ../development/ocaml-modules/camlimages/4.0.nix { libpng = pkgs.libpng12; giflib = pkgs.giflib_4_1; }; From ffe9343c750a38b0fb91a8f575af9e6fbf469539 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:02:17 -0300 Subject: [PATCH 189/273] obconf-qt: 0.11.0 -> 0.11.1 --- .../lxqt/optional/obconf-qt/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix index 381c998616f..36490b726e0 100644 --- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -1,30 +1,30 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, -openbox, hicolor_icon_theme }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "obconf-qt"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk"; + sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg xorg.libpthreadstubs xorg.libXdmcp + xorg.libSM openbox hicolor_icon_theme ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = https://github.com/lxde/obconf-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From cc9a50ec03e9eef8c6de9d70ab6b2e9e5f742229 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 16:01:30 +0100 Subject: [PATCH 190/273] virt-top: compile with ocaml 4.01 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4db54bbc2..11ea168cd91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15478,7 +15478,9 @@ with pkgs; spice_gtk = spice_gtk; }; - virt-top = callPackage ../applications/virtualization/virt-top { }; + virt-top = callPackage ../applications/virtualization/virt-top { + ocamlPackages = ocamlPackages_4_01_0; + }; virtmanager = callPackage ../applications/virtualization/virt-manager { vte = gnome3.vte; From f18ac15dcad7d07f6c9c31b049a45bba9cd77b2a Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 16:57:40 +0100 Subject: [PATCH 191/273] ocamlPackages.spacetime: only build with ocaml-4.04 --- pkgs/top-level/ocaml-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 659b9243b6e..146405c7bad 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -390,7 +390,10 @@ let sequence = callPackage ../development/ocaml-modules/sequence { }; - spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; + spacetime_lib = if lib.versionOlder "4.04" ocaml.version then + callPackage ../development/tools/ocaml/ocamlbuild { } + else + null; sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; From 88dac94e3bc7be400dd6e22a27b4a5a300768f77 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 16 Feb 2017 16:58:05 +0100 Subject: [PATCH 192/273] switch ocamlPackages to 4.02 --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 146405c7bad..08c8d64a15e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -759,5 +759,5 @@ in rec ocamlPackages_latest = ocamlPackages_4_04; - ocamlPackages = ocamlPackages_4_01_0; + ocamlPackages = ocamlPackages_4_02; } From 6893d8a2fdc5dc609c6a4be97b87ba95ee6a0bcf Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 18 Feb 2017 14:57:51 +0100 Subject: [PATCH 193/273] llpp: move out of ocamlPackages --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11ea168cd91..22b63a492ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14098,7 +14098,7 @@ with pkgs; bison = bison2; }; - inherit (ocaml-ng.ocamlPackages_4_04) llpp; + llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { }; lmms = callPackage ../applications/audio/lmms { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 08c8d64a15e..5f000099e14 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -698,11 +698,6 @@ let google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; - llpp = - if lib.versionOlder "4.04" ocaml.version - then callPackage ../applications/misc/llpp { } - else null; - monotoneViz = callPackage ../applications/version-management/monotone-viz { inherit (pkgs.gnome2) libgnomecanvas glib; From 4c5f083d7016c737d321bbe8ac65adf73cc125ee Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 18 Feb 2017 18:10:00 +0100 Subject: [PATCH 194/273] prooftree: move out of ocamlPackages --- pkgs/top-level/all-packages.nix | 5 ++++- pkgs/top-level/ocaml-packages.nix | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22b63a492ee..7e29ff17185 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17254,7 +17254,10 @@ with pkgs; picosat = callPackage ../applications/science/logic/picosat {}; - inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree; + prooftree = (with ocamlPackages_4_01_0; + callPackage ../applications/science/logic/prooftree { + camlp5 = camlp5_transitional; + }); prover9 = callPackage ../applications/science/logic/prover9 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5f000099e14..e580ac41660 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -721,12 +721,6 @@ let camlp5 = camlp5_transitional; }; - prooftree = - if lib.versionOlder "4.01" ocaml.version - then null - else callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }; }; in lib.fix' (lib.extends overrides packageSet); in rec From 05a3a541436527823883d3d39813912bc89e7782 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:16:38 -0300 Subject: [PATCH 195/273] pavucontrol-qt: 0.1.0 -> 0.2.0 --- .../lxqt/core/pavucontrol-qt/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix index ea2f24d6cf1..b8421d06202 100644 --- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -1,29 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, -xdg-user-dirs, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pavucontrol-qt"; - version = "0.1.0"; + version = "0.2.0"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j"; + sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg - xdg-user-dirs libpulseaudio ]; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = https://github.com/lxde/pavucontrol-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From cadb035ebe629efdbc4ee3366bb4fb16733c7957 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:21:45 -0300 Subject: [PATCH 196/273] qtermwidget: 0.7.0 -> 0.7.1 --- pkgs/desktops/lxqt/core/qtermwidget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix index 33f3cc19cf6..66620e195ec 100644 --- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qtermwidget"; - version = "0.7.0"; + version = "0.7.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz"; + sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz"; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "A terminal emulator widget for Qt 5"; homepage = https://github.com/lxde/qtermwidget; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 660329fe9bb3a315ca61516ed44873f8ed1cf825 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:33:42 -0300 Subject: [PATCH 197/273] lximage-qt: 0.5.0 -> 0.5.1 --- .../lxqt/optional/lximage-qt/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix index ac7055924c4..3308f0e412b 100644 --- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix @@ -1,33 +1,33 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, - libfm, menu-cache, libexif }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, libfm, libexif }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lximage-qt"; - version = "0.5.0"; + version = "0.5.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0c5s0c2y73hp7mcxwg31bpn0kmjyhv519d0dxzp3na56n0xk9vl0"; + sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.libfm-qt xorg.libpthreadstubs xorg.libXdmcp libfm - menu-cache libexif ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "The image viewer and screenshot tool for lxqt"; homepage = https://github.com/lxde/lximage-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 3f03825ba6b30ecca2f59409e626286489b08fbc Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:43:43 -0300 Subject: [PATCH 198/273] pcmanfm-qt: 0.11.1 -> 0.11.3 --- .../desktops/lxqt/core/pcmanfm-qt/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix index bc9cf774017..7c115c2ca27 100644 --- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -1,31 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm, -menu-cache, lxmenu-data }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libfm, menu-cache, lxmenu-data }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "pcmanfm-qt"; - version = "0.11.1"; + version = "0.11.3"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32"; + sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.libfm-qt - xorg.libpthreadstubs - xorg.libXdmcp libfm menu-cache lxmenu-data @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = https://github.com/lxde/pcmanfm-qt; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 61f859d820270a675810f42ce24117cef4547732 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:48:38 -0300 Subject: [PATCH 199/273] qterminal: 0.7.0 -> 0.7.1 --- .../lxqt/optional/qterminal/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix index 7f0f66c6fbe..ff59a2d893c 100644 --- a/pkgs/desktops/lxqt/optional/qterminal/default.nix +++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: +{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qterminal"; - version = "0.7.0"; + version = "0.7.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v"; + sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase qt5.qttools qt5.qtx11extras - qt5.qtsvg - kde5.kwindowsystem - lxqt.liblxqt - lxqt.libqtxdg lxqt.qtermwidget ]; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { description = "A lightweight Qt-based terminal emulator"; homepage = https://github.com/lxde/qterminal; license = licenses.gpl2; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From d01f1690d38093b6517e0083aa5628488c7c84ad Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Feb 2017 11:54:31 +0100 Subject: [PATCH 200/273] redis: 3.2.7 -> 3.2.8 --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e50ecf60567..d87aefd37fb 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.7"; + version = "3.2.8"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "1abghfr9nq5k69vg0kjh2409k51xy6fhyf466gy7pzjb6zjz77dz"; + sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1"; }; buildInputs = [ lua ]; From 8f162eb0239e0e24422c66e9c6ef36973a133b94 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:54:27 -0300 Subject: [PATCH 201/273] lxqt-about: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-about/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix index 3e3b047dd4e..34491d0414b 100644 --- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -1,18 +1,21 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }: +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-about"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc"; + sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtx11extras @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = https://github.com/lxde/lxqt-about; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From a4825a2ed99b7430993716528233347f6d61f785 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 09:59:23 -0300 Subject: [PATCH 202/273] lxqt-admin: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-admin/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix index da47e02dcf1..2e6ae9858ad 100644 --- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }: +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-admin"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23"; + sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr"; }; nativeBuildInputs = [ cmake + lxqt.lxqt-build-tools ]; buildInputs = [ @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { description = "LXQt system administration tool"; homepage = https://github.com/lxde/lxqt-admin; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 49d8d91d5e13d7915351c4e31c398298eed3ab88 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:05:14 -0300 Subject: [PATCH 203/273] lxqt-config: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-config/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix index 66187a0ae6f..a16fcd21f68 100644 --- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -3,19 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-config"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw"; + sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx"; }; nativeBuildInputs = [ cmake pkgconfig - ]; + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { description = "Tools to configure LXQt and the underlying operating system"; homepage = https://github.com/lxde/lxqt-config; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 87393b2a6ff63001bb28bbb4e0be0a86b34694b2 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:08:45 -0300 Subject: [PATCH 204/273] lxqt-globalkeys: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix index 7f1f140653f..a23bff6e8d1 100644 --- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-globalkeys"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y"; + sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { description = "Daemon used to register global keyboard shortcuts"; homepage = https://github.com/lxde/lxqt-globalkeys; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 183550cb2ee4766bcd4acc9e0fca149c0862f286 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:15:20 -0300 Subject: [PATCH 205/273] lxqt-notificationd: 0.11.0 -> 0.11.1 --- .../lxqt/core/lxqt-notificationd/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix index 1ecef633494..3646a461c83 100644 --- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-notificationd"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x"; + sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -21,6 +24,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common ]; cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; @@ -29,7 +33,7 @@ stdenv.mkDerivation rec { description = "The LXQt notification daemon"; homepage = https://github.com/lxde/lxqt-notificationd; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From a0cc7797479feb2c2c8e8af38ab33c9b658a1797 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:20:13 -0300 Subject: [PATCH 206/273] lxqt-openssh-askpass: 0.11.0 -> 0.11.1 --- .../lxqt/core/lxqt-openssh-askpass/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix index 202231fbdea..9190718fde4 100644 --- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-openssh-askpass"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c"; + sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { description = "GUI to query passwords on behalf of SSH agents"; homepage = https://github.com/lxde/lxqt-openssh-askpass; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 7ca3611a496020f9e61f20d5ce0bb72a3a27288c Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:24:17 -0300 Subject: [PATCH 207/273] lxqt-policykit: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-policykit/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix index 627f43f8be6..f4351a9598d 100644 --- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-policykit"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd"; + sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -31,7 +35,7 @@ stdenv.mkDerivation rec { description = "The LXQt PolicyKit agent"; homepage = https://github.com/lxde/lxqt-policykit; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 9fb51ec316047e8a95e440b9d4730814a79aaf12 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:28:13 -0300 Subject: [PATCH 208/273] lxqt-powermanagement: 0.11.0 -> 0.11.1 --- .../lxqt/core/lxqt-powermanagement/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix index aabce857edd..b7321c64668 100644 --- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-powermanagement"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa"; + sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { description = "Power management module for LXQt"; homepage = https://github.com/lxde/lxqt-powermanagement; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From e4c6b47f477b246cc47bf80e3f483055809ff4cb Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:33:04 -0300 Subject: [PATCH 209/273] lxqt-session: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-session/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index a226169b21a..1dfdd303a72 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -3,16 +3,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-session"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4"; + sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -21,6 +25,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common xorg.libpthreadstubs xorg.libXdmcp xdg-user-dirs @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { description = "An alternative session manager ported from the original razor-session"; homepage = https://github.com/lxde/lxqt-session; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From b5ae4f42dc590d053e4ef8b531fd7a195f03765b Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:35:35 -0300 Subject: [PATCH 210/273] lxqt-sudo: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix index ad0885917ae..83b16587523 100644 --- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -3,16 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-sudo"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j"; + sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { description = "GUI frontend for sudo/su"; homepage = https://github.com/lxde/lxqt-sudo; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 349c252c58b9a6f343e7df31cd919cfc490715f3 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:53:59 -0300 Subject: [PATCH 211/273] lxqt-panel: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d5786444fad..0c899c67dad 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -5,16 +5,20 @@ lxmenu-data }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-panel"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq"; + sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -27,6 +31,7 @@ stdenv.mkDerivation rec { kde5.kguiaddons lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common lxqt.lxqt-globalkeys lxqt.libsysstat xorg.libpthreadstubs @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { description = "The LXQt desktop panel"; homepage = https://github.com/lxde/lxqt-panel; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 2e046f2bedfa99c60e21eeb14d26c063c21d38fe Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 10:56:07 -0300 Subject: [PATCH 212/273] lxqt-runner: 0.11.0 -> 0.11.1 --- pkgs/desktops/lxqt/core/lxqt-runner/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix index 02d6f90397a..f420e9e410a 100644 --- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -4,16 +4,20 @@ menu-cache, muparser }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "lxqt-runner"; - version = "0.11.0"; + version = "0.11.1"; srcs = fetchFromGitHub { owner = "lxde"; repo = pname; rev = version; - sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc"; + sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.lxqt-build-tools + ]; buildInputs = [ qt5.qtbase @@ -22,6 +26,7 @@ stdenv.mkDerivation rec { kde5.kwindowsystem lxqt.liblxqt lxqt.libqtxdg + lxqt.lxqt-common lxqt.lxqt-globalkeys menu-cache muparser @@ -33,7 +38,7 @@ stdenv.mkDerivation rec { description = "Tool used to launch programs quickly by typing their names"; homepage = https://github.com/lxde/lxqt-runner; license = licenses.lgpl21; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 0360e61d889439e930c4b02b08835825c527b95a Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Sat, 18 Feb 2017 00:20:38 +0530 Subject: [PATCH 213/273] serf: 20150515 -> 0.8.1 --- pkgs/servers/serf/default.nix | 21 ++++-- pkgs/servers/serf/deps.nix | 137 ---------------------------------- 2 files changed, 14 insertions(+), 144 deletions(-) delete mode 100644 pkgs/servers/serf/deps.nix diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 44c766d35d0..23daa99b3bc 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,17 +1,24 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "serf-${version}"; - version = "20150515-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; + version = "0.8.1"; + rev = "v${version}"; goPackagePath = "github.com/hashicorp/serf"; - src = fetchgit { + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "serf"; inherit rev; - url = "https://github.com/hashicorp/serf"; - sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; + sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; }; - goDeps = ./deps.nix; + meta = with stdenv.lib; { + description = "Tool for service orchestration and management"; + homepage = "https://www.serf.io/"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; + }; } diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix deleted file mode 100644 index bc5b960d147..00000000000 --- a/pkgs/servers/serf/deps.nix +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; - sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; - sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; - sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; - }; - } - { - goPackagePath = "github.com/hashicorp/logutils"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/logutils"; - rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; - sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; - sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; - sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; - }; - } - { - goPackagePath = "github.com/hashicorp/memberlist"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/memberlist"; - rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; - sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "281073eb9eb092240d33ef253c404f1cca550309"; - sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; - }; - } - { - goPackagePath = "github.com/armon/circbuf"; - fetch = { - type = "git"; - url = "https://github.com/armon/circbuf"; - rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; - sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; - sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "8102d0ed5ea2709ade1243798785888175f6e415"; - sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; - sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-msgpack"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; - sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; - }; - } - { - goPackagePath = "github.com/hashicorp/go.net"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go.net"; - rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; - sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; - }; - } -] From 8286ce1bcfa6a7a068360bc106176cb4e2ac4721 Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 19 Feb 2017 11:45:02 -0300 Subject: [PATCH 214/273] screengrab: 2016-02-24 -> 2017-02-18 --- pkgs/desktops/lxqt/optional/screengrab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix index 2ef1c7532a5..b3524d36777 100644 --- a/pkgs/desktops/lxqt/optional/screengrab/default.nix +++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }: stdenv.mkDerivation rec { - name = "screengrab-unstable-2016-09-12"; + name = "screengrab-unstable-2017-02-18"; srcs = fetchFromGitHub { owner = "QtDesktop"; repo = "screengrab"; - rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6"; - sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5"; + rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64"; + sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0"; }; nativeBuildInputs = [ cmake pkgconfig ]; From b53c53b1b4dd30d4c28ed86ec4f6c49079de4f66 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 31 Dec 2016 14:31:56 +0200 Subject: [PATCH 215/273] maintainers: Add script to patch version/sha256 in .nix files Adds a script to help automatically upgrading packages: this one can patch name/version attributes like: version = "50.1.0"; name = "bc-1.06"; ... to the given version, and updates the sha256 hash to match. Usage is: update-source-version [] where: - attr is the attribute path of the package - new-version is the version string to be patched in - new-source-hash is the optional sha256/etc. hash of the source. If not given, the script will automatically calculate it. This is added to a subdirectory where other useful scripts can be added in the future, like figuring out the newest version from a git repo or GitHub releases etc. --- pkgs/common-updater/scripts.nix | 18 ++++ .../scripts/update-source-version | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 110 insertions(+) create mode 100644 pkgs/common-updater/scripts.nix create mode 100755 pkgs/common-updater/scripts/update-source-version diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix new file mode 100644 index 00000000000..cb7f23f7480 --- /dev/null +++ b/pkgs/common-updater/scripts.nix @@ -0,0 +1,18 @@ +{ stdenv, makeWrapper, coreutils, gawk, gnused, nix }: + +stdenv.mkDerivation { + name = "common-updater-scripts"; + + buildInputs = [ makeWrapper ]; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p $out/bin + cp ${./scripts}/* $out/bin + + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix ]} + done + ''; +} diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version new file mode 100755 index 00000000000..13f8adf5677 --- /dev/null +++ b/pkgs/common-updater/scripts/update-source-version @@ -0,0 +1,91 @@ +#!/usr/bin/env bash +set -e + +die() { + echo "$0: error: $1" >&2 + exit 1 +} + +# Usage: update-source-hash [] +attr=$1 +newVersion=$2 +newHash=$3 + +nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +if [ ! -f "$nixFile" ]; then + die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!" +fi + +oldHashAlgo=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') +oldHash=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"') + +if [ -z "$oldHashAlgo" -o -z "$oldHash" ]; then + die "Couldn't evaluate old source hash from '$attr.src'!" +fi + +if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then + die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" +fi + +drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"') +oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"') + +if [ -z "$drvName" -o -z "$oldVersion" ]; then + die "Couldn't evaluate name and version from '$attr.name'!" +fi + +if [ "$oldVersion" = "$newVersion" ]; then + echo "$0: New version same as old version, nothing to do." >&2 + exit 0 +fi + +# Escape dots, there should not be any other regex characters allowed in store path names +oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g') + +if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|" +elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then + pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|" +else + die "Couldn't figure out where out where to patch in new version in '$attr'!" +fi + +# Replace new version +sed -i.bak "$nixFile" -re "$pattern" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!" +fi + +case "$oldHashAlgo" in + sha256) hashLength=64 ;; + sha512) hashLength=128 ;; + *) die "Unhandled hash algorithm '$oldHashAlgo' in '$attr'!" ;; +esac + +# Make a temporary all-zeroes hash of $hashLength characters +tempHash=$(printf '%0*d' "$hashLength" 0) + +sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace source hash of '$attr' to a temporary hash!" +fi + +# If new hash not given on the command line, recalculate it ourselves. +if [ -z "$newHash" ]; then + nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true + # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed + newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }') +fi + +if [ -z "$newHash" ]; then + cat "$attr.fetchlog" >&2 + die "Couldn't figure out new hash of '$attr.src'!" +fi + +sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|" +if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace temporary source hash of '$attr' to the final source hash!" +fi + +rm -f "$nixFile.bak" +rm -f "$attr.fetchlog" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1385be2c99f..30452e7fa6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -65,6 +65,7 @@ with pkgs; nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { }; + common-updater-scripts = callPackage ../common-updater/scripts.nix { }; ### BUILD SUPPORT From 9483359887f815aa7441176be5af2d4e9ae6f5b2 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 19 Feb 2017 16:33:31 +0200 Subject: [PATCH 216/273] linuxPackages.tp_smapi: Use common-updater/update-source-version script This way we have the benefit of the usual Nixpkgs style, and gain a slight reduction in amount of code in the updater. Also use callPackage to reduce duplication of the dependencies of the update script and use makeBinPath to make things neater. --- pkgs/os-specific/linux/tp_smapi/default.nix | 14 ++++++++------ pkgs/os-specific/linux/tp_smapi/update.nix | 19 +++---------------- 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index cb5c539a94e..765305d0fda 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl +{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts }: stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "0.42"; - src = fetchurl { - url = "https://github.com/evgeni/tp_smapi/archive/tp-smapi/${version}.tar.gz"; - sha256 = "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381"; + src = fetchFromGitHub { + owner = "evgeni"; + repo = "tp_smapi"; + rev = "tp-smapi/${version}"; + sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy"; + name = "tp-smapi-${version}"; }; hardeningDisable = [ "pic" ]; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.updateScript = import ./update.nix { - inherit writeScript coreutils gnugrep jq curl; + inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts; }; meta = { diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix index 0c97d18472c..94eb44b744c 100644 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ b/pkgs/os-specific/linux/tp_smapi/update.nix @@ -1,23 +1,10 @@ -{ writeScript, coreutils, gnugrep, jq, curl -}: +{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }: writeScript "update-tp_smapi" '' -PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin +PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]} -pushd pkgs/os-specific/linux/tp_smapi - -tmpfile=`mktemp` tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1` -sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1` -cat > update.json < Date: Thu, 5 Jan 2017 00:38:55 +0200 Subject: [PATCH 217/273] firefox, thunderbird: Use common-updater/update-source-version script Replace the custom patching code with the common script. Also use callPackage and makeBinPath --- .../networking/browsers/firefox/default.nix | 12 +++---- .../networking/browsers/firefox/update.nix | 34 ++++--------------- .../mailreaders/thunderbird/default.nix | 10 +++--- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 4a1b642d838..a01cde4d6de 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -5,7 +5,7 @@ , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio , autoconf213, which -, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed +, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -151,8 +151,8 @@ in { version = "51.0.1"; sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312"; updateScript = import ./update.nix { - name = "firefox"; - inherit writeScript xidel coreutils gnused gnugrep curl ed; + attrPath = "firefox-unwrapped"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; }; }; @@ -161,9 +161,9 @@ in { version = "45.7.0esr"; sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d"; updateScript = import ./update.nix { - name = "firefox-esr"; - versionSuffix = "esr"; - inherit writeScript xidel coreutils gnused gnugrep curl ed; + attrPath = "firefox-esr-unwrapped"; + versionSuffix = "esr"; + inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix index 33c9f307918..0f465122806 100644 --- a/pkgs/applications/networking/browsers/firefox/update.nix +++ b/pkgs/applications/networking/browsers/firefox/update.nix @@ -1,23 +1,18 @@ -{ name -, writeScript +{ writeScript +, lib , xidel +, common-updater-scripts , coreutils , gnused , gnugrep , curl -, ed -, sourceSectionRegex ? "${name}-unwrapped = common" -, basePath ? "pkgs/applications/networking/browsers/firefox" +, attrPath , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" , versionSuffix ? "" }: -let - version = (builtins.parseDrvName name).version; -in writeScript "update-${name}" '' - PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${ed}/bin - - pushd ${basePath} +writeScript "update-${attrPath}" '' + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} url=${baseUrl} @@ -35,20 +30,5 @@ in writeScript "update-${name}" '' shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1` - ed default.nix < Date: Sun, 19 Feb 2017 11:52:26 -0300 Subject: [PATCH 218/273] qlipper: 2016-09-26 -> 5.0.0 --- pkgs/desktops/lxqt/optional/qlipper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix index 551259ac3a0..376b8fb0190 100644 --- a/pkgs/desktops/lxqt/optional/qlipper/default.nix +++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qlipper"; - version = "2016-09-26"; + version = "5.0.0"; srcs = fetchFromGitHub { owner = "pvanek"; repo = pname; - rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486"; - sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k"; + rev = version; + sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j"; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Cross-platform clipboard history applet"; homepage = https://github.com/pvanek/qlipper; license = licenses.gpl2Plus; - maintainers = with maintainers; [ romildo ]; platforms = with platforms; unix; + maintainers = with maintainers; [ romildo ]; }; } From 5d62724e27c8c0f7c215b01a87c3ac08c65d11c4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Feb 2017 16:44:49 +0100 Subject: [PATCH 219/273] geogebra: 5-0-328-0 -> 5-0-331-0 --- pkgs/applications/science/math/geogebra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index f72ec5bacc2..c5b1fbabde1 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-328-0"; + version = "5-0-331-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "1bzmnw5410fv9s29ji8f4naa6m6ykvv8h88mmxhiygr3rfsc7050"; + sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2"; }; srcIcon = fetchurl { From 10a453c61bb54640356901e23718c6d4ee2e08c1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Feb 2017 16:51:01 +0100 Subject: [PATCH 220/273] geogebra: add ma27 as maintainer --- lib/maintainers.nix | 1 + pkgs/applications/science/math/geogebra/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 89c08872698..fa19809cc65 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -277,6 +277,7 @@ luispedro = "Luis Pedro Coelho "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; + ma27 = "Maximilian Bosch "; madjar = "Georges Dubus "; magnetophon = "Bart Brouns "; mahe = "Matthias Herrmann "; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index c5b1fbabde1..45f8dd1960b 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { calculus in one easy-to-use package. ''; homepage = https://www.geogebra.org/; + maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = platforms.all; hydraPlatforms = []; From 511f82d6e5efbf9a0cf4d8a7cfa1b30967e9aee6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Feb 2017 17:29:42 +0100 Subject: [PATCH 221/273] fbterm: install terminfo definition Hopefully helps with #22988 --- pkgs/os-specific/linux/fbterm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index 59f93e836c4..ad3c145cd8a 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses}: +{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz"; sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj"; }; - buildInputs = [gpm freetype fontconfig pkgconfig ncurses]; + buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86]; in stdenv.mkDerivation { inherit (s) name version; @@ -24,6 +24,10 @@ stdenv.mkDerivation { export HOME=$PWD; export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype" ''; + preBuild = '' + mkdir -p "$out/share/terminfo" + tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm + ''; meta = { inherit (s) version; description = "Framebuffer terminal emulator"; From 505d7bea3af48c79af4212111324a4b95f80f212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Feb 2017 17:40:18 +0100 Subject: [PATCH 222/273] lua-packages: hydraPlatforms -> platforms I see no original reason. It seems someone started using hydraPlatforms in that file and everyone else was just conforming to the style. --- pkgs/top-level/lua-packages.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 6ad2e288c97..4b5552b8738 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -126,7 +126,7 @@ let meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - hydraPlatforms = stdenv.lib.platforms.unix; + plaftorms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.flosse ]; }; }; @@ -146,7 +146,7 @@ let ''; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - hydraPlatforms = stdenv.lib.platforms.unix; + plaftorms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ flosse ]; }; }; @@ -162,7 +162,7 @@ let meta = { description = "Lua bindings for POSIX API"; homepage = "https://github.com/luaposix/luaposix"; - hydraPlatforms = stdenv.lib.platforms.unix; + plaftorms = stdenv.lib.platforms.unix; }; }; @@ -175,7 +175,7 @@ let }; meta = { homepage = "http://www.tset.de/lpty"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; preBuild = '' @@ -239,7 +239,7 @@ let meta = with stdenv.lib; { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = with platforms; [darwin linux freebsd illumos]; + plaftorms = with platforms; [darwin linux freebsd illumos]; maintainers = with maintainers; [ mornfall ]; }; }; @@ -257,7 +257,7 @@ let disabled = isLua52; meta = { homepage = "https://github.com/luaforge/luazip"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -288,7 +288,7 @@ let meta = with stdenv.lib; { homepage = https://github.com/brimworks/lua-zlib; - hydraPlatforms = platforms.unix; + plaftorms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.koral ]; }; @@ -304,7 +304,7 @@ let buildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -339,7 +339,7 @@ let meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; broken = true; }; @@ -359,7 +359,7 @@ let meta = { homepage = "https://github.com/LuaDist/luasql-sqlite3"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -387,7 +387,7 @@ let meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - hydraPlatforms = stdenv.lib.platforms.all; + plaftorms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; }; }; @@ -459,7 +459,7 @@ let meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; - hydraPlatforms = stdenv.lib.platforms.linux; + plaftorms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; From f6eedf08674769a0bf12ec0ce8e3e7d6a8dc3c1b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 19 Feb 2017 19:44:53 +0300 Subject: [PATCH 223/273] nvidia-x11.settings: add librsvg for gtk3 --- pkgs/os-specific/linux/nvidia-x11/settings.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index d088fe5253c..abf208cff93 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,7 @@ nvidia_x11: sha256: { stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau +, librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -15,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig m4 ]; - buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ]; + buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; @@ -39,9 +41,11 @@ stdenv.mkDerivation rec { ''} ''; + binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; + postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \ - $out/bin/nvidia-settings + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \ + $out/bin/$binaryName ''; meta = with stdenv.lib; { From 22750b36fdd96f0b88a8048e00e6ef4c31106f81 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 11 Feb 2017 17:11:18 +0300 Subject: [PATCH 224/273] nvidia: support application profiles Closes #22666. --- nixos/modules/hardware/video/nvidia.nix | 4 ++++ pkgs/os-specific/linux/nvidia-x11/builder.sh | 7 +++++++ pkgs/os-specific/linux/nvidia-x11/default.nix | 1 + pkgs/os-specific/linux/nvidia-x11/generic.nix | 3 ++- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 1 + pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 ++++ 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index cf723d53269..161ed9457af 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -49,6 +49,10 @@ in Option "RandRRotation" "on" ''; + environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles { + source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc"; + }; + hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs; hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 7dee6b4776c..24a2e2cf06f 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -68,6 +68,13 @@ installPhase() { nuke-refs $i cp $i $bin/lib/modules/$kernelVersion/misc/ done + + # Install application profiles. + if [ "$useProfiles" = "1" ]; then + mkdir -p $bin/share/nvidia + cp nvidia-application-profiles-*-rc $bin/share/nvidia/nvidia-application-profiles-rc + cp nvidia-application-profiles-*-key-documentation $bin/share/nvidia/nvidia-application-profiles-key-documentation + fi fi # All libs except GUI-only are installed now, so fixup them. diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 204ef62138a..5e26fef6e19 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -37,6 +37,7 @@ in settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf"; persistencedSha256 = null; useGLVND = false; + useProfiles = false; }; legacy_173 = callPackage ./legacy173.nix { }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1398dae0e64..9e39a6df09c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -4,6 +4,7 @@ , settingsSha256 , persistencedSha256 , useGLVND ? true +, useProfiles ? true , preferGtk2 ? false }: @@ -41,7 +42,7 @@ let } else throw "nvidia-x11 does not support platform ${stdenv.system}"; - inherit version useGLVND; + inherit version useGLVND useProfiles; inherit (stdenv) system; outputs = [ "out" ] ++ optional (!libsOnly) "bin"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 19199579e77..6e5b412a9b8 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { settings = null; persistenced = null; useGLVND = false; + useProfiles = false; }; meta = { diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index abf208cff93..f8999744164 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; + postPatch = lib.optionalString nvidia_x11.useProfiles '' + sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c + ''; + preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then ( cd src/libXNVCtrl From 77f5a50c400d7e312e7491593dcc8ee8cab86c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Feb 2017 17:55:50 +0100 Subject: [PATCH 225/273] lua-packages: fix my mass typo in meta --- pkgs/top-level/lua-packages.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 4b5552b8738..5ca9f697b87 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -126,7 +126,7 @@ let meta = { homepage = "http://matthewwild.co.uk/projects/luaexpat"; - plaftorms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.flosse ]; }; }; @@ -146,7 +146,7 @@ let ''; meta = { homepage = "https://github.com/keplerproject/luafilesystem"; - plaftorms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ flosse ]; }; }; @@ -162,7 +162,7 @@ let meta = { description = "Lua bindings for POSIX API"; homepage = "https://github.com/luaposix/luaposix"; - plaftorms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.unix; }; }; @@ -175,7 +175,7 @@ let }; meta = { homepage = "http://www.tset.de/lpty"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; preBuild = '' @@ -239,7 +239,7 @@ let meta = with stdenv.lib; { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - plaftorms = with platforms; [darwin linux freebsd illumos]; + platforms = with platforms; [darwin linux freebsd illumos]; maintainers = with maintainers; [ mornfall ]; }; }; @@ -257,7 +257,7 @@ let disabled = isLua52; meta = { homepage = "https://github.com/luaforge/luazip"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -288,7 +288,7 @@ let meta = with stdenv.lib; { homepage = https://github.com/brimworks/lua-zlib; - plaftorms = platforms.unix; + platforms = platforms.unix; license = licenses.mit; maintainers = [ maintainers.koral ]; }; @@ -304,7 +304,7 @@ let buildInputs = [ autoreconfHook unzip ]; meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -339,7 +339,7 @@ let meta = { homepage = "https://github.com/lua-stdlib/lua-stdlib/"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; broken = true; }; @@ -359,7 +359,7 @@ let meta = { homepage = "https://github.com/LuaDist/luasql-sqlite3"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; @@ -387,7 +387,7 @@ let meta = { homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/"; - plaftorms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; }; }; @@ -459,7 +459,7 @@ let meta = { description = "Simple implementation of msgpack in C Lua 5.1"; homepage = "https://github.com/tarruda/libmpack"; - plaftorms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; }; }; From 1078758b12cf2749f78333a9184d7d2af8149d4a Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 19 Feb 2017 17:13:09 +0000 Subject: [PATCH 226/273] haskellPackages.lentil: no longer needs overrides --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4370feef40f..1f24556a1a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -808,12 +808,6 @@ self: super: { # No upstream issue tracker hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; - lentil = super.lentil.overrideScope (self: super: { - pipes = self.pipes_4_3_2; - # https://github.com/roelvandijk/terminal-progress-bar/issues/14 - terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1; - }); - # https://github.com/basvandijk/lifted-base/issues/34 lifted-base = doJailbreak super.lifted-base; From febda39df386f374de7ee441f4c9b63ce2c15b84 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Feb 2017 18:35:22 +0100 Subject: [PATCH 227/273] qca2: 2.1.1 -> 2.1.3 --- pkgs/development/libraries/qca2/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 431fd432ecb..6a951fddb79 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.1.1"; + name = "qca-${version}"; + version = "2.1.3"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz"; - sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm"; + url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz"; + sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -13,8 +14,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./libressl.patch ]; - meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; From 5759206608378365de940ad2630f6932ce9e3157 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Feb 2017 18:36:12 +0100 Subject: [PATCH 228/273] qca2: add qca2-qt5 top-level attribute --- 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 abead3b3b21..7d79258ab5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9218,6 +9218,7 @@ with pkgs; re2 = callPackage ../development/libraries/re2 { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; + qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; From 9d8166448086a95dab25876ccc96e5b1f912dad3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 19 Feb 2017 18:37:56 +0100 Subject: [PATCH 229/273] psi: move out of kdePackages, it doesn't use kdelibs anyway --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d79258ab5a..87b0ec76a1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3502,6 +3502,8 @@ with pkgs; ps3netsrv = callPackage ../servers/ps3netsrv { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -16757,8 +16759,6 @@ with pkgs; polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; - qtcurve = callPackage ../misc/themes/qtcurve { }; quassel = callPackage ../applications/networking/irc/quassel rec { From 048c04654dfcb48c8d8e6ddbb011c752eaa88e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Feb 2017 18:30:19 +0100 Subject: [PATCH 230/273] maintainers: update my email address --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fa19809cc65..fba18ac75a7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -305,7 +305,7 @@ meisternu = "Matt Miemiec "; metabar = "Celine Mercier "; mguentner = "Maximilian Güntner "; - mic92 = "Jörg Thalheim "; + mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; From 6dbb3ab03124610dad016fdd52fa2caae969d143 Mon Sep 17 00:00:00 2001 From: anderspapitto Date: Sun, 19 Feb 2017 10:25:25 -0800 Subject: [PATCH 231/273] buildRustPackage: fix deprecated use of registry.index config key (#22987) See https://github.com/rust-lang/cargo/commit/8214bb953dee7f529747ce69ff81fe294259a6a0 for the cargo commit which deprecated the registry.index key, and implements this as a replacement. This gets rid of the error message warning: custom registry support via the `registry.index` configuration is being removed, this functionality will not work in the future --- pkgs/build-support/rust/fetch-cargo-deps | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps index 54593994990..89b78547b38 100755 --- a/pkgs/build-support/rust/fetch-cargo-deps +++ b/pkgs/build-support/rust/fetch-cargo-deps @@ -11,8 +11,11 @@ fetchCargoDeps() { echo "Using rust registry from $rustRegistry" cat < $out/config -[registry] -index = "file://$rustRegistry" +[source.nix-store-rust-registry] +registry = "file://$rustRegistry" + +[source.crates-io] +replace-with = "nix-store-rust-registry" EOF export CARGO_HOME=$out From 4129697445a84e0291bc53f28166af6147271d3e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 19 Feb 2017 15:27:04 -0300 Subject: [PATCH 232/273] higan: 101 -> 102 (#22942) --- pkgs/misc/emulators/higan/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 8d3537b0ee6..b1495987e61 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,19 +4,18 @@ , udev , mesa, SDL , libao, openal, libpulseaudio -, gtk2, gtksourceview -}: +, gtk2, gtksourceview }: with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "101"; + version = "102"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "04vr3fp0b3cwq7q8d9v60qmv08zpcsb5gqn1whl4fvwcxcl22by8"; + sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; @@ -71,16 +70,17 @@ stdenv.mkDerivation rec { longDescription = '' Higan (formerly bsnes) is a Nintendo multi-system emulator. It currently supports the following systems: - Famicom; Super Famicom; - Game Boy; Game Boy Color; Game Boy Advance - WonderSwan; WonderSwan Color - higan also supports the following subsystems: - Super Game Boy; BS-X Satellaview; Sufami Turbo + - Nintendo's Famicom, Super Famicom (with subsystems: + Super Game Boy, BS-X Satellaview, Sufami Turbo); + Game Boy, Game Boy Color, Game Boy Advance; + - Sega's Master System, Game Gear, Mega Drive; + - NEC's PC Engine, SuperGrafx; + - Bandai' WonderSwan, WonderSwan Color. ''; homepage = http://byuu.org/higan/; license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; }; } From a21455d989d320cb316be50c58c8a3fbe090865d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 19 Feb 2017 13:33:31 -0500 Subject: [PATCH 233/273] firefox-bin: Add gpg verification to updater (#22270) --- .../browsers/firefox-bin/default.nix | 3 +- .../browsers/firefox-bin/firefox.key | 63 +++++++++++++++++++ .../browsers/firefox-bin/update.nix | 16 +++-- 3 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox-bin/firefox.key diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 0b9ff9db219..80197999f5a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -43,6 +43,7 @@ , coreutils , gnused , gnugrep +, gnupg }: assert stdenv.isLinux; @@ -173,7 +174,7 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.updateScript = import ./update.nix { - inherit name writeScript xidel coreutils gnused gnugrep curl; + inherit name writeScript xidel coreutils gnused gnugrep gnupg curl; }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/pkgs/applications/networking/browsers/firefox-bin/firefox.key new file mode 100644 index 00000000000..9169c4f9c44 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox-bin/firefox.key @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCz +PQpH6BoA73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxR +tWq5rCH48LnltKPamPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuuc +B4GNxXMgswZ7GTZO3VBDVEw5GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEn +dUB2oDMsSAoS/dZcl8F4otqfR1pXg618cU06omvq5yguWLDRV327BLmezYK0prD3 +P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLzK+7hok5kBxhsdMsdTZLd4tVR +jXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfslTmo7BgvmjZvAH5Z +asaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnypUPaJ2sBu +blnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin +CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZ +suv1TA+Mn111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQAB +tC9Nb3ppbGxhIFNvZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29t +PokCOAQTAQIAIgUCValABAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ +Ybe1JtmPA1NQqg//Rr6/V7uLqrIwx0UFknyNJasRJZhUkYxdGsLD18zO0Na8Ve3Q +sYpOC3ojpqaFUzpqm6KNv8eXfd/Ku7j3WGr9kPkbjZNghvy6V5Lva4JkxO6LMxKk +JYqiqF2o1Gfda8NfcK08GFy4C0L8zNwlADvmdMo4382tmHNGbTTft7BeVaRrE9xW +9eGmGQ2jYOsjxb5MsadAdZUuK8IC95ZHlUDR3gH9KqhfbQWp5Bo924Kiv+f2JUzN +rrG98eOm1Qb8F9rePzZ2DOYRJyOe4p8Gpl+kojCXNntkJgcwJ1a1yRE6wy9RzpeB +lCeoQuLS92MNne+deQZUskTZFoYXUadf6vbdfqL0nuPCKdl9lhef1QNwE30IRymt +6fhJCFffFQjGdeMfSiCHgcI8ichQbrzhBCGGR3bAHan9c2EbQ+puqG3Aa0YjX6Db +GJjWOI6A61bqSPepLCMVaXqV2mZEIaZWdZkOHjnRrU6CJdXG/+D4m1YBZwYM60eJ +kNu4eMMwMFnRsHiWf7bhqKptwuk8HyIGp2o4j8iqrFRVJEbK/ctdhA3H1AlKug9f +NrfwCfqhNCSBju97V03U26j04JMn9nrZ2UEGbpty+8ONTb38WX5/oC61BgwV8Ki4 +6Lwyb7fImUzz8jE83pjh7s3+NCKvvbH+VfT12f+V/fsphN3EwGwJPTC3fX25Ag0E +ValA9AEQAK/z677fpoVUj4zQz0g60wVWf+1y2lGb8iFYICmvrJyaEra5SRkyihYA +1WmEzhN4T//tHw3UIfe646+GkY3eIQW2jY9DM2XaElmMN8k/v54nbn5oD7rNEyCT +FTvCOq5d74HH1vw96Lzay1vy45E7jPWvqfg9Se8KAnzElohTJjizyhU+0QbmPHnQ +lY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdLPhcFB1scc25iFqh9IAKUGDur8jQ+SDHC +jgQlkFOg3rbqtaUOnVHPohfrBM90ZNwuneFgQY7ZFSUidCimp/EN4CXnzgjDYXUU +A42S8G86+G4KAJC22gRQo4mcVmehwHTH0glfLmUK7TEu29A1KWNL3R/R7Zdyajjp +CvUaK2A0Abj3ZE2BSDbJrVlbBVfy5kfPdZjhd3wUWqFaDHiVcImcjZRWPncllhcy +6fhqEy3ELZrkezpJjnARsVkij3GXz6oX+HVULne2w0dkTXydR6muZI/GeNtrLHmA +8B3/0/TllmLy8ChmYZVIKZ8zt1ghq3f+hFTXgtZil7eBewZgA6L+EXXK6dZj14lb +e6CMS2kungTX9stU1s42I+WRbiqiLpAxCX6qcLBOWrJwsOep2nvu5bhrPHptSfRh +F4Vs1xteVFckCWhcLgdYi/Je1XBEM+AAVa0k1FiywCg7MqlG6toLABEBAAGJBEQE +GAECAA8FAlWpQPQCGwIFCQPCZwACKQkQYbe1JtmPA1PBXSAEGQECAAYFAlWpQPQA +CgkQHGnE5V6ZBdsvxQ/6A62ZteN0b/TVfSJ51SdG66amwe2rpRX4UdSw7ifxo3qh +gEICQmXR5c09qXwl17MFJWM3FhGrbxnA5KGgeWGtqrPup4QZPKU+l2Ea2QLSJSiB +q5QqqEgZvR14Lhr/hCGhBAq9s/xbp8fbKNJj/uWiZ+uTPbt5T5rgKJ4+g3B6DNO1 +rH7F70OLrd32mxZs4pSxngHRAyiMPB59yQVDsVMha0JTqC+P96itUzvnInc/9mwE +0EMiBtpDTkoBwbJVPnuv+7FjkOLn5s5u3RLH9fe8z1xnV0fPC0/ndrlNiuBpAn3z +VCsWasvW18Vz8K+CQY8Sw0Jw75edBgFoz2QMFxHfDpMJefvMadB7mdte1lKk/Im9 +KFFH8Idh9b6zD0a/+Ooujukx6QpFfAVhe2sT2CIm2nmMAuAZI2cCt7SC+REn9n9M +SuIWxN8YTE3qgAUB6F3ea0O0hGlLl+z5UOfX0bNAs+ebx/P6PczJtDzeqpmRb0QX +qo55JWXLvmXT/fgjF7fNTTLsyCtV+xH6ZFKGpvGJGJMHApEbz2a0hy12RZH58eI1 +ueN3Tzn8nI57+oYSsqFw/QgcdGXDonLGJsPVzIpQRg92/GXSukWF+MsCjVOilHRS +Y1wfPPmJ7+kMQ4rdXpjAhwNYJc1ff5N+omCxCKoFgYsCXlFCHFKs4JwRbTdd3Mku +qBAAlBlIjym8NyJIBltfWckuhQTX4BiBltGPNga9CpQsml519EePuLtoe5H0fTUp +4UYbL0ZzyJImQE2uw/hMNZ36bA057YtHOoP4FcPUwv6wsl5JC87UR1XFhAXb5xSU +0qdi3hWh0hm772X6CBlM8lM6GtT/fDZkSGNXMQaIs1X/O9vf8wGg+HwLJcaCvybI +4w7w1K0R7WjWZlJXutCZf8hRc0d88W/qSZYooKD9q2S7foqaJhySIaF11sH5ETvV +P3oCfGVIVhKWb0Tp2jXPXlXLeRAQA8S+4B1o5XHiM+J3SNXhPQHRGQ3VGcDn45it +g3F4xQX2Qvo4SV42NMYd6TykM/dIfQyJDOVg3CT3+nqfjCknf94SNvyZprHEPmpc +DeseoPMw8kjKNwDwPXFLxBRntPgnqVXDcNN41OH2kqx4jF7FLlRmwNpB2mFVH8xe +VuRm7h2WZRsaEoqvivhzRtESVA2um5Eg763CVTcNYlK6MD/iy8JzbMuZBrlOHr58 +HKDdcOy1W0z2quESGoqrwA995IgPav/1DSpyuJPNc/oUTWlhpYshqYKoflezAyKj +30+UzC3R/mY03ri6zUvCgXHNgZlKUsM3VEXk6h5oDuaXniHLLzuxjTBVrILnGYgH +SFRP80L/knz+o4Uvq4wj7NHnruc5fP1foFxRNsMt40yRJfU= +=D+jC +-----END PGP PUBLIC KEY BLOCK----- \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index d32f4dfcf5b..a6cf8c1c1e0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -5,8 +5,9 @@ , gnused , gnugrep , curl +, gnupg , baseName ? "firefox" -, basePath ? "pkgs/applications/networking/browsers/firefox-bin" +, basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" }: @@ -14,10 +15,13 @@ let version = (builtins.parseDrvName name).version; isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version); in writeScript "update-${baseName}-bin" '' - PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin - + PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin + set -eux pushd ${basePath} + HOME=`mktemp -d` + cat ${./firefox.key} | gpg2 --import + tmpfile=`mktemp` url=${baseUrl} @@ -39,8 +43,12 @@ in writeScript "update-${baseName}-bin" '' grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \ tail -1` + curl --silent -o $HOME/shasums "$url$version/SHA512SUMS" + curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc" + gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums + # this is a list of sha512 and tarballs for both arches - shasums=`curl --silent $url$version/SHA512SUMS` + shasums=`cat $HOME/shasums` cat > $tmpfile < Date: Sun, 19 Feb 2017 19:16:56 +0100 Subject: [PATCH 234/273] keepalived: 1.3.2 -> 1.3.4 --- pkgs/tools/networking/keepalived/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 1f5a6216e7b..6e18e1dba1d 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "1mfw8116b7j8y37l382v154yssm635kbm72f4x8303g5zwg6n6qx"; + sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989"; }; buildInputs = [ From 07b301529ca0020963e7d0ebcf616837f79d06c2 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Mon, 20 Feb 2017 00:41:00 +0530 Subject: [PATCH 235/273] wuzz: 0.1.0 -> 0.2.0 (#23002) --- pkgs/tools/networking/wuzz/default.nix | 6 +-- pkgs/tools/networking/wuzz/deps.nix | 67 +++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 994a6f75d54..b13e5dee18c 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "wuzz-${version}"; - version = "0.1.0"; + version = "0.2.0"; rev = "v${version}"; goPackagePath = "https://github.com/asciimoo/wuzz"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "asciimoo"; repo = "wuzz"; inherit rev; - sha256 = "0n55y9dmx4rsccjscvbrgiq2g1qwqxj44lg90589i55b5f7r1ljd"; + sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/wuzz/deps.nix b/pkgs/tools/networking/wuzz/deps.nix index 1025793cc98..8904596a712 100644 --- a/pkgs/tools/networking/wuzz/deps.nix +++ b/pkgs/tools/networking/wuzz/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/jroimartin/gocui"; - rev = "7ac95c981b8a07b624ab197b3ad5813fdfbe4864"; - sha256 = "1xr752gpjv32mnzzy5v367maczl7sn8frn258wqrs6gqf07sdmjp"; + rev = "ed41d1bd2c217d4d1e312c2ee5d2f0c7793a99cc"; + sha256 = "1h4jxhvkf43jsbn85w45fq2xsmcg08mc9g7pkxf880g6sqznrmcz"; }; } { @@ -26,4 +26,67 @@ sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv"; }; } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/nwidger/jsoncolor"; + fetch = { + type = "git"; + url = "https://github.com/nwidger/jsoncolor"; + rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a"; + sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878"; + sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "30a891c33c7cde7b02a981314b4228ec99380cca"; + sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "d228849504861217f796da67fae4f6e347643f15"; + sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d"; + }; + } + { + goPackagePath = "github.com/asciimoo/wuzz"; + fetch = { + type = "git"; + url = "https://github.com/asciimoo/wuzz"; + rev = "f34c82a4386951022f8bfc011fe6a7362dd8286c"; + sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs"; + }; + } ] From aefb01a94577806351b6dd921f3265a291cf86ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 18 Feb 2017 19:23:28 +0300 Subject: [PATCH 236/273] haskellPackages.lambdabot: maintain --- .../haskell-modules/configuration-hackage2nix.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 364c5bcdf32..492b2005ccd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2296,6 +2296,7 @@ package-maintainers: - shakespeare abbradar: - Agda + - lambdabot dont-distribute-packages: # hard restrictions that really belong into meta.platforms @@ -5418,9 +5419,6 @@ dont-distribute-packages: lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] - lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-core: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] From 7734d159d102251fafdd1573e99e712d840d8c84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 16 Feb 2017 12:34:49 +0100 Subject: [PATCH 237/273] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/cc52bff6e8781efaf053d9a19dd42ec4fe8ba02a. --- .../haskell-modules/hackage-packages.nix | 937 ++++++++++++++---- 1 file changed, 732 insertions(+), 205 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b83d984b0bb..fddb99eb130 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1344,8 +1344,8 @@ self: { }: mkDerivation { pname = "BioHMM"; - version = "1.0.3"; - sha256 = "88963139ccce5e5ab1125bf590847d403d08a9b9f17f91a4fcb704a6881f6335"; + version = "1.0.4"; + sha256 = "b3c36291729328b42ba73ee777c4ef1490eccee982b64ee3dbf5103c25d5c2f3"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector @@ -1713,6 +1713,8 @@ self: { pname = "BlogLiterately"; version = "0.8.4.3"; sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721"; + revision = "1"; + editedCabalFile = "fa4ead9c5b7ffc4b664584723d9cb95fccab0ba835b8ec8ca8303787bbe1d705"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11537,8 +11539,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2016.12.19"; - sha256 = "c182c028ecf764a4f363426fbd101eb1e3c9283d5558cae898cdbd45847d4fca"; + version = "0.2017.2.18"; + sha256 = "bce3d9eb1b99f620cae1fd35046e6829deb564846b1f847168924de251b87d68"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -15880,6 +15882,8 @@ self: { pname = "Spock"; version = "0.12.0.0"; sha256 = "8392d1ee34b46238c6bfe951080f06e11e1f3622d8402e7762c70aa61430e3d9"; + revision = "1"; + editedCabalFile = "88a5e8b3c6fb8b7b23bb5b6f37a4ac071842fba1420d6bd835d9ac7085753529"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -15901,6 +15905,8 @@ self: { pname = "Spock-api"; version = "0.12.0.0"; sha256 = "8cfdbcbd2fa426c595fb7d29f8a6395dea17476c15d5ae863da2605b1c6ebe00"; + revision = "1"; + editedCabalFile = "7fb9f5bacb759e7763ff03fb910b6d7ff3a19436bf70ba7bd0f9e54801541d70"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; @@ -15960,6 +15966,8 @@ self: { pname = "Spock-core"; version = "0.12.0.0"; sha256 = "e69b70ea3027fa644d546bcae25bbf75e38abd6f4a7f88f0628fea6e16e97895"; + revision = "1"; + editedCabalFile = "183fb6ab42002aff45add4cc8808ba29d8c6e7939c8cdc2877f100a4669d6676"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers cookie directory hashable http-api-data http-types hvect mtl @@ -16007,6 +16015,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Spock-lucid_0_4_0_0" = callPackage + ({ mkDerivation, base, lucid, Spock, transformers }: + mkDerivation { + pname = "Spock-lucid"; + version = "0.4.0.0"; + sha256 = "09ca1adac56dd7c1bd465d5a893f592e8b352337ab834418fa98d55eadabf26c"; + libraryHaskellDepends = [ base lucid Spock transformers ]; + homepage = "http://github.com/aelve/Spock-lucid"; + description = "Lucid support for Spock"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Spock-worker" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector @@ -16120,8 +16141,8 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.0.0"; - sha256 = "0b1234009521e37f69d734391138bec11c7c3d2df2496c939268fbff2cb1c86b"; + version = "1.0.1"; + sha256 = "04ae48d0061e8c7b8120c924677c33179cd837b2171e295c30558ad31583867f"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector @@ -26551,6 +26572,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "atom-conduit_0_4_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators + , data-default, hlint, lens-simple, mono-traversable, parsers + , quickcheck-instances, resourcet, safe-exceptions, tasty + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "atom-conduit"; + version = "0.4.0.2"; + sha256 = "dca5d06000961b82120440b17ff241dc785426b2bf50071f1979f8d4f6e839ff"; + libraryHaskellDepends = [ + base blaze-builder conduit conduit-combinators lens-simple + mono-traversable parsers safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base conduit data-default hlint lens-simple mono-traversable + parsers quickcheck-instances resourcet safe-exceptions tasty + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit + xml-types + ]; + description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atom-msp430" = callPackage ({ mkDerivation, atom, base, mtl }: mkDerivation { @@ -31270,6 +31318,8 @@ self: { pname = "bindynamic"; version = "1.0.0.0"; sha256 = "f1e9c392ea6a9be6a4d7200ed8060e5560ac6881c65c9423cc6e63d2bbe7246e"; + revision = "1"; + editedCabalFile = "d2dca13b71f94e70829d5d290af936fd21d93e1fb9f6b89a8540cd6f40a0a7e5"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; homepage = "https://github.com/lspitzner/bindynamic"; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; @@ -33315,6 +33365,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bookkeeping" = callPackage + ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }: + mkDerivation { + pname = "bookkeeping"; + version = "0.1.0.1"; + sha256 = "3fcfd3c8754c14b4882c35bb9762d928ada95fc099bac3ab5bb4821aeb879a58"; + libraryHaskellDepends = [ base dlist mtl text time ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/haskell-bookkeeping#readme"; + description = "A module for bookkeeping by double entry"; + license = stdenv.lib.licenses.mit; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -41662,10 +41725,8 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.2.0"; - sha256 = "963b04b703a2d5f273ffc43b3687e6d58afed144eef47d4070b0bdec6f3bd3e5"; - revision = "1"; - editedCabalFile = "54a4d19227a0e550ad5c89295596d5c8b3b3d8d9ffd0b1f937ca48198ce6e7ad"; + version = "0.1.3.0"; + sha256 = "d8e324ce287c9607c0358a70ecc02ee5a1c071661b020dac4a0d674b94b55119"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -56218,10 +56279,8 @@ self: { }: mkDerivation { pname = "dynamic-plot"; - version = "0.2.1.0"; - sha256 = "8d75d0d068f801f2da0199738b43261966f265f62f58b3ad9f5b33e7c7158999"; - revision = "1"; - editedCabalFile = "d2d367212ca5c730e629b14d04a12eccc8bee0d3bead4f16c7db230507753c4e"; + version = "0.2.2.0"; + sha256 = "7f04a719fd74874eab8f362443ebdac8ad9caffd6271f72a8904f4723a2a9cf0"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -57285,8 +57344,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.7"; - sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927"; + version = "1.0.8"; + sha256 = "8a12b4ee452e708e0e345963487341c48bf1936aabc47eef2e8b2efd69771b78"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -57302,8 +57361,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.6"; - sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5"; + version = "1.0.7"; + sha256 = "4dc63dc6fa6305a601152fa1a4f8e41f4d519e53967940bbc8565baf09b450a3"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -63776,11 +63835,11 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.0.8"; - sha256 = "1be849d2dbf73a7ad02d0945ae7eb834085ed4a192dcdf5733c2fd764d308adb"; + version = "0.5.1.0"; + sha256 = "0153c9fe8224f1cf72acfd6b738f03fed28e7b498ececaec176edb98556ef184"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring text ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base directory filepath mtl parsec ]; @@ -65104,8 +65163,8 @@ self: { }: mkDerivation { pname = "free-functors"; - version = "0.7"; - sha256 = "bb30362bc3c5f8293a75af0bda8e52dee497e06ab3c0f44b088d619a41f5707d"; + version = "0.7.1"; + sha256 = "051dff857638b93e574aecce065860e1985e71a8e0f07c410966cdf87880930c"; libraryHaskellDepends = [ algebraic-classes base bifunctors comonad constraints contravariant profunctors template-haskell transformers @@ -67663,8 +67722,8 @@ self: { }: mkDerivation { pname = "genvalidity-text"; - version = "0.3.0.0"; - sha256 = "ac533aec5b7d845596d5f0caef8fa2c931a8ba9fee17650e0141df4a6baacd0b"; + version = "0.3.1.0"; + sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -69871,6 +69930,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ginger_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, filepath + , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "ginger"; + version = "0.5.0.0"; + sha256 = "619261156d6d5fa5cdde9b2f39429c22b20b9d9159dcb4e867a598f5ed5c7f5c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring data-default filepath http-types mtl parsec + safe scientific text time transformers unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring data-default text transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring data-default mtl tasty tasty-hunit + tasty-quickcheck text time transformers unordered-containers + utf8-string + ]; + homepage = "https://bitbucket.org/tdammers/ginger"; + description = "An implementation of the Jinja2 template language in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ginsu" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, network, old-locale @@ -71107,16 +71198,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glazier_0_8_0_0" = callPackage - ({ mkDerivation, base, lens, mmorph, mtl, profunctors - , semigroupoids, transformers + "glazier_0_10_0_0" = callPackage + ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids + , transformers }: mkDerivation { pname = "glazier"; - version = "0.8.0.0"; - sha256 = "758345dee0b3401091ce52ce8e91332dd763bcfba112e211166ee7e7f69efa9c"; + version = "0.10.0.0"; + sha256 = "af7325fd898b62b8a29c106836b25fd334ab637d5d773a55da1fc25942af5167"; libraryHaskellDepends = [ - base lens mmorph mtl profunctors semigroupoids transformers + base lens mmorph mtl semigroupoids transformers ]; homepage = "https://github.com/louispan/glazier#readme"; description = "Composable widgets framework"; @@ -75316,13 +75407,13 @@ self: { }: mkDerivation { pname = "grapefruit-examples"; - version = "0.1.0.5"; - sha256 = "994a75f551cfe8c1a91eb83c5100abb6177acc3fdcd13c643ef08573ad24a629"; + version = "0.1.0.6"; + sha256 = "d12f367a313bebb5d793a152ab59223ada856fb4150428d994f30b87ae60e99b"; libraryHaskellDepends = [ base colour containers fraction grapefruit-frp grapefruit-records grapefruit-ui ]; - homepage = "http://grapefruit-project.org/"; + homepage = "https://grapefruit-project.org/"; description = "Examples using the Grapefruit library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75334,12 +75425,12 @@ self: { }: mkDerivation { pname = "grapefruit-frp"; - version = "0.1.0.5"; - sha256 = "15b626d8eaa352f3ad891cf7a235a71161791797326400d630a4fe4a9dacb094"; + version = "0.1.0.6"; + sha256 = "4e661fd1f137e438e1fa82d2d2bba7e9df24f5cf2e08027b2085793bc0c08ec0"; libraryHaskellDepends = [ arrows base containers fingertree semigroups TypeCompose ]; - homepage = "http://grapefruit-project.org/"; + homepage = "https://grapefruit-project.org/"; description = "Functional Reactive Programming core"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75349,10 +75440,10 @@ self: { ({ mkDerivation, arrows, base, grapefruit-frp }: mkDerivation { pname = "grapefruit-records"; - version = "0.1.0.5"; - sha256 = "011af70c436e6463b0fa43e873fcdbe584ac7a29546deb6d4dd401f1f5ca1e0a"; + version = "0.1.0.6"; + sha256 = "f5b41878c93312c4149b8c44dbc51bef35de6f9ab9b0d6a5e898f3285c5c99e4"; libraryHaskellDepends = [ arrows base grapefruit-frp ]; - homepage = "http://grapefruit-project.org/"; + homepage = "https://grapefruit-project.org/"; description = "A record system for Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75364,13 +75455,13 @@ self: { }: mkDerivation { pname = "grapefruit-ui"; - version = "0.1.0.5"; - sha256 = "58264c0628092bef6ecaa148de601a267bea6c352a8488f8fd7e1f82c4dbbd87"; + version = "0.1.0.6"; + sha256 = "16c7d95fa20d962c72dcc25d13ccd60d625f6c8fee6ea2b7d8a66dc1725f8fc9"; libraryHaskellDepends = [ arrows base colour containers fraction grapefruit-frp grapefruit-records ]; - homepage = "http://grapefruit-project.org/"; + homepage = "https://grapefruit-project.org/"; description = "Declarative user interface programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75378,17 +75469,18 @@ self: { "grapefruit-ui-gtk" = callPackage ({ mkDerivation, base, colour, containers, fraction, glib - , grapefruit-frp, grapefruit-records, grapefruit-ui, gtk + , grapefruit-frp, grapefruit-records, grapefruit-ui, gtk3 + , transformers }: mkDerivation { pname = "grapefruit-ui-gtk"; - version = "0.1.0.5"; - sha256 = "3f91385bada888f49f9b61b8c0bc289675fcd447f875c766044e9c6da5dfda80"; + version = "0.1.0.6"; + sha256 = "1f3411ae628b64f842a205e22226bc651e698dd368950d0063bf8ef3f1a7ba42"; libraryHaskellDepends = [ base colour containers fraction glib grapefruit-frp - grapefruit-records grapefruit-ui gtk + grapefruit-records grapefruit-ui gtk3 transformers ]; - homepage = "http://grapefruit-project.org/"; + homepage = "https://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -78321,8 +78413,8 @@ self: { pname = "hackage-security"; version = "0.5.2.2"; sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41"; - revision = "1"; - editedCabalFile = "abb26d1da6e07e187a4494591154080415152787c2583c09acf522ab929b9642"; + revision = "2"; + editedCabalFile = "678fde798c4291a66cc8d0497c1df558292dd8526b46132d6c651dc090ef0e5a"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -85659,8 +85751,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.0.1"; - sha256 = "6d4e53adcfc7375736ce47beb07e0ab3c6ec96300ce91edbae1fbd009bfff0db"; + version = "0.5.0.2"; + sha256 = "bcaf93d7febb8f04540010b2b0a244030bda1d5002b7cc158bbd05ba5acc9172"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87246,6 +87338,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hformat_0_2_0_0" = callPackage + ({ mkDerivation, base, base-unicode-symbols, hspec, text }: + mkDerivation { + pname = "hformat"; + version = "0.2.0.0"; + sha256 = "a949d752095cdc21a2e48ab4adf068ba67e5e53fa394e6fae9f29fe156dccefb"; + libraryHaskellDepends = [ base base-unicode-symbols text ]; + testHaskellDepends = [ base base-unicode-symbols hspec text ]; + homepage = "http://github.com/mvoidex/hformat"; + description = "Simple Haskell formatting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hfov" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -88679,12 +88785,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "histogram-fill_0_8_5_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }: + mkDerivation { + pname = "histogram-fill"; + version = "0.8.5.0"; + sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ]; + homepage = "https://github.com/Shimuuar/histogram-fill/"; + description = "Library for histograms creation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "histogram-fill-binary" = callPackage ({ mkDerivation, base, binary, histogram-fill, vector }: mkDerivation { pname = "histogram-fill-binary"; - version = "0.6.2.1"; - sha256 = "22ea6f6453ae85486621d05afaed5e3903be4b41464594f5e8a040840304672f"; + version = "0.8.5.0"; + sha256 = "1eefe685953e205c8dfb9003f56e28bd17b673c0e6bd5455bb59d9a50b6b7b36"; libraryHaskellDepends = [ base binary histogram-fill vector ]; homepage = "https://github.com/Shimuuar/histogram-fill/"; description = "Binary instances for histogram-fill package"; @@ -88695,11 +88814,11 @@ self: { ({ mkDerivation, base, cereal, histogram-fill, vector }: mkDerivation { pname = "histogram-fill-cereal"; - version = "0.6.2.0"; - sha256 = "55c7212207e03e55e01f6ce5715ee75f4029520804410ca61a6310b398b1769d"; + version = "0.8.5.0"; + sha256 = "38e36d11e6de32b2fd955a66961bfca4f81711e139cee680264c5c76962952cd"; libraryHaskellDepends = [ base cereal histogram-fill vector ]; - homepage = "http://bitbucket.org/Shimuuar/histogram-fill-cereal/"; - description = "Library for histograms creation"; + homepage = "https://github.com/Shimuuar/histogram-fill/"; + description = "Binary instances for histogram-fill package"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -91049,8 +91168,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.3.0"; - sha256 = "48d8e8c41c1204ced517a337d454a1dc87bd6a5ef3697f09756fac22e4d374ef"; + version = "0.3.1"; + sha256 = "162598c04c1e977b666c491dfb34451c43c08354427d9ed806b81169d6dd9c80"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; @@ -98040,8 +98159,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "1.0.0"; - sha256 = "01722988ca762cfefcbb97944d408fb3f4463fe56a3697e7e3aba501962d3af0"; + version = "1.1.1"; + sha256 = "be1ae93a00f627052a5f6c2d87bf26b531d59c737d69db6d0717cf0ef1b03402"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98068,8 +98187,8 @@ self: { }: mkDerivation { pname = "hw-kafka-conduit"; - version = "1.0.0"; - sha256 = "9b37eecd87f4e166a9cf8fec4dc2685aadb458028fae5d2adaea480e05826d1a"; + version = "1.1.1"; + sha256 = "308d8e9ed13fc980148b0b1b26e090739533c210bdbbfceb990d4ae54170a212"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102701,8 +102820,8 @@ self: { pname = "ip"; version = "0.8.7"; sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; - revision = "1"; - editedCabalFile = "53d0cca59537fcb2f837d6afcb3d9b0ac3df15a7cdbc4a06f97d696931698ebd"; + revision = "2"; + editedCabalFile = "121a83393fc17cfc59aee069015fcfd0a6f6d33e14314cb6688fed05396aafb6"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -103345,6 +103464,18 @@ self: { license = "LGPL"; }) {}; + "iso3166-country-codes_0_20140203_8" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "iso3166-country-codes"; + version = "0.20140203.8"; + sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36"; + libraryHaskellDepends = [ base ]; + description = "A datatype for ISO 3166 country codes"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "iso639" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -104179,8 +104310,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.2"; - sha256 = "cf7b09b08144d7cdc35111a07a1374b08b099a4d639da12bcad9502a830bcebc"; + version = "0.5.3"; + sha256 = "2e6ab2632c50b2141ec9ab885db21f9ec8ad4d8499507d5f6a8ede49955764d1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104690,6 +104821,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jose-jwt_0_7_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal + , containers, cryptonite, doctest, either, hspec, HUnit, memory + , mtl, QuickCheck, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "jose-jwt"; + version = "0.7.5"; + sha256 = "53e3e9441b7d6d987920749edd61ab15e6e526856822e7d6c27cab302eedcdea"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal containers cryptonite + either memory mtl text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite doctest either hspec HUnit memory + mtl QuickCheck text unordered-containers vector + ]; + homepage = "http://github.com/tekul/jose-jwt"; + description = "JSON Object Signing and Encryption Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jpeg" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -105751,8 +105905,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.11"; - sha256 = "ec2419917909588b5aaf88fef64fc0b7cb40d9da9e41a26763c53def58f8c506"; + version = "0.2.14"; + sha256 = "cae9327fe9d2068d74f9e8ed80125cb78f0a0612b3eb8f361ff7b5871cc77eb5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107656,6 +107810,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "labels_0_3_2" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "labels"; + version = "0.3.2"; + sha256 = "c4060c9fe6adb9f8c34f21acf761a4a5e0f45c4d580a27ead0f05ea2717e0a31"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "https://github.com/chrisdone/labels#readme"; + description = "Anonymous records via named tuples"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "laborantin-hs" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cmdlib, containers , directory, hslogger, mtl, old-locale, parsec, random, split, text @@ -108020,7 +108187,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {}; "lambdabot-core" = callPackage @@ -108073,7 +108240,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -108200,7 +108366,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacat" = callPackage @@ -112218,15 +112383,16 @@ self: { "linearmap-category" = callPackage ({ mkDerivation, base, constrained-categories, containers , free-vector-spaces, ieee754, lens, linear, manifolds-core - , semigroups, tagged, vector, vector-space + , semigroups, tagged, transformers, vector, vector-space }: mkDerivation { pname = "linearmap-category"; - version = "0.3.0.1"; - sha256 = "f8f24aa068e6578798b9fcdbbc4e7058322db89cf630540b7b91a7cbfe5d5f78"; + version = "0.3.2.0"; + sha256 = "45932979d622e33de233a01e8e66e5925be9553caa246132705e36437580233d"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 - lens linear manifolds-core semigroups tagged vector vector-space + lens linear manifolds-core semigroups tagged transformers vector + vector-space ]; homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; @@ -114187,6 +114353,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_1_3" = callPackage + ({ mkDerivation, async, base, exceptions, free, monad-control, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.1.3"; + sha256 = "0eaa34ec9174acc7cbc4c806b44f4b616430658bf215c086b3ee29877cbe7914"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, hspec, template-haskell, transformers }: mkDerivation { @@ -114394,31 +114579,23 @@ self: { }) {}; "lol" = callPackage - ({ mkDerivation, arithmoi, base, binary, bytestring, constraints - , containers, crypto-api, data-default, deepseq, DRBG + ({ mkDerivation, arithmoi, base, bytestring, constraints + , containers, crypto-api, data-default, deepseq, directory , monadcryptorandom, MonadRandom, mtl, numeric-prelude - , protocol-buffers, protocol-buffers-descriptor, QuickCheck, random - , reflection, repa, singletons, tagged-transformer - , template-haskell, test-framework, test-framework-quickcheck2 - , th-desugar, transformers, vector, vector-th-unbox + , protocol-buffers, protocol-buffers-descriptor, random, reflection + , singletons, tagged-transformer, template-haskell, vector + , vector-th-unbox }: mkDerivation { pname = "lol"; - version = "0.5.0.2"; - sha256 = "7a3a494d8262865e7262bf34e39030f1bf48c81a602b8f81e1d50770372030ca"; - revision = "1"; - editedCabalFile = "3e58e5596d39e3a7265acecf79ece269b44cf58fd14699bdbc9a28fde0bd622d"; + version = "0.6.0.0"; + sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d"; libraryHaskellDepends = [ - arithmoi base binary bytestring constraints containers crypto-api - data-default deepseq monadcryptorandom MonadRandom mtl - numeric-prelude protocol-buffers protocol-buffers-descriptor - QuickCheck random reflection repa singletons tagged-transformer - template-haskell th-desugar transformers vector vector-th-unbox - ]; - testHaskellDepends = [ - arithmoi base constraints deepseq DRBG MonadRandom mtl QuickCheck - random repa singletons test-framework test-framework-quickcheck2 - vector + arithmoi base bytestring constraints containers crypto-api + data-default deepseq directory monadcryptorandom MonadRandom mtl + numeric-prelude protocol-buffers protocol-buffers-descriptor random + reflection singletons tagged-transformer template-haskell vector + vector-th-unbox ]; homepage = "https://github.com/cpeikert/Lol"; description = "A library for lattice cryptography"; @@ -114456,6 +114633,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lol-benches" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, criterion + , crypto-api, deepseq, DRBG, lol, MonadRandom, split, statistics + , transformers, vector + }: + mkDerivation { + pname = "lol-benches"; + version = "0.0.0.1"; + sha256 = "13c40b8c3d05c57e43bbc76546486abfff269f412d81104c8790bf1fb4a7ed91"; + libraryHaskellDepends = [ + ansi-terminal base containers criterion crypto-api deepseq DRBG lol + MonadRandom split statistics transformers vector + ]; + homepage = "https://github.com/cpeikert/Lol"; + description = "A library for benchmarking ."; + license = stdenv.lib.licenses.gpl2; + }) {}; + "lol-calculus" = callPackage ({ mkDerivation, base, containers, directory, filepath, haskeline , mtl, parsec, text, text-format, transformers @@ -114478,6 +114673,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lol-tests" = callPackage + ({ mkDerivation, base, lol, MonadRandom, QuickCheck, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "lol-tests"; + version = "0.0.0.1"; + sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed"; + libraryHaskellDepends = [ + base lol MonadRandom QuickCheck test-framework + test-framework-quickcheck2 + ]; + testHaskellDepends = [ base lol test-framework ]; + homepage = "https://github.com/cpeikert/Lol"; + description = "A library for testing ."; + license = stdenv.lib.licenses.gpl2; + }) {}; + "lol-typing" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , ghc-prim, lol-calculus, monad-classes, parsec, tasty, tasty-hunit @@ -115752,18 +115965,19 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-megaparsec - , lens, megaparsec, mtl, mwc-random, optparse-generic, text + ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec + , hspec-megaparsec, lens, megaparsec, mtl, mwc-random + , optparse-generic, text }: mkDerivation { pname = "madlang"; - version = "0.1.0.5"; - sha256 = "2fcb9eea46f6cd7d67164baaa82078b9c4f3a486ce9ff0abf225731e68066f7a"; + version = "1.0.0.0"; + sha256 = "d8fd8f0055eab476c13c23361cec3a780319d90e45c2b45fccd1208b0ff24120"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base lens megaparsec mtl mwc-random optparse-generic - text + ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random + optparse-generic text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -115901,16 +116115,17 @@ self: { }) {}; "mailchimp" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client - , http-client-tls, servant, servant-client, text, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring, generics-sop + , http-client, http-client-tls, servant, servant-client, text + , transformers }: mkDerivation { pname = "mailchimp"; - version = "0.1.1"; - sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6"; + version = "0.2.0"; + sha256 = "03cbeca629b8f9cc4e9ebd86c98aa05c03726d7358b523d8fc81e309dfa4e4da"; libraryHaskellDepends = [ - aeson attoparsec base bytestring http-client http-client-tls - servant servant-client text transformers + aeson attoparsec base bytestring generics-sop http-client + http-client-tls servant servant-client text transformers ]; homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; description = "Bindings for the MailChimp API"; @@ -116072,6 +116287,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_0_1_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: + mkDerivation { + pname = "makefile"; + version = "0.1.1.0"; + sha256 = "3ccab1e08b9920e4390b9dca8504e4ba621b693e0fa25b4c3dd68042373a325e"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "managed" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -116542,8 +116771,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.0.0"; - sha256 = "7300fabce3e4c7723cc320f4c96bbd7980ca4e72cb694aa422b91d51b6e26c5e"; + version = "0.4.1.0"; + sha256 = "a59a301f18bd852b7ac135a723631145e0b766b216046f5392d014ac83f02311"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -116556,18 +116785,19 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free-vector-spaces, lens, linear, linearmap-category - , manifolds-core, MemoTrie, semigroups, tagged, transformers - , vector, vector-space, void + , deepseq, free, free-vector-spaces, lens, linear + , linearmap-category, manifolds-core, MemoTrie, number-show + , semigroups, tagged, transformers, vector, vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.4.0.0"; - sha256 = "7a4a8a4c392b5e0743e0984bbd361a744a7e054838ca9353131b0bea04e09f93"; + version = "0.4.1.0"; + sha256 = "a10fb25dbfedc0bd308d4bbdabae83721784fef8e0e91278124a1cefc166afee"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq + base comonad constrained-categories containers deepseq free free-vector-spaces lens linear linearmap-category manifolds-core - MemoTrie semigroups tagged transformers vector vector-space void + MemoTrie number-show semigroups tagged transformers vector + vector-space void ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -116579,8 +116809,8 @@ self: { ({ mkDerivation, base, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.0.0"; - sha256 = "53a19cc72ef02345f161676d04701249fbf36cd02303672a1d5e3ecd78341568"; + version = "0.4.1.0"; + sha256 = "8fd0dc49d4bc1246abd0e1043355154d1d747dad6ec5f03cdd00209a65252b10"; libraryHaskellDepends = [ base tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; @@ -116935,31 +117165,32 @@ self: { }) {}; "marvin" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, configurator - , directory, filepath, hashable, haskeline, lens, lifted-async - , lifted-base, marvin-interpolate, monad-control, monad-logger - , monad-loops, mono-traversable, mtl, mustache, network-uri - , optparse-applicative, random, stm, text, text-icu, time - , transformers-base, unordered-containers, vector, wai, warp - , websockets, wreq, wuss + ({ mkDerivation, aeson, base, bytestring, configurator, deepseq + , directory, filepath, hashable, haskeline, http-client + , http-client-tls, http-types, lens, lifted-async, lifted-base + , marvin-interpolate, monad-control, monad-logger, monad-loops, mtl + , mustache, network-uri, optparse-applicative, random, stm, text + , text-icu, time, transformers, transformers-base + , unordered-containers, vector, wai, warp, warp-tls, websockets + , wreq, wuss }: mkDerivation { pname = "marvin"; - version = "0.0.9"; - sha256 = "10c98f4282208ec6c99ac4530dd8e4127b5e6635b1d6df9d250432e0eff01dfa"; + version = "0.1.5"; + sha256 = "42cebd7af1b7d20575a08bbd1510226761aa2f494f64b0e7110d350f211b504a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring configurator hashable haskeline lens - lifted-async lifted-base marvin-interpolate monad-control - monad-logger monad-loops mono-traversable mtl network-uri - optparse-applicative random stm text text-icu time - transformers-base unordered-containers vector wai warp websockets - wreq wuss + aeson base bytestring configurator deepseq hashable haskeline + http-client http-client-tls http-types lens lifted-async + lifted-base marvin-interpolate monad-control monad-logger + monad-loops mtl network-uri optparse-applicative random stm text + text-icu time transformers transformers-base unordered-containers + vector wai warp warp-tls websockets wreq wuss ]; executableHaskellDepends = [ - aeson base bytestring configurator directory filepath - mono-traversable mustache optparse-applicative text + aeson base bytestring configurator directory filepath mustache + optparse-applicative text ]; homepage = "https://marvin.readthedocs.io"; description = "A modular chat bot"; @@ -116973,8 +117204,8 @@ self: { }: mkDerivation { pname = "marvin-interpolate"; - version = "1.0"; - sha256 = "bb80ab05ba25400c688af5f1ca1f0a02e07aa3a99115b1cf2d4f684caaa339ae"; + version = "1.1"; + sha256 = "4ab8a4739390bf13b1612f223a671b440d959e8f70c9b2913e35cf1cb9e75656"; libraryHaskellDepends = [ base haskell-src-meta mtl parsec template-haskell text ]; @@ -117258,8 +117489,8 @@ self: { }: mkDerivation { pname = "matrix-market-attoparsec"; - version = "0.1.0.3"; - sha256 = "e6c71b7405174df690d7617d1b295bc12b3e8be52b766fff79801f207fc93e20"; + version = "0.1.0.4"; + sha256 = "f26e637d3e10c0ef98dbb3307d2410eed5dca54affbd052162d1b1bc378b8e6d"; libraryHaskellDepends = [ attoparsec base bytestring exceptions scientific ]; @@ -117343,6 +117574,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "maxent-learner-hw" = callPackage + ({ mkDerivation, array, base, containers, csv, deepseq, file-embed + , mtl, optparse-applicative, parallel, random, text, vector + }: + mkDerivation { + pname = "maxent-learner-hw"; + version = "0.1.2"; + sha256 = "582b87a3f644043455906a2e48cfacc83a384d08bc5c97de7b2feb971efcb434"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers csv deepseq mtl random text vector + ]; + executableHaskellDepends = [ + array base containers deepseq file-embed mtl optparse-applicative + parallel random text + ]; + homepage = "https://github.com/george-steel/maxent-learner"; + description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars"; + license = "GPL"; + }) {}; + "maximal-cliques" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -119775,8 +120028,8 @@ self: { ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.4"; - sha256 = "eb77f105623bdf639d0f309eb7fecbc89512b9b0d2acb47ae8f2a589b270510f"; + version = "0.5"; + sha256 = "be27b38fc90ed81d5a4b3f15ee180519ac47fe9e905e77e3eed7db7371b3e856"; libraryHaskellDepends = [ base bytestring cereal mtl transformers ]; @@ -125512,6 +125765,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network-carbon_1_0_9" = callPackage + ({ mkDerivation, base, bytestring, network, text, time, vector }: + mkDerivation { + pname = "network-carbon"; + version = "1.0.9"; + sha256 = "70860d724fce8a1ee8f2ef80ea0466544ef1deb4c2b9435f15ea234d914a3b35"; + libraryHaskellDepends = [ + base bytestring network text time vector + ]; + homepage = "http://github.com/ocharles/network-carbon"; + description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-conduit" = callPackage ({ mkDerivation, base, conduit }: mkDerivation { @@ -127357,8 +127625,8 @@ self: { }: mkDerivation { pname = "ntrip-client"; - version = "0.1.5"; - sha256 = "eb93158c19610209c4d5e89de75afe7aa70bf3871e0e0b3ee70418d1f0d1aee8"; + version = "0.1.6"; + sha256 = "c508b4e7a9859b7eb306b58383d177f4cb66aec7c356ffe9323e32e6a3e46dac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127448,6 +127716,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "number-show" = callPackage + ({ mkDerivation, base, microlens, microlens-th }: + mkDerivation { + pname = "number-show"; + version = "0.1.0.0"; + sha256 = "3e4ba74494fce27278ae6c07773d75be901be09c51028f47cbdc9087d9e29e06"; + revision = "1"; + editedCabalFile = "8c75cd93ac276a74f86693467c56de7ecb7c04f9d93d26c369199d7a7baaf173"; + libraryHaskellDepends = [ base microlens microlens-th ]; + description = "Flexible and accurate (for a given precision) numerical->string conversion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -129545,6 +129826,35 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "opml-conduit_0_6_0_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, conduit + , conduit-combinators, containers, data-default, hlint, lens-simple + , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck + , quickcheck-instances, resourcet, safe-exceptions, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "opml-conduit"; + version = "0.6.0.2"; + sha256 = "b1f66c0ba92fdf436889058e7fa62dca5a86398348432ab38c352af1804e4125"; + libraryHaskellDepends = [ + base case-insensitive conduit conduit-combinators containers + lens-simple mono-traversable monoid-subclasses safe-exceptions + semigroups text time timerep uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers data-default + hlint lens-simple mono-traversable mtl parsers QuickCheck + quickcheck-instances resourcet semigroups tasty tasty-hunit + tasty-quickcheck text time uri-bytestring xml-conduit + ]; + homepage = "https://github.com/k0ral/opml-conduit"; + description = "Streaming parser/renderer for the OPML 2.0 format."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opn" = callPackage ({ mkDerivation, base, directory, filepath, ini, network-uri , optparse-applicative, process, text, unordered-containers @@ -133529,6 +133839,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_4_1_1" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , quickcheck-simple, template-haskell, th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.4.1.1"; + sha256 = "dd62fde2b2cde224f8bbc2fdb71abc586ed1c16519d2ddd1a5744412144c57d6"; + libraryHaskellDepends = [ + array base containers dlist names-th template-haskell + th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -134610,6 +134939,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pi-lcd" = callPackage + ({ mkDerivation, base, bytestring, clock, text, unix + , unordered-containers + }: + mkDerivation { + pname = "pi-lcd"; + version = "0.1.0.0"; + sha256 = "afd0dc56b2c3254420b7b3590bca606be9a7d6881cacfab04e5fb2dbe31303d9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock text unix unordered-containers + ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/ppelleti/pi-lcd"; + description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pia-forward" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, directory , filepath, http-client, http-client-tls, network-info, process @@ -134747,6 +135095,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pidfile" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "pidfile"; + version = "0.1.0.1"; + sha256 = "5af1a8984396635229057f9d0a6bc5cf7d7fa2fba55c8f0e9dfc2a4534e448df"; + libraryHaskellDepends = [ base unix ]; + homepage = "https://github.com/jonpetterbergman/pidfile"; + description = "Run an IO action protected by a pidfile"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piet" = callPackage ({ mkDerivation, array, base, containers, Imlib, mtl }: mkDerivation { @@ -135487,18 +135847,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-misc_0_2_4_0" = callPackage + "pipes-misc_0_2_5_0" = callPackage ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl , pipes, pipes-category, pipes-concurrency, semigroups, stm , transformers }: mkDerivation { pname = "pipes-misc"; - version = "0.2.4.0"; - sha256 = "5602e1cc4a726b62de393b0236db0ba1bbd2f847f8fc5ac30c5ee727fb40041b"; + version = "0.2.5.0"; + sha256 = "69cf964dcc21efcf74a30e2bf792405019fb0b0ab22130ca806f7907f1ed3669"; libraryHaskellDepends = [ - base clock Decimal lens mtl pipes pipes-category pipes-concurrency - semigroups stm transformers + base clock Decimal lens mmorph mtl pipes pipes-category + pipes-concurrency semigroups stm transformers ]; testHaskellDepends = [ base hspec lens mmorph pipes pipes-concurrency stm transformers @@ -135689,6 +136049,8 @@ self: { pname = "pipes-s3"; version = "0.3.0.2"; sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7"; + revision = "1"; + editedCabalFile = "3ea6a4e25482c09ecd13270fc8c6c85340f803990f6dc72e8e4d9a5982ab2b70"; libraryHaskellDepends = [ aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers @@ -137491,10 +137853,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.0"; - sha256 = "2086e66f6aef0629d586c63d461a0c45232dc6c3afc939898106bcc632c0faa0"; - revision = "2"; - editedCabalFile = "8ad8aaa78d501b83f4583cb66365cc518f531a54fa4f97e458c0b86008a1acfe"; + version = "0.2.1.1"; + sha256 = "dff5332ea4648bb2c4e25ce2f79d89282f653af60f03b09efe8110673709245f"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix @@ -138384,8 +138744,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.21"; - sha256 = "7b5918a713a9d56c85bc36027541809ccf5a60706c0e74f0875fa059cbf8dc24"; + version = "0.0.23"; + sha256 = "9da28ef916d8c8dec8bb28071e2536a4a5076438028d2e7b1c4e4b020383b044"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139283,12 +139643,16 @@ self: { }) {}; "privileged-concurrency" = callPackage - ({ mkDerivation, base, stm }: + ({ mkDerivation, base, lifted-base, monad-control, stm + , transformers-base + }: mkDerivation { pname = "privileged-concurrency"; - version = "0.3"; - sha256 = "c760e05e350ad4af188d031cb12749b2d1468046d9f06e6cdcb77a9a50286464"; - libraryHaskellDepends = [ base stm ]; + version = "0.5"; + sha256 = "5be035781722144dec6ab14f443ecccb6addcf4be2f871f4bb372e5a9790ebfe"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; description = "Provides privilege separated versions of the concurrency primitives"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -144580,6 +144944,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reactive-banana-gi-gtk" = callPackage + ({ mkDerivation, base, gi-gtk, haskell-gi-base, reactive-banana + , text, transformers + }: + mkDerivation { + pname = "reactive-banana-gi-gtk"; + version = "0.1.0.0"; + sha256 = "adb56a19f5021b446929620bdb6a3977194d1e47698f192173f7e7e169821f30"; + libraryHaskellDepends = [ + base gi-gtk haskell-gi-base reactive-banana text transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/mr/reactive-banana-gi-gtk"; + description = "Simple reactive programming with GTK GObject Introspection"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "reactive-banana-sdl" = callPackage ({ mkDerivation, base, data-lens, data-lens-template , reactive-banana, SDL, SDL-image, SDL-ttf @@ -145961,38 +146342,41 @@ self: { }) {}; "regex" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa - , regex-tdfa-text, shelly, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, template-haskell, text, time, transformers + ({ mkDerivation, array, base, base-compat, bytestring, containers + , directory, hashable, heredoc, http-conduit, regex-base + , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly + , smallcheck, tasty, tasty-hunit, tasty-smallcheck + , template-haskell, text, time, time-locale-compat, transformers , unordered-containers }: mkDerivation { pname = "regex"; - version = "0.0.0.2"; - sha256 = "200695e102f2a698939833c35c6862bfa93803a5f4e22fa7ad40e76999ed2396"; + version = "0.1.0.0"; + sha256 = "21ed5c61fe5c97790a085657b6c022c48953fa8a5904d0d14c695ae3593f3448"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers hashable heredoc regex-base - regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck tasty - tasty-hunit tasty-smallcheck template-haskell text time - transformers unordered-containers + array base base-compat bytestring containers hashable heredoc + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text + template-haskell text time time-locale-compat transformers + unordered-containers ]; executableHaskellDepends = [ - array base bytestring containers directory hashable heredoc - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly - smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text - time transformers unordered-containers + array base base-compat bytestring containers directory hashable + heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa + regex-tdfa-text shelly smallcheck tasty tasty-hunit + tasty-smallcheck template-haskell text time time-locale-compat + transformers unordered-containers ]; testHaskellDepends = [ - array base bytestring containers directory hashable heredoc - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly - smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text - time transformers unordered-containers + array base base-compat bytestring containers directory hashable + heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa + regex-tdfa-text shelly smallcheck tasty tasty-hunit + tasty-smallcheck template-haskell text time time-locale-compat + transformers unordered-containers ]; homepage = "https://iconnect.github.io/regex"; - description = "A Regular Expression Toolkit for regex-base"; + description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -146897,14 +147281,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-record_0_1_6_0" = callPackage + "relational-record_0_1_6_1" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC }: mkDerivation { pname = "relational-record"; - version = "0.1.6.0"; - sha256 = "7f7b6ba0a9646e475b0092a062cbffd32f8cabb0d4da1f29e7c0672472afb115"; + version = "0.1.6.1"; + sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada"; libraryHaskellDepends = [ base persistable-types-HDBC-pg relational-query relational-query-HDBC @@ -147039,8 +147423,8 @@ self: { }: mkDerivation { pname = "remarks"; - version = "0.1.12"; - sha256 = "3a36340fd00c3cd002dc1494508e1577004ea71a204e66785a1861d61356d087"; + version = "0.1.13"; + sha256 = "60d0765189daca9eb70e8c4c1598924ac9a72682d2962d56b781660de0d0ed74"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers GenericPretty pretty ]; @@ -149934,6 +150318,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit_0_3_0_1" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , conduit-extra, containers, data-default, hlint, lens-simple + , mono-traversable, QuickCheck, quickcheck-instances, resourcet + , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text + , time, timerep, uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.3.0.1"; + sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6"; + libraryHaskellDepends = [ + base conduit conduit-combinators containers lens-simple + mono-traversable safe safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra data-default hlint + lens-simple mono-traversable QuickCheck quickcheck-instances + resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text + time uri-bytestring xml-conduit xml-types + ]; + description = "Streaming parser/renderer for the RSS 2.0 standard."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq , feed, http-client, http-conduit, http-types, io-storage, irc @@ -152293,8 +152704,8 @@ self: { }: mkDerivation { pname = "scrape-changes"; - version = "0.1.0.4"; - sha256 = "cdeba91d063c2e2368c15ad5c9767572e6101003d15bb7f1ae79b317c5792a72"; + version = "0.1.0.5"; + sha256 = "e1c2a54d597d12ced09af8e5247d4468e8a11cd6b90d9b1d398d2ebb9ebd06d1"; libraryHaskellDepends = [ async attoparsec base bytestring cron directory email-validate filepath hashable hslogger http-client lens mime-mail network-uri @@ -152681,8 +153092,8 @@ self: { }: mkDerivation { pname = "seakale-postgresql"; - version = "0.1.0.0"; - sha256 = "b8557deb006934cd605eabcf1a00c0c9ab4492490f140df22eef3e38a8d21752"; + version = "0.1.1.0"; + sha256 = "e13909695f1c4b1aa4615c2e2d586a352e42a144cbb7552fe0d029702d9f5533"; libraryHaskellDepends = [ base bytestring free mtl postgresql-libpq seakale time ]; @@ -153706,8 +154117,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.3.2"; - sha256 = "0fc433fd42e2281fc9cb3e76a55cd0d6806b611c25fdba516734350507682a77"; + version = "0.1.3.4"; + sha256 = "553d2d47c1c04cb67c08632d26d817a8b1969d10064dd66409dc9d559056468f"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -157413,6 +157824,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-log_0_6_0" = callPackage + ({ mkDerivation, async, base, containers, data-default, deepseq + , directory, exceptions, filepath, hformat, mtl, SafeSemaphore + , text, time, transformers + }: + mkDerivation { + pname = "simple-log"; + version = "0.6.0"; + sha256 = "e22ba314bcfc3be5594db3d2a7ad505dcbf7b89d91e6f71f9921d80b76fadc5d"; + libraryHaskellDepends = [ + async base containers data-default deepseq directory exceptions + filepath hformat mtl SafeSemaphore text time transformers + ]; + homepage = "http://github.com/mvoidex/simple-log"; + description = "Simple log for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-log-syslog" = callPackage ({ mkDerivation, base, hsyslog, simple-log, text }: mkDerivation { @@ -157661,6 +158091,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-smt_0_7_0" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "simple-smt"; + version = "0.7.0"; + sha256 = "87191687e3e0e63375a99520866de5eaa318b4f41f15adbcdffc3786e58687a5"; + libraryHaskellDepends = [ base process ]; + description = "A simple way to interact with an SMT solver process"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-sql-parser" = callPackage ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework , test-framework-hunit @@ -159340,8 +159782,8 @@ self: { }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.2"; - sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c"; + version = "1.1.3"; + sha256 = "33873a9f9bc51a32d940ea43801090e40d5dbceabcbbd696834ef7c0f90d7ab5"; libraryHaskellDepends = [ async base containers lifted-base monad-loops snap stm time transformers @@ -161406,15 +161848,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sparse-linear-algebra_0_2_9_1" = callPackage + "sparse-linear-algebra_0_2_9_4" = callPackage ({ mkDerivation, base, containers, criterion, exceptions, hspec , mtl, mwc-random, primitive, QuickCheck, transformers, vector , vector-algorithms, vector-space }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.9.1"; - sha256 = "5210a7491d2cd6efb5c4cf7be53c10a8c4240b0653bd7d8bfbb5c5f86393a442"; + version = "0.2.9.4"; + sha256 = "5d97d81653785f08783cd29107f0f87c01611cf5b1ad1395ef1a8b799a04adf6"; libraryHaskellDepends = [ base containers exceptions mtl transformers vector vector-algorithms vector-space @@ -161424,7 +161866,7 @@ self: { QuickCheck vector-space ]; homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Sparse linear algebra in native Haskell"; + description = "Numerical computation in native Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -169369,6 +169811,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tdigest" = callPackage + ({ mkDerivation, base, base-compat, binary, bytes, Cabal + , cabal-doctest, deepseq, directory, doctest, filepath, reducers + , semigroups, tasty, tasty-quickcheck, vector, vector-algorithms + }: + mkDerivation { + pname = "tdigest"; + version = "0"; + sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat binary deepseq reducers semigroups vector + vector-algorithms + ]; + testHaskellDepends = [ + base base-compat binary bytes deepseq directory doctest filepath + semigroups tasty tasty-quickcheck vector vector-algorithms + ]; + homepage = "https://github.com/futurice/haskell-tdigest#readme"; + description = "On-line accumulation of rank-based statistics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tdoc" = callPackage ({ mkDerivation, base, bytestring, template-haskell, transformers , xhtml @@ -169454,6 +169919,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "telegram-api_0_6_0_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath + , hjpath, hspec, http-api-data, http-client, http-client-tls + , http-media, http-types, mime-types, mtl, optparse-applicative + , servant, servant-client, string-conversions, text, transformers + , utf8-string + }: + mkDerivation { + pname = "telegram-api"; + version = "0.6.0.2"; + sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7"; + libraryHaskellDepends = [ + aeson base bytestring http-api-data http-client http-media + http-types mime-types mtl servant servant-client string-conversions + text transformers + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base filepath hjpath hspec http-client + http-client-tls http-types optparse-applicative servant + servant-client text transformers utf8-string + ]; + homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; + description = "Telegram Bot API bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "telegram-bot" = callPackage ({ mkDerivation, base, containers, http-client, http-client-tls , pipes, telegram-api, text, transformers @@ -171118,6 +171610,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-region_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , groups, hspec, lens, text + }: + mkDerivation { + pname = "text-region"; + version = "0.2.0.0"; + sha256 = "a8d29fdbd9c185f53daf6b4d02f15336f32e2be4e3e1019549844a4e2023bef0"; + libraryHaskellDepends = [ + aeson base base-unicode-symbols bytestring groups lens text + ]; + testHaskellDepends = [ base base-unicode-symbols hspec lens text ]; + homepage = "https://github.com/mvoidex/text-region"; + description = "Marking text regions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-register-machine" = callPackage ({ mkDerivation, base, containers, mtl, vector }: mkDerivation { @@ -174552,12 +175062,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers_0_5_2_0" = callPackage + "transformers_0_5_4_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.5.2.0"; - sha256 = "6c408713a8ba7dd7a6573a4644e0c17fe11747f5bf259eab958421a7358a70e2"; + version = "0.5.4.0"; + sha256 = "f87f3f338aa2d85af55aadad643ca1ce32052a017b7d1273b0226c84bdb8889a"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -175330,6 +175840,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "tsv2csv" = callPackage + ({ mkDerivation, base, HUnit, split }: + mkDerivation { + pname = "tsv2csv"; + version = "0.1.0.1"; + sha256 = "c0c505350d73c53068f5c186d58de7bcabea839ce3b3d84c2c604a633f4c77fc"; + revision = "2"; + editedCabalFile = "f93f38f878487b20ee86e91a3923f285acd63a2a360fab8097224ec7e8da37b0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base HUnit split ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/MackeyRMS/tsv2csv"; + description = "Convert tsv to csv"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tsvsql" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , optparse-applicative, string-qq, text, unordered-containers @@ -180322,12 +180849,12 @@ self: { }) {}; "validity-text" = callPackage - ({ mkDerivation, base, text, validity }: + ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.1.1.0"; - sha256 = "43cf2ce6b53a406901cae0ac01d1e46a70e2c7eddac129e35f242bbb82bf7a02"; - libraryHaskellDepends = [ base text validity ]; + version = "0.1.2.0"; + sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f"; + libraryHaskellDepends = [ base bytestring text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; license = stdenv.lib.licenses.mit; @@ -185540,8 +186067,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.7"; - sha256 = "6ecd4a1430d63568683fd3d9282cf778e94b27f2d076de67f5853aa5eacb007e"; + version = "0.3.8"; + sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 5fc89a6778fe9633c680a6f46a91d8ba839113f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 19 Feb 2017 20:29:42 +0100 Subject: [PATCH 238/273] language-ecmascript: jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f24556a1a2..1a7d928dbdd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -858,4 +858,7 @@ self: super: { # https://github.com/lambdabot/lambdabot/issues/158 lambdabot-core = doJailbreak super.lambdabot-core; + + # https://github.com/jswebtools/language-ecmascript/pull/81 + language-ecmascript = doJailbreak super.language-ecmascript; } From 055d6399ef4a6b958b97836144ca3e84c29df935 Mon Sep 17 00:00:00 2001 From: Rene Treffer Date: Sun, 19 Feb 2017 21:08:26 +0100 Subject: [PATCH 239/273] coredns: 001 -> 005 --- pkgs/servers/dns/coredns/default.nix | 8 +- pkgs/servers/dns/coredns/deps.nix | 488 +++++++++--------------- pkgs/servers/dns/coredns/pull-278.patch | 153 -------- 3 files changed, 179 insertions(+), 470 deletions(-) delete mode 100644 pkgs/servers/dns/coredns/pull-278.patch diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 1955cce2a9f..6dcb8fbbd77 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "coredns-${version}"; - version = "001"; + version = "005"; goPackagePath = "github.com/miekg/coredns"; subPackages = [ "." ]; @@ -11,17 +11,15 @@ buildGoPackage rec { owner = "miekg"; repo = "coredns"; rev = "v${version}"; - sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; + sha256 = "11wvy3xp9in5ny6h7hp24dq6asc013vrwc6bqiky83dlzasjwkf6"; }; - patches = [ ./pull-278.patch ]; - goDeps = ./deps.nix; meta = with stdenv.lib; { homepage = https://coredns.io; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = [ maintainers.rushmorem ]; + maintainers = [ maintainers.rushmorem maintainers.rtreffer ]; }; } diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix index 2aa442a8fef..18bd2b1f85d 100644 --- a/pkgs/servers/dns/coredns/deps.nix +++ b/pkgs/servers/dns/coredns/deps.nix @@ -1,111 +1,38 @@ -# This file was generated by go2nix. [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "github.com/cockroachdb/cmux"; fetch = { type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "0a9baebe991e5ff35dd9f35578eb002cf07d229c"; - sha256 = "18palgdg1ldfmjqm4almlcymx9f0kf6vy9lfspl0iwkv3wsnvfb6"; + url = "https://github.com/cockroachdb/cmux"; + rev = "30d10be492927e2dcae0089c374c455d42414fcb"; + sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx"; }; } { - goPackagePath = "github.com/PuerkitoBio/purell"; + goPackagePath = "github.com/coreos/go-semver"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; - sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + url = "https://github.com/coreos/go-semver"; + rev = "5e3acbb5668c4c3deb4842615c4098eb61fb6b1e"; + sha256 = "0kbfr8q7s10z2r01xvbv6i31n4wq6z1qvgfj7njgbcgb65bkjjrh"; }; } { - goPackagePath = "github.com/PuerkitoBio/urlesc"; + goPackagePath = "github.com/eapache/go-xerial-snappy"; fetch = { type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; - sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + url = "https://github.com/eapache/go-xerial-snappy"; + rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c"; + sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4"; }; } { - goPackagePath = "github.com/beorn7/perks"; + goPackagePath = "github.com/eapache/queue"; fetch = { type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "60ec3488bfea7cca02b021d106d9911120d25fe9"; - sha256 = "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"; - }; - } - { - goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry-incubator/candiedyaml"; - rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; - sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "c016325647ff1837d8e9695bc79837ff7549d31f"; - sha256 = "0jm0kas8c2zhkaqibvzbx7bqfg67b9yb9cs0q8g9r0b9rxjr5prk"; - }; - } - { - goPackagePath = "github.com/coreos/go-oidc"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-oidc"; - rev = "fe7346e2e6855bda769d5b3db7d917f159c5613c"; - sha256 = "141h47s2z56pff8fi926m7wzswkr34kj7hzwib8w5s8zxgdp0wld"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; - sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; - sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "431cfa3179d9b3766e39f6a74283db8bb5a13209"; - sha256 = "0hwqlqns0igaa3hg1dvz2grgy46q0v8wixyzfsmxsr5xb4ggpf32"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "c795848f1d7f574bbf767a8f17c7357e4003fed6"; - sha256 = "0abnk4055kcz57v3f5d15pd5dvvlkg7bwfy1f22rmsqwzs44ixmz"; + url = "https://github.com/eapache/queue"; + rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; + sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; }; } { @@ -122,98 +49,35 @@ fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "f12c6236fe7b5cf6bcf30e5935d08cb079d78334"; - sha256 = "1h5s03y6b17qj12p8fpm5pdijnsbfvaq38z7b2hfjn5qp45h02xb"; + rev = "a904159b9206978bb6d53fcc7a769e5cd726c737"; + sha256 = "0qq758fcnhlqa1913jki79a1ic7p2iczdx1l2mn8s886nxydn0fi"; }; } { - goPackagePath = "github.com/ghodss/yaml"; + goPackagePath = "github.com/golang/snappy"; fetch = { type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "aa0c862057666179de291b67d9f093d12b5a8473"; - sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + url = "https://github.com/golang/snappy"; + rev = "553a641470496b2327abcac10b36396bd98e45c9"; + sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; }; } { - goPackagePath = "github.com/go-openapi/jsonpointer"; + goPackagePath = "github.com/go-logfmt/logfmt"; fetch = { type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; - sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; }; } { - goPackagePath = "github.com/go-openapi/jsonreference"; + goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; - sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "2433d2f0fc794728337e0c5d65716e79e163f04d"; - sha256 = "14kdzfzjs06c2050fsg9vc0mn12b6i72gj45964mzxa5a6i09ph6"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "0e04f5e499b19bf51031c01a00f098f25067d8dc"; - sha256 = "0kbqrfargkx3yb6gj0k5rpi728pcgjyvy1as9x79sh3sgvnrq15f"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "a31fa025390fe54d2af14a04199ed08dea5dc2fd"; - sha256 = "141059khzlkfjx5qsgzryqhl1mgilb13ha7syjm1297m54ch749c"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1f49d83d9aa00e6ce4fc8258c71cc7786aec968a"; - sha256 = "0ny3nvjrsczihzmng2s0awvhq8k389l4lzl3vwgifi6ng34fszbj"; - }; - } - { - goPackagePath = "github.com/google/cadvisor"; - fetch = { - type = "git"; - url = "https://github.com/google/cadvisor"; - rev = "418c181ebad0d592828bd53c5704ed9af9a7c5a6"; - sha256 = "1k3r7a333a6x53fs0anvraf8n93dyanjfwp396sng1zxchb07dk3"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "fd52762d25a41827db7ef64c43756fd4b9f7e382"; - sha256 = "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; }; } { @@ -221,53 +85,161 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-syslog"; - rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; - sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; + sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; }; } { - goPackagePath = "github.com/howeyc/gopass"; + goPackagePath = "github.com/klauspost/crc32"; fetch = { type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "26c6e1184fd5255fa5f5289d0b789a4819c203a4"; - sha256 = "00fd4pa2dq8fala5sc6ics2721hnkh69p7d35w5lb2zf1i41l6dq"; + url = "https://github.com/klauspost/crc32"; + rev = "1bab8b35b6bb565f92cbc97939610af9369f942a"; + sha256 = "0n71bf2xkrk3b6svzsph3brwvam0cbz21pcwyymdw8scdn7mmyak"; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/mholt/caddy"; fetch = { type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "50d4dbd4eb0e84778abe37cefef140271d96fade"; - sha256 = "06z52vri1ymb0s8nk2qr4xmw068s4abh6b66qj4w92whjxmxsvnh"; + url = "https://github.com/mholt/caddy"; + rev = "60838710883baa70cf6aae08e73820b21134ee72"; + sha256 = "15dx12sap8ziwyn2wkgiy7fj1s320444zh0pn32mwjvn065c2k3z"; }; } { - goPackagePath = "github.com/jonboulle/clockwork"; + goPackagePath = "github.com/miekg/coredns"; fetch = { type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "bcac9884e7502bb2b474c0339d889cb981a2f27f"; - sha256 = "1a732411y26arr0pq9j5rfkyql7rqxbkanjs4m59hil8cx8mb068"; + url = "https://github.com/miekg/coredns"; + rev = "a7c9fd5d6b5157958a3df8dba0cdc1f24407957b"; + sha256 = "11zbwx74hhgrd3qlwm91gqw6zcj4yf7af54cn3183ca8v66f3xyf"; }; } { - goPackagePath = "github.com/juju/ratelimit"; + goPackagePath = "github.com/miekg/dns"; fetch = { type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "77ed1c8a01217656d2080ad51981f6e99adaa177"; - sha256 = "1r7xdl3bpdzny4d05fpm229864ipghqwv5lplv5im5b4vhv9ryp7"; + url = "https://github.com/miekg/dns"; + rev = "75229eecb7af00b2736e93b779a78429dcb19472"; + sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl"; }; } { - goPackagePath = "github.com/mailru/easyjson"; + goPackagePath = "github.com/opentracing/opentracing-go"; fetch = { type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "e978125a7e335d8f4db746a9ac5b44643f27416b"; - sha256 = "1if7bzxs9ibq1a1d8z96djixqrxnwc2wplcbc67ddk071anrbs8w"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "6edb48674bd9467b8e91fda004f2bd7202d60ce4"; + sha256 = "0kwighhdm187b1yzcccm4hpy7m5sv1dij5ckg31n2614xvpippby"; + }; + } + { + goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; + fetch = { + type = "git"; + url = "https://github.com/openzipkin/zipkin-go-opentracing"; + rev = "6022d4d3ed39632fad842942bda1813a9b4f63c8"; + sha256 = "0gg9g2nxjf9almgzhx5sgqvbcx4zwvs873nl1d62jb6kqhsr8sjd"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df"; + sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "a1dba9ce8baed984a2495b658c82687f8157b98f"; + sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c"; + sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj"; + }; + } + { + goPackagePath = "github.com/Shopify/sarama"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/sarama"; + rev = "1416bd78f804d523005322194994f08c2a0ad797"; + sha256 = "1skfkb1yhwf8w2n31dawr1kk145h3nwdf7xmm6yrwn69vbv8jqns"; + }; + } + { + goPackagePath = "github.com/apache/thrift"; + fetch = { + type = "git"; + url = "https://github.com/apache/thrift"; + rev = "655b9b6ef86c45b423a194abee2a9cd057a16a74"; + sha256 = "1kagirgxy2a9iabm8i32i5hdr36v5p0h651bsbyr0l99970myqfp"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "2533c2a50c4b6114ad6fd4c0000175fac3b6ee06"; + sha256 = "0z8byms8hfn7ncq8sqcw9avn9nfal5hw75ckbladd6gzjc8jay02"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/eapache/go-resiliency"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-resiliency"; + rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; + sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8"; + sha256 = "1fh4jyxv1drh9jmadidrlszcnjp4zfazysbq5075lqd1mhq99lz0"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "69b215d01a5606c843240eab4937eab3acee6530"; + sha256 = "1cy9jxqi6ba5qnjmvznlq49n2zzr5vqgky6pa9mckrbli8ssvzw7"; }; } { @@ -280,48 +252,12 @@ }; } { - goPackagePath = "github.com/mholt/caddy"; + goPackagePath = "github.com/pierrec/xxHash"; fetch = { type = "git"; - url = "https://github.com/mholt/caddy"; - rev = "bbf954cbf2801bc32f4378fe5059eb16de3ae4d3"; - sha256 = "1i5p9xz3lhir5k070a580mi77n4vbjlbglzi92qbn0mxrdvd13lr"; - }; - } - { - goPackagePath = "github.com/miekg/coredns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/coredns.git"; - rev = "a8fb01bfd28e8b57f6d7b7d33f8282d807b2457d"; - sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; - sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; - sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37"; - sha256 = "0y4nxc0kzlmqfqi3w3m7r9h508bx80vxbzj4qn0mksp40mfhjxyv"; + url = "https://github.com/pierrec/xxHash"; + rev = "5a004441f897722c627870a981d02b29924215fa"; + sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja"; }; } { @@ -329,8 +265,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_golang"; - rev = "5636dc67ae776adf5590da7349e70fbb9559972d"; - sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d"; + rev = "6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76"; + sha256 = "19phcsvq1gn53af3nnh1lvvyzg8kpwribka9mszk18jv7l6nq9mf"; }; } { @@ -338,8 +274,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; }; } { @@ -347,26 +283,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/common"; - rev = "9a94032291f2192936512bab367bc45e77990d6a"; - sha256 = "10ligvvdh6v5l7i1khirnhhfdhnlasxrqq39b3hxpnz9fq0fibg5"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; - sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + rev = "3007b6072c17c8d985734e6e19b1dea9174e13d3"; + sha256 = "0jpvnmzqbzy2krwzan7pp3bc8pj9f1qic98lqq4hanccr0g5cmk3"; }; } { @@ -374,17 +292,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "b7eff9abce531d6aeda923e759ae668e56601d21"; - sha256 = "0w84jwpiq0knspc9pp8dfvr5z6h7yl3qdq59ihvlfixl3kczw5k4"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "6ab629be5e31660579425a738ba8870beb5b7404"; - sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + rev = "c88ee250d0221a57af388746f5cf03768c21d6e2"; + sha256 = "0ylb5p5i9hln8chq8whk5iy8qypjpzyrp07zpwjd1zbf5nsm1nmv"; }; } { @@ -392,17 +301,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; - sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; - sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; + rev = "6b27048ae5e6ad1ef927e72e437531493de612fe"; + sha256 = "08zk0vavl7g6jzklhxhwrgcjh42mn2flbx2d2rxsblyxkbqri07j"; }; } { @@ -410,44 +310,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; - sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "2df9074612f50810d82416d2229398a1e7188c5c"; - sha256 = "0ibg4pr9hxlvc5m4zn5hl4nsb6v5i0yfr9japsnjm010318df885"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "93fcd402979cfad8a7151f96e016416947c6a3cb"; - sha256 = "1v0kyav7i40wrahg9ng1vfq87xcp8r8hi4y7bspyfg35np6j8wdj"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "313ef63993017597bd28f5efd23677820274cb58"; - sha256 = "1rl2mwhg20h5ay3crg5jqiwabfwgn8amp4dps6qmzyy3pcrjvsa8"; + rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547"; + sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km"; }; } ] diff --git a/pkgs/servers/dns/coredns/pull-278.patch b/pkgs/servers/dns/coredns/pull-278.patch deleted file mode 100644 index 1323f898c78..00000000000 --- a/pkgs/servers/dns/coredns/pull-278.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1158d4cb3a3cd43f1d0a72bd35c6dea9b1de345e Mon Sep 17 00:00:00 2001 -From: Manuel de Brito Fontes -Date: Wed, 21 Sep 2016 14:16:52 -0300 -Subject: [PATCH] Fix k8s build - ---- - contrib/kubernetes/testscripts/00_run_k8s.sh | 2 +- - contrib/kubernetes/testscripts/10_setup_kubectl.sh | 2 +- - middleware/kubernetes/controller.go | 38 ++++++++-------------- - middleware/kubernetes/kubernetes.go | 9 +++-- - 4 files changed, 20 insertions(+), 31 deletions(-) - -diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/contrib/kubernetes/testscripts/00_run_k8s.sh -index ef98a8e..7ff6811 100755 ---- a/contrib/kubernetes/testscripts/00_run_k8s.sh -+++ b/contrib/kubernetes/testscripts/00_run_k8s.sh -@@ -5,7 +5,7 @@ set -e - # Based on instructions at: http://kubernetes.io/docs/getting-started-guides/docker/ - - #K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt) --K8S_VERSION="v1.2.4" -+K8S_VERSION="v1.3.7" - - ARCH="amd64" - -diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/contrib/kubernetes/testscripts/10_setup_kubectl.sh -index 1778671..a7cfc1e 100755 ---- a/contrib/kubernetes/testscripts/10_setup_kubectl.sh -+++ b/contrib/kubernetes/testscripts/10_setup_kubectl.sh -@@ -10,7 +10,7 @@ cd ${BASEDIR} - echo "Setting up kubectl..." - - if [ ! -e kubectl ]; then -- curl -O http://storage.googleapis.com/kubernetes-release/release/v1.2.4/bin/linux/amd64/kubectl -+ curl -O http://storage.googleapis.com/kubernetes-release/release/v1.3.7/bin/linux/amd64/kubectl - chmod u+x kubectl - fi - -diff --git a/middleware/kubernetes/controller.go b/middleware/kubernetes/controller.go -index 126d415..c7f9e9e 100644 ---- a/middleware/kubernetes/controller.go -+++ b/middleware/kubernetes/controller.go -@@ -55,12 +55,15 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse - }, - &api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) - -- dns.svcLister.Store, dns.svcController = cache.NewInformer( -+ dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer( - &cache.ListWatch{ - ListFunc: serviceListFunc(dns.client, namespace, dns.selector), - WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector), - }, -- &api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) -+ &api.Service{}, -+ resyncPeriod, -+ cache.ResourceEventHandlerFuncs{}, -+ cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) - - dns.nsLister.Store, dns.nsController = cache.NewInformer( - &cache.ListWatch{ -@@ -163,47 +166,34 @@ func (dns *dnsController) GetNamespaceList() *api.NamespaceList { - return &nsList - } - --func (dns *dnsController) GetServiceList() *api.ServiceList { -- svcList, err := dns.svcLister.List() -+func (dns *dnsController) GetServiceList() []*api.Service { -+ svcs, err := dns.svcLister.List(labels.Everything()) - if err != nil { -- return &api.ServiceList{} -+ return []*api.Service{} - } -- -- return &svcList -+ return svcs - } - - // GetServicesByNamespace returns a map of - // namespacename :: [ kubernetesService ] - func (dns *dnsController) GetServicesByNamespace() map[string][]api.Service { - k8sServiceList := dns.GetServiceList() -- if k8sServiceList == nil { -- return nil -- } -- -- items := make(map[string][]api.Service, len(k8sServiceList.Items)) -- for _, i := range k8sServiceList.Items { -+ items := make(map[string][]api.Service, len(k8sServiceList)) -+ for _, i := range k8sServiceList { - namespace := i.Namespace -- items[namespace] = append(items[namespace], i) -+ items[namespace] = append(items[namespace], *i) - } -- - return items - } - - // GetServiceInNamespace returns the Service that matches - // servicename in the namespace - func (dns *dnsController) GetServiceInNamespace(namespace string, servicename string) *api.Service { -- svcKey := fmt.Sprintf("%v/%v", namespace, servicename) -- svcObj, svcExists, err := dns.svcLister.Store.GetByKey(svcKey) -- -+ svcObj, err := dns.svcLister.Services(namespace).Get(servicename) - if err != nil { - // TODO(...): should return err here - return nil - } - -- if !svcExists { -- // TODO(...): should return err here -- return nil -- } -- -- return svcObj.(*api.Service) -+ return svcObj - } -diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go -index 0bd1dc7..eddc58b 100644 ---- a/middleware/kubernetes/kubernetes.go -+++ b/middleware/kubernetes/kubernetes.go -@@ -183,14 +183,14 @@ func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, - - var resultItems []api.Service - -- for _, item := range serviceList.Items { -+ for _, item := range serviceList { - if symbolMatches(namespace, item.Namespace, nsWildcard) && symbolMatches(servicename, item.Name, serviceWildcard) { - // If namespace has a wildcard, filter results against Corefile namespace list. - // (Namespaces without a wildcard were filtered before the call to this function.) - if nsWildcard && (len(k.Namespaces) > 0) && (!util.StringInSlice(item.Namespace, k.Namespaces)) { - continue - } -- resultItems = append(resultItems, item) -+ resultItems = append(resultItems, *item) - } - } - -@@ -216,12 +216,11 @@ func isKubernetesNameError(err error) bool { - } - - func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service { -- svcList, err := k.APIConn.svcLister.List() -+ svcList, err := k.APIConn.svcLister.List(labels.Everything()) - if err != nil { - return nil - } -- -- for _, service := range svcList.Items { -+ for _, service := range svcList { - if service.Spec.ClusterIP == ip { - return []msg.Service{msg.Service{Host: ip}} - } From f2b1d6e5dce0f67086e2dc1ddf0ac3d688e96cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Feb 2017 21:31:41 +0100 Subject: [PATCH 240/273] vimPlugins.clang_complete: init at 2017-02-16 --- pkgs/misc/vim-plugins/default.nix | 14 ++++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../vim2nix/additional-nix-code/clang_complete | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 953957c7c12..0f1c8e9a201 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -282,6 +282,20 @@ rec { sourceRoot = "."; }; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "clang_complete-2017-02-16"; + src = fetchgit { + url = "git://github.com/Rip-Rip/clang_complete"; + rev = "b1a507fbc27ef581c966b035f52eafae773a6f32"; + sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl"; + }; + dependencies = []; + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + ''; + }; + commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "commentary-2016-03-10"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f9e79a8019b..b8fb32db094 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -14,6 +14,7 @@ "VimOutliner" "WebAPI" "YankRing" +"clang_complete" "commentary" "ctrlp-py-matcher" "ctrlp-cmatcher" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete new file mode 100644 index 00000000000..64e064e2a46 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete @@ -0,0 +1,4 @@ + preFixup = '' + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + ''; From a2b8ceb83aa71336ed666e8fa3e863cf687853f7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2017 23:19:07 +0100 Subject: [PATCH 241/273] Create AMIs for ca-central-1 (Canada) --- nixos/maintainers/scripts/ec2/create-amis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 7cceac8cbf5..1e397b0f176 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -19,7 +19,7 @@ rm -f ec2-amis.nix types="hvm pv" stores="ebs s3" -regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type From bfdfd6c3dff618370b4b8a39f8875f2977edcbbf Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sun, 19 Feb 2017 11:52:36 -0800 Subject: [PATCH 242/273] vulkan-loader: fix search paths in suid processes Fixes #22990 --- .../libraries/vulkan-loader/default.nix | 5 +- .../vulkan-loader/fallback-paths.patch | 52 +++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/vulkan-loader/fallback-paths.patch diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 46994a495eb..a1b9ee03f23 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland }: + libXext, wayland, mesa_noglu }: let version = "1.0.39.1"; @@ -23,9 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" + "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share" ]; - patches = [ ./use-xdg-paths.patch ]; + patches = [ ./use-xdg-paths.patch ./fallback-paths.patch ]; outputs = [ "out" "dev" "demos" ]; diff --git a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch new file mode 100644 index 00000000000..d8d9fdd3f5f --- /dev/null +++ b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch @@ -0,0 +1,52 @@ +commit a59b141559a8c1813da438b97e5f79eeb6cc7642 +Author: Benjamin Saunders +Date: Sun Feb 19 11:14:24 2017 -0800 + + loader: Configurable fallback search paths + + This makes it easier for non-FHS distributions to behave well when the loader + is used by a SUID process or in an otherwise unusual environment. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a43d264..d28b3f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,6 +16,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + find_package(PythonInterp 3 REQUIRED) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ set(FALLBACK_CONFIG_DIRS "/etc/xdg" CACHE STRING ++ "Search path to use when XDG_CONFIG_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") ++ set(FALLBACK_DATA_DIRS "/usr/local/share:/usr/share" CACHE STRING ++ "Search path to use when XDG_DATA_DIRS is unset or empty or the current process is SUID/SGID. Default is freedesktop compliant.") ++ + include(FindPkgConfig) + option(BUILD_WSI_XCB_SUPPORT "Build XCB WSI support" ON) + option(BUILD_WSI_XLIB_SUPPORT "Build Xlib WSI support" ON) +@@ -285,7 +290,10 @@ run_vk_xml_generate(dispatch_table_generator.py vk_dispatch_table_helper.h) + if(NOT WIN32) + include(GNUInstallDirs) + ++ add_definitions(-DFALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}") ++ add_definitions(-DFALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}") + add_definitions(-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++ + # Make sure /etc is searched by the loader + if(NOT (CMAKE_INSTALL_FULL_SYSCONFDIR STREQUAL "/etc")) + add_definitions(-DEXTRASYSCONFDIR="/etc") +diff --git a/loader/loader.c b/loader/loader.c +index 81c37c4..83378eb 100644 +--- a/loader/loader.c ++++ b/loader/loader.c +@@ -2644,9 +2644,9 @@ static VkResult loader_get_manifest_files(const struct loader_instance *inst, co + const char *xdgconfdirs = secure_getenv("XDG_CONFIG_DIRS"); + const char *xdgdatadirs = secure_getenv("XDG_DATA_DIRS"); + if (xdgconfdirs == NULL || xdgconfdirs[0] == '\0') +- xdgconfdirs = "/etc/xdg"; ++ xdgconfdirs = FALLBACK_CONFIG_DIRS; + if (xdgdatadirs == NULL || xdgdatadirs[0] == '\0') +- xdgdatadirs = "/usr/local/share:/usr/share"; ++ xdgdatadirs = FALLBACK_DATA_DIRS; + const size_t rel_size = strlen(relative_location); + // Leave space for trailing separators + loc_size += strlen(xdgconfdirs) + strlen(xdgdatadirs) + 2*rel_size + 2; From 4b833facf18adca73872f07b5394019af5b1a8bd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 19 Feb 2017 23:45:39 +0100 Subject: [PATCH 243/273] Add ca-central-1 AMIs --- nixos/modules/virtualisation/ec2-amis.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 0753e2ce994..d592a23c303 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -156,6 +156,10 @@ let self = { "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4"; "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb"; "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5"; + "16.09".ca-central-1.hvm-ebs = "ami-9f863bfb"; + "16.09".ca-central-1.hvm-s3 = "ami-ea85388e"; + "16.09".ca-central-1.pv-ebs = "ami-ce8a37aa"; + "16.09".ca-central-1.pv-s3 = "ami-448a3720"; "16.09".eu-central-1.hvm-ebs = "ami-1b884774"; "16.09".eu-central-1.hvm-s3 = "ami-b08c43df"; "16.09".eu-central-1.pv-ebs = "ami-888946e7"; From 7c9f4ee0325d3d1902d8123a6708a449c2fa3eac Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 19 Feb 2017 23:58:33 +0100 Subject: [PATCH 244/273] lua-packages/luasocket: Fix wrong platforms value This has surfaced due to 505d7bea3af48c79af4212111324a4b95f80f212 and the fixup commit 77f5a50c400d7e312e7491593dcc8ee8cab86c2c. The individial platform attributes are a list rather than single elements, so in this case we got: with platforms; [darwin linux freebsd illumos] Which results in: [ ["x86_64-darwin"] ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux"] ["i686-freebsd" "x86_64-freebsd"] ["x86_64-solaris"] ] So if you don't have allowBroken set in nixpkgs config, you end up with an evaluation error because meta.platforms is expected to be a list instead of a list of lists which we got here. Signed-off-by: aszlig Cc: @mornfall, @vcunat --- pkgs/top-level/lua-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 5ca9f697b87..3b6603996fc 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -239,7 +239,7 @@ let meta = with stdenv.lib; { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - platforms = with platforms; [darwin linux freebsd illumos]; + platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos; maintainers = with maintainers; [ mornfall ]; }; }; From 9ca3caeb09f4bbc0710a1a8a9cb05e3f4a84ec2e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 18 Feb 2017 18:32:35 +0800 Subject: [PATCH 245/273] gnupg: include systemd user units in output --- pkgs/tools/security/gnupg/21.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e40d1f7bf01..a301cf0c569 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -37,6 +37,14 @@ stdenv.mkDerivation rec { pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; + postInstall = '' + mkdir -p $out/lib/systemd/user + for f in doc/examples/systemd-user/*.{service,socket} ; do + substitute $f $out/lib/systemd/user/$(basename $f) \ + --replace /usr/bin $out/bin + done + ''; + meta = with stdenv.lib; { homepage = http://gnupg.org; description = "A complete and free implementation of the OpenPGP standard"; From 59d2eeff841f1018b0498cfbf61bf0ebc218167d Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Sun, 12 Feb 2017 11:44:44 -0800 Subject: [PATCH 246/273] openant: init at unstable-2017-02-11 --- pkgs/top-level/python-packages.nix | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40201bc6047..ae64512e73d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4659,6 +4659,37 @@ in { }; }; + openant = buildPythonPackage rec { + name = "openant-unstable-2017-02-11"; + + meta = with stdenv.lib; { + homepage = "https://github.com/Tigge/openant"; + description = "ANT and ANT-FS Python Library"; + license = licenses.mit; + platforms = platforms.linux; + }; + + src = pkgs.fetchFromGitHub { + owner = "Tigge"; + repo = "openant"; + rev = "ed89281e37f65d768641e87356cef38877952397"; + sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19"; + }; + + # Removes some setup.py hacks intended to install udev rules. + # We do the job ourselves in postInstall below. + postPatch = '' + sed -i -e '/cmdclass=.*/d' setup.py + ''; + + postInstall = '' + install -dm755 "$out/etc/udev/rules.d" + install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules" + ''; + + propagatedBuildInputs = with self; [ pyusb ]; + }; + opencv = pkgs.opencv.override { enablePython = true; pythonPackages = self; From 13884d6de1295b376884a74733796345c468668b Mon Sep 17 00:00:00 2001 From: Richard Larocque Date: Sun, 12 Feb 2017 11:45:05 -0800 Subject: [PATCH 247/273] antfs-cli: init at unstable-2017-02-11 --- pkgs/applications/misc/antfs-cli/default.nix | 21 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/antfs-cli/default.nix diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix new file mode 100644 index 00000000000..556c1db3c83 --- /dev/null +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "antfs-cli-unstable-2017-02-11"; + + meta = with stdenv.lib; { + homepage = "https://github.com/Tigge/antfs-cli"; + description = "Extracts FIT files from ANT-FS based sport watches"; + license = licenses.mit; + platforms = platforms.linux; + }; + + src = fetchFromGitHub { + owner = "Tigge"; + repo = "antfs-cli"; + rev = "85a6cc6fe6fc0ec38399f5aa30fb39177c565b52"; + sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy"; + }; + + propagatedBuildInputs = [ pythonPackages.openant ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d7d103c00a..54aec17b7ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12457,6 +12457,8 @@ with pkgs; }; }; + antfs-cli = callPackage ../applications/misc/antfs-cli {}; + antimony = qt5.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; From edce2b759cc31d6ee5ad1682819240f59b1b03a8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 00:54:19 +0100 Subject: [PATCH 248/273] make-dbus-conf: Don't try to access network This is the output of the builder: building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1' error : connection refused error : connection refused However, even when using --nonet we'd still get this: I/O error : Attempt to load network entity http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd So in order to avoid this, we now provide an XML catalog file, mapping the public URLs to the local DTD paths inside the store instead of using --path (which doesn't seem to work with xsltproc). Tested this by comparing the SHA256 (nix-hash --type sha256) of the output path generated by: nix-build -E '(import ./. {}).makeDBusConf { suidHelper = "SUIDHELPER"; serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ]; }' ... with the SHA256 of the generated output path prior to this commit and they have the same hash: 6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab Signed-off-by: aszlig Cc: @abbradar --- .../libraries/dbus/make-dbus-conf.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 7e35a9162c8..46cf1046d6a 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,4 +1,7 @@ -{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }: +{ runCommand, writeText, libxslt, dbus +, serviceDirectories ? [] +, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" +}: /* DBus has two configuration parsers -- normal and "trivial", which is used * for suid helper. Unfortunately the latter doesn't support @@ -9,19 +12,29 @@ runCommand "dbus-1" { buildInputs = [ libxslt ]; inherit serviceDirectories suidHelper; + XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' + + + + + + + ''; } '' mkdir -p $out - xsltproc \ + xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ --stringparam suidHelper "$suidHelper" \ - --path ${dbus.doc}/share/xml/dbus \ ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ > $out/system.conf - xsltproc \ + xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ - --path ${dbus.doc}/share/xml/dbus \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf '' From fc6684054d054ad677a49e2a3ba162563e126093 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 03:09:41 +0100 Subject: [PATCH 249/273] make-dbus-conf: Use libxslt.bin instead of .dev The problem with using libxslt as buildInputs is that the dev output is used for building the dbus config. This is one of the reasons why the installer tests are failing since ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd, because the tests do not have libxslt.dev in their closure and really shouldn't. Signed-off-by: aszlig Cc: @abbradar --- pkgs/development/libraries/dbus/make-dbus-conf.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 46cf1046d6a..a45b4b5443c 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -10,7 +10,6 @@ */ runCommand "dbus-1" { - buildInputs = [ libxslt ]; inherit serviceDirectories suidHelper; XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' @@ -28,12 +27,12 @@ runCommand "dbus-1" '' mkdir -p $out - xsltproc --nonet \ + ${libxslt.bin}/bin/xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ --stringparam suidHelper "$suidHelper" \ ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \ > $out/system.conf - xsltproc --nonet \ + ${libxslt.bin}/bin/xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf From c5b2714bc79a27230690821c1c6bd99bdd457c63 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 03:16:26 +0100 Subject: [PATCH 250/273] dbus: Put DTDs into $out instead of $doc First of all, these "documents" are not really documentation, so it really doesn't make much sense to put it into $doc. The main point however is that the installer tests are failing since this was introduced in ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd. One way to circumvent this is putting dbus.doc into system.extraDependencies of the installer tests, but given the first point this sounds a bit odd to me. So I went for the second way of putting it into $out, because it's now basically necessary to build a NixOS system. With this the NixOS installer tests should now work again, although I have only tested this with the installer.simple test. Signed-off-by: aszlig Cc: @abbradar --- pkgs/development/libraries/dbus/default.nix | 4 ++-- pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 49b71ff9974..7075874adf8 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -67,8 +67,8 @@ self = stdenv.mkDerivation { installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ]; postInstall = '' - mkdir -p $doc/share/xml/dbus - cp doc/*.dtd $doc/share/xml/dbus + mkdir -p "$out/share/xml/dbus" + cp doc/*.dtd "$out/share/xml/dbus" ''; # it's executed from $lib by absolute path diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index a45b4b5443c..d836d87efef 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -20,7 +20,7 @@ runCommand "dbus-1" + rewritePrefix="file://${dbus}/share/xml/dbus/"/> ''; } From a8c738713bd13f13987bde696f1e811bc253e884 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 19 Feb 2017 22:30:01 -0500 Subject: [PATCH 251/273] gnupg21: Fix scdaemon for usb smartcards (#22891) The use of smartcard functionality for yubikeys (and presumably other usb smartcards) was broken in gnupg 2.1.18. This has apparently already been fixed in gnupg master, and debian backports the included patches for 2.1.18. See also: https://bugs.gnupg.org/gnupg/issue2933 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852702 https://github.com/NixOS/nixpkgs/pull/21991 --- pkgs/tools/security/gnupg/21.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index a301cf0c569..f7968e47b1c 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth -, gettext, texinfo, pcsclite, sqlite +{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba +, libiconv, npth, gettext, texinfo, pcsclite, sqlite # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -29,7 +29,20 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - patches = [ ./fix-libusb-include-path.patch ]; + patches = [ + ./fix-libusb-include-path.patch + # TODO: Remove the following two patches on the next gnupg release after 2.1.18 + (fetchpatch { + name = "scd-Backport-two-fixes-from-master"; + url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6"; + sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k"; + }) + (fetchpatch { + name = "scd-Fix-use-case-of-PC-SC"; + url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6"; + sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz"; + }) + ]; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( From 252fbbf2d22915e0b7a793d74e5dd1a3991982c7 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 20 Feb 2017 04:43:04 +0100 Subject: [PATCH 252/273] mattermost sevice: JoinsNamespaceOf for local pgsql (#22899) --- nixos/modules/services/web-apps/mattermost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index bf3a8eed600..8e6baf6a17e 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -202,6 +202,7 @@ in ExecStart = "${pkgs.mattermost}/bin/mattermost-platform"; WorkingDirectory = "${cfg.statePath}"; PrivateTmp = true; + JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service"; Restart = "always"; RestartSec = "10"; LimitNOFILE = "49152"; From c23c2c50ded3e1dd3e7e30ba4f29142c84d0aca3 Mon Sep 17 00:00:00 2001 From: florianjacob Date: Mon, 20 Feb 2017 06:13:48 +0100 Subject: [PATCH 253/273] munin service: listen on IPv6 loopback as well (#23012) munin service: listen on IPv6 loopback as well --- nixos/modules/services/monitoring/munin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 6d2ce538368..364f18e7543 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -76,6 +76,7 @@ let # wrapped plugins by makeWrapper being with dots ignore_file ^\. + allow ^::1$ allow ^127\.0\.0\.1$ ${nodeCfg.extraConfig} From 5abca15f2119077dcfb0253d196b32bf37d6c322 Mon Sep 17 00:00:00 2001 From: zraexy Date: Sun, 19 Feb 2017 22:46:47 -0900 Subject: [PATCH 254/273] bumblebee service: Fix pmMethod bbswitch check Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau". --- nixos/modules/hardware/video/bumblebee.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 3967137fcf8..2278c7b4061 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -13,7 +13,7 @@ let useDisplayDevice = cfg.connectDisplay; }; - useBbswitch = cfg.pmMethod == "bbswitch"; + useBbswitch = cfg.pmMethod == "bbswitch" || cfg.pmMethod == "auto" && useNvidia; primus = pkgs.primus.override { inherit useNvidia; @@ -65,7 +65,7 @@ in pmMethod = mkOption { default = "auto"; - type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ]; + type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ]; description = '' Set preferred power management method for unused card. ''; From ffe6935ea8663d99da5b339d6ac886012b0f3f09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 20 Feb 2017 11:41:55 +0100 Subject: [PATCH 255/273] kile: 2016-10-24 -> 2017-02-09 --- pkgs/applications/editors/kile/frameworks.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix index 34ea7647893..ad3300b9221 100644 --- a/pkgs/applications/editors/kile/frameworks.nix +++ b/pkgs/applications/editors/kile/frameworks.nix @@ -24,12 +24,12 @@ let unwrapped = kdeDerivation rec { name = "kile-${version}"; - version = "2016-10-24"; + version = "2017-02-09"; src = fetchgit { url = git://anongit.kde.org/kile.git; - rev = "e005e2ac140881aa7610bd363d181cf306f91f80"; - sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4"; + rev = "f77f6e627487c152f111e307ad6dc71699ade746"; + sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib"; }; From c79371b82398cef0b8b50228c458bd728ccd956f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 20 Feb 2017 11:42:07 +0100 Subject: [PATCH 256/273] kdeconnect: 1.0 -> 1.0.3 --- pkgs/applications/misc/kdeconnect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index ecf3e38aeb0..22c9cfc7e98 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { name = "kdeconnect-${version}"; - version = "1.0"; + version = "1.0.3"; src = fetchurl { - url = http://download.kde.org/stable/kdeconnect/1.0/src/kdeconnect-kde-1.0.tar.xz; - sha256 = "0pd8qw0w6akc7yzmsr0sjkfj3nw6rgm5xvq41g61ak8pp05syzr0"; + url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; + sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2"; }; buildInputs = [ From dc19ba7bc67bbcc4d743bc37dc54a6df402f8cc6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 19 Feb 2017 17:35:24 -0500 Subject: [PATCH 257/273] beets: enable gstreamer support So this was suggested as [long ago as October, 2015](https://github.com/NixOS/nixpkgs/issues/10376#issuecomment-147734898). Despite being fairly ignorant of the nix Python support, I decided that I really wanted this; this change brings in what I believe are the necessary components---I have, at least, successfully run `beet replaygain` and `beet bpd`---but it may not do it in the best way; I'm happy to consider input on that front. I can at least state that all three changes are necessary---leave any one of them out and gstreamer support doesn't work. --- pkgs/tools/audio/beets/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 48d42e6533a..69f0d89e7f8 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, pythonPackages, imagemagick +, pythonPackages, imagemagick, gobjectIntrospection, gst_all_1 , enableAcousticbrainz ? true , enableAcoustid ? true @@ -93,6 +93,9 @@ in pythonPackages.buildPythonApplication rec { pythonPackages.pathlib pythonPackages.pyyaml pythonPackages.unidecode + pythonPackages.gst-python + pythonPackages.pygobject3 + gobjectIntrospection ] ++ optional enableAcoustid pythonPackages.pyacoustid ++ optional (enableFetchart || enableEmbyupdate @@ -119,7 +122,11 @@ in pythonPackages.buildPythonApplication rec { nose rarfile responses - ]; + ] ++ (with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + ]); patches = [ ./replaygain-default-bs1770gain.patch @@ -198,6 +205,8 @@ in pythonPackages.buildPythonApplication rec { runHook postInstallCheck ''; + makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ]; + meta = { description = "Music tagger and library organizer"; homepage = http://beets.radbox.org; From f0de1dc89d2ddd054a8ae60d5944e4ae1f33ee01 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2017 12:08:54 +0100 Subject: [PATCH 258/273] python-suseapi: add package at version 0.24-5-g9937e3b --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c993581f85..cb845704b16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31974,6 +31974,29 @@ EOF yarl = callPackage ../development/python-modules/yarl { }; + suseapi = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "suseapi"; + version = "0.24-5-g9937e3b"; + + src = pkgs.fetchFromGitHub { + owner = "openSUSE"; + repo = "python-${pname}"; + rev = version; + sha256 = "1144h26wrzazzy6y3yy163fccqmggk5hazjkk8l9a547390ilgrv"; + }; + + propagatedBuildInputs = with self; [ + django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil + ]; + + meta = { + homepage = "https://github.com/openSUSE/python-suseapi/"; + description = "Python module to work with various SUSE services"; + license = licenses.gpl3Plus; + }; + }; + stripe = buildPythonPackage rec { name = "${pname}-${version}"; pname = "stripe"; From 31759274f1d52d075f80b9fffaace7234f9fe2a6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2017 12:21:59 +0100 Subject: [PATCH 259/273] python-suseapi: 'requests' isn't needed at build-time, but it's needed at run-time --- 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 cb845704b16..ba17335ebe6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31987,7 +31987,7 @@ EOF }; propagatedBuildInputs = with self; [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil + django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests ]; meta = { From fea71f84d0c1c7bc6da80d70a639e1e443ef24a8 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Feb 2017 06:47:49 -0500 Subject: [PATCH 260/273] linux 4.10 --- .../linux/kernel/common-config.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++++++++++++- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 40c49509fd0..9cc4027903e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -188,7 +188,7 @@ with stdenv.lib; DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support ''} ${optionalString (versionAtLeast version "4.9") '' - DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets + DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets ''} @@ -229,7 +229,7 @@ with stdenv.lib; EXT3_FS_POSIX_ACL y EXT3_FS_SECURITY y EXT4_FS_POSIX_ACL y - EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"} + EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"} EXT4_FS_SECURITY y REISERFS_FS_XATTR? y REISERFS_FS_POSIX_ACL? y diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix new file mode 100644 index 00000000000..a556d2dc24d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.10"; + extraMeta.branch = "4.10"; + modDirVersion = "4.10.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7ee4d85638..273d187d67e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11334,6 +11334,22 @@ with pkgs; ]; }; + linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11506,7 +11522,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_9; + linuxPackages_latest = linuxPackages_4_10; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11517,6 +11533,7 @@ with pkgs; linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); + linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From 464529c603cb72046121fb61208b7819757900bf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Feb 2017 12:47:46 +0100 Subject: [PATCH 261/273] simp_le: 2016-12-16 -> 0.1.1 --- pkgs/tools/admin/simp_le/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index aef077e21a0..134afa72ad0 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -1,17 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "simp_le-2016-12-16"; + pname = "simp_le-client"; + version = "0.1.1"; + name = "${pname}-${version}"; - # kuba/simp_le seems unmaintained - src = fetchFromGitHub { - owner = "zenhack"; - repo = "simp_le"; - rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef"; - sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "18y8mg0s0i2bs57pi6mbkwgjlr5mmivchiyvrpcbdmkg9qlbfwaa"; }; - propagatedBuildInputs = with pythonPackages; [ acme ]; + prePatch = '' + substituteInPlace setup.py \ + --replace 'acme>=0.9,<0.10' acme + ''; + + checkPhase = '' + $out/bin/simp_le --test + ''; + + propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ]; meta = with stdenv.lib; { inherit (src.meta) homepage; From b191ac0d8963b7e09b428ed13007f56a16ebfb1a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Feb 2017 07:29:47 -0500 Subject: [PATCH 262/273] Revert "linux 4.10" Somehow the tarball was actually linux 4.4.10 This reverts commit fea71f84d0c1c7bc6da80d70a639e1e443ef24a8. --- .../linux/kernel/common-config.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 19 +------------------ 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 9cc4027903e..40c49509fd0 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -188,7 +188,7 @@ with stdenv.lib; DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support ''} ${optionalString (versionAtLeast version "4.9") '' - DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets + DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets ''} @@ -229,7 +229,7 @@ with stdenv.lib; EXT3_FS_POSIX_ACL y EXT3_FS_SECURITY y EXT4_FS_POSIX_ACL y - EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"} + EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"} EXT4_FS_SECURITY y REISERFS_FS_XATTR? y REISERFS_FS_POSIX_ACL? y diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix deleted file mode 100644 index a556d2dc24d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.10"; - extraMeta.branch = "4.10"; - modDirVersion = "4.10.0"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1ca54b0587..0c10c016ac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11334,22 +11334,6 @@ with pkgs; ]; }; - linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking - # kernelPatches.cpu-cgroup-v2."4.7" - kernelPatches.modinst_arg_list_too_long - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11522,7 +11506,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_10; + linuxPackages_latest = linuxPackages_4_9; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11533,7 +11517,6 @@ with pkgs; linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From f454297a7d57f1996e1b5d351be0982fe6d617da Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 20 Feb 2017 07:32:46 -0500 Subject: [PATCH 263/273] linux 4.10 --- pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix new file mode 100644 index 00000000000..ff6fac2ac6d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.10"; + extraMeta.branch = "4.10"; + modDirVersion = "4.10.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c10c016ac4..c1ca54b0587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11334,6 +11334,22 @@ with pkgs; ]; }; + linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11506,7 +11522,7 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_9; + linuxPackages_latest = linuxPackages_4_10; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11517,6 +11533,7 @@ with pkgs; linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); + linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. From fee43308ed139191238c23655d7784c531eab709 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 20 Feb 2017 15:22:14 +0200 Subject: [PATCH 264/273] platforms.nix: Remove unnecessary kernelExtraConfig for ARMv7 AHCI_IMX is already enabled in multi_v7_defconfig since kernel 4.9. --- pkgs/top-level/platforms.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix index 41cd0fff52b..e26bc9e66ae 100644 --- a/pkgs/top-level/platforms.nix +++ b/pkgs/top-level/platforms.nix @@ -416,9 +416,6 @@ rec { kernelAutoModules = false; uboot = null; kernelTarget = "zImage"; - kernelExtraConfig = '' - AHCI_IMX y - ''; gcc = { # Some table about fpu flags: # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png From 2c4d9c92286841515a56e2a05049987fe04637d7 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 19 Feb 2017 17:53:09 +0100 Subject: [PATCH 265/273] manual: Add link to config section (#22994) Add link to "Configuration" chapter from "Changing the Configuration" section. Also, fix grammar error. (cherry picked from commit a585f987fa32f2e81b3f273291971151c25f98b7) --- nixos/doc/manual/installation/changing-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index 43b591a1cae..75df307a1b7 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -7,7 +7,7 @@ The file /etc/nixos/configuration.nix contains the current configuration of your machine. Whenever you’ve -changed something to that file, you should do +changed something in that file, you should do # nixos-rebuild switch From 4daccf208feccb027731d3fc8dc2686ab9ef3428 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 13:25:08 +0100 Subject: [PATCH 266/273] systemd-boot: Make sure /etc/machine-id exists This leads to the following error when trying to install a new machine where the machine ID wasn't yet initialized during boot: Failed to get machine did: No such file or directory In addition this was also detected by the simpleUefiGummiboot installer test. So let's generate a fallback machine ID by using systemd-machine-id-setup before actually running bootctl. Tested this by running the installer.simpleUefiGummiboot test, it still fails but not because of the machine ID. Signed-off-by: aszlig Cc: @edolstra, @shlevy, @mic92 Fixes: #22561 --- .../systemd-boot/systemd-boot-builder.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index b91d64bb0a7..9218e1dc8a7 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -101,6 +101,18 @@ def main(): parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') args = parser.parse_args() + try: + with open("/etc/machine-id") as machine_file: + machine_id = machine_file.readlines()[0] + except IOError as e: + if e.errno != errno.ENOENT: + raise + # Since systemd version 232 a machine ID is required and it might not + # be there on newly installed systems, so let's generate one so that + # bootctl can find it and we can also pass it to write_entry() later. + cmd = ["@systemd@/bin/systemd-machine-id-setup", "--print"] + machine_id = subprocess.check_output(cmd).rstrip() + if os.getenv("NIXOS_INSTALL_GRUB") == "1": warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" @@ -113,13 +125,6 @@ def main(): mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") - try: - with open("/etc/machine-id") as machine_file: - machine_id = machine_file.readlines()[0] - except IOError as e: - if e.errno != errno.ENOENT: - raise - machine_id = None gens = get_generations("system") remove_old_entries(gens) From dc31a1ea29cae217b71134bf59f888c5a90f630b Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 14:28:53 +0100 Subject: [PATCH 267/273] systemd-boot: Unlink loader.conf if it exists Since systemd version 232 the install subcommand of bootctl opens the loader.conf with fopen() modes "wxe", where the "e" stands for exclusive, so the call will fail if the file exists. For installing the boot loader just once this is fine, but if we're using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is already present this will fail. Exactly this is done within the simpleUefiGummiboot installer test, where nixos-install is called twice and thus the bootloader is also installed twice, resulting in an error during the fopen call: Failed to open loader.conf for writing: File exists Removing the file prior to calling bootctl should fix this. I've tested this using the installer.simpleUefiGummiboot test and it now succeeds. Signed-off-by: aszlig Cc: @edolstra, @shlevy, @mic92 Fixes: #22925 --- .../system/boot/loader/systemd-boot/systemd-boot-builder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 9218e1dc8a7..04cf17c1b0b 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -118,6 +118,10 @@ def main(): os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": + # bootctl uses fopen() with modes "wxe" and fails if the file exists. + if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): + os.unlink("@efiSysMountPoint@/loader/loader.conf") + if "@canTouchEfiVariables@" == "1": subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) else: From d7f10f282819eebcab4c8e350affff425dc4ed84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2017 15:01:46 +0100 Subject: [PATCH 268/273] python-osc: enable (install) bash completion --- pkgs/top-level/python-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 224aae7b574..39574541314 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16752,8 +16752,19 @@ in { rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9"; sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z"; }; + buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; - postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; + postInstall = '' + ln -s $out/bin/osc-wrapper.py $out/bin/osc + install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper + mkdir -p $out/share/bash-completion/completions + cat >>$out/share/bash-completion/completions/osc </dev/null 2>&1 || return + complete -r _nullcommand >/dev/null 2>&1 || return + complete -o default -C $out/share/bash-completion/helpers/osc-helper osc + EOF + ''; meta = { description = "opensuse-commander with svn like handling"; maintainers = [ maintainers.peti ]; From 5e3eea0cd3f8e7f28dc4fad4b1fb29b73cc103e1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 20 Feb 2017 09:36:25 +0100 Subject: [PATCH 269/273] LTS Haskell 8.2 --- .../configuration-hackage2nix.yaml | 85 ++++++++++--------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 492b2005ccd..d2c86c935aa 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.0 + # LTS Haskell 8.2 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -208,7 +208,7 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1 - bcrypt ==0.0.10 - - benchpress ==0.2.2.8 + - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 - bifunctors ==5.4.1 @@ -256,7 +256,7 @@ default-package-overrides: - blosum ==0.1.1.4 - bmp ==1.2.6.3 - bool-extras ==0.4.0 - - Boolean ==0.2.3 + - Boolean ==0.2.4 - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - boomerang ==1.4.5.2 @@ -301,7 +301,7 @@ default-package-overrides: - camfort ==0.901 - carray ==0.1.6.5 - cartel ==0.18.0.2 - - case-insensitive ==1.2.0.7 + - case-insensitive ==1.2.0.8 - cased ==0.1.0.0 - cases ==0.1.3.2 - cassava ==0.4.5.1 @@ -317,9 +317,9 @@ default-package-overrides: - ChannelT ==0.0.0.2 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.2 - - Chart ==1.8.1 - - Chart-cairo ==1.8.1 - - Chart-diagrams ==1.8.1 + - Chart ==1.8.2 + - Chart-cairo ==1.8.2 + - Chart-diagrams ==1.8.2 - chart-unit ==0.1.0.0 - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 @@ -378,7 +378,7 @@ default-package-overrides: - composition ==1.0.2.1 - composition-extra ==2.0.0 - concurrency ==1.0.0.0 - - concurrent-output ==1.7.8 + - concurrent-output ==1.7.9 - concurrent-supply ==0.1.8 - conduit ==1.2.9 - conduit-combinators ==1.1.0 @@ -598,7 +598,7 @@ default-package-overrides: - fast-builder ==0.0.0.6 - fast-digits ==0.2.1.0 - fast-logger ==2.4.10 - - fasta ==0.10.4.1 + - fasta ==0.10.4.2 - fay ==0.23.1.16 - fay-base ==0.20.0.1 - fay-builder ==0.2.0.5 @@ -843,7 +843,7 @@ default-package-overrides: - hackage-security ==0.5.2.2 - hackernews ==1.1.1.0 - haddock-library ==1.4.2 - - hailgun ==0.4.1.1 + - hailgun ==0.4.1.2 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.5.1 - half ==0.2.2.3 @@ -928,7 +928,7 @@ default-package-overrides: - hinotify ==0.3.9 - hint ==0.6.0 - hip ==1.5.2.0 - - histogram-fill ==0.8.4.1 + - histogram-fill ==0.8.5.0 - hit ==0.6.3 - hjpath ==3.0.1 - hjsmin ==0.2.0.2 @@ -976,7 +976,7 @@ default-package-overrides: - hsemail ==1.7.7 - HSet ==0.0.0 - hset ==2.2.0 - - hsexif ==0.6.0.10 + - hsexif ==0.6.1.0 - hsignal ==0.2.7.5 - hsinstall ==1.5 - hslogger ==1.2.10 @@ -988,6 +988,7 @@ default-package-overrides: - hsp ==0.10.0 - hspec ==2.4.1 - hspec-attoparsec ==0.1.0.2 + - hspec-contrib ==0.4.0 - hspec-core ==2.4.1 - hspec-discover ==2.4.1 - hspec-expectations ==0.8.2 @@ -1087,7 +1088,7 @@ default-package-overrides: - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.2.0 - intervals ==0.7.2 - - intro ==0.1.0.6 + - intro ==0.1.0.8 - invariant ==0.4 - invertible ==0.2.0 - io-choice ==0.0.6 @@ -1107,7 +1108,7 @@ default-package-overrides: - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.0 - islink ==0.1.0.0 - - iso3166-country-codes ==0.20140203.7 + - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 - iterable ==3.0 @@ -1121,7 +1122,7 @@ default-package-overrides: - jmacro-rpc-snap ==0.3 - jni ==0.2.3 - jose ==0.5.0.2 - - jose-jwt ==0.7.4 + - jose-jwt ==0.7.5 - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 @@ -1149,7 +1150,7 @@ default-package-overrides: - koofr-client ==1.0.0.3 - kraken ==0.0.3 - l10n ==0.1.0.0 - - labels ==0.3.0 + - labels ==0.3.2 - lackey ==0.4.2 - language-c ==0.5.0 - language-c-quote ==0.11.7.1 @@ -1194,7 +1195,7 @@ default-package-overrides: - licensor ==0.2.0 - lift-generics ==0.1.1 - lifted-async ==0.9.1.1 - - lifted-base ==0.2.3.8 + - lifted-base ==0.2.3.10 - line ==2.2.0 - linear ==1.20.5 - linear-accelerate ==0.2 @@ -1215,7 +1216,7 @@ default-package-overrides: - log-postgres ==0.7 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - - logging-effect ==1.1.2 + - logging-effect ==1.1.3 - logging-facade ==0.1.1 - logict ==0.6.0.2 - loop ==0.3.0 @@ -1231,7 +1232,7 @@ default-package-overrides: - machines-process ==0.2.0.8 - magic ==1.1 - mainland-pretty ==0.4.1.4 - - makefile ==0.1.0.5 + - makefile ==0.1.1.0 - managed ==1.0.5 - mandrill ==0.5.3.1 - markdown ==0.1.16 @@ -1281,7 +1282,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.20.1 + - monad-logger ==0.3.20.2 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.3.0 @@ -1306,7 +1307,7 @@ default-package-overrides: - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - mongoDB ==2.1.1.1 - - mono-traversable ==1.0.1.1 + - mono-traversable ==1.0.1.2 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - monoid-subclasses ==0.4.3.1 @@ -1352,7 +1353,7 @@ default-package-overrides: - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 - - network-carbon ==1.0.8 + - network-carbon ==1.0.9 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.8 @@ -1421,7 +1422,7 @@ default-package-overrides: - pagination ==0.1.1 - palette ==0.1.0.4 - pandoc ==1.19.2.1 - - pandoc-citeproc ==0.10.4 + - pandoc-citeproc ==0.10.4.1 - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 - parallel ==3.2.1.0 @@ -1450,7 +1451,7 @@ default-package-overrides: - pdfinfo ==1.5.4 - pem ==0.2.2 - permutation ==0.5.0.5 - - persistable-record ==0.4.1.0 + - persistable-record ==0.4.1.1 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 - persistent-mysql ==2.6 @@ -1477,7 +1478,7 @@ default-package-overrides: - pipes-extras ==1.0.8 - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.6 - - pipes-misc ==0.2.3.0 + - pipes-misc ==0.2.5.0 - pipes-mongodb ==0.1.0.0 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.3 @@ -1499,12 +1500,13 @@ default-package-overrides: - pointless-fun ==1.1.0.6 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 + - posix-paths ==0.2.1.1 - posix-realtime ==0.0.0.4 - post-mess-age ==0.2.1.0 - - postgresql-binary ==0.9.2 + - postgresql-binary ==0.9.3 - postgresql-libpq ==0.9.3.0 - postgresql-simple ==0.5.2.1 - - postgresql-simple-migration ==0.1.8.0 + - postgresql-simple-migration ==0.1.9.0 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - postgresql-typed ==0.5.0 @@ -1527,7 +1529,7 @@ default-package-overrides: - printcess ==0.1.0.3 - process-extras ==0.7.1 - product-profunctors ==0.7.1.0 - - profiteur ==0.4.2.0 + - profiteur ==0.4.2.1 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1548,7 +1550,7 @@ default-package-overrides: - pure-cdb ==0.1.2 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.10.0.0 + - purescript-bridge ==0.10.1.0 - pusher-http-haskell ==1.1.0.4 - pwstore-fast ==2.4.4 - pwstore-purehaskell ==2.1.4 @@ -1616,9 +1618,9 @@ default-package-overrides: - regex-tdfa ==1.2.2 - regex-tdfa-text ==1.0.0.3 - reinterpret-cast ==0.1.0 - - relational-query ==0.8.3.4 + - relational-query ==0.8.3.5 - relational-query-HDBC ==0.6.0.2 - - relational-record ==0.1.5.1 + - relational-record ==0.1.6.1 - relational-schemas ==0.1.3.1 - renderable ==0.2.0.1 - repa ==3.4.1.2 @@ -1652,13 +1654,14 @@ default-package-overrides: - RNAlien ==1.3.1 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 + - rot13 ==0.1.0.2 - rotating-log ==0.4.2 - RSA ==2.2.0 - rss-conduit ==0.3.0.0 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.13 + - safe ==0.3.14 - safe-exceptions ==0.1.4.0 - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.2 @@ -1696,7 +1699,7 @@ default-package-overrides: - servant-cassava ==0.8 - servant-client ==0.9.1.1 - servant-docs ==0.9.1.1 - - servant-elm ==0.4.0.0 + - servant-elm ==0.4.0.1 - servant-foreign ==0.9.1.1 - servant-js ==0.9.1 - servant-JuicyPixels ==0.3.0.2 @@ -1763,7 +1766,7 @@ default-package-overrides: - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - sparkle ==0.4.0.2 - - sparse-linear-algebra ==0.2.2.0 + - sparse-linear-algebra ==0.2.9.4 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 @@ -1857,9 +1860,9 @@ default-package-overrides: - tar ==0.5.0.3 - tar-conduit ==0.1.0 - tardis ==0.4.1.0 - - tasty ==0.11.1 + - tasty ==0.11.2 - tasty-ant-xml ==1.0.4 - - tasty-auto ==0.1.0.1 + - tasty-auto ==0.1.0.2 - tasty-dejafu ==0.3.0.2 - tasty-discover ==1.1.0 - tasty-expected-failure ==0.11.0.4 @@ -1877,11 +1880,11 @@ default-package-overrides: - tasty-tap ==0.0.4 - tasty-th ==0.1.4 - Taxonomy ==1.0.2 - - TCache ==0.12.0 + - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==0.6.0.0 - tcp-streams-openssl ==0.6.0.0 - - telegram-api ==0.6.0.0 + - telegram-api ==0.6.0.2 - template ==0.2.0.10 - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 @@ -2084,7 +2087,7 @@ default-package-overrides: - warp ==3.2.11 - warp-tls ==3.2.3 - wave ==0.1.4 - - wavefront ==0.7.0.2 + - wavefront ==0.7.0.3 - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - web-routes ==0.27.11 @@ -2145,10 +2148,10 @@ default-package-overrides: - xenstore ==0.1.1 - xhtml ==3000.2.1 - xlsior ==0.1.0.1 - - xlsx ==0.4.2 + - xlsx ==0.4.3 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - - xml-conduit ==1.4.0.3 + - xml-conduit ==1.4.0.4 - xml-conduit-parse ==0.3.1.0 - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 From 8bc0ece0f160d11b2e10d6e3403521d6542969a1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Feb 2017 21:34:47 +0100 Subject: [PATCH 270/273] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/fbb2c029b0e99e31122aeddc1ccf0e822a1d0ea2. --- .../haskell-modules/hackage-packages.nix | 1187 +++++------------ 1 file changed, 326 insertions(+), 861 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index fddb99eb130..6feed8f5c98 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1800,8 +1800,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Boolean"; - version = "0.2.3"; - sha256 = "f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3"; + version = "0.2.4"; + sha256 = "67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8"; libraryHaskellDepends = [ base ]; description = "Generalized booleans and numbers"; license = stdenv.lib.licenses.bsd3; @@ -2496,23 +2496,6 @@ self: { }) {}; "Chart" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.8.1"; - sha256 = "635241e4b6b8aa1ddeb244c94002edc21603617fadeaf50aa7f52e28493ba15e"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart_1_8_2" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2527,27 +2510,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.8.1"; - sha256 = "b21494feb055a55674b66d51f0522af9c06094ed86ba62db93fba54179c47c14"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-cairo_1_8_2" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2562,31 +2527,9 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, mtl, old-locale - , operational, svg-builder, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.8.1"; - sha256 = "1c2e12d7719e6798721a3957e6df6ea772dff0bd7d6900e5a1f5c009cd5635bb"; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens mtl old-locale operational svg-builder SVGFonts - text time - ]; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Chart-diagrams_1_8_2" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, mtl, old-locale @@ -2605,7 +2548,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -14071,10 +14013,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheck-safe"; - version = "0.1.0.1"; - sha256 = "874d16e6bcd6da551c3efcf8f91aeea97a935a7a2086f78dab6991806c68b867"; - revision = "3"; - editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6"; + version = "0.1.0.2"; + sha256 = "2b6e41260800d399487537d186b1f8f55efb0ad26502333a956ecace9350f8f8"; libraryHaskellDepends = [ base QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -16393,22 +16333,6 @@ self: { }) {}; "TCache" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , hashtables, mtl, old-time, RefSerialize, stm, text - }: - mkDerivation { - pname = "TCache"; - version = "0.12.0"; - sha256 = "fab4e5fb6751a06324994577d6d4e5feae106496d28326e2c8c63c593ed55955"; - libraryHaskellDepends = [ - base bytestring containers directory hashtables mtl old-time - RefSerialize stm text - ]; - description = "A Transactional cache with user-defined persistence"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "TCache_0_12_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory , hashtables, mtl, old-time, RefSerialize, stm, text }: @@ -16422,7 +16346,6 @@ self: { ]; description = "A Transactional cache with user-defined persistence"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "THEff" = callPackage @@ -20710,8 +20633,8 @@ self: { }: mkDerivation { pname = "affection"; - version = "0.0.0.1"; - sha256 = "4d66b2b478888db84d13cd3557cc938902a97958e87bb9ea70dce9cd60e41f51"; + version = "0.0.0.2"; + sha256 = "e8e0ba4af134cabf1af0b63e1d010e9d868f881074baf8096551dfdf5c68bf29"; libraryHaskellDepends = [ babl base clock containers gegl glib linear monad-loops mtl sdl2 text @@ -21250,8 +21173,8 @@ self: { ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { pname = "alea"; - version = "0.5.1.0"; - sha256 = "32188a6da518656e962379038e0aa05f08c1434380d4eacf0ab162815638f5bd"; + version = "0.5.2.0"; + sha256 = "093cf33b6f3127cbb49ccfc6ad11183a4ef48b302fdb5771190eb497f0f9cb4f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -21813,6 +21736,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alternative-extra" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "alternative-extra"; + version = "0.1.0.0"; + sha256 = "896aadd55ce70bbd339838596878eae9fabf469dc46d383e96036234e096ced0"; + libraryHaskellDepends = [ base ]; + description = "Extra utilities for alternatives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alternative-io" = callPackage ({ mkDerivation, base, lifted-base, monad-control, transformers , transformers-base @@ -26321,6 +26255,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "async-io-either" = callPackage + ({ mkDerivation, async, base, transformers }: + mkDerivation { + pname = "async-io-either"; + version = "0.1.0.2"; + sha256 = "71d7ed0974ac8aaaeba0a53268f13ad7277a24b224762b33837d0aab93d76601"; + libraryHaskellDepends = [ async base transformers ]; + homepage = "https://github.com/mankyKitty/async-io-either#readme"; + description = "Could be useful"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "async-manager" = callPackage ({ mkDerivation, async, base, stm, unordered-containers }: mkDerivation { @@ -29459,21 +29405,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.8"; - sha256 = "39fbf32e333466931c8de7dafa922de8a010ee57cd0a8fde8961da310d04057d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring ]; - homepage = "https://github.com/WillSewell/benchpress"; - description = "Micro-benchmarking with detailed statistics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "benchpress_0_2_2_9" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -29486,7 +29417,6 @@ self: { homepage = "https://github.com/WillSewell/benchpress"; description = "Micro-benchmarking with detailed statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bencode" = callPackage @@ -37219,23 +37149,6 @@ self: { }) {}; "case-insensitive" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.7"; - sha256 = "160d3898fd0d8b50bed820ff633e6292438f069adec5267c42b8bcf0f386cac8"; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "case-insensitive_1_2_0_8" = callPackage ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit , test-framework, test-framework-hunit, text }: @@ -37250,7 +37163,6 @@ self: { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "case-insensitive-match" = callPackage @@ -39927,6 +39839,22 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "classy-influxdb-simple" = callPackage + ({ mkDerivation, aeson, async-io-either, base, bytestring, lens + , mtl, text, wreq + }: + mkDerivation { + pname = "classy-influxdb-simple"; + version = "0.1.0.1"; + sha256 = "37655507a92d3bc9c019a5d25b746db95f948b57f5d58126bac4abba38d37383"; + libraryHaskellDepends = [ + aeson async-io-either base bytestring lens mtl text wreq + ]; + homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme"; + description = "Super simple InfluxDB package in Classy-MTL style"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "classy-parallel" = callPackage ({ mkDerivation, base, lifted-base, monad-control, parallel , resourcet, transformers @@ -42818,22 +42746,6 @@ self: { }) {}; "concurrent-output" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.7.8"; - sha256 = "8c9b0ab30ff9ea930039efcd9cc3d8541f0647c617afc17370de9de793ca9a6f"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "concurrent-output_1_7_9" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix }: @@ -42847,7 +42759,6 @@ self: { ]; description = "Ungarble output from several threads or commands"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-rpc" = callPackage @@ -53716,27 +53627,26 @@ self: { "distributed-process-async" = callPackage ({ mkDerivation, ansi-terminal, base, binary, containers , data-accessor, deepseq, distributed-process - , distributed-process-extras, distributed-process-tests, fingertree - , hashable, HUnit, mtl, network, network-transport - , network-transport-tcp, rematch, stm, test-framework - , test-framework-hunit, time, transformers, unordered-containers + , distributed-process-extras, distributed-process-systest + , exceptions, fingertree, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, rematch, stm + , test-framework, test-framework-hunit, time, transformers + , unordered-containers }: mkDerivation { pname = "distributed-process-async"; - version = "0.2.3"; - sha256 = "d3031457c36bb3c35496031c185354417b54ce253e1878f35072d04e8161ad95"; - revision = "1"; - editedCabalFile = "56ae624c478fa2a42dd48850189ffdd1540416e820a83bbe00c54569b76af288"; + version = "0.2.4"; + sha256 = "ebf1a907e2f857ff853eff2f9c096f8acf5db20938ccf0d51391164e986487ec"; libraryHaskellDepends = [ base binary containers data-accessor deepseq distributed-process - distributed-process-extras fingertree hashable mtl stm time - transformers unordered-containers + distributed-process-extras exceptions fingertree hashable mtl stm + time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary deepseq distributed-process - distributed-process-extras distributed-process-tests HUnit network - network-transport network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + distributed-process-extras distributed-process-systest exceptions + HUnit network network-transport network-transport-tcp rematch stm + test-framework test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; @@ -61195,24 +61105,6 @@ self: { }) {}; "fasta" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, foldl - , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring - , pipes-group, pipes-text, split, text - }: - mkDerivation { - pname = "fasta"; - version = "0.10.4.1"; - sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482"; - libraryHaskellDepends = [ - attoparsec base bytestring containers foldl lens parsec pipes - pipes-attoparsec pipes-bytestring pipes-group pipes-text split text - ]; - homepage = "https://github.com/GregorySchwartz/fasta"; - description = "A simple, mindless parser for fasta files"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "fasta_0_10_4_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, foldl , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring , pipes-group, pipes-text, split, text @@ -61228,7 +61120,6 @@ self: { homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastbayes" = callPackage @@ -68169,8 +68060,8 @@ self: { pname = "ghc-dump-tree"; version = "0.2.0.2"; sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3"; - revision = "2"; - editedCabalFile = "9a950ee81c799050c982191431e3df03a178288c03faa077f21bc5b136ee002e"; + revision = "3"; + editedCabalFile = "b6d735f4e90a0c006513f1efc963d7b45bae8a95e0bee736e7e1fb55553643b8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79054,24 +78945,6 @@ self: { }) {}; "hailgun" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; - version = "0.4.1.1"; - sha256 = "d584d2bfec3eb94088452bb0611a4f8aea255bba4b3bf861ff3aeb888b5d4d03"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, email-validate , exceptions, filepath, http-client, http-client-tls, http-types , tagsoup, text, time, transformers @@ -79087,7 +78960,6 @@ self: { ]; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -88770,22 +88642,6 @@ self: { }) {}; "histogram-fill" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, monad-primitive - , primitive, vector - }: - mkDerivation { - pname = "histogram-fill"; - version = "0.8.4.1"; - sha256 = "385919434a933b7ad4c7c262308186e4057d6e2e653fa98fa020f949d4c7557d"; - libraryHaskellDepends = [ - base deepseq ghc-prim monad-primitive primitive vector - ]; - homepage = "https://github.com/Shimuuar/histogram-fill/"; - description = "Library for histograms creation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "histogram-fill_0_8_5_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }: mkDerivation { pname = "histogram-fill"; @@ -88795,7 +88651,6 @@ self: { homepage = "https://github.com/Shimuuar/histogram-fill/"; description = "Library for histograms creation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "histogram-fill-binary" = callPackage @@ -93896,25 +93751,6 @@ self: { }) {}; "hsexif" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit - , iconv, text, time - }: - mkDerivation { - pname = "hsexif"; - version = "0.6.0.10"; - sha256 = "64cb8abfa31085475ae45fddfc2716cb40764714d47c0fc6146fec2b8ab65d33"; - libraryHaskellDepends = [ - base binary bytestring containers iconv text time - ]; - testHaskellDepends = [ - base binary bytestring containers hspec HUnit iconv text time - ]; - homepage = "https://github.com/emmanueltouzery/hsexif"; - description = "EXIF handling library in pure Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsexif_0_6_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit , iconv, text, time }: @@ -93931,7 +93767,6 @@ self: { homepage = "https://github.com/emmanueltouzery/hsexif"; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfacter" = callPackage @@ -96540,6 +96375,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_6" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , deepseq, directory, exceptions, filepath, ghc-prim, hspec + , http-types, mime-types, monad-control, network, network-uri + , random, streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.6"; + sha256 = "514271d83fff7169a493111105e77ea93d11b562effa840c47117a3db912216a"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie deepseq exceptions filepath + ghc-prim http-types mime-types network network-uri random + streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -102354,32 +102219,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, safe - , string-conversions, tagged, text, transformers - , unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.1.0.6"; - sha256 = "a3ebf5474aa99626287859c27669ffb2bcd0873204e1d9a6994f628742180bcd"; - libraryHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl - ]; - homepage = "https://github.com/minad/intro#readme"; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "intro_0_1_0_8" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers , deepseq, dlist, extra, hashable, lens, mtl, safe , string-conversions, tagged, text, transformers @@ -103454,17 +103293,6 @@ self: { }) {}; "iso3166-country-codes" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "iso3166-country-codes"; - version = "0.20140203.7"; - sha256 = "3a9d48b3ccb6d0df6df9e41e3a58bfb1afa2c0ae702a9e33caacf1d2f3ccd5b1"; - libraryHaskellDepends = [ base ]; - description = "A datatype for ISO 3166 country codes"; - license = "LGPL"; - }) {}; - - "iso3166-country-codes_0_20140203_8" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "iso3166-country-codes"; @@ -103473,7 +103301,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A datatype for ISO 3166 country codes"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iso639" = callPackage @@ -104800,28 +104627,6 @@ self: { }) {}; "jose-jwt" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, containers - , cryptonite, doctest, either, hspec, HUnit, memory, mtl - , QuickCheck, text, time, unordered-containers, vector - }: - mkDerivation { - pname = "jose-jwt"; - version = "0.7.4"; - sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd"; - libraryHaskellDepends = [ - aeson base bytestring cereal containers cryptonite either memory - mtl text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring cryptonite doctest either hspec HUnit memory - mtl QuickCheck text unordered-containers vector - ]; - homepage = "http://github.com/tekul/jose-jwt"; - description = "JSON Object Signing and Encryption Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "jose-jwt_0_7_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, cryptonite, doctest, either, hspec, HUnit, memory , mtl, QuickCheck, text, time, unordered-containers, vector @@ -104841,7 +104646,6 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -105905,8 +105709,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.14"; - sha256 = "cae9327fe9d2068d74f9e8ed80125cb78f0a0612b3eb8f361ff7b5871cc77eb5"; + version = "0.2.15"; + sha256 = "4ff1279e9f4d54c605a22792f411d4b84324337b454449a0cd4c7c009abb2269"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107127,8 +106931,8 @@ self: { ({ mkDerivation, base, udbus }: mkDerivation { pname = "keyring"; - version = "0.1.0.4"; - sha256 = "2ddbfe06b0cdbd888c5e2e420e698d746fd3f98ce9ba4f6cc3594f7db2f5f6c8"; + version = "0.1.0.5"; + sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8"; libraryHaskellDepends = [ base udbus ]; homepage = "https://github.com/lunaryorn/haskell-keyring"; description = "Keyring access"; @@ -107799,18 +107603,6 @@ self: { }) {}; "labels" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "labels"; - version = "0.3.0"; - sha256 = "2e7fa244c88e4de017440a617bc10c4899e3ade4422e435698923b24d84a1afb"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "https://github.com/chrisdone/labels#readme"; - description = "Anonymous records via named tuples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "labels_0_3_2" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "labels"; @@ -107820,7 +107612,6 @@ self: { homepage = "https://github.com/chrisdone/labels#readme"; description = "Anonymous records via named tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "laborantin-hs" = callPackage @@ -108175,8 +107966,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.1"; - sha256 = "6a8d27eb05dff3c3cf8950994e04239bc0fbc84d811cab6bd185a4f5fd0f6ffc"; + version = "5.1.0.1"; + sha256 = "24dc7cd5081c443933ce40a1c18c8f492dec436c67d71b7728f23acceca9bda4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108184,7 +107975,7 @@ self: { lambdabot-misc-plugins lambdabot-novelty-plugins lambdabot-reference-plugins lambdabot-social-plugins mtl ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [ abbradar ]; @@ -108201,8 +107992,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.1"; - sha256 = "f44e0f1264bb6158b79394a2ce7595d81028413cb97911c0a9e5ae19cecc4425"; + version = "5.1.0.1"; + sha256 = "ebb542e189ce551c79e3d89f9a0c2898e545abb8c6bf19655b0ec8052cd28970"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -108211,7 +108002,7 @@ self: { split syb template-haskell time transformers transformers-base unix utf8-string zlib ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; }) {}; @@ -108249,13 +108040,13 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.1"; - sha256 = "000e84f1f72af87180c67a8088b15d5e4f6078e1fb4e06f3ea0cc827baa835d5"; + version = "5.1.0.1"; + sha256 = "4e50f2430da752ac36e23cf87ce5b2db9e42cf2e76b48447d2fbc882cdeab1ab"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; }) {}; @@ -108269,8 +108060,8 @@ self: { }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.1"; - sha256 = "b3868b5099b399cc1d5d12a1407edf3ed12cde74d210a8c0362afd844ae5ce62"; + version = "5.1.0.1"; + sha256 = "7a424f1c3919c0e34378ce6187e88b456f264bdf3ddf3d2d6f800631cf2fe1ad"; libraryHaskellDepends = [ base bytestring containers filepath hstatsd lambdabot-core lifted-base mtl network network-uri parsec process random random-fu @@ -108278,7 +108069,7 @@ self: { template-haskell time transformers transformers-base unix utf8-string zlib ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; }) {}; @@ -108290,13 +108081,13 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.1"; - sha256 = "afbf25fad387f8e3232d1dfb2bcfbcb42f639f2cff6346459732f47d9b44cff9"; + version = "5.1.0.1"; + sha256 = "f11918f9fbd0b1c49e69864e7a3a6f4669c4791d5ed9103473c88928c2b557c7"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Novelty plugins for Lambdabot"; license = "GPL"; }) {}; @@ -108308,13 +108099,13 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.1"; - sha256 = "441a94ddd6dc686c1d0fe991ee898922eb06b4caafb97dfdd1852612a321129c"; + version = "5.1.0.1"; + sha256 = "9713547bd30e5a84ebc9f672aa09ea4f677277a4a42412bdf2ff06aae110a968"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; }) {}; @@ -108325,12 +108116,12 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.1"; - sha256 = "a8bbd6a1ac47f64fa9e6a71a2b69383570fd5af4e2a13b6e24f7397cb0802ef4"; + version = "5.1.0.1"; + sha256 = "82502bebb4f51ace089dbccd97e7e699a05d580d33199f743f039e2e96c786dc"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; }) {}; @@ -108339,10 +108130,10 @@ self: { ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.1"; - sha256 = "f3719ceb57523f2e4448431581070bb0bdd0b089a4f1956af10398e79232b0bc"; + version = "5.1.0.1"; + sha256 = "f92c7d46bca96da2f7dbc7dbc71f90bf911364aba8470a78447a75b25fbf1b87"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; - homepage = "http://haskell.org/haskellwiki/Lambdabot"; + homepage = "https://wiki.haskell.org/Lambdabot"; description = "Lambdabot trusted code"; license = "GPL"; }) {}; @@ -111919,25 +111710,6 @@ self: { }) {}; "lifted-base" = callPackage - ({ mkDerivation, base, HUnit, monad-control, test-framework - , test-framework-hunit, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "lifted-base"; - version = "0.2.3.8"; - sha256 = "1605df810bc941951522d0cd1b777ff1d62dac6628aabed165a49b848f25df9f"; - libraryHaskellDepends = [ base monad-control transformers-base ]; - testHaskellDepends = [ - base HUnit monad-control test-framework test-framework-hunit - transformers transformers-base transformers-compat - ]; - homepage = "https://github.com/basvandijk/lifted-base"; - description = "lifted IO operations from the base library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-base_0_2_3_10" = callPackage ({ mkDerivation, base, HUnit, monad-control, test-framework , test-framework-hunit, transformers, transformers-base , transformers-compat @@ -111954,7 +111726,6 @@ self: { homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-protolude" = callPackage @@ -114336,24 +114107,6 @@ self: { }) {}; "logging-effect" = callPackage - ({ mkDerivation, async, base, exceptions, free, monad-control, mtl - , semigroups, stm, stm-delay, text, time, transformers - , transformers-base, wl-pprint-text - }: - mkDerivation { - pname = "logging-effect"; - version = "1.1.2"; - sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c"; - libraryHaskellDepends = [ - async base exceptions free monad-control mtl semigroups stm - stm-delay text time transformers transformers-base wl-pprint-text - ]; - homepage = "https://github.com/ocharles/logging-effect"; - description = "A mtl-style monad transformer for general purpose & compositional logging"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logging-effect_1_1_3" = callPackage ({ mkDerivation, async, base, exceptions, free, monad-control, mtl , semigroups, stm, stm-delay, text, time, transformers , transformers-base, wl-pprint-text @@ -114369,7 +114122,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -114640,8 +114392,8 @@ self: { }: mkDerivation { pname = "lol-benches"; - version = "0.0.0.1"; - sha256 = "13c40b8c3d05c57e43bbc76546486abfff269f412d81104c8790bf1fb4a7ed91"; + version = "0.0.0.3"; + sha256 = "4ec18d88b5153220c89ec9f39bf9a0d2e6c1fdfff69f980cdabc42423ee092b5"; libraryHaskellDepends = [ ansi-terminal base containers criterion crypto-api deepseq DRBG lol MonadRandom split statistics transformers vector @@ -114673,6 +114425,56 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lol-cpp" = callPackage + ({ mkDerivation, arithmoi, base, bytestring, constraints + , containers, crypto-api, data-default, deepseq, lol, lol-tests + , monadcryptorandom, MonadRandom, mtl, numeric-prelude + , protocol-buffers, protocol-buffers-descriptor, random, reflection + , repa, singletons, tagged-transformer, template-haskell + , th-desugar, transformers, vector, vector-th-unbox + }: + mkDerivation { + pname = "lol-cpp"; + version = "0.0.0.1"; + sha256 = "86d374f5628c89a35d969c6e6cc59da9c2ca85758bf7375b25f7c0e2ddcf0b57"; + libraryHaskellDepends = [ + arithmoi base bytestring constraints containers crypto-api + data-default deepseq lol monadcryptorandom MonadRandom mtl + numeric-prelude protocol-buffers protocol-buffers-descriptor random + reflection repa singletons tagged-transformer template-haskell + th-desugar transformers vector vector-th-unbox + ]; + testHaskellDepends = [ base lol-tests ]; + homepage = "https://github.com/cpeikert/Lol"; + description = "A fast C++ backend for ."; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "lol-repa" = callPackage + ({ mkDerivation, arithmoi, base, bytestring, constraints + , containers, crypto-api, data-default, deepseq, lol, lol-tests + , monadcryptorandom, MonadRandom, mtl, numeric-prelude + , protocol-buffers, protocol-buffers-descriptor, random, reflection + , repa, singletons, tagged-transformer, template-haskell + , th-desugar, transformers, vector, vector-th-unbox + }: + mkDerivation { + pname = "lol-repa"; + version = "0.0.0.1"; + sha256 = "c175e5881ee98795a0e24adde1a7c1955102b5723048d540389f773fff239b98"; + libraryHaskellDepends = [ + arithmoi base bytestring constraints containers crypto-api + data-default deepseq lol monadcryptorandom MonadRandom mtl + numeric-prelude protocol-buffers protocol-buffers-descriptor random + reflection repa singletons tagged-transformer template-haskell + th-desugar transformers vector vector-th-unbox + ]; + testHaskellDepends = [ base lol-tests ]; + homepage = "https://github.com/cpeikert/Lol"; + description = "A repa backend for ."; + license = stdenv.lib.licenses.gpl2; + }) {}; + "lol-tests" = callPackage ({ mkDerivation, base, lol, MonadRandom, QuickCheck, test-framework , test-framework-quickcheck2 @@ -116275,19 +116077,6 @@ self: { }) {}; "makefile" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: - mkDerivation { - pname = "makefile"; - version = "0.1.0.5"; - sha256 = "e47e5f07b23071ea1a9881c034ce66f915d3c2a3cf646b4f7db2718725d80316"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; - homepage = "http://github.com/nmattia/mask"; - description = "Simple Makefile parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "makefile_0_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: mkDerivation { pname = "makefile"; @@ -116298,7 +116087,6 @@ self: { homepage = "http://github.com/nmattia/mask"; description = "Simple Makefile parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "managed" = callPackage @@ -117489,8 +117277,8 @@ self: { }: mkDerivation { pname = "matrix-market-attoparsec"; - version = "0.1.0.4"; - sha256 = "f26e637d3e10c0ef98dbb3307d2410eed5dca54affbd052162d1b1bc378b8e6d"; + version = "0.1.0.5"; + sha256 = "cb200336ba478707e4c0aefc7d4cb4ba4d38ec7a1d637e105184c26ff401565a"; libraryHaskellDepends = [ attoparsec base bytestring exceptions scientific ]; @@ -117499,7 +117287,7 @@ self: { ]; homepage = "https://github.com/ocramz/matrix-market-attoparsec"; description = "Parsing and serialization functions for the NIST Matrix Market format"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd2; }) {}; "matrix-market-pure" = callPackage @@ -120679,28 +120467,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.20.1"; - sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_20_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -120720,7 +120486,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -121725,28 +121490,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , hspec, HUnit, QuickCheck, semigroups, split, text, transformers - , unordered-containers, vector, vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.1.1"; - sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , hspec, HUnit, QuickCheck, semigroups, split, text, transformers , unordered-containers, vector, vector-algorithms @@ -121766,7 +121509,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -125751,21 +125493,6 @@ self: { }) {}; "network-carbon" = callPackage - ({ mkDerivation, base, bytestring, network, text, time, vector }: - mkDerivation { - pname = "network-carbon"; - version = "1.0.8"; - sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86"; - libraryHaskellDepends = [ - base bytestring network text time vector - ]; - homepage = "http://github.com/ocharles/network-carbon"; - description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "network-carbon_1_0_9" = callPackage ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; @@ -131054,39 +130781,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.10.4"; - sha256 = "1dcfffe0dc26d0a1b5ef5688a09c1bb81231702169196e6faed8ddef360d848f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath mtl pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_10_4_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -131117,7 +130811,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -131203,6 +130896,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pandoc-include-code" = callPackage + ({ mkDerivation, base, containers, filepath, pandoc-types + , pcre-heavy, process + }: + mkDerivation { + pname = "pandoc-include-code"; + version = "0.1.0"; + sha256 = "f6a14ba6e4d00a27aef573336d6da703a39d1788a5fe9a5d18f080c3486c935c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers filepath pandoc-types pcre-heavy process + ]; + homepage = "https://github.com/owickstrom/pandoc-include-code"; + description = "A Pandoc filter for including code from source files"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "pandoc-japanese-filters" = callPackage ({ mkDerivation, base, containers, data-default, effin, HaTeX , HaTeX-qq, hxt, pandoc, pandoc-types, shelly, system-fileio @@ -133823,23 +133534,6 @@ self: { }) {}; "persistable-record" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , template-haskell, th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.4.1.0"; - sha256 = "5bf42a49a7efa127b5f5308ed812c367d3fe1afe499f32e24d0ac0f846df7619"; - libraryHaskellDepends = [ - array base containers dlist names-th template-haskell - th-data-compat transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-record_0_4_1_1" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , quickcheck-simple, template-haskell, th-data-compat, transformers }: @@ -133855,7 +133549,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -135827,27 +135520,6 @@ self: { }) {}; "pipes-misc" = callPackage - ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl - , pipes, pipes-category, pipes-concurrency, semigroups, stm - , transformers - }: - mkDerivation { - pname = "pipes-misc"; - version = "0.2.3.0"; - sha256 = "15a45dcef5c4893c517632772991602b34dd128d59b9eb4fa9d37a6aa7d62d66"; - libraryHaskellDepends = [ - base clock Decimal lens mtl pipes pipes-category pipes-concurrency - semigroups stm transformers - ]; - testHaskellDepends = [ - base hspec lens mmorph pipes pipes-concurrency stm transformers - ]; - homepage = "https://github.com/louispan/pipes-misc#readme"; - description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-misc_0_2_5_0" = callPackage ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl , pipes, pipes-category, pipes-concurrency, semigroups, stm , transformers @@ -135866,7 +135538,6 @@ self: { homepage = "https://github.com/louispan/pipes-misc#readme"; description = "Miscellaneous utilities for pipes, required by glazier-tutorial"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-mongodb" = callPackage @@ -137962,33 +137633,6 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, conversion, conversion-bytestring, conversion-text - , foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rerebase, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time - , transformers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.9.2"; - sha256 = "ba9df352bbfc0ee3dff91ef1462f1a3d676e5bac3a45ff3af5d765b7365b1d47"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring foldl loch-th - placeholders scientific text time transformers uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - homepage = "https://github.com/nikita-volkov/postgresql-binary"; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-binary_0_9_3" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text , foldl, json-ast, loch-th, placeholders, postgresql-libpq @@ -138013,7 +137657,6 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-config" = callPackage @@ -138228,30 +137871,6 @@ self: { }) {}; "postgresql-simple-migration" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash - , directory, hspec, postgresql-simple, text, time - }: - mkDerivation { - pname = "postgresql-simple-migration"; - version = "0.1.8.0"; - sha256 = "69d24f8f9dce302206562edc76afa2653d977770d6b223583da9126f2f6635fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base64-bytestring bytestring cryptohash directory - postgresql-simple time - ]; - executableHaskellDepends = [ - base base64-bytestring bytestring cryptohash directory - postgresql-simple text time - ]; - testHaskellDepends = [ base bytestring hspec postgresql-simple ]; - homepage = "https://github.com/ameingast/postgresql-simple-migration"; - description = "PostgreSQL Schema Migrations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple-migration_0_1_9_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , directory, hspec, postgresql-simple, text, time }: @@ -138273,7 +137892,6 @@ self: { homepage = "https://github.com/ameingast/postgresql-simple-migration"; description = "PostgreSQL Schema Migrations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-opts" = callPackage @@ -140073,26 +139691,6 @@ self: { }) {}; "profiteur" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath - , ghc-prof, js-jquery, scientific, text, unordered-containers - , vector - }: - mkDerivation { - pname = "profiteur"; - version = "0.4.2.0"; - sha256 = "eb1936c5b9db53695530ba6302fe6950dd8dc275628112b05b7902996f414b91"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring containers filepath ghc-prof js-jquery - scientific text unordered-containers vector - ]; - homepage = "http://github.com/jaspervdj/profiteur"; - description = "Treemap visualiser for GHC prof files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profiteur_0_4_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath , ghc-prof, js-jquery, scientific, text, unordered-containers , vector @@ -140110,7 +139708,6 @@ self: { homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -141586,27 +141183,6 @@ self: { }) {}; "purescript-bridge" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, hspec, hspec-expectations-pretty-diff, lens - , mtl, text, transformers - }: - mkDerivation { - pname = "purescript-bridge"; - version = "0.10.0.0"; - sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving lens mtl text - transformers - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations-pretty-diff text - ]; - description = "Generate PureScript data types from Haskell data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "purescript-bridge_0_10_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers @@ -146343,39 +145919,21 @@ self: { "regex" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers - , directory, hashable, heredoc, http-conduit, regex-base - , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly - , smallcheck, tasty, tasty-hunit, tasty-smallcheck - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers + , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, template-haskell, text, time, time-locale-compat + , transformers, unordered-containers }: mkDerivation { pname = "regex"; - version = "0.1.0.0"; - sha256 = "21ed5c61fe5c97790a085657b6c022c48953fa8a5904d0d14c695ae3593f3448"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.1"; + sha256 = "43ee04802ef3a4d6884cd97c73a261277d89eaa80abc31f148bd0b8f9c6f4a31"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text time time-locale-compat transformers unordered-containers ]; - executableHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers - ]; - testHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers - ]; - homepage = "https://iconnect.github.io/regex"; + homepage = "http://regex.uk"; description = "Toolkit for regex-base"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -146516,6 +146074,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-examples" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , directory, hashable, heredoc, http-conduit, regex, regex-base + , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly + , smallcheck, tasty, tasty-hunit, tasty-smallcheck + , template-haskell, text, time, time-locale-compat, transformers + , unordered-containers + }: + mkDerivation { + pname = "regex-examples"; + version = "0.2.0.1"; + sha256 = "73b95d1ca92342fff14b2a5f634b8b1a703d22e6a32140a6f0faea2c68ca55a1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base base-compat bytestring containers directory hashable + heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa + regex-tdfa-text shelly smallcheck tasty tasty-hunit + tasty-smallcheck template-haskell text time time-locale-compat + transformers unordered-containers + ]; + testHaskellDepends = [ + array base base-compat bytestring containers directory hashable + heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa + regex-tdfa-text shelly smallcheck tasty tasty-hunit + tasty-smallcheck template-haskell text time time-locale-compat + transformers unordered-containers + ]; + homepage = "http://regex.uk"; + description = "Tutorial, tests and example programs for regex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-genex" = callPackage ({ mkDerivation, base, containers, logict, mtl, regex-tdfa, sbv , stream-monad, text @@ -147198,29 +146789,6 @@ self: { }) {}; "relational-query" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.8.3.4"; - sha256 = "5c31665bf5cae82c06090e2d9b539f8001434db2888ab891755584b74b9560c2"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-query_0_8_3_5" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words , template-haskell, text, th-reify-compat, time, time-locale-compat @@ -147241,7 +146809,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-query-HDBC" = callPackage @@ -147265,23 +146832,6 @@ self: { }) {}; "relational-record" = callPackage - ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.5.1"; - sha256 = "b62734918834dfecb41be5dd9c9c90d409498e307d26eed37c7df30298e4571b"; - libraryHaskellDepends = [ - base persistable-types-HDBC-pg relational-query - relational-query-HDBC - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-record_0_1_6_1" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC }: @@ -147296,7 +146846,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Meta package of Relational Record"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-record-examples" = callPackage @@ -150768,19 +150317,6 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "safe"; - version = "0.3.13"; - sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_14" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; @@ -150791,7 +150327,6 @@ self: { homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -154117,8 +153652,10 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.3.4"; - sha256 = "553d2d47c1c04cb67c08632d26d817a8b1969d10064dd66409dc9d559056468f"; + version = "0.1.3.5"; + sha256 = "4d39b93b18636db11004b7b03fc118da8417ff9abe4db32164c200da23a22391"; + revision = "1"; + editedCabalFile = "3bcba06004dd1f2cfe23b7321917dd53e08efff1c65e2c48898d773b91ce5a35"; libraryHaskellDepends = [ acid-state aeson aeson-extra base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -154838,25 +154375,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens - , servant, servant-foreign, text, wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.4.0.0"; - sha256 = "2421e8eb140d3848ba4713bc4fb0b8c0c804aef8ef361c0cba08d4df3f50c24b"; - libraryHaskellDepends = [ - base elm-export lens servant servant-foreign text wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-export hspec HUnit servant text - ]; - homepage = "http://github.com/mattjbray/servant-elm#readme"; - description = "Automatically derive Elm functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-elm_0_4_0_1" = callPackage ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens , servant, servant-foreign, text, wl-pprint-text }: @@ -154873,7 +154391,6 @@ self: { homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-examples" = callPackage @@ -155225,6 +154742,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-purescript_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text + }: + mkDerivation { + pname = "servant-purescript"; + version = "0.7.0.0"; + sha256 = "672cf63144b54f3f3de3662794a06270d806d5a7575d52156f3b487eb637d6f8"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath http-types lens + mainland-pretty purescript-bridge servant servant-foreign + servant-server servant-subscriber text + ]; + testHaskellDepends = [ + aeson base containers lens mainland-pretty purescript-bridge + servant servant-foreign servant-subscriber text + ]; + homepage = "https://github.com/eskimor/servant-purescript#readme"; + description = "Generate PureScript accessor functions for you servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pushbullet-client" = callPackage ({ mkDerivation, aeson, base, http-api-data, http-client , http-client-tls, microlens, microlens-th, scientific, servant @@ -158823,6 +158365,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "skylighting_0_3" = callPackage + ({ mkDerivation, aeson, base, binary, blaze-html, bytestring + , case-insensitive, containers, Diff, directory, filepath, HUnit + , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty + , tasty-golden, tasty-hunit, text, utf8-string + }: + mkDerivation { + pname = "skylighting"; + version = "0.3"; + sha256 = "ebfb2d5c8ce5769522826a2d5744064c578291d25d3671dcfe89a41f694ebf59"; + libraryHaskellDepends = [ + aeson base binary blaze-html bytestring case-insensitive containers + directory filepath hxt mtl regex-pcre-builtin safe text utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show random tasty tasty-golden tasty-hunit text + ]; + homepage = "https://github.com/jgm/skylighting"; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skype4hs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, lifted-base , monad-control, mtl, stm, text, time, transformers-base, word8 @@ -161827,28 +161393,6 @@ self: { }) {}; "sparse-linear-algebra" = callPackage - ({ mkDerivation, base, containers, criterion, hspec, mtl - , mwc-random, primitive, QuickCheck, vector - }: - mkDerivation { - pname = "sparse-linear-algebra"; - version = "0.2.2.0"; - sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers hspec mtl mwc-random primitive QuickCheck vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers criterion hspec mtl mwc-random primitive - ]; - homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "sparse-linear-algebra_0_2_9_4" = callPackage ({ mkDerivation, base, containers, criterion, exceptions, hspec , mtl, mwc-random, primitive, QuickCheck, transformers, vector , vector-algorithms, vector-space @@ -161868,7 +161412,6 @@ self: { homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computation in native Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -165894,8 +165437,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.2.0"; - sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559"; + version = "2.2.1"; + sha256 = "1c95d6a8479e1f87b5800252427f2f2b2ddc2a3b39e7f45b3bd097705b336c6d"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -165909,8 +165452,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.2.0"; - sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0"; + version = "2.2.1"; + sha256 = "aae0995a0c678fbe5c2f9f150f6a6183c0948500ca51a4a54b1257b88faed0bf"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -165924,8 +165467,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.2.0"; - sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a"; + version = "2.2.1"; + sha256 = "5de7f0f2167ee004a0cb67de2a99fb753022a142e5c12c8477e9c928b4976662"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -165946,8 +165489,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.2.0"; - sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913"; + version = "2.2.1"; + sha256 = "e170b605119c5da30efceefe446e6c3b31ed2c7b8c7edf6e643464a57a7ce3e9"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers @@ -169140,24 +168683,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays - }: - mkDerivation { - pname = "tasty"; - version = "0.11.1"; - sha256 = "ab9f83401ba8b99d05bc85e2447e32416da593684daae14647777db8bb5eabdc"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays - ]; - homepage = "http://documentup.com/feuerbach/tasty"; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty_0_11_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged , unbounded-delays @@ -169173,7 +168698,6 @@ self: { homepage = "http://documentup.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage @@ -169195,28 +168719,6 @@ self: { }) {}; "tasty-auto" = callPackage - ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec - , tasty-hunit, tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-auto"; - version = "0.1.0.1"; - sha256 = "ec858ac5f1890af16c7a98ae866231e15ee3f46c374245bd89a9168b52a7d109"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base directory filepath ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base directory filepath tasty tasty-hspec tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/minad/tasty-auto#readme"; - description = "Simple auto discovery for Tasty"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "tasty-auto_0_1_0_2" = callPackage ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec , tasty-hunit, tasty-quickcheck, tasty-smallcheck }: @@ -169893,33 +169395,6 @@ self: { }) {}; "telegram-api" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath - , hjpath, hspec, http-api-data, http-client, http-client-tls - , http-media, http-types, mime-types, mtl, optparse-applicative - , servant, servant-client, string-conversions, text, transformers - , utf8-string - }: - mkDerivation { - pname = "telegram-api"; - version = "0.6.0.0"; - sha256 = "8e930edd4291c66e73ca8fcd30b642b66141a17b1c534aac092642c93311f7f2"; - libraryHaskellDepends = [ - aeson base bytestring http-api-data http-client http-media - http-types mime-types mtl servant servant-client string-conversions - text transformers - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string - ]; - homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; - description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "telegram-api_0_6_0_2" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath , hjpath, hspec, http-api-data, http-client, http-client-tls , http-media, http-types, mime-types, mtl, optparse-applicative @@ -184268,22 +183743,6 @@ self: { }) {}; "wavefront" = callPackage - ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text - , transformers, vector - }: - mkDerivation { - pname = "wavefront"; - version = "0.7.0.2"; - sha256 = "3ec8338855efbdc430f3c7f5449c9e5308d7c854dea8a51ae192b983681eae26"; - libraryHaskellDepends = [ - attoparsec base dlist filepath mtl text transformers vector - ]; - homepage = "https://github.com/phaazon/wavefront"; - description = "Wavefront OBJ loader"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wavefront_0_7_0_3" = callPackage ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text , transformers, vector }: @@ -184297,7 +183756,6 @@ self: { homepage = "https://github.com/phaazon/wavefront"; description = "Wavefront OBJ loader"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wavefront-obj" = callPackage @@ -187612,8 +187070,8 @@ self: { }: mkDerivation { pname = "xlsx"; - version = "0.4.2"; - sha256 = "cc4fa6267c36824637f36f3e10c6a8ef301402a1ccd81be1ebb036ef6b0cc3c8"; + version = "0.4.3"; + sha256 = "1862f1a68be3d4d8619c60d858355aa9c1ad535b79845c359686ab5f1e0699a0"; libraryHaskellDepends = [ base base64-bytestring binary-search bytestring conduit containers data-default errors extra filepath lens mtl mtl-compat network-uri @@ -187714,30 +187172,6 @@ self: { }) {}; "xml-conduit" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, conduit, conduit-extra, containers - , data-default, deepseq, hspec, HUnit, monad-control, resourcet - , text, transformers, xml-types - }: - mkDerivation { - pname = "xml-conduit"; - version = "1.4.0.3"; - sha256 = "b924632258a68fc31d5c14e00393f9c38bdfad8fb753010b8a6b5b417d99bbdf"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - conduit conduit-extra containers data-default deepseq monad-control - resourcet text transformers xml-types - ]; - testHaskellDepends = [ - base blaze-markup bytestring conduit containers hspec HUnit - resourcet text transformers xml-types - ]; - homepage = "http://github.com/snoyberg/xml"; - description = "Pure-Haskell utilities for dealing with XML with the conduit package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xml-conduit_1_4_0_4" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -187759,7 +187193,6 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-decode" = callPackage @@ -189147,6 +188580,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_22" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, filepath, hspec + , HUnit, libyaml, mockery, resourcet, scientific, semigroups + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.22"; + sha256 = "76429aedad04cadacbdc20fdb7f4a763b8e5bf9f733d6c97f166edb24bd9b5a3"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath resourcet scientific semigroups template-haskell text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet temporary text transformers + unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-config" = callPackage ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty , tasty-quickcheck, text, unordered-containers, yaml From 183eeb3c0fdac8de3146aedaa6028b474f96db6f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 20 Feb 2017 16:06:17 +0100 Subject: [PATCH 271/273] simp_le: fix meta.homepage --- pkgs/tools/admin/simp_le/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 134afa72ad0..b3707a4f4da 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ]; meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner nckx ]; From ac8fabd0e08507e857600641ce4163c2c8cc0ff6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 20 Feb 2017 19:07:57 +0300 Subject: [PATCH 272/273] phpPackages: also default to 7.1 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bfb6d92a8e..0c8b4868fe7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5806,8 +5806,7 @@ with pkgs; pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; php = php71; - - phpPackages = php70Packages; + phpPackages = php71Packages; php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php56; From b634622be0a78fd62f2631ee63e1a73d965f3527 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Feb 2017 20:09:53 +0000 Subject: [PATCH 273/273] compcert: 2.7.1 -> 3.0.1 --- pkgs/development/compilers/compcert/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 9 ++++++++- pkgs/top-level/ocaml-packages.nix | 8 -------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 20d4a430ac4..8086a9f9749 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, fetchurl -, coq, ocaml, findlib, menhir +, coq, ocamlPackages , tools ? stdenv.cc }: -assert lib.versionAtLeast ocaml.version "4.02"; +assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02"; stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.7.1"; + version = "3.0.1"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4"; + sha256 = "0dgrj26dzdy4n3s9b5hwc6lm54vans1v4qx9hdp1q8w1qqcdriq9"; }; - buildInputs = [ coq ocaml findlib menhir ]; + buildInputs = [ coq ] + ++ (with ocamlPackages; [ ocaml findlib menhir ]); enableParallelBuilding = true; configurePhase = '' - substituteInPlace ./configure --replace pl2 pl3 substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $lib/share/doc/compcert mv doc/html $lib/share/doc/compcert/ mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - mv backend cfrontend common cparser driver flocq ia32 lib \ + mv backend cfrontend common cparser driver flocq x86 x86_32 lib \ $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c8b4868fe7..722b9b9d9d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4766,7 +4766,14 @@ with pkgs; cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - inherit (ocaml-ng.ocamlPackages_4_02) compcert; + compcert = callPackage ../development/compilers/compcert (( + if system == "x86_64-linux" + then { tools = pkgsi686Linux.stdenv.cc; } + else {} + ) // { + coq = coq_8_6; + }); + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bd902396ba1..b980e053020 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -671,14 +671,6 @@ let wyrd = callPackage ../tools/misc/wyrd { }; - compcert = callPackage ../development/compilers/compcert (( - if system == "x86_64-linux" - then { tools = pkgs.pkgsi686Linux.stdenv.cc; } - else {} - ) // { - coq = pkgs.coq_8_5; - }); - haxe = callPackage ../development/compilers/haxe { }; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };