From e4d8cb8dabb0b7ec7b5f785a5cebd34909df0603 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 27 Jul 2016 21:37:39 +0800 Subject: [PATCH 001/278] iio-sensor-proxy: init at 2.2 and nixos module This PR adds support for ```iio-sensor-proxy``` used by GNOME v3 and others for reading data from the accelerometer, gps, compass and similar sensors built into some relatively recent laptops. Additionally, there is a NixOS module exposed via hardware.sensor.iio for enabling services, udev rules and dbus services. --- nixos/modules/hardware/sensor/iio.nix | 30 ++++++++++++ nixos/modules/module-list.nix | 1 + .../linux/iio-sensor-proxy/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 80 insertions(+) create mode 100644 nixos/modules/hardware/sensor/iio.nix create mode 100644 pkgs/os-specific/linux/iio-sensor-proxy/default.nix diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix new file mode 100644 index 000000000000..a8bc18800021 --- /dev/null +++ b/nixos/modules/hardware/sensor/iio.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + + options = { + hardware.sensor.iio = { + enable = mkOption { + description = "Enable this option to support IIO sensors."; + type = types.bool; + default = false; + }; + }; + }; + + ###### implementation + + config = mkIf config.hardware.sensor.iio.enable { + + boot.initrd.availableKernelModules = [ "hid-sensor-hub" ]; + + environment.systemPackages = with pkgs; [ iio-sensor-proxy ]; + + services.dbus.packages = with pkgs; [ iio-sensor-proxy ]; + services.udev.packages = with pkgs; [ iio-sensor-proxy ]; + systemd.packages = with pkgs; [ iio-sensor-proxy ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ec985acae3b..ee43e538f6d5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -29,6 +29,7 @@ ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix + ./hardware/sensor/iio.nix ./hardware/ksm.nix ./hardware/network/b43.nix ./hardware/network/intel-2100bg.nix diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix new file mode 100644 index 000000000000..cdcae22a18e9 --- /dev/null +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake +, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }: + +stdenv.mkDerivation rec { + name = "iio-sensor-proxy-${version}"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "hadess"; + repo = "iio-sensor-proxy"; + rev = version; + sha256 = "1x0whwm2r9g50hq5px0bgsrigy8naihqgi6qm0x5q87jz5lkhrnv"; + }; + + configurePhase = '' + ./autogen.sh --prefix=$out \ + --with-udevrulesdir=$out/lib/udev/rules.d \ + --with-systemdsystemunitdir=$out/lib/systemd/system + ''; + + buildInputs = [ + glib + gtk3 + gtk_doc + libgudev + systemd + ]; + + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + gettext + intltool + libtool + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "Proxy for sending IIO sensor data to D-Bus"; + homepage = https://github.com/hadess/iio-sensor-proxy; + license = licenses.gpl3 ; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1224593a2abb..30cf7582ba61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -932,6 +932,8 @@ with pkgs; long-shebang = callPackage ../misc/long-shebang {}; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; + mathics = pythonPackages.mathics; meson = callPackage ../development/tools/build-managers/meson { }; From 0f40d2dea32211672824ea77865afaffde6cf080 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Wed, 11 Jan 2017 04:36:19 -0600 Subject: [PATCH 002/278] latex2html: init at 2016 --- pkgs/tools/misc/latex2html/default.nix | 52 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/misc/latex2html/default.nix diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix new file mode 100644 index 000000000000..596a72ee5ac1 --- /dev/null +++ b/pkgs/tools/misc/latex2html/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, makeWrapper +, ghostscript, netpbm, perl }: +# TODO: withTex + +# Ported from Homebrew. +# https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb + +stdenv.mkDerivation rec { + name = "latex2html-${version}"; + version = "2016"; + + src = fetchurl { + url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz"; + sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db"; + }; + + buildInputs = [ ghostscript netpbm perl ]; + + nativeBuildInputs = [ makeWrapper ]; + + configurePhase = '' + ./configure \ + --prefix="$out" \ + --without-mktexlsr \ + --with-texpath=$out/share/texmf/tex/latex/html + ''; + + postInstall = '' + for p in $out/bin/{latex2html,pstoimg}; do \ + wrapProgram $p --add-flags '--tmp="''${TMPDIR:-/tmp}"' + done + ''; + + meta = with stdenv.lib; { + description = "LaTeX-to-HTML translator"; + longDescription = '' + A Perl program that translates LaTeX into HTML (HyperText Markup + Language), optionally creating separate HTML files corresponding to each + unit (e.g., section) of the document. LaTeX2HTML proceeds by interpreting + LaTeX (to the best of its abilities). It contains definitions from a wide + variety of classes and packages, and users may add further definitions by + writing Perl scripts that provide information about class/package + commands. + ''; + + homepage = "https://www.ctan.org/pkg/latex2html"; + + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ yurrriq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c51a76f6c83d..7600887e71e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2646,6 +2646,8 @@ with pkgs; kindlegen = callPackage ../tools/typesetting/kindlegen { }; + latex2html = callPackage ../tools/misc/latex2html { }; + ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { From f40b96137844fe474f9c7d73272313a3848b4ee5 Mon Sep 17 00:00:00 2001 From: timor Date: Fri, 10 Feb 2017 12:50:28 +0100 Subject: [PATCH 003/278] couchdb: add support for version 2.0.0 Version 2.0.0 is installed as a separate package called "couchdb2". When setting the config option "package" attribute to pkgs.couchdb2, a corresponding service configuration will be generated. If a previous 1.6 installation exists, the databases can still be found on the local port (default: 5986) and can be replicated from there. Note that single-node or cluster setup still needs to be configured manually, as described in http://docs.couchdb.org/en/2.0.0/install/index.html. --- nixos/modules/services/databases/couchdb.nix | 30 ++++++++-- pkgs/servers/http/couchdb/2.0.0.nix | 53 +++++++++++++++++ pkgs/servers/http/couchdb/jsapi.patch | 60 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/http/couchdb/2.0.0.nix create mode 100644 pkgs/servers/http/couchdb/jsapi.patch diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index d4d231456c52..52247bfb983e 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -4,20 +4,29 @@ with lib; let cfg = config.services.couchdb; - configFile = pkgs.writeText "couchdb.ini" + useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0"; + configFile = pkgs.writeText "couchdb.ini" ( '' [couchdb] database_dir = ${cfg.databaseDir} uri_file = ${cfg.uriFile} view_index_dir = ${cfg.viewIndexDir} - + '' + (if useVersion2 then + '' + [chttpd] + '' else + '' [httpd] + '') + + '' port = ${toString cfg.port} bind_address = ${cfg.bindAddress} [log] file = ${cfg.logFile} - ''; + ''); + executable = if useVersion2 then "${cfg.package}/bin/couchdb" + else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}''; in { @@ -130,7 +139,6 @@ in { configFile = mkOption { type = types.string; - default = "/var/lib/couchdb/couchdb.ini"; description = '' Configuration file for persisting runtime changes. File needs to be readable and writable from couchdb user/group. @@ -147,6 +155,9 @@ in { environment.systemPackages = [ cfg.package ]; + services.couchdb.configFile = mkDefault + (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini"); + systemd.services.couchdb = { description = "CouchDB Server"; wantedBy = [ "multi-user.target" ]; @@ -170,11 +181,20 @@ in { fi ''; + environment = mkIf useVersion2 { + # we are actually specifying 4 configuration files: + # 1. the preinstalled default.ini + # 2. the module configuration + # 3. the extraConfig from the module options + # 4. the locally writable config file, which couchdb itself writes to + ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}''; + }; + serviceConfig = { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}"; + ExecStart = executable; }; }; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix new file mode 100644 index 000000000000..0481ebb9b8dc --- /dev/null +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey +, coreutils, bash, makeWrapper }: + +stdenv.mkDerivation rec { + name = "couchdb-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; + sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc"; + }; + + buildInputs = [ erlang icu openssl spidermonkey makeWrapper ]; + + patches = [ ./jsapi.patch ]; + postPatch = '' + substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE" + + patch bin/rebar < #!${coreutils}/bin/env escript + EOF + + ''; + + # Configure a username. The build system would use "couchdb" as + # default if none is provided. Note that it is unclear where this + # username is actually used in the build, as any choice seems to be + # working. + configurePhase = '' + ./configure -u nobody + ''; + + buildPhase = '' + make release + ''; + + installPhase = '' + mkdir -p $out + cp -r rel/couchdb/* $out + wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin + ''; + + meta = with stdenv.lib; { + description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + homepage = "http://couchdb.apache.org"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/pkgs/servers/http/couchdb/jsapi.patch new file mode 100644 index 000000000000..bb7d4ca610c7 --- /dev/null +++ b/pkgs/servers/http/couchdb/jsapi.patch @@ -0,0 +1,60 @@ +diff -ru couch_js/http.c couch_js-patched/http.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c 2017-02-10 10:52:33.025854045 +0100 +@@ -15,7 +15,7 @@ + #include + #include + #include +-#include ++#include + #include "config.h" + #include "utf8.h" + #include "util.h" +diff -ru couch_js/main.c couch_js-patched/main.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c 2017-02-10 10:52:33.001854154 +0100 +@@ -20,7 +20,7 @@ + #include + #endif + +-#include ++#include + #include "config.h" + #include "http.h" + #include "utf8.h" +diff -ru couch_js/utf8.c couch_js-patched/utf8.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c 2017-02-10 10:52:33.009854117 +0100 +@@ -10,7 +10,7 @@ + // License for the specific language governing permissions and limitations under + // the License. + +-#include ++#include + #include "config.h" + + static int +diff -ru couch_js/util.c couch_js-patched/util.c +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c 2017-02-10 10:52:33.017854081 +0100 +@@ -13,7 +13,7 @@ + #include + #include + +-#include ++#include + + #include "help.h" + #include "util.h" +diff -ru couch_js/util.h couch_js-patched/util.h +--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h 2016-09-12 11:28:51.000000000 +0200 ++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h 2017-02-10 10:52:32.988854212 +0100 +@@ -13,7 +13,7 @@ + #ifndef COUCHJS_UTIL_H + #define COUCHJS_UTIL_H + +-#include ++#include + + typedef struct { + int no_eval; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 079f3220015a..36f98de5a511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10287,6 +10287,10 @@ with pkgs; erlang = erlangR16; }; + couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { + spidermonkey = spidermonkey_1_8_5; + }; + couchpotato = callPackage ../servers/couchpotato {}; dico = callPackage ../servers/dico { }; From 82aa79d57fd558ff6ba295c65502cd315556d915 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Tue, 7 Mar 2017 20:42:38 +0100 Subject: [PATCH 004/278] haskell: ghcjs shims: dc034a0 -> b970152 --- pkgs/development/compilers/ghcjs/shims.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix index 0da50570bf59..fa706699449a 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "dc034a035aa73db2c5be34145732090bd74c1b57"; - sha256 = "18r8kf7g7d2n0rhwcgiz9gsgdmgln1nmwwyj347bpn4zh17qlkqa"; + rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca"; + sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz"; } From 9ea35eae7a5aee9159735ca662b65c8552aec8dc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 8 Mar 2017 00:29:20 +0100 Subject: [PATCH 005/278] nixos/users-groups: chown home on createHome Fixes #23619. --- nixos/modules/config/update-users-groups.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index cbbe216e5a17..4ca8a83554ad 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -177,7 +177,7 @@ foreach my $u (@{$spec->{users}}) { } # Create a home directory. - if ($u->{createHome} && ! -e $u->{home}) { + if ($u->{createHome}) { make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home}; chown $u->{uid}, $u->{gid}, $u->{home}; } From 07905c8f93b444acd231adf9559dc55b2dc6fc73 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Tue, 7 Mar 2017 20:45:22 +0100 Subject: [PATCH 006/278] haskell: ghcjs packages: fix ghcjs-dom-jsffi with newer Cabal --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index e4a4f74907a8..bea914354de0 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -126,7 +126,8 @@ self: super: }); ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { - libraryHaskellDepends = [ self.ghcjs-base self.text ]; + setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ]; + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; isLibrary = true; }); From 161d73c1639a3da02389137baa310883bd54221a Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Fri, 10 Mar 2017 07:12:16 +0000 Subject: [PATCH 007/278] ripgrep: install man-page Modify the `ripgrep` package to install the tool's manual page. I have tested this commit per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/tools/text/ripgrep/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 7ba43e38f382..786bcaa5334f 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -15,6 +15,11 @@ buildRustPackage rec { depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + preFixup = '' + mkdir -p "$out/man/man1" + cp "$src/doc/rg.1" "$out/man/man1" + ''; + meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = https://github.com/BurntSushi/ripgrep; From 330c7e4a5f409da8bb0bfaa48d8ef0ac352e6386 Mon Sep 17 00:00:00 2001 From: Wei-Ming Yang Date: Fri, 10 Mar 2017 18:39:16 +0800 Subject: [PATCH 008/278] fix the incorrect elasticsearch plugin name elasticsearch_analisys_lemmagen -> elasticsearch_analysis_lemmagen --- pkgs/servers/search/elasticsearch/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 32b065364a6a..9cce987e58f4 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -36,7 +36,7 @@ in { }; }; - elasticsearch_analisys_lemmagen = esPlugin rec { + elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; version = "0.1"; From 9041f0d8d964b0c348f72f10a6aef86155796b4f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 10 Mar 2017 12:51:02 +0100 Subject: [PATCH 009/278] pythonPackages.django-raster: 0.3 -> 0.3.1 --- .../python-modules/django-raster/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------- 2 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/django-raster/default.nix diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix new file mode 100644 index 000000000000..e673d587e3e3 --- /dev/null +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchurl, + numpy, django_colorful, pillow, psycopg2, + pyparsing, django, celery +}: +buildPythonPackage rec { + name = "django-raster-${version}"; + version = "0.3.1"; + + src = fetchurl { + url = "mirror://pypi/d/django-raster/${name}.tar.gz"; + sha256 = "1hsrkvybak1adn9d9qdw7hx3rcxsbzas4ixwll6vrjkrizgfihk3"; + }; + + # Tests require a postgresql + postgis server + doCheck = false; + + propagatedBuildInputs = [ numpy django_colorful pillow psycopg2 + pyparsing django celery ]; + + meta = with stdenv.lib; { + description = "Basic raster data integration for Django"; + homepage = https://github.com/geodesign/django-raster; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 069a10cdba52..ad5e74a51747 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10632,24 +10632,7 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - django_raster = buildPythonPackage rec { - name = "django-raster-${version}"; - version = "0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-raster/${name}.tar.gz"; - sha256 = "0vn11y07wag7yvjzrk7m99xs3cqyaaaklwcsik9zbvw0kwp2khni"; - }; - - propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2 - pyparsing django celery_3 ]; - - meta = { - description = "Basic raster data integration for Django"; - homepage = https://github.com/geodesign/django-raster; - license = licenses.mit; - }; - }; + django-raster = callPackage ../development/python-modules/django-raster { }; django_redis = buildPythonPackage rec { name = "django-redis-${version}"; From 1ca372e4d23934b857e6d8ca16ed8d5b253b7de8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 10 Mar 2017 12:52:18 +0100 Subject: [PATCH 010/278] pythonPackages.celery_3: drop --- pkgs/top-level/python-packages.nix | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad5e74a51747..912ce72dea7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3630,31 +3630,6 @@ in { }; }; - celery_3 = buildPythonPackage rec { - name = "celery-${version}"; - version = "3.1.23"; - - disabled = (pythonOlder "2.6") || isPy35; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/celery/${name}.tar.gz"; - sha256 = "0614ppp18vmiwdk0rxvz0wn62d7svanwdnx7jgqxpy9pb20rqd8s"; - }; - - buildInputs = with self; [ mock nose unittest2 ]; - propagatedBuildInputs = with self; [ kombu_3 billiard_33 pytz anyjson amqp_1 ]; - - checkPhase = '' - nosetests $out/${python.sitePackages}/celery/tests/ - ''; - - meta = { - homepage = https://github.com/celery/celery/; - description = "Distributed task queue"; - license = licenses.bsd3; - }; - }; - celery = buildPythonPackage rec { name = "celery-${version}"; version = "4.0.2"; From 49207a62f3f14aefeddd0daf311529a9495101db Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 11 Mar 2017 01:44:49 +0100 Subject: [PATCH 011/278] chromium: 56.0.2924.87 -> 57.0.2987.98 [Security] --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 32a3713682e7..20a7743439a0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3"; - sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk"; - version = "57.0.2987.21"; + sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n"; + sha256bin64 = "0dx9ivjc7avm0zgw0jcx5mmlzapwc2lp1sdjpwgd4y0iai1zr3yw"; + version = "57.0.2987.98"; }; dev = { - sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf"; - sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh"; - version = "58.0.3000.4"; + sha256 = "1i6qr1ypjww3q59lqg60xpns8xqxxrkd0yrpyx96alb1bp22x85p"; + sha256bin64 = "1ahp99p4hi8r2bvkdpnkakwkpmmnndjn299axc7cafz85zs6z9vl"; + version = "58.0.3029.14"; }; stable = { - sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s"; - sha256bin64 = "1s64smkpjmnlw7ym14v3g3lcpagsgavmnlq6wkgci80kyvwasd3w"; - version = "56.0.2924.87"; + sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n"; + sha256bin64 = "1qs8pmfasf3j84pjf4fnf6yb0pfa2hdgicskvfmr1sqy7c7yg348"; + version = "57.0.2987.98"; }; } From 26623240e93f8454ac69f66a3a025d98a7e94b71 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Sat, 4 Feb 2017 11:19:14 -0600 Subject: [PATCH 012/278] Init HaLVM at 2.4.0 --- pkgs/development/compilers/ghc/7.10.3.nix | 1 - pkgs/development/compilers/halvm/2.4.0.nix | 48 +++++++++++++++ .../configuration-halvm-2.4.0.nix | 59 +++++++++++++++++++ .../haskell-modules/generic-builder.nix | 20 +++---- .../haskell-modules/with-packages-wrapper.nix | 9 +-- pkgs/top-level/haskell-packages.nix | 9 +++ 6 files changed, 131 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/compilers/halvm/2.4.0.nix create mode 100644 pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index d75f5df370f8..5c6b62bee6f1 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -82,5 +82,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; - } diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix new file mode 100644 index 000000000000..c167f4bdd75a --- /dev/null +++ b/pkgs/development/compilers/halvm/2.4.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, binutils, autoconf, alex, happy, makeStaticLibraries +, hscolour, xen, automake, gcc, git, zlib, libtool, enableIntegerSimple ? false +}: + +stdenv.mkDerivation rec { + version = "2.4.0"; + name = "HaLVM-${version}"; + isHaLVM = true; + isGhcjs = false; + src = fetchgit { + rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925"; + url = "https://github.com/GaloisInc/HaLVM"; + sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167"; + }; + prePatch = '' + sed -i '312 d' Makefile + sed -i '316,446 d' Makefile # Removes RPM packaging + sed -i '20 d' src/scripts/halvm-cabal.in + sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in + ''; + configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ]; + propagatedNativeBuildInputs = [ alex happy ]; + buildInputs = + let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc + ]; in [ bootPkgs.ghc + automake perl git binutils + autoconf xen zlib ncurses.dev + libtool gmp ] ++ haskellPkgs; + preConfigure = '' + autoconf + patchShebangs . + ''; + hardeningDisable = ["all"]; + postInstall = "$out/bin/halvm-ghc-pkg recache"; + passthru = { + inherit bootPkgs; + cross.config = "halvm"; + cc = "${gcc}/bin/gcc"; + ld = "${binutils}/bin/ld"; + }; + + meta = { + homepage = "http://github.com/GaloisInc/HaLVM"; + description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen"; + maintainers = with stdenv.lib.maintainers; [ dmjio ]; + inherit (bootPkgs.ghc.meta) license platforms; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix new file mode 100644 index 000000000000..cd7857e23de9 --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix @@ -0,0 +1,59 @@ +{ pkgs }: + +with import ./lib.nix { inherit pkgs; }; + +self: super: { + + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + + # Disable GHC 8.0.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hoopl = null; + hpc = null; + integer-gmp = null; + pretty = null; + process = null; + rts = null; + template-haskell = null; + terminfo = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + + # cabal-install can use the native Cabal library. + cabal-install = super.cabal-install.override { Cabal = null; }; + + # jailbreak-cabal can use the native Cabal library. + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; + sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; + }); + + # https://github.com/christian-marie/xxhash/issues/3 + xxhash = doJailbreak super.xxhash; + + # https://github.com/Deewiant/glob/issues/8 + Glob = doJailbreak super.Glob; + + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 + vector-algorithms = dontCheck super.vector-algorithms; + +} diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index e47375e71c73..64924f7252e0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -66,7 +66,8 @@ let concatStringsSep enableFeature optionalAttrs toUpper; isGhcjs = ghc.isGhcjs or false; - packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version + isHaLVM = ghc.isHaLVM or false; + packageDbFlag = if isGhcjs || isHaLVM || versionOlder "7.6" ghc.version then "package-db" else "package-conf"; @@ -99,16 +100,15 @@ let "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg" "--with-gcc=${ghc.cc}" "--with-ld=${ghc.ld}" - "--hsc2hs-options=--cross-compile" "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" - ]; + ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]); crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" - "--with-gcc=$CC" # Clang won't work without that extra information. + "--with-gcc=$CC" # Clang won't work without that extra information. "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") @@ -133,8 +133,9 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") - (optionalString (isGhcjs || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") - (optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398 + (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") + # https://github.com/haskell/cabal/issues/2398 + (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") ]; isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env); @@ -319,11 +320,10 @@ stdenv.mkDerivation ({ export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}" export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_${ghcCommandCaps}_DOCDIR="${ghcEnv}/share/doc/ghc/html" - export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}" - ${shellHook} - ''; + '' + (if isHaLVM + then ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/HaLVM-${ghc.version}"'' + else ''export NIX_${ghcCommandCaps}_LIBDIR="${ghcEnv}/lib/${ghcCommand}-${ghc.version}"'') + "${shellHook}"; }; - }; meta = { inherit homepage license platforms; } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index e04cbe08c2c7..15d66bbd6dc0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -8,7 +8,7 @@ assert ghcLibdir != null -> (ghc.isGhcjs or false); # This wrapper works only with GHC 6.12 or later. -assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; +assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -33,13 +33,14 @@ assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; let isGhcjs = ghc.isGhcjs or false; - ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; + isHaLVM = ghc.isHaLVM or false; + ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; + ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; ghcCommand = "${crossPrefix}${ghcCommand'}"; ghcCommandCaps= lib.toUpper ghcCommand'; - libDir = "$out/lib/${ghcCommand}-${ghc.version}"; + libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b4226e656fde..bad483f02373 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -79,6 +79,10 @@ in rec { ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { bootPkgs = packages.ghc802; }; + ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec { + bootPkgs = packages.ghc802; + inherit (bootPkgs) hscolour alex happy; + }; jhc = callPackage ../development/compilers/jhc { inherit (packages.ghc763) ghcWithPackages; @@ -100,6 +104,7 @@ in rec { in pkgs.recurseIntoAttrs (integerSimpleGhcs // { ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; }; }); + }; packages = { @@ -167,6 +172,10 @@ in rec { ghc = compiler.ghcjsHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; + ghcHaLVM240 = callPackage ../development/haskell-modules { + ghc = compiler.ghcHaLVM240; + compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { }; + }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. From e50dba97d202ed3d3fc057380b0766dc73930b2e Mon Sep 17 00:00:00 2001 From: Ben Zhang Date: Fri, 10 Mar 2017 21:54:49 -0500 Subject: [PATCH 013/278] nodejs: 7.7.1 -> 7.7.2 --- pkgs/development/web/nodejs/v7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index b34d84ac851a..a93cd16e00e1 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.7.1"; + version = "7.7.2"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "04bn7c2hvhs6dqjz3khrlqyspljbxiw7y7g4fkjkn8k7lwmchpwn"; + sha256 = "117mqhvnvipyaq02knq75ikbk1swrw42b0kw6iijqb6k8j78si77"; }; }) From 2262855d9c50514d1aa33b1f443c7255c0d3d52e Mon Sep 17 00:00:00 2001 From: butterflya Date: Sat, 11 Mar 2017 15:03:48 +0100 Subject: [PATCH 014/278] Delete invalid option The removed configureFlags entry is not a documented option according to `configure --help`. --- pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix index 87a014f8f74e..c0ef7904668d 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" + configureFlags = [ "--disable-pst-import" "--disable-autoar" "--disable-libcryptui" ]; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; From 061ff21bbf5ca1df9f956756c923613e0e7301d5 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 15:07:45 +0100 Subject: [PATCH 015/278] kubernetes: use removeReferencesTo --- .../networking/cluster/kubernetes/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 952fd8fe9b6e..ecb2cd65a37c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , iptables, coreutils , components ? [ "cmd/kubeadm" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; }; - buildInputs = [ makeWrapper which go rsync go-bindata ]; + buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -59,12 +59,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # Remove references to go compiler - while read file; do - cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $out/bin $pause/bin -type f 2>/dev/null) + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { From 0c6a1eaa434ce6d0186ad1777de68c553cf6ccc6 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 15:07:56 +0100 Subject: [PATCH 016/278] containerd: use removeReferencesTo --- pkgs/applications/virtualization/containerd/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index c428c56b313b..c07670b5de65 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub, removeReferencesTo , go, libapparmor, apparmor-parser, libseccomp }: with lib; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8"; }; - buildInputs = [ go ]; + buildInputs = [ removeReferencesTo go ]; preBuild = '' ln -s $(pwd) vendor/src/github.com/docker/containerd @@ -26,10 +26,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out/bin -type f 2>/dev/null) + find $out -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { From c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 15:08:04 +0100 Subject: [PATCH 017/278] docker: use removeReferencesTo --- pkgs/applications/virtualization/docker/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 903ee98a0e1b..f2db629336c2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man -, go, containerd, runc, docker-proxy, tini +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +, go-md2man, go, containerd, runc, docker-proxy, tini , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { }); buildInputs = [ - makeWrapper pkgconfig go-md2man go + makeWrapper removeReferencesTo pkgconfig go-md2man go sqlite devicemapper btrfs-progs systemd ]; @@ -126,12 +126,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler, gcc and glibc - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out -type f 2>/dev/null) + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + ''; meta = { From d082a29c3a0eeb014b678c2797329389274fc4a2 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 15:08:09 +0100 Subject: [PATCH 018/278] runc: use removeReferencesTo --- pkgs/applications/virtualization/runc/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 7f19121b7f5b..3ce183d90e26 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man +{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: with lib; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { hardeningDisable = ["fortify"]; - buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; @@ -61,10 +61,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - # remove references to go compiler - while read file; do - sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file - done < <(find $out/bin -type f 2>/dev/null) + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { From 3051dafeb6b0e960b520103cf9bfc5673fe4744f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 18 Jun 2016 15:38:23 +0100 Subject: [PATCH 019/278] pythonPackages.pyudev: 0.16.1 -> 0.20.0 --- pkgs/top-level/python-packages.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c248e4c77840..ae004f669471 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21202,20 +21202,19 @@ in { pyudev = buildPythonPackage rec { name = "pyudev-${version}"; - version = "0.16.1"; + version = "0.20.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyudev/${name}.tar.gz"; - sha256 = "765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95"; + sha256 = "0al4cpg0m8n7cd06w94x3cx8mxaqg08bfv4r6a3pkgqxc74mpn0l"; }; postPatch = '' - sed -i -e '/udev_library_name/,/^ *libudev/ { - s|CDLL([^,]*|CDLL("${pkgs.systemd.lib}/lib/libudev.so.1"|p; d - }' pyudev/_libudev.py + substituteInPlace src/pyudev/_ctypeslib/libudev.py \ + --replace "find_library('udev')" "'${pkgs.systemd.lib}/lib/libudev.so'" ''; - propagatedBuildInputs = with self; [ pkgs.systemd ]; + propagatedBuildInputs = with self; [ pkgs.systemd six ]; meta = { homepage = "http://pyudev.readthedocs.org/"; From 4aaf27bb4d071c8751484ac0e07e4df7368ecc4b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 18 Jun 2016 17:26:45 +0100 Subject: [PATCH 020/278] pythonPackages.ds4drv: 0.5.0 -> 0.5.1 Also move expression --- pkgs/development/python-modules/ds4drv.nix | 27 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++-------------- 2 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/ds4drv.nix diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix new file mode 100644 index 000000000000..8698a65ea11b --- /dev/null +++ b/pkgs/development/python-modules/ds4drv.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, buildPythonPackage +, evdev, pyudev +, bluez +}: + +buildPythonPackage rec { + name = "ds4drv-${version}"; + version = "0.5.1"; + + # PyPi only carries py3 wheel + src = fetchFromGitHub { + owner = "chrippa"; + repo = "ds4drv"; + rev = "v${version}"; + sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v"; + }; + + propagatedBuildInputs = [ evdev pyudev ]; + + buildInputs = [ bluez ]; + + meta = { + description = "Userspace driver for the DualShock 4 controller"; + homepage = "https://github.com/chrippa/ds4drv"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae004f669471..4e6493d910c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6590,24 +6590,8 @@ in { }; }; - ds4drv = buildPythonPackage rec { - name = "ds4drv-${version}"; - version = "0.5.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/d/ds4drv/${name}.tar.gz"; - sha256 = "0dq2z1z09zxa6rn3v94vwqaaz29jwiydkss8hbjglixf20krmw3b"; - }; - - propagatedBuildInputs = with self; [ evdev pyudev ]; - - buildInputs = [ pkgs.bluez ]; - - meta = { - description = "Userspace driver for the DualShock 4 controller"; - homepage = "https://github.com/chrippa/ds4drv"; - license = licenses.mit; - }; - + ds4drv = callPackage ../development/python-modules/ds4drv.nix { + inherit (pkgs) fetchFromGitHub bluez; }; dyn = buildPythonPackage rec { From 61edb1cb2ec30bd437650a18a1a8a7556c813af0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 9 Mar 2017 13:40:56 +0100 Subject: [PATCH 021/278] pythonPackages.pyudev: 0.20.0 -> 0.21.0 Also move expression --- pkgs/development/python-modules/pyudev.nix | 26 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 ++------------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/pyudev.nix diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix new file mode 100644 index 000000000000..98607501e032 --- /dev/null +++ b/pkgs/development/python-modules/pyudev.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildPythonPackage +, six, systemd +}: + +buildPythonPackage rec { + name = "pyudev-${version}"; + version = "0.21.0"; + + src = fetchurl { + url = "mirror://pypi/p/pyudev/${name}.tar.gz"; + sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; + }; + + postPatch = '' + substituteInPlace src/pyudev/_ctypeslib/libudev.py \ + --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'" + ''; + + propagatedBuildInputs = [ systemd six ]; + + meta = { + homepage = "http://pyudev.readthedocs.org/"; + description = "Pure Python libudev binding"; + license = lib.licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e6493d910c7..11ebfad988c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21184,31 +21184,10 @@ in { buildInputs = with self; [ pyasn1 pycrypto ]; }; - pyudev = buildPythonPackage rec { - name = "pyudev-${version}"; - version = "0.20.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyudev/${name}.tar.gz"; - sha256 = "0al4cpg0m8n7cd06w94x3cx8mxaqg08bfv4r6a3pkgqxc74mpn0l"; - }; - - postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/libudev.py \ - --replace "find_library('udev')" "'${pkgs.systemd.lib}/lib/libudev.so'" - ''; - - propagatedBuildInputs = with self; [ pkgs.systemd six ]; - - meta = { - homepage = "http://pyudev.readthedocs.org/"; - description = "Pure Python libudev binding"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - }; + pyudev = callPackage ../development/python-modules/pyudev.nix { + inherit (pkgs) fetchurl systemd; }; - pynzb = buildPythonPackage (rec { name = "pynzb-0.1.0"; From 286917bfc983599d75d248a255e66234a4e8ddb9 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 08:28:07 -0600 Subject: [PATCH 022/278] aubio: 0.4.1 -> 0.4.4 (#23739) --- pkgs/development/libraries/aubio/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index a14de67d7f39..3ea86b36a306 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python2 +, libsndfile, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "aubio-0.4.3"; + name = "aubio-0.4.4"; src = fetchurl { url = "http://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n"; + sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a"; }; - buildInputs = [ - alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python2 - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile python3 ]; - configurePhase = "${python2.interpreter} waf configure --prefix=$out"; + configurePhase = "${python3.interpreter} waf configure --prefix=$out"; - buildPhase = "${python2.interpreter} waf"; + buildPhase = "${python3.interpreter} waf"; - installPhase = "${python2.interpreter} waf install"; + installPhase = "${python3.interpreter} waf install"; meta = with stdenv.lib; { description = "Library for audio labelling"; From 42c2bac8c06a2d062134087de9807b40e1e4da15 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 11 Mar 2017 15:39:05 +0100 Subject: [PATCH 023/278] neomutt: 20170128 -> 20170306 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 18ea017cb8c8..e61386a6819f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: stdenv.mkDerivation rec { - version = "20170128"; + version = "20170306"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20"; + sha256 = "0nlazabwj4czi30m84ppga275hkr51glyndizqzg540q9wp1acz4"; }; nativeBuildInputs = [ which autoconf automake ]; From 55e477c1f15405bd53bdac2cc61fa8f62defe4ee Mon Sep 17 00:00:00 2001 From: butterflya Date: Sat, 11 Mar 2017 17:42:20 +0100 Subject: [PATCH 024/278] Remove Python 2 specific syntax --- maintainers/scripts/hydra-eval-failures.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index b339f296056c..6122dabb1e85 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -74,13 +74,13 @@ def cli(jobset): # TODO: dependency failed without propagated builds for tr in d('img[alt="Failed"]').parents('tr'): a = pq(tr)('a')[1] - print "- [ ] [{}]({})".format(a.text, a.get('href')) + print("- [ ] [{}]({})".format(a.text, a.get('href'))) sys.stdout.flush() maintainers = get_maintainers(a.text) if maintainers: - print " - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))) + print(" - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))) # TODO: print last three persons that touched this file # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked? From 10a0f1c2afcaa593d2cc491cee8a7bc889903874 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 13:49:23 +0100 Subject: [PATCH 025/278] pythonPackages.trezor: 0.7.4 -> 0.7.12 --- pkgs/development/python-modules/trezor.nix | 26 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 24 +------------------- 2 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/trezor.nix diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor.nix new file mode 100644 index 000000000000..36bf0c15de25 --- /dev/null +++ b/pkgs/development/python-modules/trezor.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }: + +buildPythonPackage rec { + pname = "trezor"; + version = "0.7.12"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "0ryqdk13x60qq5s68i9dfc1na4dka66kdxqycxignzg9k9ykaa8g"; + }; + + propagatedBuildInputs = [ protobuf3_0 hidapi ]; + + buildInputs = [ ecdsa mnemonic ]; + + # There are no actual tests: "ImportError: No module named tests" + doCheck = false; + + meta = { + description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; + homepage = https://github.com/trezor/python-trezor; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ np ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11ebfad988c2..13a749182e35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30799,29 +30799,7 @@ EOF }; }; - trezor = buildPythonPackage rec{ - version = "0.7.4"; - name = "trezor-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/trezor/${name}.tar.gz"; - sha256 = "18nr76jkdg24sb3r8cfbiq12b95gnh0amc0r1wx9mmg3pwq6jx6y"; - }; - - propagatedBuildInputs = with self; [ protobuf3_0 hidapi ]; - - buildInputs = with self; [ ecdsa mnemonic ]; - - # There are no actual tests: "ImportError: No module named tests" - doCheck = false; - - meta = { - description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; - homepage = https://github.com/trezor/python-trezor; - license = licenses.gpl3; - maintainers = with maintainers; [ np ]; - }; - }; + trezor = callPackage ../development/python-modules/trezor.nix { }; keepkey = buildPythonPackage rec{ version = "0.7.3"; From 9cc2083daca4e712f2e759afccd855894b8d1b53 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 13:52:18 +0100 Subject: [PATCH 026/278] pythonPackages.mnemonic: 0.12 -> 0.17 --- pkgs/development/python-modules/mnemonic.nix | 21 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +----------------- 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/mnemonic.nix diff --git a/pkgs/development/python-modules/mnemonic.nix b/pkgs/development/python-modules/mnemonic.nix new file mode 100644 index 000000000000..9f71fdb8e741 --- /dev/null +++ b/pkgs/development/python-modules/mnemonic.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildPythonPackage, pbkdf2 }: + +buildPythonPackage rec { + pname = "mnemonic"; + version = "0.17"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/m/${pname}/${name}.tar.gz"; + sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn"; + }; + + propagatedBuildInputs = [ pbkdf2 ]; + + meta = { + description = "Implementation of Bitcoin BIP-0039"; + homepage = https://github.com/trezor/python-mnemonic; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ np ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13a749182e35..e430099dace3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30780,24 +30780,7 @@ EOF }; }; - mnemonic = buildPythonPackage rec{ - version = "0.12"; - name = "mnemonic-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/m/mnemonic/${name}.tar.gz"; - sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4"; - }; - - propagatedBuildInputs = with self; [ pbkdf2 ]; - - meta = { - description = "Implementation of Bitcoin BIP-0039"; - homepage = https://github.com/trezor/python-mnemonic; - license = licenses.mit; - maintainers = with maintainers; [ np ]; - }; - }; + mnemonic = callPackage ../development/python-modules/mnemonic.nix { }; trezor = callPackage ../development/python-modules/trezor.nix { }; From 617d8af325bc427178f9022b57478eac9d726d52 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 14:00:41 +0100 Subject: [PATCH 027/278] pythonPackages.pyaes: init at 1.6.0 --- pkgs/development/python-modules/pyaes.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/pyaes.nix diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes.nix new file mode 100644 index 000000000000..c2feb2e239c7 --- /dev/null +++ b/pkgs/development/python-modules/pyaes.nix @@ -0,0 +1,18 @@ +{ lib, fetchPypi, buildPythonPackage }: + +buildPythonPackage rec { + pname = "pyaes"; + version = "1.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw"; + }; + + meta = { + description = "Pure-Python AES"; + license = lib.licenses.mit; + homepage = https://github.com/ricmoo/pyaes; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e430099dace3..9260b8e73faa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -289,6 +289,8 @@ in { plantuml = callPackage ../tools/misc/plantuml { }; + pyaes = callPackage ../development/python-modules/pyaes.nix { }; + pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}"; pycairo = callPackage ../development/python-modules/pycairo { }; From d575efc5f05080834019ce0abebde4f47b1657cf Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 11 Mar 2017 14:00:59 +0100 Subject: [PATCH 028/278] electrum: 2.7.18 -> 2.8.1 See https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES Also - patch .desktop file to include full path to electrum - add dep on pysocks - remove dep on pyasn; per the changelog, it has not been used since v2.1 - replace dep on slowaes with pyaes --- pkgs/applications/misc/electrum/default.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 28b5f02e813a..0fde5c8644eb 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.7.18"; + version = "2.8.1"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1l9krc7hqhqrm5bwp999bpykkcq4958qwvx8v0l5mxcxw8k7fkab"; + sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g"; }; propagatedBuildInputs = with python2Packages; [ @@ -15,22 +15,22 @@ python2Packages.buildPythonApplication rec { jsonrpclib pbkdf2 protobuf3_0 - pyasn1 - pyasn1-modules + pyaes pycrypto pyqt4 + pysocks qrcode requests - slowaes tlslite # plugins - trezor keepkey + trezor + # TODO plugins - # matplotlib - # btchip # amodem + # btchip + # matplotlib ]; preBuild = '' @@ -43,8 +43,11 @@ python2Packages.buildPythonApplication rec { postInstall = '' # Despite setting usr_share above, these files are installed under # $out/nix ... - mv $out/lib/python2.7/site-packages/nix/store/*/share $out + mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out rm -rf $out/lib/python2.7/site-packages/nix + + substituteInPlace $out/share/applications/electrum.desktop \ + --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" ''; doInstallCheck = true; From bd4285a4cb36c364487c506a23db0f5fd06819bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 11 Mar 2017 19:41:18 +0100 Subject: [PATCH 029/278] Remove Dockerfile One can generate a new layer with nix-channel --update from https://hub.docker.com/r/nixos/nix/ This file wasn't maintained. --- maintainers/docker/.dockerignore | 14 -------------- maintainers/docker/Dockerfile | 12 ------------ 2 files changed, 26 deletions(-) delete mode 100644 maintainers/docker/.dockerignore delete mode 100644 maintainers/docker/Dockerfile diff --git a/maintainers/docker/.dockerignore b/maintainers/docker/.dockerignore deleted file mode 100644 index eb4668233e6a..000000000000 --- a/maintainers/docker/.dockerignore +++ /dev/null @@ -1,14 +0,0 @@ -*~ -,* -.*.swp -.*.swo -result -result-* -/doc/NEWS.html -/doc/NEWS.txt -/doc/manual.html -/doc/manual.pdf -.version-suffix - -.DS_Store -.git diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile deleted file mode 100644 index f02a9d653fd5..000000000000 --- a/maintainers/docker/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM busybox - -RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \ - wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ - mkdir -m 0755 /nix && USER=root sh $dir/*/install && \ - echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile - -ADD . /root/nix/nixpkgs -ONBUILD ENV NIX_PATH nixpkgs=/root/nix/nixpkgs:nixos=/root/nix/nixpkgs/nixos -ONBUILD ENV PATH /root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin -ONBUILD ENV ENV /etc/profile -ENV ENV /etc/profile From 2a9208cd2421674f04df6c283b4356dfbffb2b1a Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sat, 11 Mar 2017 10:29:44 -0500 Subject: [PATCH 030/278] krfb: init at 16.12.2 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/krfb.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/krfb.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fff0df35d052..79536662a6b1 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -76,6 +76,7 @@ let kmix = callPackage ./kmix.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; + krfb = callPackage ./krfb.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libkdcraw = callPackage ./libkdcraw.nix {}; libkexiv2 = callPackage ./libkexiv2.nix {}; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix new file mode 100644 index 000000000000..ef5530be6fa6 --- /dev/null +++ b/pkgs/applications/kde/krfb.nix @@ -0,0 +1,22 @@ +{ + kdeApp, lib, kdeWrapper, + extra-cmake-modules, kdoctools, + kdelibs4support, kdnssd, libvncserver, libXtst +}: + +let + unwrapped = + kdeApp { + name = "krfb"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = with lib.maintainers; [ jerith666 ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ]; + }; +in +kdeWrapper { + inherit unwrapped; + targets = [ "bin/krfb" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170fa60c27b2..54937c3287a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14101,7 +14101,7 @@ with pkgs; inherit (kdeApplications) akonadi ark dolphin ffmpegthumbs filelight gwenview kate - kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole marble + kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole krfb marble okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; From 7c980f5e9c2c9c6bc58a5bdbe4009458a38d9e84 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 2 Mar 2017 15:19:45 +0100 Subject: [PATCH 031/278] valgrind: enable darwin build --- .../tools/analysis/valgrind/default.nix | 27 ++++++++++++-- .../analysis/valgrind/valgrind-bzero.patch | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++- 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 2ecb5eaa1329..80e3fdfc8072 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, perl, gdb }: +{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }: stdenv.mkDerivation rec { name = "valgrind-3.12.0"; @@ -14,11 +14,13 @@ stdenv.mkDerivation rec { # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. - buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb; + buildInputs = [ perl gdb ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ]; enableParallelBuilding = true; - postPatch = + patches = stdenv.lib.optionals (stdenv.isDarwin) [ ./valgrind-bzero.patch ]; + + postPatch = stdenv.lib.optionalString (stdenv.isDarwin) # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666). '' echo "getting rid of the \`-arch' GCC option..." @@ -27,6 +29,23 @@ stdenv.mkDerivation rec { sed -i coregrind/link_tool_exe_darwin.in \ -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g' + + echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach" + substituteInPlace coregrind/Makefile.in \ + --replace /usr/include/mach ${xnu}/include/mach + + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + find -name "Makefile.in" | while read file; do + substituteInPlace "$file" \ + --replace dsymutil ${llvm}/bin/llvm-dsymutil + done + + substituteInPlace coregrind/m_debuginfo/readmacho.c \ + --replace /usr/bin/dsymutil ${llvm}/bin/llvm-dsymutil + + echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld" + substituteInPlace coregrind/link_tool_exe_darwin.in \ + --replace /usr/bin/ld ${cctools}/bin/ld ''; configureFlags = @@ -58,6 +77,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch b/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch new file mode 100644 index 000000000000..f56a277ad717 --- /dev/null +++ b/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch @@ -0,0 +1,37 @@ +Index: coregrind/m_main.c +=================================================================== +--- a/coregrind/m_main.c (revision 16102) ++++ b/coregrind/m_main.c (revision 16103) +@@ -3489,6 +3489,10 @@ + // skip check + return VG_(memset)(s,c,n); + } ++void __bzero(void* s, UWord n); ++void __bzero(void* s, UWord n) { ++ (void)VG_(memset)(s,0,n); ++} + void bzero(void *s, SizeT n); + void bzero(void *s, SizeT n) { + VG_(memset)(s,0,n); +@@ -4058,20 +4062,7 @@ + + #endif + +-#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10 + +-/* This might also be needed for > DARWIN_10_10, but I have no way +- to test for that. Hence '==' rather than '>=' in the version +- test above. */ +-void __bzero ( void* s, UWord n ); +-void __bzero ( void* s, UWord n ) +-{ +- (void) VG_(memset)( s, 0, n ); +-} +- +-#endif +- +- + /*--------------------------------------------------------------------*/ + /*--- end ---*/ + /*--------------------------------------------------------------------*/ + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d98ce26aff46..dc3924c5829e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6862,7 +6862,10 @@ with pkgs; gdb-multitarget = lowPrio (gdb.override { multitarget = true; }); - valgrind = callPackage ../development/tools/analysis/valgrind { }; + valgrind = callPackage ../development/tools/analysis/valgrind { + inherit (darwin) xnu bootstrap_cmds cctools; + llvm = llvm_39; + }; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; From f474f82860d7ce780ccef9d1e91b0174f5c5d7e5 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 11 Mar 2017 16:23:00 -0500 Subject: [PATCH 032/278] ykpers: consolidate into yubikey-personalization Looks like this accidentally got packaged twice. --- nixos/modules/system/boot/luksroot.nix | 4 ++-- pkgs/applications/misc/pwsafe/default.nix | 6 ++--- pkgs/applications/misc/ykpers/default.nix | 24 ------------------- .../misc/yubikey-personalization/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 pkgs/applications/misc/ykpers/default.nix diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 1f412fe2d8f2..8978b73749b7 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -434,8 +434,8 @@ in chmod +x $out/bin/cryptsetup-askpass ${optionalString luks.yubikeySupport '' - copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp - copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp + copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index f65435ba7b23..0ea530b6bf1c 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst -, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers +, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization }: stdenv.mkDerivation rec { @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }; makefile = "Makefile.linux"; - makeFlags = "YBPERS_LIBPATH=${ykpers}/lib"; + makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib"; buildFlags = "unicoderelease"; buildInputs = [ wxGTK libuuid gettext perl zip xercesc libXt libXtst libXi xextproto - pkgconfig libyubikey ykpers ]; + pkgconfig libyubikey yubikey-personalization ]; postPatch = '' # Fix perl scripts used during the build. diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix deleted file mode 100644 index 0fa9b5f66b26..000000000000 --- a/pkgs/applications/misc/ykpers/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}: - -stdenv.mkDerivation rec -{ - version = "1.17.2"; - name = "ykpers-${version}"; - - src = fetchurl - { - url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz"; - sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh"; - }; - - buildInputs = [pkgconfig libusb1 libyubikey]; - - meta = - { - homepage = "http://opensource.yubico.com/yubikey-personalization/"; - description = "YubiKey Personalization cross-platform library and tool"; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.calrama ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 71c9a113298f..36dd8339f26e 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington calrama ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3924c5829e..b846409edfef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16181,8 +16181,6 @@ with pkgs; inherit (gnome3) yelp; - ykpers = callPackage ../applications/misc/ykpers {}; - yoshimi = callPackage ../applications/audio/yoshimi { }; inherit (python3Packages) you-get; From 8cc10357ce3cef5e7dc18bb53cc4f02a16bb131e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 11 Mar 2017 21:56:44 +0000 Subject: [PATCH 033/278] kcachegrind: init at 16.2.2 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kcachegrind.nix | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/kde/kcachegrind.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index fff0df35d052..46aa6473f0c8 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -62,6 +62,7 @@ let kate = callPackage ./kate.nix {}; kdenlive = callPackage ./kdenlive.nix {}; kcalc = callPackage ./kcalc.nix {}; + kcachegrind = callPackage ./kcachegrind.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; kcontacts = callPackage ./kcontacts.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix new file mode 100644 index 000000000000..2f270d24224f --- /dev/null +++ b/pkgs/applications/kde/kcachegrind.nix @@ -0,0 +1,27 @@ +{ + kdeApp, lib, kdeWrapper, + cmake, automoc4, + kdelibs, perl, python, php +}: + +kdeWrapper { + unwrapped = kdeApp { + name = "kcachegrind"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ orivej ]; + }; + nativeBuildInputs = [ cmake automoc4 ]; + buildInputs = [ kdelibs perl python php ]; + enableParallelBuilding = true; + }; + + targets = [ + "bin/kcachegrind" + "bin/dprof2calltree" # perl + "bin/hotshot2calltree" # python + "bin/memprof2calltree" # perl + "bin/op2calltree" # perl + "bin/pprof2calltree" # php + ]; +} From d9123a2329f0d35af45d25aab5adb4348b8e3d56 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 11 Mar 2017 17:39:40 -0500 Subject: [PATCH 034/278] lib: fix mixed tab/space indents, trailing whitespace, etc Nix style seems to have settled on not using spaces between bound variable names and the lambda : so I also tried to make those somewhat more consistent throughout. --- lib/composable-derivation.nix | 6 +- lib/debug.nix | 14 +-- lib/deprecated.nix | 179 +++++++++++++++++----------------- lib/modules.nix | 8 +- lib/tests.nix | 8 +- lib/types.nix | 2 +- 6 files changed, 110 insertions(+), 107 deletions(-) diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix index e3e017d982d3..5442dcedeabc 100644 --- a/lib/composable-derivation.nix +++ b/lib/composable-derivation.nix @@ -1,4 +1,4 @@ -{lib, pkgs} : +{lib, pkgs}: let inherit (lib) nv nvs; in { @@ -19,7 +19,7 @@ let inherit (lib) nv nvs; in # * vim_configurable # # A minimal example illustrating most features would look like this: - # let base = composableDerivation { (fixed : let inherit (fixed.fixed) name in { + # let base = composableDerivation { (fixed: let inherit (fixed.fixed) name in { # src = fetchurl { # } # buildInputs = [A]; @@ -79,7 +79,7 @@ let inherit (lib) nv nvs; in # consider adding addtional elements by derivation.merge { removeAttrs = ["elem"]; }; removeAttrs ? ["cfg" "flags"] - }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) + }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) { inherit applyPreTidy removeAttrs; }).merge; diff --git a/lib/debug.nix b/lib/debug.nix index e2e895ab6202..5b3878554c5d 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -24,10 +24,10 @@ rec { traceValSeq = v: traceVal (builtins.deepSeq v v); # this can help debug your code as well - designed to not produce thousands of lines - traceShowVal = x : trace (showVal x) x; + traceShowVal = x: trace (showVal x) x; traceShowValMarked = str: x: trace (str + showVal x) x; - attrNamesToStr = a : lib.concatStringsSep "; " (map (x : "${x}=") (attrNames a)); - showVal = x : + attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)); + showVal = x: if isAttrs x then if x ? outPath then "x is a derivation, name ${if x ? name then x.name else ""}, { ${attrNamesToStr x} }" else "x is attr set { ${attrNamesToStr x} }" @@ -43,9 +43,9 @@ rec { # trace the arguments passed to function and its result # maybe rewrite these functions in a traceCallXml like style. Then one function is enough - traceCall = n : f : a : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); - traceCall2 = n : f : a : b : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); - traceCall3 = n : f : a : b : c : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); + traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); + traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); + traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); # FIXME: rename this? traceValIfNot = c: x: @@ -71,7 +71,7 @@ rec { # create a test assuming that list elements are true # usage: { testX = allTrue [ true ]; } - testAllTrue = expr : { inherit expr; expected = map (x: true) expr; }; + testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; strict = v: trace "Warning: strict is deprecated and will be removed in the next release" diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 3729197f48bc..45a3893fc22d 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -16,23 +16,23 @@ rec { defaultMergeArg = x : y: if builtins.isAttrs y then y - else + else (y x); defaultMerge = x: y: x // (defaultMergeArg x y); - foldArgs = merger: f: init: x: - let arg=(merger init (defaultMergeArg init x)); - # now add the function with composed args already applied to the final attrs - base = (setAttrMerge "passthru" {} (f arg) - ( z : z // rec { - function = foldArgs merger f arg; - args = (lib.attrByPath ["passthru" "args"] {} z) // x; + foldArgs = merger: f: init: x: + let arg = (merger init (defaultMergeArg init x)); + # now add the function with composed args already applied to the final attrs + base = (setAttrMerge "passthru" {} (f arg) + ( z: z // rec { + function = foldArgs merger f arg; + args = (lib.attrByPath ["passthru" "args"] {} z) // x; } )); - withStdOverrides = base // { - override = base.passthru.function; - } ; + withStdOverrides = base // { + override = base.passthru.function; + }; in - withStdOverrides; - + withStdOverrides; + # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice) # the naming "overridableDelayableArgs" tries to express that you can @@ -49,35 +49,35 @@ rec { # # examples: see test cases "res" below; overridableDelayableArgs = - f : # the function applied to the arguments - initial : # you pass attrs, the functions below are passing a function taking the fix argument + f: # the function applied to the arguments + initial: # you pass attrs, the functions below are passing a function taking the fix argument let takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument - tidy = args : + tidy = args: let # apply all functions given in "applyPreTidy" in sequence - applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); + applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args); in removeAttrs (applyPreTidyFun args) ( ["applyPreTidy"] ++ (maybeAttr "removeAttrs" [] args) ); # tidy up args before applying them - fun = n : x : - let newArgs = fixed : - let args = takeFixed fixed; - mergeFun = args.${n}; - in if isAttrs x then (mergeFun args x) - else assert isFunction x; - mergeFun args (x ( args // { inherit fixed; })); - in overridableDelayableArgs f newArgs; + fun = n: x: + let newArgs = fixed: + let args = takeFixed fixed; + mergeFun = args.${n}; + in if isAttrs x then (mergeFun args x) + else assert isFunction x; + mergeFun args (x ( args // { inherit fixed; })); + in overridableDelayableArgs f newArgs; in (f (tidy (lib.fix takeFixed))) // { merge = fun "mergeFun"; replace = fun "keepFun"; }; - defaultOverridableDelayableArgs = f : + defaultOverridableDelayableArgs = f: let defaults = { mergeFun = mergeAttrByFunc; # default merge function. merge strategie (concatenate lists, strings) is given by mergeAttrBy - keepFun = a : b : { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values + keepFun = a: b: { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values applyPreTidy = []; # list of functions applied to args before args are tidied up (usage case : prepareDerivationArgs) mergeAttrBy = mergeAttrBy // { - applyPreTidy = a : b : a ++ b; - removeAttrs = a : b: a ++ b; + applyPreTidy = a: b: a ++ b; + removeAttrs = a: b: a ++ b; }; removeAttrs = ["mergeFun" "keepFun" "mergeAttrBy" "removeAttrs" "fixed" ]; # before applying the arguments to the function make sure these names are gone }; @@ -86,7 +86,7 @@ rec { # rec { # an example of how composedArgsAndFun can be used - # a = composedArgsAndFun (x : x) { a = ["2"]; meta = { d = "bar";}; }; + # a = composedArgsAndFun (x: x) { a = ["2"]; meta = { d = "bar";}; }; # # meta.d will be lost ! It's your task to preserve it (eg using a merge function) # b = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; }; # # instead of passing/ overriding values you can use a merge function: @@ -119,7 +119,7 @@ rec { else if val == true || val == false then false else null; - + # Return true only if there is an attribute and it is true. checkFlag = attrSet: name: if name == "true" then true else @@ -134,29 +134,29 @@ rec { ( attrByPath [name] (if checkFlag attrSet name then true else if argList == [] then null else let x = builtins.head argList; in - if (head x) == name then + if (head x) == name then (head (tail x)) - else (getValue attrSet + else (getValue attrSet (tail argList) name)) attrSet ); - + # Input : attrSet, [[name default] ...], [ [flagname reqs..] ... ] # Output : are reqs satisfied? It's asserted. - checkReqs = attrSet : argList : condList : + checkReqs = attrSet: argList: condList: ( - fold lib.and true - (map (x: let name = (head x) ; in - - ((checkFlag attrSet name) -> + fold lib.and true + (map (x: let name = (head x); in + + ((checkFlag attrSet name) -> (fold lib.and true (map (y: let val=(getValue attrSet argList y); in - (val!=null) && (val!=false)) - (tail x))))) condList)) ; - + (val!=null) && (val!=false)) + (tail x))))) condList)); + # This function has O(n^2) performance. - uniqList = {inputList, acc ? []} : - let go = xs : acc : + uniqList = { inputList, acc ? [] }: + let go = xs: acc: if xs == [] then [] else let x = head xs; @@ -164,26 +164,26 @@ rec { in y ++ go (tail xs) (y ++ acc); in go inputList acc; - uniqListExt = {inputList, outputList ? [], - getter ? (x : x), compare ? (x: y: x==y)}: + uniqListExt = { inputList, + outputList ? [], + getter ? (x: x), + compare ? (x: y: x==y) }: if inputList == [] then outputList else - let x=head inputList; - isX = y: (compare (getter y) (getter x)); - newOutputList = outputList ++ - (if any isX outputList then [] else [x]); - in uniqListExt {outputList=newOutputList; - inputList = (tail inputList); - inherit getter compare; - }; + let x = head inputList; + isX = y: (compare (getter y) (getter x)); + newOutputList = outputList ++ + (if any isX outputList then [] else [x]); + in uniqListExt { outputList = newOutputList; + inputList = (tail inputList); + inherit getter compare; + }; - - condConcat = name: list: checker: if list == [] then name else - if checker (head list) then - condConcat - (name + (head (tail list))) - (tail (tail list)) + if checker (head list) then + condConcat + (name + (head (tail list))) + (tail (tail list)) checker else condConcat name (tail (tail list)) checker; @@ -202,12 +202,12 @@ rec { in work startSet [] []; - innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else + innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else innerModifySumArgs f x (a // b); modifySumArgs = f: x: innerModifySumArgs f x {}; - innerClosePropagation = acc : xs : + innerClosePropagation = acc: xs: if xs == [] then acc else let y = head xs; @@ -227,31 +227,31 @@ rec { closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);}); # calls a function (f attr value ) for each record item. returns a list - mapAttrsFlatten = f : r : map (attr: f attr r.${attr}) (attrNames r); + mapAttrsFlatten = f: r: map (attr: f attr r.${attr}) (attrNames r); # attribute set containing one attribute - nvs = name : value : listToAttrs [ (nameValuePair name value) ]; + nvs = name: value: listToAttrs [ (nameValuePair name value) ]; # adds / replaces an attribute of an attribute set - setAttr = set : name : v : set // (nvs name v); + setAttr = set: name: v: set // (nvs name v); # setAttrMerge (similar to mergeAttrsWithFunc but only merges the values of a particular name) - # setAttrMerge "a" [] { a = [2];} (x : x ++ [3]) -> { a = [2 3]; } - # setAttrMerge "a" [] { } (x : x ++ [3]) -> { a = [ 3]; } - setAttrMerge = name : default : attrs : f : + # setAttrMerge "a" [] { a = [2];} (x: x ++ [3]) -> { a = [2 3]; } + # setAttrMerge "a" [] { } (x: x ++ [3]) -> { a = [ 3]; } + setAttrMerge = name: default: attrs: f: setAttr attrs name (f (maybeAttr name default attrs)); - # Using f = a : b = b the result is similar to // + # Using f = a: b = b the result is similar to // # merge attributes with custom function handling the case that the attribute # exists in both sets - mergeAttrsWithFunc = f : set1 : set2 : - fold (n: set : if set ? ${n} + mergeAttrsWithFunc = f: set1: set2: + fold (n: set: if set ? ${n} then setAttr set n (f set.${n} set2.${n}) else set ) (set2 // set1) (attrNames set2); # merging two attribute set concatenating the values of same attribute names # eg { a = 7; } { a = [ 2 3 ]; } becomes { a = [ 7 2 3 ]; } - mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a : b : (toList a) ++ (toList b) ); + mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a: b: (toList a) ++ (toList b) ); # merges attributes using //, if a name exisits in both attributes # an error will be triggered unless its listed in mergeLists @@ -262,10 +262,10 @@ rec { # ! deprecated, use mergeAttrByFunc instead mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"], overrideSnd ? [ "buildPhase" ] - } : attrs1 : attrs2 : - fold (n: set : + }: attrs1: attrs2: + fold (n: set: setAttr set n ( if set ? ${n} - then # merge + then # merge if elem n mergeLists # attribute contains list, merge them by concatenating then attrs2.${n} ++ attrs1.${n} else if elem n overrideSnd @@ -286,14 +286,14 @@ rec { # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; } # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix - mergeAttrByFunc = x : y : + mergeAttrByFunc = x: y: let - mergeAttrBy2 = { mergeAttrBy=lib.mergeAttrs; } + mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; } // (maybeAttr "mergeAttrBy" {} x) // (maybeAttr "mergeAttrBy" {} y); in fold lib.mergeAttrs {} [ x y - (mapAttrs ( a : v : # merge special names using given functions + (mapAttrs ( a: v: # merge special names using given functions if x ? ${a} then if y ? ${a} then v x.${a} y.${a} # both have attr, use merge func @@ -313,9 +313,9 @@ rec { # # This function is best explained by an example: # - # {version ? "2.x"} : + # {version ? "2.x"}: # - # mkDerivation (mergeAttrsByVersion "package-name" version + # mkDerivation (mergeAttrsByVersion "package-name" version # { # version specific settings # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; }; # "2.x" = { src = ..; }; @@ -346,21 +346,24 @@ rec { # See misc.nix -> versionedDerivation # discussion: nixpkgs: pull/310 mergeAttrsByVersion = name: version: attrsByVersion: base: - mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } base (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)]; + mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } + base + (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion) + ]; # sane defaults (same name as attr name so that inherit can be used) mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; } - listToAttrs (map (n : nameValuePair n lib.concat) + listToAttrs (map (n: nameValuePair n lib.concat) [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" "patches" ]) - // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) - // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) + // listToAttrs (map (n: nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ]) + // listToAttrs (map (n: nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ]) ; # prepareDerivationArgs tries to make writing configurable derivations easier # example: # prepareDerivationArgs { # mergeAttrBy = { - # myScript = x : y : x ++ "\n" ++ y; + # myScript = x: y: x ++ "\n" ++ y; # }; # cfg = { # readlineSupport = true; @@ -392,10 +395,10 @@ rec { # TODO use args.mergeFun here as well? prepareDerivationArgs = args: let args2 = { cfg = {}; flags = {}; } // args; - flagName = name : "${name}Support"; - cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags))) + flagName = name: "${name}Support"; + cfgWithDefaults = (listToAttrs (map (n: nameValuePair (flagName n) false) (attrNames args2.flags))) // args2.cfg; - opts = attrValues (mapAttrs (a : v : + opts = attrValues (mapAttrs (a: v: let v2 = if v ? set || v ? unset then v else { set = v; }; n = if cfgWithDefaults.${flagName a} then "set" else "unset"; attr = maybeAttr n {} v2; in diff --git a/lib/modules.nix b/lib/modules.nix index a7c397d2cf43..862488310d81 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -114,7 +114,7 @@ rec { /* Massage a module into canonical form, that is, a set consisting of ‘options’, ‘config’ and ‘imports’ attributes. */ unifyModuleSyntax = file: key: m: - let metaSet = if m ? meta + let metaSet = if m ? meta then { meta = m.meta; } else {}; in @@ -595,7 +595,7 @@ rec { functionality This show a warning if any a.b.c or d.e.f is set, and set the value of - x.y.z to the result of the merge function + x.y.z to the result of the merge function */ mkMergedOptionModule = from: to: mergeFn: { config, options, ... }: @@ -611,12 +611,12 @@ rec { let val = getAttrFromPath f config; opt = getAttrFromPath f options; in - optionalString + optionalString (val != "_mkMergedOptionModule") "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly." ) from); } // setAttrByPath to (mkMerge - (optional + (optional (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) (mergeFn config))); }; diff --git a/lib/tests.nix b/lib/tests.nix index d33e3a824e34..251282d29904 100644 --- a/lib/tests.nix +++ b/lib/tests.nix @@ -80,7 +80,7 @@ runTests { y = x.merge {}; in (y.merge) { a = 10; }; - resRem7 = res6.replace (a : removeAttrs a ["a"]); + resRem7 = res6.replace (a: removeAttrs a ["a"]); resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; }; x2 = x.merge { a = 20; }; # now we have 27 @@ -88,10 +88,10 @@ runTests { # fixed tests (delayed args): (when using them add some comments, please) resFixed1 = - let x = defaultOverridableDelayableArgs id ( x : { a = 7; c = x.fixed.b; }); - y = x.merge (x : { name = "name-${builtins.toString x.fixed.c}"; }); + let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; }); + y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; }); in (y.merge) { b = 10; }; - strip = attrs : removeAttrs attrs ["merge" "replace"]; + strip = attrs: removeAttrs attrs ["merge" "replace"]; in all id [ ((strip res1) == { }) ((strip res2) == { a = 7; }) diff --git a/lib/types.nix b/lib/types.nix index 0d1a88a00f2d..175cb7472bf6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -81,7 +81,7 @@ rec { # name: name of the type # type: type function. # wrapped: the type wrapped in case of compound types. - # payload: values of the type, two payloads of the same type must be + # payload: values of the type, two payloads of the same type must be # combinable with the binOp binary operation. # binOp: binary operation that merge two payloads of the same type. functor ? defaultFunctor name From e0988990232c5f437876f05434e1603b537f865b Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 18:36:11 -0600 Subject: [PATCH 035/278] cdk:5.0-20160131 -> 5.0-20161210 --- pkgs/development/libraries/cdk/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 614d57002cd2..a97ca5cc6980 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, ncurses }: -let - version = "5.0-20160131"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cdk-${version}"; - inherit version; + version ="5.0-20161210"; buildInputs = [ ncurses @@ -13,13 +10,13 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3"; + sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; }; - meta = { + meta = with stdenv.lib; { description = "Curses development kit"; - license = stdenv.lib.licenses.bsdOriginal ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsdOriginal ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } From 2188e0f61fa7bede37c372fd7d3ddab7cd807ac9 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 12 Mar 2017 12:22:52 +1100 Subject: [PATCH 036/278] pure: 0.64 -> 0.66 --- pkgs/development/interpreters/pure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index c471a3cdc0fb..133329f4f203 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.64"; + version="0.66"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg"; + sha256="42df6832476e8bee3a7ca179671284c1edd7bc82b71062fa0de62fd2117ee676"; }; buildInputs = [ bison flex makeWrapper ]; From 5d025f573114561650bd469d8fb7c3b47e80c4ae Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 19:58:16 -0600 Subject: [PATCH 037/278] chipmunk:7.0.0 -> 7.0.1 --- pkgs/development/libraries/chipmunk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 52990097a230..2c50d8138057 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "chipmunk-${version}"; majorVersion = "7"; - version = "${majorVersion}.0.0"; + version = "${majorVersion}.0.1"; src = fetchurl { url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql"; + sha256 = "0q4jwv1icz8spcjkp0v3bnygi6hq2zmnsgcxkwm8i2bxfxjb8m7y"; }; + nativeBuildInputs = [ cmake ]; buildInputs = - [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin From ef741de5b1b125a5e22700b91ed0907e0f1500ab Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 20:59:11 -0600 Subject: [PATCH 038/278] cl:1.2.1 -> 1.2.3 --- pkgs/development/libraries/cl/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 1fa45992aeee..b26327dd7754 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.3"; name = "cl-${version}"; - src = fetchurl { - url = "https://github.com/tonyrog/cl/archive/${name}.tar.gz"; - sha256 = "03jv280h9gqqqkm0mmkjr53srd2mzhvyy1biss77wpjrzq2z12c8"; + src = fetchFromGitHub { + owner = "tonyrog"; + repo = "cl"; + rev = "cl-${version}"; + sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03"; }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; - #propagatedBuildInputs = [ SDL mesa ]; - + buildPhase = '' - sed 's/git/"${version}"/' -i src/cl.app.src rebar compile ''; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { cp -ruv c_src doc ebin include priv src $DIR ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } From 5f03cf8f940f55e129be192220cd31d5222e9109 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 21:15:29 -0600 Subject: [PATCH 039/278] concurrencykit: 0.4.5 -> 0.6.0 --- .../libraries/concurrencykit/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 3fad256e5728..29ce216cadf1 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.5"; + version = "0.6.0"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9"; + sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; + + #Deleting this line causes "Unknown option --disable-static" + configurePhase = "./configure --prefix=$out"; enableParallelBuilding = true; - configurePhase = "./configure --prefix=$out"; - - meta = { + meta = with stdenv.lib; { description = "A library of safe, high-performance concurrent data structures"; - homepage = "http://concurrencykit.org"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = http://concurrencykit.org; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } From a7843b01f2caccb9d67614df2a6a1a3112c77869 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 20:45:24 -0600 Subject: [PATCH 040/278] chromaprint: 1.3.1 -> 1.3.2 --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 7c3c776e81b0..09c5eeb611ba 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "10dm9cfqb77g12pyjnqaw80860kzdcvskni02ll7afpywq8s15cg"; + sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; nativeBuildInputs = [ cmake ]; From e18d518d668ac98e9e216916da869f6aba1e0e06 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 12 Mar 2017 14:40:26 +0800 Subject: [PATCH 041/278] heroku-cli: 5.6.14 -> 5.6.32 --- pkgs/development/tools/heroku/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index f9c43ee841ba..6334bb2e5ddf 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let cli = buildGoPackage rec { name = "cli-${version}"; - version = "5.6.14"; + version = "5.6.32"; goPackagePath = "github.com/heroku/cli"; @@ -14,8 +14,21 @@ let owner = "heroku"; repo = "cli"; rev = "v${version}"; - sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9"; + sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz"; }; + + buildFlagsArray = '' + -ldflags= + -X=main.Version=${version} + -X=main.Channel=stable + -X=main.Autoupdate=no + ''; + + preCheck = '' + export HOME=/tmp + ''; + + doCheck = true; }; in stdenv.mkDerivation rec { From c9d8ae084d9340f9f7dddd3267e1f7ad72f70502 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 12 Mar 2017 07:29:54 +0000 Subject: [PATCH 042/278] ocamlPackages.ocaml-migrate-parsetree: init at 0.5 This library converts parsetrees, outcometree and ast mappers between different OCaml versions. High-level functions help making PPX rewriters independent of a compiler version. Homepage: https://github.com/let-def/ocaml-migrate-parsetree --- .../ocaml-migrate-parsetree/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix new file mode 100644 index 000000000000..3694dd2d6abc --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "let-def"; + repo = "ocaml-migrate-parsetree"; + rev = "v${version}"; + sha256 = "023lnd3kxa3d4zgsvv0z2lyzhg05zcgagy18vaalimbza57wq83h"; + }; + + buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; + propagatedBuildInputs = [ result ]; + + installPhase = '' + for p in *.install + do + ${jbuilder.installPhase} $p + done + ''; + + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1cc5de01e101..f3f535bb0857 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -336,6 +336,8 @@ let ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; + ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; + ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; From 1e68693cef9d2e588460d0695d69a2f81bee404b Mon Sep 17 00:00:00 2001 From: ndowens Date: Sat, 11 Mar 2017 20:50:59 -0600 Subject: [PATCH 043/278] cimg: 1.7.0 -> 1.7.9 --- pkgs/development/libraries/cimg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 722852f12700..a9470ee3f41b 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.7.0"; + version = "1.7.9"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj"; + sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; builder = ./builder.sh; From 819b8c68de7376b8e08cdba1c1629a456a6b2d3a Mon Sep 17 00:00:00 2001 From: ndowens Date: Fri, 10 Mar 2017 19:51:45 -0600 Subject: [PATCH 044/278] assimp: 3.2 -> 3.3.1 --- pkgs/development/libraries/assimp/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 5fbc45a7c08b..e342d8ab6c09 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: -let - version = "3.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "assimp-${version}"; + version = "3.3.1"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x"; + sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; }; - buildInputs = [ unzip cmake boost zlib ]; + buildInputs = [ cmake boost zlib ]; meta = with stdenv.lib; { description = "A library to import various 3D model formats"; From c52b7510b5efe30ed7a1fecba84214796ad966e0 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 1 Mar 2017 18:18:37 -0600 Subject: [PATCH 045/278] olsrd: 0.6.6.1 -> 0.9.6.1 --- pkgs/tools/networking/olsrd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index 90f686f77ea6..8fa30a5c2211 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, bison, flex }: stdenv.mkDerivation rec { - name = "olsrd-0.6.6.1"; + name = "olsrd-${version}"; + version = "0.9.6.1"; src = fetchurl { - url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2"; - sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8"; + url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2"; + sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612"; }; buildInputs = [ bison flex ]; From f5a55163555b2520afafc5acb0174982905e7ed8 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Sun, 12 Mar 2017 15:32:15 +0800 Subject: [PATCH 046/278] emem: 0.2.34 -> 0.2.35 --- pkgs/applications/misc/emem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index a30a58db4836..76f2f03d159f 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.34"; + version = "0.2.35"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "19dslv632qyz3hcycx22w6x96nwph7cxl1yjprir2w2c692dq06x"; + sha256 = "0y1jwfmqmmff3kh82j07p9j0l2hc7dxhy8vij4lz8wrv6pnxng7f"; }; buildInputs = [ ]; From 4904df80bb2d333a4a19ba5320a79c95570ace8a Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Sat, 11 Mar 2017 20:49:14 +0100 Subject: [PATCH 047/278] qt57.qtbase: enable darwin compatibility --- .../libraries/qt-5/5.7/default.nix | 4 +- .../qt-5/5.7/qtbase/cmake-paths-darwin.patch | 384 ++++++++++++++++++ .../libraries/qt-5/5.7/qtbase/default.nix | 127 ++++-- .../libraries/qt-5/5.7/qtbase/series | 1 - 4 files changed, 479 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index 85b38c6fc6ce..f468670674f0 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -107,12 +107,12 @@ let makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch new file mode 100644 index 000000000000..2fda5ed8cf0c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch @@ -0,0 +1,384 @@ +Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE +- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF ++ set(imported_location \"${PLUGIN_LOCATION}\") + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +@@ -136,28 +136,28 @@ contains(CONFIG, plugin) { + + win32 { + isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll + } else:mingw { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a + } else { # MSVC static +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib + } + } else { + mac { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } else { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } + } + cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in +Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -2,10 +2,10 @@ + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 934203950b09..3c865c318b2e 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -4,6 +4,7 @@ coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, ruby, + darwin, libiconv, dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, @@ -15,7 +16,8 @@ cups ? null, mysql ? null, postgresql ? null, # options - mesaSupported, mesa, + mesaSupported ? (!stdenv.isDarwin), + mesa, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -35,6 +37,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -54,11 +57,11 @@ stdenv.mkDerivation { substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ --replace "@openssl@" "${openssl.out}" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace src/dbus/qdbus_symbols.cpp \ --replace "@dbus_libs@" "${dbus.lib}" @@ -74,8 +77,23 @@ stdenv.mkDerivation { substituteInPlace mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev or mesa}" - ''; - + ''+ lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf + ''; + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. setOutputFlags = false; preConfigure = '' @@ -103,7 +121,6 @@ stdenv.mkDerivation { ${lib.optionalString developerBuild "-developer-build"} -largefile -accessibility - -rpath -optimized-qmake -strip -no-reduce-relocations @@ -117,15 +134,6 @@ stdenv.mkDerivation { -iconv -icu -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 @@ -141,13 +149,8 @@ stdenv.mkDerivation { -system-libpng -system-libjpeg -system-harfbuzz - -system-xcb - -system-xkbcommon -system-pcre -openssl-linked - -dbus-linked - -libinput - -gtk -system-sqlite -${if mysql != null then "plugin" else "no"}-sql-mysql @@ -158,7 +161,30 @@ stdenv.mkDerivation { -${lib.optionalString (buildExamples == false) "no"}make examples -${lib.optionalString (buildTests == false) "no"}make tests -v - ''; + '' + lib.optionalString (!stdenv.isDarwin) '' + -no-rpath + -glib + -xcb + -qpa xcb + + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -libinput + -gtk + -system-xcb + -system-xkbcommon + -dbus-linked + '' + lib.optionalString stdenv.isDarwin '' + -platform macx-clang + -no-use-gold-linker + -no-fontconfig + -qt-freetype + ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. @@ -166,32 +192,44 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + libxml2 libxslt openssl pcre16 sqlite zlib + + # Text rendering + harfbuzz icu # Image formats libjpeg libpng libtiff + ] + ++ lib.optional mesaSupported mesa + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev # Text rendering - fontconfig freetype harfbuzz icu + fontconfig freetype # X11 libs libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] - ++ lib.optional mesaSupported mesa; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa + DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + ]); - buildInputs = - [ gtk3 libinput ] + buildInputs = [ ] + ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python2 ]; + nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 postInstall = '' find "$out" -name "*.cmake" | while read file; do @@ -213,6 +251,11 @@ stdenv.mkDerivation { moveToOutput "share/doc" "$dev" ''; + # Don't move .prl files on darwin because they end up in + # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent + # use of lndir in the qtbase setup-hook. On Linux, the .prl files + # are in lib, and so do not cause a subsequent recreation of deep + # framework directory trees. postFixup = '' # Don't retain build-time dependencies like gdb. @@ -221,17 +264,33 @@ stdenv.mkDerivation { # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ while read -r file; do mkdir -p "''${!outputDev}/$(dirname "$file")" mv "''${!outputLib}/$file" "''${!outputDev}/$file" done popd fi + '' + lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames_rpath() { + local flags=() + + for fn in "$@"; do + flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") + done + + for fn in "$@"; do + echo "$fn: fixing dylib" + install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" + done + } + fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" ''; inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; + setupHook = if stdenv.isDarwin + then ../../qtbase-setup-hook-darwin.sh + else ../../qtbase-setup-hook.sh; enableParallelBuilding = true; @@ -240,7 +299,7 @@ stdenv.mkDerivation { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series index 44e2d9040807..2196d8383752 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/series @@ -7,4 +7,3 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch -cmake-paths.patch From 4ca17dd6c099792f64399b2e9bd5b173ecee762f Mon Sep 17 00:00:00 2001 From: zetok Date: Sun, 12 Mar 2017 14:05:14 +0000 Subject: [PATCH 048/278] gresecurity docs: fix incorrect option (#23789) --- nixos/modules/security/grsecurity.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 07a61919ab42..620e8f653f99 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -312,7 +312,7 @@ Overflows in boot critical code (e.g., the root filesystem module) can render the system unbootable. Work around by setting - boot.kernel.kernelParams = [ "pax_size_overflow_report_only" ]; + boot.kernelParams = [ "pax_size_overflow_report_only" ]; From 04fa8e006cf662a9cdefa52162e006304ad8877d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 8 Feb 2017 21:16:01 +0100 Subject: [PATCH 049/278] darwin: add setup-hook to fix CF references --- .../setup-hooks/fix-darwin-frameworks.sh | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh new file mode 100644 index 000000000000..e3a08b2598d9 --- /dev/null +++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh @@ -0,0 +1,31 @@ +# On Mac OS X, frameworks are linked to the system CoreFoundation but +# dynamic libraries built with nix use a pure version of CF this +# causes segfaults for binaries that depend on it at runtime. This +# can be solved in two ways. +# 1. Rewrite references to the pure CF using this setup hook, this +# works for the simple case but this can still cause problems if other +# dependencies (eg. python) use the pure CF. +# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to +# /System/Library/Frameworks. This will make everything load the +# system's CoreFoundation framework while still keeping the +# dependencies pure for other packages. + +fixupOutputHooks+=('fixDarwinFrameworksIn $prefix') + +fixDarwinFrameworks() { + local systemPrefix='/System/Library/Frameworks' + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + + for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do + install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2 + done + done +} + +fixDarwinFrameworksIn() { + local dir="$1" + fixDarwinFrameworks $(find "$dir" -name "*.dylib") +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3924c5829e..f40f7d10577b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -305,6 +305,8 @@ with pkgs; fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; + fixDarwinFrameworks = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-frameworks.sh; + keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; From 97a3e7cf52068f9e48d3d811f97638c73a513d85 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 7 Mar 2017 22:10:07 +0100 Subject: [PATCH 050/278] darwin-frameworks: don't use pure CF --- pkgs/os-specific/darwin/apple-sdk/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 1148fe5c4a16..338e02b9df3d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -119,6 +119,9 @@ let propagatedBuildInputs = deps; + # don't use pure CF for dylibs that depend on frameworks + setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh; + # allows building the symlink tree __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f40f7d10577b..45f2438c782c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8733,7 +8733,8 @@ with pkgs; libusb = callPackage ../development/libraries/libusb {}; libusb1 = callPackage ../development/libraries/libusb1 { - inherit (darwin) libobjc IOKit; + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit; }; libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; From 16023ef5984153febd0cca71e9848ebed6874799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 12 Mar 2017 11:48:14 -0300 Subject: [PATCH 051/278] enlightenment: 0.21.5 -> 0.21.7 (#23791) --- pkgs/desktops/enlightenment/enlightenment.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 3949bffaba17..23805b469ae1 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.5"; + version = "0.21.7"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h"; + sha256 = "1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn"; }; nativeBuildInputs = [ pkgconfig ]; From 196f64d6756b1aa1a3a74c2eea35dbe1d15504fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 12 Mar 2017 11:48:26 -0300 Subject: [PATCH 052/278] qbittorrent: 3.3.10 -> 3.3.11 (#23703) --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index cdafea3be79f..17548d824417 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.10"; + version = "3.3.11"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c"; + sha256 = "0q57ahhlx7r5k1ji87gbp4rvjfvhirlmcx5nbwrfvqmxsigar4j8"; }; nativeBuildInputs = [ pkgconfig which ]; From 453529bd605a473b44802f8ac1df077ac98bf456 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 5 Mar 2017 19:25:39 +0000 Subject: [PATCH 053/278] nodePackages: support github:owner/repo scheme for package deps JS devs found a new way to be annoying - adjust code accordingly. Have also put this change in PR svanderburg/node2nix#40 --- pkgs/development/node-packages/node-env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index bd1de3e9f93e..e8328252a117 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -73,7 +73,7 @@ let if(versionSpec == "latest" || versionSpec == "unstable" || versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') return '*'; - else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || + else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || parsedUrl.protocol == "github:" || parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:") return '*'; else From 252e58a95e395d34a8d3925639ba565d0632eaf8 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 5 Mar 2017 16:48:29 +0000 Subject: [PATCH 054/278] pump.io: 1.0.0 -> 3.0.0 The package stopped building for some unknown reason (npm could no longer fetch a module). This is one of the build failures listed in #23253. http://hydra.nixos.org/build/49551309 http://hydra.nixos.org/build/49548753 Easiest fix is to upgrade to latest stable version and regenerate packages with node2nix. The databank-memcached dependency needed to be dropped due to dependency failures. --- pkgs/servers/web-apps/pump.io/generate.sh | 14 +- .../web-apps/pump.io/node-packages.nix | 2087 ++++++++++------- 2 files changed, 1239 insertions(+), 862 deletions(-) diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh index 51e05ce37d6b..6dc91c72c09e 100755 --- a/pkgs/servers/web-apps/pump.io/generate.sh +++ b/pkgs/servers/web-apps/pump.io/generate.sh @@ -15,15 +15,23 @@ set -e # Also jshon does funny things with slashes in strings, which can be # fixed with sed. -curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \ +VERSION="3.0.0" +URL="https://registry.npmjs.org/pump.io/-/pump.io-$VERSION.tgz" +SHA1="ycfm7ak83xi8mgafhp9q0n6n3kzmdz16" + +curl https://raw.githubusercontent.com/e14n/pump.io/v$VERSION/package.json | \ jshon -e dependencies \ -s '*' -i databank-mongodb \ -s '*' -i databank-redis \ - -s '*' -i databank-memcached \ -s '*' -i databank-lrucache \ -p | sed 's=\\/=/=g' > full-package.json node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix # overriding nodePackages src doesn't seem to work, so... -sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix +sed -i "s|src = ./.|src = fetchurl { url = \"$URL\"; sha1 = \"$SHA1\"; }|" node-packages.nix + +# fetchgit or node2nix is having problems with submodules or something. +# This is the sha256 for connect-auth which is a npm dep hosted on +# github and containing submodules. +sed -i "s|d08fecbb72aff14ecb39dc310e8965ba92228f0c0def41fbde3db5ea7a1aac19|1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b|" node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index ab3022b95123..a275ef4ca402 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -13,13 +13,22 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.5" = { + "bunyan-1.8.8" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.5"; + version = "1.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; - sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.8.tgz"; + sha1 = "6549ed6db088e4d82b7be3bcc6d0697159f6e209"; + }; + }; + "colors-1.1.2" = { + name = "colors"; + packageName = "colors"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; + sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; "connect-2.30.2" = { @@ -31,13 +40,14 @@ let sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; }; }; - "connect-auth-0.6.1" = { + "connect-auth-git://github.com/e14n/connect-auth" = { name = "connect-auth"; packageName = "connect-auth"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-auth/-/connect-auth-0.6.1.tgz"; - sha1 = "8d798153d6c8e78cb809de82a436f1de7c79868f"; + version = "0.6.0"; + src = fetchgit { + url = "git://github.com/e14n/connect-auth"; + rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec"; + sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b"; }; }; "connect-databank-1.0.3" = { @@ -49,6 +59,15 @@ let sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; }; }; + "connect-multiparty-2.0.0" = { + name = "connect-multiparty"; + packageName = "connect-multiparty"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; + sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; + }; + }; "crypto-cacerts-0.1.0" = { name = "crypto-cacerts"; packageName = "crypto-cacerts"; @@ -58,13 +77,13 @@ let sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; }; }; - "databank-0.19.5" = { + "databank-0.19.8" = { name = "databank"; packageName = "databank"; - version = "0.19.5"; + version = "0.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.19.5.tgz"; - sha1 = "edcbd954b84730c0c5d0de551e004b92f1f53119"; + url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz"; + sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844"; }; }; "dateformat-1.0.12" = { @@ -85,13 +104,13 @@ let sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; }; }; - "dompurify-0.8.4" = { + "dompurify-0.8.5" = { name = "dompurify"; packageName = "dompurify"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz"; - sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6"; + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz"; + sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44"; }; }; "emailjs-1.0.8" = { @@ -103,22 +122,22 @@ let sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; }; }; - "express-2.5.11" = { + "express-3.21.2" = { name = "express"; packageName = "express"; - version = "2.5.11"; + version = "3.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; + sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "express-session-1.14.2" = { + "express-session-1.15.1" = { name = "express-session"; packageName = "express-session"; - version = "1.14.2"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.14.2.tgz"; - sha1 = "6bcf586ed6d1dc37b02570087756c9de7b80b275"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.1.tgz"; + sha1 = "9abba15971beea7ad98da5a4d25ed92ba4a2984e"; }; }; "gm-1.23.0" = { @@ -130,13 +149,22 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-2.3.0" = { + "helmet-3.4.1" = { name = "helmet"; packageName = "helmet"; - version = "2.3.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz"; - sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91"; + url = "https://registry.npmjs.org/helmet/-/helmet-3.4.1.tgz"; + sha1 = "27d37629227f25a110f2a128bfe1b1028648a397"; + }; + }; + "jade-1.11.0" = { + name = "jade"; + packageName = "jade"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; + sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; }; }; "jankyqueue-0.1.1" = { @@ -157,6 +185,15 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; + "method-override-2.3.7" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; + sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; + }; + }; "mkdirp-0.5.1" = { name = "mkdirp"; packageName = "mkdirp"; @@ -166,15 +203,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "node-uuid-1.4.7" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - }; "oauth-evanp-0.9.10-evanp.2" = { name = "oauth-evanp"; packageName = "oauth-evanp"; @@ -184,6 +212,15 @@ let sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; }; }; + "octal-1.0.0" = { + name = "octal"; + packageName = "octal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; + sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; + }; + }; "optimist-0.6.1" = { name = "optimist"; packageName = "optimist"; @@ -193,13 +230,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "rimraf-2.5.4" = { + "rimraf-2.6.1" = { name = "rimraf"; packageName = "rimraf"; - version = "2.5.4"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; + sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; "sanitize-html-1.14.1" = { @@ -229,13 +266,13 @@ let sha1 = "765e7607c8055452bba6f0b052595350986036de"; }; }; - "showdown-1.6.0" = { + "showdown-1.6.4" = { name = "showdown"; packageName = "showdown"; - version = "1.6.0"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz"; - sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4"; + url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz"; + sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6"; }; }; "sockjs-0.3.18" = { @@ -247,13 +284,22 @@ let sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; }; }; - "step-0.0.6" = { + "ssl-config-0.0.9" = { + name = "ssl-config"; + packageName = "ssl-config"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ssl-config/-/ssl-config-0.0.9.tgz"; + sha1 = "905ed1b7ddd0564aa9395cd4ae7146907351ff2c"; + }; + }; + "step-1.0.0" = { name = "step"; packageName = "step"; - version = "0.0.6"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz"; + sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2"; }; }; "ua-parser-js-0.7.12" = { @@ -283,13 +329,13 @@ let sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; }; }; - "utml-0.2.0" = { - name = "utml"; - packageName = "utml"; - version = "0.2.0"; + "uuid-3.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; - sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; + sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; }; }; "validator-4.4.0" = { @@ -310,13 +356,13 @@ let sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; }; }; - "databank-mongodb-0.19.0" = { + "databank-mongodb-1.0.0" = { name = "databank-mongodb"; packageName = "databank-mongodb"; - version = "0.19.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.19.0.tgz"; - sha1 = "66ffa32848986d0e138403396506d64895fefc45"; + url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz"; + sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b"; }; }; "databank-redis-0.19.6" = { @@ -328,15 +374,6 @@ let sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; }; }; - "databank-memcached-0.15.0" = { - name = "databank-memcached"; - packageName = "databank-memcached"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; - sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; - }; - }; "databank-lrucache-0.1.2" = { name = "databank-lrucache"; packageName = "databank-lrucache"; @@ -364,13 +401,13 @@ let sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; }; }; - "dtrace-provider-0.8.0" = { + "dtrace-provider-0.8.1" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; - sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz"; + sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f"; }; }; "mv-2.1.1" = { @@ -382,13 +419,13 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "safe-json-stringify-1.0.3" = { + "safe-json-stringify-1.0.4" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; + sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; "moment-2.17.1" = { @@ -400,13 +437,13 @@ let sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; }; }; - "nan-2.5.0" = { + "nan-2.5.1" = { name = "nan"; packageName = "nan"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; + url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; + sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; }; }; "ncp-2.0.0" = { @@ -670,15 +707,6 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.7" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; - }; - }; "morgan-1.6.1" = { name = "morgan"; packageName = "morgan"; @@ -922,13 +950,13 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.4" = { + "csrf-3.0.5" = { name = "csrf"; packageName = "csrf"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; - sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.5.tgz"; + sha1 = "3c3aa86f395dd39f86d68fcf1734a2380f466112"; }; }; "base64-url-1.3.3" = { @@ -958,13 +986,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.3" = { + "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; - sha1 = "077e264a00b3187936b270bb7376a26473631071"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; + sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; }; }; "random-bytes-1.0.0" = { @@ -1048,42 +1076,6 @@ let sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "vary-1.1.0" = { - name = "vary"; - packageName = "vary"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; - }; - }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; "basic-auth-1.0.4" = { name = "basic-auth"; packageName = "basic-auth"; @@ -1156,6 +1148,15 @@ let sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; }; }; + "ms-0.7.2" = { + name = "ms"; + packageName = "ms"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; + sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + }; + }; "batch-0.5.3" = { name = "batch"; packageName = "batch"; @@ -1174,22 +1175,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "connect-2.7.11" = { - name = "connect"; - packageName = "connect"; - version = "2.7.11"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; - sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; - }; - }; - "oauth-0.9.10" = { + "oauth-0.9.7" = { name = "oauth"; packageName = "oauth"; - version = "0.9.10"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.10.tgz"; - sha1 = "7d356af319a16d889e581fa80f86bbd5ab454646"; + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; + sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; }; }; "openid-0.4.1" = { @@ -1201,114 +1193,6 @@ let sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; }; }; - "qs-0.6.5" = { - name = "qs"; - packageName = "qs"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; - sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; - }; - }; - "formidable-1.0.14" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - }; - "cookie-signature-1.0.1" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; - sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; - }; - }; - "buffer-crc32-0.2.1" = { - name = "buffer-crc32"; - packageName = "buffer-crc32"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; - sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; - }; - }; - "cookie-0.0.5" = { - name = "cookie"; - packageName = "cookie"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; - sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; - }; - }; - "send-0.1.1" = { - name = "send"; - packageName = "send"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.1.1.tgz"; - sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; - }; - }; - "bytes-0.2.0" = { - name = "bytes"; - packageName = "bytes"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; - sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; - }; - }; - "fresh-0.1.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; - sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; - }; - }; - "pause-0.0.1" = { - name = "pause"; - packageName = "pause"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; - }; - }; - "debug-2.6.0" = { - name = "debug"; - packageName = "debug"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "range-parser-0.0.4" = { - name = "range-parser"; - packageName = "range-parser"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; - sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; - }; - }; "async-1.5.2" = { name = "async"; packageName = "async"; @@ -1318,6 +1202,15 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + }; "set-immediate-0.1.1" = { name = "set-immediate"; packageName = "set-immediate"; @@ -1327,40 +1220,31 @@ let sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; }; }; - "vows-0.7.0" = { - name = "vows"; - packageName = "vows"; - version = "0.7.0"; + "multiparty-4.1.3" = { + name = "multiparty"; + packageName = "multiparty"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; - sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; + sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; }; }; - "eyes-0.1.8" = { - name = "eyes"; - packageName = "eyes"; - version = "0.1.8"; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - }; - "diff-1.0.8" = { - name = "diff"; - packageName = "diff"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; }; }; "get-stdin-4.0.1" = { @@ -1426,13 +1310,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.5" = { + "normalize-package-data-2.3.6" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz"; + sha1 = "498fa420c96401f787402ba21e600def9f981fff"; }; }; "object-assign-4.1.1" = { @@ -1507,13 +1391,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.2.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; }; }; "is-builtin-module-1.0.0" = { @@ -1678,13 +1562,13 @@ let sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; }; }; - "error-ex-1.3.0" = { + "error-ex-1.3.1" = { name = "error-ex"; packageName = "error-ex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; }; }; "is-arrayish-0.2.1" = { @@ -1759,6 +1643,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "step-0.0.6" = { + name = "step"; + packageName = "step"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + }; "addressparser-0.3.2" = { name = "addressparser"; packageName = "addressparser"; @@ -1831,49 +1724,112 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "connect-1.9.2" = { - name = "connect"; - packageName = "connect"; - version = "1.9.2"; + "content-disposition-0.5.0" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; }; }; - "mime-1.2.4" = { + "commander-2.6.0" = { + name = "commander"; + packageName = "commander"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; + sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + }; + }; + "merge-descriptors-1.0.0" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; + sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "proxy-addr-1.0.10" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; + sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; + }; + }; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + }; + }; + "send-0.13.0" = { + name = "send"; + packageName = "send"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; + sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; + }; + }; + "forwarded-0.1.0" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + }; + "ipaddr.js-1.0.5" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; + sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; + }; + }; + "destroy-1.0.3" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + }; + "mime-1.3.4" = { name = "mime"; packageName = "mime"; - version = "1.2.4"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; }; }; - "qs-0.4.2" = { - name = "qs"; - packageName = "qs"; - version = "0.4.2"; + "statuses-1.2.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; - }; - }; - "mkdirp-0.3.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }; - }; - "formidable-1.0.17" = { - name = "formidable"; - packageName = "formidable"; - version = "1.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; }; }; "cookie-0.3.1" = { @@ -1885,13 +1841,22 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "crc-3.4.1" = { + "crc-3.4.4" = { name = "crc"; packageName = "crc"; - version = "3.4.1"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.1.tgz"; - sha1 = "65d5830b1a2569557cfb324c0e679998521473ee"; + url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; + sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; + }; + }; + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; }; }; "array-parallel-0.1.3" = { @@ -1966,13 +1931,13 @@ let sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; }; }; - "connect-3.4.1" = { + "connect-3.6.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; + sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; }; }; "dns-prefetch-control-0.1.0" = { @@ -1993,22 +1958,22 @@ let sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; }; }; - "frameguard-2.0.0" = { + "frameguard-3.0.0" = { name = "frameguard"; packageName = "frameguard"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-2.0.0.tgz"; - sha1 = "30c2c149e5e3505f9e156f9bc491a438420e487e"; + url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; + sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; }; }; - "helmet-csp-1.2.2" = { + "helmet-csp-2.3.0" = { name = "helmet-csp"; packageName = "helmet-csp"; - version = "1.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-1.2.2.tgz"; - sha1 = "085c0307d57fc96cd97337f170ab8bfea99e5df7"; + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.3.0.tgz"; + sha1 = "bc341939dfef5266cc817abcf53f079f61fe7e3f"; }; }; "hide-powered-by-1.0.0" = { @@ -2020,22 +1985,22 @@ let sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; }; }; - "hpkp-1.2.0" = { + "hpkp-2.0.0" = { name = "hpkp"; packageName = "hpkp"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz"; - sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65"; + url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz"; + sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672"; }; }; - "hsts-1.0.0" = { + "hsts-2.0.0" = { name = "hsts"; packageName = "hsts"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-1.0.0.tgz"; - sha1 = "98e1039ef7aba554057b6b0e32584c0b1143a414"; + url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz"; + sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7"; }; }; "ienoopen-1.0.0" = { @@ -2047,22 +2012,22 @@ let sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; }; }; - "nocache-1.0.1" = { + "nocache-2.0.0" = { name = "nocache"; packageName = "nocache"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-1.0.1.tgz"; - sha1 = "695c9f736926a7554f7365fa25e087941065bd36"; + url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; + sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; }; }; - "referrer-policy-1.0.0" = { + "referrer-policy-1.1.0" = { name = "referrer-policy"; packageName = "referrer-policy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.0.0.tgz"; - sha1 = "f60eedc92f942b01a6118121ec932d66e8fd7e14"; + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; + sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; }; }; "x-xss-protection-1.0.0" = { @@ -2074,13 +2039,22 @@ let sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; }; }; - "finalhandler-0.4.1" = { + "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; + sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; + }; + }; + "encodeurl-1.0.1" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; + sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; }; }; "camelize-1.0.0" = { @@ -2092,31 +2066,40 @@ let sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; }; }; - "content-security-policy-builder-1.0.0" = { + "content-security-policy-builder-1.1.0" = { name = "content-security-policy-builder"; packageName = "content-security-policy-builder"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.0.0.tgz"; - sha1 = "11fd40c5cc298a6c725a35f9acf71e82ab5d3243"; + url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz"; + sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3"; }; }; - "lodash.reduce-4.5.0" = { + "dasherize-2.0.0" = { + name = "dasherize"; + packageName = "dasherize"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz"; + sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308"; + }; + }; + "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.5.0.tgz"; - sha1 = "af7d2ec621062441e77d5bf408a1e071ef86691c"; + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; }; }; - "platform-1.3.1" = { + "platform-1.3.3" = { name = "platform"; packageName = "platform"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/platform/-/platform-1.3.1.tgz"; - sha1 = "492210892335bd3131c0a08dda2d93ec3543e423"; + url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz"; + sha1 = "646c77011899870b6a0903e75e997e8e51da7461"; }; }; "dashify-0.2.2" = { @@ -2128,13 +2111,112 @@ let sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; }; }; - "abab-1.0.3" = { - name = "abab"; - packageName = "abab"; - version = "1.0.3"; + "character-parser-1.2.1" = { + name = "character-parser"; + packageName = "character-parser"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; - sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; + sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; + }; + }; + "clean-css-3.4.25" = { + name = "clean-css"; + packageName = "clean-css"; + version = "3.4.25"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; + sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; + }; + }; + "constantinople-3.0.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; + sha1 = "4b945d9937907bcd98ee575122c3817516544141"; + }; + }; + "jstransformer-0.0.2" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; + sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; + }; + }; + "transformers-2.1.0" = { + name = "transformers"; + packageName = "transformers"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; + sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; + }; + }; + "uglify-js-2.8.9" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.9.tgz"; + sha1 = "01194b91cc0795214093c05594ef5ac1e0b2e900"; + }; + }; + "void-elements-2.0.1" = { + name = "void-elements"; + packageName = "void-elements"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + }; + "with-4.0.3" = { + name = "with"; + packageName = "with"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; + sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; + }; + }; + "commander-2.8.1" = { + name = "commander"; + packageName = "commander"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + }; + "source-map-0.4.4" = { + name = "source-map"; + packageName = "source-map"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "amdefine-1.0.1" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; "acorn-2.7.0" = { @@ -2146,6 +2228,258 @@ let sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; }; }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "promise-6.1.0" = { + name = "promise"; + packageName = "promise"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; + sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; + }; + }; + "asap-1.0.0" = { + name = "asap"; + packageName = "asap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; + sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; + }; + }; + "promise-2.0.0" = { + name = "promise"; + packageName = "promise"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; + sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; + }; + }; + "css-1.0.8" = { + name = "css"; + packageName = "css"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; + sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; + }; + }; + "uglify-js-2.2.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; + sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; + }; + }; + "is-promise-1.0.1" = { + name = "is-promise"; + packageName = "is-promise"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + }; + }; + "css-parse-1.0.4" = { + name = "css-parse"; + packageName = "css-parse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; + sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; + }; + }; + "css-stringify-1.0.5" = { + name = "css-stringify"; + packageName = "css-stringify"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; + sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; + }; + }; + "source-map-0.1.43" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.43"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + }; + "optimist-0.3.7" = { + name = "optimist"; + packageName = "optimist"; + version = "0.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; + sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "source-map-0.5.6" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "kind-of-3.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; + sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-buffer-1.1.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; + sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + }; + }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -2155,13 +2489,22 @@ let sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; }; }; - "cssom-0.3.1" = { + "abab-1.0.3" = { + name = "abab"; + packageName = "abab"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; + sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + }; + }; + "cssom-0.3.2" = { name = "cssom"; packageName = "cssom"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; - sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz"; + sha1 = "b8036170c79f07a90ff2f16e22284027a243848b"; }; }; "cssstyle-0.2.37" = { @@ -2200,31 +2543,31 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.79.0" = { + "request-2.80.0" = { name = "request"; packageName = "request"; - version = "2.79.0"; + version = "2.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/request/-/request-2.80.0.tgz"; + sha1 = "8cc162d76d79381cdefdd3505d76b80b60589bd0"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; - "symbol-tree-3.2.1" = { + "symbol-tree-3.2.2" = { name = "symbol-tree"; packageName = "symbol-tree"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz"; - sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"; + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; }; }; "tough-cookie-2.3.2" = { @@ -2362,15 +2705,6 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -2380,22 +2714,22 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.11.0" = { + "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; "combined-stream-1.0.5" = { @@ -2434,13 +2768,13 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "har-validator-2.0.6" = { + "har-validator-4.2.1" = { name = "har-validator"; packageName = "har-validator"; - version = "2.0.6"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; "hawk-3.1.3" = { @@ -2497,13 +2831,22 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.3.0" = { + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.3.2" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; }; }; "stringstream-0.0.5" = { @@ -2524,15 +2867,6 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -2551,139 +2885,49 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ajv-4.11.4" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz"; + sha1 = "ebf3a55d4b132ea60ff5847ae85d2ef069960b45"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "is-my-json-valid-2.15.0" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; "hoek-2.16.3" = { @@ -2740,13 +2984,13 @@ let sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.11.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; + sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; }; }; "extsprintf-1.0.2" = { @@ -2812,13 +3056,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2848,13 +3092,13 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; "punycode-1.4.1" = { @@ -2875,6 +3119,24 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; + "debug-2.3.3" = { + name = "debug"; + packageName = "debug"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; + sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; + }; + }; + "vary-1.1.0" = { + name = "vary"; + packageName = "vary"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; + sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + }; + }; "minimist-0.0.8" = { name = "minimist"; packageName = "minimist"; @@ -2884,15 +3146,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -2938,6 +3191,15 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; "domelementtype-1.3.0" = { name = "domelementtype"; packageName = "domelementtype"; @@ -2974,13 +3236,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; + sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; }; }; "dom-serializer-0.1.0" = { @@ -3046,33 +3308,6 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -3181,6 +3416,15 @@ let sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; "wrap-ansi-2.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -3190,6 +3434,15 @@ let sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; "lcid-1.0.0" = { name = "lcid"; packageName = "lcid"; @@ -3262,6 +3515,51 @@ let sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; }; }; + "assert-1.4.1" = { + name = "assert"; + packageName = "assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + }; + "es6-shim-0.27.1" = { + name = "es6-shim"; + packageName = "es6-shim"; + version = "0.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.27.1.tgz"; + sha1 = "bd3f870663eac2ede8e8943e2a6d23c052d53fc6"; + }; + }; + "minimum-tls-version-0.0.1" = { + name = "minimum-tls-version"; + packageName = "minimum-tls-version"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimum-tls-version/-/minimum-tls-version-0.0.1.tgz"; + sha1 = "42220187e52700e253218cfa8ad974920b73ea74"; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "underscore-1.6.0" = { name = "underscore"; packageName = "underscore"; @@ -3280,13 +3578,31 @@ let sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; }; - "mongodb-2.2.21" = { + "databank-1.0.1" = { + name = "databank"; + packageName = "databank"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-1.0.1.tgz"; + sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; + }; + }; + "mongodb-2.2.24" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.21"; + version = "2.2.24"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz"; - sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz"; + sha1 = "80f40d6ec5bdec0ddecf0f9ce0144e794c46449a"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; "es6-promise-3.2.1" = { @@ -3298,13 +3614,13 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.1.6" = { + "mongodb-core-2.1.8" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.1.6"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz"; - sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz"; + sha1 = "b33e0370d0a59d97b6cb1ec610527be9e95ca2c0"; }; }; "readable-stream-2.1.5" = { @@ -3361,78 +3677,6 @@ let sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "memcached-0.2.8" = { - name = "memcached"; - packageName = "memcached"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; - sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; - }; - }; - "databank-0.18.2" = { - name = "databank"; - packageName = "databank"; - version = "0.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; - sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; - }; - }; - "underscore-1.4.4" = { - name = "underscore"; - packageName = "underscore"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - }; - "hashring-0.0.8" = { - name = "hashring"; - packageName = "hashring"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; - sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; - }; - }; - "jackpot-0.0.6" = { - name = "jackpot"; - packageName = "jackpot"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; - sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; - }; - }; - "bisection-0.0.3" = { - name = "bisection"; - packageName = "bisection"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; - sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; - }; - }; - "simple-lru-cache-0.0.2" = { - name = "simple-lru-cache"; - packageName = "simple-lru-cache"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - }; - "retry-0.6.0" = { - name = "retry"; - packageName = "retry"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }; - }; "lru-cache-2.3.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -3446,8 +3690,8 @@ let args = { name = "pump.io"; packageName = "pump.io"; - version = "1.0.0"; - src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }; + version = "3.0.0"; + src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-3.0.0.tgz"; sha1 = "ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"; }; dependencies = [ (sources."bcrypt-0.8.7" // { dependencies = [ @@ -3455,11 +3699,11 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.5" // { + (sources."bunyan-1.8.8" // { dependencies = [ - (sources."dtrace-provider-0.8.0" // { + (sources."dtrace-provider-0.8.1" // { dependencies = [ - sources."nan-2.5.0" + sources."nan-2.5.1" ]; }) (sources."mv-2.1.1" // { @@ -3497,10 +3741,11 @@ let }) ]; }) - sources."safe-json-stringify-1.0.3" + sources."safe-json-stringify-1.0.4" sources."moment-2.17.1" ]; }) + sources."colors-1.1.2" (sources."connect-2.30.2" // { dependencies = [ sources."basic-auth-connect-1.0.0" @@ -3553,12 +3798,12 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.4" // { + (sources."csrf-3.0.5" // { dependencies = [ sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.3" // { + (sources."uid-safe-2.1.4" // { dependencies = [ sources."random-bytes-1.0.0" ]; @@ -3616,17 +3861,6 @@ let sources."statuses-1.3.1" ]; }) - (sources."method-override-2.3.7" // { - dependencies = [ - (sources."debug-2.3.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."methods-1.1.2" - sources."vary-1.1.0" - ]; - }) (sources."morgan-1.6.1" // { dependencies = [ sources."basic-auth-1.0.4" @@ -3700,51 +3934,52 @@ let sources."vhost-3.0.2" ]; }) - (sources."connect-auth-0.6.1" // { + (sources."connect-auth-git://github.com/e14n/connect-auth" // { dependencies = [ - (sources."connect-2.7.11" // { - dependencies = [ - sources."qs-0.6.5" - sources."formidable-1.0.14" - sources."cookie-signature-1.0.1" - sources."buffer-crc32-0.2.1" - sources."cookie-0.0.5" - (sources."send-0.1.1" // { - dependencies = [ - sources."mime-1.2.11" - sources."range-parser-0.0.4" - ]; - }) - sources."bytes-0.2.0" - sources."fresh-0.1.0" - sources."pause-0.0.1" - (sources."debug-2.6.0" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - ]; - }) - sources."oauth-0.9.10" + sources."oauth-0.9.7" sources."openid-0.4.1" ]; }) (sources."connect-databank-1.0.3" // { dependencies = [ sources."async-1.5.2" + sources."node-uuid-1.4.7" sources."set-immediate-0.1.1" ]; }) - sources."crypto-cacerts-0.1.0" - (sources."databank-0.19.5" // { + (sources."connect-multiparty-2.0.0" // { dependencies = [ - (sources."vows-0.7.0" // { + (sources."multiparty-4.1.3" // { dependencies = [ - sources."eyes-0.1.8" - sources."diff-1.0.8" + (sources."fd-slicer-1.0.1" // { + dependencies = [ + sources."pend-1.2.0" + ]; + }) ]; }) - sources."setimmediate-1.0.5" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."qs-4.0.0" + (sources."type-is-1.6.14" // { + dependencies = [ + sources."media-typer-0.3.0" + (sources."mime-types-2.1.14" // { + dependencies = [ + sources."mime-db-1.26.0" + ]; + }) + ]; + }) + ]; + }) + sources."crypto-cacerts-0.1.0" + (sources."databank-0.19.8" // { + dependencies = [ + sources."set-immediate-0.1.1" ]; }) (sources."dateformat-1.0.12" // { @@ -3770,9 +4005,9 @@ let }) sources."map-obj-1.0.1" sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -3811,7 +4046,7 @@ let sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -3872,9 +4107,10 @@ let (sources."dialback-client-0.2.0" // { dependencies = [ sources."underscore-1.5.2" + sources."step-0.0.6" ]; }) - sources."dompurify-0.8.4" + sources."dompurify-0.8.5" (sources."emailjs-1.0.8" // { dependencies = [ sources."addressparser-0.3.2" @@ -3893,34 +4129,70 @@ let sources."bufferjs-1.1.0" ]; }) - (sources."express-2.5.11" // { + (sources."express-3.21.2" // { dependencies = [ - (sources."connect-1.9.2" // { - dependencies = [ - sources."formidable-1.0.17" - ]; - }) - sources."mime-1.2.4" - sources."qs-0.4.2" - sources."mkdirp-0.3.0" - ]; - }) - (sources."express-session-1.14.2" // { - dependencies = [ - sources."cookie-0.3.1" + sources."basic-auth-1.0.4" + sources."content-disposition-0.5.0" + sources."content-type-1.0.2" + sources."commander-2.6.0" + sources."cookie-0.1.3" sources."cookie-signature-1.0.6" - sources."crc-3.4.1" (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) + sources."depd-1.0.1" + sources."escape-html-1.0.2" + sources."etag-1.7.0" + sources."fresh-0.3.0" + sources."merge-descriptors-1.0.0" + sources."methods-1.1.2" + sources."parseurl-1.3.1" + (sources."proxy-addr-1.0.10" // { + dependencies = [ + sources."forwarded-0.1.0" + sources."ipaddr.js-1.0.5" + ]; + }) + sources."range-parser-1.0.3" + (sources."send-0.13.0" // { + dependencies = [ + sources."destroy-1.0.3" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.1" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."statuses-1.2.1" + ]; + }) + sources."utils-merge-1.0.0" + sources."vary-1.0.1" + ]; + }) + (sources."express-session-1.15.1" // { + dependencies = [ + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."crc-3.4.4" + (sources."debug-2.6.1" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) sources."depd-1.1.0" sources."on-headers-1.0.1" sources."parseurl-1.3.1" - (sources."uid-safe-2.1.3" // { + (sources."uid-safe-2.1.4" // { dependencies = [ - sources."base64-url-1.3.3" sources."random-bytes-1.0.0" ]; }) @@ -3953,23 +4225,25 @@ let }) ]; }) - (sources."helmet-2.3.0" // { + (sources."helmet-3.4.1" // { dependencies = [ - (sources."connect-3.4.1" // { + (sources."connect-3.6.0" // { dependencies = [ - (sources."debug-2.2.0" // { + (sources."debug-2.6.1" // { dependencies = [ - sources."ms-0.7.1" + sources."ms-0.7.2" ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-1.0.0" // { dependencies = [ + sources."encodeurl-1.0.1" sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { dependencies = [ sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.1" sources."unpipe-1.0.0" ]; }) @@ -3979,34 +4253,155 @@ let }) sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" - sources."frameguard-2.0.0" - (sources."helmet-csp-1.2.2" // { + sources."frameguard-3.0.0" + (sources."helmet-csp-2.3.0" // { dependencies = [ sources."camelize-1.0.0" - (sources."content-security-policy-builder-1.0.0" // { + (sources."content-security-policy-builder-1.1.0" // { dependencies = [ sources."dashify-0.2.2" ]; }) - sources."lodash.reduce-4.5.0" - sources."platform-1.3.1" + sources."dasherize-2.0.0" + sources."lodash.reduce-4.6.0" + sources."platform-1.3.3" ]; }) sources."hide-powered-by-1.0.0" - sources."hpkp-1.2.0" - (sources."hsts-1.0.0" // { + sources."hpkp-2.0.0" + (sources."hsts-2.0.0" // { dependencies = [ sources."core-util-is-1.0.2" ]; }) sources."ienoopen-1.0.0" - (sources."nocache-1.0.1" // { + sources."nocache-2.0.0" + sources."referrer-policy-1.1.0" + sources."x-xss-protection-1.0.0" + ]; + }) + (sources."jade-1.11.0" // { + dependencies = [ + sources."character-parser-1.2.1" + (sources."clean-css-3.4.25" // { dependencies = [ - sources."depd-1.1.0" + (sources."commander-2.8.1" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."source-map-0.4.4" // { + dependencies = [ + sources."amdefine-1.0.1" + ]; + }) + ]; + }) + sources."commander-2.6.0" + (sources."constantinople-3.0.2" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) + (sources."jstransformer-0.0.2" // { + dependencies = [ + sources."is-promise-2.1.0" + (sources."promise-6.1.0" // { + dependencies = [ + sources."asap-1.0.0" + ]; + }) + ]; + }) + (sources."transformers-2.1.0" // { + dependencies = [ + (sources."promise-2.0.0" // { + dependencies = [ + sources."is-promise-1.0.1" + ]; + }) + (sources."css-1.0.8" // { + dependencies = [ + sources."css-parse-1.0.4" + sources."css-stringify-1.0.5" + ]; + }) + (sources."uglify-js-2.2.5" // { + dependencies = [ + (sources."source-map-0.1.43" // { + dependencies = [ + sources."amdefine-1.0.1" + ]; + }) + (sources."optimist-0.3.7" // { + dependencies = [ + sources."wordwrap-0.0.3" + ]; + }) + ]; + }) + ]; + }) + (sources."uglify-js-2.8.9" // { + dependencies = [ + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.10.0" // { + dependencies = [ + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.1.0" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + ]; + }) + ]; + }) + sources."void-elements-2.0.1" + (sources."with-4.0.3" // { + dependencies = [ + sources."acorn-1.2.2" + (sources."acorn-globals-1.0.9" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) ]; }) - sources."referrer-policy-1.0.0" - sources."x-xss-protection-1.0.0" ]; }) sources."jankyqueue-0.1.1" @@ -4015,7 +4410,7 @@ let sources."abab-1.0.3" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."cssom-0.3.1" + sources."cssom-0.3.2" sources."cssstyle-0.2.37" (sources."escodegen-1.8.1" // { dependencies = [ @@ -4041,11 +4436,11 @@ let }) sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.79.0" // { + (sources."request-2.80.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" - sources."caseless-0.11.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -4058,47 +4453,19 @@ let sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { + (sources."ajv-4.11.4" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."jsonify-0.0.0" ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.15.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -4119,17 +4486,17 @@ let sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.2" // { + (sources."sshpk-1.11.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -4143,14 +4510,14 @@ let ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."performance-now-0.2.0" + sources."qs-6.3.2" sources."stringstream-0.0.5" sources."tunnel-agent-0.4.3" - sources."uuid-3.0.1" ]; }) - sources."sax-1.2.1" - sources."symbol-tree-3.2.1" + sources."sax-1.2.2" + sources."symbol-tree-3.2.2" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" @@ -4165,20 +4532,32 @@ let sources."xml-name-validator-2.0.1" ]; }) + (sources."method-override-2.3.7" // { + dependencies = [ + (sources."debug-2.3.3" // { + dependencies = [ + sources."ms-0.7.2" + ]; + }) + sources."methods-1.1.2" + sources."parseurl-1.3.1" + sources."vary-1.1.0" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."node-uuid-1.4.7" sources."oauth-evanp-0.9.10-evanp.2" + sources."octal-1.0.0" (sources."optimist-0.6.1" // { dependencies = [ sources."wordwrap-0.0.3" sources."minimist-0.0.10" ]; }) - (sources."rimraf-2.5.4" // { + (sources."rimraf-2.6.1" // { dependencies = [ (sources."glob-7.1.1" // { dependencies = [ @@ -4226,7 +4605,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.3" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4267,7 +4646,7 @@ let sources."statuses-1.2.1" ]; }) - (sources."showdown-1.6.0" // { + (sources."showdown-1.6.4" // { dependencies = [ (sources."yargs-6.6.0" // { dependencies = [ @@ -4312,7 +4691,7 @@ let sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -4332,9 +4711,9 @@ let }) ]; }) - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4407,7 +4786,22 @@ let sources."uuid-2.0.3" ]; }) - sources."step-0.0.6" + (sources."ssl-config-0.0.9" // { + dependencies = [ + (sources."assert-1.4.1" // { + dependencies = [ + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + ]; + }) + sources."es6-shim-0.27.1" + sources."minimum-tls-version-0.0.1" + ]; + }) + sources."step-1.0.0" sources."ua-parser-js-0.7.12" sources."underscore-1.8.3" (sources."underscore-contrib-0.3.0" // { @@ -4415,28 +4809,34 @@ let sources."underscore-1.6.0" ]; }) - sources."utml-0.2.0" + sources."uuid-3.0.1" sources."validator-4.4.0" (sources."webfinger-0.4.2" // { dependencies = [ + sources."step-0.0.6" (sources."xml2js-0.1.14" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) ]; }) - (sources."databank-mongodb-0.19.0" // { + (sources."databank-mongodb-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."databank-1.0.1" // { + dependencies = [ + sources."setimmediate-1.0.5" + ]; + }) + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.21" // { + (sources."mongodb-2.2.24" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.6" // { + (sources."mongodb-core-2.1.8" // { dependencies = [ sources."bson-1.0.4" (sources."require_optional-1.0.0" // { @@ -4469,37 +4869,6 @@ let sources."underscore-1.6.0" ]; }) - (sources."databank-memcached-0.15.0" // { - dependencies = [ - (sources."memcached-0.2.8" // { - dependencies = [ - (sources."hashring-0.0.8" // { - dependencies = [ - sources."bisection-0.0.3" - sources."simple-lru-cache-0.0.2" - ]; - }) - (sources."jackpot-0.0.6" // { - dependencies = [ - sources."retry-0.6.0" - ]; - }) - ]; - }) - (sources."databank-0.18.2" // { - dependencies = [ - (sources."vows-0.7.0" // { - dependencies = [ - sources."eyes-0.1.8" - sources."diff-1.0.8" - ]; - }) - sources."set-immediate-0.1.1" - ]; - }) - sources."underscore-1.4.4" - ]; - }) (sources."databank-lrucache-0.1.2" // { dependencies = [ sources."underscore-1.5.2" From f1a1490135aaf4d2f1fe9b4001cc40718c6ebf2a Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 10 Mar 2017 22:34:42 +0000 Subject: [PATCH 055/278] pumpio service: adjust upload directory config for 3.0.0 These changes are backwards compatible. --- nixos/modules/services/web-apps/pump.io.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix index b7c64bc6940b..b946aa28477f 100644 --- a/nixos/modules/services/web-apps/pump.io.nix +++ b/nixos/modules/services/web-apps/pump.io.nix @@ -57,7 +57,8 @@ let smtpfrom = cfg.smtpFrom; nologger = false; - uploaddir = "${dataDir}/uploads"; + enableUploads = cfg.enableUploads; + datadir = dataDir; debugClient = false; firehose = cfg.firehose; disableRegistration = cfg.disableRegistration; @@ -152,6 +153,15 @@ in ''; }; + enableUploads = mkOption { + type = types.bool; + default = true; + description = '' + If you want to disable file uploads, set this to false. Uploaded files will be stored + in ${dataDir}/uploads. + ''; + }; + sslKey = mkOption { type = types.path; example = "${dataDir}/myserver.key"; @@ -341,7 +351,15 @@ in { description = "pump.io social network stream server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p ${dataDir}/uploads + chown pumpio:pumpio ${dataDir}/uploads + chmod 770 ${dataDir}/uploads + ''; + serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json"; + PermissionsStartOnly = true; serviceConfig.User = if cfg.port < 1024 then "root" else user; serviceConfig.Group = user; }; From f488b1811bf0ee1430ce728d661830e55abef88c Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 10 Mar 2017 22:16:12 +0000 Subject: [PATCH 056/278] pumpio service: don't keep secrets in nix store Added extra config options to allow reading passwords from file rather than the world-readable nix store. The full config.json file is created at service startup. Relevant to #18881 --- .../services/web-apps/pump.io-configure.js | 23 ++ nixos/modules/services/web-apps/pump.io.nix | 196 +++++++++++------- 2 files changed, 149 insertions(+), 70 deletions(-) create mode 100644 nixos/modules/services/web-apps/pump.io-configure.js diff --git a/nixos/modules/services/web-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js new file mode 100644 index 000000000000..1fbf346a34c4 --- /dev/null +++ b/nixos/modules/services/web-apps/pump.io-configure.js @@ -0,0 +1,23 @@ +var fs = require('fs'); + +var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString()); +var config = opts.config; + +var readSecret = function(filename) { + return fs.readFileSync(filename).toString().trim(); +}; + +if (opts.secretFile) { + config.secret = readSecret(opts.secretFile); +} +if (opts.dbPasswordFile) { + config.params.dbpass = readSecret(opts.dbPasswordFile); +} +if (opts.smtpPasswordFile) { + config.smtppass = readSecret(opts.smtpPasswordFile); +} +if (opts.spamClientSecretFile) { + config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile); +} + +fs.writeFileSync(opts.outputFile, JSON.stringify(config)); diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix index b946aa28477f..27ae68516367 100644 --- a/nixos/modules/services/web-apps/pump.io.nix +++ b/nixos/modules/services/web-apps/pump.io.nix @@ -5,72 +5,74 @@ with lib; let cfg = config.services.pumpio; dataDir = "/var/lib/pump.io"; + runDir = "/run/pump.io"; user = "pumpio"; + optionalSet = condition: value: if condition then value else {}; + + configScript = ./pump.io-configure.js; configOptions = { - driver = if cfg.driver == "disk" then null else cfg.driver; - params = ({ } // - (if cfg.driver == "disk" then { - dir = dataDir; - } else { }) // - (if cfg.driver == "mongodb" || cfg.driver == "redis" then { - host = cfg.dbHost; - port = cfg.dbPort; - dbname = cfg.dbName; - dbuser = cfg.dbUser; - dbpass = cfg.dbPassword; - } else { }) // - (if cfg.driver == "memcached" then { - host = cfg.dbHost; - port = cfg.dbPort; - } else { }) // - cfg.driverParams); + outputFile = "${runDir}/config.json"; + config = + (optionalSet (cfg.driver != "disk") { + driver = cfg.driver; + }) // + { + params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) // + (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") { + host = cfg.dbHost; + port = cfg.dbPort; + dbname = cfg.dbName; + dbuser = cfg.dbUser; + dbpass = cfg.dbPassword; + }) // + (optionalSet (cfg.driver == "memcached") { + host = cfg.dbHost; + port = cfg.dbPort; + }) // cfg.driverParams; + secret = cfg.secret; - secret = cfg.secret; + address = cfg.address; + port = cfg.port; - address = cfg.address; - port = cfg.port; + noweb = false; + urlPort = cfg.urlPort; + hostname = cfg.hostname; + favicon = cfg.favicon; - noweb = false; - urlPort = cfg.urlPort; - hostname = cfg.hostname; - favicon = cfg.favicon; + site = cfg.site; + owner = cfg.owner; + ownerURL = cfg.ownerURL; - site = cfg.site; - owner = cfg.owner; - ownerURL = cfg.ownerURL; + key = cfg.sslKey; + cert = cfg.sslCert; + bounce = false; - key = cfg.sslKey; - cert = cfg.sslCert; - bounce = false; + spamhost = cfg.spamHost; + spamclientid = cfg.spamClientId; + spamclientsecret = cfg.spamClientSecret; - spamhost = cfg.spamHost; - spamclientid = cfg.spamClientId; - spamclientsecret = cfg.spamClientSecret; + requireEmail = cfg.requireEmail; + smtpserver = cfg.smtpHost; + smtpport = cfg.smtpPort; + smtpuser = cfg.smtpUser; + smtppass = cfg.smtpPassword; + smtpusessl = cfg.smtpUseSSL; + smtpfrom = cfg.smtpFrom; - requireEmail = cfg.requireEmail; - smtpserver = cfg.smtpHost; - smtpport = cfg.smtpPort; - smtpuser = cfg.smtpUser; - smtppass = cfg.smtpPassword; - smtpusessl = cfg.smtpUseSSL; - smtpfrom = cfg.smtpFrom; + nologger = false; + enableUploads = cfg.enableUploads; + datadir = dataDir; + debugClient = false; + firehose = cfg.firehose; + disableRegistration = cfg.disableRegistration; - nologger = false; - enableUploads = cfg.enableUploads; - datadir = dataDir; - debugClient = false; - firehose = cfg.firehose; - disableRegistration = cfg.disableRegistration; - } // - (if cfg.port < 1024 then { - serverUser = user; # have pump.io listen then drop privileges - } else { }) // - cfg.extraConfig; - -in - -{ + inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile; + } // + (optionalSet (cfg.port < 1024) { + serverUser = user; # have pump.io listen then drop privileges + }) // cfg.extraConfig; +}; in { options = { services.pumpio = { @@ -78,7 +80,8 @@ in enable = mkEnableOption "Pump.io social streams server"; secret = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "my dog has fleas"; description = '' A session-generating secret, server-wide password. Warning: @@ -86,6 +89,16 @@ in ''; }; + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-secret"; + description = '' + A file containing the session-generating secret, + server-wide password. + ''; + }; + site = mkOption { type = types.str; example = "Awesome Sauce"; @@ -126,7 +139,7 @@ in hostname = mkOption { type = types.nullOr types.str; - default = null; + default = "localhost"; description = '' The hostname of the server, used for generating URLs. Defaults to "localhost" which doesn't do much for you. @@ -263,6 +276,15 @@ in ''; }; + dbPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-dbpassword"; + description = '' + A file containing the password corresponding to dbUser. + ''; + }; + smtpHost = mkOption { type = types.nullOr types.str; default = null; @@ -301,6 +323,17 @@ in ''; }; + smtpPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-smtppassword"; + description = '' + A file containing the password used to connect to SMTP + server. Might not be necessary for some servers. + ''; + }; + + smtpUseSSL = mkOption { type = types.bool; default = false; @@ -342,32 +375,55 @@ in stored in cleartext in the Nix store! ''; }; + spamClientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pump.io-spamclientsecret"; + description = '' + A file containing the OAuth key for the spam server. + ''; + }; }; }; config = mkIf cfg.enable { + warnings = let warn = k: optional (cfg.${k} != null) + "config.services.pumpio.${k} is insecure. Use ${k}File instead."; + in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ]; + + assertions = [ + { assertion = !(isNull cfg.secret && isNull cfg.secretFile); + message = "pump.io needs a secretFile configured"; + } + ]; + systemd.services."pump.io" = - { description = "pump.io social network stream server"; + { description = "Pump.io - stream server that does most of what people really want from a social network"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -p ${dataDir}/uploads - chown pumpio:pumpio ${dataDir}/uploads - chmod 770 ${dataDir}/uploads + mkdir -p ${runDir} + chown pumpio:pumpio ${dataDir}/uploads ${runDir} + chmod 770 ${dataDir}/uploads ${runDir} + + ${pkgs.nodejs}/bin/node ${configScript} < Date: Sun, 12 Mar 2017 15:56:31 +0100 Subject: [PATCH 057/278] pump.io: fix tests fixes #23568 --- nixos/tests/pump.io.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix index 18da52b5134b..0991ed3fce1f 100644 --- a/nixos/tests/pump.io.nix +++ b/nixos/tests/pump.io.nix @@ -51,16 +51,6 @@ import ./make-test.nix ({ pkgs, ...} : let Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w== -----END CERTIFICATE----- ''; - - makePump = { opts ? { } }: - { - enable = true; - sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; - sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; - secret = "test"; - site = "test"; - } // opts; - in { name = "pumpio"; meta = with pkgs.stdenv.lib.maintainers; { @@ -72,9 +62,14 @@ in { { config, pkgs, ... }: { services = { - pumpio = makePump { opts = { + pumpio = { port = 443; - }; }; + enable = true; + sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert; + sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey; + secretFile = pkgs.writeText "secretFile" "test123"; + site = "test"; + }; mongodb.enable = true; mongodb.extraConfig = '' storage.journal.enabled: false From 2d47e1be722df1e61132ae4a7b17444f3af656f9 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 12 Mar 2017 16:49:24 +0100 Subject: [PATCH 058/278] kdevelop: 5.0.3 -> 5.0.4 (#23788) --- .../editors/kdevelop5/kdevelop.nix | 6 +- .../kdevplatform-projectconfigskeleton.patch | 55 ------------------- .../editors/kdevelop5/kdevplatform.nix | 8 +-- 3 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 19ffb2c4959b..facd1206a00e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,8 +9,8 @@ let pname = "kdevelop"; - version = "5.0.3"; - dirVersion = "5.0.3"; + version = "5.0.4"; + dirVersion = "5.0.4"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601"; + sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch deleted file mode 100644 index ba5140c77fcf..000000000000 --- a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001 -From: Kevin Funk -Date: Mon, 5 Dec 2016 15:20:53 +0100 -Subject: Hotfix for restoring build with newer KConfig - -https://phabricator.kde.org/D3386 is a SIC change, handle that ---- - project/projectconfigskeleton.cpp | 4 ++++ - project/projectconfigskeleton.h | 14 +++++--------- - 2 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp -index 0e06149..c4c9767 100644 ---- a/project/projectconfigskeleton.cpp -+++ b/project/projectconfigskeleton.cpp -@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname ) - ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config ) - : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate ) - { -+ // FIXME: Check if that does the right thing. -+ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public -+ Q_ASSERT(config); -+ d->m_developerTempFile = config->name(); - } - - void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg ) -diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h -index ed17ed0..c8314df 100644 ---- a/project/projectconfigskeleton.h -+++ b/project/projectconfigskeleton.h -@@ -55,16 +55,12 @@ public: - - Path projectFile() const; - Path developerFile() const; -+ -+protected: -+ explicit ProjectConfigSkeleton( KSharedConfigPtr config ); -+ - private: -- /** -- * There's no way in KDE4 API to find out the file that the config object -- * was created from, so we can't apply defaults when using this -- * constructors. Thus I'm making this private, so we can find out when -- * this constructor is used and see if we need to add appropriate API to -- * kdelibs -- */ -- explicit ProjectConfigSkeleton( KSharedConfigPtr config ); -- struct ProjectConfigSkeletonPrivate * const d; -+ struct ProjectConfigSkeletonPrivate * const d; - }; - - } --- -cgit v0.11.2 - diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index c36885a9e139..f2b4fc32fe4c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -6,8 +6,8 @@ let pname = "kdevplatform"; - version = "5.0.3"; - dirVersion = "5.0.3"; + version = "5.0.4"; + dirVersion = "5.0.4"; in stdenv.mkDerivation rec { @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; + sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471"; }; - patches = [ ./kdevplatform-projectconfigskeleton.patch ]; - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; propagatedBuildInputs = [ ]; From 697838cbea0d7aadb7ca3a4da78ab2753af2bf63 Mon Sep 17 00:00:00 2001 From: Ji-Haeng Huh Date: Sat, 25 Feb 2017 22:18:03 +0100 Subject: [PATCH 059/278] yasr: init at 0.6.9 fixes #23188 --- .../yasr/10_fix_openpty_forkpty_declarations | 25 +++++++++++++++++ pkgs/applications/audio/yasr/20_maxpathlen | 11 ++++++++ pkgs/applications/audio/yasr/30_conf | 18 ++++++++++++ .../audio/yasr/40_dectalk_extended_chars | 14 ++++++++++ pkgs/applications/audio/yasr/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 98 insertions(+) create mode 100644 pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations create mode 100644 pkgs/applications/audio/yasr/20_maxpathlen create mode 100644 pkgs/applications/audio/yasr/30_conf create mode 100644 pkgs/applications/audio/yasr/40_dectalk_extended_chars create mode 100644 pkgs/applications/audio/yasr/default.nix diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations new file mode 100644 index 000000000000..f575af5ecd31 --- /dev/null +++ b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations @@ -0,0 +1,25 @@ +Disable openpty() and forkpty() prototypes when needed. +--- a/yasr/yasr.h ++++ b/yasr/yasr.h +@@ -308,8 +308,10 @@ extern void opt_set(int num, void *val); + extern void opt_queue_empty(int ll); + extern void opt_write(FILE * fp); + ++#ifndef HAVE_OPENPTY + /* openpty.c prototypes */ + extern int openpty(int *, int *, char *, struct termios *, struct winsize *); ++#endif + + /* cfmakeraw.c prototypes */ + extern void cfmakeraw(struct termios *); +@@ -317,8 +319,10 @@ extern void cfmakeraw(struct termios *); + /* login_tty.c prototypes */ + extern int login_tty(int); + ++#ifndef HAVE_FORKPTY + /* forkpty.c prototypes */ + extern int forkpty(int *, char *, struct termios *, struct winsize *); ++#endif + + /* tbc - Would it be more efficient to ensure that "blank" grids always held + ascii 0x20 rather than ascii 0x00? */ diff --git a/pkgs/applications/audio/yasr/20_maxpathlen b/pkgs/applications/audio/yasr/20_maxpathlen new file mode 100644 index 000000000000..386c6cbf22bd --- /dev/null +++ b/pkgs/applications/audio/yasr/20_maxpathlen @@ -0,0 +1,11 @@ +--- a/yasr/config.c.orig 2011-11-28 03:56:58.764995828 +0100 ++++ a/yasr/config.c 2011-11-28 03:57:00.048967703 +0100 +@@ -60,7 +60,7 @@ + int args, arg[16], *argp; + int i, key, ln = 0, mode = 0; + char *home, *ptr, *s; +- char confname[MAXPATHLEN]; ++ char confname[strlen(PACKAGE_DATA_DIR) + 10 + 1]; + + if ((home = getenv("HOME")) != NULL) + { diff --git a/pkgs/applications/audio/yasr/30_conf b/pkgs/applications/audio/yasr/30_conf new file mode 100644 index 000000000000..98e959f55f31 --- /dev/null +++ b/pkgs/applications/audio/yasr/30_conf @@ -0,0 +1,18 @@ +diff --git a/yasr.conf b/yasr.conf +index 1e07fc6..72f5922 100644 +--- a/yasr.conf ++++ b/yasr.conf +@@ -59,11 +59,11 @@ synthesizer=emacspeak server + #synthesizer=speech dispatcher + #synthesizer port=S0 + #synthesizer port=l0 +-synthesizer port=|/usr/local/bin/eflite ++synthesizer port=|eflite + # Below line appropriate for Speech Dispatcher in its default configuration + #synthesizer port=127.0.0.1:6560 + key echo=off +-shell=/bin/bash ++shell=/bin/sh + special=off + up and down arrows=speak line + DisableKey=6925 diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/pkgs/applications/audio/yasr/40_dectalk_extended_chars new file mode 100644 index 000000000000..cc1f0af86065 --- /dev/null +++ b/pkgs/applications/audio/yasr/40_dectalk_extended_chars @@ -0,0 +1,14 @@ +Index: yasr-0.6.9/yasr/tts.c +=================================================================== +--- yasr-0.6.9.orig/yasr/tts.c 2008-02-03 00:10:07.000000000 +1100 ++++ yasr-0.6.9/yasr/tts.c 2012-02-05 10:59:06.059007839 +1100 +@@ -281,6 +281,9 @@ + char *p = synth[tts.synth].unspeakable; + + if (ch < 32) return 1; ++ /* characters with high bit set cause DECTALK to crash */ ++ if (tts.synth == TTS_DECTALK && ch & 0x80) ++ return 1; + while (*p) + { + if (*p++ == ch) return 1; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix new file mode 100644 index 000000000000..b700cc0bd83d --- /dev/null +++ b/pkgs/applications/audio/yasr/default.nix @@ -0,0 +1,28 @@ +{stdenv,fetchurl}: + +stdenv.mkDerivation rec { + name = "yasr-${version}"; + + version = "0.6.9"; + + src = fetchurl { + url = "https://sourceforge.net/projects/yasr/files/yasr/${version}/${name}.tar.gz"; + sha256 = "1prv9r9y6jb5ga5578ldiw507fa414m60xhlvjl29278p3x7rwa1"; + }; + + patches = [ + ./10_fix_openpty_forkpty_declarations + ./20_maxpathlen + ./30_conf + ./40_dectalk_extended_chars + ]; # taken from the debian yasr package + + meta = { + homepage = "http://yasr.sourceforge.net"; + description = "A general-purpose console screen reader"; + longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc3924c5829e..0d30d2197ce9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4626,6 +4626,8 @@ with pkgs; yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; + + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; From 496b2930702c6ecab344fe6f6205dea0039ef43a Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 11:15:38 -0500 Subject: [PATCH 060/278] dlib: 18.10 -> 19.4 --- pkgs/development/libraries/dlib/default.nix | 40 ++++++--------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 8a24445dcca7..fe4e7907c9fe 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,45 +1,25 @@ -{ stdenv, fetchurl, cmake, xlibsWrapper }: +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }: stdenv.mkDerivation rec { - version = "18.10"; + version = "19.4"; name = "dlib-${version}"; - src = fetchurl { - url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; - sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + src = fetchFromGitHub { + owner = "davisking"; + repo = "dlib"; + rev ="v${version}"; + sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4"; }; - # The supplied CMakeLists.txt does not have any install targets. - sources_var = "\$\{sources\}"; - headers_var = "\$\{hearders\}"; - preConfigure = '' - cat << EOF > CMakeLists.txt - cmake_minimum_required(VERSION 2.6 FATAL_ERROR) - project(dlib) - - include_directories(./) - - file(GLOB sources ./dlib/all/*.cpp) - file(GLOB headers ./dlib/*.h) - - SET(LIBRARY_OUTPUT_PATH ".") - add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) - - install(TARGETS dlib DESTINATION lib) - install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") - EOF - ''; - enableParallelBuilding = true; - buildInputs = [ cmake xlibsWrapper ]; - propagatedBuildInputs = [ xlibsWrapper ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = http://www.dlib.net; - license = stdenv.lib.licenses.boost; + license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } From e333a71478730c63510b48131282f97b5e9c1af9 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 12 Mar 2017 16:24:43 +0000 Subject: [PATCH 061/278] scala: put docs in correct subdirectory Under NixOS, /run/current-system/sw/share/doc was getting the license file, etc. --- pkgs/development/compilers/scala/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 8e1f8dd47220..7971d7a8b23d 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { rm "bin/"*.bat mv * $out + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/scala + for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ --prefix PATH ":" ${coreutils}/bin \ From 69448187a47619f60f6506e3c96e36aed073e491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Mar 2017 18:17:53 +0100 Subject: [PATCH 062/278] haskellPackages.llvm-general-darwin: fix #23794 by hiding under llvm-general. There seems no use in a separately named attribute. The derivations are unchanged. --- .../haskell-modules/configuration-nix.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 85421ba960e8..3dd462397742 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -216,20 +216,19 @@ self: super: builtins.intersectAttrs super { # Uses OpenGL in testing caramia = dontCheck super.caramia; - llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: { - preConfigure = '' - sed -i llvm-general.cabal \ - -e 's,extra-libraries: stdc++,extra-libraries: c++,' - ''; - configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; - librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; - }); - - # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 llvm-general = - if pkgs.stdenv.isDarwin - then self.llvm-general-darwin - else super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142 + let base = super.llvm-general.override { llvm-config = pkgs.llvm_35; }; + in if !pkgs.stdenv.isDarwin then base else overrideCabal base ( + drv: { + preConfigure = '' + sed -i llvm-general.cabal \ + -e 's,extra-libraries: stdc++,extra-libraries: c++,' + ''; + configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"]; + librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or []; + } + ); # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From d2e30a74f4d940899f5919e45558bf282022a577 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 12 Mar 2017 13:09:00 -0400 Subject: [PATCH 063/278] eigen : Fix an extra slash. --- pkgs/development/libraries/eigen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index c38759e0c757..374f52c9cb06 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; postInstall = '' - sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc + sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc ''; meta = with stdenv.lib; { From 4c211bdc635358c2888afb8371f8a7854bb14403 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 12 Mar 2017 18:38:12 +0100 Subject: [PATCH 064/278] grsecurity: 4.9.13-201703052141 -> 4.9.14-201703121245 --- 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 859385c4e994..b10ef6a6a67d 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.13"; + version = "4.9.14"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "2mszr7n212ryaw5q2lj92766aqnjznkfr7ly04g2ggzk7cyiirrf1w37d9arzg3smn5695fb1frikacnbrmz2hsaia48kjhwgjbxn2h"; + sha512 = "0qc78s1j3mm03qs5m3dkc1ah9zchwdkmnkl1bl516dr9gy9i386all5c3f9bxniy8dd3lsk7bgfyqnigav1gyaki7vf9jh9ywqz58vd"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fffe524b11f3..25441c5a5d26 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.13"; - grrev = "201703052141"; - sha512 = "197n21975ifp2nkpl6d7v3r9fllw2l7pyd2h8cic7dnigy65a5jqx1sxhqryivijx3czf6hj173q999j218ihlg15p6a7aqjhkh90kf"; + { kver = "4.9.14"; + grrev = "201703121245"; + sha512 = "1h9d1vvfwxn8flzhbii7xd808cmhw8az895sk3fam2vjy5ls1mxvrmvw0z9nzx5sq2hgjg9adyz52y5nj2rza09n3m2gn4i7lid81hh"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 8091c1b208a439c068300b7c564ea8470445dd21 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 12 Mar 2017 18:38:39 +0100 Subject: [PATCH 065/278] linux_4_9: 4.9.13 -> 4.9.14 --- 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 9290bb125f50..2327c882f2d0 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.13"; + version = "4.9.14"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0s52hrs3wrsa1chzgcqpxwgb5kjmpfd82i964n9d2bmk9zn4liin"; + sha256 = "0h5nnf9h00fsd7q66rapvwmfxs4pi0vjljk92ir5vid59hzk8kak"; }; kernelPatches = args.kernelPatches; From 3c37edb928a5bbbb69603ac43c7b810fd6bc738d Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 12 Mar 2017 18:19:20 +0100 Subject: [PATCH 066/278] tinycc: 0.9.27pre-20170220 -> 20170225 Contains a fix for x86-64 asm gen and unified cross-compilation. --- pkgs/development/compilers/tinycc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 79745d45c2b3..dfbbaa4d4310 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170220"; + date = "20170225"; version = "0.9.27pre-${date}"; - rev = "e209b7dac463e228525499153103ec28173ca365"; - sha256 = "1p8h999aqgy5rlkk47vc86c5lx8280761712nwkcgvydvixd0gd6"; + rev = "bb93064d7857d887b674999c9b4152b44a628f9a"; + sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr"; in stdenv.mkDerivation rec { From 45cfd3969ae954da8b7f804df6e9ec2833c5eb7f Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 12:55:30 -0500 Subject: [PATCH 067/278] drumstick: 1.0.2 -> 1.1.0 --- pkgs/development/libraries/drumstick/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 809037bb5edf..7ec72afc2bff 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "drumstick-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; - sha256 = "0l47gy9yywrc860db5g3wdqg8yc8qdb2lqq6wvw1dfim5j0vbail"; + sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df"; }; outputs = [ "out" "dev" "man" ]; @@ -28,8 +28,14 @@ stdenv.mkDerivation rec { done ''; + #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket + postInstall = '' + rm $out/bin/drumstick-vpiano + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - alsaLib cmake doxygen fluidsynth pkgconfig qt5.qtbase qt5.qtsvg + alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg ]; meta = with stdenv.lib; { @@ -37,6 +43,6 @@ stdenv.mkDerivation rec { description = "MIDI libraries for Qt5/C++"; homepage = http://drumstick.sourceforge.net/; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From c05ac3ea126300ee65345bd0b07ab212aa9b5f6a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 12 Mar 2017 22:07:43 +0300 Subject: [PATCH 068/278] makeDBusConf: re-add XDG directories for session bus Fixes #23770. --- pkgs/development/libraries/dbus/make-session-conf.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl index bc73369af944..9544aa13db56 100644 --- a/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -18,7 +18,8 @@ - + + /share/dbus-1/services From a7b6f2eee460d2a55a9474c78c89a62bdf1700d6 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 15:24:05 -0500 Subject: [PATCH 069/278] ffms: 2.21 -> 2.22 --- pkgs/development/libraries/ffms/default.nix | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 3fc3f37d2aad..5aa62a638fe8 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-2.21"; + name = "ffms-${version}"; + version = "2.22"; - src = fetchurl { - url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21; - name = "${name}.tar.gz"; - sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2"; + src = fetchFromGitHub { + owner = "FFMS"; + repo = "ffms2"; + rev = version; + sha256 = "1ywcx1f3q533qfrbck5qhik3l617qhm062l8zixv02gnla7w6rkm"; }; NIX_CFLAGS_COMPILE = "-fPIC"; - buildInputs = [ zlib ffmpeg pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ffmpeg ]; - meta = { - homepage = http://code.google.com/p/ffmpegsource/; + meta = with stdenv.lib; { + homepage = http://github.com/FFMS/ffms2/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.mit; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } From f303ac7c79b000a8438cd62438db64b17f13f792 Mon Sep 17 00:00:00 2001 From: hlolli Date: Sat, 11 Mar 2017 23:40:29 +0100 Subject: [PATCH 070/278] csound: 6.04 -> 6.08.1 fixes #23767 --- pkgs/applications/audio/csound/default.nix | 26 +++++++++++++--------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 166ed592ad84..976ecb675e76 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libsndfile, flex, bison +{ stdenv, fetchFromGitHub, cmake, libsndfile, flex, bison, boost , alsaLib ? null , libpulseaudio ? null , tcltk ? null @@ -11,26 +11,30 @@ # , wiiuse ? null }: -stdenv.mkDerivation { - name = "csound-6.04"; +stdenv.mkDerivation rec { + name = "csound-6.08.1"; + version = "6.08.1"; enableParallelBuilding = true; hardeningDisable = [ "format" ]; - src = fetchurl { - url = mirror://sourceforge/csound/Csound6.04.tar.gz; - sha256 = "1030w38lxdwjz1irr32m9cl0paqmgr02lab2m7f7j1yihwxj1w0g"; + src = fetchFromGitHub { + owner = "csound"; + repo = "csound"; + rev = version; + sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9"; }; - buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ]; + nativeBuildInputs = [ cmake flex bison ]; + buildInputs = [ libsndfile alsaLib libpulseaudio tcltk boost ]; - meta = { + meta = with stdenv.lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = http://www.csounds.com/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = [maintainers.marcweber]; + platforms = platforms.linux; }; } From 1d948ddc016882b2189bfebcb501ebafee53a6fb Mon Sep 17 00:00:00 2001 From: Bo Bakker Date: Sat, 11 Mar 2017 22:42:43 +0100 Subject: [PATCH 071/278] caf: init at 0.15.3 fixes #23772 --- lib/maintainers.nix | 1 + pkgs/development/libraries/caf/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/caf/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index dd257a495023..e7b8ff7bf101 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -71,6 +71,7 @@ bjg = "Brian Gough "; bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; + bobakker = "Bo Bakker "; bobvanderlinden = "Bob van der Linden "; bodil = "Bodil Stokke "; boothead = "Ben Ford "; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix new file mode 100644 index 000000000000..d3e655676e64 --- /dev/null +++ b/pkgs/development/libraries/caf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "actor-framework-${version}"; + version = "0.15.3"; + + src = fetchFromGitHub { + owner = "actor-framework"; + repo = "actor-framework"; + rev = "${version}"; + sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "An open source implementation of the actor model in C++"; + homepage = http://actor-framework.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ bobakker ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 981d2950c6a7..e294eb2dd1e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7059,6 +7059,8 @@ with pkgs; certbot = callPackage ../tools/admin/certbot { }; + caf = callPackage ../development/libraries/caf {}; + cgal = callPackage ../development/libraries/CGAL {}; cgui = callPackage ../development/libraries/cgui {}; From 586cd21796800786b0c6ead5b2a34c6930a865df Mon Sep 17 00:00:00 2001 From: ndowens Date: Thu, 9 Mar 2017 21:06:40 -0600 Subject: [PATCH 072/278] peru: 1.0.1 -> 1.1.0 --- .../version-management/peru/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 28df4f7fc312..01369b9685dc 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,25 +1,26 @@ -{ stdenv, fetchurl, python3Packages }: - -let - pythonPackages = python3Packages; -in pythonPackages.buildPythonApplication rec { +{ stdenv, fetchFromGitHub, python3Packages }: +python3Packages.buildPythonApplication rec { name = "peru-${version}"; - version = "1.0.1"; + version = "1.1.0"; - src = fetchurl { - url = "mirror://pypi/p/peru/${name}.tar.gz"; - sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1"; + src = fetchFromGitHub { + owner = "buildinspace"; + repo = "peru"; + rev = "${version}"; + sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8"; }; - propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ]; + propagatedBuildInputs = with python3Packages; [ pyyaml docopt ]; # No tests in archive doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/buildinspace/peru; description = "A tool for including other people's code in your projects"; - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.unix; }; -} \ No newline at end of file + +} From 3d9d879bc0d54bf22988b16f40b3c04c04753bc8 Mon Sep 17 00:00:00 2001 From: ndowens Date: Fri, 10 Mar 2017 18:01:55 -0600 Subject: [PATCH 073/278] ace: 6.3.3 -> 6.4.2 --- pkgs/development/libraries/ace/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 10ba217175c3..9bc714c5538b 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl -}: +{ stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.3.3"; + version = "6.4.2"; + src = fetchurl { - url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2; - sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk"; + url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; + sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73"; }; enableParallelBuilding = true; - buildInputs = [ pkgconfig libtool perl ]; + nativeBuildInputs = [ pkgconfig libtool ]; + buildInputs = [ perl ]; patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; @@ -25,12 +26,11 @@ stdenv.mkDerivation rec { > include/makeinclude/platform_macros.GNU ''; -meta = { + meta = with stdenv.lib; { description = "ADAPTIVE Communication Environment"; homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; - license = stdenv.lib.licenses.doc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.doc; + platforms = platforms.linux; + maintainers = [ maintainers.nico202 ]; }; } - From f0bb10fea396d44d126b0e515f6dbb6265467e63 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 16:25:18 -0500 Subject: [PATCH 074/278] geis: 2.2.16 -> 2.2.17 --- pkgs/development/libraries/geis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index e8f4001c1b59..5a7bff7459e3 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geis-${version}"; - version = "2.2.16"; + version = "2.2.17"; src = fetchurl { url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; - sha256 = "40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf"; + sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; NIX_CFLAGS_COMPILE = "-Wno-error=pedantic"; From 1dd16a93741c425880ac81d1e611af7be050c96b Mon Sep 17 00:00:00 2001 From: obadz Date: Sun, 12 Mar 2017 21:31:59 +0000 Subject: [PATCH 075/278] coreclr: mark broken --- pkgs/development/compilers/coreclr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 558cfa35adad..b619bf6ce208 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -102,5 +102,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ obadz ]; license = stdenv.lib.licenses.mit; + broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak. }; } From 2df3b5ca7f52393e32cbdef9ae50df9dff863ec2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 12 Mar 2017 22:37:10 +0100 Subject: [PATCH 076/278] geogebra: 5-0-331-0 -> 5-0-338-0 (#23593) --- 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 45f8dd1960b7..aee4831034d8 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-331-0"; + version = "5-0-338-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2"; + sha256 = "1namwib3912zjizgl9swan0fwgmq9kvfq5k5y8lz818vh4lv88kx"; }; srcIcon = fetchurl { From 039c6a6dfad1d37c09411fecaf8e821f108f12cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 12 Mar 2017 22:45:19 +0100 Subject: [PATCH 077/278] haskell: comment about configuration-nix.nix's intersectAttrs --- .../development/haskell-modules/configuration-nix.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3dd462397742..9773a65cefec 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -29,6 +29,17 @@ with import ./lib.nix { inherit pkgs; }; +# All of the overrides in this set should look like: +# +# foo = ... something involving super.foo ... +# +# but that means that we add `foo` attribute even is there is no `super.foo`! So if +# you want to use this configuration for a package set that only contains a subset of +# the packages that have overrides defined here, you'll end up with a set that contains +# a bunch of attributes that trigger an evaluation error. +# +# To avoid this, we use `intersectAttrs` here so we never add packages that are not present +# in the parent package set (`super`). self: super: builtins.intersectAttrs super { # Apply NixOS-specific patches. From 6c99f88eeced94c9940e45419c4608a766a02487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 12 Mar 2017 22:47:28 +0100 Subject: [PATCH 078/278] fix typo in comment --- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9773a65cefec..981a48055bcc 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -33,7 +33,7 @@ with import ./lib.nix { inherit pkgs; }; # # foo = ... something involving super.foo ... # -# but that means that we add `foo` attribute even is there is no `super.foo`! So if +# but that means that we add `foo` attribute even if there is no `super.foo`! So if # you want to use this configuration for a package set that only contains a subset of # the packages that have overrides defined here, you'll end up with a set that contains # a bunch of attributes that trigger an evaluation error. From 39cd6ccb8e557ea7697c932f2537ac5979f4dc3d Mon Sep 17 00:00:00 2001 From: Olegs Jeremejevs Date: Sun, 12 Mar 2017 23:59:48 +0200 Subject: [PATCH 079/278] Add subl symlink for Sublime Text 3 (#23815) --- pkgs/applications/editors/sublime3/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index f900a4e9147c..8912aca0711d 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -66,6 +66,7 @@ in stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin + ln -s ${sublime}/sublime_text $out/bin/subl ln -s ${sublime}/sublime_text $out/bin/sublime ln -s ${sublime}/sublime_text $out/bin/sublime3 mkdir -p $out/share/applications From 848423f2234fc3e008799ca9475d7a164164cac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Mar 2017 23:02:28 +0100 Subject: [PATCH 080/278] clisp-tip: make the build more reliable Hydra shows it sometimes fails without autoconf: http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux I can't say I understand why this happened. --- pkgs/development/interpreters/clisp/hg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index b4930e7d57d6..58bb52397bf7 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -5,8 +5,7 @@ # - full: contains base plus modules in withModules { stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11 , libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto -, libffi -, libffcall +, libffi, libffcall, automake , coreutils # build options , threadSupport ? (stdenv.isi686 || stdenv.isx86_64) @@ -37,6 +36,7 @@ stdenv.mkDerivation rec { ffcallAvailable = stdenv.isLinux && (libffcall != null); + nativeBuildInputs = [ automake ]; # sometimes fails otherwise buildInputs = [libsigsegv] ++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (ncurses != null) ncurses From 47b14e0a99f8eb2c06b4a5e2fe9be9f0de8e130d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 12 Mar 2017 23:35:28 +0100 Subject: [PATCH 081/278] doc/language-frameworks/haskell.md: integer-simple improvements * Strip the unnecessary 'pkgs' attribute. * Remove ghc-7.6.3 as a GHC supporting integer-simple. --- doc/languages-frameworks/haskell.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 6d8984821741..1cab3d1e4eed 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -823,10 +823,10 @@ alternative implemention for Integer called [integer-simple](http://hackage.haskell.org/package/integer-simple). To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use -the attribute: `pkgs.haskell.compiler.integer-simple."${ghcVersion}"`. +the attribute: `haskell.compiler.integer-simple."${ghcVersion}"`. For example: - $ nix-build -E '(import {}).pkgs.haskell.compiler.integer-simple.ghc802' + $ nix-build -E '(import {}).haskell.compiler.integer-simple.ghc802' ... $ result/bin/ghc-pkg list | grep integer integer-simple-0.1.1.1 @@ -838,7 +838,6 @@ The following command displays the complete list of GHC compilers build with `in haskell.compiler.integer-simple.ghc7103 ghc-7.10.3 haskell.compiler.integer-simple.ghc722 ghc-7.2.2 haskell.compiler.integer-simple.ghc742 ghc-7.4.2 - haskell.compiler.integer-simple.ghc763 ghc-7.6.3 haskell.compiler.integer-simple.ghc783 ghc-7.8.3 haskell.compiler.integer-simple.ghc784 ghc-7.8.4 haskell.compiler.integer-simple.ghc801 ghc-8.0.1 @@ -846,10 +845,10 @@ The following command displays the complete list of GHC compilers build with `in haskell.compiler.integer-simple.ghcHEAD ghc-8.1.20170106 To get a package set supporting `integer-simple` use the attribute: -`pkgs.haskell.packages.integer-simple."${ghcVersion}"`. For example +`haskell.packages.integer-simple."${ghcVersion}"`. For example use the following to get the `scientific` package build with `integer-simple`: - $ nix-build -A pkgs.haskell.packages.integer-simple.ghc802.scientific + $ nix-build -A haskell.packages.integer-simple.ghc802.scientific ## Other resources From ba0b527456ac6885f0dd4a287d028384ffbf82b2 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Mar 2017 05:40:22 +0700 Subject: [PATCH 082/278] exim: 4.88 -> 4.89 (#23670) --- pkgs/servers/mail/exim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 68e3ad4ca426..bf7b5d8d6ed1 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,11 +1,11 @@ { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: stdenv.mkDerivation rec { - name = "exim-4.88"; + name = "exim-4.89"; src = fetchurl { - url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2"; - sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i"; + url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz"; + sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c"; }; buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; From 54b7c3b63fd46f66487f4b29fb4b42d0c6353118 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 12 Mar 2017 23:58:20 +0100 Subject: [PATCH 083/278] clisp-git: update to the upstream fix of 32-bit builds The current exact tip fails to build on x86_64, there probably is a fresher safe commit, but I haven't try bisecting. --- pkgs/development/interpreters/clisp/hg.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 58bb52397bf7..597f75c46456 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -23,13 +23,13 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xproto != null && libXext != null && xextproto != null); stdenv.mkDerivation rec { - v = "2.50pre20161201"; + v = "2.50pre20170130"; name = "clisp-${v}"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; - rev = "536a48"; - sha256 = "097igsfpn8xipnjapyf5hx6smzh04v4ncskxl747xxn6pgpq813z"; + rev = "130e74c8ea17"; + sha256 = "1aqaxskvghc4ipbs3m4syvzn6bzj165zqvjpw0xa696i07vkk19j"; }; inherit libsigsegv gettext coreutils; From bed935bd135215771a11e3b18ff658c5aa6ae521 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 13 Mar 2017 00:27:41 +0000 Subject: [PATCH 084/278] qmetro: init at 0.7.1 --- pkgs/applications/misc/qmetro/default.nix | 32 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/qmetro/default.nix diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix new file mode 100644 index 000000000000..932d8156a79a --- /dev/null +++ b/pkgs/applications/misc/qmetro/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, qmake4Hook, unzip, qt4 }: + +stdenv.mkDerivation rec { + name = "${project}-${version}"; + project = "qmetro"; + version = "0.7.1"; + + src = fetchurl { + url = "mirror://sourceforge/${project}/${name}.zip"; + sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5"; + }; + + nativeBuildInputs = [ qmake4Hook unzip ]; + + buildInputs = [ qt4 ]; + + postPatch = '' + sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop + echo 'LIBS += -lz' >> qmetro.pro + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/projects/qmetro/; + description = "Worldwide transit maps viewer"; + license = licenses.gpl3; + + maintainter = with maintainers; [ orivej ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9686b1c62d64..28fea813af78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14998,6 +14998,8 @@ with pkgs; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; + qmetro = callPackage ../applications/misc/qmetro { }; + qmidinet = callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; From 14db0b9ef3315e87c07cdc9195cc543c21e63bd5 Mon Sep 17 00:00:00 2001 From: Julien Dehos Date: Mon, 13 Mar 2017 02:35:34 +0100 Subject: [PATCH 085/278] pbrt: 2016-05-19 -> 2017-01-12 (#23405) --- pkgs/applications/graphics/pbrt/default.nix | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 5bf6907744ad..894667597d85 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,25 +1,26 @@ -{stdenv, fetchgit, flex, bison, cmake, git, zlib}: +{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: stdenv.mkDerivation rec { - version = "2016-05-19"; + version = "2017-01-12"; name = "pbrt-v3-${version}"; - src = fetchgit { - url = "https://github.com/mmp/pbrt-v3.git"; - rev = "638249e5cf4596e129695c8df8525d43f11573ff"; - sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g"; - }; - fetchSubmodules = true; + src = fetchFromGitHub { + rev = "35b6da3429526f2026fe5e5ebaf36d593e113028"; + owner = "mmp"; + repo = "pbrt-v3"; + sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7"; + fetchSubmodules = true; + }; buildInputs = [ git flex bison cmake zlib ]; - meta = { + meta = with stdenv.lib; { homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; - platforms = stdenv.lib.platforms.linux ; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.juliendehos ]; + platforms = platforms.linux ; + license = licenses.bsd2; + maintainers = [ maintainers.juliendehos ]; priority = 10; }; } From 09c73776b952c6f99856263eb86b422cf09d913d Mon Sep 17 00:00:00 2001 From: andyjscott Date: Mon, 13 Mar 2017 01:38:27 +0000 Subject: [PATCH 086/278] mmex: v1.3.1 -> v1.3.3 (#23732) --- pkgs/applications/office/mmex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 2981a0f7f890..30b8809f2247 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -2,7 +2,7 @@ let - version = "1.3.1"; + version = "1.3.3"; in stdenv.mkDerivation { name = "money-manager-ex-${version}"; @@ -10,7 +10,7 @@ in src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; rev = "refs/tags/v${version}"; - sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0"; + sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; }; buildInputs = [ sqlite wxGTK30 gettext ]; From afeb989c5c400b5439f2019bf4e31fb00aaade7f Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 20:38:46 -0500 Subject: [PATCH 087/278] gtkspell:3.0.8 -> 3.0.9 --- pkgs/development/libraries/gtkspell/3.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 1b28477f1e0c..c6cc51b1e1f8 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1zrz5pz4ryvcssk898liynmy2wyxgj95ak7mp2jv7x62yzihq6h1"; + url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; + sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"; }; - buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ aspell gtk3 enchant ]; propagatedBuildInputs = [ enchant ]; - meta = { + meta = with stdenv.lib; { homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fuuzetsu ]; }; } From 912b956b074a68c8280321da5082e49ccb2bf882 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 20:55:07 -0500 Subject: [PATCH 088/278] gupnp-tools: 0.8.8 -> 0.8.13 --- pkgs/tools/networking/gupnp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index f846a711aa4a..ea78cdd106ac 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "gupnp-tools-${version}"; majorVersion = "0.8"; - version = "${majorVersion}.8"; + version = "${majorVersion}.13"; src = fetchurl { url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; - sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; + sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av From fe339d281bd1947983a8d590736227707a9f56b9 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 11 Mar 2017 20:12:53 -0500 Subject: [PATCH 089/278] minikube: switch to build from source & fix on Darwin Linux behavior should be largely unchanged but we now build minikube ourselves. Unfortunately localkube is still tricky to build so I pull in a binary version from upstream. --- .../networking/cluster/minikube/default.nix | 88 +++++++++++++------ 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index fcc17df3fc46..19fe89ea4491 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,47 +1,77 @@ -{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, makeWrapper }: let - arch = if stdenv.isLinux - then "linux-amd64" - else "darwin-amd64"; - checksum = if stdenv.isLinux - then "0cdcabsx5l4jbpyj3zzyz5bnzks6wl64bmzdsnk41x92ar5y5yal" - else "12f3b7s5lwpvzx4wj6i6h62n4zjshqf206fxxwpwx9kpsdaw6xdi"; + binPath = [ kubernetes ] + ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ] + ++ stdenv.lib.optionals stdenv.isDarwin []; -# TODO: compile from source - -in stdenv.mkDerivation rec { - pname = "minikube"; + # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube + # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static + # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare. + # + # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge + # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like, + # so for example it doesn't know about v1.5.3 even though there's a perfectly good version of localkube hosted there. So + # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is + # currently https://storage.googleapis.com/minikube/k8s_releases.json. Note that we can't use 1.5.3 with minikube 0.17.1 + # expects to be able to pass it a command-line argument that it doesn't understand. v1.5.4 and higher should be fine. There + # doesn't seem to ae any official release of localkube for 1.5.4 yet so I'm temporarily grabbing a version built from the + # minikube CI server. + localkube-binary = fetchurl { + url = "https://storage.googleapis.com/minikube-builds/1216/localkube"; + # url = "https://storage.googleapis.com/minikube/k8sReleases/v${kubernetes.version}/localkube-linux-amd64"; + sha256 = "1vqrsak7n045ci6af3rpgs2qwjnrqk8k7c3ax6wzli4m8vhsiv57"; + }; +in buildGoPackage rec { + pname = "minikube"; + name = "${pname}-${version}"; version = "0.17.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}"; - sha256 = "${checksum}"; + goPackagePath = "k8s.io/minikube"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; + sha256 = "1m61yipn0p3cfavjddhrg1rcmr0hv6k3zxvqqd9fisl79g0sdfsr"; }; - phases = [ "installPhase" "fixupPhase" ]; + # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly + # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions + buildInputs = [ go-bindata makeWrapper kubernetes ]; + subPackages = [ "cmd/minikube" ]; - buildInputs = [ makeWrapper ]; + preBuild = '' + pushd go/src/${goPackagePath} >/dev/null - binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ]; + mkdir -p out + cp ${localkube-binary} out/localkube - installPhase = '' - install -Dm755 ${src} $out/bin/${pname} + go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/... + + ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//") + ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") + + export buildFlagsArray="-ldflags=\ + -X k8s.io/minikube/pkg/version.version=v${version} \ + -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \ + -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET" + + popd >/dev/null ''; - fixupPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/minikube" - - wrapProgram $out/bin/${pname} \ - --prefix PATH : ${binPath} + postInstall = '' + mkdir -p $bin/share/bash-completion/completions/ + MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube ''; + postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}"; + meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/minikube; + homepage = https://github.com/kubernetes/minikube; description = "A tool that makes it easy to run Kubernetes locally"; - license = licenses.asl20; - maintainers = with maintainers; [ ebzzry ]; - platforms = with platforms; linux ++ darwin; + license = licenses.asl20; + maintainers = with maintainers; [ ebzzry copumpkin ]; + platforms = with platforms; unix; }; } From 23e4e32b91f40a569ca8e0b213ab531455b5fb7e Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 12 Mar 2017 22:35:20 -0400 Subject: [PATCH 090/278] kops: enable on Darwin --- pkgs/applications/networking/cluster/kops/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 80747e44bf53..ea25fa6ccb57 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -27,5 +27,6 @@ buildGoPackage rec { homepage = https://github.com/kubernetes/kops; license = licenses.asl20; maintainers = with maintainers; [offline]; + platforms = platforms.unix; }; } From cf7d4bf8af4829e6a7ad1abf19109e0a19fcc41c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 12 Mar 2017 23:02:34 -0400 Subject: [PATCH 091/278] kubernetes: 1.5.2 -> 1.5.4 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index ecb2cd65a37c..bf69eac318dc 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; + sha256 = "1xhz6m6ly6ffj60id9ms1liijlrik8n2pxyzb5m77ym3zf7rxlpl"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; From 6a51b55af6f3b962a55402a5c3406f5dd848b044 Mon Sep 17 00:00:00 2001 From: Arseniy Alekseyev Date: Mon, 13 Mar 2017 03:02:33 +0000 Subject: [PATCH 092/278] fetchSvn: Add support for --ignore-keywords flag This is a flag that disables subversion keyword substitution. Keyword substitution inserts metadata into the files being checked out, and is therefore somewhat at odds with build reproducibility. In particular, it can become a problem if you're trying to switch between svn and a git export of the same thing (keyword substitutions are normally not exported into git). --- pkgs/build-support/fetchsvn/builder.sh | 3 ++- pkgs/build-support/fetchsvn/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 3ab6e730a51b..7a8a161712d6 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -22,7 +22,8 @@ fi; # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic # hash of the output matters. Pass in extra p's to handle redirects. -printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \ +printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \ + ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" stopNest diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 85ec52c4bde0..05ed0505f81c 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,5 +1,6 @@ {stdenv, subversion, sshSupport ? false, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}: +{url, rev ? "HEAD", md5 ? "", sha256 ? "", + ignoreExternals ? false, ignoreKeywords ? false, name ? null}: let repoName = with stdenv.lib; @@ -31,7 +32,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = if sha256 == "" then md5 else sha256; - inherit url rev sshSupport openssh ignoreExternals; + inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; From d4beeef3ce78c1ef0077db51136664553a51eaff Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 9 Mar 2017 18:26:47 +0800 Subject: [PATCH 093/278] vlc: compile against qt 5.6 --- 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 9686b1c62d64..029455e0dd75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15794,7 +15794,8 @@ with pkgs; gtk = gtk2; }; - vlc_qt5 = libsForQt5.vlc; + # VLC 3.0 is needed to compile in C++11 mode (QT 5.7) + vlc_qt5 = libsForQt56.vlc; vmpk = callPackage ../applications/audio/vmpk { }; From eb7690ab0628bae91eeeeadf0586bb3237602167 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2017 11:46:02 +0800 Subject: [PATCH 094/278] qsyncthingtray: broken on qt 5.7 --- pkgs/applications/misc/qsyncthingtray/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index ba8b946f3fbb..0aeb7d7eb8fc 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtwebengine ]; nativeBuildInputs = [ qmakeHook ]; enableParallelBuilding = true; - + postInstall = '' mkdir -p $out/bin cp binary/QSyncthingTray $out/bin @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy ]; platforms = platforms.all; + broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; }; } From f7fd8a6f73aa58307c178c8b3141abf2af92d6e0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2017 11:46:08 +0800 Subject: [PATCH 095/278] xca: broken on qt 5.7 --- pkgs/applications/misc/xca/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 30d38183c8f2..60af439e94bb 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; + broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; }; } From c272796806fa0cbce3e51ba9be2234af2b22657a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 13 Mar 2017 04:22:29 +0000 Subject: [PATCH 096/278] mtr: 0.86 -> 0.87 --- pkgs/tools/networking/mtr/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c96e5cac367c..666bb4942a9f 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, autoconf +{stdenv, fetchurl, autoreconfHook, pkgconfig, ncurses , withGtk ? false, gtk2 ? null}: assert withGtk -> gtk2 != null; @@ -6,24 +6,27 @@ assert withGtk -> gtk2 != null; with stdenv.lib; stdenv.mkDerivation rec { baseName="mtr"; - version="0.86"; + version="0.87"; name="${baseName}-${version}"; - + src = fetchurl { url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz"; - sha256 = "01lcy89q3i9g4kz4liy6m7kcq1zyvmbc63rqidgw67341f94inf5"; + sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r"; }; configureFlags = optionalString (!withGtk) "--without-gtk"; - buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ ncurses ] ++ optional withGtk gtk2; + + enableParallelBuilding = true; meta = { homepage = http://www.bitwizard.nl/mtr/; description = "A network diagnostics tool"; - maintainers = [ maintainers.koral maintainers.raskin ]; + maintainers = with maintainers; [ koral orivej raskin ]; platforms = platforms.unix; license = licenses.gpl2; }; } - From 12083de992057d55a575a36965260d0c153bc13a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 6 Mar 2017 12:56:50 -0800 Subject: [PATCH 097/278] nvidia_x11: 375.26 -> 375.39 nvidia_x11_beta: 378.09 -> 378.13 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5e26fef6e19d..f04ff107ea66 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -6,19 +6,19 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "375.26"; - sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; - sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; - settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y"; - persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky"; + version = "375.39"; + sha256_32bit = "0mlly5n84640xa2mcdqqg44s42ck6g3lj5skf7gmfp2w5ibzccvz"; + sha256_64bit = "19w5v81f770rqjrvdwz11k015zli2y8f4x10ydqxcy0nhhh5mgli"; + settingsSha256 = "0f881q4jzliqzqi1p5lzwz86h829m5g74zdj7nlfi1cc6s45g5p5"; + persistencedSha256 = "0zj6wdcgg2ljhvsssfsqz9wk28ykmsh4gwmis31q3rsrkq668x33"; }; beta = generic { - version = "378.09"; - sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy"; - sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8"; - settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v"; - persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc"; + version = "378.13"; + sha256_32bit = "1ca6kbk20kki5f698x1ga9b1v1is4mr10f7f70s3gixak1h2mrh5"; + sha256_64bit = "1vj2vyy6vim0qis7iqq4la6k6bnby65p3qjbl888qnpjkqj7kqrx"; + settingsSha256 = "08q04cd769l1i6737ylvanaxrqg8fym05kjp7kvpz28764g96gxj"; + persistencedSha256 = "0hmxp5fbxwl9f7c9fspg65my6lwynpqhz02zw7100dgwqb2vn1qj"; }; legacy_340 = generic { From 8799254eac48f8b351aef941f3ff330e309ab150 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 6 Mar 2017 12:59:51 -0800 Subject: [PATCH 098/278] nvidia_x11_beta: add patch to support Linux 4.10.x thanks to bendlas for the review for pointing out a way to grab the patch remotely! --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 9e39a6df09c1..eb4d3ae224a0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -42,6 +42,13 @@ let } else throw "nvidia-x11 does not support platform ${stdenv.system}"; + # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 + patches = if versionOlder version "375" + then null + else [ (fetchurl { + url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; + }) ]; + inherit version useGLVND useProfiles; inherit (stdenv) system; From 7dc3edaa6a660021ede4db72e38f138873b0f7fc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 13 Mar 2017 08:23:19 +0100 Subject: [PATCH 099/278] slimerjs: 0.10.2 -> 0.10.3 --- pkgs/development/tools/slimerjs/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index cb6c4614a1a4..b3049736b710 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, fetchgit, zip, unzip, firefox, bash}: +{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}: let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.10.2"; + version="0.10.3"; name="${baseName}-${version}"; - hash="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529"; - url="http://download.slimerjs.org/releases/0.10.2/slimerjs-0.10.2.zip"; - sha256="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529"; + owner = "laurentj"; + repo = "${baseName}"; + sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y"; + rev = "${version}"; }; buildInputs = [ unzip zip @@ -16,12 +17,15 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + #src = fetchurl { + # inherit (s) url sha256; + #}; #src = fetchgit { # inherit (s) url sha256 rev; #}; + src = fetchFromGitHub { + inherit (s) owner repo rev sha256; + }; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */ From 78c0cecc5fa0d2a1d179dd3230652f8af2dc179f Mon Sep 17 00:00:00 2001 From: Mikhail Volkhov Date: Mon, 13 Mar 2017 10:34:55 +0300 Subject: [PATCH 100/278] sage: fix build at 6.8 --- pkgs/applications/science/math/sage/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 9e17fe60c295..af4cda874730 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk -, imagemagick, liblapack, python, openssl, libpng +{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422 +, imagemagick, liblapack, python, openssl, libpng , which }: @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://old.files.sagemath.org/src-old/${name}.tar.gz"; sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9"; + }; - buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg tk imagemagick liblapack - python openssl libpng which]; + buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack + python openssl libpng which ]; patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ]; From 89747d357badd51485a2c893ee3803d49def058b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 11 Mar 2017 15:05:23 +0100 Subject: [PATCH 101/278] msilbc: fix build --- pkgs/development/libraries/msilbc/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 1e868b79ce66..c7d65f156b8b 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { name = "msilbc-2.0.3"; - + src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; }; -# patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c"; + propagatedBuildInputs = [ ilbc mediastreamer ]; + nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ilbc mediastreamer]; - - buildInputs = [pkgconfig]; - configureFlags = "ILBC_LIBS=ilbc ILBC_CFLAGS=-I${ilbc}/include"; + configureFlags = [ + "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" + "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" + ]; meta = { platforms = stdenv.lib.platforms.linux; From 64fcdf7aa4754cdb38f0a69297e3b3c80d636c72 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2017 17:47:40 +0800 Subject: [PATCH 102/278] requests-cache: 0.4.10 -> 0.4.13 Also add support for python3 --- pkgs/top-level/python-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9260b8e73faa..7468b8325e1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5841,17 +5841,16 @@ in { requests-cache = buildPythonPackage (rec { name = "requests-cache-${version}"; - version = "0.4.10"; - disabled = isPy3k; + version = "0.4.13"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests-cache/${name}.tar.gz"; - sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0"; + sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy"; }; buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ self.six requests2 ]; + propagatedBuildInputs = with self; [ requests2 six urllib3 ]; meta = { description = "Persistent cache for requests library"; From c1b1da21ea86841695a5f90b571ac07dceb2a0f4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2017 17:48:45 +0800 Subject: [PATCH 103/278] tvdb_api: add support for python3 --- 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 7468b8325e1f..d26a29da7290 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31280,7 +31280,7 @@ EOF sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih"; }; - disabled = isPy3k; + propagatedBuildInputs = with self; [ requests-cache ]; meta = { description = "Simple to use TVDB (thetvdb.com) API in Python."; From 5fa3b11239bbd0dd95a01f96fd611c5e55690126 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 13 Mar 2017 17:49:04 +0800 Subject: [PATCH 104/278] tvnamer: 2.3 -> 2.4 Also add support for python3 --- pkgs/top-level/python-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d26a29da7290..5b9cb3b6e6b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -31292,19 +31292,18 @@ EOF tvnamer = buildPythonPackage rec { name = "tvnamer-${version}"; - version = "2.3"; + version = "2.4"; src = pkgs.fetchurl { url = "mirror://pypi/t/tvnamer/${name}.tar.gz"; - sha256 = "15i6qvhwhcx08c96xx3s2841yc7k8gxrqqvhw908c11g0045c2r3"; + sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav"; }; - propagatedBuildInputs = with self; [ - tvdb_api - ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ tvdb_api ]; - # tvdb_api isn't working with Python 3 - disabled = isPy3k; + # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. + doCheck = false; meta = { description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; From c83665108492437527554e39963a733471c75023 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Mar 2017 10:18:00 +0100 Subject: [PATCH 105/278] purePackages.octave: 0.7 -> 0.9 --- pkgs/development/pure-modules/octave/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 9f9527d0f025..61bc7a4d5c15 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave }: +{ stdenv, fetchurl, pkgconfig, pure, octave, gcc6 }: stdenv.mkDerivation rec { baseName = "octave"; - version = "0.7"; + version = "0.9"; name = "pure-${baseName}-${version}"; src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; - sha256 = "04c1q5cjcyc5sg15ny1hn43rkphja3virw4k110cahc3piwbpsqk"; + sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - buildInputs = [ pkgconfig ]; + buildInputs = [ pkgconfig gcc6 ]; propagatedBuildInputs = [ pure octave ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; From 80bd50a6e4cbb875d936a951420abda5167cfc16 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Mar 2017 11:43:24 +0100 Subject: [PATCH 106/278] ponyc: 0.10.0 -> 0.11.0 --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 2c785d2a721d..3f1aa85e0fcc 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0"; + sha256 = "0jjzc1711km53zkkxwy4r9ki9yxdx8mdjrp7g3mkr42p7q5h4w70"; }; buildInputs = [ llvm makeWrapper which ]; From dbbdccdd658169a9f001eff01a7629a2404780ba Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Mar 2017 12:07:48 +0100 Subject: [PATCH 107/278] ispc: fix build --- pkgs/development/compilers/ispc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 6bc7f66ca299..f8413075ac81 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, +{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { m4 python bison - flex + flex_2_6_1 llvm llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; From 0867ac9963122db938d40cecf188d2e97a4a8182 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Mon, 13 Mar 2017 11:27:08 +0000 Subject: [PATCH 108/278] Haskell Packages: jailbreak strict-io --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f37d8b4c9c7f..85839b6492a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -877,4 +877,8 @@ self: super: { # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; + + # strict-io is too cautious with it's deepseq dependency + # strict-io doesn't have a working bug tracker, the author has been emailed however. + strict-io = doJailbreak super.strict-io; } From e2a13af49c0a05fef1dafc0bb75ec99b8c7da6b7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Mar 2017 13:15:51 +0100 Subject: [PATCH 109/278] emboss: fix build --- .../science/biology/emboss/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 331820276553..2110a9bcfaba 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline, perl, libX11, libpng, libXt, zlib}: +{stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}: stdenv.mkDerivation { name = "emboss-6.6.0"; @@ -6,16 +6,14 @@ stdenv.mkDerivation { url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz"; sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e"; }; - # patch = fetchurl { - # url = ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-9.gz; - # sha256 = "1pfn5zdxrr71c3kwpdkzmmsqvdwkmynkvcr707vqh73h9cjhk3c1"; - # }; - buildInputs = [readline perl libpng libX11 libXt zlib]; + buildInputs = [ readline perl libharu libpng libX11 libXt zlib ]; - # preConfigure = '' - # gzip -d $patch | patch -p1 - # ''; + configureFlags = [ "--with-hpdf=${libharu}" "--with-pngdriver=${zlib}" ]; + + postConfigure = '' + sed -i 's@$(bindir)/embossupdate@true@' Makefile + ''; meta = { description = "The European Molecular Biology Open Software Suite"; From f32fc9b03e0a5c8152f94ddec01879050df2b988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 13 Mar 2017 13:21:58 +0100 Subject: [PATCH 110/278] setuptools_scm: 1.11.1 -> 1.15.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5b9cb3b6e6b7..e51ad68366f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23420,11 +23420,11 @@ in { setuptools_scm = buildPythonPackage rec { name = "setuptools_scm-${version}"; - version = "1.11.1"; + version = "1.15.0"; src = pkgs.fetchurl { url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz"; - sha256 = "8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf"; + sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs"; }; buildInputs = with self; [ pip pytest ]; From 28d2066063953d80ee86a1bf48de68a326662fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 13 Mar 2017 13:22:33 +0100 Subject: [PATCH 111/278] sphinxcontrib-httpdomain: 1.3.0 -> 1.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e51ad68366f4..3f0a9a6b2f60 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24728,7 +24728,7 @@ in { }); sphinxcontrib_httpdomain = buildPythonPackage (rec { - name = "sphinxcontrib-httpdomain-1.3.0"; + name = "sphinxcontrib-httpdomain-1.5.0"; # Check is disabled due to this issue: # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype @@ -24736,7 +24736,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - sha256 = "ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5"; + sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a"; }; propagatedBuildInputs = with self; [sphinx]; From 9ab1d08bb0956430a324d338eccc34fdb095aa40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 13 Mar 2017 13:24:43 +0100 Subject: [PATCH 112/278] Add sphinxcontrib-openapi at 0.3.0 --- pkgs/top-level/python-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f0a9a6b2f60..11c2f48ba36b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24727,6 +24727,19 @@ in { }; }); + sphinxcontrib-openapi = buildPythonPackage (rec { + name = "sphinxcontrib-openapi-0.3.0"; + + doCheck = false; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sphinxcontrib-openapi/${name}.tar.gz"; + sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6"; + }; + + propagatedBuildInputs = with self; [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain]; + }); + sphinxcontrib_httpdomain = buildPythonPackage (rec { name = "sphinxcontrib-httpdomain-1.5.0"; From e4eb46129d5c48f9b3fe4bd06e0f194b833e63e6 Mon Sep 17 00:00:00 2001 From: Willi Butz Date: Mon, 13 Mar 2017 13:58:35 +0100 Subject: [PATCH 113/278] spotify: get source via https instead of plain http --- pkgs/applications/audio/spotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index affb574d60bd..6b4d8e33b503 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { src = fetchurl { - url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; + url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; }; From d23effdedf359557e6fa306f251f58965b734797 Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Mon, 13 Mar 2017 17:02:43 +0300 Subject: [PATCH 114/278] flow: 0.39.0 -> 0.41.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index c1cb4412b9ca..1b41a10bb9c4 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.39.0"; + version = "0.41.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli"; + sha256 = "0v3dhvvj4k35h7g42rmpwc9hqi2z0ccg7rmk8ad00l0djs13l18z"; }; installPhase = '' From 4efed1d0d410cb1c68628f37636549eed40f1c6a Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 13 Mar 2017 15:42:20 +0100 Subject: [PATCH 115/278] jenkins: 2.44 -> 2.49 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3196b6728e05..7b42e5877520 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.44"; + version = "2.49"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d"; + sha256 = "0c7qnrx87wrgxgh4im1i6sqlxq3hsrs119krh5vwjzx5wp6daa93"; }; buildCommand = '' From 1375a2eecf52dc6f4fe61a52b9beadc1ffbc5dc6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 13 Mar 2017 16:05:31 +0100 Subject: [PATCH 116/278] qgis: Fix build after pythonPackages.sip update QGis seems to have a problem with recent sip releases. This patch fixes the issue. --- pkgs/applications/gis/qgis/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 004d11fe1575..d7dbaeb1fc21 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper , qjson, qca2, txt2tags, openssl , withGrass ? false, grass @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; + patches = [ + # See https://hub.qgis.org/issues/16071 + (fetchpatch { + name = "fix-build-against-recent-sip"; + url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch"; + sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30"; + }) + ]; + # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; From 6f90badeac9c6453033665bdeb78e28d02c8250c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Mar 2017 14:42:10 +0100 Subject: [PATCH 117/278] pythonPackages.hypothesis: fix for python 3.3 --- pkgs/development/python-modules/hypothesis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index f313f6ab5c4d..7505d3bf5b7a 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python -, isPy27, enum34 +, pythonOlder, enum34 , doCheck ? true, pytest, flake8, flaky }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { }; buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; - propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ]; + propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ]; inherit doCheck; From 891a051df18c029845415718773d3bdf16d1c7e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Mar 2017 14:42:40 +0100 Subject: [PATCH 118/278] ipython_genutils: fix for python 3.3 and 3.4 --- pkgs/top-level/python-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11c2f48ba36b..39d541ca42ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13131,6 +13131,13 @@ in { sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6"; }; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/ipython/ipython_genutils/commit/6d74d8cb34e49820e48ba8b4f5e5f8322824f4f7.patch"; + sha256 = "13ah6a11qldzzywax50la6qwq02sk5929gjkzzn456lg1ja5gq35"; + }) + ]; + LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose pkgs.glibcLocales ]; From 8aee2b5c4fd0dfe79b801d261d440a0107e789d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Mar 2017 14:42:52 +0100 Subject: [PATCH 119/278] pythonPackages.traitlets: 4.3.1 -> 4.3.2 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 39d541ca42ca..00a43b05424c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25661,12 +25661,13 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.3.1"; - name = "traitlets-${version}"; + pname = "traitlets"; + version = "4.3.2"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; + src = fetchPypi { + inherit pname version; + sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835"; }; LC_ALL = "en_US.UTF-8"; From 57e768f58e7d2019ea19520226d5fb6e05e98c96 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Mar 2017 15:30:39 +0100 Subject: [PATCH 120/278] hypothesis: 3.6.0 -> 3.6.1 --- pkgs/development/python-modules/hypothesis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index 7505d3bf5b7a..e961d56abcb6 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. name = "hypothesis-${version}"; - version = "3.6.0"; + version = "3.6.1"; # Upstream prefers github tarballs src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "${version}"; - sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg"; + sha256 = "1zwr9g4h4jizbvm2d7fywdpcxmw8i1m85h8g72kizah07gk12aq1"; }; buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ]; From b2c96062ca28a9073b8deeab9855f23352a260f9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 13 Mar 2017 18:47:21 +0200 Subject: [PATCH 121/278] kernel: Add a validity check for modDirVersion Because if you get it wrong, you get a very confusing error message at the end of the kernel build, which is quite painful as the build can take a long time. --- pkgs/os-specific/linux/kernel/manual-config.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 83020ad35a2b..e07a89fc1e64 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -102,6 +102,13 @@ let make $makeFlags "''${makeFlagsArray[@]}" oldconfig runHook postConfigure + make $makeFlags prepare + actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)" + if [ "$actualModDirVersion" != "${modDirVersion}" ]; then + echo "Error: modDirVersion specified in the Nix expression is wrong, it should be: $actualModDirVersion" + exit 1 + fi + # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") ''; From bc1011b3303c847bbd7dca9ed7d706aeb2d13a11 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 13 Mar 2017 17:53:12 +0100 Subject: [PATCH 122/278] radare2: 0.10.6 -> 1.3.0 --- pkgs/development/tools/analysis/radare2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1c1dace284f1..5befd5e620d5 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,12 +13,12 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { - version = "0.10.6"; + version = "1.3.0"; name = "radare2-${version}"; src = fetchurl { - url = "http://radare.org/get/${name}.tar.xz"; - sha256 = "0icxd8zilygnggxc50lkk6jmcq8xl66rqxqhzqwpiprbn8k7b24f"; + url = "http://cloud.radare.org/get/${version}/${name}.tar.gz"; + sha256 = "08p2vhv6vkqvknwq18xl5wgf843lbpbmb111x23gkkxm6vxvpydd"; }; @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { ++ optional luaBindings [lua]; meta = { - description = "Free advanced command line hexadecimal editor"; + description = "unix-like reverse engineering framework and commandline tools"; homepage = http://radare.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [raskin]; + maintainers = with stdenv.lib.maintainers; [raskin makefu]; platforms = with stdenv.lib.platforms; linux; inherit version; }; From c70ded3295cddcfc569f4b143609918e3fd8e44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 13 Mar 2017 18:18:42 +0100 Subject: [PATCH 123/278] conky: 1.10.5 -> 1.10.6 --- pkgs/os-specific/linux/conky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 674f3caa7653..9c2553dbf456 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -62,13 +62,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "1x1b7h4s8f8qbiyas7sw5v2nq5h2wy3q7hsp1ah4l7191jjidqix"; + sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; }; postPatch = '' From 72619a86c9166d7b4bea5762070ee14fb72dc6e7 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 9 Mar 2017 21:02:16 +0100 Subject: [PATCH 124/278] JBoss AS: list known vulnerability CVE-2015-7501 Warning in JBoss module --- nixos/modules/services/web-servers/jboss/default.nix | 2 +- pkgs/servers/http/jboss/default.nix | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index 583fe56eb5e2..d28724281a83 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -25,7 +25,7 @@ in enable = mkOption { default = false; - description = "Whether to enable jboss"; + description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; }; tempDir = mkOption { diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 2dd9d544a03b..068053d71f09 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -22,5 +22,8 @@ stdenv.mkDerivation { license = licenses.lgpl21; maintainers = [ maintainers.sander ]; platforms = platforms.unix; + knownVulnerabilities = [ + "CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation" + ]; }; } From b2b8a412fb376fccda36530666948bf25170d26e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 12 Mar 2017 18:22:01 +0000 Subject: [PATCH 125/278] ocaml-llvm: 3.7.1 -> 3.9.1 --- .../ocaml-modules/llvm/default.nix | 24 ++++++++++--------- pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 351a773a6f7b..3bced92cc3e3 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python, llvm, ocaml, findlib, ctypes }: +{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: let version = stdenv.lib.getVersion llvm; in @@ -7,21 +7,23 @@ stdenv.mkDerivation { inherit (llvm) src; - buildInputs = [ python llvm ocaml findlib ctypes ]; + buildInputs = [ python cmake llvm ocaml findlib ctypes ]; - configurePhase = '' - mkdir build - cd build - ../configure --disable-compiler-version-checks --prefix=$out \ - --disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \ - --enable-static - ''; + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch; + sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9"; + })]; - enableParallelBuilding = false; + cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ]; - makeFlags = [ "-C bindings" "SYSTEM_LLVM_CONFIG=llvm-config" ]; + buildFlags = "ocaml_all"; + + installFlags = "-C bindings/ocaml"; postInstall = '' + mv $out/lib/ocaml $out/ocaml + mkdir -p $OCAMLFIND_DESTDIR/ + mv $out/ocaml $OCAMLFIND_DESTDIR/llvm mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,} ''; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f3f535bb0857..bb4d2abed22b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -261,7 +261,7 @@ let else lambdaTerm-1_6; llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_37; + llvm = pkgs.llvm_39; }; logs = callPackage ../development/ocaml-modules/logs { From 4433fc90892a53c207093854db70088015e1381d Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 13 Mar 2017 14:57:42 -0400 Subject: [PATCH 126/278] elpa-package: 2017-03-13 --- .../editors/emacs-modes/elpa-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 834d3056e742..400b1cd42468 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -645,10 +645,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.2.3"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar"; - sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0"; + url = "https://elpa.gnu.org/packages/el-search-1.3.tar"; + sha256 = "0hg7jppdsaxy285bdaban1i096bjx21pqmczz7w9f3nr34n28pyn"; }; packageRequires = [ emacs stream ]; meta = { @@ -821,10 +821,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.1.2"; + version = "1.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.1.2.tar"; - sha256 = "18d5wdv33lcg96m3ljnv9zn98in27apm7bjycgq0asd2f31dvcvx"; + url = "https://elpa.gnu.org/packages/gnorb-1.1.5.tar"; + sha256 = "128ag8zkfxspf6szxfd7dcscm1zzzcibx7p9dpbpk036cr7m5i1p"; }; packageRequires = [ cl-lib ]; meta = { From 2b1faaae9eddfd7f2f409732fc27fc26dc1f8415 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 13 Mar 2017 14:58:13 -0400 Subject: [PATCH 127/278] melpa-stable-packages: 2017-03-13 --- .../emacs-modes/melpa-stable-generated.nix | 356 ++++++++++++++---- 1 file changed, 283 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 18759a91f5b7..8a5d293ab055 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1477,6 +1477,27 @@ license = lib.licenses.free; }; }) {}; + anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anything-tramp"; + version = "0.2"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-anything-tramp"; + rev = "75df15ac263701f921649fefb29f03f6b7d49b9f"; + sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; + sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1"; + name = "anything-tramp"; + }; + packageRequires = [ anything emacs ]; + meta = { + homepage = "https://melpa.org/#/anything-tramp"; + license = lib.licenses.free; + }; + }) {}; anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2284,12 +2305,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256"; - sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby"; + rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; + sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4458,12 +4479,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "2e3264670c861ecbe862f7618241367ab497b5ff"; - sha256 = "0a0pb3amsxj6m8ka12ny1w9qjy3dg7vsxdsy1wg3qzanj2pdsk4l"; + rev = "f08c19e95e67c852512c30b6825dae3dbd3005a0"; + sha256 = "0qypfla1j7c34syphh21nyswr363v6vwi87614wx9d1rz5v4h24n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -5115,12 +5136,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "a77b914ba99729ef618e9e86543da24a46be315a"; - sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx"; + rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8"; + sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5721,22 +5742,22 @@ license = lib.licenses.free; }; }) {}; - darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.2.100"; + version = "0.3.5"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "380fdcff12f44faf099bc5a38984d88784b495a2"; - sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn"; + rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; + sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs"; name = "darktooth-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/darktooth-theme"; license = lib.licenses.free; @@ -6349,6 +6370,27 @@ license = lib.licenses.free; }; }) {}; + dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-hide-dotfiles"; + version = "0.1"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "dired-hide-dotfiles"; + rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221"; + sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; + sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; + name = "dired-hide-dotfiles"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dired-hide-dotfiles"; + license = lib.licenses.free; + }; + }) {}; dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; @@ -6496,6 +6538,27 @@ license = lib.licenses.free; }; }) {}; + direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: + melpaBuild { + pname = "direnv"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-direnv"; + rev = "cc8fbcc9c71f120c45c3363ed6ad202352e9a6d5"; + sha256 = "03m4c2x7d7hmsgx3ma4z0ra5y6s7fyfsxmzwz618pfa94nbx3qny"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; + sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; + name = "direnv"; + }; + packageRequires = [ dash emacs with-editor ]; + meta = { + homepage = "https://melpa.org/#/direnv"; + license = lib.licenses.free; + }; + }) {}; direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx"; @@ -8099,12 +8162,12 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "d712c8efc01646117097e061e1b14933b822b9c7"; - sha256 = "00fry1gjsrx4dv9d9rjf5pd8w3709mn0052al0l948vhwz4wys9z"; + rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe"; + sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -9419,6 +9482,27 @@ license = lib.licenses.free; }; }) {}; + eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eslintd-fix"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "eslintd-fix"; + rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773"; + sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; + sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v"; + name = "eslintd-fix"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eslintd-fix"; + license = lib.licenses.free; + }; + }) {}; espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "espuds"; @@ -9947,12 +10031,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d"; - sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8"; + rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03"; + sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -12647,12 +12731,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "6.1.2"; + version = "6.2"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; - sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; + rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; + sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -13046,12 +13130,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -16306,6 +16390,27 @@ license = lib.licenses.free; }; }) {}; + helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-tramp"; + version = "0.2"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-tramp"; + rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523"; + sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; + sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv"; + name = "helm-tramp"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-tramp"; + license = lib.licenses.free; + }; + }) {}; helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; @@ -17170,12 +17275,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "397a43309c0405009cc6961053c54dedebdc83a2"; - sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb"; + rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; + sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -17275,12 +17380,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "397a43309c0405009cc6961053c54dedebdc83a2"; - sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb"; + rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; + sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -18550,6 +18655,27 @@ license = lib.licenses.free; }; }) {}; + jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jinja2-mode"; + version = "0.2"; + src = fetchFromGitHub { + owner = "paradoxxxzero"; + repo = "jinja2-mode"; + rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86"; + sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode"; + sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx"; + name = "jinja2-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/jinja2-mode"; + license = lib.licenses.free; + }; + }) {}; jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jpop"; @@ -19796,6 +19922,27 @@ license = lib.licenses.free; }; }) {}; + literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "literal-string"; + version = "0.1"; + src = fetchFromGitHub { + owner = "joodie"; + repo = "literal-string-mode"; + rev = "46dd2b620df70d681261616f1a26afa4a032e2d5"; + sha256 = "02a1jvxk2m1lb21p3281cr9xyhzix31cn8a9la53w90sz569i66r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; + sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; + name = "literal-string"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/literal-string"; + license = lib.licenses.free; + }; + }) {}; literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; @@ -20135,12 +20282,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -20289,12 +20436,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d"; - sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv"; + rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e"; + sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -20951,8 +21098,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; - sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; + rev = "89f9643c08211a770454919551a7fd8605d1fca8"; + sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -21238,6 +21385,27 @@ license = lib.licenses.free; }; }) {}; + mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "mmm-jinja2"; + version = "0.1"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "mmm-jinja2"; + rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; + sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; + sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; + name = "mmm-jinja2"; + }; + packageRequires = [ mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/mmm-jinja2"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -22392,11 +22560,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24pre0"; + version = "0.24"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "990f8cd03203c7a19cef4e3edbec823cc99fa701"; - sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q"; + rev = "e60b44ecf8bd5934959727496c7ef3016ff80cf6"; + sha256 = "1q81ibvhjvnz4hbwmdna3a1xjkik21avy5im89fnkhq068kwac2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -22769,12 +22937,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "8c349c5531d3bc90b00df875b6cd3c64110f59f1"; - sha256 = "1c4fdm6r3r3fqjflqjncfmx0ps52b5f17vq957g0b3pcaql5n63d"; + rev = "032599b162624a4b65c82c20be06433f24b00e8f"; + sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -23815,12 +23983,12 @@ org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "1fca19fbccbb21159086970b82af56a81f78e247"; - sha256 = "1swhsspa5yz68hl2449l9hk1d6r9c32z19z4mrdxw4nimdxhxmqp"; + rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; + sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; @@ -24379,6 +24547,27 @@ license = lib.licenses.free; }; }) {}; + ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-epub"; + version = "0.1.6"; + src = fetchFromGitHub { + owner = "ofosos"; + repo = "ox-epub"; + rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8"; + sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; + sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; + name = "ox-epub"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-epub"; + license = lib.licenses.free; + }; + }) {}; ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-ioslide"; @@ -24842,12 +25031,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "1.0.5"; + version = "2.0.3"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; - sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + rev = "748d6a179fcbbc4af77c7b96059a66d579f34dc8"; + sha256 = "0f8rcifzfp4fs52pjgfly39vqz54kgjb3yqyxlh4adq12zbq11cd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -25260,12 +25449,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.5"; + version = "2.9.6"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "1116ead88123a11efef346db0045ee8389250bd2"; - sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; + rev = "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06"; + sha256 = "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -28131,22 +28320,22 @@ license = lib.licenses.free; }; }) {}; - rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; - rev = "405e0fd4c57adb125e3d04208bc86081e3e78d4c"; - sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q"; + rev = "980bedb455e3551d35a212fae515c054888907c1"; + sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q"; name = "rubocop"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/rubocop"; license = lib.licenses.free; @@ -28425,6 +28614,27 @@ license = lib.licenses.free; }; }) {}; + salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + melpaBuild { + pname = "salt-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "salt-mode"; + rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81"; + sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; + sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; + name = "salt-mode"; + }; + packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/salt-mode"; + license = lib.licenses.free; + }; + }) {}; sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }: melpaBuild { pname = "sass-mode"; @@ -28488,22 +28698,22 @@ license = lib.licenses.free; }; }) {}; - sayid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "01bf777cb15a4f236bc44842712e9ca82fed7f55"; - sha256 = "0lh4mmdm5vizr08lyz2jc131991dqmyx29n8njgpxa1vjzqd08az"; + rev = "3e5456cade044f01eb0753aabc9e50868000bd14"; + sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs"; name = "sayid"; }; - packageRequires = []; + packageRequires = [ cider ]; meta = { homepage = "https://melpa.org/#/sayid"; license = lib.licenses.free; @@ -30040,22 +30250,22 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "0.11.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "303858e7f91829ec720141482c777460e66f310b"; - sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij"; + rev = "33da09b3895e03e64959005678d448ab82e527b6"; + sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; name = "sparql-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sparql-mode"; license = lib.licenses.free; @@ -34335,12 +34545,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "e5dc3962fd30005914b79b14e9821d298f2c305a"; - sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc"; + rev = "f031c785b469cf4356fddb997eccf60399e34235"; + sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; From 29559f6d7a8de71a631728039a7cf949a4940ad4 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 13 Mar 2017 14:59:57 -0400 Subject: [PATCH 128/278] melpa-packages: 2017-03-13 --- .../editors/emacs-modes/melpa-generated.nix | 1453 ++++++++++------- 1 file changed, 884 insertions(+), 569 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 92159833e9c4..844dfa9fcb80 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20170211.1328"; + version = "20170309.117"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "54777551c1760f02b35043a51e1cadad1468aa44"; - sha256 = "0p5jhp71n4021p173c9agmm26xqqx7z864ygaskf9dh810mxs1yh"; + rev = "0539862591a5af70e6fa04f0e88e7fc0f0fbb11e"; + sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -194,8 +194,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "ac-anaconda"; - rev = "e42b68f648a4179c76b56b7ff03d25a6e482f38c"; - sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0"; + rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462"; + sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; + sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "1f823b74622b1602c7336991c211b71d3f20b180"; + sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -758,8 +758,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "1f823b74622b1602c7336991c211b71d3f20b180"; + sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -859,12 +859,12 @@ ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; - version = "20170124.1245"; + version = "20170308.2109"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-flyspell"; - rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c"; - sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0"; + rev = "538d4f8508d305262ba0228dfe7c819fb65b53c9"; + sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell"; @@ -1299,12 +1299,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170215.348"; + version = "20170310.828"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "5959b48e94493738ead6fc91f18e70155962ffba"; - sha256 = "06kk8j7yq60cir4llgqdsyj4d94261danyw36idqx9papa4da3id"; + rev = "0492172a766971405fb6dea19371a3c97db8dc3c"; + sha256 = "12s14diivykwfmkp5429j1y5ry8is81wmnmw048wy3jlh4zwrxnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20170217.103"; + version = "20170311.1021"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "c39a6184c665e5ee3e53ed22beab6c4b6e8be2ce"; - sha256 = "17s35dj95nprac081v34bvj7mipnydj4blvjcymsn698aa21vgxm"; + rev = "7b799f901ceecf1aeb101ebeef5f785c2e4d6d03"; + sha256 = "10sd8m8ym7c47fkdawkiss3cfrm9kwh0ysknrws1g108zpmszsij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1684,12 +1684,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170214.556"; + version = "20170313.343"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "65de04e9bda55b858d53d4d7982183fd82839b55"; - sha256 = "1x3wl30rbza8y4693jmpjpq7mcdv8gjhcnr451lgvfjmzxfhbn3d"; + rev = "b76345e0ba398c03347b6af4fa087f346eb32174"; + sha256 = "105m01hnkm2asq900c8ndcpim6a2dgndcl83669vb5v39alm17g6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1938,8 +1938,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; - rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; - sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; + rev = "86083a7bb2ed0468ca64e52076b06441a2f8e9e0"; + sha256 = "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; @@ -2269,12 +2269,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20170208.539"; + version = "20170313.257"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "6f062a3bd00f7af651a21532d43900c22523e596"; - sha256 = "1vhf8qnknxvxkk44yyhp04kfmf0vrf41ycpgrj7p7la3k1anyvg6"; + rev = "75df15ac263701f921649fefb29f03f6b7d49b9f"; + sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; @@ -2414,8 +2414,8 @@ src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "2a14eab0c66b7c8ae4c8767ebcca1a82e325773c"; - sha256 = "1rxkzcl1clp794c017d19dpm085njmz7hlvn3sqgsw06wkczd0pl"; + rev = "e6732de88dcbe48ae88466b5cf34fd30405540df"; + sha256 = "1xg96pidwzxrg2r025pdc8644m8g11z9avcw3jvpmm11rvi2af7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -3590,6 +3590,27 @@ license = lib.licenses.free; }; }) {}; + auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: + melpaBuild { + pname = "auto-virtualenvwrapper"; + version = "20170309.1536"; + src = fetchFromGitHub { + owner = "robert-zaremba"; + repo = "auto-virtualenvwrapper.el"; + rev = "bfe512270cd6471346f149d46e9f724569dd10a9"; + sha256 = "1mw61d29z8p847qmlyjqpl1lmnpla40xh5sxgqg5hjp9scwwwp8w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; + sha256 = "1v82z922d9sadwvyrl4iddsa19f5k43s6iwn8w146jcl0v42bkmd"; + name = "auto-virtualenvwrapper"; + }; + packageRequires = [ cl-lib s virtualenvwrapper ]; + meta = { + homepage = "https://melpa.org/#/auto-virtualenvwrapper"; + license = lib.licenses.free; + }; + }) {}; auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-yasnippet"; @@ -4242,12 +4263,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170227.1310"; + version = "20170307.143"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "0ebf2ee7ab5ae3b3cb6140ea57b2a88e02a59818"; - sha256 = "197avkxslnvp95f0spmys1nis6nmqfvrv0b1cm945syk7yxa30db"; + rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; + sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -5239,12 +5260,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170126.458"; + version = "20170310.909"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76"; - sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y"; + rev = "925e9cf749387fc5c631d93c1652a4a80eac91c3"; + sha256 = "0kb1y56cq990i1hsvk8dfrh3ks67l6wf7a3658w6f1nj903xy3rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5257,22 +5278,22 @@ license = lib.licenses.free; }; }) {}; - blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, s, simple-httpd }: + blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, org, s, simple-httpd }: melpaBuild { pname = "blog-minimal"; - version = "20170304.1548"; + version = "20170311.555"; src = fetchFromGitHub { owner = "thiefuniverse"; repo = "blog-minimal"; - rev = "a3454f1358a8add2969f221c4e56d3bc17ee4baa"; - sha256 = "0g7n9g4hnaar5basv26c1p00kdkn3vsbsxzby2bi1590grkgjycq"; + rev = "d679d74039ecc114b037800c8a94303265b9542a"; + sha256 = "1x14xwnv22dc99gzbn6z48dhxpy46a7lrby2p59aizpwpysi64yk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal"; sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff"; name = "blog-minimal"; }; - packageRequires = [ ht mustache s simple-httpd ]; + packageRequires = [ ht mustache org s simple-httpd ]; meta = { homepage = "https://melpa.org/#/blog-minimal"; license = lib.licenses.free; @@ -5344,12 +5365,12 @@ bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bongo"; - version = "20160623.1058"; + version = "20170312.808"; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; - rev = "6499a28fdd8249724cf3b9f3cf2dcbce8c4d3927"; - sha256 = "0s24b0z4q23rfj8j8ifhnnh1ll87c3frpcc0p829a2qqb2nqc4nn"; + rev = "1961b2e05c01c03d0dd6527988d1348610359d0d"; + sha256 = "0alm2kq32sxxc7708djxhgd3xnzlglynqjqp9af0y308ryajmdgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo"; @@ -5406,7 +5427,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170227.1053"; + version = "20170312.1134"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad"; @@ -6783,8 +6804,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; + sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6825,8 +6846,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; + sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7012,8 +7033,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "5d48e64b00bd6d9ceef9f80ce27be6b8df76415d"; - sha256 = "0zzk009qjdc92svann593l7w3qajna29nv92qwsp4hav9zjgq07w"; + rev = "19de82713504f253961ad46d30943bf004f8a64c"; + sha256 = "1x8fr5rczzppgpq7hrcvzv95s5hjpvm4ksm5wwmkvy5a8awghdyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7052,7 +7073,7 @@ version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12036"; + rev = "12051"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7342,12 +7363,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20161008.450"; + version = "20170309.2126"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "3f1e8d13837d22109a0eb0af4ee85fb2e90b31a1"; - sha256 = "0xx692nbnw6wkdh84i59kfr0nzq6jh4iarzzqppd60rr48r3l9wx"; + rev = "a73397712f5a1d008330778b45b3071df5232806"; + sha256 = "0rx9z90k6mmlgnmwn4d3az9q72rd51zv8x038ws4f6aa7zji7wnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -7384,12 +7405,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20170221.206"; + version = "20170313.423"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1"; - sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0"; + rev = "36284714815a2339bf25ed2a6051e6136ad81920"; + sha256 = "10qvikdi2mh72s9c5df2y8hx9m1hny3g9mwm8ar5nfvdhpwwhnnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7633,12 +7654,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170306.1"; + version = "20170310.735"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "52e69c102f2e6438196e223483a388115809bbc1"; - sha256 = "0cr9clqni9yy5kxspy9nn9llzpqaa3x1d5q4fnlg7qncv6jyfyqb"; + rev = "f5a1ade83c0299df9ae99bbb5a2bb843e0168452"; + sha256 = "14zdnvjjlqgw6y23lgs5mjf3b0g5z04xqzvn3fyjgbjzw77pa9ya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7909,7 +7930,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "297038"; + rev = "297625"; sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2"; }; recipeFile = fetchurl { @@ -8551,8 +8572,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "add3b1ee4f798fe667b53a521eb18a623e64f0e0"; - sha256 = "0k0przix6iyfqc9flphsgbzbz09r2lbmw45667zbimpd91k4a29f"; + rev = "ccec62c6aa8ac44aaa9908ca5d72c396c5f068c0"; + sha256 = "1wdhyrx7ddqrj0fwqpdqrgnbdmcbk0z83jsn9lkqqv5bnw0l5k5r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9319,8 +9340,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "182a8fdabc01630f255beeb2708728c0cd5c6316"; - sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0"; + rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7"; + sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -9336,12 +9357,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20161119.1155"; + version = "20170311.1313"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "5e8b51b21d32d3d8929fc2e82dec8f584a863399"; - sha256 = "0appxl6njgxmgpf9np5cpjym3ifgdwh0mzvsnxvx08pidrrnmm33"; + rev = "f08c19e95e67c852512c30b6825dae3dbd3005a0"; + sha256 = "0qypfla1j7c34syphh21nyswr363v6vwi87614wx9d1rz5v4h24n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -9586,8 +9607,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; + sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9880,8 +9901,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris"; @@ -9939,12 +9960,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170306.659"; + version = "20170308.1819"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec"; - sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9"; + rev = "1f823b74622b1602c7336991c211b71d3f20b180"; + sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10138,8 +10159,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-tern"; - rev = "dfa3f39d67f011a78fe04ad5a1c7f54d8d788a0a"; - sha256 = "125p6ipp9mrrc0va4a3pfc2wdnrsk945i9yv0p9lnmrrq69nnszr"; + rev = "10ac058b065ae73c1f30e9fb7d969dd1a79387be"; + sha256 = "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; @@ -10469,12 +10490,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20170303.1916"; + version = "20170310.1621"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "a77b914ba99729ef618e9e86543da24a46be315a"; - sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx"; + rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8"; + sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10578,8 +10599,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; + sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10637,12 +10658,12 @@ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; - version = "20170305.600"; + version = "20170310.536"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-counsel-gtags"; - rev = "9d9061ece327a315ad9161e4fcc20c83638ccd10"; - sha256 = "04h3hn1rs9i7cgdg393v12vqrm862bgiw64hyck7978d1w6n3a1b"; + rev = "4ef27b1cf1075097e11c3bcfee43e0710950dbcb"; + sha256 = "14rnccz8sm8zyghkh93id4iv65qwdix75rb5f6i2y23k94h2483f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; @@ -11614,8 +11635,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "56a44bf2944107cfdb178a90c14a6e8092471359"; - sha256 = "1jg3bhm2ksa4ask2n8q80afpa027430gz5w7vq4iwqw5ij8cx4v8"; + rev = "af4737d709a90cc867ed93447e5354ee250ad6ec"; + sha256 = "0pz99wc7karlj4bvb6j6d1drfxmkb5f22pg27v4qqayl1hig0m14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11925,12 +11946,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170216.2034"; + version = "20170313.317"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "53ee536cc912a900a16b768abd0f8e23e609ef5e"; - sha256 = "04lj0161la9fb4fd7mdvr1raqnyarzp73dkfydvsaziggg8vnab8"; + rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; + sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12219,12 +12240,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170304.120"; + version = "20170311.1248"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "651cdbca22d725958b4ee26f8f299f841005797d"; - sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl"; + rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; + sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12343,12 +12364,12 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20160608.2347"; + version = "20170310.632"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "84a8c4d78e83629fb3100abf5408bd108e4cfcef"; - sha256 = "0s0zk2hy8mi46rz949i241qsiy0s4aywzb3j0ch69jf3i6qdxh59"; + rev = "c2b5ea44b77516b50e917ddc897f88dbf2a58894"; + sha256 = "1y40cyb61ghjhxn03ipbsx08b5d5qa909zp27g8r9nck4i3ni5gq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12530,12 +12551,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20160822.924"; + version = "20170311.1148"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "24a4a9a0f023c7b3fe5441783794185ba3954ffe"; - sha256 = "04q7fv3qvh8a4p64hd9pqfvhnbclfbr1b9s0vi9m8jz9y5p86x8d"; + rev = "0f9436f98225e0f5a5deecea4680c173e76f0322"; + sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -12973,8 +12994,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13136,8 +13157,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13157,8 +13178,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13171,6 +13192,27 @@ license = lib.licenses.free; }; }) {}; + dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-hide-dotfiles"; + version = "20170312.1017"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "dired-hide-dotfiles"; + rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221"; + sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; + sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0"; + name = "dired-hide-dotfiles"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dired-hide-dotfiles"; + license = lib.licenses.free; + }; + }) {}; dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; @@ -13216,12 +13258,12 @@ dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20161116.116"; + version = "20170313.803"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15"; - sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx"; + rev = "c50e8f73358060a448bff66db2d330b52bbeffc1"; + sha256 = "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -13241,8 +13283,8 @@ src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "b62492c1a6404ed2ed32973d99cdcf8630cf7d02"; - sha256 = "09nwzihg1v5p8c4jcjzl3w2il701lh3ps8c472g2iwmkihljs093"; + rev = "58cf696c396c12d143387f4bf446ccb8398837b6"; + sha256 = "1i7a3rjf62ksyfd161jw4x1zx3apjmra42vas7xpllkkhrk0cz08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13258,12 +13300,12 @@ dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; - version = "20160918.740"; + version = "20170309.329"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13283,8 +13325,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13343,8 +13385,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13364,8 +13406,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13461,8 +13503,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c"; - sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj"; + rev = "342d75f1240ebe17959ec25a5b050b40156e10cb"; + sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13538,22 +13580,22 @@ license = lib.licenses.free; }; }) {}; - direnv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20161002.715"; + version = "20170313.309"; src = fetchFromGitHub { - owner = "jml"; - repo = "direnv-el"; - rev = "fc80f40a77553b3c8841abedc15a64771634cb35"; - sha256 = "15lkpnklvgppj63q9qwjd6jbq8czyvjic81mkhf3bwcd7gdqar84"; + owner = "wbolster"; + repo = "emacs-direnv"; + rev = "120d6e15cfef64b10ed599a5f748e7580eacaeac"; + sha256 = "0vma9ar82841gwlgx3x2qywqwdm9ydx28di7k6c56v9z500jf9ra"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0f526b9cc7bc1495e5f5e9fb2e49af926aba8a7d/recipes/direnv"; - sha256 = "12yl7hmb7kc8ycr8nr39xb35jhagv8mqn6xs0k8j0mcykpzf2h1g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; + sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd"; name = "direnv"; }; - packageRequires = []; + packageRequires = [ dash emacs with-editor ]; meta = { homepage = "https://melpa.org/#/direnv"; license = lib.licenses.free; @@ -14643,12 +14685,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20170303.1415"; + version = "20170308.2107"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "5db3f961644ea611682eab843a960eb3177ace48"; - sha256 = "0rrxvvspz2l8byhnl052x59yd0yx7aajnc9b41846ng83kyb8dlm"; + rev = "3c9efcc81ecb18c2ebd71aeb8da691a47a1fd49a"; + sha256 = "10gz1pmpdxk2c7r47ac4vxc57bs703l9yqa9jp6q6wnldi2k0snd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14852,7 +14894,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1785720"; + rev = "1786710"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14953,12 +14995,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161218.110"; + version = "20170312.1831"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "0c7fed68916de6bcbbfbc6c9f787d610a3316b1e"; - sha256 = "1a5jg1344s18bj6v33wfrxxg1cxlx6aha40wyw9dbwj1pjpw7vqd"; + rev = "c5e81e4ef8baa92b4e7a0b5d91fb18cde1907923"; + sha256 = "01fih3i17s8ih8n79bxgpknfh7z0wgrb6asvvp32bxmmkhwrppkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -15372,12 +15414,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20161031.2119"; + version = "20170309.2143"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "6f43c8d575274349757173b9bcad3bf5b59300ac"; - sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39"; + rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148"; + sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -15516,12 +15558,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170305.1130"; + version = "20170310.900"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7"; - sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k"; + rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; + sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15831,12 +15873,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "20160528.651"; + version = "20170310.1002"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "1d1dae842505e5ff09644529deec87c056e1b14e"; - sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz"; + rev = "2fc8f382ee12fc8f7202288534258186bdf6068a"; + sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -15936,12 +15978,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170222.2141"; + version = "20170309.2006"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "1d69cffd1dd4709338fba7241f344a55cb61f59e"; - sha256 = "1pv83biyiqkm5if3wkm071r5cl0ch1wv5yxzdqyxsq4k11s9z4qy"; + rev = "0a6d9a3c0259aba57a332ac8db582c33e522f12f"; + sha256 = "114zfk7p6p61mcphd1hn3r1hqj0j9ra0acmfx1k74d60npci25pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15957,12 +15999,12 @@ editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20170102.751"; + version = "20170309.2112"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "8216ce7d20703a8ce923b4c0284c098ae85621f9"; - sha256 = "02qkvdgn78asz1i7gh8198z0as4yhax3yans96c8lxwmbac125kz"; + rev = "f5b9e0932e861c71611b5dfbd2c04ce635d14e34"; + sha256 = "0iql5c9a5qzzdwp3f1n5pb3zcglnby2hhx4nsplpjr0ffbqgad63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; @@ -16096,8 +16138,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "8b9bfc404818038b8dd93dd4d39f3b820f8fcd52"; - sha256 = "0y6k54vz9r6b81aif9ags130wgk2v00yq6rv2l4nzswsifxy2r07"; + rev = "d44a906db46f6708f3e02e5ae460c2b698593492"; + sha256 = "0dw1jxzcxs47cq5sza28kz198zk0nhf0dv5ily262i5p0wl2kcjc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16283,8 +16325,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "e2b412ef6b6a6b6443314575609f730fce766e9b"; - sha256 = "0hzx6g62sa7lqkgsq1bavq8b73ji4994n31lr8afzgdx885xw6kw"; + rev = "b47a94877b8b621534403a533ad147a971caaf89"; + sha256 = "0qhy7bxgs8gbbjww438jmmqhz20aczp3bvdpbywbwcmfkadv6086"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16630,12 +16672,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20170304.453"; + version = "20170311.533"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "57c00c08257794562e8b328adb7707c4aefe37a0"; - sha256 = "1gymbxdw8z2sfh3k2apg197r7k0l37pxzj761lc5jps3wy4d6w1g"; + rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277"; + sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16844,6 +16886,27 @@ license = lib.licenses.free; }; }) {}; + elisp-docstring-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-docstring-mode"; + version = "20170304.815"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "elisp-docstring-mode"; + rev = "f512e509dd690f65133e55563ebbfd2dede5034f"; + sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a5bf5c03ec4c26eb43703a49606450cbdb826996/recipes/elisp-docstring-mode"; + sha256 = "0mrg4vszf3p09qz3dvj38dv00f3ca8hrm3vmnjsfq0cji0yipyy1"; + name = "elisp-docstring-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/elisp-docstring-mode"; + license = lib.licenses.free; + }; + }) {}; elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-format"; @@ -17036,12 +17099,12 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "20170304.705"; + version = "20170312.356"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "fad4cee572cb4dbe670be8eb19f10646d02be854"; - sha256 = "0zmg56gvq1hhhzzcx0d08r8ii56bn96ifaby6r6bgr6b094c2i59"; + rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe"; + sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -18091,12 +18154,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170220.2247"; + version = "20170313.640"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "181d619e96cd3275e69e010486169553c13479e7"; - sha256 = "1ms2pkjqdkwfvn8xq4dbm0585p2gdwcwplnx6rk7zjvir6nc6y5s"; + rev = "00e8d01f114ad5ca95d5e9509ef327afa0087e0f"; + sha256 = "171ic2qcrc0mwfjjn2v8894m0r5waq3qpmw80lqqc1a05yn656si"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18950,12 +19013,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170303.248"; + version = "20170309.216"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3300b3059d13cd204f553f0c7d46d784adc5a8ab"; - sha256 = "1717hpj71kq9bgfwp30z8k2pns6n23vh3mybfsn6iz8wz424428x"; + rev = "47e46069d01960b74cefeba648e98e6afbb79e59"; + sha256 = "1319rs0cj396q3zdzfwiijynx8rgzy7zchqya8gjrqxfq5bh6p01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19114,12 +19177,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170213.1137"; + version = "20170307.2136"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "9fb395996316c140f3a6c77afb10dcd37cb49126"; - sha256 = "0g2x3jwy3v45p6nqjfskj0w0c94gyvxm1xzi5yypnyhsj188fsyp"; + rev = "527a2f70e1de7df46e59609b245e7e99c53708d1"; + sha256 = "19kss3hrjf1cj4lgj68qw5zszar7c7pjbqj8sxlwicnrg831mj0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -19324,12 +19387,12 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20161126.758"; + version = "20170310.2205"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "fb56e851c1baac68249c34043bd5db9c9420141e"; - sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs"; + rev = "1e57eed52fad929f36ae5e3a9e3aa45ad019ee93"; + sha256 = "0wa4whvhg6l7v8yis2hlil79dsjsp2qacvc81pbhf5j24fbfhd5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; @@ -19429,12 +19492,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170227.1220"; + version = "20170310.835"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "9c1f697c95b16f623c24bbb9c63257068d834977"; - sha256 = "0ddpr9brxigc22mzq4nc5x499bpkqq3xx28ygjcmc0z7kb03d0rk"; + rev = "fe2ed976c79474baa2cdb2fc4477786cb42d5b22"; + sha256 = "1y6c94kk4bb3y3dw7sbv7w6fj9c4j0hq0gsy1m1675zzv8ar1di9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -20452,12 +20515,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170205.1355"; + version = "20170312.2052"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "17a469799a5fe0df8d9b3589c6719634acd065eb"; - sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7"; + rev = "62378695eb45990dec776864e16c28829136aeb6"; + sha256 = "196ii51malqh2ahfk13rj6p4np0755zhx4pdk18090pwl4hgkzfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20536,12 +20599,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170305.1847"; + version = "20170309.49"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d"; - sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8"; + rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03"; + sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -21169,8 +21232,8 @@ version = "20170301.232"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "ff6f30a005444269b985bbc28963c85ebcdaa835"; - sha256 = "078xpnjqndlcaidzgdcvryqsrd5vpi2ckvlb6ihcym68611zqy7g"; + rev = "240ae7b829733d5da1d2e255a3e7f5638f83c745"; + sha256 = "00bkwaydh4j76gpxd77m3pyxrnqhws1rg70r1g7vmgm6h5ah9ndc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -21373,12 +21436,12 @@ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ez-query-replace"; - version = "20160908.1329"; + version = "20170311.139"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; - rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3"; - sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx"; + rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7"; + sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; @@ -22590,11 +22653,11 @@ flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; - version = "20160926.1630"; + version = "20170308.1210"; src = fetchhg { url = "https://bitbucket.com/jpkotta/flex-isearch"; - rev = "6a54f37be01f"; - sha256 = "19wcfpgd5qrh3sbybrxvd1hx34j85y34dy19yb80nlh2nha2n5sk"; + rev = "8b934ea6f1e4"; + sha256 = "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch"; @@ -22691,12 +22754,12 @@ flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: melpaBuild { pname = "flow-mode"; - version = "20170303.1146"; + version = "20170312.422"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-mode"; - rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458"; - sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp"; + rev = "111555a5edb1c3857e5767950a44cc08e14b8c30"; + sha256 = "18bxzzq6s80kgfgj34v8429nwx6bcvvfk951mkzqjydba56bch62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode"; @@ -22796,12 +22859,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170223.247"; + version = "20170309.145"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "da499ef6a7e3c8f4adec732703f34aea2a4e70a2"; - sha256 = "0nyvkgva0qkk7hrsb2h3q22hxvc17r10hff87gv7bj82ia8lxqnl"; + rev = "312f78cd712f696dc169a34cb45622ca154d097e"; + sha256 = "1jlbsy9pdcg76r75ca7gpn2lpkvpy71z31713cl5a1sqgb26lc8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23888,12 +23951,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20160813.2038"; + version = "20170311.1203"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "bfe40fec4695b6914d1ef36331dbd3eda384c92d"; - sha256 = "06p38yqkdrb4ksm30yd7wj3i6vqkhgmys94dm33anslh8dz00flw"; + rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3"; + sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -25715,8 +25778,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "430317e5b2ea5005851ce7f03564aa8f8dba61c6"; - sha256 = "0zsg5q1370fqswq5cysfc4lg74hyjxn5yjpqzyl9mwlips90y42l"; + rev = "29e26503c13569de25268283dce534f111726643"; + sha256 = "0g6xb811n4nd1vm7jraypaq2qarigd2chg2nbdx0nc23ga17f90q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -25894,12 +25957,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20170121.203"; + version = "20170309.2204"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "e8100f9694c1b85c12ed57d89f7efe408b9f933f"; - sha256 = "14d6iiy2dk93ani1d3vm57nsd3pn170fk8brs5v7jpf1sqszjihw"; + rev = "ce51aa1afec78bf96aedb4badf33463383b7593e"; + sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -26232,8 +26295,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "fdd8ffb39098e38c0179dd647f05b846012f10a2"; - sha256 = "1niq9vwdgyw0bwwcfbmkzs9z59adx0ly1ana8rjb7r39ii1am6ah"; + rev = "472db909d1b11288885de6fe36c3691be7f175ec"; + sha256 = "16ywm37y35rpvlzywyqyc2ga4l1h0fz4xy38j18a0z04w7xigkwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -26522,12 +26585,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170214.347"; + version = "20170308.146"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; + sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27198,8 +27261,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "gmpl-mode"; - rev = "c4cf8896aef89b4c08c0c8764c9f2330fc987f9e"; - sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4"; + rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6"; + sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode"; @@ -27636,8 +27699,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -27674,12 +27737,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20170228.916"; + version = "20170308.1512"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -27762,8 +27825,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3"; - sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s"; + rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2"; + sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -28199,12 +28262,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20170305.942"; + version = "20170310.349"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "aca1bdd18997759bd4d3618c9591cc38774ac16a"; - sha256 = "1g59mwb1l8bvc66gsq8lprbrfbs238lp280k3xqda6z7dbrh9vq9"; + rev = "50833e9579ac2ed2647708982477edf9a783113e"; + sha256 = "0zcbmd3kdkcxx96mkl130j913y9mzcdxkbjd7x1vm48akirz598w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28280,12 +28343,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170302.1450"; + version = "20170310.1402"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16"; - sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj"; + rev = "4e7a21e556f26c636141c95a4041baa141e971d1"; + sha256 = "0l5dm0r44nchgn8vzzqsn7rhf5015ni5fp56fxnz8m4kkkas01lz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28913,6 +28976,27 @@ license = lib.licenses.free; }; }) {}; + gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gtk-pomodoro-indicator"; + version = "20170310.532"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "gtk-pomodoro-indicator"; + rev = "f64fd33f95289e3c4c81e8496eb0bdafc0c42815"; + sha256 = "0x8r0hamq1ws5l3z9jcxfmdqvm5qcig40knvwanjmkb2whbqlyk9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; + sha256 = "0fg227yhj85xy0s32xzwg2ka9kc9ygl0wd33wypp6jban13ldasr"; + name = "gtk-pomodoro-indicator"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gtk-pomodoro-indicator"; + license = lib.licenses.free; + }; + }) {}; guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guess-language"; @@ -28979,12 +29063,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170227.656"; + version = "20170313.813"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "c11094293d250bd6299c4eeb4dc64af223124aa9"; - sha256 = "0ya4zacfrv3hl317l78jrj491hag36i4ishh0gcrz602qqdgw531"; + rev = "61d6ce9b133fb57d4b7a12d007b2e2c8bc6a645f"; + sha256 = "0jlzb06vcgdmj5yp0wnfq81bjdasnbrffvm3019b5yyx0cc7ysn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29466,8 +29550,8 @@ src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "74351e8a14e6e8e1cdb77a4b677065ab81d98d8b"; - sha256 = "0h6xrng4qmfkafd77pg1svzcsz5law6rcif95050c03w3fvy4syn"; + rev = "775ff42884c0baab9da01fcdc87707c6c90480c8"; + sha256 = "1w6sc6klkr5b9fbp38pngmn0icps5hi6z6cbs59zlzz5lmq7jr9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29730,12 +29814,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170304.206"; + version = "20170312.2348"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5d4d74c9ad506c33263df8a561289b621eda1546"; - sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm"; + rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0"; + sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29940,12 +30024,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170227.608"; + version = "20170308.36"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; - sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; + rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6"; + sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30276,12 +30360,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20161121.2111"; + version = "20170306.2113"; src = fetchFromGitHub { owner = "manuel-uberti"; repo = "helm-company"; - rev = "59e93396309fe3cb60913332d384d2f4706694c3"; - sha256 = "0slp08dy9s40mqj6f64d8yw9si1a76mlhbmm3a7khf076b8ky02s"; + rev = "64b3e341776dcb2fe7b329ad0a790629e4a7b800"; + sha256 = "1h8yhvwh8973r9990mdizrva1g1c8r8xm5wrd3gpmllgx36mkkmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company"; @@ -30297,12 +30381,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170301.2122"; + version = "20170310.529"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "5d4d74c9ad506c33263df8a561289b621eda1546"; - sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm"; + rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0"; + sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30595,8 +30679,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "1546dbbfaac7729435226b4a7426c9e67032482a"; - sha256 = "1a7kjibc2r26wxc2c12bymjxdx965blm39qfgcvmqy6if0bp6w7h"; + rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c"; + sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -31556,12 +31640,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20161112.1505"; + version = "20170312.1524"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "4596ac225a90bc49d96a416d661f5da2a13b711d"; - sha256 = "0snynrrrkhm7c3g2iwr5m4lq49lxfrkf7il1rm2k56r5lbzw7mkm"; + rev = "dc697094c48f97d485c1898b7a5ff3df6d992910"; + sha256 = "13r0x74yx1cyl2zwj76p867yj2x97pj5hxapc1v9fj3i9h9a99l6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -32225,6 +32309,27 @@ license = lib.licenses.free; }; }) {}; + helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: + melpaBuild { + pname = "helm-spotify-plus"; + version = "20170311.221"; + src = fetchFromGitHub { + owner = "wandersoncferreira"; + repo = "helm-spotify-plus"; + rev = "a09f571ed5addbdb0a2b8354cf18b4d5551b5abb"; + sha256 = "1c6dv92n9kkaizhswlm7hhk175c5ywvq2710d7hpn18cdj3isjsx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; + sha256 = "1f39g2kgx4jr7ahhhswkrj0m5rbsykvkgh00d7jy8czpp8r4dl20"; + name = "helm-spotify-plus"; + }; + packageRequires = [ emacs helm multi ]; + meta = { + homepage = "https://melpa.org/#/helm-spotify-plus"; + license = lib.licenses.free; + }; + }) {}; helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; @@ -32291,12 +32396,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170208.546"; + version = "20170313.139"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "65e1f3ab12caa206402fad381cc75c7e844f9452"; - sha256 = "0j07hrdws0n9s51a5z7b0q1lzivvmrpn0crsg5rwnm9jwa1a6vws"; + rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523"; + sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; @@ -32597,12 +32702,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170228.615"; + version = "20170308.205"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "fcc713565189eae4dc9f39ffd1944f4c192b512a"; - sha256 = "0338j0wf5h3vxdrhsgdiqiczg97md3gapghabswpsk8r9k4nsjn1"; + rev = "f7b8803fd81e738e25425e0eeeed4cf2adc6a5e8"; + sha256 = "0hbfgzs4kg2vqm034falm9rhhin9ii0n0rc50qli5v3a85c7ayrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -32885,6 +32990,27 @@ license = lib.licenses.free; }; }) {}; + highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "highlight-context-line"; + version = "20170310.1438"; + src = fetchFromGitHub { + owner = "ska2342"; + repo = "highlight-context-line"; + rev = "18ca91d91f2a9e86311d8895c53741ad847180ba"; + sha256 = "1a0mvkbdhdad4nd0bqpg0ldz10lh211w72gcd2x1ydijwvkphjdc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line"; + sha256 = "0zmqcfsr2j0m2l76c8h6lmdqwrd1b38gi6yp5sdib0m4vj9d0pnd"; + name = "highlight-context-line"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/highlight-context-line"; + license = lib.licenses.free; + }; + }) {}; highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-current-line"; @@ -33243,8 +33369,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "c2ac3e3ce57c834525dc8ec5ca87d5e8d728b69b"; - sha256 = "1zhggfmhk57v2yj6w9z8mrq8yjsdjg7nzljz1jwbk03jkf7zvwr8"; + rev = "336a440749e626df015be58e4582f1f6ad179984"; + sha256 = "0r8x7sjhx4l3yl5sfxl04qk8rmid4x7cmk3721zbbmsyzwzx1a2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -33320,6 +33446,27 @@ license = lib.licenses.free; }; }) {}; + historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "historian"; + version = "20170310.1001"; + src = fetchFromGitHub { + owner = "PythonNut"; + repo = "historian.el"; + rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec"; + sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; + sha256 = "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab"; + name = "historian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/historian"; + license = lib.licenses.free; + }; + }) {}; history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "history"; @@ -33566,12 +33713,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170302.711"; + version = "20170310.849"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "0e65583a7821e60882b8ce7934b1f1c34d4d1874"; - sha256 = "12r0jxcipfbs77yr2svs60x1b52l6lyjgjax3kxaizjdjaxxwsdc"; + rev = "ef211ab1ad75cb323adfd3b13de5832e5b7b180e"; + sha256 = "1mz48jpr9af8p7yrplnbkkkgd3587nw28jigpdyik257v2787ayi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -35539,12 +35686,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170305.900"; + version = "20170310.2255"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "2e1dd6c1e1540223f8cc4e3493c1e555144d5431"; - sha256 = "0flfp8313xxw8c3wip0fqqz33n7gfn3fhppsrpz7wlxiqymsb20d"; + rev = "d81e266e77316bc116ceca5dbc92fc3831825be3"; + sha256 = "0hrz6809w0ardqgb5xraxpr6gj25jh2w7cbcpacc5xv90cv4p7ri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36039,12 +36186,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170302.2354"; + version = "20170308.2033"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "693e13fd3f19c05e906c234c692d77ac48d69fdc"; - sha256 = "18xj5m6qglh4w903vcdxmw1sms51ansrai43sndcp6z4sbi02xpb"; + rev = "5396b410c326f8685b473e3f38db7506b1616582"; + sha256 = "10qnz73djzwr4lb96d1x51vhia5qicjr3c1ijdysh2dhbxpz2y02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36309,12 +36456,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170223.515"; + version = "20170312.1515"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "75b356b357e63a03c04e194e85f1925f198363dc"; - sha256 = "0fsg79ww3aqy0m46xjdr3783zwc6vnxknh4k2yrizmm44zvy925z"; + rev = "0c16cbe0038dcd5a2f70de2edd28a62a4008ac5e"; + sha256 = "19r6jzs47h15kxjmpsk3ddb0gc331vnsvfa5xcabkf5gk3h36mh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -36597,12 +36744,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170225.351"; + version = "20170312.844"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; + sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36618,12 +36765,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170227.608"; + version = "20170308.36"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "c4fd39864d0c9f770426a93319b492942c81b1e6"; - sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr"; + rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6"; + sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -36678,6 +36825,27 @@ license = lib.licenses.free; }; }) {}; + ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-historian"; + version = "20170310.1006"; + src = fetchFromGitHub { + owner = "PythonNut"; + repo = "historian.el"; + rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec"; + sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; + sha256 = "0yzq3rr51q5d64pfc7x5jszz77x6nwpbjj0g74x5ga3bsw3i67d9"; + name = "ivy-historian"; + }; + packageRequires = [ emacs flx historian ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-historian"; + license = lib.licenses.free; + }; + }) {}; ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; @@ -36685,8 +36853,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; + sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36790,8 +36958,8 @@ src = fetchFromGitHub { owner = "squiter"; repo = "ivy-youtube"; - rev = "32f609f1d1a3718739be5797e020d6266d8340d2"; - sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd"; + rev = "7e916dd531c52a2809188a99716aeff8446056cc"; + sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; @@ -38373,12 +38541,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170304.2103"; + version = "20170307.549"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "5995aa56c9ccbb3eb78c49daba1e77a6aed354b0"; - sha256 = "0aqmd5hkqphwv74n6y5yidhn21hl2hlnmfdm7m8wkwhcylylq6xi"; + rev = "bfbcb88c7f107b85559562da5e7dc37af0ddb82e"; + sha256 = "11vrsswn6bzfdvprcy7psgxdpkn4ayggqb851pj2vz12bqj17jf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -38394,12 +38562,12 @@ kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; - version = "20160218.20"; + version = "20170311.2151"; src = fetchFromGitHub { owner = "kuanyui"; repo = "kaomoji.el"; - rev = "cde86e7f27008dbe03230d63941a0f5bd0512c10"; - sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5"; + rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e"; + sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji"; @@ -38706,12 +38874,12 @@ keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyword-search"; - version = "20160607.2238"; + version = "20170309.2247"; src = fetchFromGitHub { owner = "keyword-search"; repo = "keyword-search"; - rev = "d40633712cf4dbb1bdf95d8262b5a4138b29e049"; - sha256 = "0g42yr331piv3r18ymz4kb8jqmslimq3xamkyqdn702xljmb2pad"; + rev = "33682e93429027805ee7c51c5f6f608872b6f5dc"; + sha256 = "03qz2sdyrlww1xc9bkarc07pf3rk42h7jjnl0dw76ffrci1z1mj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7/recipes/keyword-search"; @@ -38878,8 +39046,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "ca9eb0bbb8e9a4b5b6e2b177b2b36ab024495587"; - sha256 = "0kzh5q1dj7mqdjcp1di0lm8imxjlp1ak8licidfy0lz4h4fcqsch"; + rev = "3bcc310e4f62eb567d5d568446058f7f5811ade8"; + sha256 = "0zx73p4hdgpsvy2ifbi6zwi2ard1sjnkd1ig0habhzd5c7f52igr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -39025,8 +39193,8 @@ src = fetchFromGitHub { owner = "tttuuu888"; repo = "korean-holidays"; - rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4"; - sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579"; + rev = "6e94c2e071069aee9ed12ebbfd9b0ad863b8c78e"; + sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays"; @@ -39230,10 +39398,10 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20170101.1036"; + version = "20170307.837"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lacarte.el"; - sha256 = "0xlbv4hhmg85x8i2zzbma29r5674cbmjrqwda9bjxf00wfid0a76"; + sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte"; @@ -39584,12 +39752,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170208.425"; + version = "20170310.1705"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611"; - sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx"; + rev = "084849f8350a51224a968184cc2b1debdb75bc93"; + sha256 = "0iy603ym4bx85gp44cndxzqpcn8xgbz9nrwiid9bmjicizv9xld8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -39773,12 +39941,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170226.131"; + version = "20170309.1340"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "51ca421f52839c62c6b4ed4cc70d55701ca2afdb"; - sha256 = "08v2mx80ihcs4v2ydf4ksb5yhbsp222wwzzx26xw70icahsx67y4"; + rev = "4b11c7d4ea4dbde316844d3c73be9bafe12ac911"; + sha256 = "0saaakcs32i0bal2v6zcw1r27jzbs3hlhcsvr0k9dkhyi2kv2nwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39853,10 +40021,10 @@ }) {}; lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; - version = "20170101.1038"; + version = "20170307.855"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "03y99c1cg368c3647w8jypf2nlx26qkygrijw2vxcp4ha5v9f44z"; + sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires"; @@ -40150,12 +40318,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170302.1031"; + version = "20170312.957"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "8794864744151b808c0f966b29c33c547be96d89"; - sha256 = "0ii8092148a5mi59ssnl9hxzjx861vpb6ajma4anpzfjlv9wjjq7"; + rev = "0ea4c086756e0f332821ca757ea884ea9ee0a81f"; + sha256 = "0kf20hkav15r8dv9hdvbrn9x3x0dc3m0k15gnv3a99fi5qlnwh12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -40397,6 +40565,27 @@ license = lib.licenses.free; }; }) {}; + literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "literal-string"; + version = "20170301.730"; + src = fetchFromGitHub { + owner = "joodie"; + repo = "literal-string-mode"; + rev = "2ca4fc08b8e19e6183b1f1db747bb0a4aa4f98eb"; + sha256 = "0wcz0lid05gnlmxpxm4ckw07cnxwjkyw6960nq7pylbjpg76g5ng"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string"; + sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn"; + name = "literal-string"; + }; + packageRequires = [ emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/literal-string"; + license = lib.licenses.free; + }; + }) {}; literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; @@ -40550,8 +40739,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "c7849f87280d549f3829a2c2fe4cd911c421a0db"; - sha256 = "1anp1avlzl7xf2zhj9b8ixhwxmvprbiis7nmdnh9nq1xkpfjlmxm"; + rev = "00ea544948006ad27602b656c5eb3e2b2051c1be"; + sha256 = "1zibr3x6y7p6mynjivd55y102hjyl97sv2ipwgm9n1jsif2iz6ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -40917,22 +41106,22 @@ license = lib.licenses.free; }; }) {}; - lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170302.1127"; + version = "20170311.2126"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-lsp"; - rev = "03f1bd56317557c398851757893522f25908cc7f"; - sha256 = "1xmmh4a23naa7ipd673q52hv31wmi1j20sh5kcgw14r3pqymd8dh"; + rev = "0fc5400562247b5d674ae8d18f78824de12ba6b0"; + sha256 = "1zmpkpx2nhm1vvdagrp75jz6v3d4n7zv45xp49m81xzqsyw20im0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1"; name = "lsp-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs flycheck ]; meta = { homepage = "https://melpa.org/#/lsp-mode"; license = lib.licenses.free; @@ -41108,10 +41297,10 @@ }) {}; macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "macros-plus"; - version = "20151231.1419"; + version = "20170307.842"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/macros+.el"; - sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d"; + sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+"; @@ -41232,12 +41421,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170306.44"; + version = "20170311.925"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; + sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -41383,6 +41572,27 @@ license = lib.licenses.free; }; }) {}; + magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-lfs"; + version = "20170312.1524"; + src = fetchFromGitHub { + owner = "ailrun"; + repo = "magit-lfs"; + rev = "799282fce73b668d2cf6e4fa87f889fec8e25333"; + sha256 = "11wv3j8b377sbfj1qhcr6rn05ns728ifrigjk7r60rd34lwyc8c4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1a92f0963d8df3e299a999948828173dac38a612/recipes/magit-lfs"; + sha256 = "1im9skj74jdi7jh0fnyyk8a4g4sk48clgn107ggf69lnfpxh8xxa"; + name = "magit-lfs"; + }; + packageRequires = [ dash emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-lfs"; + license = lib.licenses.free; + }; + }) {}; magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: melpaBuild { pname = "magit-p4"; @@ -41407,12 +41617,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170214.347"; + version = "20170308.146"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "4f565039fd318ad5a90cd3c779785f25f540c652"; - sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr"; + rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; + sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -41659,12 +41869,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20170304.348"; + version = "20170313.206"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "af83a1be2bb800ebee4ab378f167075537eeb7ec"; - sha256 = "1zbjaixbrhs39fmf58mxqmwlby531gfxzn2s8s10rm0m6sswbzii"; + rev = "07dfde3f4236498fac31fe1ed5a9b87e92c484f8"; + sha256 = "0dz8mijsfnzsi7bd928a55d7dmc04c45jx28zg9v0mmgx6fkkr28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -41869,12 +42079,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170301.1511"; + version = "20170308.2031"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "b360948acf5a31b6cf6f0113ab5f30bc47f6b098"; - sha256 = "016h6mq0650fw8ix1zh1j15i782g0bpmlsnsznzi5aspy8b391kn"; + rev = "67c15f292515142c2417f147117ea2a3172cd195"; + sha256 = "1kbr2x4s0ynwizm5hy3q4xdjs1jmfdsnpndcs0dlh0di0mhld6x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -42419,10 +42629,10 @@ }) {}; mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-depth-plus"; - version = "20170101.1046"; + version = "20170307.844"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; - sha256 = "1sk8x91gxwk17kv7whwfh9szxmgyy9ys1h4hx17hyzlvhz9smncg"; + sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+"; @@ -42752,10 +42962,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20170101.1047"; + version = "20170307.845"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0s460zm9k8b76vih5wgyrg8a7w5alwd43ia00mp110ipq2sy9pd2"; + sha256 = "1lvnsh45fh23pc49xfz8p5m7z82zzxsrdikmx6pbylzhlr0m3nc4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -42775,8 +42985,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805"; - sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q"; + rev = "89f9643c08211a770454919551a7fd8605d1fca8"; + sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -43373,12 +43583,12 @@ mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mips-mode"; - version = "20161008.212"; + version = "20170310.2149"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "8857384be127b55bd7a20437e4592d8a0175ebc7"; - sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl"; + rev = "a13d1fc5b583a29f059f7794f2d83e59da439fa1"; + sha256 = "0ncvp52dnicy84wmnbxhm6djxhc8njrbxy6zwz2vylmy24z9948w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -43393,10 +43603,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20170113.904"; + version = "20170307.847"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz"; + sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -43411,10 +43621,10 @@ }) {}; misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-fns"; - version = "20170101.1050"; + version = "20170307.848"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-fns.el"; - sha256 = "0q5if5p0yy2b3h93lsrhy7z8f5mjmm3kkh1ql94jng4a0hl64jqr"; + sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns"; @@ -43451,12 +43661,12 @@ mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-jinja2"; - version = "20170128.416"; + version = "20170313.720"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "mmm-jinja2"; - rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c"; - sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55"; + rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f"; + sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; @@ -43722,10 +43932,10 @@ }) {}; modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-char"; - version = "20170101.1054"; + version = "20170307.854"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-char.el"; - sha256 = "0y5bjny8j9lvf94rfk3nrwdfmbp24i1b96909xpifn3l1r1xl6qr"; + sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char"; @@ -43740,10 +43950,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170227.1124"; + version = "20170307.856"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "0glwnfgch9li5z6051ia3f61csl3f6aa1cwkwmw9w7saw4d6q3m1"; + sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -44094,10 +44304,10 @@ }) {}; mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-plus"; - version = "20170101.1057"; + version = "20170307.859"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "0drv4r30jj1bsgd9jv6znicc9jgxd0hzjd3xlsp7l2ynjbg86n4g"; + sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; @@ -44133,10 +44343,10 @@ }) {}; mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse3"; - version = "20170101.1058"; + version = "20170307.858"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse3.el"; - sha256 = "1d6192r5iqyvs21ip78wcsvwc4lpx2jiv6pljcm9blxr1bpsk3gl"; + sha256 = "0as1d26m3r1vacccsdlbw0rp6jyhj054wv1lssiky6d0kqzn6wa6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; @@ -44362,12 +44572,12 @@ mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mpg123"; - version = "20151214.1150"; + version = "20170313.715"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "mpg123"; - rev = "ed2307843ca54ebf0ca5e5d2e79b41e79527c45c"; - sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb"; + rev = "d1dd8c56428ae55df9e23ba26f102588001d55be"; + sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123"; @@ -45086,10 +45296,10 @@ }) {}; naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "naked"; - version = "20170101.1100"; + version = "20170307.920"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/naked.el"; - sha256 = "06j2kijshd6ywx0rfvl4d08r0rh0b0rj69zypz63p418liymzcn6"; + sha256 = "1l6r7vdhzlbv70in16qiyac81930srakr4d14dqda5j3h4w09hbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked"; @@ -45252,12 +45462,12 @@ nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nand2tetris"; - version = "20170214.2248"; + version = "20170306.1827"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris"; @@ -45277,8 +45487,8 @@ src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; - rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee"; - sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv"; + rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e"; + sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler"; @@ -45334,10 +45544,10 @@ }) {}; narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-indirect"; - version = "20170101.1101"; + version = "20170307.921"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el"; - sha256 = "0rlj647azpj5v7lzap88992f7mf2y94708f4aw2cvnzj6hf1rsvy"; + sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect"; @@ -45588,8 +45798,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "883bca8693d0d289c19ea62d55e5fbaa93e721ce"; - sha256 = "0mr9x0fkza7l1427ib4cwab77vva2aghr7279rzh2hq0wlkzc5zj"; + rev = "851a186de01369721042a1a9fa951f89c98a68fa"; + sha256 = "1n67k2h919rjsn41qsnxm13a7qdasfh2hj5d52wqjf3ld8f88zqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -45902,8 +46112,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "fb3c70049b82d53101fc6086a1699ecf16966792"; - sha256 = "0amylb876720959hhsd31k025l1d3rv1i9i8qhf2k1skd8xfrvpj"; + rev = "0b0374e831d9c050c6c9eb2ef48b73bc62a0f084"; + sha256 = "0vyra2kr95msd103h3p8ya66l04wgn5c95vmz5g3l71jvmm9wx8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -45944,8 +46154,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1cf480110879ffc8aee94b4b75999da405b71d7c"; - sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02"; + rev = "96443e94a1932cff13f23d202839c53483b9290e"; + sha256 = "027agsvbi6wmhdsdzxjvbhskjlgc20dzq13jb7sjvq5a330fgjsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -46066,12 +46276,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170226.1130"; + version = "20170312.612"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b"; - sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i"; + rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde"; + sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -46234,8 +46444,8 @@ version = "20170304.1716"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b"; - sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q"; + rev = "c0c5645538d9dda84657602ee4189f4ff3ca1aeb"; + sha256 = "092mv01pn5i7brn311zdcd74pspw5lsmq4vhvi3n80z9byrh6w1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -46271,10 +46481,10 @@ }) {}; novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "novice-plus"; - version = "20170101.1103"; + version = "20170307.925"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/novice+.el"; - sha256 = "04lsjzj0a0z7wn7jzlpzjdv9d2w591gs2mwvsh1j8hmgl4x5p9vp"; + sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+"; @@ -47385,8 +47595,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "5dc0ab3bee633aad64967e79539cdd007bbcacac"; - sha256 = "1d7q3gd6clyhpzy4phi6g5435iz50kba2mbn0jd403x3270gdk9y"; + rev = "032599b162624a4b65c82c20be06433f24b00e8f"; + sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -47788,10 +47998,10 @@ }) {}; oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "oneonone"; - version = "20170101.1104"; + version = "20170307.932"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/oneonone.el"; - sha256 = "04jjdfbn8ah3gk4fpc56il8j4q52l9raxkbkxivqn440as7nkrn4"; + sha256 = "1fi006v0j5w993jf7hr2ywk9zhsy2v0hiscxlmjws2ihgcfmcslg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone"; @@ -48246,12 +48456,12 @@ org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; - version = "20160811.217"; + version = "20170312.2316"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-chinese-utils"; - rev = "3818d03bde90433b49b8ef8cffdd242084af4058"; - sha256 = "0rlqr0b54rv8p2015vgb730r3lqwxg3v0msiimwxlhfhgww1pg2b"; + rev = "9f3ea014d049e026105055330500ee9ed82e9bc4"; + sha256 = "1i05ds7dz5ra2vyzx3fd0038qnzgr527cnnnrhl4afr93cqgjp6a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils"; @@ -48878,8 +49088,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b"; - sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb"; + rev = "7b426972600154286ce6fddbaf9b7c7503845bbe"; + sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -48898,8 +49108,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b"; - sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb"; + rev = "7b426972600154286ce6fddbaf9b7c7503845bbe"; + sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -48975,6 +49185,27 @@ license = lib.licenses.free; }; }) {}; + org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-notebook"; + version = "20170311.1302"; + src = fetchFromGitHub { + owner = "Rahi374"; + repo = "org-notebook"; + rev = "ea6e477015a5f25d41df25af25252f521b12691a"; + sha256 = "1i1jchigh70z0ymil85plfx6wf9hwxlkl7jx9kxhv70zpc3m9mlg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; + sha256 = "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld"; + name = "org-notebook"; + }; + packageRequires = [ cl-lib emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-notebook"; + license = lib.licenses.free; + }; + }) {}; org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; @@ -49020,12 +49251,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20170305.1948"; + version = "20170310.240"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "493e9ac843eb44efd8a6f486a7cfa727d575f3af"; - sha256 = "1amviznfqjb3z09bzv11yy2ickka43z7ffzjlbgk9wy066944p8l"; + rev = "18c94764b6240344d4e147d881071876e9004e30"; + sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -49285,12 +49516,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170306.638"; + version = "20170313.713"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "1cf25da328ecfeac402aaa38dc3f50af8f462264"; - sha256 = "17bw03c22khqxf8b5hmf4f0l2s7qbmjkkw6m3xvs30k5snq1wk8x"; + rev = "2f8152e6e45885f68c01b39a227c625a441d6ded"; + sha256 = "03ra8dr5qpmny3s293al8fckyrspkhbrgw31adz3x9z69c919qjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49673,12 +49904,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20161030.100"; + version = "20170311.1713"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "6a3c80ec00bb16707def17138e4230221511df3a"; - sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x"; + rev = "bd7b0e896e250a7c330568b33520c347b6731890"; + sha256 = "1l3smz4xx9s4jsr82isnh0hz6ivsf9y5jl87fcfkh98aqlym4z8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -50412,8 +50643,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "af3d973d90b779d93153f751c746f9ede85972dd"; - sha256 = "0468if164skl0rwnk36ld3kjcmiqmj59jijgfw5w9mpd8j4mvwf0"; + rev = "f9c485ecb08bd1820f47c6e5c160eae0776a1ed7"; + sha256 = "0vwfhgsxgnwg0533359r5hng29k9wjs5j3yjx82y1qxdla13j51j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -50426,6 +50657,27 @@ license = lib.licenses.free; }; }) {}; + ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "ox-epub"; + version = "20170304.1600"; + src = fetchFromGitHub { + owner = "ofosos"; + repo = "ox-epub"; + rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8"; + sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; + sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh"; + name = "ox-epub"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/ox-epub"; + license = lib.licenses.free; + }; + }) {}; ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; @@ -50534,12 +50786,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20160928.2153"; + version = "20170312.600"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "338b168bac4c44f8f4d212f67a2190a70eacd240"; - sha256 = "1wh0ds7cznnvvh9rg3wsapdhxi8pplimszhzliglgj8sqfyb7kcx"; + rev = "f4f49ed0c6de69b11739b62cd1ebc1351ad657f4"; + sha256 = "1bppfj3zwkn5k11wk0845gf32k69c8jz5fsqq4iwvl89ijfjk5xn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -51121,10 +51373,10 @@ }) {}; palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "palette"; - version = "20170101.1109"; + version = "20170307.936"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/palette.el"; - sha256 = "0kx41b6axq9ba1mhp7icjq165aklskiq9ddmcn8yrcx480v4gf11"; + sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette"; @@ -51474,12 +51726,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20151006.232"; + version = "20170311.1430"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; - sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + rev = "ee1dfbb53fff9fd5c4dc6571bf498516b7ffff01"; + sha256 = "05rgi9hk17h2kjib5v68i4ikg7292f65qxxinaxkhsy0xsx6kybl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -52332,12 +52584,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20170302.712"; + version = "20170311.716"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "5e440fb287897b97a0d13fc150df60b6860e4481"; - sha256 = "1ff1h80hmkm3b1qj4y3hjzmmzcwp14qr8ankmi0qxymsz5z2jar8"; + rev = "6b3987b6c085da52a4a1e1a8433bd4a6f3f411d4"; + sha256 = "0w2wmy1mhpjfmm0js5h0nqwwmj2xzpasc1m40slwh0lcm9176w9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -52395,12 +52647,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170221.1910"; + version = "20170312.19"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "cca16ec338454acbad26f4d1d57a463a034bdd44"; - sha256 = "078mfmky682hbjkdxkawimxddzc2laz6xqrcpi1dli1vzgpkx7p9"; + rev = "f093cfecde0e8ce0d5e390784c228831536aef72"; + sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; @@ -52584,12 +52836,12 @@ phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; - version = "20150807.112"; + version = "20170310.237"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search"; - rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69"; - sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62"; + rev = "a81c4ea203fcb572f6cc37cc658d6b01453bef9d"; + sha256 = "1z3640walrdk2c90hj47xvlpm6xd5iblxvn7i16krdfz735i4rr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search"; @@ -52794,12 +53046,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170220.1707"; + version = "20170307.1750"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "aa69d062ea91e03ad84a378ed4f71c63846027d9"; - sha256 = "0xpdzv2vigidnqv2pl9g614cqd8xykyln84pksifx2ldjbcs9xsc"; + rev = "c761c97e53d50a015bf8d5d554f4917267b0f6dc"; + sha256 = "0hy0bzscv3hakldmjynsm9rz91v5lyb7rp20ljzfvbzzbkbxzdai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -53666,12 +53918,12 @@ polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20170216.615"; + version = "20170307.322"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "f72ab719c054ad2a46d175c77ad893bb6f476e36"; - sha256 = "1pkhp3b1fv7zvsq8qnf06czyv3ax95kni7k6zjgnrwrvm3ks8fsn"; + rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6"; + sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -53684,6 +53936,27 @@ license = lib.licenses.free; }; }) {}; + pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pomidor"; + version = "20170310.634"; + src = fetchFromGitHub { + owner = "TatriX"; + repo = "pomidor"; + rev = "c361814b1abbff2b213bd3cd5376efd3e749ce2e"; + sha256 = "15ryj9hp9kc9fn6jwipwwgaj6f5cwwmjswq1017y0f69qf69dd1i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; + sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi"; + name = "pomidor"; + }; + packageRequires = [ alert emacs ]; + meta = { + homepage = "https://melpa.org/#/pomidor"; + license = lib.licenses.free; + }; + }) {}; pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomodoro"; @@ -54085,10 +54358,10 @@ }) {}; pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-c-l"; - version = "20170101.1116"; + version = "20170307.939"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp-c-l.el"; - sha256 = "07favccg34khq0rnkdmbmhagpn6sg0vrmxcql35vh1p0jalp208s"; + sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l"; @@ -54103,10 +54376,10 @@ }) {}; pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-plus"; - version = "20170101.1114"; + version = "20170307.938"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "0v8gm9z9dqxmqqvgz4dwmh79ssmir0zf4p3c6wbwrbak16b2ad6m"; + sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; @@ -54226,10 +54499,10 @@ }) {}; pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-lambdada"; - version = "20170101.1117"; + version = "20170307.940"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el"; - sha256 = "17vji7y92ahmhff6ax7znhi7dbfhi8zpghhnl408n5hzcvmqmf06"; + sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada"; @@ -54596,22 +54869,43 @@ license = lib.licenses.free; }; }) {}; - projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "project-shells"; + version = "20170311.409"; + src = fetchFromGitHub { + owner = "hying-caritas"; + repo = "project-shells"; + rev = "ab10fcd370781f684ca334f83fd70ed22a3f93b9"; + sha256 = "0fh61myklzg514zlqasp09arxdg43lvyqv7sv2dr74ins29zc0lq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells"; + sha256 = "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8"; + name = "project-shells"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/project-shells"; + license = lib.licenses.free; + }; + }) {}; + projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170225.2320"; + version = "20170309.30"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "d9cc453b9e11c9b2f03413e3075e063a6143af69"; - sha256 = "1zam1avzb5dcv0icjd8vs1p7k24szqx1n4b7qr17pikyvjz4g0xs"; + rev = "0c307c8cbf6162fa992bcdbdd1940bf6eff28253"; + sha256 = "18m35h9r1gs96hkgqmjhkwnlg5dj9knh227n2k9xckg161mld2fg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn"; name = "projectile"; }; - packageRequires = [ pkg-info ]; + packageRequires = [ emacs pkg-info ]; meta = { homepage = "https://melpa.org/#/projectile"; license = lib.licenses.free; @@ -54645,8 +54939,8 @@ src = fetchFromGitHub { owner = "christianromney"; repo = "projectile-direnv"; - rev = "33455b93576855065ba4ba9ed1b05dc36e692f1a"; - sha256 = "09zyzfqy1i3i8knvh1ajr5jcidjx3jpsyx8qarxfr5kv16pwyfvj"; + rev = "d5d29e5228f840b7a25358a2fd50353ef2dc9b16"; + sha256 = "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/602485c251bc573e855dfd33e4e94052afbab93f/recipes/projectile-direnv"; @@ -54708,8 +55002,8 @@ src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "038c7f9724f684c7862e108150e256a00ff9c5c6"; - sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv"; + rev = "4e5cecdf28e5c7a255648b246883adf6add987f6"; + sha256 = "0wdbmsqw806qji12wwiw2blzldnpyj2lzqj3qcyxladq5w576xqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -55002,8 +55296,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "0c0a8879c3dd7ee6925746d2206f3262689b5833"; - sha256 = "1np5vkyzp5fjjzj8x3b55pj7mvanqsff726maj77mnixcs11vj7f"; + rev = "a69bc9de75fe08f5fe7ad6e2339dfc5b0da5d8ef"; + sha256 = "11b7wmzkm35bsbczhswl5495zz84ib2dm3syyyvyhbrgqrayppmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -55745,8 +56039,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "7df8caaa3e1995018417ac2fd87afd89be6945ba"; - sha256 = "0fj97k1h4yplz87pfcmbxcg7sam447k1rn6ggb227jlyvqbw30sm"; + rev = "d78e0130720aba010a55e388ba16bd58debef828"; + sha256 = "0my3a7h7v6x1b19d8fd6lpdzn32zav4nwpmc8f8pypf076kjaf82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -55888,12 +56182,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170219.809"; + version = "20170307.457"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "52024dfb55354b3cc59f7115421bc130a7670c2d"; - sha256 = "1v0qd7935nlxz7y9175xz8ygx1m6snd0nhgfs2k0bkfyv14ps5bg"; + rev = "ac40376edcd2ca5a608f8aaa87b76fa020a2f3a3"; + sha256 = "0z375bx4609c1p9bb1awvrzcqscmn4v5jzarkw9ps5y1r0770b1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -56287,12 +56581,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170226.1906"; + version = "20170308.1044"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "c50cd48edc74348bd89b09661ea325dac12fcb48"; - sha256 = "1vxplnnp751lp4nm2vqdysr9b1ksqykrn6l02dn2priyy5hh29k4"; + rev = "8cd8966db88de17d4c2f558540f1fe4b1b9e5a2e"; + sha256 = "0lflbfrz90vkxmi33mw060vjimxsw6dr4fdpp2x38ykv97bwlpi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -57378,12 +57672,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170219.807"; + version = "20170311.114"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "9ac5ccaab861968ff54ce4a89efeb29ea3e4fae9"; - sha256 = "1jqm4dmyzcknzpn6i00wgv1f7fa6acxg4b5vp6hzp8za8i9fzc6p"; + rev = "e46948a3567a462094fcda227daa0f462e9f9120"; + sha256 = "1damy0y5c4qnfvdmv9qzr7w6vs88dm71wsfv918p79a0drp7xrdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -57733,10 +58027,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20170101.1119"; + version = "20170307.942"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0cbm5g5d1d4bdfmx3nkldpq8k5ah0cz5ddq7cn4278rjx1h9ml5f"; + sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; @@ -57920,12 +58214,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20170220.2245"; + version = "20170306.2230"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "56f877fe86373df3eb048ac96d6deef7b9f60892"; - sha256 = "1v4yvkp4f3rg8gi01y1gsfn7sikx4c3w0gisc3kdb3rs9kf1p8dd"; + rev = "d7eacf44b643babce367076d91bef87cdf8e732e"; + sha256 = "0gw5i62d74byj4zdas480cpylz9rnb4jishpzhpq1zvmdhh5sd0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -58544,12 +58838,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20170225.12"; + version = "20170312.56"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "159afaf630be5fb13b3b0762f4c42ae6699dd143"; - sha256 = "0pm0zzk7sdzvk3zwlqpkq5pg6p3kkny9a8104fpyszvd3f2ygsk2"; + rev = "fe336636a57955b927b5994c8c738e21cacdc800"; + sha256 = "07qjp6bb5rkcpbda7gb8g0zr2mr6cwplaspwc4ckidfcd8vzdn7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -58569,8 +58863,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "ec6d0dcd9215fe9f29c7cf49685a60c3ebeeaf8d"; - sha256 = "01br0l60ng8jx0wyvikjy96g6safdmr3vdr463jz61shif3xpirx"; + rev = "606864f4e3f6e00426a69087b707cbc44d19404c"; + sha256 = "1ga88cjjb91pma47r4hz3kg6080dk29lbvghlffh9x0r91w1y5pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -58607,12 +58901,12 @@ rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "20170123.906"; + version = "20170311.2211"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; - rev = "d4dad3209f05288bdbe3a31f47794047b87fa424"; - sha256 = "1w1mbp04sqsa4jl8ix05i8af9095zbblcjxkhgmj4x57s8yfsiap"; + rev = "980bedb455e3551d35a212fae515c054888907c1"; + sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop"; @@ -58631,7 +58925,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57789"; + rev = "57962"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58711,7 +59005,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57789"; + rev = "57962"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -59148,12 +59442,12 @@ salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170128.424"; + version = "20170313.725"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df"; - sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh"; + rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81"; + sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -59316,12 +59610,12 @@ sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sayid"; - version = "20170301.256"; + version = "20170306.1733"; src = fetchFromGitHub { owner = "bpiel"; repo = "sayid"; - rev = "5a85d5e98b7a23a1009dc089d604de9a32facedf"; - sha256 = "1sxsf3f9rzlpm3pib39cdy4sbn2fg1l5k0iwcr3vpkrfiyzivbpd"; + rev = "3e5456cade044f01eb0753aabc9e50868000bd14"; + sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid"; @@ -59362,8 +59656,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "14322d78b2be5148c2756d69e7a6c1e53b745569"; - sha256 = "0ih1kahzr3n6rvmsv2jg9v1f5n119vn1qa6jjs27wpd39n3az3hj"; + rev = "3a7dd67970c5ac57df24c40e18e77a99fd14e1c7"; + sha256 = "0hk965ldfxybjjaw9sfyn4zw28178pdmaljk454y4y6xfnm2xcrw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -59920,10 +60214,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20161210.820"; + version = "20170307.946"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/second-sel.el"; - sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c"; + sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; @@ -60001,12 +60295,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170115.237"; + version = "20170309.543"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "001e205b37ae0dded430b9a809425dc7ed730366"; - sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; + rev = "09f7c7c75d8570909ecb45599d6f3ba75768321c"; + sha256 = "0s6y3aqavc4lfqi84hkvbdyyjgw9j5n99272blj0878a0qmia658"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -60849,10 +61143,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20170101.1132"; + version = "20170307.1528"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "1mx48ly135wmqrr0srwnxby46b0mcnyw4vyd0jykih9ygd8kk4dj"; + sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -61180,10 +61474,10 @@ simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: melpaBuild { pname = "simple-plus"; - version = "20170101.1133"; + version = "20170307.1529"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/simple+.el"; - sha256 = "1z1l1lsddd865ma1q714hj4y9p89z1m3hr7z9fir53ipsa31cnl1"; + sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+"; @@ -62182,12 +62476,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170303.346"; + version = "20170312.450"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "0c81107de550931466b11132b8c6286851615b5f"; - sha256 = "1xmaxl7s8lh288vrqg6diakzldp615z41innkl13yjawnad4mxfk"; + rev = "a212f777eea775a5c106b5022dea3bbb215bf98a"; + sha256 = "19fpal1r0x11515s1lwgr5cjs0jk7pggfnv6y7jj4bvrvq87imnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -62748,12 +63042,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20170305.327"; + version = "20170313.810"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "d2f6facaf012fc556498c90a4d1343fcb59a4628"; - sha256 = "0hnjws9b4k0f6clcpcmvvlqnjkq09zrppkdylw334nhdbpkdhkxl"; + rev = "494981aa8f7828392a930ef8533698944738090e"; + sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi"; @@ -63151,22 +63445,22 @@ license = lib.licenses.free; }; }) {}; - sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161219.550"; + version = "20170313.721"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "e5bedd0b1df135bb1e42b756da850dac5955aeb8"; - sha256 = "11vpx9cq81ld6k4710nbvnfhpwq0v0bw0zg5aljr2j1pyfyh0pcs"; + rev = "33da09b3895e03e64959005678d448ab82e527b6"; + sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d"; name = "sparql-mode"; }; - packageRequires = [ async cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sparql-mode"; license = lib.licenses.free; @@ -63729,6 +64023,27 @@ license = lib.licenses.free; }; }) {}; + ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssass-mode"; + version = "20170310.2024"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ssass-mode"; + rev = "c26852123436849367d826c370f24dd9f20cb501"; + sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode"; + sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm"; + name = "ssass-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ssass-mode"; + license = lib.licenses.free; + }; + }) {}; ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh"; @@ -64251,10 +64566,10 @@ }) {}; strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "strings"; - version = "20170210.1925"; + version = "20170307.1533"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/strings.el"; - sha256 = "0am2w3p2igh0y5mdbmjfdzyrx3bngs4c3nibjjcky3pmvj4k3r4i"; + sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; @@ -64477,10 +64792,10 @@ }) {}; subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "subr-plus"; - version = "20170101.1138"; + version = "20170307.1534"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/subr+.el"; - sha256 = "057h7hshdvzm3qcwdnbyw0qb7ijw3jz38cff0n9ln4xgsma6cgm1"; + sha256 = "191yqzkvvfnx8hx19ak20dvm9qjcm5r5yqcmnzw6nsc53m2pdwbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+"; @@ -64977,8 +65292,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc"; - sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m"; + rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; + sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -65224,10 +65539,10 @@ }) {}; synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "synonyms"; - version = "20170101.1140"; + version = "20170307.1537"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/synonyms.el"; - sha256 = "0f1krqbmbdkpll6ggryblcr7gw0wqm3d9hvq145sdwhwi5jw8b4v"; + sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms"; @@ -65368,12 +65683,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20170205.1305"; + version = "20170311.2357"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584"; - sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm"; + rev = "ebfb6f9eb46c006a4488c1fbf9f46de48f5a788a"; + sha256 = "199bmzxw6lrby6l9fgm01i92lvzzbz7sqpjrn9jjmpiwr718qxcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -66537,10 +66852,10 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20170101.1143"; + version = "20170307.1538"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thing-cmds.el"; - sha256 = "1qpszba6ajwqphhk39y6j4wlg7s5lch63lwfa9y28qipwkbn6zlq"; + sha256 = "16bfjak7953mhmn7abd3pq8cqh8njir5x5x7acqs8zmd9n9qpni6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; @@ -66555,10 +66870,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20170101.1144"; + version = "20170307.1539"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0hb3fyqzq0312isid5vji0j74dmkh08p41sss32f4w60yhd8p19x"; + sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -66641,8 +66956,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "431732d39e89f1661dc7dddffedb2c5c1e019cc7"; - sha256 = "1mz2g5flz7yrsjzjfa9p6f5sinhd3xxf6nn3sjma7a9jcm626l7l"; + rev = "6582757752e62efea3f9786dddf0260efaa1f450"; + sha256 = "1c9miaq60d0l352yyxc2l3v927wzgadsyvfxyvs88qdk6pmz59ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -66658,10 +66973,10 @@ thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "thumb-frm"; - version = "20170101.1145"; + version = "20170307.1540"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thumb-frm.el"; - sha256 = "19fiafq5nl29wr35l7nkzjs70fvnw0g27424x7xnm425gwaags8s"; + sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm"; @@ -66698,12 +67013,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170303.1211"; + version = "20170310.2151"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "616a93710a3bf882f75f61bd8f3438de698938c4"; - sha256 = "19n1pc3igwbd1yz1cylnk46jvv723aab7505i8r7mw05zd5cnwpg"; + rev = "70d859495d8bd76f338868f6fc1a89dbcabf7a2b"; + sha256 = "0nd5lcs2lv5m0s56vga3d7j66zfy2w4dafv8g3jv3m3p5hll1dq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -67279,10 +67594,10 @@ }) {}; tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tool-bar-plus"; - version = "20170101.1147"; + version = "20170307.1542"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; - sha256 = "19ayc57vnv9348nfc10392kr4xd6wg0b6v2ya3x2zlpfsq3a6w2n"; + sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+"; @@ -67531,12 +67846,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170305.1155"; + version = "20170312.1927"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "3c1b891f350a5c0b87d15d174203b9ba2bf3db2d"; - sha256 = "0l2qqrxpfn4f0x9zdz0rsf5vw8238ycjmxnbjx7mcp3awm90pp46"; + rev = "fd6334f795df409d8d854a0762ef2d2ac74556c0"; + sha256 = "0mi3xrgsshds09j70mv42ngn1f702wswvrn4wm3xh8gv6sqfbz5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -68027,12 +68342,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20160921.1038"; + version = "20170312.735"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "08a810167d47852367e7e8d56916c794f7b0fd04"; - sha256 = "15wghd8iiyrikahd7ayga9m0s993ghriwk44ylcycy3a6axaizmi"; + rev = "63c96fb029033b1a300b90aa922e167c7c405bcb"; + sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -68069,12 +68384,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20161130.1944"; + version = "20170311.1208"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "3b0ace2a710cbe0a47617a2e4650f593c7282385"; - sha256 = "15rghh1k657hiahaqb6isrxs1bwys220r0fzk7fxhv8jfbmb2a12"; + rev = "ca510ab853feb45bb0a6fa5bfe01c96bb1da50ba"; + sha256 = "11g98jy74bpkryb9y5kclndm1zv40rwg7cfpd782fp8f767f17rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -68212,10 +68527,10 @@ }) {}; ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ucs-cmds"; - version = "20170101.1149"; + version = "20170308.1512"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el"; - sha256 = "0ql6qyzcj067vx2amwfh2m4vi056zf7qra4pkyskv829nxqg9mk8"; + sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; @@ -68273,12 +68588,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170306.214"; + version = "20170309.131"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "69bbb941a6835137564b919109884d056429f2f0"; - sha256 = "1dg642b8s9s0f97mqm7facqsg6lmaxi9nv0kpj33p58bqsjrq6hc"; + rev = "c9ae717f38a7d01de30a8030f80032a5782aa88c"; + sha256 = "0jx8rfm8jrpn7b8q0wkabjsnvlbzmgn2q60qscmvz1bggb01r9ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -69911,10 +70226,10 @@ }) {}; w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; - version = "20170101.1154"; + version = "20170308.1518"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; - sha256 = "0x30ldv2wbv3vhj85jss7hwf672m61f5r4z9l1sg3v0ibalqry45"; + sha256 = "0pp3fl2r5g32qv8ysiwnznpc5na7cqh3vp5mq59yfhv5p6myayxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser"; @@ -69930,10 +70245,10 @@ w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32browser-dlgopen"; - version = "20170101.1155"; + version = "20170309.1433"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el"; - sha256 = "1dv4l7rcm34p78cvyjv7b1lcc1d28pia18vj3swgnan9g1mi7zdf"; + sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen"; @@ -70073,12 +70388,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170204.530"; + version = "20170309.1426"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e"; - sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z"; + rev = "40ea87cc62ac6d858235edf2e5d10e5867aa230e"; + sha256 = "0kmw7rhx7d1a9vhabrfks5l95jafya4lw6yl937imkyxjb6kqdf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -70304,12 +70619,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170225.1206"; + version = "20170309.3"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "6e4d7e96f2a699c2df3056609584e586f4667b39"; - sha256 = "10iwzjc697niwj0sqvazpi779ipsncpmn2pfy58lgglriq88ss8r"; + rev = "b8b0dec9fb429012e530a36eb1aa918f84c6ee82"; + sha256 = "1k7rzk04n7vw0dzxfl4fdlb88br1zxn8w3i2ld5abz2b0x87497p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -70786,10 +71101,10 @@ }) {}; wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wid-edit-plus"; - version = "20170101.1156"; + version = "20170309.1434"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; - sha256 = "0pzxarpwabbg67ajg340yrp1gqly8y71qrd5gcv9vjzgvvh9anws"; + sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+"; @@ -70930,10 +71245,10 @@ }) {}; wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wimpy-del"; - version = "20161209.736"; + version = "20170309.1436"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wimpy-del.el"; - sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg"; + sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del"; @@ -71092,10 +71407,10 @@ }) {}; window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-plus"; - version = "20170101.1158"; + version = "20170309.1437"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/window+.el"; - sha256 = "06igqiwvnwm68k6gf9h85p4ppqab20sxl6qnxb57z8lpczpsssqa"; + sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+"; @@ -71446,12 +71761,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170225.405"; + version = "20170306.1230"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "d543680243046f5f62d36f9e56debcfe414ba40a"; - sha256 = "0hdd5yi6cnf7ry088wrq2xdm7f2hirhwrds56wvi0bdm9rizm6gs"; + rev = "9dc5a0f5077e20ea3177376823a1fed18840d5f2"; + sha256 = "076mz72qqfcbrs2gw9ng8gbzhr9kzc9mnjmv51n67dmd7hi5mmyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -71761,12 +72076,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170116.919"; + version = "20170312.151"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "ed4539971dd9c32752c7ff5a1d280150446bc769"; - sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2"; + rev = "b710877056cc91641aff82d26af01db728131563"; + sha256 = "0hmnbbdf2rsw24dspfbbdr0b0f4wlrrkw9pzc73dcn8y0pafavyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -72703,12 +73018,12 @@ yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; - version = "20150315.605"; + version = "20170309.555"; src = fetchFromGitHub { owner = "m2ym"; repo = "yascroll-el"; - rev = "f7743df1cf6d8e55607141d1ea5f50b562582c51"; - sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5"; + rev = "7b58febbc698e10b3714506a2ce09071fb172bff"; + sha256 = "0zk8j1jbq2sba09kr8kn2mmsf2i78ng567s9823336b4s61279qx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll"; @@ -72724,12 +73039,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170226.1638"; + version = "20170310.1724"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "6e9b7f9432a87122cf9bb80a505be2fd9811a9cf"; - sha256 = "0k5yv90530946zjs7xdq3017vcq688mz44r542l39hyd9skxq8ba"; + rev = "7f337f4488da6e3ea4b92057ca1576d17bc51743"; + sha256 = "0g1irdas5vvzjfrzvvzpz7kii52smn4aa58s6v10kchppxrrikzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -72900,12 +73215,12 @@ yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; - version = "20170305.2158"; + version = "20170307.906"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; - rev = "c76b1659a8e5cfccbdfcfe971ef6fcb3b7cd0263"; - sha256 = "0k86b7lkkdlwd2570hc93ywbg60bxpx1axvzbvyvqiara7vq6njy"; + rev = "7ab8df0bd646e0571a4d27cbaa4f62b60f625bad"; + sha256 = "0qh8d14vpaj6hbhxv8zmr7sg85wfjqb2gf30b56lnrvkl783v50b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme"; @@ -73025,12 +73340,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20170306.429"; + version = "20170306.2250"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "96f953cee3358fbc299662a3b3cbc087cb395b70"; - sha256 = "0cp2n0a4g1x4py1ixf273k6nrymhxc4hy1ccvg0cv43jpka85xkf"; + rev = "f031c785b469cf4356fddb997eccf60399e34235"; + sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -73275,10 +73590,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20170101.1159"; + version = "20170309.1440"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "1m88lqfmfayx2pj5ws14cfysf4pv8rm9v768x6xvsknjb4sl0q8l"; + sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; @@ -73315,10 +73630,10 @@ zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "zoom-frm"; - version = "20170101.1201"; + version = "20170309.1439"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zoom-frm.el"; - sha256 = "1n16qx3ag9cdds04l4s2a79ijqg4k5gg1144vyn5p6ih10casw32"; + sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; @@ -73460,11 +73775,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170305.2023"; + version = "20170307.1646"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "d33bf30fd45c"; - sha256 = "0wa2nw8q1pbmif1n7vxyzxf7zziwxdv60pa4rx1kxjnrd8aizzi7"; + rev = "f79f9e8247da"; + sha256 = "0mdajrwwcfgy6g330ca3s6a240wnj56ryag6h2ghwwclzy81nwdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; From f54813d7674ade872b8d79145d452d2d5011de87 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 13 Mar 2017 14:54:39 -0500 Subject: [PATCH 129/278] llvm4: rc4 -> release! --- pkgs/development/compilers/llvm/4/clang/default.nix | 2 +- pkgs/development/compilers/llvm/4/default.nix | 11 ++++------- pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/4/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/4/lld.nix | 2 +- pkgs/development/compilers/llvm/4/lldb.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index c0a33f03e0f2..88eafe983d3e 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "062n17mfsn85dx3qy1qvq8rfxi7hcbr2nj70v2dah3xmy28i3yaq"} + unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index aed77b7513ad..999ff858d020 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -3,18 +3,15 @@ let callPackage = newScope (self // { inherit stdenv isl release_version version fetch; }); release_version = "4.0.0"; - rc = "rc4"; - version = "${release_version}${rc}"; + version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz"; - # Once 4 is released, use this instead: - # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz"; + url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1bxz2z9mxbx7211xfgsn5inwvpz53d1cqg76h8166dsli27xwkjm"; - clang-tools-extra_src = fetch "clang-tools-extra" "0zkgnnv3srqxf44q4a5n3wpizf71mlq8w5rnwfwhdx777k94s5nx"; + compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk"; + clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 753aded54ff7..8e2c8eaa1768 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "052fc91y8084830ajfm8nkc0vghafhnfl7l89b68qsyz3ra93i3l"; + src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 23269f605f09..559b6b26bc52 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "02z8d0q42wfmnnd0rd1yg2x4y50rfrv1k9rq00a86b6803dc7p45"; + src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index e62e50b2d316..549fa863c151 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "00wy4qczh4s6g49sbfmyk21845zx5qc2qpm39bznqz8ynpnh4phc"; + src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; buildInputs = [ cmake llvm ]; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 4fec3ad1a894..6e6fdf012dd6 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "14dy1j48nw10w8brkpmla2vjjwfr1mrsl9wfabjfx1j85ywp3h69"; + src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d"; patchPhase = '' # Fix up various paths that assume llvm and clang are installed in the same place diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 1470e7d510fa..ac3fc6790d58 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -21,7 +21,7 @@ }: let - src = fetch "llvm" "1ljb5y5wgypk3sy8zcd5qdgsm5hw8vl7cy6874mbf4gnk9k809b1"; + src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib From 369230cc760816fd2d7931bf05aac372b6bdea5a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Mar 2017 20:17:29 +0000 Subject: [PATCH 130/278] ocamlPackages.cpuid: init at 0.1.0 cpuid allows detection of CPU features from OCaml. Homepage: https://github.com/pqwy/cpuid --- .../ocaml-modules/cpuid/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cpuid/default.nix diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix new file mode 100644 index 000000000000..1bdf70e86c5a --- /dev/null +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-cpuid-0.1.0"; + + src = fetchurl { + url = http://github.com/pqwy/cpuid/releases/download/v0.1.0/cpuid-0.1.0.tbz; + sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + homepage = https://github.com/pqwy/cpuid; + description = "Detect CPU features from OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bb4d2abed22b..b695e0a073e6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -138,6 +138,8 @@ let cppo = callPackage ../development/tools/ocaml/cppo { }; + cpuid = callPackage ../development/ocaml-modules/cpuid { }; + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; cstruct = callPackage ../development/ocaml-modules/cstruct { From 5e701625de8d68c1436c71f69c098b33b0445808 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 12 Mar 2017 18:10:04 +0000 Subject: [PATCH 131/278] pythonPackages.first: init at 2.0.1 --- .../python-modules/first/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/first/default.nix diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix new file mode 100644 index 000000000000..5ecbff90442d --- /dev/null +++ b/pkgs/development/python-modules/first/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +let + pname = "first"; + version = "2.0.1"; +in +buildPythonPackage { + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pn9hl2y0pz61la1xhkdz6vl9i2dg3nh0ksizcf0f9ybh8sxxcrv"; + }; + + doCheck = false; # no tests + + meta = with stdenv.lib; { + description = "The function you always missed in Python"; + homepage = https://github.com/hynek/first/; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9260b8e73faa..9766255be73e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29044,6 +29044,8 @@ EOF }; }; + first = callPackage ../development/python-modules/first {}; + flaskbabel = buildPythonPackage rec { name = "Flask-Babel-0.11.1"; From 04290bbd143e36ef40cb97ae5a707f160f8f83c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 13 Mar 2017 18:16:38 -0300 Subject: [PATCH 132/278] mkvtoolnix: 9.8.0 -> 9.9.0 (#23827) * mkvtoolnix: 9.8.0 -> 9.9.0 Starting with version 9.9.0 the man pages and their translations are not pre-built and bundled with the source code. The tool "xsltproc" and the DocBook XSL stylesheets for man pages are now required dependencies to build them. --- pkgs/applications/video/mkvtoolnix/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index e8dc1227ef87..73d462a6f4d2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake -, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost -, libebml, zlib, libmatroska, libogg, libvorbis, flac +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost +, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt , withGUI ? true }: @@ -10,16 +10,16 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.8.0"; + version = "9.9.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n"; + sha256 = "1jiz23s52l3gpl84yx4yw3w445jqzcimvnvibvrv3a21k29hyik1"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ]; + nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { "--disable-precompiled-headers" "--disable-static-qt" "--with-gettext" + "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl" (enableFeature withGUI "qt") ]; From 7e9c815c23f9db7ddbd050f259c7d5233ac8e27c Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 13 Mar 2017 22:17:08 +0100 Subject: [PATCH 133/278] libfilezilla: 0.9.0 -> 0.9.1 --- pkgs/development/libraries/libfilezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4df326e278cc..d6c0c538a8fe 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"; + sha256 = "06ivj40bk5b76a36zwhnwqvg564hgccncnn5nb5cqc7kf4bkkchq"; }; meta = with stdenv.lib; { From acef015a0ba9e16f36ea665bf766fa95993a5af6 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 13 Mar 2017 22:18:03 +0100 Subject: [PATCH 134/278] filezilla: 3.24.0 -> 3.25.0 --- pkgs/applications/networking/ftp/filezilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 984616173cb6..95e0c502749b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.24.0"; in +let version = "3.25.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"; + sha256 = "1b1lb1zvm887xy3q9i5ziqvwk4ww2pd81a1msbwjrxzy5lq5ykhh"; }; configureFlags = [ From 88d7718a64d2f512b64f3d68a15761e2a237f912 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Mar 2017 21:20:26 +0000 Subject: [PATCH 135/278] mkvtoolnix-cli: fix build on darwin --- pkgs/applications/video/mkvtoolnix/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 73d462a6f4d2..ce6935a26064 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake +{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt , withGUI ? true @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib libmatroska libogg libvorbis flac - ] ++ optional withGUI qt5.qtbase; + ] + ++ optional stdenv.isDarwin libiconv + ++ optional withGUI qt5.qtbase; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; @@ -48,6 +50,7 @@ stdenv.mkDerivation rec { homepage = http://www.bunkus.org/videotools/mkvtoolnix/; license = licenses.gpl2; maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.linux + ++ optionals (!withGUI) platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35800184a5a..86058822f2a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8950,7 +8950,7 @@ with pkgs; mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = mkvtoolnix.override { + mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; }; From a3c03eb11fff8f0a0e6469890bcba8a6e5b96ae6 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 12 Mar 2017 18:10:19 +0000 Subject: [PATCH 136/278] pip-tools: init at 1.8.1rc3 --- .../python-modules/pip-tools/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/pip-tools/default.nix diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix new file mode 100644 index 000000000000..fe307513de7c --- /dev/null +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }: +buildPythonPackage rec { + pname = "pip-tools"; + version = "1.8.1rc3"; + name = "pip-tools-${version}"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "pip-tools"; + rev = version; + sha256 = "09rbgzj71bfp1x1jfr1zx3vax4qjbw5l6vcd3fqvshsdvg9lcnpx"; + }; + + LC_ALL = "en_US.UTF-8"; + buildInputs = [ pytest glibcLocales ]; + propagatedBuildInputs = [ pip click six first ]; + + checkPhase = '' + export HOME=$(mktemp -d) + py.test -k "not test_realistic_complex_sub_dependencies" # requires network + ''; + + meta = with stdenv.lib; { + description = "Keeps your pinned dependencies fresh"; + homepage = https://github.com/jazzband/pip-tools/; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9766255be73e..1bf736219f04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18874,6 +18874,10 @@ in { }; }; + pip-tools = callPackage ../development/python-modules/pip-tools { + glibcLocales = pkgs.glibcLocales; + }; + pika = buildPythonPackage rec { name = "pika-${version}"; version = "0.10.0"; From b806e25d65421d7aa0a524ce1601f0e51099df11 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 13 Mar 2017 17:34:33 -0400 Subject: [PATCH 137/278] nixos: build for aarch64-linux --- nixos/release-combined.nix | 2 +- nixos/release.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 63ca39a9b602..1953fd1a26a7 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,7 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] }: let diff --git a/nixos/release.nix b/nixos/release.nix index 8a5b41ca3bb3..0359d0907cca 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] }: with import ../lib; From 68a1dc63042f2d70c0fc90bf4d22da45ec391d8b Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 13 Mar 2017 22:47:10 +0100 Subject: [PATCH 138/278] rustRegistry: 2017-02-19 -> 2017-03-13 --- 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 faed3a218fc5..1659208f76f2 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-02-19"; - rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1"; - sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp"; + version = "2017-03-13"; + rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82"; + sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb"; src = fetchFromGitHub { inherit rev; From 363cfbd23dd6653a12fd2a5deba97befe8816426 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 13 Mar 2017 22:48:38 +0100 Subject: [PATCH 139/278] ripgrep: 0.4.0 -> 0.5.0 --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 7ba43e38f382..e0bd0d3711f7 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; + sha256 = "13mg624867hqxp9pzpq1gn9kqkvbaqcphdjia3bz5wvff1cbxkfy"; }; - depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + depsSha256 = "0glw8xk77w2h1xg6c451fg8cmwx3vz7dyzdrbf0i8d84yq8sh0i1"; meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; From 61e8c0370d55cd9083e3dac85cf466633758ade0 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Mon, 13 Mar 2017 23:01:35 +0100 Subject: [PATCH 140/278] bluefish: 2.2.9 -> 2.2.10 --- pkgs/applications/editors/bluefish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 59e8076c787b..1c2e3a425782 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.9"; + name = "bluefish-2.2.10"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav"; + sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; From 4aee4cc8a5a4d99e6013c667e01409be3123e395 Mon Sep 17 00:00:00 2001 From: ndowens Date: Mon, 13 Mar 2017 17:11:03 -0500 Subject: [PATCH 141/278] htmlcxx: 0.85 -> 0.86 --- pkgs/development/libraries/htmlcxx/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 6557d8f80410..1537f9cc480b 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "htmlcxx-${version}"; - version = "0.85"; + version = "0.86"; src = fetchurl { url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; - sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; patches = [ ./ptrdiff.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://htmlcxx.sourceforge.net/; - description = "htmlcxx is a simple non-validating css1 and html parser for C++"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + description = "A simple non-validating css1 and html parser for C++"; + license = licenses.lgpl2; + platforms = platforms.linux; }; } From 36bb2839410d425f9ad6560be2aed5475b204778 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Mon, 13 Mar 2017 23:17:03 +0100 Subject: [PATCH 142/278] haproxy: 1.7.2 -> 1.7.3 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 1b917019662a..3b7a68fb972f 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "haproxy"; majorVersion = "1.7"; - minorVersion = "2"; + minorVersion = "3"; version = "${majorVersion}.${minorVersion}"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "0bsb5q3s1k5gqybv5p8zyvl6zh8iyidv3jb3wfmgwqad5bsl0nzr"; + sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65"; }; buildInputs = [ openssl zlib ]; From dff0ba38a243603534c99f2cf1af81c793cad98e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 14 Mar 2017 00:30:01 +0200 Subject: [PATCH 143/278] bash: Set bash_cv_getcwd_malloc=yes when cross compiling Because if you don't, the configure script assumes that your getcwd() function is broken. Which then makes bash use it's own getcwd() implementation, which doesn't work if the path to the current directory contains bind mounts in its paths. This shows up as: shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor ... and fails the aarch64 glibc build with sandboxes enabled. Sigh. --- pkgs/shells/bash/4.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 7dbb18324972..682123d924e0 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { crossAttrs = { configureFlags = baseConfigureFlags + - " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" + optionalString stdenv.isCygwin '' --without-libintl-prefix --without-libiconv-prefix --with-installed-readline From 46c9eac980e1d879d62c25499544c402feff3066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Mar 2017 23:23:09 +0100 Subject: [PATCH 144/278] guile: enable parallel building civodul today on irc said that 2.0.13 likely has the parallel building issue fixed (case equal-or-over 8 cores). Let's try. --- pkgs/development/interpreters/guile/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 6b4e6c2a7288..04f31dda26a0 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -30,9 +30,7 @@ # A native Guile 2.0 is needed to cross-build Guile. selfNativeBuildInput = true; - # Guile 2.0.11 repeatable fails with 8-core parallel building because - # libguile/vm-i-system.i is not created in time - enableParallelBuilding = false; + enableParallelBuilding = true; patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch (fetchpatch { From 57463868db1f2955399da0309e062439b0d6a8a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 14 Mar 2017 00:01:04 +0100 Subject: [PATCH 145/278] top-level llvm-4 attrs: drop lowPrio Now the packages are properly released. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35800184a5a..9018e5044087 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4782,7 +4782,7 @@ with pkgs; clang = llvmPackages.clang; - clang_4 = lowPrio llvmPackages_4.clang; + clang_4 = llvmPackages_4.clang; clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; @@ -5338,13 +5338,13 @@ with pkgs; lizardfs = callPackage ../tools/filesystems/lizardfs { }; - lld = lowPrio llvmPackages_4.lld; + lld = llvmPackages_4.lld; lldb = llvmPackages.lldb; llvm = llvmPackages.llvm; - llvm_4 = lowPrio llvmPackages_4.llvm; + llvm_4 = llvmPackages_4.llvm; llvm_39 = llvmPackages_39.llvm; llvm_38 = llvmPackages_38.llvm; llvm_37 = llvmPackages_37.llvm; From 64218d61fc0b66722b1c97bab07cd1569d2d0471 Mon Sep 17 00:00:00 2001 From: ndowens Date: Mon, 13 Mar 2017 18:44:28 -0500 Subject: [PATCH 146/278] hwloc: 1.11.2 -> 1.11.6 (#23870) --- pkgs/development/libraries/hwloc/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 5d07cfe3a2bb..e1acacc328cc 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 , pciutils, numactl }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "hwloc-1.11.2"; + name = "hwloc-1.11.6"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; + sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -16,17 +18,17 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = # Since `libpci' appears in `hwloc.pc', it must be propagated. - stdenv.lib.optional stdenv.isLinux pciutils; + optional stdenv.isLinux pciutils; enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (stdenv.isLinux && numactl != null) + optionalString (stdenv.isLinux && numactl != null) '' if [ -d "${numactl}/lib64" ] then numalibdir="${numactl}/lib64" @@ -43,9 +45,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; - longDescription = '' hwloc provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of @@ -64,9 +65,7 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; platforms = platforms.all; }; From 56fea1a8c08542e82035b0d4a6a772c2ea717424 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Mar 2017 20:00:58 -0400 Subject: [PATCH 147/278] gradle: 3.4.0 -> 3.4.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8d119371aa86..28b6601cab6f 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.4"; + name = "gradle-3.4.1"; nativeVersion = "0.13"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0192yz1j59mvn6d3sch0yjx6i2fg4nyppkdpbqbbxqymrm6wvl3j"; + sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv"; }; }; From dd015a829fd7a47fc1609cd133a13bf80eb7838f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Mar 2017 20:03:39 -0400 Subject: [PATCH 148/278] kotlin: 1.0.6 -> 1.1 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 0f2f3d12a1ce..33921ef02cd7 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.1"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1dhliqd79hydd62xmrn2nwrcqy7lb5svkahkkpx9w3z9s5r0p8j2"; + sha256 = "179m5y56fi50qvxsm075h0547swib7n2pfdn8a4axk9wpwldni5a"; }; propagatedBuildInputs = [ jre ] ; From 435b8ed1fc6f6e99ef80dbc16d794b97b7be5d23 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Mar 2017 20:07:14 -0400 Subject: [PATCH 149/278] oh-my-zsh: 2017-02-20 -> 2017-02-27 --- pkgs/shells/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 21e409b727b7..25dec429ff08 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-02-20"; + version = "2017-02-27"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "98d8d3429f8b9fc2c4c109fb199a31c8d1735699"; - sha256 = "1zdjb5dsbr8n7jfmib4a6rhcx9wrp5lw4b8b9xrh164s97hza2d0"; + rev = "b908feebcfb0ca8a9a80360d177e716c24c317d6"; + sha256 = "0b7gir2llv5212nwh9arzva2p714s39qzgk385s9pmalhspfc6c1"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 9ac82a773c9b4369bad77dc2dc24454c1afe2a34 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Mar 2017 20:15:26 -0400 Subject: [PATCH 150/278] linux: 4.4.52 -> 4.4.53 --- 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 fba52eeaee5b..9c583fe30f88 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.52"; + version = "4.4.53"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01hz3g7j1m8dis6pyy9p8pi5ixl32g6cvgav0i7a7qbkrspdvlp8"; + sha256 = "1rpkrlspxs3kfks0vg4dz8n570hpwdw5zymy9g2ky5vwskawvzky"; }; kernelPatches = args.kernelPatches; From 18684a4892bc202590a51a8bee251dc1b4fcf3b7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Mar 2017 20:15:42 -0400 Subject: [PATCH 151/278] linux: 4.1.38 -> 4.1.39 --- pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 9c7354024ada..30c5ce7e569b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.38"; + version = "4.1.39"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0mmx11z1wlnlaw2nhpdw76xzmqmfr8q52dv0jvy0pjq8rcbk3hmq"; + sha256 = "0m48slb13ipnjnw4inhyb74xxpla94344wbc2y5lzb402n5jrs58"; }; kernelPatches = args.kernelPatches; From 706bd194c7654bb0d5349305b5c9278748f794e0 Mon Sep 17 00:00:00 2001 From: ndowens Date: Mon, 13 Mar 2017 20:29:03 -0500 Subject: [PATCH 152/278] iso-codes: 3.56 -> 3.74 --- .../libraries/iso-codes/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 9477aca59733..ed742888a0ef 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,24 +1,24 @@ -{stdenv, fetchurl, gettext, python, xz}: +{stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.56"; + name = "iso-codes-3.74"; + src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; + sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; }; patchPhase = '' for i in `find . -name \*.py` do - sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i done ''; - buildInputs = [ gettext ]; - nativeBuildInputs = [ xz ]; + buildInputs = [ gettext python3 ]; - meta = { + meta = with stdenv.lib; { homepage = http://pkg-isocodes.alioth.debian.org/; description = "Various ISO codes packaged as XML files"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.urkud ]; + platforms = platforms.all; }; } From 25e75cd5805fe427b1588ed87b108a29cfb81e80 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 13 Mar 2017 22:20:38 -0400 Subject: [PATCH 153/278] kube-aws: 0.8.1 -> 0.9.4 Also, enable on Darwin --- pkgs/development/tools/kube-aws/default.nix | 22 +++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 0a6d0ba32210..11f4a5c8bd0a 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -4,20 +4,26 @@ with lib; buildGoPackage rec { name = "kube-aws-${version}"; - version = "0.8.1"; + version = "0.9.4"; - goPackagePath = "github.com/coreos/coreos-kubernetes"; + goPackagePath = "github.com/coreos/kube-aws"; src = fetchFromGitHub { owner = "coreos"; - repo = "coreos-kubernetes"; + repo = "kube-aws"; rev = "v${version}"; - sha256 = "067nc525km0f37w5km44fs5pr22a6zz3lkdwwg2akb4hhg6f45c2"; + sha256 = "11h14fsnflbx76rmpp0fxahbxi2qgcamgyxy9s4rmw83j2m8csxp"; }; - preBuild = '' - (cd go/src/github.com/coreos/coreos-kubernetes - go generate multi-node/aws/pkg/config/config.go) + preBuild = ''( + cd go/src/${goPackagePath} + go generate ./core/controlplane/config + go generate ./core/nodepool/config + go generate ./core/root/config + )''; + + buildFlagsArray = '' + -ldflags=-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version} ''; meta = { @@ -25,6 +31,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = https://github.com/coreos/coreos-kubernetes; maintainers = with maintainers; [offline]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } From 24b47526ce38e3ccb073c776b32c0ea220f3c0f2 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 13 Mar 2017 22:17:29 -0400 Subject: [PATCH 154/278] callCabal2nix: Don't rebuild unchanged cabal file It can be quite annoying that callCabal2nix will build a new derivation if anything in the source has changed, even if the cabal file hasn't. --- pkgs/development/haskell-modules/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index df17c769ea2d..6d15d5966245 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -84,7 +84,14 @@ let callHackage = name: version: self.callPackage (hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: self.callPackage (haskellSrc2nix { inherit src name; }); + callCabal2nix = name: src: args: + let + # Filter out files other than the cabal file. This ensures + # that we don't create new derivations even when the cabal + # file hasn't changed. + justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; + drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args; + in overrideCabal drv (drv': { inherit src; }); # Restore the desired src. ghcWithPackages = selectFrom: withPackages (selectFrom self); From 1e8476c5b61c7d8b249738bee2128fb1ef49f7e2 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 14 Mar 2017 18:40:21 +1300 Subject: [PATCH 155/278] links2: build on all unix platforms --- .../networking/browsers/links2/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index be2a836a085c..befe3cb21f93 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp"; }; - buildInputs = - [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ] - ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ] - ++ stdenv.lib.optional enableDirectFB [ directfb ]; + buildInputs = with stdenv.lib; + [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ] + ++ optionals stdenv.isLinux [ gpm ] + ++ optionals enableX11 [ libX11 libXau libXt ] + ++ optional enableDirectFB [ directfb ]; nativeBuildInputs = [ pkgconfig bzip2 ]; @@ -39,6 +40,6 @@ stdenv.mkDerivation rec { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin urkud viric ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 8498f979a1297a1392bb90b22ec329c8112905db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Mar 2017 07:55:34 +0000 Subject: [PATCH 156/278] ocaml-top: 1.1.2 -> 1.1.3 --- .../tools/ocaml/ocaml-top/default.nix | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 2 -- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 5f3a2b884b16..e194a77fbe81 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,15 +1,16 @@ { stdenv, fetchzip, ncurses -, ocaml, ocpBuild, findlib, lablgtk, ocp-index +, ocamlPackages , opam }: stdenv.mkDerivation { - name = "ocaml-top-1.1.2"; + name = "ocaml-top-1.1.3"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.2.tar.gz; - sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j"; + url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz; + sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3"; }; - buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ]; + buildInputs = [ ncurses opam ] + ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); configurePhase = '' export TERM=xterm @@ -18,15 +19,13 @@ stdenv.mkDerivation { buildPhase = "ocp-build ocaml-top"; - installPhase = '' - opam-installer --script --prefix=$out ocaml-top.install | sh - ''; + installPhase = "opam-installer --prefix=$out"; meta = { homepage = http://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocaml.meta.platforms or []; + platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f3766915e33..2cc3e21d84f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5452,7 +5452,7 @@ with pkgs; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - inherit (ocamlPackages) ocaml-top; + ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b695e0a073e6..2a59dbd3293f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -752,8 +752,6 @@ let haxe = callPackage ../development/compilers/haxe { }; - ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; - ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; trv = callPackage ../development/tools/misc/trv { }; From a6be98c9c116ff578f21c99a09544ee335884a64 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Mon, 13 Mar 2017 11:49:30 +0100 Subject: [PATCH 157/278] qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase during configurePhase. --- pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 977c859e76d3..aa2d24a741ca 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -135,10 +135,14 @@ qt5LinkModuleDir() { qt5LinkDarwinModuleLibDir() { for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do + if [ ! -L "$fw" ]; then ln -s "$fw" "$NIX_QT5_TMP"/lib + fi done for file in $(find "$1"/lib -maxdepth 1 -type f); do + if [ ! -L "$file" ]; then ln -s "$file" "$NIX_QT5_TMP"/lib + fi done for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") @@ -178,4 +182,3 @@ _qtFixCMakePaths() { if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtFixCMakePaths) fi - From d46fe334ca9c556ebc481c443330f7603658034b Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Mar 2017 15:00:42 -0500 Subject: [PATCH 158/278] ffmpegthumbnailer: 2.0.10 -> 2.2.0 --- .../libraries/ffmpegthumbnailer/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index df1c532f6330..c6167252866a 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,16 +1,19 @@ -{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig +{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "ffmpegthumbnailer-${version}"; - version = "2.0.10"; + version = "2.2.0"; - src = fetchurl { - url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3"; + src = fetchFromGitHub { + owner = "dirkvdb"; + repo = "ffmpegthumbnailer"; + rev = version; + sha256 = "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp"; }; - buildInputs = [ ffmpeg cmake libpng pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ ffmpeg libpng ]; meta = with stdenv.lib; { homepage = https://github.com/dirkvdb/ffmpegthumbnailer; From f09a73896b93527a4e1d6480432805bfe243c27e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 14 Mar 2017 16:45:05 +0800 Subject: [PATCH 159/278] crudini: init at 0.9 --- pkgs/tools/misc/crudini/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/crudini/default.nix diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix new file mode 100644 index 000000000000..ead18f8c31f2 --- /dev/null +++ b/pkgs/tools/misc/crudini/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "crudini-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "pixelb"; + repo = "crudini"; + rev = version; + sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav"; + }; + + propagatedBuildInputs = with python2Packages; [ iniparse ]; + + meta = with stdenv.lib; { + description = "A utility for manipulating ini files "; + homepage = http://www.pixelbeat.org/programs/crudini/; + license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cc3e21d84f2..182fcc617bb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -798,6 +798,8 @@ with pkgs; crunch = callPackage ../tools/security/crunch { }; + crudini = callPackage ../tools/misc/crudini { }; + daemontools = callPackage ../tools/admin/daemontools { }; dante = callPackage ../servers/dante { }; From 648db95651e99e5e2ce938bf5e776fc9f512c81a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 14 Mar 2017 12:28:36 +0300 Subject: [PATCH 160/278] python.pkgs.bleach: 1.5.0 -> 2.0.0 Fixes #23854. --- pkgs/top-level/python-packages.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a3debdf48b7..c8a52d3b4a48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2898,7 +2898,7 @@ in { }; }; - # Needed for bleach 1.5.0 and calibre 2.76.0 + # Needed for FlexGet 1.2.337 and calibre 2.76.0 html5lib_0_9999999 = self.html5lib.override rec { name = "html5lib-${version}"; buildInputs = with self; [ nose flake8 ]; @@ -2916,21 +2916,16 @@ in { bleach = buildPythonPackage rec { pname = "bleach"; - version = "1.5.0"; + version = "2.0.0"; name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65"; + sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr"; }; buildInputs = with self; [ pytest pytestrunner ]; - propagatedBuildInputs = with self; [ six html5lib_0_9999999 ]; - - postPatch = '' - substituteInPlace setup.py --replace "==3.0.3" "" - substituteInPlace setup.py --replace ">=0.999,!=0.9999,!=0.99999,<0.99999999" "" - ''; + propagatedBuildInputs = with self; [ six html5lib ]; meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; From a312abedeb1b935829f2b76e6bbaa494fbcf3f25 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 10:49:39 +0100 Subject: [PATCH 161/278] hypothesis: disabled for Python 3.3 --- pkgs/development/python-modules/hypothesis.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix index e961d56abcb6..271251b830e1 100644 --- a/pkgs/development/python-modules/hypothesis.nix +++ b/pkgs/development/python-modules/hypothesis.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, python -, pythonOlder, enum34 +, pythonOlder, pythonAtLeast, enum34 , doCheck ? true, pytest, flake8, flaky }: buildPythonPackage rec { @@ -30,6 +30,10 @@ buildPythonPackage rec { ${python.interpreter} -m pytest tests/cover ''; + # Unsupport by upstream on certain versions + # https://github.com/HypothesisWorks/hypothesis-python/issues/477 + disabled = pythonOlder "3.4" && pythonAtLeast "2.8"; + meta = with stdenv.lib; { description = "A Python library for property based testing"; homepage = https://github.com/DRMacIver/hypothesis; From 638e1b82439e77e2d195ca768296dfd7ff3f35ff Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 13 Mar 2017 16:53:54 -0400 Subject: [PATCH 162/278] nixos: Add a menu launcher for the NixOS manual --- nixos/modules/services/misc/nixos-manual.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 306ee346523d..622607f3b32d 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -41,7 +41,7 @@ let entry = "${manual.manual}/share/doc/nixos/index.html"; - help = pkgs.writeScriptBin "nixos-help" + helpScript = pkgs.writeScriptBin "nixos-help" '' #! ${pkgs.stdenv.shell} -e browser="$BROWSER" @@ -58,6 +58,15 @@ let exec "$browser" ${entry} ''; + desktopItem = pkgs.makeDesktopItem { + name = "nixos-manual"; + desktopName = "NixOS Manual"; + genericName = "View NixOS documentation in a web browser"; + # TODO: find a better icon (Nix logo + help overlay?) + icon = "system-help"; + exec = "${helpScript}/bin/nixos-help"; + categories = "System"; + }; in { @@ -105,7 +114,8 @@ in system.build.manual = manual; environment.systemPackages = - [ manual.manual help ] + [ manual.manual helpScript ] + ++ optional config.services.xserver.enable desktopItem ++ optional config.programs.man.enable manual.manpages; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; From b0c7df9fbc3920fc7cc215c80f1b620a67c31aae Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 14 Mar 2017 18:44:00 +0800 Subject: [PATCH 163/278] crudini: fix maintainer and run tests --- pkgs/tools/misc/crudini/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index ead18f8c31f2..856138f046ae 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -13,10 +13,16 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ iniparse ]; + checkPhase = '' + patchShebangs . + pushd tests >/dev/null + ./test.sh + ''; + meta = with stdenv.lib; { description = "A utility for manipulating ini files "; homepage = http://www.pixelbeat.org/programs/crudini/; license = licenses.gpl2; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ peterhoeg ]; }; } From 065383cde82a2d0f9c5ee733a2a20e83073b2a39 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:24:21 +0100 Subject: [PATCH 164/278] pythonPackages.ipython: 5.2.1 -> 5.3.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c8a52d3b4a48..c1df8f9c5150 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13083,12 +13083,12 @@ in { }; ipython = buildPythonPackage rec { - version = "5.2.1"; + version = "5.3.0"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; + sha256 = "bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' From 2a1cceac16bcf4586ee2cd9551bb56ac33f8048a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:24:33 +0100 Subject: [PATCH 165/278] pythonPackages.jupyter_client: 4.4.0 -> 5.0.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1df8f9c5150..6bd303e85cf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13460,16 +13460,16 @@ in { }; jupyter_client = buildPythonPackage rec { - version = "4.4.0"; + version = "5.0.0"; name = "jupyter_client-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_client/${name}.tar.gz"; - sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee"; + sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py; + propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py; checkPhase = '' nosetests -v From fbb30ee46f5044fcbdeab50e5f80f2b9a35ea05a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:24:47 +0100 Subject: [PATCH 166/278] pythonPackages.jupyter_core: 4.2.1 -> 4.3.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6bd303e85cf8..d34b73ce4ec3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13487,12 +13487,12 @@ in { }; jupyter_core = buildPythonPackage rec { - version = "4.2.1"; + version = "4.3.0"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; + sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40"; }; buildInputs = with self; [ pytest mock ]; From 044014826be9daccac419650046d36cdaccd41a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:25:17 +0100 Subject: [PATCH 167/278] pythonPackages.nbformat: 4.2.0 -> 4.3.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d34b73ce4ec3..acd017d20033 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15599,12 +15599,12 @@ in { }; nbformat = buildPythonPackage rec { - version = "4.2.0"; + version = "4.3.0"; name = "nbformat-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; + sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b"; }; LC_ALL="en_US.UTF-8"; buildInputs = with self; [ pytest pkgs.glibcLocales ]; From 0c11ce654187c9b00963df4e376437cbda38b634 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:25:31 +0100 Subject: [PATCH 168/278] pythonPackages.notebook: 4.3.2 -> 4.4.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acd017d20033..12dfbebec88e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16047,12 +16047,12 @@ in { }; notebook = buildPythonPackage rec { - version = "4.3.2"; + version = "4.4.1"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; + sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765"; }; LC_ALL = "en_US.UTF-8"; From bd0a0c79080051d3b7238367adf31faa867cddbf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:25:48 +0100 Subject: [PATCH 169/278] pythonPackages.pathlib2: 2.1.0 -> 2.2.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12dfbebec88e..1208605ac491 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18442,14 +18442,14 @@ in { pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec { name = "pathlib2-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pathlib2/${name}.tar.gz"; - sha256 = "deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c"; + sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d"; }; - propagatedBuildInputs = with self; [ six ]; + propagatedBuildInputs = with self; [ six ] ++ optional (pythonOlder "3.5") scandir; meta = { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; From 47f77d6104b888f1f837662b61b9c88d25842c5d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:26:04 +0100 Subject: [PATCH 170/278] pythonPackages.pathpy: 8.1.2 -> 10.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1208605ac491..51f5d00b299f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18460,12 +18460,12 @@ in { }; pathpy = buildPythonPackage rec { - version = "8.1.2"; + version = "10.1"; name = "path.py-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/path.py/${name}.tar.gz"; - sha256 = "ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2"; + sha256 = "8b0ee56f6c1421a9038823926ee8da354ce70933424b408558bc6b48496587f3"; }; buildInputs = with self; [setuptools_scm pytestrunner pytest pkgs.glibcLocales ]; From c7268fa2a935ef691b04eabc78f47e926ce0805f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:26:17 +0100 Subject: [PATCH 171/278] pythonPackages.pickleshare: 0.5 -> 0.7.4 --- pkgs/top-level/python-packages.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51f5d00b299f..e63dfad084ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18812,15 +18812,18 @@ in { }; pickleshare = buildPythonPackage rec { - version = "0.5"; + version = "0.7.4"; name = "pickleshare-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pickleshare/${name}.tar.gz"; - sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286"; + sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b"; }; - propagatedBuildInputs = with self; [pathpy]; + propagatedBuildInputs = with self; [pathpy] ++ optional (pythonOlder "3.4") pathlib2; + + # No proper test suite + doCheck = false; meta = { description = "Tiny 'shelve'-like database with concurrency support"; From db512addefef7063325ec4c595f32b33731ed13a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:26:34 +0100 Subject: [PATCH 172/278] pythonPackages.prompt_toolkit: 1.0.9 -> 1.0.13 --- 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 e63dfad084ed..1f2fe71a0e05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19315,10 +19315,10 @@ in { prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "1.0.9"; + version = "1.0.13"; src = pkgs.fetchurl { - sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd"; + sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776"; url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz"; }; checkPhase = '' From 88a3861c7bdbbc795c3897c8e84aba2334530962 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 13:26:44 +0100 Subject: [PATCH 173/278] pythonPackages.pyzmq: 15.2.0 -> 16.0.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 1f2fe71a0e05..52821234f410 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28215,10 +28215,10 @@ EOF }; pyzmq = buildPythonPackage rec { - name = "pyzmq-15.2.0"; + name = "pyzmq-16.0.2"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyzmq/${name}.tar.gz"; - sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec"; + sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"; }; buildInputs = with self; [ pkgs.zeromq3 pytest tornado ]; propagatedBuildInputs = [ self.py ]; From b63aab243349792b3ae7ff31d93594cf355cc583 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 14 Mar 2017 12:13:30 +0000 Subject: [PATCH 174/278] slack: 2.5.1 -> 2.5.2 --- .../networking/instant-messengers/slack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 59ce03cc0f45..c0d50a86c71f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.5.1"; + version = "2.5.2"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -45,7 +45,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1rrhgqmz0ajv2135bzykv3dq0mifzf5kiycgrisk2sfxn6nwyyvj"; + sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi"; } else throw "Slack is not supported on ${stdenv.system}"; From dc32b87082d5295a2cf5393235f76f703d6a48ad Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 14 Mar 2017 07:47:20 -0500 Subject: [PATCH 175/278] timewarrior: patch to install all themes; use default install target. --- .../applications/misc/timewarrior/default.nix | 6 +---- .../misc/timewarrior/install-all-themes.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/misc/timewarrior/install-all-themes.patch diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 091d51d33059..d417140b29bf 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -13,11 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - cp -rv doc/man/*.1 $out/share/man/man1 - cp src/timew $out/bin/ - ''; + patches = [ ./install-all-themes.patch ]; meta = with stdenv.lib; { description = "A command-line time tracker"; diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch new file mode 100644 index 000000000000..c6e8d3b0dbf7 --- /dev/null +++ b/pkgs/applications/misc/timewarrior/install-all-themes.patch @@ -0,0 +1,27 @@ +From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 14 Mar 2017 07:51:02 -0500 +Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'. + +--- + doc/themes/CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt +index a954576..3a3b453 100644 +--- a/doc/themes/CMakeLists.txt ++++ b/doc/themes/CMakeLists.txt +@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8) + + message ("-- Configuring theme documentation") + +-install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES README DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_blue.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) ++install (FILES dark_red.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes) +-- +2.12.0 + From 58807f75bc58ecdf23fdd93d423495feae9b60ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 14 Mar 2017 14:13:24 +0100 Subject: [PATCH 176/278] esniper: 2.32.0 -> 2.33.0 --- pkgs/applications/networking/esniper/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index bf6da8c207a0..b7bc2c6c67a0 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: -stdenv.mkDerivation { - name = "esniper-2.32.0"; +stdenv.mkDerivation rec { + name = "esniper-2.33.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-32-0.tgz"; - sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy"; + url = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz"; + sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69"; }; buildInputs = [ openssl curl ]; From 770794cbfeb2273c4116c7fc5ac9db485ba3540b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 14 Mar 2017 14:41:28 +0100 Subject: [PATCH 177/278] urt: remove --- pkgs/development/libraries/urt/default.nix | 61 ------ pkgs/development/libraries/urt/gentoo-config | 52 ----- .../libraries/urt/urt-3.1b-build-fixes.patch | 151 ------------- .../urt/urt-3.1b-compile-updates.patch | 141 ------------ .../libraries/urt/urt-3.1b-make.patch | 75 ------- .../libraries/urt/urt-3.1b-rle-fixes.patch | 203 ------------------ .../libraries/urt/urt-3.1b-tempfile.patch | 19 -- pkgs/top-level/all-packages.nix | 2 - 8 files changed, 704 deletions(-) delete mode 100644 pkgs/development/libraries/urt/default.nix delete mode 100644 pkgs/development/libraries/urt/gentoo-config delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-make.patch delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-tempfile.patch diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix deleted file mode 100644 index 090ca28d7c45..000000000000 --- a/pkgs/development/libraries/urt/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{stdenv, fetchurl, ncompress}: - -stdenv.mkDerivation rec { - name = "urt-${version}"; - version = "3.1b"; - - src = fetchurl { - url = ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z; - sha256 = "0hbb3avgvkfb2cksqn6cmmgcr0278nb2qd1srayqx0876pq6g2vd"; - }; - - buildInputs = [ ncompress ]; - - unpackPhase = '' - mkdir urt - tar xvf "$src" -C urt - ''; - patchFlags = "-p0 -d urt"; - patches = [ ./urt-3.1b-build-fixes.patch ./urt-3.1b-compile-updates.patch - ./urt-3.1b-make.patch ./urt-3.1b-rle-fixes.patch ./urt-3.1b-tempfile.patch ]; - postPatch = '' - cd urt - - rm bin/README - rm man/man1/template.1 - - # stupid OS X declares a stack_t type already - sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c - - sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr - - cp "${./gentoo-config}" config/gentoo - ''; - configurePhase = '' - ./Configure config/gentoo - ''; - postInstall = '' - mkdir -p $out/bin - cp bin/* $out/bin - - mkdir -p $out/lib - cp lib/librle.a $out/lib - - mkdir -p $out/include - cp include/rle*.h $out/include - - mkdir -p $out/share/man/man1 - cp man/man1/*.1 $out/share/man/man1 - - mkdir -p $out/share/man/man3 - cp man/man3/*.3 $out/share/man/man3 - - mkdir -p $out/share/man/man5 - cp man/man5/*.5 $out/share/man/man5 - ''; - - meta = { - homepage = http://www.cs.utah.edu/gdc/projects/urt/; - description = "A library for dealing with raster images"; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/urt/gentoo-config b/pkgs/development/libraries/urt/gentoo-config deleted file mode 100644 index a2d9ec3faf2f..000000000000 --- a/pkgs/development/libraries/urt/gentoo-config +++ /dev/null @@ -1,52 +0,0 @@ -#define ABEKASA60 -#define ABEKASA62 -#define ALIAS -##define CGM -#define CUBICOMP -##define DVIRLE -#define GRAYFILES -#define MACPAINT -##define PBMPLUS -##define SUNRASTER -#define TARGA -#define VICAR -#define WASATCH -#define WAVEFRONT - -#define GCC - -#define CONST_DECL -#define NO_MAKE_MAKEFILE -#define USE_TIME_H -#define SYS_V_SETPGRP -#define USE_PROTOTYPES -#define USE_RANDOM -#define USE_STDARG -#define USE_STDLIB_H -#define USE_UNISTD_H -#define USE_STRING_H -#define VOID_STAR -#define USE_XLIBINT_H -#define X_SHARED_MEMORY - -#defpath DEST bin -#defpath RI include -#defpath RL lib - -ROFF = nroff -ROFFOPT = -man -ROFFPIPE = | lpr - -INCTIFF = -LIBTIFF = -ltiff -INCX11 = -LIBX11 = -lX11 - -# Most people have migrated X11 to /usr/lib, but just in case ... -check_x11=$(shell \ - echo 'int main(){}' > test.c ; \ - if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ - echo "-L/usr/X11R6/lib" ; \ - fi ; \ - rm -f .urt-x11-test test.c) -LIBX11 += $(call check_x11) diff --git a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch deleted file mode 100644 index fc2bacddb30c..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch +++ /dev/null @@ -1,151 +0,0 @@ -some hosts are more anal about ar usage than others -http://bugs.gentoo.org/107428 - -respect user LDFLAGS -http://bugs.gentoo.org/126872 - ---- lib/makefile.src -+++ lib/makefile.src -@@ -181,8 +181,7 @@ - # Rebuild the library from all the .o files. - buildlib: $(OBJS) - -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+ ar rc $(LIBNAME) $(OBJS) - #ifndef NO_RANLIB - ranlib $(LIBNAME) - #endif ---- tools/clock/makefile.src -+++ tools/clock/makefile.src -@@ -6,7 +6,7 @@ install: rleClock - mv rleClock ../rleClock.out - - rleClock:rleClock.o font.o -- ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock -+ ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm - - font.c:font.src makeFont - chmod +x makeFont ---- tools/makefile.src -+++ tools/makefile.src -@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h - pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h - $(CC) $(CFLAGS) pyrlib.c -c - pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h -- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new - mv pyrmask.new pyrmask.out - - fant.out: fant.o mallocNd.o -- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out - - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - - crop.out: crop.c rle_box.o -- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new -+ ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new - mv crop.new crop.out - rlebox.out: rlebox.c rle_box.o -- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new -+ ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new - mv rlebox.new rlebox.out - - # rleClock has it's own directory, must be built special -@@ -100,7 +100,7 @@ clean: clean-pgm - .SUFFIXES: - .SUFFIXES: .out .c .o - .c.out: -- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new -+ $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new - mv $*.new $@ - - .c.o: ---- cnv/makefile.src -+++ cnv/makefile.src -@@ -76,13 +76,13 @@ PBMDIR = - # ppmtorle - ppm format to RLE - # rletoppm - RLE to ppm format - pgmtorle.out: pgmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - ppmtorle.out: ppmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - rletoppm.out: rletoppm.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - #endif - -@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c - # iristorle/rletoiris - Convert between RLE and SGI image format. - # - iristorle.out: iristorle.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - rletoiris.out: rletoiris.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - #endif - -@@ -108,10 +108,10 @@ TIFFDIR = - # tifftorle - Convert TIFF images to RLE - # rletotiff - Convert RLE images to TIFF - rletotiff.out: rletotiff.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - tifftorle.out: tifftorle.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - #endif - -@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c - # Will build with the default rule. - # rletorla - RLE to Wavefront RLA - rletorla.out: rletorla.c -- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new - mv $*.new $@ - #endif WAVEFRONT - -@@ -144,7 +144,7 @@ pristine: pristine-pgm - .SUFFIXES: - .SUFFIXES: .out .c - .c.out: -- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new - mv $*.new $@ - - # Dependency lines. Make sure to #ifdef them. ---- cnv/rletoabA62/makefile.src -+++ cnv/rletoabA62/makefile.src -@@ -15,7 +15,7 @@ all : $(PGMS) - # Executables. The .out will be stripped off in the install action. - - rletoabA62.out : rletoabA62.o rle.o -- $(CC) $(CFLAGS) -o rletoabA62.new \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ - rletoabA62.o rle.o $(LIBS) - mv rletoabA62.new rletoabA62.out - ---- cnv/rletogif/makefile.src -+++ cnv/rletogif/makefile.src -@@ -15,7 +15,7 @@ all: $(PGMS) - # The executable. The ".out" will be stripped off in the install action. - - rletogif.out: ${OBJ} -- ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new - mv rletogif.new rletogif.out - - # Incremental install, copies executable to DEST dir. diff --git a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch b/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch deleted file mode 100644 index 105f7c41f6a7..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- get/getx11/XGetHClrs.c -+++ get/getx11/XGetHClrs.c -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ ---- tools/mallocNd.c -+++ tools/mallocNd.c -@@ -67,7 +67,7 @@ - - /* Imports */ - #include --extern char *malloc(); -+#include - - /* Forward declarations */ - char *BuildIndirectionTable(); ---- tools/into.c -+++ tools/into.c -@@ -40,8 +40,8 @@ - static char buf[MAXPATHLEN+1]; - short forceflg; /* overwrite an unwritable file? */ - --extern int errno; --extern char *sys_errlist[]; -+#include -+#include - - void - main(argc, argv) -@@ -103,7 +103,7 @@ - if (ferror(outf)) - { - fprintf(stderr, "into: %s, \"%s\" not modified\n", -- sys_errlist[errno], argv[1]); -+ strerror(errno), argv[1]); - unlink(buf); - exit(1); - } ---- cnv/tex/dvirle2.c -+++ cnv/tex/dvirle2.c -@@ -55,7 +55,6 @@ - void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); - - char *ProgName; --extern int errno; - extern char *optarg; - extern int optind; - ---- cnv/wasatchrle.c -+++ cnv/wasatchrle.c -@@ -32,7 +32,6 @@ - #include - #include "rle.h" - --extern int errno; - - /* "short" in our world is 16 bits. Beware of swyte-bopping. */ - ---- get/getx11/x11_stuff.c -+++ get/getx11/x11_stuff.c -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -361,7 +360,6 @@ Boolean reallocate; - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) ---- get/qcr/qcr.h -+++ get/qcr/qcr.h -@@ -6,8 +6,6 @@ - #define GREEN 1 - #define BLUE 2 - --extern int errno; -- - /* Command defs for QCR-Z Film Recorder */ - - /* These are for 8 bit Look Up Tables */ ---- get/gettaac.c -+++ get/gettaac.c -@@ -24,6 +24,7 @@ - * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu - */ - -+#include - #include - #include - #include -@@ -459,7 +460,6 @@ char *template; - char nonUnique; - char twiddleUserCompletion; - -- extern int errno; - struct direct *nameEntry; - DIR *dirChan; - struct passwd *pwdEntry; ---- tools/clock/rleClock.c -+++ tools/clock/rleClock.c -@@ -598,7 +598,7 @@ - { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, - { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, - { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, -- NULL -+ { FALSE, NULL } - }; - - void ---- tools/to8.c -+++ tools/to8.c -@@ -175,7 +175,7 @@ - * Give it a background color of black, since the real background - * will be dithered anyway. - */ -- if ( in_hdr.background != NULL ) -+ if ( in_hdr.background != 0 ) - { - out_hdr.bg_color = (int *)malloc( sizeof( int ) ); - RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); ---- cnv/rletoabA62/rletoabA62.c -+++ cnv/rletoabA62/rletoabA62.c -@@ -157,7 +157,7 @@ - exit(1); - } - if (optind < argc) { -- if ((file = open(argv[optind], 0)) == NULL) { -+ if ((file = open(argv[optind], 0)) == -1) { - perror(argv[optind]); - exit(1); - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-make.patch b/pkgs/development/libraries/urt/urt-3.1b-make.patch deleted file mode 100644 index 310675dd395d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-make.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: makefile.src -=================================================================== ---- makefile.src -+++ makefile.src -@@ -17,7 +17,7 @@ all: default - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ MAKE_TARGET = - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - -Index: tools/makefile.src -=================================================================== ---- tools/makefile.src -+++ tools/makefile.src -@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm -Index: makefile.tlr -=================================================================== ---- makefile.tlr -+++ makefile.tlr -@@ -7,7 +7,7 @@ subdirs: - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ clean-pgm: - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff --git a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch deleted file mode 100644 index 3720806960fe..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fixes taken from netpbm - ---- lib/rle_global.c -+++ lib/rle_global.c -@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ NULL, /* output file -- must be set dynamically */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ ---- lib/rle_hdr.c -+++ lib/rle_hdr.c -@@ -269,6 +273,9 @@ - { - rle_hdr *ret_hdr; - -+ rle_dflt_hdr.rle_file = stdout; -+ /* The rest of rle_dflt_hdr is set by the loader's data initialization */ -+ - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - ---- lib/dither.c -+++ lib/dither.c -@@ -38,10 +38,10 @@ void make_square(); - #endif - - static int magic4x4[4][4] = { -- 0, 14, 3, 13, -- 11, 5, 8, 6, -- 12, 2, 15, 1, -- 7, 9, 4, 10 -+{ 0, 14, 3, 13}, -+{ 11, 5, 8, 6}, -+{ 12, 2, 15, 1}, -+{ 7, 9, 4, 10} - }; - - /* basic dithering macro */ ---- lib/rle_open_f.c -+++ lib/rle_open_f.c -@@ -9,7 +9,11 @@ - */ - - #include "rle_config.h" -+#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -+ - #include -+#include -+#include - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -260,7 +260,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) ---- lib/rle_getcom.c -+++ lib/rle_getcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } ---- lib/scanargs.c -+++ lib/scanargs.c -@@ -128,10 +130,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -375,11 +377,12 @@ - if ( optarg > 0 ) /* end optional args? */ - { - /* Eat the arg, too, if necessary */ -- if ( list_cnt == 0 ) -+ if ( list_cnt == 0 ) { - if ( typchr == 's' ) - (void)va_arg( argl, char * ); - else - (void)va_arg( argl, ptr ); -+ } - break; - } - else -@@ -567,7 +570,7 @@ - * Do conversion for n and N types - */ - tmpflg = typchr; -- if (typchr == 'n' || typchr == 'N' ) -+ if (typchr == 'n' || typchr == 'N' ) { - if (*argp != '0') - tmpflg = 'd'; - else if (*(argp+1) == 'x' || -@@ -578,6 +581,7 @@ - } - else - tmpflg = 'o'; -+ } - if (typchr == 'N') - tmpflg = toupper( tmpflg ); - ---- lib/inv_cmap.c -+++ lib/inv_cmap.c -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static long gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT ---- lib/rle_getrow.c -+++ lib/rle_getrow.c -@@ -351,7 +351,7 @@ - bzero( (char *)scanline[-1] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1 ); - for ( nc = 0; nc < the_hdr->ncolors; nc++ ) -- if ( RLE_BIT( *the_hdr, nc ) ) -+ if ( RLE_BIT( *the_hdr, nc ) ) { - /* Unless bg color given explicitly, use 0. */ - if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) - bzero( (char *)scanline[nc] + the_hdr->xmin, -@@ -360,6 +360,7 @@ - bfill( (char *)scanline[nc] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1, - the_hdr->bg_color[nc] ); -+ } - } - - /* If skipping, then just return */ -@@ -367,7 +368,7 @@ - { - the_hdr->priv.get.vert_skip--; - the_hdr->priv.get.scan_y++; -- if ( the_hdr->priv.get.vert_skip > 0 ) -+ if ( the_hdr->priv.get.vert_skip > 0 ) { - if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) - { - int y = the_hdr->priv.get.scan_y; -@@ -377,6 +378,7 @@ - } - else - return the_hdr->priv.get.scan_y; -+ } - } - - /* If EOF has been encountered, return also */ -@@ -457,11 +459,12 @@ - else - nc = DATUM(inst); - nc++; -- if ( debug_f ) -+ if ( debug_f ) { - if ( RLE_BIT( *the_hdr, channel ) ) - fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); - else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); -+ } - if ( RLE_BIT( *the_hdr, channel ) ) - { - /* Don't fill past end of scanline! */ ---- lib/rle_putcom.c -+++ lib/rle_putcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch b/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch deleted file mode 100644 index 12acce151b5d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/rlecat.c -+++ tools/rlecat.c -@@ -110,8 +110,14 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -- tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); -+ /* we dont have to use rle_open_f() because all it does in -+ * this case is run fopen() ... we're creating a file so all -+ * the checks for opening an existing file aren't needed */ -+ int fd = mkstemp(temp); -+ if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { -+ perror("Unable to open tempfile"); -+ exit(-1); -+ } - } - } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182fcc617bb0..09d3d3ecad31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9877,8 +9877,6 @@ with pkgs; unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {}); - urt = callPackage ../development/libraries/urt { }; - ustr = callPackage ../development/libraries/ustr { }; usbredir = callPackage ../development/libraries/usbredir { From f70a896094025aa0a1129f368d3a380c69ca1d59 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 14 Mar 2017 15:36:06 +0100 Subject: [PATCH 178/278] hol: mark as broken --- pkgs/applications/science/logic/hol/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 40fb9bfb160b..e931c6fcf9d5 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; + broken = true; }; } From c555556af518c3ee52d3f8233544a81c0746ccaa Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 14 Mar 2017 15:36:35 +0100 Subject: [PATCH 179/278] refind: mark as broken --- pkgs/tools/bootloaders/refind/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index ecc6bec3005d..74ea097d2f30 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -139,6 +139,7 @@ EOF homepage = http://refind.sourceforge.net/; maintainers = [ maintainers.AndersonTorres ]; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = true; }; } From fc55e80ee7754c02a51484a820001b0f57889561 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 15:41:10 +0100 Subject: [PATCH 180/278] pythonPackages.ipython_genutils: 0.1.0 -> 0.2.0 --- pkgs/top-level/python-packages.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 52821234f410..495a310fcd3c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13118,21 +13118,14 @@ in { }; ipython_genutils = buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; name = "ipython_genutils-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz"; - sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6"; + sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; }; - patches = [ - (pkgs.fetchpatch { - url = "https://github.com/ipython/ipython_genutils/commit/6d74d8cb34e49820e48ba8b4f5e5f8322824f4f7.patch"; - sha256 = "13ah6a11qldzzywax50la6qwq02sk5929gjkzzn456lg1ja5gq35"; - }) - ]; - LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose pkgs.glibcLocales ]; From c3772678e95d1e803b3f791b4a60e2daae028e97 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 15 Mar 2017 00:02:08 +0900 Subject: [PATCH 181/278] flashplayer: 24.0.0.221 -> 25.0.0.127 (#23889) --- .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------ .../mozilla-plugins/flashplayer/standalone.nix | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 9e0b0852bf8a..72a1f171dec6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,25 +73,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "24.0.0.221"; + version = "25.0.0.127"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "10f8m5zc8p4xbhihbl785lws1kpv6smnbhx4ydzf8ai3mlv3y241" + "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva" else - "1rz9rkbvln8wdkfmsnnq936xs6969qma141jc4qx408419q7v3hg" + "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx" else if arch == "x86_64" then - "1cb4mvslphj3bcchgr7lcswz8kk8si0s60rl5266mi53byplhw08" + "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn" else - "1vcyp9041171xkcnz05dlk3n7bnbcb9qbh4sy5wfgjkqsyd6i5bl"; + "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 248fe63ab0c6..178b86b61c66 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -57,19 +57,19 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "24.0.0.221"; + version = "25.0.0.127"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0cy81cml72ayx2wa0fd9vgp2wzny866jasahndg01v0jfxcxw5rz" + "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51" else - "0xgiycd47mzmwvmhbi0ig3rd7prksfdpcd4h62as1m9gs1ax4d7l"; + "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2"; }; nativeBuildInputs = [ unzip ]; From 308c09d41f309e5055e45c66c07454581945d458 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 14 Mar 2017 16:11:51 +0100 Subject: [PATCH 182/278] wordpress: security upgrade: 4.7.2 -> 4.7.3 & other improvements (#23837) * Moved the wordpress sources derivation to the attribute pkgs.wordpress. This makes it easier to override. * Also introduce the `package` option for the wordpress virtual host config which defaults to pkgs.wordpress. * Also fixed the test in nixos/tests/wordpress.nix. --- .../web-servers/apache-httpd/wordpress.nix | 20 +++++++++---------- nixos/tests/wordpress.nix | 12 ++++------- pkgs/servers/web-apps/wordpress/default.nix | 12 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/servers/web-apps/wordpress/default.nix diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index a5b6548d3c53..b94ec14308be 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -4,11 +4,6 @@ with lib; let - - # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix - version = "4.7.2"; - fullversion = "${version}"; - # Our bare-bones wp-config.php file using the above settings wordpressConfig = pkgs.writeText "wp-config.php" '' Date: Tue, 14 Mar 2017 16:11:03 +0100 Subject: [PATCH 183/278] alot: 0.5 -> 0.5.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d189a4ff4cee..301554f823c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -905,7 +905,7 @@ in { alot = buildPythonPackage rec { - rev = "0.5"; + rev = "0.5.1"; name = "alot-${rev}"; disabled = isPy3k; @@ -914,7 +914,7 @@ in { owner = "pazz"; repo = "alot"; inherit rev; - sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6"; + sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8"; }; postPatch = '' From c9d9f072e541589475068005c090ea0e02ae7fb7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 16:40:52 +0100 Subject: [PATCH 184/278] pythonPackages.pytest-shutil: 1.1.1 -> 1.2.8 --- 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 495a310fcd3c..68712bcd8c94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5371,10 +5371,10 @@ in { pytest-shutil = buildPythonPackage rec { name = "pytest-shutil-${version}"; - version = "1.1.1"; + version = "1.2.8"; src = pkgs.fetchurl { url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz"; - sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4"; + sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d"; }; buildInputs = with self; [ cmdline pytest ]; propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ]; From 4bfa709562eb8266d43e2afbe76a4f24b4439ba2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 16:41:07 +0100 Subject: [PATCH 185/278] pythonPackages.pytest-virtualenv: 1.1.0 -> 1.2.7 --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68712bcd8c94..b9d97b05aed4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5386,12 +5386,9 @@ in { license = licenses.mit; }; - checkPhase = '' py.test ''; - # Bunch of pickle errors - doCheck = false; }; pytestcov = buildPythonPackage (rec { @@ -5421,10 +5418,10 @@ in { pytest-virtualenv = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pytest-virtualenv"; - version = "1.1.0"; + version = "1.2.7"; src = pkgs.fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669"; + sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755"; }; buildInputs = with self; [ pytest pytestcov mock cmdline ]; propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ]; From d7378da0280ebc0b59d0d198fd86b2d4a9eace41 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 15:04:16 +0100 Subject: [PATCH 186/278] pythonPackages.configparser: fix with namespace packages --- .../configparser/0001-namespace-fix.patch | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/configparser/0001-namespace-fix.patch diff --git a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch new file mode 100644 index 000000000000..05dbf4677182 --- /dev/null +++ b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch @@ -0,0 +1,42 @@ +From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Tue, 14 Mar 2017 15:00:33 +0100 +Subject: [PATCH] namespace fix + +configparser broke other namespace packages +https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428 +This patch seems to solve that issue. +--- + setup.py | 1 - + src/backports/__init__.py | 6 ------ + 2 files changed, 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 3b07823..63ed25d 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,6 @@ setup( + py_modules=modules, + package_dir={'': 'src'}, + packages=find_packages('src'), +- namespace_packages=['backports'], + include_package_data=True, + zip_safe=False, + install_requires=requirements, +diff --git a/src/backports/__init__.py b/src/backports/__init__.py +index f84d25c..febdb2f 100644 +--- a/src/backports/__init__.py ++++ b/src/backports/__init__.py +@@ -3,9 +3,3 @@ + + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) +- +-try: +- import pkg_resources +- pkg_resources.declare_namespace(__name__) +-except ImportError: +- pass +-- +2.11.1 + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9d97b05aed4..b6dbaac44114 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4171,6 +4171,12 @@ in { # No tests available doCheck = false; + # Fix issue when used together with other namespace packages + # https://github.com/NixOS/nixpkgs/issues/23855 + patches = [ + ./../development/python-modules/configparser/0001-namespace-fix.patch + ]; + meta = { maintainers = [ ]; platforms = platforms.all; From b27dfdbe66a63669ae9cdd4cf09cd1f188bd2bca Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 11 Mar 2017 12:52:57 +0100 Subject: [PATCH 187/278] pythonPackages.parsedatetime: 2.1 -> 2.3 --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b6dbaac44114..040ce68830a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18190,7 +18190,7 @@ in { parsedatetime = buildPythonPackage rec { name = "parsedatetime-${version}"; - version = "2.1"; + version = "2.3"; meta = { description = "Parse human-readable date/time text"; @@ -18198,11 +18198,12 @@ in { license = licenses.asl20; }; - buildInputs = with self; [ PyICU nose ]; + buildInputs = with self; [ pytest pytestrunner ]; + propagatedBuildInputs = with self; [ future ]; src = pkgs.fetchurl { url = "mirror://pypi/p/parsedatetime/${name}.tar.gz"; - sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p"; + sha256 = "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll"; }; }; From 47f7817037487c8acd1a7a25627ba75573c0ead3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 16:52:25 +0100 Subject: [PATCH 188/278] pythonPackages.typed-ast: 1.0.1 -> 1.0.2 --- .../python-modules/typed-ast/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 8d36d3c3a61f..02a603234205 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -1,13 +1,16 @@ -{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }: +{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }: buildPythonPackage rec { - name = "typed-ast-${version}"; - version = "1.0.1"; - src = fetchzip { - url = "mirror://pypi/t/typed-ast/${name}.zip"; - sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154"; + pname = "typed-ast"; + version = "1.0.2"; + name = "${pname}-${version}"; + src = fetchPypi{ + inherit pname version; + sha256 = "13e02b10479ddff07eb546f9638743702ab9b175bfa3cdf2482688df91b5766d"; }; # Only works with Python 3.3 and newer; - disabled = !isPy3k && !(pythonOlder "3.3"); + disabled = pythonOlder "3.3"; + # No tests in archive + doCheck = false; meta = { homepage = "https://pypi.python.org/pypi/typed-ast"; description = "a fork of Python 2 and 3 ast modules with type comment support"; From fd68cd4ed7dc3c00b85a4f677a446879f2b6c8fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 16:57:00 +0100 Subject: [PATCH 189/278] pythonPackages.pygal: 2.0.10 -> 2.3.1 --- pkgs/top-level/python-packages.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 040ce68830a4..44befee73268 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15329,16 +15329,15 @@ in { }; pygal = buildPythonPackage rec { - version = "2.0.10"; - name = "pygal-${version}"; + pname = "pygal"; + version = "2.3.1"; + name = "${pname}-${version}"; doCheck = !isPyPy; # one check fails with pypy - src = pkgs.fetchFromGitHub { - owner = "Kozea"; - repo = "pygal"; - rev = version; - sha256 = "1j7qjgraapvfc80yp8xcbddqrw8379gqi7pwkvfml3qcqm0z0d33"; + src = fetchPypi { + inherit pname version; + sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667"; }; buildInputs = with self; [ flask pyquery pytest ]; From 6a6d48be4e80a078e6969e9c565db32aec67dc62 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 17:07:09 +0100 Subject: [PATCH 190/278] pythonPackages.dateparser: mark as broken --- 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 44befee73268..6f7d332dbe86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5981,6 +5981,7 @@ in { description = "Date parsing library designed to parse dates from HTML pages"; homepage = http://pypi.python.org/pypi/dateparser; license = licenses.bsd3; + broken = true; }; }; From 6de3eb991894826c8836e6b025b1065a3a89dccd Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Tue, 14 Mar 2017 16:33:39 +0100 Subject: [PATCH 191/278] nixbot: typo --- pkgs/tools/misc/nixbot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix index 6fb0b9c8201b..554aa0bccee2 100644 --- a/pkgs/tools/misc/nixbot/default.nix +++ b/pkgs/tools/misc/nixbot/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - desciption = "Github bot for reviewing/testing pull requests with the help of Hydra"; + description = "Github bot for reviewing/testing pull requests with the help of Hydra"; maintainers = with maintainers; [ domenkozar fpletz globin ]; license = licenses.asl20; homepage = https://github.com/domenkozar/nixbot; From 4a615d90af98bbe6ad470479b77d3b4dd38af458 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 14 Mar 2017 17:09:20 +0100 Subject: [PATCH 192/278] pythonPackages.pywatchman: disable python 3.x and disable tests --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7d332dbe86..6ed90dbd1fe6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10059,6 +10059,11 @@ in { substituteInPlace pywatchman/__init__.py \ --replace "'watchman'" "'${pkgs.watchman}/bin/watchman'" ''; + # SyntaxError + disabled = isPy3k; + # No tests in archive + doCheck = false; + }; zope_tales = buildPythonPackage rec { From 4e439b2393945c5a943a1e168dfe90de07a3f634 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Fri, 10 Mar 2017 20:26:25 +0000 Subject: [PATCH 193/278] qutebrowser: 0.9.1 -> 0.10.1 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4c186fcf5ea9..a07fc04b02ea 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -24,12 +24,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.9.1"; + version = "0.10.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass"; + sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917"; }; # Needs tox From 5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 14 Mar 2017 11:14:29 +0100 Subject: [PATCH 194/278] eclipses: add dependencies as build inputs Having `glib` in the build inputs will allow its build hook to trigger. Also adds `gsettings_desktop_schemas` as a dependency since Eclipse appears to need the schemas under certain circumstances. --- pkgs/applications/editors/eclipse/build-eclipse.nix | 10 ++++++++-- pkgs/applications/editors/eclipse/default.nix | 5 +++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 74707c65b6ca..60bece1fafc4 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,6 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2 +, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -15,7 +17,10 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ + fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 + libXrender libXtst makeWrapper zlib + ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2; buildCommand = '' # Unpack tarball. @@ -37,6 +42,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 9271579346aa..8ef855e48c8d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk2, libXtst, jdk +, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -12,7 +12,8 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst webkitgtk2 makeWrapper; + jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2 + makeWrapper; }; ### Eclipse CPP From d6f586bbffbc84e299302e9abec41317f2e82eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Mar 2017 13:58:07 +0100 Subject: [PATCH 195/278] git-octopus: init at 1.4 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-octopus/default.nix | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-octopus/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b9b7f2e543ff..281a39149867 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -66,6 +66,8 @@ rec { git-imerge = callPackage ./git-imerge { }; + git-octopus = callPackage ./git-octopus { }; + git-radar = callPackage ./git-radar { }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix new file mode 100644 index 000000000000..f8d871bdcf30 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, git, perl, makeWrapper }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "git-octopus-${version}"; + version = "1.4"; + + installFlags = [ "prefix=$(out)" ]; + + buildInputs = [ makeWrapper ]; + + # perl provides shasum + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]} + done + ''; + + src = fetchFromGitHub { + owner = "lesfurets"; + repo = "git-octopus"; + rev = "v${version}"; + sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1"; + }; + + meta = { + homepage = https://github.com/lesfurets/git-octopus; + description = "The continuous merge workflow"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [maintainers.mic92]; + }; +} From 496120c19f710e1a317f606dc067664a6751370d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Mar 2017 17:07:25 +0100 Subject: [PATCH 196/278] travis: 1.8.2 -> 1.8.8 --- .../tools/misc/travis/Gemfile.lock | 26 +++++++------- pkgs/development/tools/misc/travis/gemset.nix | 36 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index e84e87fb5232..529be0793605 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -3,32 +3,32 @@ GEM specs: addressable (2.4.0) backports (3.6.8) - ethon (0.8.1) + ethon (0.10.1) ffi (>= 1.3.0) - faraday (0.9.2) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - ffi (1.9.10) - gh (0.14.0) - addressable + faraday_middleware (0.11.0.1) + faraday (>= 0.7.4, < 1.0) + ffi (1.9.18) + gh (0.15.1) + addressable (~> 2.4.0) backports faraday (~> 0.8) multi_json (~> 1.0) - net-http-persistent (>= 2.7) + net-http-persistent (~> 2.9) net-http-pipeline highline (1.7.8) - json (1.8.3) + json (2.0.3) launchy (2.4.3) addressable (~> 2.3) - multi_json (1.11.2) + multi_json (1.12.1) multipart-post (2.0.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.2) + travis (1.8.8) backports faraday (~> 0.9) faraday_middleware (~> 0.9, >= 0.9.1) @@ -39,7 +39,7 @@ GEM typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) - websocket (1.2.2) + websocket (1.2.4) PLATFORMS ruby @@ -48,4 +48,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.11.2 + 1.14.4 diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index abfd352e90ec..148923848beb 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -18,42 +18,42 @@ ethon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij"; + sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl"; type = "gem"; }; - version = "0.8.1"; + version = "0.10.1"; }; faraday = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr"; type = "gem"; }; - version = "0.9.2"; + version = "0.11.0"; }; faraday_middleware = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; + sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.0.1"; }; ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; type = "gem"; }; - version = "1.9.10"; + version = "1.9.18"; }; gh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2"; + sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; type = "gem"; }; - version = "0.14.0"; + version = "0.15.1"; }; highline = { source = { @@ -66,10 +66,10 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; type = "gem"; }; - version = "1.8.3"; + version = "2.0.3"; }; launchy = { source = { @@ -82,10 +82,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.1"; }; multipart-post = { source = { @@ -122,10 +122,10 @@ travis = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s"; + sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.8"; }; typhoeus = { source = { @@ -138,9 +138,9 @@ websocket = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4"; + sha256 = "1shymfaw14p8jdi74nwz4nsgc9cmpli166lkp5g5wbhjmhmpvrnh"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.4"; }; } \ No newline at end of file From 5fa84fb1a8cd1f5e6268f0276f572c54d106aa96 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 14 Mar 2017 16:31:08 -0400 Subject: [PATCH 197/278] terra{form,grunt}: Add some needed old versions --- .../networking/cluster/terraform/0.8.5.nix | 34 +++++++++++++++++++ .../networking/cluster/terragrunt/0.9.8.nix | 31 +++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++ 3 files changed, 71 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform/0.8.5.nix create mode 100644 pkgs/applications/networking/cluster/terragrunt/0.9.8.nix diff --git a/pkgs/applications/networking/cluster/terraform/0.8.5.nix b/pkgs/applications/networking/cluster/terraform/0.8.5.nix new file mode 100644 index 000000000000..7f927b586705 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform/0.8.5.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "terraform-${version}"; + version = "0.8.5"; + + goPackagePath = "github.com/hashicorp/terraform"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; + }; + + postInstall = '' + # remove all plugins, they are part of the main binary now + for i in $bin/bin/*; do + if [[ $(basename $i) != terraform ]]; then + rm "$i" + fi + done + ''; + + meta = with stdenv.lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = "https://www.terraform.io/"; + license = licenses.mpl20; + maintainers = with maintainers; [ + jgeerds + zimbatm + ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix new file mode 100644 index 000000000000..54ca1a9d7d0f --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: + +buildGoPackage rec { + name = "terragrunt-${version}"; + version = "0.9.8"; + + goPackagePath = "github.com/gruntwork-io/terragrunt"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "gruntwork-io"; + repo = "terragrunt"; + sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $bin/bin/terragrunt \ + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform + ''; + + meta = with stdenv.lib; { + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + homepage = https://github.com/gruntwork-io/terragrunt/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b580dfc042e3..4a73c033c4ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17984,8 +17984,14 @@ with pkgs; terraform = callPackage ../applications/networking/cluster/terraform {}; + terraform_0_8_5 = callPackage ../applications/networking/cluster/terraform/0.8.5.nix {}; + terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; + terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix { + terraform = terraform_0_8_5; + }; + tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; tewi-font = callPackage ../data/fonts/tewi {}; From cbf87bc2b25fb7c118348a65e72a5580972d1262 Mon Sep 17 00:00:00 2001 From: Markus Schneider Date: Mon, 13 Mar 2017 11:20:41 +0100 Subject: [PATCH 198/278] granite: 0.3.0 -> 0.4.0.1 --- pkgs/development/libraries/granite/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4d011ddd4638..ee453963376f 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.3"; - minorVersion = "0"; + majorVersion = "0.4"; + minorVersion = "0.1"; name = "granite-${majorVersion}.${minorVersion}"; src = fetchurl { - url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; - sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; + sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; From 961c73a78c95b783d4c235b9401ed4b2d0ec377f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 7 Mar 2017 20:59:39 +0100 Subject: [PATCH 199/278] qt56.full: add missing modules qtquickcontrols2, qtwebkit. Added in the same order as the modules are listed in default.nix (and then reformatted the block). (The qt55 expression already has all modules in *full.) --- pkgs/development/libraries/qt-5/5.6/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 37b6eb7f3d3c..cc6475d31b64 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -114,9 +114,9 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = From db937b9d60c281ab34f329867f593cbacaa6866a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 7 Mar 2017 20:54:24 +0100 Subject: [PATCH 200/278] qt57.full: add missing modules qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit. Added in the same order as the modules are listed in default.nix (and then reformatted the block). --- pkgs/development/libraries/qt-5/5.7/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index f468670674f0..f387a242101b 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -98,10 +98,11 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats + qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebsockets qtx11extras qtxmlpatterns + qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras + qtxmlpatterns ]; makeQtWrapper = From a691c0655694fae5ec58019b402a61593cc52d37 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 13 Mar 2017 15:13:02 +0100 Subject: [PATCH 201/278] linux_testing: 4.11-rc1 -> 4.11-rc2 --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 329f80d0e67e..c02b8209f2fe 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -456,7 +456,7 @@ with stdenv.lib; FTRACE_SYSCALLS y SCHED_TRACER y STACK_TRACER y - UPROBE_EVENT y + UPROBE_EVENT? y ${optionalString (versionAtLeast version "4.4") '' BPF_SYSCALL y BPF_EVENTS y diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 124486606637..b9f5d152bf6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc1"; - modDirVersion = "4.11.0-rc1"; + version = "4.11-rc2"; + modDirVersion = "4.11.0-rc2"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "19zcyjqiw255d48k1mk33i1wgbiwv58nn3dw9i9079hfb843s28l"; + sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx"; }; features.iwlwifi = true; From 44bd7c45dcbb2ef6f833aa17e4f51a6736d60136 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 13 Mar 2017 15:13:28 +0100 Subject: [PATCH 202/278] linux_4_10: 4.10.1 -> 4.10.2 --- pkgs/os-specific/linux/kernel/linux-4.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix index 01ee7211ba6f..cdcd4ccc21f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10.1"; + version = "4.10.2"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0hrmph137q4j2xfsv1fyayig47g4v8ivd2rqsw03dy7mzasnp83c"; + sha256 = "1m5ahr1m36kdni80xj4imhhw26l8621rsaaa3z4gkjmnq6n0bnxr"; }; kernelPatches = args.kernelPatches; From 5b946fdafcf752fd01a687acf784f99e013b66e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 13 Mar 2017 15:26:41 +0100 Subject: [PATCH 203/278] atlassian-crowd: 2.10.1 -> 2.11.1 --- pkgs/servers/atlassian/crowd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 05b88cf9cf3b..d80691231c5e 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "2.10.1"; + version = "2.11.1"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1pl4wyqvzqb97ql23530amslrrsysi0fmmnzpihhgqhvhwf57sc6"; + sha256 = "12gb9p5npcdr7mxyyir3xgjkc6n05zfi4i5dqkg8f7jrhi49nas7"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; From a26c51116d681a2828ad836386b7698dc3876689 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 14 Mar 2017 23:18:23 +0100 Subject: [PATCH 204/278] disnix: 0.6 -> 0.7 --- .../disnix/DisnixWebService/default.nix | 6 +++--- pkgs/tools/package-management/disnix/default.nix | 10 ++++------ .../package-management/disnix/disnixos/default.nix | 8 +++----- .../package-management/disnix/dysnomia/default.nix | 6 +++--- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 08847b999cfe..152dc7dcc040 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: stdenv.mkDerivation { - name = "DisnixWebService-0.6"; + name = "DisnixWebService-0.7"; src = fetchurl { - url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2; - sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz"; + url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz; + sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 45bd2abe8ece..e83f8047f4ba 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.6.1"; + name = "disnix-0.7"; src = fetchurl { - url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz; - sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj"; + url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz; + sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71"; }; buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; - dontStrip = true; - meta = { description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index eb0b7d2a4187..81be1549c83c 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.5"; + name = "disnixos-0.6"; src = fetchurl { - url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz; - sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq"; + url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz; + sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7"; }; buildInputs = [ socat pkgconfig dysnomia disnix getopt ]; - dontStrip = true; - meta = { description = "Provides complementary NixOS infrastructure deployment to Disnix"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 08f58f668ece..e33776eaa2b7 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.6.1"; + name = "dysnomia-0.7"; src = fetchurl { - url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz; - sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi"; + url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz; + sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; From 83052ef9db71b5f70e65b25e255d61da3eaaa0ac Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Mon, 13 Mar 2017 20:04:42 +0100 Subject: [PATCH 205/278] nixos/dnscrypt-proxy: support reload --- nixos/modules/services/networking/dnscrypt-proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index beddaa076122..66fa5e6dd3c5 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -197,6 +197,7 @@ in serviceConfig = { NonBlocking = "true"; ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "dnscrypt-proxy"; From 9325c3a61646fb1da6ff7377da23c119523d038a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 12 Mar 2017 16:20:10 +0100 Subject: [PATCH 206/278] nixos/dnscrypt-proxy: simplify module logic related to apparmor --- .../modules/services/networking/dnscrypt-proxy.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 66fa5e6dd3c5..37d56f1c3c17 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -2,8 +2,6 @@ with lib; let - apparmorEnabled = config.security.apparmor.enable; - cfg = config.services.dnscrypt-proxy; stateDirectory = "/var/lib/dnscrypt-proxy"; @@ -187,12 +185,8 @@ in documentation = [ "man:dnscrypt-proxy(8)" ]; before = [ "nss-lookup.target" ]; - - after = [ "network.target" ] - ++ optional apparmorEnabled "apparmor.service"; - - requires = [ "dnscrypt-proxy.socket "] - ++ optional apparmorEnabled "apparmor.service"; + after = [ "network.target" ]; + requires = [ "dnscrypt-proxy.socket "]; serviceConfig = { NonBlocking = "true"; @@ -208,7 +202,9 @@ in }; } - (mkIf apparmorEnabled { + (mkIf config.security.apparmor.enable { + systemd.services.dnscrypt-proxy.after = [ "apparmor.service" ]; + security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, From 719813caf6309441fcf502d4c88aabddc7d5ca70 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 10 Mar 2017 15:36:13 +0100 Subject: [PATCH 207/278] nixos/dnscrypt-proxy: replace unimportant options with extraArgs Removes tcpOnly and ephemeralKeys: reifying them as nixos options adds little beyond improved discoverability. Until 17.09 we'll automatically translate these options into extraArgs for convenience. Unless reifying an option is necessary for conditional computation or greatly simplifies configuration/reduces risk of misconfiguration, it should go into extraArgs instead. --- .../services/networking/dnscrypt-proxy.nix | 79 +++++++++++-------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 37d56f1c3c17..251097c160c7 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -6,8 +6,6 @@ let stateDirectory = "/var/lib/dnscrypt-proxy"; - localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; - # The minisign public key used to sign the upstream resolver list. # This is somewhat more flexible than preloading the key as an # embedded string. @@ -16,31 +14,36 @@ let sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; }; - # Internal flag indicating whether the upstream resolver list is used + # Internal flag indicating whether the upstream resolver list is used. useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; + # The final local address. + localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; + + # The final resolvers list path. resolverList = if (cfg.resolverList != null) then cfg.resolverList else "${stateDirectory}/dnscrypt-resolvers.csv"; - resolverArgs = if (cfg.customResolver != null) - then - [ "--resolver-address=${cfg.customResolver.address}:${toString cfg.customResolver.port}" - "--provider-name=${cfg.customResolver.name}" - "--provider-key=${cfg.customResolver.key}" - ] - else - [ "--resolvers-list=${resolverList}" - "--resolver-name=${cfg.resolverName}" - ]; + # Build daemon command line + + resolverArgs = + if (cfg.customResolver == null) + then + [ "-L ${resolverList}" + "-R ${cfg.resolverName}" + ] + else with cfg.customResolver; + [ "-N ${name}" + "-k ${key}" + "-r ${address}:${toString port}" + ]; - # The final command line arguments passed to the daemon daemonArgs = - [ "--local-address=${localAddress}" ] - ++ optional cfg.tcpOnly "--tcp-only" - ++ optional cfg.ephemeralKeys "-E" - ++ resolverArgs; + [ "-a ${localAddress}" ] + ++ resolverArgs + ++ cfg.extraArgs; in { @@ -50,6 +53,9 @@ in }; options = { + # Before adding another option, consider whether it could + # equally well be passed via extraArgs. + services.dnscrypt-proxy = { enable = mkOption { default = false; @@ -131,24 +137,13 @@ in }; })); }; - tcpOnly = mkOption { - default = false; - type = types.bool; + extraArgs = mkOption { + default = []; + type = types.listOf types.str; description = '' - Force sending encrypted DNS queries to the upstream resolver over - TCP instead of UDP (on port 443). Use only if the UDP port is blocked. - ''; - }; - - ephemeralKeys = mkOption { - default = false; - type = types.bool; - description = '' - Compute a new key pair for every query. Enabling this option - increases CPU usage, but makes it more difficult for the upstream - resolver to track your usage of their service across IP addresses. - The default is to re-use the public key pair for all queries, making - tracking trivial. + Additional command-line arguments passed verbatim to the daemon. + See dnscrypt-proxy + 8 for details. ''; }; }; @@ -309,5 +304,19 @@ in imports = [ (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ]) + + (mkChangedOptionModule + [ "services" "dnscrypt-proxy" "tcpOnly" ] + [ "services" "dnscrypt-proxy" "extraArgs" ] + (config: + let val = getAttrFromPath [ "services" "dnscrypt-proxy" "tcpOnly" ] config; in + optional val "-T")) + + (mkChangedOptionModule + [ "services" "dnscrypt-proxy" "ephemeralKeys" ] + [ "services" "dnscrypt-proxy" "extraArgs" ] + (config: + let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in + optional val "-E")) ]; } From 540740598e6765e75a5f589928bb9b886f427341 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 10 Mar 2017 18:45:11 +0100 Subject: [PATCH 208/278] nixos/dnscrypt-proxy: add example of how to use the cache plugin --- nixos/modules/services/networking/dnscrypt-proxy.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 251097c160c7..d0fc0a79c60a 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -145,6 +145,7 @@ in See dnscrypt-proxy 8 for details. ''; + example = [ "-X libdcplugin_example_cache.so,--min-ttl=60" ]; }; }; }; From 472002f2164916f3271918aa0470fac205e94518 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 10 Mar 2017 14:20:30 +0100 Subject: [PATCH 209/278] nixos/dnscrypt-proxy: remove the resolverList option This option was initially added to make it easier to use an up-to-date list, but now that we always use an up-to-date list from upstream, there's no point to the option. From now on, you can either use a resolver listed by dnscrypt upstream or a custom resolver. --- .../services/networking/dnscrypt-proxy.nix | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index d0fc0a79c60a..2be86df9ece1 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -15,16 +15,13 @@ let }; # Internal flag indicating whether the upstream resolver list is used. - useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; + useUpstreamResolverList = cfg.customResolver == null; # The final local address. localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; # The final resolvers list path. - resolverList = - if (cfg.resolverList != null) - then cfg.resolverList - else "${stateDirectory}/dnscrypt-resolvers.csv"; + resolverList = "${stateDirectory}/dnscrypt-resolvers.csv"; # Build daemon command line @@ -88,19 +85,11 @@ in default = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' - The name of the upstream DNSCrypt resolver to use, taken from - ${resolverList}. The default resolver is - located in Holland, supports DNS security extensions, and - claims to not keep logs. - ''; - }; - - resolverList = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - List of DNSCrypt resolvers. The default is to use the list of - public resolvers provided by upstream. + The name of the DNSCrypt resolver to use, taken from + ${resolverList}. The default + resolver is located in Holland, supports DNS security + extensions, and claims to not + keep logs. ''; }; @@ -319,5 +308,10 @@ in (config: let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in optional val "-E")) + + (mkRemovedOptionModule [ "services" "dnscrypt-proxy" "resolverList" ] '' + The current resolver listing from upstream is always used + unless a custom resolver is specified. + '') ]; } From de15e7894b582efffceead81e437cd6992debb9f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 00:29:49 +0100 Subject: [PATCH 210/278] nixos/dnscrypt-proxy: get resolver list from github The list has disappeared from its ordinary location at download.dnscrypt.org. --- nixos/modules/services/networking/dnscrypt-proxy.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 2be86df9ece1..9183700a73dc 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -254,12 +254,12 @@ in path = with pkgs; [ curl diffutils dnscrypt-proxy minisign ]; script = '' cd ${stateDirectory} - domain=download.dnscrypt.org + domain=raw.githubusercontent.com get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)" $get -o dnscrypt-resolvers.csv.tmp \ - https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv + https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv $get -o dnscrypt-resolvers.csv.minisig.tmp \ - https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig + https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} minisign -q -V -p ${upstreamResolverListPubKey} \ -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig From f122f0147bb0275bc4cb3eb5d62bbdb3ac34349f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 00:52:20 +0100 Subject: [PATCH 211/278] nixos/dnscrypt-proxy: log resolver list verification failure Otherwise, the service unit just fails for no discernable reason. Verifcation failure is bad so it ought to be easily discoverable. --- nixos/modules/services/networking/dnscrypt-proxy.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 9183700a73dc..d382fa8c9cb2 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -261,8 +261,11 @@ in $get -o dnscrypt-resolvers.csv.minisig.tmp \ https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig mv dnscrypt-resolvers.csv.minisig{.tmp,} - minisign -q -V -p ${upstreamResolverListPubKey} \ - -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig + if ! minisign -q -V -p ${upstreamResolverListPubKey} \ + -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then + echo "failed to verify resolver list!" >&2 + exit 1 + fi [[ -f dnscrypt-resolvers.csv ]] && mv dnscrypt-resolvers.csv{,.old} mv dnscrypt-resolvers.csv{.tmp,} if cmp dnscrypt-resolvers.csv{,.old} ; then From 541b3ec1bc9357fd5c2ff9bcd96a82920f3316c1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 02:37:10 +0100 Subject: [PATCH 212/278] travis: send emails iff commit caused the build to start failing This setting should ensure that email notifications are sent *only* when the commit caused the build to start failing. That is, no more "the build is still failing" spam. As an alternative we could consider disabling email notifications outright and possibly enable IRC notifications instead. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 802af69834d0..bed82810d469 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,8 @@ matrix: env: global: - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f + +notifications: + email: + on_success: never + on_failure: change From 59b795c5901c0a60aa5dd973474e41520224a380 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 14 Mar 2017 22:36:21 -0400 Subject: [PATCH 213/278] apple-sdk: 10.9 -> 10.10 This is a slightly less ambitious version of the (now reverted) commit 377cef8d16c47df74d2653432d9bba968236c8a0, which had a bunch of issues that I don't have time to resolve right now. --- pkgs/os-specific/darwin/apple-sdk/default.nix | 24 +++++++++++++++---- .../darwin/apple-sdk/frameworks.nix | 3 +++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 1148fe5c4a16..19ae4569c1af 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,17 +1,30 @@ -{ stdenv, fetchurl, xar, gzip, cpio, pkgs }: +{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }: let + # TODO: make this available to other packages and generalize the unpacking a bit + # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d + # This isn't needed until we get to SDK 10.11, but that presents other challenges + # unpbzx = fetchurl { + # url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py"; + # sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc"; + # }; + # sadly needs to be exported because security_tool needs it sdk = stdenv.mkDerivation rec { - version = "10.9"; + version = "10.10"; name = "MacOS_SDK-${version}"; + # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.10.merged-1.sucatalog, which we found by: + # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version + # 2. In the resulting file, search for a file called DevSDK ending in .pkg + # 3. ??? + # 4. Profit src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg"; - sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; + url = "http://swcdn.apple.com/content/downloads/22/52/031-45139/hcjjv7cm4n6yqk56ict73qqw15ikm5iaql/DevSDK_OSX1010.pkg"; + sha256 = "08bxa93zw7r4vzs28j9giq2qyk3b68ky6jx1bb9850gflr3nvgq1"; }; - buildInputs = [ xar gzip cpio ]; + buildInputs = [ xar xz cpio python ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -114,6 +127,7 @@ let popd >/dev/null } + linkFramework "${name}.framework" ''; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index 9a3c3c556e3b..5475b6641707 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -52,6 +52,7 @@ with frameworks; with libs; { GSS = []; GameController = []; GameKit = [ Foundation ]; + Hypervisor = []; ICADevices = [ Carbon CF IOBluetooth ]; IMServicePlugIn = []; IOBluetoothUI = [ IOBluetooth ]; @@ -117,4 +118,6 @@ with frameworks; with libs; { OpenDirectory = []; Quartz = [ QuickLook QTKit ]; QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ]; + + vmnet = []; } From dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Tue, 14 Mar 2017 22:38:35 -0400 Subject: [PATCH 214/278] xhyve: update and fix to use our Hypervisor framework (this is a cherry-picked version of f3b65f67d98a2e67c739d4b76b3340eda1dd06f4, which got reverted because it depended on my 10.11 frameworks, which were flawed) --- .../virtualization/xhyve/default.nix | 20 ++++++++++++------- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index b7205ac000e2..c519784a6233 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }: stdenv.mkDerivation rec { - name = "xhyve-${version}"; - version = "0.2.0"; + name = "xhyve-${version}"; + version = "1f1dbe305"; src = fetchurl { - url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz"; - sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj"; + url = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz"; + sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx"; }; + buildInputs = [ Hypervisor vmnet xpc libobjc ]; + # Don't use git to determine version - buildFlags = '' - CFLAGS=-DVERSION=\"${version}\" + prePatch = '' + substituteInPlace Makefile \ + --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version" ''; + + makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ]; + installPhase = '' mkdir -p $out/bin cp build/xhyve $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a73c033c4ee..8879a1390afe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18148,7 +18148,11 @@ with pkgs; xcftools = callPackage ../tools/graphics/xcftools { }; - xhyve = callPackage ../applications/virtualization/xhyve { }; + xhyve = callPackage ../applications/virtualization/xhyve { + inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin) libobjc; + }; xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { }; From d546966d7db702c458e75b4ebab2ef2512bd2411 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Wed, 15 Mar 2017 17:22:35 +1300 Subject: [PATCH 215/278] entr: upgrade to 3.7 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 8ba92990b536..a68e2be6aebe 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "entr-${version}"; - version = "3.6"; + version = "3.7"; src = fetchurl { url = "http://entrproject.org/code/${name}.tar.gz"; - sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4"; + sha256 = "0bx2ivx9hwixjwmk7aqlx20mwmn3cvryppnmc285d7byiw6dbvwl"; }; postPatch = '' From 9e60a17cb82b4387832fd563892c8ee1639a99c8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 07:23:52 +0100 Subject: [PATCH 216/278] grsecurity: 4.9.14-201703121245 -> 4.9.15-201703150049 Contains a fix for the n_hdlc double free bug. --- 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 b10ef6a6a67d..540ec0e5699f 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.14"; + version = "4.9.15"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "0qc78s1j3mm03qs5m3dkc1ah9zchwdkmnkl1bl516dr9gy9i386all5c3f9bxniy8dd3lsk7bgfyqnigav1gyaki7vf9jh9ywqz58vd"; + sha512 = "3p0cfjfmq4r04w6bjyi2aphq171yavv9m06b29wjsglb1bbkyiy4v278r99cq913msmdp3xs0ba1rkc36qp7cv7hxc29pj0w06ajwls"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 25441c5a5d26..c3da24bdfac4 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.14"; - grrev = "201703121245"; - sha512 = "1h9d1vvfwxn8flzhbii7xd808cmhw8az895sk3fam2vjy5ls1mxvrmvw0z9nzx5sq2hgjg9adyz52y5nj2rza09n3m2gn4i7lid81hh"; + { kver = "4.9.15"; + grrev = "201703150049"; + sha512 = "1x02ncl94835n85kpp5bfvy6863sb482fw30x2pqszi4aivjc31i77vj135a7f508ni1b9rbbl8a0m3q4nb8gdbia75zcxbjdi9ij9m"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From c7669601505c46c695af7c6f6332f2f5a8ee3cb6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 8 Mar 2017 11:00:11 -0600 Subject: [PATCH 217/278] lit: init at 0.5 --- pkgs/development/tools/misc/lit/default.nix | 22 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/misc/lit/default.nix diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix new file mode 100644 index 000000000000..adc5ba967583 --- /dev/null +++ b/pkgs/development/tools/misc/lit/default.nix @@ -0,0 +1,22 @@ +{ lib, python2 }: + +python2.pkgs.buildPythonApplication rec { + pname = "lit"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = python2.pkgs.fetchPypi { + inherit pname version; + sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c"; + }; + + # Non-standard test suite. Needs custom checkPhase. + doCheck = false; + + meta = { + description = "Portable tool for executing LLVM and Clang style test suites"; + homepage = "http://llvm.org/docs/CommandGuide/lit.html"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a73c033c4ee..533d1c1e7da8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6586,6 +6586,8 @@ with pkgs; libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; + lit = callPackage ../development/tools/misc/lit { }; + lsof = callPackage ../development/tools/misc/lsof { }; ltrace = callPackage ../development/tools/misc/ltrace { }; From ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 15 Mar 2017 09:36:34 +0100 Subject: [PATCH 218/278] mpd: 0.20.5 -> 0.20.6 --- pkgs/servers/mpd/default.nix | 6 ++---- pkgs/servers/mpd/i386.patch | 14 -------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/servers/mpd/i386.patch diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 87a477ab057d..e3938ec71a84 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -33,17 +33,15 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "5"; + minor = "6"; in stdenv.mkDerivation rec { name = "mpd-${major}${if minor == "" then "" else "." + minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj"; + sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; }; - patches = [ ./i386.patch ]; - buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch deleted file mode 100644 index dca8ea88a8b5..000000000000 --- a/pkgs/servers/mpd/i386.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -index 6986453..167fc07 100644 ---- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx -+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx -@@ -20,8 +20,8 @@ - /* necessary because libavutil/common.h uses UINT64_C */ - #define __STDC_CONSTANT_MACROS - --#include "lib/ffmpeg/Time.hxx" - #include "config.h" -+#include "lib/ffmpeg/Time.hxx" - #include "FfmpegDecoderPlugin.hxx" - #include "lib/ffmpeg/Domain.hxx" - #include "lib/ffmpeg/Error.hxx" From 61f20c94ca8486071cfc1ed0216e7efa3a6079f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 15 Mar 2017 10:12:25 +0100 Subject: [PATCH 219/278] taskjuggler: remove 2.x series The version was released 8 years ago and does not build anymore --- .../misc/taskjuggler/2.x/default.nix | 76 ------------------- .../misc/taskjuggler/2.x/timezone-glibc.patch | 48 ------------ .../misc/taskjuggler/{3.x => }/Gemfile | 0 .../misc/taskjuggler/{3.x => }/Gemfile.lock | 0 .../misc/taskjuggler/{3.x => }/default.nix | 0 .../misc/taskjuggler/{3.x => }/gemset.nix | 0 pkgs/top-level/all-packages.nix | 8 +- 7 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/default.nix delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile (100%) rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile.lock (100%) rename pkgs/applications/misc/taskjuggler/{3.x => }/default.nix (100%) rename pkgs/applications/misc/taskjuggler/{3.x => }/gemset.nix (100%) diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix deleted file mode 100644 index 2a199843cb3b..000000000000 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{stdenv, fetchurl, -zlib, libpng, libjpeg, perl, expat, qt3, -libX11, libXext, libSM, libICE, -}: - -stdenv.mkDerivation rec { - name = "taskjuggler-2.4.3"; - src = fetchurl { - url = "http://www.taskjuggler.org/download/${name}.tar.bz2"; - sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl"; - }; - - buildInputs = - [zlib libpng libX11 libXext libSM libICE perl expat libjpeg] - ; - - patches = [ ./timezone-glibc.patch ]; - - preConfigure = '' - for i in $(grep -R "/bin/bash" . | sed 's/:.*//'); do - substituteInPlace $i --replace /bin/bash $(type -Pp bash) - done - for i in $(grep -R "/usr/bin/perl" . | sed 's/:.*//'); do - substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl - done - - # Fix install - for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do - # Do not use variable substitution because there is some text after the last '@' - substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/' - done - - # Comment because the ical export need the KDE support. - for i in Examples/FirstProject/AccountingSoftware.tjp; do - substituteInPlace $i --replace "icalreport" "# icalreport" - done - - for i in TestSuite/testdir TestSuite/createrefs \ - TestSuite/Scheduler/Correct/Expression.sh; do - substituteInPlace $i --replace '/bin/rm' 'rm' - done - - # Some tests require writing at $HOME - HOME=$TMPDIR - ''; - - configureFlags = " - --without-arts --disable-docs - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib - --with-qt-dir=${qt3} - "; - - preInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/ - ''; - - installFlags = - # kde_locale is not defined when installing without kde. - "kde_locale=\${out}/share/locale"; - - meta = { - homepage = "http://www.taskjuggler.org"; - license = stdenv.lib.licenses.gpl2; - description = "Project management tool"; - longDescription = '' - TaskJuggler is a modern and powerful, Open Source project management - tool. Its new approach to project planing and tracking is more - flexible and superior to the commonly used Gantt chart editing - tools. It has already been successfully used in many projects and - scales easily to projects with hundreds of resources and thousands of - tasks. - ''; - }; -} diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch deleted file mode 100644 index f599e8a1730c..000000000000 --- a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee - -From: Chris Schlaeger -Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100) -Subject: Try to fix time zone check for glibc 2.11. -X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda - -Try to fix time zone check for glibc 2.11. - -Reported-by: Lee ---- - -diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp -index 5e2bf21..9b7fce2 100644 ---- a/taskjuggler/Utility.cpp -+++ b/taskjuggler/Utility.cpp -@@ -206,16 +206,28 @@ setTimezone(const char* tZone) - - /* To validate the tZone value we call tzset(). It will convert the zone - * into a three-letter acronym in case the tZone value is good. If not, it -- * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back -- * to UTC. */ -+ * will -+ * - copy the wrong value to tzname[0] (glibc < 2.5) -+ * - or fall back to UTC (glibc >= 2.5 && < 2.11) -+ * - copy the part before the '/' to tzname[0] (glibc >= 2.11). -+ */ - tzset(); -+ char* region = new(char[strlen(tZone) + 1]); -+ region[0] = 0; -+ if (strchr(tZone, '/')) -+ { -+ strcpy(region, tZone); -+ *strchr(region, '/') = 0; -+ } - if (timezone2tz(tZone) == 0 && -- (strcmp(tzname[0], tZone) == 0 || -+ (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 || - (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0))) - { - UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone); -+ delete region; - return false; - } -+ delete region; - - if (!LtHashTab) - return true; diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile rename to pkgs/applications/misc/taskjuggler/Gemfile diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock rename to pkgs/applications/misc/taskjuggler/Gemfile.lock diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/default.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/default.nix rename to pkgs/applications/misc/taskjuggler/default.nix diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix similarity index 100% rename from pkgs/applications/misc/taskjuggler/3.x/gemset.nix rename to pkgs/applications/misc/taskjuggler/gemset.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35800184a5a..33459eb3ea5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4628,7 +4628,7 @@ with pkgs; yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; - + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; @@ -15486,11 +15486,7 @@ with pkgs; teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; - taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { }; - - taskjuggler = callPackage ../applications/misc/taskjuggler/3.x { - ruby = ruby_2_0; - }; + taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; }; tasknc = callPackage ../applications/misc/tasknc { }; From 1893ed54dc1ee7cef56be1c2ce7839c9523ba17e Mon Sep 17 00:00:00 2001 From: Mogria Date: Wed, 15 Mar 2017 11:32:44 +0100 Subject: [PATCH 220/278] sublime3: fix hardcoded /bin/bash when executing commands for build systems (#23561) * sublime3: replace hardcoded /bin/bash with /usr/bin/env exec.py in Default.package-sublime calls /bin/bash with subprocess. See Issue #12011. Because of this builds could not be started from withtin Sublime Text. * sublime3: use wrapped of bash to fix internal build system Without the wrapped version of bash (a symlink to $bash/bin/bash) with LD_PRELOAD to glibc an relocation error occurs when trying to run builds from within Sublime Text 3. See Issue #12011. --- .../applications/editors/sublime3/default.nix | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 8912aca0711d..0b8ecda62302 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu}: + gksuSupport ? false, gksu, unzip, zip, bash }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; @@ -33,6 +33,21 @@ in let dontPatchELF = true; buildInputs = [ makeWrapper ]; + # make exec.py in Default.sublime-package use own bash with + # an LD_PRELOAD instead of "/bin/bash" + patchPhase = '' + mkdir Default.sublime-package-fix + ( cd Default.sublime-package-fix + ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null + substituteInPlace "exec.py" --replace \ + "[\"/bin/bash\"" \ + "[\"$out/sublime_bash\"" + ) + ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null + mv Default.sublime-package.zip Packages/Default.sublime-package + rm -r Default.sublime-package-fix + ''; + buildPhase = '' for i in sublime_text plugin_host crash_reporter; do patchelf \ @@ -52,6 +67,12 @@ in let mkdir -p $out cp -prvd * $out/ + # We can't just call /usr/bin/env bash because a relocation error occurs + # when trying to run a build from within Sublime Text + ln -s ${bash}/bin/bash $out/sublime_bash + wrapProgram $out/sublime_bash \ + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + wrapProgram $out/sublime_text \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} From bb3ef8a95c9659596b8a34d27881cd30ffea2f9f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 11 Mar 2017 15:52:12 +0100 Subject: [PATCH 221/278] physlock: fix issue 21935 --- nixos/modules/services/security/physlock.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 34d0be3b1beb..0881483967c6 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -26,17 +26,7 @@ in This will switch to a new virtual terminal, turn off console switching and disable SysRq mechanism (when is set) - until the root or - password is given. - ''; - }; - - user = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - User whose password will be used to unlock the screen on par - with the root password. + until the root or user password is given. ''; }; @@ -105,7 +95,7 @@ in ++ cfg.lockOn.extraTargets; serviceConfig.Type = "forking"; script = '' - ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"} + ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"} ''; }; From bcc4c261bea58cbababec413c1faa074d1a90efd Mon Sep 17 00:00:00 2001 From: Volth Date: Tue, 14 Mar 2017 11:34:04 +0000 Subject: [PATCH 222/278] lxc: ensure directory /var/lib/lxc/rootfs --- nixos/modules/virtualisation/lxc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 6759ff0f2fe9..2310fe984325 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -71,6 +71,7 @@ in environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; environment.etc."lxc/default.conf".text = cfg.defaultConfig; + systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ]; security.apparmor.packages = [ pkgs.lxc ]; security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; From c037f54ffb3aa31ceb6cab975eda7e1a135c5b4f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 15 Mar 2017 08:46:19 -0300 Subject: [PATCH 223/278] firefox: fix debugBuild = true --- .../networking/browsers/firefox/default.nix | 4 + .../browsers/firefox/fix-debug.patch | 77 +++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/fix-debug.patch diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 68e3bf1b2022..71e8d056ebe9 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -30,6 +30,10 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { inherit sha512; }; + # this patch should no longer be needed in 53 + # from https://bugzilla.mozilla.org/show_bug.cgi?id=1013882 + patches = lib.optional debugBuild ./fix-debug.patch; + buildInputs = [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch new file mode 100644 index 000000000000..ba92bbc47403 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/fix-debug.patch @@ -0,0 +1,77 @@ + +# HG changeset patch +# User Michelangelo De Simone +# Date 1479198095 28800 +# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a +# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57 +Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau + +MozReview-Commit-ID: IEHesdoU4Sz + +diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in +--- a/b2g/installer/package-manifest.in ++++ b/b2g/installer/package-manifest.in +@@ -570,17 +570,17 @@ + @RESPATH@/components/InputMethod.manifest + #ifdef MOZ_B2G + @RESPATH@/components/inputmethod.xpt + #endif + + @RESPATH@/components/SystemUpdate.manifest + @RESPATH@/components/SystemUpdateManager.js + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; Modules + @RESPATH@/modules/* + +diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in +--- a/browser/installer/package-manifest.in ++++ b/browser/installer/package-manifest.in +@@ -554,17 +554,17 @@ + @RESPATH@/components/PresentationControlService.js + @RESPATH@/components/PresentationDataChannelSessionTransport.js + @RESPATH@/components/PresentationDataChannelSessionTransport.manifest + + ; InputMethod API + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; [Extensions] + @RESPATH@/components/extensions-toolkit.manifest + @RESPATH@/browser/components/extensions-browser.manifest +diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in +--- a/mobile/android/installer/package-manifest.in ++++ b/mobile/android/installer/package-manifest.in +@@ -381,17 +381,17 @@ + + @BINPATH@/components/CaptivePortalDetectComponents.manifest + @BINPATH@/components/captivedetect.js + + #ifdef MOZ_WEBSPEECH + @BINPATH@/components/dom_webspeechsynth.xpt + #endif + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @BINPATH@/components/TestInterfaceJS.js + @BINPATH@/components/TestInterfaceJS.manifest + @BINPATH@/components/TestInterfaceJSMaplike.js + #endif + + @BINPATH@/components/nsAsyncShutdown.manifest + @BINPATH@/components/nsAsyncShutdown.js + + From 1ea6860cc7352ad739c5a4ac2244c5895a60a21b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 15 Mar 2017 08:49:36 -0300 Subject: [PATCH 224/278] icu: fix crash in firefox Fixes #23857 --- pkgs/development/libraries/icu/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 1508f05db8b6..ea0919caa31f 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -3,6 +3,14 @@ let pname = "icu4c"; version = "58.2"; + + # this patch should no longer be needed in 58.3 + # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14 + keywordFix = fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -32,6 +40,7 @@ stdenv.mkDerivation ({ ''; postPatch = '' popd + patch -p4 < ${keywordFix} ''; patches = [ From e7dca2c2309389699d510f7df4183331d827ea4c Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Wed, 15 Mar 2017 22:41:20 +1000 Subject: [PATCH 225/278] ITK build on darwin --- pkgs/development/libraries/itk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index ae1f9996b78a..fab14e5d8b3c 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.itk.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } From 8d83fbe439c2a497acbfa67fd5c1758bf79f6136 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Wed, 15 Mar 2017 18:55:03 +0545 Subject: [PATCH 226/278] nomad: 0.5.4 -> 0.5.5 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index ae3415adef9a..1d39534bc16c 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.5.4"; + version = "0.5.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3"; + sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65"; }; meta = with stdenv.lib; { From 162845d5b159fbd1c53ec90e82c41464940df55e Mon Sep 17 00:00:00 2001 From: Andrzej Trzaska Date: Wed, 15 Mar 2017 15:55:45 +0100 Subject: [PATCH 227/278] Use gem 2.6.10 (#23902) --- pkgs/development/interpreters/ruby/rubygems-src.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index 7ea52185d77b..7658c303a1e9 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,6 +1,6 @@ { fetchurl -, version ? "2.6.8" -, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1" +, version ? "2.6.10" +, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0" }: fetchurl { url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; From d6c3e744259ad9e364c5f4d9072ce64f950f2dc3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 15 Mar 2017 11:00:55 -0400 Subject: [PATCH 228/278] buildGoModule: share the buildFlagsArray with the parallel subprocesses --- pkgs/development/go-modules/generic/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index c707592e4ae3..985b4c9b9db1 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -116,6 +116,7 @@ go.stdenv.mkDerivation ( local d; local cmd; cmd="$1" d="$2" + . $TMPDIR/buildFlagsArray echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 local OUT @@ -143,6 +144,11 @@ go.stdenv.mkDerivation ( fi } + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray + else + touch $TMPDIR/buildFlagsArray + fi export -f buildGoDir # parallel needs to see the function if [ -z "$enableParallelBuilding" ]; then export NIX_BUILD_CORES=1 From 0c928f4a1d645a5eea14f3940518ef9f0376f317 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 15 Mar 2017 11:01:09 -0400 Subject: [PATCH 229/278] terragrunt: Set the version variable properly --- pkgs/applications/networking/cluster/terragrunt/0.9.8.nix | 4 ++++ pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix index 54ca1a9d7d0f..ec13cbe35bca 100644 --- a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix +++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix @@ -17,6 +17,10 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") + ''; + postInstall = '' wrapProgram $bin/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e2641b2d6571..28fc7fcc6662 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") + ''; + postInstall = '' wrapProgram $bin/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform From d16b08ac85128c2a74cf21463987f4bab0f1dcab Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Wed, 15 Mar 2017 16:08:50 +0100 Subject: [PATCH 230/278] go2nix: 1.1.1 -> 1.2.0 --- pkgs/development/tools/go2nix/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 5a77ec7eaa6a..a6f5d62e29e3 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "1.1.1"; + version = "1.2.0"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,11 +12,13 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "1idxgn9yf8shw4mq4d7rhf8fvb2s1lli4r4ck0h8ddf1s9q8p63s"; + sha256 = "1hlanw56r1phj89sicpsfcz6sdjba9qjwhiblcsqka4wfqkai8pn"; }; goDeps = ./deps.nix; + outputs = [ "bin" "out" "man" ]; + buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; @@ -24,6 +26,9 @@ buildGoPackage rec { wrapProgram $bin/bin/go2nix \ --prefix PATH : ${nix-prefetch-git}/bin \ --prefix PATH : ${git}/bin + + mkdir -p $man/share/man/man1 + cp $src/go2nix.1 $man/share/man/man1 ''; allowGoReference = true; From a8cca7037e445915b5c58a582eae270e65065678 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 7 Mar 2017 22:59:57 +0100 Subject: [PATCH 231/278] prometheus-fritzbox-exporter: init at 1.0 --- nixos/modules/module-list.nix | 1 + .../prometheus/fritzbox-exporter.nix | 76 +++++++++++++++++++ .../prometheus/fritzbox-exporter.nix | 24 ++++++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 102 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix create mode 100644 pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c9f1fad0d0e9..627807edb900 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -329,6 +329,7 @@ ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/blackbox-exporter.nix + ./services/monitoring/prometheus/fritzbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix ./services/monitoring/prometheus/node-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix new file mode 100644 index 000000000000..6da39b6519cb --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix @@ -0,0 +1,76 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.fritzboxExporter; +in { + options = { + services.prometheus.fritzboxExporter = { + enable = mkEnableOption "prometheus fritzbox exporter"; + + port = mkOption { + type = types.int; + default = 9133; + description = '' + Port to listen on. + ''; + }; + + gatewayAddress = mkOption { + type = types.str; + default = "fritz.box"; + description = '' + The hostname or IP of the FRITZ!Box. + ''; + }; + + gatewayPort = mkOption { + type = types.int; + default = 49000; + description = '' + The port of the FRITZ!Box UPnP service. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the fritzbox exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-fritzbox-exporter = { + description = "Prometheus exporter for FRITZ!Box via UPnP"; + unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \ + -listen-address :${toString cfg.port} \ + -gateway-address ${cfg.gatewayAddress} \ + -gateway-port ${toString cfg.gatewayPort} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix new file mode 100644 index 000000000000..2e7a4932de62 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "fritzbox-exporter-${version}"; + version = "1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/ndecker/fritzbox_exporter"; + + src= fetchFromGitHub { + inherit rev; + owner = "ndecker"; + repo = "fritzbox_exporter"; + sha256 = "1qk3dgxxz3cnz52jzz0yvfkrkk4s5kdhc26nbfgdpn0ifzqj0awr"; + }; + + meta = with stdenv.lib; { + description = "FRITZ!Box UPnP statistics exporter for prometheus"; + homepage = https://github.com/ndecker/fritzbox_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ bachp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 557f05b2577d..07df54e9341f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10808,6 +10808,7 @@ with pkgs; 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-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; From 6505c6e3df519bbf800f302e9ba14923b9dabee5 Mon Sep 17 00:00:00 2001 From: Leon Isenberg Date: Fri, 10 Mar 2017 16:36:36 +0100 Subject: [PATCH 232/278] keepass-keeagent: init at 0.8.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: change fetchurl indent 4 -> 2 spaces.] --- .../misc/keepass-plugins/keeagent/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/misc/keepass-plugins/keeagent/default.nix diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix new file mode 100644 index 000000000000..cd83d2a44e1d --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildEnv, fetchzip, mono }: + +let + version = "0.8.1"; + drv = stdenv.mkDerivation { + name = "keeagent-${version}"; + + src = fetchzip { + url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; + sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + stripRoot = false; + }; + + meta = { + description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; + homepage = http://lechnology.com/software/keeagent; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2; + maintainers = [ ]; + }; + + pluginFilename = "KeeAgent.plgx"; + + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + ''; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07df54e9341f..f55fc5f54a6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13425,6 +13425,8 @@ with pkgs; keepass = callPackage ../applications/misc/keepass { }; + keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; + keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; From 12648a455bd9d7755b635f0732ce402590e1bd6f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 20:02:29 +0100 Subject: [PATCH 233/278] linux_4_9: 4.9.14 -> 4.9.15 --- 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 2327c882f2d0..18ac6b41c8cb 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.14"; + version = "4.9.15"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h5nnf9h00fsd7q66rapvwmfxs4pi0vjljk92ir5vid59hzk8kak"; + sha256 = "14sfacaqkk9c66zrl8wkmy5331hczgz5j65yms6pnpwwi82sq3c2"; }; kernelPatches = args.kernelPatches; From 331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 15:16:32 -0400 Subject: [PATCH 234/278] go1.4: patch test to work with recent tzdata --- pkgs/development/compilers/go/1.4.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index b703a92f3ea5..f60077e89621 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross +{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross , pkgconfig , pcre , Security }: @@ -114,6 +114,13 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch ./creds-test-1.4.patch + + # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch + # actually works on old versions too. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; From 08314598bb938682049fc5753da13648141c0230 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 15:16:39 -0400 Subject: [PATCH 235/278] go1.6: patch test to work with recent tzdata --- pkgs/development/compilers/go/1.6.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 7d78f5efd104..52ffbab6dcb8 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.5.patch ./creds-test.patch + + # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch + # actually works on old versions too. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; From e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 15:16:45 -0400 Subject: [PATCH 236/278] go1.7: patch test to work with recent tzdata --- pkgs/development/compilers/go/1.7.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 0df2e8d6f7e9..7fa35e1fcacb 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -107,6 +107,13 @@ stdenv.mkDerivation rec { [ ./remove-tools-1.7.patch ./cacert-1.7.patch ./creds-test.patch + + # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch + # actually works on old versions too. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; From 2ffda66f11bfd7f12271ac44ac7010148f73a085 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 15:16:59 -0400 Subject: [PATCH 237/278] go1.8: patch test to work with recent tzdata --- pkgs/development/compilers/go/1.8.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 00ec11abc47b..6d9ee3de5501 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -80,11 +80,6 @@ stdenv.mkDerivation rec { '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + optionalString stdenv.isDarwin '' - - # Disabling `format_test.go` because it fails on Darwin for an - # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727 - rm src/time/format_test.go - substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -115,6 +110,13 @@ stdenv.mkDerivation rec { ./cacert-1.8.patch ./creds-test.patch ./remove-test-pie-1.8.patch + + # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch + # works fine here for now. + (fetchpatch { + url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; + sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; + }) ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; From 77b7b7df33e05d5cf238b0e0a0fd73b7c48d27fa Mon Sep 17 00:00:00 2001 From: edanaher Date: Wed, 15 Mar 2017 16:20:25 -0400 Subject: [PATCH 238/278] bup: 0.28.1 -> 0.29 (#23876) --- pkgs/tools/backup/bup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4e035ab67acb..baf9e4f4e394 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.28.1"; in +let version = "0.29"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; + sha256 = "1cc9kpq9bpln89m4ni6wqzh4c8zwxmgnhaibdxxfs5pk2mpl3ds5"; }; buildInputs = [ git python2Packages.python ]; From 376d960034d90c33b9a59db168151b18ccb8bdc5 Mon Sep 17 00:00:00 2001 From: Andrzej Trzaska Date: Wed, 15 Mar 2017 21:34:35 +0100 Subject: [PATCH 239/278] bundler: 1.14.4 -> 1.14.6 (#23930) --- 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 f3737afdb222..9251c4d2a415 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.4"; - sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv"; + version = "1.14.6"; + sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl"; dontPatchShebangs = true; postFixup = '' From 0cfa1b0ddeb5fb4083eea532ea9eccfbc4ad9d98 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 16:37:48 -0400 Subject: [PATCH 240/278] openjdk-darwin: use a sensible crypto policy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should really move to a source build of openjdk on Darwin, but that's tricky so for now we continue to hack around it and do stuff like this, even though crypto export polices are stupid and make no sense. No, I'm not bitter at all that I need to do this 😩 --- pkgs/development/compilers/openjdk-darwin/8.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 1d12d59998a1..2f3391f70e0d 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -1,10 +1,16 @@ { stdenv, fetchurl, unzip, setJavaClassPath, freetype }: let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + jdk = stdenv.mkDerivation { name = "zulu1.8.0_66-8.11.0.1"; src = fetchurl { - url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip; + url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip"; sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; }; @@ -15,6 +21,9 @@ let mkdir -p $out mv * $out + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/ + # jni.h expects jni_md.h to be in the header search path. ln -s $out/include/darwin/*_md.h $out/include/ ''; From 18a272ef756ee6901cce4726e97a9ddb495b15ad Mon Sep 17 00:00:00 2001 From: Sergii Paryzhskyi Date: Wed, 15 Mar 2017 22:17:23 +0100 Subject: [PATCH 241/278] sbt-0.12.4: add an older stable version (#23933) --- lib/maintainers.nix | 1 + .../tools/build-managers/sbt/0.12.4.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/build-managers/sbt/0.12.4.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e7b8ff7bf101..a44f93e36cfa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -204,6 +204,7 @@ havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; + heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; diff --git a/pkgs/development/tools/build-managers/sbt/0.12.4.nix b/pkgs/development/tools/build-managers/sbt/0.12.4.nix new file mode 100644 index 000000000000..9c02fcd0b3fb --- /dev/null +++ b/pkgs/development/tools/build-managers/sbt/0.12.4.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, jre }: + +stdenv.mkDerivation rec { + name = "sbt-${version}"; + version = "0.12.14"; + + src = fetchurl { + url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; + sha256 = "5907af5a3db5e9090024c91e8b6189cd2143841b08c4688542a2efbc9023ac1a"; + }; + + patchPhase = '' + echo -java-home ${jre.home} >>conf/sbtopts + ''; + + installPhase = '' + mkdir -p $out/share/sbt $out/bin + cp -ra . $out/share/sbt + ln -s $out/share/sbt/bin/sbt $out/bin/ + ''; + + meta = with stdenv.lib; { + homepage = http://www.scala-sbt.org/; + license = licenses.bsd3; + description = "A build tool for Scala, Java and more"; + maintainers = with maintainers; [ heel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f55fc5f54a6a..b18c0e7f1375 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4634,7 +4634,7 @@ with pkgs; yaft = callPackage ../applications/misc/yaft { }; yarn = callPackage ../development/tools/yarn { }; - + yasr = callPackage ../applications/audio/yasr { }; yank = callPackage ../tools/misc/yank { }; @@ -6765,6 +6765,7 @@ with pkgs; scons = callPackage ../development/tools/build-managers/scons { }; + sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { }; sbt = callPackage ../development/tools/build-managers/sbt { }; simpleBuildTool = sbt; From eba3900781ef0abd0a8eb478820280851d1e0fbb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 Mar 2017 20:04:40 +0000 Subject: [PATCH 242/278] ocamlPackages.rresult: init at 0.5.0 Rresult is an OCaml module for handling computation results and errors in an explicit and declarative manner without resorting to exceptions. Homepage: http://erratique.ch/software/rresult --- .../ocaml-modules/rresult/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/rresult/default.nix diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix new file mode 100644 index 000000000000..f9951b56da2d --- /dev/null +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-rresult-${version}"; + version = "0.5.0"; + src = fetchurl { + url = "http://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; + sha256 = "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild topkg opam ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + license = stdenv.lib.licenses.isc; + homepage = http://erratique.ch/software/rresult; + description = "Result value combinators for OCaml"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 2a59dbd3293f..aeef0a2859bb 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -494,6 +494,8 @@ let re = callPackage ../development/ocaml-modules/re { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; + safepass = callPackage ../development/ocaml-modules/safepass { }; sedlex = callPackage ../development/ocaml-modules/sedlex { }; From a1ea2879f82f5836948cd65d3e37d0c3c71a2055 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 15 Mar 2017 16:35:49 -0500 Subject: [PATCH 243/278] libdiscid: 0.6.1 -> 0.6.2 --- pkgs/development/libraries/libdiscid/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index d0122d0283c5..c5da3816c41c 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libdiscid-0.6.1"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + name = "libdiscid-${version}"; + version = "0.6.2"; + nativeBuildInputs = [ cmake pkgconfig ]; + src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; - sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc"; + sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; meta = with stdenv.lib; { From 3c57a37c55f35bbd9107c072e052781869f138fc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 15 Mar 2017 23:44:25 +0200 Subject: [PATCH 244/278] sbt_0_12_4: Fix eval --- 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 b18c0e7f1375..b36db750d62f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6765,8 +6765,8 @@ with pkgs; scons = callPackage ../development/tools/build-managers/scons { }; - sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { }; sbt = callPackage ../development/tools/build-managers/sbt { }; + sbt_0_12_4 = callPackage ../development/tools/build-managers/sbt/0.12.4.nix { }; simpleBuildTool = sbt; shards = callPackage ../development/tools/build-managers/shards { }; From ef56873e981bf919046c210f8ae44254885409ee Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Wed, 15 Mar 2017 10:33:32 +0800 Subject: [PATCH 245/278] emem: 0.2.35 -> 0.2.39 --- pkgs/applications/misc/emem/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 76f2f03d159f..3b0ac2e54c80 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.35"; + version = "0.2.39"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0y1jwfmqmmff3kh82j07p9j0l2hc7dxhy8vij4lz8wrv6pnxng7f"; + sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p"; }; buildInputs = [ ]; @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { phases = [ "buildPhase" "installPhase" ]; buildPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/java + mkdir -p $out/bin $out/share/java ''; installPhase = '' From 545e267adfc796bcceeb5c6702075fb2890cabe2 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 16 Mar 2017 00:53:32 +0300 Subject: [PATCH 246/278] wireshark-gtk: wrap properly --- .../networking/sniffers/wireshark/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index fd709aa76603..375a948c1f20 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , libssh, zlib, cmake, extra-cmake-modules -, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -23,11 +23,15 @@ in stdenv.mkDerivation { sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; }; + nativeBuildInputs = [ + bison cmake extra-cmake-modules flex + ] ++ optional withGtk wrapGAppsHook; + buildInputs = [ - bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls - geoip c-ares python glib zlib - ] ++ (optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])) - ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ]) + gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt + libgpgerror gnutls geoip c-ares python glib zlib + ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; From cfc7a1877a1ff969e6d1dd18af74b467c3c6b5df Mon Sep 17 00:00:00 2001 From: Christopher League Date: Thu, 9 Mar 2017 14:35:37 -0500 Subject: [PATCH 247/278] clips: init at 6.30 CLIPS is a language for building expert systems. --- .../interpreters/clips/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/interpreters/clips/default.nix diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix new file mode 100644 index 000000000000..cf923d409172 --- /dev/null +++ b/pkgs/development/interpreters/clips/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "6.30"; + name = "clips-${version}"; + src = fetchurl { + url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z"; + sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy"; + }; + buildPhase = '' + make -C core -f ../makefiles/makefile.gcc + ''; + installPhase = '' + install -D -t $out/bin core/clips + ''; + meta = with stdenv.lib; { + description = "A Tool for Building Expert Systems"; + homepage = "http://www.clipsrules.net/"; + longDescription = '' + Developed at NASA's Johnson Space Center from 1985 to 1996, + CLIPS is a rule-based programming language useful for creating + expert systems and other programs where a heuristic solution is + easier to implement and maintain than an algorithmic solution. + ''; + license = licenses.publicDomain; + maintainers = [maintainers.league]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36db750d62f..2f0ffdd7de2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5656,6 +5656,8 @@ with pkgs; ceptre = callPackage ../development/interpreters/ceptre { }; + clips = callPackage ../development/interpreters/clips { }; + clisp = callPackage ../development/interpreters/clisp { }; clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { }; From a8f269d014dde1eb60d81d0153602a204f95ff28 Mon Sep 17 00:00:00 2001 From: NWDD Date: Thu, 9 Mar 2017 23:09:06 +0100 Subject: [PATCH 248/278] gitkraken: 2.1.0 -> 2.2.0 also added myself as a maintainer --- pkgs/applications/version-management/gitkraken/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 70ca7a74b236..28d89fb32d04 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.tar.gz"; - sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999"; + sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ xnwdd ]; }; } From 9b0a175af9639b062fdbd7fcf6b00d38db81b902 Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Thu, 16 Mar 2017 06:52:19 +0800 Subject: [PATCH 249/278] emem: 0.2.40 -> 0.2.41 --- pkgs/applications/misc/emem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 3b0ac2e54c80..f748318407a3 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.39"; + version = "0.2.41"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p"; + sha256 = "0pg7m4fyrcbm8d5nj96xvvh1cvml501rw34hniqq384waifr2kqs"; }; buildInputs = [ ]; From a89e9e999b7d88f3e08e4c70cb31beac712068ba Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 15 Mar 2017 18:19:11 -0500 Subject: [PATCH 250/278] libextractor: 1.2 -> 1.3 --- pkgs/development/libraries/libextractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6f1981d0ece7..0f21180f691c 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.2"; + name = "libextractor-1.3"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"; + sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6"; }; preConfigure = From 00addcb95e67ea9e6c2a6429216233a9fa96b45d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Mar 2017 00:43:58 +0100 Subject: [PATCH 251/278] pythonPackages.python-jose: init at 1.3.2 --- .../python-modules/python-jose/default.nix | 29 +++++++++++++++ .../python-jose/pycryptodome.patch | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 +- 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/python-jose/default.nix create mode 100644 pkgs/development/python-modules/python-jose/pycryptodome.patch diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix new file mode 100644 index 000000000000..da4dd4107461 --- /dev/null +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, future, six, ecdsa, pycryptodome, pytest +}: + +buildPythonPackage rec { + name = "python-jose-${version}"; + version = "1.3.2"; + src = fetchFromGitHub { + owner = "mpdavis"; + repo = "python-jose"; + rev = version; + sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv"; + }; + + buildInputs = [ pytest ]; + checkPhase = "py.test ."; + patches = [ + # to use pycryptodme instead of pycrypto + ./pycryptodome.patch + ]; + propagatedBuildInputs = [ future six ecdsa pycryptodome ]; + meta = with stdenv.lib; { + homepage = "https://github.com/mpdavis/python-jose"; + description = "A JOSE implementation in Python"; + platforms = platforms.all; + license = licenses.mit; + maintainers = [ maintainers.jhhuh ]; + }; +} diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch new file mode 100644 index 000000000000..665ad5980343 --- /dev/null +++ b/pkgs/development/python-modules/python-jose/pycryptodome.patch @@ -0,0 +1,37 @@ +diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt +--- python-jose-1.3.2/requirements.txt 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/requirements.txt 2017-03-15 11:35:47.118001810 +0100 +@@ -1,3 +1,3 @@ +-pycrypto ++pycryptodome + six + future +diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py +--- python-jose-1.3.2/setup.py 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/setup.py 2017-03-15 11:37:15.725077184 +0100 +@@ -25,12 +25,8 @@ + + + def get_install_requires(): +- if platform.python_implementation() == 'PyPy': +- crypto_lib = 'pycryptodome >=3.3.1, <3.4.0' +- else: +- crypto_lib = 'pycrypto >=2.6.0, <2.7.0' + return [ +- crypto_lib, ++ 'pycryptodome >=3.3.1, <3.5.0', + 'six <2.0', + 'ecdsa <1.0', + 'future <1.0', +diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini +--- python-jose-1.3.2/tox.ini 2016-09-05 15:13:49.000000000 +0200 ++++ python-jose-1.3.2.new/tox.ini 2017-03-15 11:36:50.423055657 +0100 +@@ -6,7 +6,7 @@ + py.test --cov-report term-missing --cov jose + deps = + future +- pycrypto ++ pycryptodome + ecdsa + pytest + pytest-cov diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99a797ea509a..9be1e5d38ab4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5063,6 +5063,8 @@ in { }; }; + python-jose = callPackage ../development/python-modules/python-jose {}; + pyhepmc = buildPythonPackage rec { name = "pyhepmc-${version}"; version = "0.5.0"; @@ -19725,7 +19727,6 @@ in { }; }; - Babel = buildPythonPackage (rec { name = "Babel-2.3.4"; From 09cfbc8cc33bb00c14bede0ee8f941200d0c69be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Mar 2017 00:48:34 +0100 Subject: [PATCH 252/278] PyGithub: init at 1.32 --- .../python-modules/pyGithub/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pyGithub/default.nix diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix new file mode 100644 index 000000000000..75fb75f93185 --- /dev/null +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub +, cacert +, buildPythonPackage, python-jose }: + +buildPythonPackage rec { + name = "PyGithub-${version}"; + version = "1.32"; + + src = fetchFromGitHub { + owner = "PyGithub"; + repo = "PyGithub"; + rev = "v${version}"; + sha256 = "15dr9ja63zdxax9lg6q2kcakqa82dpffyhgpjr13wq3sfkcy5pdw"; + }; + + postPatch = '' + # requires network + echo "" > github/tests/Issue142.py + ''; + propagatedBuildInputs = [ python-jose ]; + meta = with stdenv.lib; { + homepage = "https://github.com/PyGithub/PyGithub"; + description = "A Python (2 and 3) library to access the GitHub API v3"; + platforms = platforms.all; + license = licenses.gpl3; + maintainers = with maintainers; [ jhhuh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9be1e5d38ab4..8f7fe7a872e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20339,6 +20339,8 @@ in { }; }; + PyGithub = callPackage ../development/python-modules/pyGithub {}; + pyglet = buildPythonPackage rec { name = "pyglet-${version}"; version = "1.2.4"; From 26045faaaf3d6893518b329de1b8cb0c2f2673e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Mar 2017 00:57:09 +0100 Subject: [PATCH 253/278] cligh: init at 0.3 fixes #23914 --- .../tools/github/cligh/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/github/cligh/default.nix diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix new file mode 100644 index 000000000000..09df42b2a45b --- /dev/null +++ b/pkgs/development/tools/github/cligh/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +buildPythonApplication rec { + name = "cligh-${version}"; + version = "0.3"; + + doCheck = false; # no tests + + src = fetchFromGitHub { + owner = "CMB"; + repo = "cligh"; + rev = "v${version}"; + sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ]; + + meta = with stdenv.lib; { + homepage = "http://the-brannons.com/software/cligh.html"; + description = "A simple command-line interface to the facilities of Github"; + longDescription = '' + Cligh is a simple command-line interface to the facilities of GitHub. + It is written by Christopher Brannon chris@the-brannons.com. The + current version is 0.3, released July 23, 2016. This program is still + in the early stage of development. It is by no means feature-complete. + A friend and I consider it useful, but others may not. + ''; + platforms = platforms.all; + license = licenses.bsd3; + maintainers = [ maintainers.jhhuh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f0ffdd7de2f..7e87d92ec3b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12960,6 +12960,8 @@ with pkgs; clfswm = callPackage ../applications/window-managers/clfswm { }; + cligh = callPackage ../development/tools/github/cligh {}; + clipgrab = callPackage ../applications/video/clipgrab { }; clipit = callPackage ../applications/misc/clipit { }; From bf5dc90f304b6dd047a031cd097ada3bc242b7e0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Mar 2017 09:59:08 +0800 Subject: [PATCH 254/278] keybase: 20170209 -> 1.0.20 --- pkgs/tools/security/keybase/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index b962a6409b45..5d212c0b80f5 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "20170209.17b641d"; + version = "1.0.20"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -10,10 +10,10 @@ buildGoPackage rec { dontRenameImports = true; src = fetchFromGitHub { - owner = "keybase"; - repo = "client"; - rev = "17b641de629a85ad77621d0efa3e2442661b5ee7"; - sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11"; + owner = "keybase"; + repo = "client"; + rev = "v${version}"; + sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v"; }; buildFlags = [ "-tags production" ]; From e3abe9c6faf2b65717867a3ec966667d9e83bfa7 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 15 Mar 2017 22:20:17 -0400 Subject: [PATCH 255/278] pythonPackages.pants13-pre: init --- pkgs/top-level/python-packages.nix | 39 ++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f7fe7a872e9..2c71d0dfa178 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8562,9 +8562,44 @@ in { meta = { description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; - license = licenses.asl20; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; + }; + + pants13-pre = buildPythonPackage rec { + pname = "pantsbuild.pants"; + version = "1.3.0.dev13"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "0gnz0f74s53xccfdn78v2dg1m3gx2mm0pdmmjvs5ikfbb9lidhz4"; + }; + + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py + ''; + + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; + + propagatedBuildInputs = with self; [ + twitter-common-collections setproctitle setuptools six ansicolors + packaging pathspec scandir twitter-common-dirutil psutil requests2 + pystache pex docutils markdown pygments twitter-common-confluence + fasteners coverage pywatchman futures cffi + ]; + + meta = { + description = "A build system for software projects in a variety of languages"; + homepage = "http://www.pantsbuild.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; }; }; From f60fec99d19f0f2181661d65f73aca3a85ca81c4 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Wed, 8 Mar 2017 04:45:22 -0800 Subject: [PATCH 256/278] SDL2_mixer: add optional fluidsynth support also add flac support and mp3 support, and add myself as the maintainer, since there is no current maintainer for this package --- pkgs/development/libraries/SDL2_mixer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 0919970543c5..9fef76c799b9 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; - propagatedBuildInputs = [ SDL2 libogg libvorbis ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ]; configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.linux; homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; } From 49c18cc75d394c57acffa594b170d36014a88b3a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Mar 2017 07:11:33 +0000 Subject: [PATCH 257/278] ocamlPackages.bos: init at 0.1.4 Bos provides support for basic and robust interaction with the operating system in OCaml. Homepage: http://erratique.ch/software/bos --- .../development/ocaml-modules/bos/default.nix | 27 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bos/default.nix diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix new file mode 100644 index 000000000000..eb1e8d15feab --- /dev/null +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg +, astring, fmt, fpath, logs, rresult +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-bos-${version}"; + version = "0.1.4"; + src = fetchurl { + url = "http://erratique.ch/software/bos/releases/bos-${version}.tbz"; + sha256 = "1ly66lysk4w6mdy4k1n3ynlpfpq7lw4wshcpzgx58v6x613w5s7q"; + }; + + unpackCmd = "tar xjf $src"; + + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + propagatedBuildInputs = [ astring fmt fpath logs rresult ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Basic OS interaction for OCaml"; + homepage = http://erratique.ch/software/bos; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aeef0a2859bb..43cd2e22e4e3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -53,6 +53,8 @@ let bolt = callPackage ../development/ocaml-modules/bolt { }; + bos = callPackage ../development/ocaml-modules/bos { }; + bitstring = if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/bitstring { } From 1ae9a7911ca7ca06be7d776621acd253f6c816b2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 16 Mar 2017 11:06:30 +0100 Subject: [PATCH 258/278] cligh: fix evaluation --- pkgs/development/tools/github/cligh/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 09df42b2a45b..ded0aaa92424 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "cligh-${version}"; version = "0.3"; From aca073eb3a701358c5f75d9d2a502942a5eea781 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Mar 2017 18:09:13 +0800 Subject: [PATCH 259/278] pytest-catchlog: init at 1.2.2 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c71d0dfa178..3f13e9abeddf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5140,6 +5140,24 @@ in { }; }; + pytest-catchlog = buildPythonPackage rec { + name = "pytest-catchlog-1.2.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/pytest-catchlog/${name}.zip"; + sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab"; + }; + + buildInputs = with self; [ pytest ]; + + checkPhase = "make test"; + + meta = { + license = licenses.mit; + website = https://pypi.python.org/pypi/pytest-catchlog/; + description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; + }; + }; + pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; pytest-fixture-config = buildPythonPackage rec { From 99c7aa45e762e4ef9a56a11ab10e961ec8874aff Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 16 Mar 2017 18:12:19 +0800 Subject: [PATCH 260/278] s3ql: 2.17.1 -> 2.21 --- pkgs/tools/backup/s3ql/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 9b2adc1d39f9..a90738d39a4c 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -1,17 +1,29 @@ -{ stdenv, fetchurl, python3Packages, sqlite }: +{ stdenv, fetchurl, python3Packages, sqlite, which }: python3Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "s3ql"; - version = "2.17.1"; + version = "2.21"; src = fetchurl { url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2"; - sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx"; + sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d"; }; - propagatedBuildInputs = with python3Packages; - [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ]; + buildInputs = [ which ]; # tests will fail without which + propagatedBuildInputs = with python3Packages; [ + sqlite apsw pycrypto requests2 defusedxml dugong llfuse + cython pytest pytest-catchlog + ]; + + preBuild = '' + # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851 + ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace + ''; + + checkPhase = '' + pytest tests + ''; meta = with stdenv.lib; { description = "A full-featured file system for online data storage"; From 9bd988eb0f4c4aaa2c89d9898a846edb0dc9aa80 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 10 Mar 2017 20:46:22 +1100 Subject: [PATCH 261/278] sipp: 3.4-beta2 -> 3.5.1 fixes #23945 --- pkgs/development/tools/misc/sipp/default.nix | 33 ++++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 266a9824ed2a..a506831cd8ea 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,28 +1,41 @@ -{stdenv, fetchurl, ncurses, libpcap }: +{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }: stdenv.mkDerivation rec { - - version = "3.4-beta2"; + version = "3.5.1"; name = "sipp-${version}"; - src = fetchurl { - url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz"; - sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv"; + src = fetchFromGitHub { + owner = "SIPp"; + repo = "sipp"; + rev = "v${version}"; + sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k"; }; - configurePhase = '' - export ac_cv_lib_curses_initscr=yes - export ac_cv_lib_pthread_pthread_mutex_init=yes + patchPhase = '' sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp - ./configure --prefix=$out --with-pcap + sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac + echo "#define SIPP_VERSION \"v${version}\"" > include/version.h ''; + configureFlags = [ + "--with-pcap" + ]; + postInstall = '' mkdir -pv $out/share/pcap cp pcap/* $out/share/pcap ''; buildInputs = [ncurses libpcap]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = http://sipp.sf.net; + description = "The SIPp testing tool"; + license = licenses.gpl3; + platforms = platforms.unix; + }; } From df3044cb2e7f01d5535700b173f61511805c44b8 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Thu, 16 Mar 2017 11:57:19 +0100 Subject: [PATCH 262/278] chromium: flashplayer: 24.0.0.221 -> 25.0.0.127 [Critical security fix] https://github.com/NixOS/nixpkgs/pull/23889 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 02b7ec34cfcd..f202aee38283 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "24.0.0.221"; + version = "25.0.0.127"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80"; + sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14"; stripRoot = false; }; From 645c2189d14ee95d22efb08e42a2bb3ca7e74a04 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 16 Mar 2017 12:39:43 +0100 Subject: [PATCH 263/278] pythonPackages.pytest-django: unpin setuptools_scm - unpin setuptools_scm - move to file in folder following guidelines - use PyPI/upstream name --- .../{pytestdjango.nix => pytest-django/default.nix} | 12 ++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) rename pkgs/development/python-modules/{pytestdjango.nix => pytest-django/default.nix} (64%) diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytest-django/default.nix similarity index 64% rename from pkgs/development/python-modules/pytestdjango.nix rename to pkgs/development/python-modules/pytest-django/default.nix index 5a8dd85f4bdb..48a5c043841a 100644 --- a/pkgs/development/python-modules/pytestdjango.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,5 +1,6 @@ { stdenv, buildPythonPackage, fetchurl , pytest, django, setuptools_scm +, fetchpatch }: buildPythonPackage rec { name = "pytest-django-${version}"; @@ -13,6 +14,17 @@ buildPythonPackage rec { buildInputs = [ pytest setuptools_scm ]; propagatedBuildInputs = [ django ]; + patches = [ + # Unpin setuptools-scm + (fetchpatch { + url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; + sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp"; + }) + ]; + + # Complicated. Requires Django setup. + doCheck = false; + meta = with stdenv.lib; { description = "py.test plugin for testing of Django applications"; homepage = http://pytest-django.readthedocs.org/en/latest/; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3f13e9abeddf..97dab697081d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5158,7 +5158,7 @@ in { }; }; - pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { }; + pytest-django = callPackage ../development/python-modules/pytest-django { }; pytest-fixture-config = buildPythonPackage rec { name = "${pname}-${version}"; From 4f531a1d2baf41bdee13d65d6479315ce18a3818 Mon Sep 17 00:00:00 2001 From: rbasso Date: Thu, 16 Mar 2017 12:56:55 +0900 Subject: [PATCH 264/278] sc-im: 0.4.0 -> 0.5.0 - Bump version to 0.5.0 - Enable support for reading '.xls' and '.xlsx' files. The support for reading Excel files depends on: - libxml2, which was already a build input. - libzip - libxls --- pkgs/applications/misc/sc-im/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 75d08ec81883..6d9e1c9fcf23 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }: +{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: stdenv.mkDerivation rec { - version = "0.4.0"; + version = "0.5.0"; name = "sc-im-${version}"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0"; + sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61"; }; - buildInputs = [ yacc ncurses libxml2 pkgconfig ]; + buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ]; buildPhase = '' cd src - sed -i "s,prefix=/usr,prefix=$out," Makefile - sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile + sed -e "\|^prefix = /usr/local| s|/usr/local|$out|" \ + -e "\|^#LDLIBS += -lxlsreader| s|^#|| " \ + -e "\|^#CFLAGS += -DXLS| s|^#|| " \ + -i Makefile make export DESTDIR=$out From a17e8e7e72de66bf62108f63348751f86a653d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 16 Mar 2017 15:13:04 +0100 Subject: [PATCH 265/278] servant-auth-server, servant-swagger: enable hydra build --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cab70ea6f6d7..b693a55de55f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2248,7 +2248,6 @@ extra-packages: - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - - servant-auth-server < 0.2.2.0 # https://github.com/plow-technologies/servant-auth/issues/25 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -7302,8 +7301,6 @@ dont-distribute-packages: servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] - servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] From 504b596e5558316240f19711909b0873f820cf7d Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 16 Mar 2017 11:01:02 -0400 Subject: [PATCH 266/278] pythonPackages.pathspec_0_5: init The pre-release version of pants needs it. I'll kill the duplicated copy once the new version of pants is final. --- pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97dab697081d..e2fb54ede583 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8607,7 +8607,7 @@ in { propagatedBuildInputs = with self; [ twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec scandir twitter-common-dirutil psutil requests2 + packaging pathspec_0_5 scandir twitter-common-dirutil psutil requests2 pystache pex docutils markdown pygments twitter-common-confluence fasteners coverage pywatchman futures cffi ]; @@ -8656,6 +8656,7 @@ in { }; }; + # Get rid of this when pants 1.3.0 is released and make 0.5 the default pathspec = buildPythonPackage rec { pname = "pathspec"; version = "0.3.4"; @@ -8674,6 +8675,24 @@ in { }; }; + pathspec_0_5 = buildPythonPackage rec { + pname = "pathspec"; + version = "0.5.0"; + name = "${pname}-${version}"; + + src = self.fetchPypi { + inherit pname version; + sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma"; + }; + + meta = { + description = "Utility library for gitignore-style pattern matching of file paths"; + homepage = "https://github.com/cpburnz/python-path-specification"; + license = licenses.mpl20; + maintainers = with maintainers; [ copumpkin ]; + }; + }; + pathtools = buildPythonPackage rec { name = "pathtools-${version}"; version = "0.1.2"; From c317e5c85dd5bb239622ba6846b9ad5cec4c91da Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 15 Mar 2017 23:59:57 +0100 Subject: [PATCH 267/278] ldns: split man pages Saves ~1.8MB --- pkgs/development/libraries/ldns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c35cc5883146..91eb7aecea90 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; From 0526467494476586a715e75c1ac37c5a800df011 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 16 Mar 2017 14:57:07 +0100 Subject: [PATCH 268/278] dnscrypt-proxy: enable additional plugins Adding ldns builds additional plugins for rewriting DNS queries, such as blocking and forwarding. For example, to use a custom domain blocklist, you can do ```nix let myBlockListFile = writeText "blocked-domains" '' *.example.com ''; in { services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example_ldns_blocking.so,--domains=${myBlockListFile}" ]; } ``` --- pkgs/tools/networking/dnscrypt-proxy/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 24aa3d4b829b..03d217440957 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsodium, systemd }: +{ stdenv, fetchurl, pkgconfig, libsodium, ldns, openssl, systemd }: with stdenv.lib; @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd; + # depends on + buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd; postInstall = '' # Previous versions required libtool files to load plugins; they are From 2e72372c05ee5a4e0c690178c5f6305878a3a777 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 16 Mar 2017 17:19:10 +0100 Subject: [PATCH 269/278] pythonPackages.django_guardian: fix eval --- pkgs/development/python-modules/django_guardian.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix index c9217955213d..1b31456162b0 100644 --- a/pkgs/development/python-modules/django_guardian.nix +++ b/pkgs/development/python-modules/django_guardian.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, python, fetchurl , django_environ, mock, django, six -, pytest, pytestrunner, pytestdjango, setuptools_scm +, pytest, pytestrunner, pytest-django, setuptools_scm }: buildPythonPackage rec { name = "django-guardian-${version}"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5"; }; - buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ]; + buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ]; propagatedBuildInputs = [ django six ]; checkPhase = '' From 3cecb95a9debf0382db5103c9c22a9faa6ec4f85 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 15 Mar 2017 15:55:43 -0500 Subject: [PATCH 270/278] libdap: 3.15.1 -> 3.18.3 --- pkgs/development/libraries/libdap/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 2e76c510bdda..e20b1c95a199 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.15.1"; + version = "3.18.3"; name = "libdap-${version}"; - buildInputs = [ bison libuuid curl libxml2 flex ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f"; + sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; }; - meta = { + meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; homepage = http://www.opendap.org/download/libdap; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; }; } From 00b6d820018a296b59076baf3d78995da8faf6c1 Mon Sep 17 00:00:00 2001 From: ndowens Date: Wed, 15 Mar 2017 15:40:47 -0500 Subject: [PATCH 271/278] libcouchbase: 2.5.2 -> 2.7.2 fixes #23932 --- .../libraries/libcouchbase/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 2784cd90a5c6..24ec3d74d36f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: -stdenv.mkDerivation { - name = "libcouchbase-2.5.2"; - src = fetchurl { - url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz"; - sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24"; +stdenv.mkDerivation rec { + name = "libcouchbase-${version}"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "couchbase"; + repo ="libcouchbase"; + rev = version; + sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevent openssl]; + buildInputs = [ libevent openssl ]; - meta = { + doCheck = true; + checkPhase = "ctest"; + + meta = with stdenv.lib; { description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.unix; }; } From fd61a33d2b42d86215c1697c8da11218279ac802 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 16 Mar 2017 16:41:44 +0000 Subject: [PATCH 272/278] icewm: fix CFGDIR --- pkgs/applications/window-managers/icewm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 861313431b07..ef3ad8fda251 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - export cmakeFlags="-DPREFIX=$out" + export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm" ''; meta = { From 5d6ea2d64e759e30c5864ca2950c0b5ad9070437 Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Fri, 10 Mar 2017 21:59:38 +0100 Subject: [PATCH 273/278] jshon: fix null termination in read_stream. This fixes a somewhat critical (security?) bug. We are trying to get it merged upstream but have had no response from the ordinary maintainer in over a week. (See .) fixes #23727 --- pkgs/development/tools/parsing/jshon/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 4b35ba0cce29..5406b4e9a0e5 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jansson }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { name = "jshon-20140712"; @@ -12,14 +12,23 @@ stdenv.mkDerivation rec { repo = "jshon"; }; + patches = [ + # Fix null termination in read_stream. + # https://github.com/keenerd/jshon/issues/53 + (fetchpatch { + url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch; + sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; + }) + ]; + buildInputs = [ jansson ]; - patchPhase = + patchPhase = '' substituteInPlace Makefile --replace "/usr/" "/" ''; - preInstall = + preInstall = '' export DESTDIR=$out ''; From 6da60bb10142ba2e63309da048044026f7158d0a Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 15 Mar 2017 17:35:18 +0100 Subject: [PATCH 274/278] modules/mlmmj: fix a typo in listaddress folder --- nixos/modules/services/mail/mlmmj.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix index e2b37522cb16..4a01745eb8b6 100644 --- a/nixos/modules/services/mail/mlmmj.nix +++ b/nixos/modules/services/mail/mlmmj.nix @@ -18,7 +18,7 @@ let footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}"; createList = d: l: '' ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l} - echo ${listAddress d l} > ${listCtl d l}/listadress + echo ${listAddress d l} > ${listCtl d l}/listaddress echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders echo ${footer d l} > ${listCtl d l}/footer echo ${subjectPrefix l} > ${listCtl d l}/prefix From 92bb91f72f649d49bacb55e3b735455d5a740771 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Wed, 15 Mar 2017 17:35:50 +0100 Subject: [PATCH 275/278] mlmmj: add docfiles to output --- pkgs/servers/mail/mlmmj/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 8955f40e565a..ddf4fd5d880d 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; }; + postInstall = '' + # grab all documentation files + docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*") + install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles + ''; + meta = with stdenv.lib; { homepage = http://mlmmj.org; description = "Mailing List Management Made Joyful"; @@ -18,4 +24,4 @@ stdenv.mkDerivation rec { license = licenses.mit; }; -} \ No newline at end of file +} From f28fe4cfae06d8da440f5beef340762768fa9408 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 15 Mar 2017 14:50:16 +0100 Subject: [PATCH 276/278] pythonPackages.pycassa: init at 1.11.2 fixes #23920 --- .../python-modules/pycassa/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pycassa/default.nix diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix new file mode 100644 index 000000000000..7d4be3226bd9 --- /dev/null +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }: + +buildPythonPackage rec { + pname = "pycassa"; + version = "1.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nsqjzgn6v0rya60dihvbnrnq1zwaxl2qwf0sr08q9qlkr334hr6"; + }; + + disabled = isPy3k; + + # Tests are not executed since they require a cassandra up and + # running + doCheck = false; + + propagatedBuildInputs = [ thrift ]; + + meta = { + description = "pycassa is a python client library for Apache Cassandra"; + homepage = http://github.com/pycassa/pycassa; + license = stdenv.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2fb54ede583..64de0d30a74b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9022,7 +9022,9 @@ in { }; }; - pybluez = buildPythonPackage rec { + pycassa = callPackage ../development/python-modules/pycassa { }; + + pybluez = buildPythonPackage rec { version = "unstable-20160819"; pname = "pybluez"; name = "${pname}-${version}"; From b13f408d8bb0cde63a7f164dc0e3f63c72999bbc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Mar 2017 19:43:09 +0000 Subject: [PATCH 277/278] pythonPackages.pycassa: fix evaluation --- pkgs/development/python-modules/pycassa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index 7d4be3226bd9..fc8fbcaa8d2d 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ thrift ]; meta = { - description = "pycassa is a python client library for Apache Cassandra"; + description = "A python client library for Apache Cassandra"; homepage = http://github.com/pycassa/pycassa; - license = stdenv.licenses.mit; + license = stdenv.lib.licenses.mit; }; } From 14315cf4f59daf6efde281ac2be2e27602d39b41 Mon Sep 17 00:00:00 2001 From: ndowens Date: Fri, 10 Mar 2017 21:15:02 -0600 Subject: [PATCH 278/278] babl: 0.1.12 -> 0.1.24 --- pkgs/development/libraries/babl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 02b1af5ab521..545612d5c155 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.12"; + name = "babl-0.1.24"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g"; + sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7"; }; - meta = { + meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; }