From 4a88a01dd30d8eb9d5ee4d522916e610a14876b2 Mon Sep 17 00:00:00 2001 From: Claas Augner Date: Mon, 4 Dec 2017 22:08:32 +0100 Subject: [PATCH 001/133] nextcloud: 2.3.2 -> 2.3.3 --- pkgs/applications/networking/nextcloud-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 652de194a5e7..6082b7de6d11 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "nextcloud-client-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchgit { url = "git://github.com/nextcloud/client_theming.git"; - rev = "1ee750d1aeaaefc899629e85c311594603e9ac1b"; - sha256 = "0dxyng8a7cg78z8yngiqypsb44lf5c6vkabvkfch0cl0cqmarc1a"; + rev = "ab40efe1e1475efddd636c09251d8917627261da"; + sha256 = "19a1kqydgx47sa1a917j46zlbc5g9nynsanasyad9c8sqi0qvyip"; fetchSubmodules = true; }; From c2fa5f172922c001bdf7e8213bcdd46e2b1cc49b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 31 Jan 2018 21:25:28 +0100 Subject: [PATCH 002/133] nixos/xautolock: fix default defaults/examples, add assertions see issue #34371 --- nixos/modules/services/x11/xautolock.nix | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 28fc92024bcb..a614559970e9 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -26,9 +26,9 @@ in }; locker = mkOption { - default = "xlock"; # default according to `man xautolock` - example = "i3lock -i /path/to/img"; - type = types.string; + default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock` + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.str; description = '' The script to use when automatically locking the computer. @@ -37,8 +37,8 @@ in nowlocker = mkOption { default = null; - example = "i3lock -i /path/to/img"; - type = types.nullOr types.string; + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.nullOr types.str; description = '' The script to use when manually locking the computer with xautolock -locknow. @@ -56,10 +56,8 @@ in notifier = mkOption { default = null; - example = literalExample '' - "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" - ''; - type = types.nullOr types.string; + example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + type = types.nullOr types.str; description = '' Notification script to be used to warn about the pending autolock. @@ -68,8 +66,8 @@ in killer = mkOption { default = null; # default according to `man xautolock` is none - example = "systemctl suspend"; - type = types.nullOr types.string; + example = "${pkgs.systemd}/bin/systemctl suspend"; + type = types.nullOr types.str; description = '' The script to use when nothing has happend for as long as @@ -131,6 +129,12 @@ in assertion = cfg.killer != null -> cfg.killtime >= 10; message = "killtime has to be at least 10 minutes according to `man xautolock`"; } - ]; + ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ] + (option: + { + assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; + message = "Please specify a canonical path for `services.xserver.xautolock.${option}`"; + }) + ); }; } From bbbd9de9d7962ce26c42a60f4de52da04a912c31 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 16 Feb 2018 10:00:08 -0500 Subject: [PATCH 003/133] linux-common: Add CFS_BANDWIDTH The option is needed to limit CPU usage of processes. It seems to have no negative impact if left unused. See https://lwn.net/Articles/428230/ --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 968fb195d2a2..2fa343412019 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -450,6 +450,7 @@ with stdenv.lib; RC_DEVICES? y # Enable IR devices RT2800USB_RT55XX y SCHED_AUTOGROUP y + CFS_BANDWIDTH y SCSI_LOGGING y # SCSI logging facility SERIAL_8250 y # 8250/16550 and compatible serial support SLIP_COMPRESSED y # CSLIP compressed headers From 911f408b5eec933ad0adbd296458ebdb1f3fd4dc Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 18 Feb 2018 23:19:41 +0100 Subject: [PATCH 004/133] virtmanager: 1.4.3 -> 1.5.0, cleanup dependencies remove unneeded dependencies, see issue #34043 --- .../virtualization/virt-manager/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 527371791082..7a2fb6d7f315 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt , gsettings_desktop_schemas, glib, libosinfo, gnome3 , spiceSupport ? true, spice_gtk ? null @@ -9,12 +9,12 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.3"; + version = "1.5.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; + sha512 = "b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da"; }; nativeBuildInputs = [ @@ -23,15 +23,13 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi gsettings_desktop_schemas libosinfo ] ++ optional spiceSupport spice_gtk; propagatedBuildInputs = with python2Packages; - [ eventlet greenlet gflags netaddr carrot routes PasteDeploy - m2crypto ipy twisted distutils_extra simplejson - cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python - pygobject3 ipaddr mox libvirt libxml2 requests + [ + pygobject3 ipaddr libvirt libxml2 requests ]; patchPhase = '' From b0eb4d6390000eb60486f316afe13aa8dead4e8f Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 19 Feb 2018 01:02:47 +0100 Subject: [PATCH 005/133] virtmanager: 1.5.0: add gtk3 dependency otherwise virt-manager startup fails with Typelib file for namespace 'Pango', version '1.0' not found: Could not open display: :0 --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 7a2fb6d7f315..9306a1dea9b1 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages, intltool, file , wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3 +, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3 , spiceSupport ? true, spice_gtk ? null }: @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo + gsettings_desktop_schemas libosinfo gtk3 ] ++ optional spiceSupport spice_gtk; propagatedBuildInputs = with python2Packages; From 7460dc318b9d7c05fb225ba565b865fad132bd20 Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 19 Feb 2018 01:15:47 +0100 Subject: [PATCH 006/133] virtmanager: 1.5.0: sha512->sha256 (readability) --- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9306a1dea9b1..fb573bf6c9eb 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha512 = "b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da"; + sha256 = "d43a7b99d40acdcb8e9455e7874beee132cfcfce9eed0d6252e8f254a82cadc6"; }; nativeBuildInputs = [ From 77959471314fb2892ec48d2275e48f839d908d2f Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 11:17:50 +0100 Subject: [PATCH 007/133] libvirt-glib: should build on Darwin platforms: linux -> unix to see if it builds on Darwin --- pkgs/development/libraries/libvirt-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 83b2983d9c4b..ba4a96d41624 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://libvirt.org/; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From bd83899f695b0f2f54482e0ee3f14303a9d7dfec Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 12:38:19 +0100 Subject: [PATCH 008/133] Revert "libvirt-glib: should build on Darwin" ... but it doesn't (needs libcap-ng) This reverts commit 77959471314fb2892ec48d2275e48f839d908d2f. --- pkgs/development/libraries/libvirt-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ba4a96d41624..83b2983d9c4b 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://libvirt.org/; license = licenses.lgpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 1cbccb95a7a0fee4bebdeb7b37ae2ecc51d3e685 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 12:47:34 +0100 Subject: [PATCH 009/133] virtmanager: set platforms to linux since dependency libvirt-glib currently doesn't build on Darwin --- pkgs/applications/virtualization/virt-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb573bf6c9eb..9e18a6738c38 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -61,6 +61,8 @@ python2Packages.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; + # exclude Darwin since libvirt-glib currently doesn't build there + platforms = platforms.linux; maintainers = with maintainers; [ qknight offline fpletz ]; }; } From 27ce04207f916cf06fd4ac0ddc837b02135f2bfa Mon Sep 17 00:00:00 2001 From: Hugo Tavares Reis Date: Tue, 20 Feb 2018 12:40:03 +0100 Subject: [PATCH 010/133] nixnote2: init at 2.0.2 --- pkgs/applications/misc/nixnote2/default.nix | 37 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/nixnote2/default.nix diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix new file mode 100644 index 000000000000..971da8ba0483 --- /dev/null +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -0,0 +1,37 @@ +{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}: + +mkDerivation rec { + name = "nixnote2-${version}"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "baumgarr"; + repo = "nixnote2"; + rev = "v${version}"; + sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr"; + }; + + buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ qmake ]; + + postPatch = '' + # Fix location of poppler-qt5.h + for f in threads/indexrunner.cpp html/noteformatter.cpp utilities/noteindexer.cpp gui/plugins/popplerviewer.h gui/plugins/pluginfactory.h gui/plugins/popplerviewer.cpp ; do + substituteInPlace $f \ + --replace '#include ' '#include ' + done + + substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy' + ''; + + meta = with stdenv.lib; { + description = "An unofficial client of Evernote"; + homepage = http://www.nixnote.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ htr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce18e9d3762d..113ec8f9b816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3236,6 +3236,8 @@ with pkgs; ninka = callPackage ../development/tools/misc/ninka { }; + nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nodejs = hiPrio nodejs-6_x; nodejs-slim = nodejs-slim-6_x; @@ -5755,7 +5757,7 @@ with pkgs; compcert = callPackage ../development/compilers/compcert { }; cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { From b2f53c76f83cbe91bb9c765b7a3aaaa50336d653 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 20 Feb 2018 22:17:16 +0100 Subject: [PATCH 011/133] postgis: get rid of composableDerivation In this change composableDerivation is removed in favor of stdenv.mkDerivation. --- .../modules/services/databases/postgresql.nix | 2 +- nixos/tests/postgis.nix | 2 +- pkgs/development/libraries/postgis/2.3.nix | 102 ++++++++++++ .../development/libraries/postgis/default.nix | 154 +++++++----------- pkgs/top-level/all-packages.nix | 1 + 5 files changed, 164 insertions(+), 97 deletions(-) create mode 100644 pkgs/development/libraries/postgis/2.3.nix diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9b5e3735239f..0dcbfe2e47ac 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -122,7 +122,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f6ce3fe38ed3..7fe905eb4254 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; }; }; }; diff --git a/pkgs/development/libraries/postgis/2.3.nix b/pkgs/development/libraries/postgis/2.3.nix new file mode 100644 index 000000000000..8e6218a0d561 --- /dev/null +++ b/pkgs/development/libraries/postgis/2.3.nix @@ -0,0 +1,102 @@ +{ fetchurl +, stdenv +, perl +, libxml2 +, postgresql +, geos +, proj +, flex +, gdal +, json_c +, pkgconfig +, file +}: + + /* + + ### NixOS - usage: + ================== + + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; + + + ### important Postgis implementation details: + ============================================= + + Postgis provides a shared library implementing many operations. They are + exposed to the Postgres SQL interpreter by special SQL queries eg: + + CREATE FUNCTION [...] + AS '[..]liblwgeom', 'lwhistogram2d_in' LANGUAGE 'C' IMMUTABLE STRICT; -- WITH (isstrict); + + where liblwgeom is the shared library. + Postgis < 1.5 used absolute paths, in NixOS $libdir is always used. + + Thus if you want to use postgresql dumps which were created by non NixOS + systems you have to adopt the library path. + + + ### TODO: + ========= + the bin commands to have gtk gui: + */ + + +let + version = "2.3.1"; + sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; +in stdenv.mkDerivation rec { + name = "postgis-${version}"; + + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + inherit sha256; + }; + + # don't pass these vars to the builder + removeAttrs = ["sql_comments" "sql_srcs"]; + + # create aliases for all commands adding version information + postInstall = '' + sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) + + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done + + cp -r doc $out + ''; + + buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; + + sql_comments = "postgis_comments.sql"; + + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + + meta = with stdenv.lib; { + description = "Geographic Objects for PostgreSQL"; + homepage = http://postgis.refractions.net; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index bdf537f4375e..582ebc05176b 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -1,11 +1,23 @@ -args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, proj, flex, gdal, json_c, pkgconfig, file, ...}: +{ fetchurl +, stdenv +, perl +, libxml2 +, postgresql +, geos +, proj +, flex +, gdal +, json_c +, pkgconfig +, file +}: /* ### NixOS - usage: ================== - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_3_1 ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; ### important Postgis implementation details: @@ -31,108 +43,60 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p let - pgDerivationBase = composableDerivation.composableDerivation {} ( fix : + version = "2.4.0"; + sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; +in stdenv.mkDerivation rec { + name = "postgis-${version}"; - let version = fix.fixed.version; in { + src = fetchurl { + url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString version}.tar.gz"; + inherit sha256; + }; - name = "postgis-${version}"; + # don't pass these vars to the builder + removeAttrs = ["sql_comments" "sql_srcs"]; - src = fetchurl { - url = "http://postgis.refractions.net/download/postgis-${fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; + # create aliases for all commands adding version information + postInstall = '' + sql_srcs=$(for sql in ${builtins.toString sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) - # don't pass these vars to the builder - removeAttrs = ["hash" "sql_comments" "sql_srcs"]; + for prog in $out/bin/*; do # */ + ln -s $prog $prog-${version} + done - preConfigure = '' - configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin" - makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" - ''; + cp -r doc $out + ''; - # create aliases for all commands adding version information - postInstall = '' + buildInputs = [ libxml2 postgresql geos proj perl gdal json_c pkgconfig ]; - sql_srcs=$(for sql in ${builtins.toString fix.fixed.sql_srcs}; do echo -n "$(find $out -iname "$sql") "; done ) + sql_comments = "postgis_comments.sql"; - for prog in $out/bin/*; do # */ - ln -s $prog $prog-${version} - done + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - cp -r doc $out - ''; - - buildInputs = [libxml2 postgresql geos proj perl]; - - sql_comments = "postgis_comments.sql"; - - meta = { - description = "Geographic Objects for PostgreSQL"; - homepage = http://postgis.refractions.net; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; - }; - }); - - pgDerivationBaseNewer = pgDerivationBase.merge (fix: { - src = fetchurl { - url = "http://download.osgeo.org/postgis/source/postgis-${builtins.toString fix.fixed.version}.tar.gz"; - inherit (fix.fixed) sha256; - }; - }); - -in rec { - - v_2_3_1 = pgDerivationBaseNewer.merge ( fix : { - version = "2.3.1"; - sha256 = "0xd21h2k6x3i1b3z6pgm3pmkfpxm6irxd5wbx68acjndjgd6p3ac"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); - - v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { - version = "2.4.0"; - sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; - sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; - builtInputs = [gdal json_c pkgconfig]; - - # postgis config directory assumes /include /lib from the same root for json-c library - NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; - - dontDisableStatic = true; - preConfigure = '' - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" - ''; - postConfigure = '' - sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; - s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/loader/Makefile"; - sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g - " \ - "raster/scripts/python/Makefile"; - ''; - }); + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="--datadir=$out/share --datarootdir=$out/share --bindir=$out/bin --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + makeFlags="PERL=${perl}/bin/perl datadir=$out/share pkglibdir=$out/lib bindir=$out/bin" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + meta = with stdenv.lib; { + description = "Geographic Objects for PostgreSQL"; + homepage = http://postgis.refractions.net; + license = licenses.gpl2; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e48f097a137..711a0ea5efa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10740,6 +10740,7 @@ with pkgs; }; postgis = callPackage ../development/libraries/postgis { }; + postgis_2_3 = callPackage ../development/libraries/postgis/2.3.nix { }; protobuf = callPackage ../development/libraries/protobuf/3.4.nix { }; From 12e6a3b1c2c991b10463236e5fa0c37c5b9faafa Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 21 Feb 2018 00:13:42 +0200 Subject: [PATCH 012/133] tectonic: 0.1.6 -> 0.1.7 --- pkgs/tools/typesetting/tectonic/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 3fdebd19f3cb..ad612fa18af6 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchFromGitHub, rustPlatform, makeWrapper , fontconfig, harfbuzz-icu, openssl, pkgconfig }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "0k5vkn112bjwh4wnxryzqz79dlja64k7s105mf3yaik136hqnmqv"; + sha256 = "007l0l9xnyayiqiap22zlsp8l9afdw803064cj8inr3q7ckzfcpb"; }; - cargoSha256 = "03bqhgz8c4ipdkd3g448bcrr6d188h87vskcfcc3mqlcxg77b8q5"; + cargoSha256 = "0kjy9zrjlrlkr2il62nz35hm1nndyym9dbnas43hzz7y8hdf859k"; nativeBuildInputs = [ pkgconfig ]; From 4fcb56d139e9552c9ece9f16dd2f4ad8655813d7 Mon Sep 17 00:00:00 2001 From: Augustin Borsu Date: Tue, 20 Feb 2018 23:23:04 +0100 Subject: [PATCH 013/133] nextcloud: 12.0.5 -> 13.0.0 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 70c252d395f8..2e423246c515 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "12.0.5"; + version = "13.0.0"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0hya524d8wqia5v2wz8cmasi526j97z6d0l1h7l7j442wsn2kgn8"; + sha256 = "38e6064432a2d1a044f219028d3fd46cb7a943a47e11eef346810bd289705aec"; }; installPhase = '' From 7c14e8ba043133a786de4a76060c6095a51abfb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Wed, 21 Feb 2018 00:38:34 +0100 Subject: [PATCH 014/133] dmenu-python: init at 0.2.1 --- .../python-modules/dmenu/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/dmenu/default.nix diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix new file mode 100644 index 000000000000..d7ec8161ef5e --- /dev/null +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, lib, fetchPypi, dmenu }: + +buildPythonPackage rec { + pname = "dmenu-python"; + version = "0.2.1"; + + src = fetchPypi { + inherit version; + pname = "dmenu"; + sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm"; + }; + + propagatedBuildInputs = [ dmenu ]; + + # No tests existing + doCheck = false; + + meta = { + description = "A Python wrapper for dmenu"; + homepage = http://dmenu.readthedocs.io; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nico202 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3e2e99c9432..ba4caee70148 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3922,6 +3922,8 @@ in { discogs_client = callPackage ../development/python-modules/discogs_client { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; + dnspython = callPackage ../development/python-modules/dnspython { }; dns = self.dnspython; # Alias for compatibility, 2017-12-10 From 43860cc5147c460f5e6baa993c4f7fff05499c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Tue, 20 Feb 2018 23:53:43 +0100 Subject: [PATCH 015/133] papis: 0.5.2 -> 0.5.3 --- pkgs/tools/misc/papis/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index de69712eb5ee..98713c571401 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,39 +1,43 @@ { buildPythonApplication, lib, fetchFromGitHub , argcomplete, arxiv2bib, beautifulsoup4, bibtexparser -, configparser, habanero, papis-python-rofi, pylibgen -, prompt_toolkit, pyparser, python_magic, pyyaml -, requests, unidecode, urwid, vobject, tkinter +, configparser, dmenu-python, habanero, papis-python-rofi +, pylibgen, prompt_toolkit, pyparser, pytest, python_magic +, pyyaml, requests, unidecode, urwid, vobject, tkinter , vim }: buildPythonApplication rec { pname = "papis"; - version = "0.5.2"; + version = "0.5.3"; # Missing tests on Pypi src = fetchFromGitHub { owner = "alejandrogallo"; repo = pname; rev = "v${version}"; - sha256 = "0cw6ajdaknijka3j2bkkkn0bcxqifk825kq0a0rdbbmc6661pgxb"; + sha256 = "1yc4ilb7bw099pi2vwawyf8mi0n1kp87wgwgwcwc841ibq62q8ic"; }; postPatch = "sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py"; propagatedBuildInputs = [ argcomplete arxiv2bib beautifulsoup4 bibtexparser - configparser habanero papis-python-rofi pylibgen - prompt_toolkit pyparser python_magic pyyaml + configparser dmenu-python habanero papis-python-rofi + pylibgen prompt_toolkit pyparser python_magic pyyaml requests unidecode urwid vobject tkinter vim ]; + checkInputs = [ pytest ]; + # Papis tries to create the config folder under $HOME during the tests - preCheck = '' + checkPhase = '' mkdir -p check-phase export HOME=$(pwd)/check-phase - ''; + make test + make test-non-pythonic + ''; meta = { description = "Powerful command-line document and bibliography manager"; From 30f27c49b91867b5f5dd55fc147f5b17dfc9b383 Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Wed, 21 Feb 2018 09:25:58 +0100 Subject: [PATCH 016/133] crashplan-small-business: remove unneeded function --- .../backup/crashplan-small-business.nix | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/backup/crashplan-small-business.nix b/nixos/modules/services/backup/crashplan-small-business.nix index c6002b6a3f6b..9497d8c18bb7 100644 --- a/nixos/modules/services/backup/crashplan-small-business.nix +++ b/nixos/modules/services/backup/crashplan-small-business.nix @@ -23,7 +23,7 @@ with lib; example = "2G"; type = types.str; description = '' - Maximum amount of that the crashplan engine should use. + Maximum amount of ram that the crashplan engine should use. ''; }; openPorts = mkOption { @@ -52,28 +52,13 @@ with lib; after = [ "network.target" "local-fs.target" ]; preStart = '' - ensureDir() { - dir=$1 - mode=$2 - - if ! test -e $dir; then - ${pkgs.coreutils}/bin/mkdir -m $mode -p $dir - elif [ "$(${pkgs.coreutils}/bin/stat -c %a $dir)" != "$mode" ]; then - ${pkgs.coreutils}/bin/chmod $mode $dir - fi - } - - ensureDir ${crashplansb.vardir} 755 - ensureDir ${crashplansb.vardir}/conf 700 - ensureDir ${crashplansb.manifestdir} 700 - ensureDir ${crashplansb.vardir}/cache 700 - ensureDir ${crashplansb.vardir}/backupArchives 700 - ensureDir ${crashplansb.vardir}/log 777 + install -d -m 755 ${crashplansb.vardir} + install -d -m 700 ${crashplansb.vardir}/conf + install -d -m 700 ${crashplansb.manifestdir} + install -d -m 700 ${crashplansb.vardir}/cache + install -d -m 700 ${crashplansb.vardir}/backupArchives + install -d -m 777 ${crashplansb.vardir}/log cp -avn ${crashplansb}/conf.template/* ${crashplansb.vardir}/conf - #for x in bin install.vars lang lib libc42archive64.so libc42core.so libjniwrap64.so libjtux64.so libleveldb64.so libnetty-tcnative.so share upgrade; do - # rm -f ${crashplansb.vardir}/$x; - # ln -sf ${crashplansb}/$x ${crashplansb.vardir}/$x; - #done ''; serviceConfig = { From 18ac3c9a6ed652f6d06ae674734e447878162f4e Mon Sep 17 00:00:00 2001 From: Marti Serra Date: Wed, 21 Feb 2018 10:13:42 +0100 Subject: [PATCH 017/133] crashplan-small-business: 6.6.0 -> 6.7.0 --- .../backup/crashplan/crashplan-small-business.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 42729f4aad18..9bed504103a1 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -6,14 +6,14 @@ maxRam ? "1024m" }: stdenv.mkDerivation rec { - version = "6.6.0"; - rev = "1506661200660_4347"; + version = "6.7.0"; + rev = "1512021600670_4503"; pname = "CrashPlanSmb"; name = "${pname}_${version}_${rev}"; src = fetchurl { url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz"; - sha256 = "1zzx60fpmi2nlzpq80x4hfgspsrgd7ycfcvc6w391wxr0qzf2i9k"; + sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q"; }; nativeBuildInputs = [ makeWrapper cpio nodePackages.asar ]; From 444cdf0454495919538d8d7e1484fe84ccbec2e3 Mon Sep 17 00:00:00 2001 From: Ales Huzik Date: Fri, 16 Feb 2018 14:07:28 +1100 Subject: [PATCH 018/133] nixos/acpid: add option to log events --- nixos/modules/services/hardware/acpid.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix index f69706ebff34..0f05876aee32 100644 --- a/nixos/modules/services/hardware/acpid.nix +++ b/nixos/modules/services/hardware/acpid.nix @@ -53,6 +53,12 @@ in description = "Whether to enable the ACPI daemon."; }; + logEvents = mkOption { + type = types.bool; + default = false; + description = "Log all event activity."; + }; + handlers = mkOption { type = types.attrsOf (types.submodule { options = { @@ -142,7 +148,7 @@ in ConditionPathExists = [ "/proc/acpi" ]; }; - script = "acpid --confdir ${acpiConfDir}"; + script = "acpid ${optionalString config.services.acpid.logEvents "--logevents"} --confdir ${acpiConfDir}"; }; }; From fdbc7448569a25a03a2d09f8def1f96a266362f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claes=20Wallin=20=28=E9=9F=8B=E5=98=89=E8=AA=A0=29?= Date: Mon, 5 Feb 2018 14:28:17 +0800 Subject: [PATCH 019/133] racket-minimal: build on darwin Technically, racket compiles and packages too, but it doesn't pass all tests yet, so the build fails. gcc7Stdenv is GCC 7 with the MacOS-specific adaptations retained. Building on MacOS with that works, but we should be using clang. I'm hoping that the next person wanting to override the compiler version in some other derivation sees that attribute and doesn't inadvertently break a MacOS build again. --- pkgs/development/interpreters/racket/default.nix | 9 +++++++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- pkgs/top-level/all-packages.nix | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 4a980ec418f0..e3aa3e8a6f5c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,6 +4,7 @@ , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? false +, CoreFoundation }: let @@ -47,9 +48,13 @@ stdenv.mkDerivation rec { FONTCONFIG_FILE = fontsConf; LD_LIBRARY_PATH = libPath; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; + NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [ + (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s") + (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") + ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]; + buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ]; preConfigure = '' unset AR diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 6bac9a0f3414..c63d0040cfee 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -14,6 +14,6 @@ racket.overrideAttrs (oldAttrs: rec { as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. ''; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b643ab1f6eb6..75788ace0396 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5822,6 +5822,8 @@ with pkgs; extraBuildInputs = lib.optional hostPlatform.isDarwin clang.cc; }; + gcc7Stdenv = overrideCC gccStdenv gcc7; + wrapCCMulti = cc: if system == "x86_64-linux" then let # Binutils with glibc multi @@ -7102,7 +7104,8 @@ with pkgs; # racket 6.11 doesn't build with gcc6 + recent glibc: # https://github.com/racket/racket/pull/1886 # https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769 - stdenv = overrideCC stdenv gcc7; + stdenv = if stdenv.isDarwin then stdenv else gcc7Stdenv; + inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; From c888d970139da81bbc49175e3cb810d5b718ae8b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Feb 2018 17:21:11 +0000 Subject: [PATCH 020/133] ocamlPackages.cil: fix build on Darwin --- pkgs/development/ocaml-modules/cil/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 99b5f92b3405..0394266353ce 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; preConfigure = '' + substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)' export FORCE_PERL_PREFIX=1 ''; prefixKey = "-prefix="; From 70cc99005ea6ed57b255d3b0fd9ac3ef9e1a285b Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Wed, 21 Feb 2018 20:36:36 +0200 Subject: [PATCH 021/133] ripgrep: 0.8.0 -> 0.8.1 --- 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 a93ec8e4e4c9..11355bb6df1d 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "ripgrep-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = "${version}"; - sha256 = "0ha46vhma2diqxfgasdc9gwlkcrlhc4l65nayvdy4m2ah5bm4qp6"; + sha256 = "1h7k9ik723qzplwl0a5i0anzdr115wwklfgp0n11p4k2ckh7nygn"; }; - cargoSha256 = "0q44qa9myrzg42q0lvclpk5nypmf0q7v3xy5nnsb28j3imvcrs4p"; + cargoSha256 = "1gld93dxfm4vyiz1b43smbdhxmyzdk2236ksp8vw1zb1yyzn83nf"; nativeBuildInputs = [ asciidoc docbook_xsl libxslt ]; From 06718493c09b4bdf367367a607fe440e50cd8bef Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 19:31:25 +0000 Subject: [PATCH 022/133] libguestfs: 1.36.3 -> 1.38.0 --- pkgs/development/libraries/libguestfs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e659b31d9745..7e7f46673580 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -9,16 +9,16 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.36.3"; + version = "1.38.0"; appliance = fetchurl { - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; - sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz"; + sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy"; }; src = fetchurl { - url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; - sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; + url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; + sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3"; }; nativeBuildInputs = [ pkgconfig ]; From 284425dc5df531c4b826ebb03cc44f6d17285aa1 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 19:34:31 +0000 Subject: [PATCH 023/133] tinc: 1.0.32 -> 1.0.33 --- pkgs/tools/networking/tinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index 508816dbfa81..4f6bec9c0084 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.32"; + version = "1.0.33"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "11smq1h6jyp6x2cwrv2zxck9phzdz3svi95pxnvvpd4dzzm4zcjd"; + sha256 = "1x0hpfz13vn4pl6dcpnls6xq3rfcbdsg90awcfn53ijb8k35svvz"; }; buildInputs = [ lzo openssl zlib ]; From e3cd8a2d0655aa36d5f543fb9c74e3f159c42862 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 21 Feb 2018 20:40:22 +0100 Subject: [PATCH 024/133] raven: 6.5.0 -> 6.6.0 --- pkgs/development/python-modules/raven/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index b6cc70ed787c..33d199ad274a 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -1,12 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, contextlib2, blinker }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +, contextlib2, blinker +}: buildPythonPackage rec { pname = "raven"; - version = "6.5.0"; + version = "6.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "raven-python"; + rev = version; + sha256 = "184wpr0zdcm260pxqll9kpmp2ywisn75k8pdm8gc6xmk740in1hj"; }; # way too many dependencies to run tests From d44bd9cb570e35178c4345bbd73f098c7aeefe6b Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 19:42:57 +0000 Subject: [PATCH 025/133] varnish-modules: 0.10.2 -> 0.13.0 --- pkgs/servers/varnish/modules.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 8327b2ca5166..8fdcf63e5b9a 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, varnish, python, docutils, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.10.2"; + version = "0.13.0"; name = "varnish-modules-${version}"; src = fetchurl { url = "https://download.varnish-software.com/varnish-modules/varnish-modules-${version}.tar.gz"; - sha256 = "0inw76pm8kcidh0lq7gm3c3bh8v6yps0z7j6ar617b8wf730w1im"; + sha256 = "1nj52va7cp0swcv87zd3si80knpaa4a7na37cy9wkvgyvhf9k8mh"; }; nativeBuildInputs = [ pkgconfig docutils removeReferencesTo ]; From 00c59077e2156f92c4f0d9af0e9f3fb9cf9a02f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= Date: Wed, 21 Feb 2018 12:10:38 +0100 Subject: [PATCH 026/133] papis: fix tests --- pkgs/tools/misc/papis/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 98713c571401..49c57ab8dc90 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,4 +1,4 @@ -{ buildPythonApplication, lib, fetchFromGitHub +{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive , argcomplete, arxiv2bib, beautifulsoup4, bibtexparser , configparser, dmenu-python, habanero, papis-python-rofi , pylibgen, prompt_toolkit, pyparser, pytest, python_magic @@ -12,13 +12,16 @@ buildPythonApplication rec { # Missing tests on Pypi src = fetchFromGitHub { - owner = "alejandrogallo"; + owner = "papis"; repo = pname; rev = "v${version}"; sha256 = "1yc4ilb7bw099pi2vwawyf8mi0n1kp87wgwgwcwc841ibq62q8ic"; }; - postPatch = "sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py"; + postPatch = '' + sed -i 's/configparser>=3.0.0/# configparser>=3.0.0/' setup.py + patchShebangs tests + ''; propagatedBuildInputs = [ argcomplete arxiv2bib beautifulsoup4 bibtexparser @@ -33,10 +36,16 @@ buildPythonApplication rec { # Papis tries to create the config folder under $HOME during the tests checkPhase = '' mkdir -p check-phase - export HOME=$(pwd)/check-phase + export PATH=$out/bin:$PATH + # Still don't know why this fails + sed -i 's/--set dir=hello //' tests/bash/test_default.sh + # This test has been disabled since it requires a network connaction + sed -i 's/test_downloader_getter(self):/disabled_test_downloader_getter(self):/' papis/downloaders/tests/test_main.py + + export HOME=$(pwd)/check-phase make test - make test-non-pythonic + SH=${bashInteractive}/bin/bash make test-non-pythonic ''; meta = { From 5b20d893469b37bdf22970884eedf73a00a79dd3 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Wed, 21 Feb 2018 22:15:04 +0200 Subject: [PATCH 027/133] skypeforlinux: 8.13.0.2 -> 8.16.0.4 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index f75487565e1d..9e7377699bd7 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.13.0.2"; + version = "8.16.0.4"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -57,7 +57,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "15p1v6y8fwx9qj3ag645bvrcw7c1j20v63iy75s4xwsv1siz8cf9"; + sha256 = "1qc5qd07r768q9wkr2fq1q731hslh21i8rs41jb6pbn3ai65mxf5"; } else throw "Skype for linux is not supported on ${stdenv.system}"; From 5a08e90cdc2061394a0a90d9986f8a247f5e7c20 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 20:47:52 +0000 Subject: [PATCH 028/133] icu: init at 60.2 --- pkgs/development/libraries/icu/60.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+) create mode 100644 pkgs/development/libraries/icu/60.nix diff --git a/pkgs/development/libraries/icu/60.nix b/pkgs/development/libraries/icu/60.nix new file mode 100644 index 000000000000..e56135b15c62 --- /dev/null +++ b/pkgs/development/libraries/icu/60.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "60.2"; + sha256 = "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88c87a134c5d..1a52dc278d48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9186,6 +9186,7 @@ with pkgs; icu58 = callPackage ../development/libraries/icu/58.nix { }; icu59 = callPackage ../development/libraries/icu/59.nix { }; + icu60 = callPackage ../development/libraries/icu/60.nix { }; icu = icu59; From 6081c36599009d255d427f9b93574daa5a98a6d9 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 20:56:00 +0000 Subject: [PATCH 029/133] mercurial: 4.3.2 -> 4.5 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 541bc8799a83..68750bb9e6e7 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.3.2"; + version = "4.5"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "0j6djq584rcj9ghz59ddqzrfq49lykg3wqwap5fnzp9apa4gcnqg"; + sha256 = "0rgjy42zdlbzgp4qq49amzplfcvycyijf4kdhc5wk3fqz7cki4sd"; }; inherit python; # pass it so that the same version can be used in hg2git From 3d75eaccfbc5ef04fee5e5aa2669ff8f472a4980 Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 21:34:43 +0000 Subject: [PATCH 030/133] mongodb-tools: 3.5.13 -> 3.7.2 --- pkgs/tools/misc/mongodb-tools/default.nix | 11 +- pkgs/tools/misc/mongodb-tools/deps.nix | 182 ---------------------- 2 files changed, 6 insertions(+), 187 deletions(-) delete mode 100644 pkgs/tools/misc/mongodb-tools/deps.nix diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 7e24c955a806..a728450d76e5 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -3,7 +3,7 @@ let tools = [ "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport" - "mongooplog" "mongorestore" "mongostat" "mongotop" + "mongoreplay" "mongorestore" "mongostat" "mongotop" ]; in @@ -11,7 +11,7 @@ with stdenv.lib; buildGoPackage rec { name = "mongo-tools-${version}"; - version = "3.5.13"; + version = "3.7.2"; rev = "r${version}"; goPackagePath = "github.com/mongodb/mongo-tools"; @@ -21,17 +21,18 @@ buildGoPackage rec { inherit rev; owner = "mongodb"; repo = "mongo-tools"; - sha256 = "00klm4pyx5k39nn4pmfrpnkqxdhbzm7lprgwxszpirzrarh2g164"; + sha256 = "1y5hd4qw7422sqkj8vmy4agscvin3ck54r515bjrzn69iw73nhfl"; }; - goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl_1_0_2 libpcap ]; # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer buildPhase = '' + # move vendored codes so nixpkgs go builder could find it + mv go/src/github.com/mongodb/mongo-tools/vendor/src/* go/src/github.com/mongodb/mongo-tools/vendor/ + runHook preBuild ${stdenv.lib.concatMapStrings (t: '' go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix deleted file mode 100644 index 30de006db6f7..000000000000 --- a/pkgs/tools/misc/mongodb-tools/deps.nix +++ /dev/null @@ -1,182 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "314a259e304ff91bd6985da2a7149bbf91237993"; - sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://github.com/golang/crypto"; - rev = "1f22c0103821b9390939b6776727195525381532"; - sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://github.com/10gen/mgo"; - rev = "39b4000d99037e917f3a3b9d2dcab667a9ef284a"; - sha256 = "1m0xgd3y32g15fhl204g2caarfi5rn41m8pyym0i2gl3jnv5zw99"; - }; - } - { - goPackagePath = "github.com/google/gopacket"; - fetch = { - type = "git"; - url = "https://github.com/google/gopacket"; - rev = "93b782132903d1846aab74cb1f62e6138564949f"; - sha256 = "0l5m5a8dnqbkhphyfq7anj5zv59s74q2l7i6w9r7xwysfiqyq335"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; - sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; - }; - } - { - goPackagePath = "github.com/spacemonkeygo/openssl"; - fetch = { - type = "git"; - url = "https://github.com/10gen/openssl"; - rev = "2692b9f6fa95e72c75f8d9ba76e49c5dfd2cf8e4"; - sha256 = "16x2mx51977jrqw8d9hqhqmx892v2qf1k5xb01hhfklh58f527k2"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; - sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; - }; - } - { - goPackagePath = "github.com/spacemonkeygo/spacelog"; - fetch = { - type = "git"; - url = "https://github.com/spacemonkeygo/spacelog"; - rev = "f936fb050dc6b5fe4a96b485a6f069e8bdc59aeb"; - sha256 = "00an6zlhjk5l0vk1zjzshhswsd0h4syi48n50hv0fcnbmpxc5hv2"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v2"; - rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; - sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "8ddce2a84170772b95dd5d576c48d517b22cac63"; - sha256 = "11rp9wbzkd71640rq0nwmgsddskx3qac8wzqz71ksdb7ixjj5fmj"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "287b4346dc4e71a038c346375a9d572453bc469b"; - sha256 = "1nw9j9aircra68lbkp5bq4l8ayq4g3fvbb2x8qd2hg0vwgn5yaij"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "bf58a9a1291224109919756b4dcc469c670cc7e4"; - sha256 = "1k8k6vvlpl5a19dbrywxjmcia36macjbajx2hb6ci64rdfyf5kz5"; - }; - } - { - goPackagePath = "github.com/jacobsa/oglematchers"; - fetch = { - type = "git"; - url = "https://github.com/jacobsa/oglematchers"; - rev = "3ecefc49db07722beca986d9bb71ddd026b133f0"; - sha256 = "0vrk5sfs1ymkg0gv5n5dn9x0kqiaw8gaapljj8q75mgrr1p5149y"; - }; - } - { - goPackagePath = "github.com/3rf/mongo-lint"; - fetch = { - type = "git"; - url = "https://github.com/3rf/mongo-lint"; - rev = "3550fdcf1f43b89aaeabaa4559eaae6dc4407e42"; - sha256 = "19b60a3i6kzssd15dg57y4bg49sw41idrsjdi8vr4j5lr5d7gviv"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; - } - { - goPackagePath = "github.com/10gen/escaper"; - fetch = { - type = "git"; - url = "https://github.com/10gen/escaper"; - rev = "17fe61c658dcbdcbf246c783f4f7dc97efde3a8b"; - sha256 = "1iw86lg8ad5gdm46ryf4v431ix834l52lrjvcahq3c4dw1ylnbvl"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; - sha256 = "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; - }; - } - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "0723e7c3d0a317dea811f0fbe4d6edd81908c971"; - sha256 = "1ak35nhlgjpbpnh7v9qvjyfsq52liz3niqfqva76p7a68pblwbr7"; - }; - } - { - goPackagePath = "github.com/jessevdk/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/jessevdk/go-flags"; - rev = "97448c91aac742cbca3d020b3e769013a420a06f"; - sha256 = "0fv3yxvq8m3639a279hq4pf0c52ngqfl5n1vklcfympndrb7zjzj"; - }; - } -] From 873863d6e5ed5b130bbfd2eaf4e934fab8fd4319 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 21 Feb 2018 22:34:24 +0100 Subject: [PATCH 031/133] perl-Gtk2-GladeXML: add homepage and license fields --- pkgs/top-level/perl-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 99dfaf00341a..6ebbd816d4d6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6331,10 +6331,12 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gtk2 Pango pkgs.gnome2.libglade pkgs.gtk2 ]; meta = { + homepage = https://metacpan.org/pod/Gtk2::GladeXML; description = "Create user interfaces directly from Glade XML files"; + license = stdenv.lib.licenses.lgpl2Plus; }; }; - + Gtk2TrayIcon = buildPerlPackage rec { name = "Gtk2-TrayIcon-0.06"; src = fetchurl { From e6b5fefed752ff203b3c7abc17027ad15493679e Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Thu, 22 Feb 2018 01:29:52 +0300 Subject: [PATCH 032/133] configuration-generic | c2hs: language-c 0.7.2 is compatible with GHC 8.4 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 535f962c661a..acd485e332f6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -833,7 +833,7 @@ self: super: { rev = "8b79823c32e234c161baec67fdf7907952ca62b8"; sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz"; }; - }).override { language-c = self.language-c_0_7_0; }; + }).override { language-c = self.language-c_0_7_2; }; # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { From 24777b86d8b07cb063b36a870480c5b390d6d1c1 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Thu, 22 Feb 2018 01:31:33 +0300 Subject: [PATCH 033/133] configuration-ghc84: import manually-defined overrides and update --- .../configuration-ghc-8.4.x.nix | 290 +++++++----------- 1 file changed, 108 insertions(+), 182 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 663f1b686399..3e8ff6b73eaa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,47 +42,6 @@ self: super: { unix = null; xhtml = null; - # Use more recent doctest version to fix build errors. - doctest = self.doctest_0_14_0; - doctest_0_14_0 = dontCheck super.doctest_0_14_0; # https://github.com/sol/doctest/issues/189 - QuickCheck = self.QuickCheck_2_11_3; # needed by doctest-0.14.0 - - # https://github.com/tmhedberg/here/pull/22 - here = doJailbreak super.here; - - # https://github.com/pcapriotti/optparse-applicative/issues/288 - optparse-applicative = dontCheck super.optparse-applicative; - - # https://github.com/haskell/test-framework/issues/35 - test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2; - - # GHC 8.4.x needs newer versions than LTS-10.x offers by default. - ## haddock: panic! (the 'impossible' happened) - ## (GHC version 8.4.20180122 for x86_64-unknown-linux): - ## extractDecl - ## Ambiguous decl for Arg in class: - ## class Example e where - ## type Arg e :: * - ## {-# MINIMAL evaluateExample #-} - ## evaluateExample :: - ## e - ## -> Params - ## -> ActionWith Arg e -> IO () -> ProgressCallback -> IO Result - ## Matches: - ## [] - ## Call stack: - ## CallStack (from HasCallStack): - ## callStackDoc, called at compiler/utils/Outputable.hs:1150:37 in ghc:Outputable - ## pprPanic, called at utils/haddock/haddock-api/src/Haddock/Interface/Create.hs:1013:16 in main:Haddock.Interface.Create - ## Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug - hspec = dontHaddock (dontCheck super.hspec_2_4_8); # test suite causes an infinite loop - - ## Setup: Encountered missing dependencies: - ## QuickCheck >=2.3 && <2.10 - ## builder for ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed with exit code 1 - ## error: build of ‘/nix/store/d60y5jwn5bpgk2p8ps23c129dcw7whg6-test-framework-0.8.2.0.drv’ failed - test-framework = dontCheck self.test-framework_0_8_2_0; - # Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1: # Distribution/Simple/CCompiler.hs:64:10: error: # • No instance for (Semigroup CDialect) @@ -96,34 +55,48 @@ self: super: { ## Shadowed: ## Needs bump to a versioned attribute - ## ## • Could not deduce (Semigroup (Dict a)) ## arising from the superclasses of an instance declaration ## from the context: a constraints = super.constraints_0_10; ## Needs bump to a versioned attribute - ## + ## Issue: https://github.com/sol/doctest/issues/189 + doctest = overrideCabal super.doctest_0_14_0 (drv: { + ## Setup: Encountered missing dependencies: + ## ghc >=7.0 && <8.4 + ## + ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) + doCheck = false; + }); + + ## Needs bump to a versioned attribute ## • Could not deduce (Semigroup (IterT m a)) ## arising from the superclasses of an instance declaration ## from the context: (Monad m, Monoid a) free = super.free_5; - funcmp = overrideCabal super.funcmp_1_9 (drv: { - ## Needs bump to a versioned attribute - ## - ## Needed for (<>) in prelude + ## Needs bump to a versioned attribute + ## Needed for (<>) in prelude + funcmp = super.funcmp_1_9; + + ## Needs bump to a versioned attribute + hspec = overrideCabal super.hspec_2_4_8 (drv: { ## Setup: Encountered missing dependencies: - ## base >=3 && <4.11 - jailbreak = true; + ## hspec-core ==2.4.4, hspec-discover ==2.4.4 + ## + ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11: + ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11: + ## infinite recursion encountered, at undefined position + ## test suite causes an infinite loop + doCheck = false; }); + ## Needs bump to a versioned attribute hspec-core = overrideCabal super.hspec-core_2_4_8 (drv: { - ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.5.1 && <2.11 ## - ## • No instance for (Semigroup Summary) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid Summary’ ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11: ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11: ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at /home/deepfire/src/nixpkgs/pkgs/stdenv/generic/make-derivation.nix:148:11: @@ -134,43 +107,49 @@ self: super: { }); ## Needs bump to a versioned attribute - ## ## breaks hspec: ## Setup: Encountered missing dependencies: ## hspec-discover ==2.4.7 hspec-discover = super.hspec-discover_2_4_8; - lens = overrideCabal super.lens_4_16 (drv: { - ## Needs bump to a versioned attribute - ## - ## • Could not deduce (Apply f) - ## arising from the superclasses of an instance declaration - ## from the context: (Contravariant f, Applicative f) - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; - }); + ## Needs bump to a versioned attribute + ## Ambiguous occurrence ‘<>’ + ## It could refer to either ‘Prelude.<>’, + ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 + language-c = super.language-c_0_7_2; - semigroupoids = overrideCabal super.semigroupoids_5_2_2 (drv: { - ## Needs bump to a versioned attribute - ## - ## • Variable not in scope: mappend :: Seq a -> Seq a -> Seq a - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; - }); + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## free ==4.*, template-haskell >=2.4 && <2.13 + lens = super.lens_4_16; + + ## Needs bump to a versioned attribute + QuickCheck = super.QuickCheck_2_11_3; + + ## Needs bump to a versioned attribute + ## Setup: Encountered missing dependencies: + ## doctest >=0.11.1 && <0.14 + semigroupoids = super.semigroupoids_5_2_2; ## Needs bump to a versioned attribute - ## ## • No instance for (Semigroup Builder) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Builder’ stringbuilder = super.stringbuilder_0_5_1; ## Needs bump to a versioned attribute - ## + ## Issue: https://github.com/haskell/test-framework/issues/35 + test-framework = overrideCabal super.test-framework_0_8_2_0 (drv: { + ## • No instance for (Semigroup (TestOptions' Maybe)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (TestOptions' Maybe)’ + ## + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.3 && <2.10 + doCheck = false; + }); + + ## Needs bump to a versioned attribute ## Module ‘Data.Semigroup’ does not export ‘Monoid(..)’ ## | ## 80 | import Data.Semigroup (Semigroup(..), Monoid(..)) @@ -179,9 +158,8 @@ self: super: { ## On Hackage: + ## On Hackage, awaiting for import tasty = overrideCabal super.tasty (drv: { - ## On Hackage, awaiting for import - ## ## • No instance for (Semigroup OptionSet) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid OptionSet’ @@ -192,9 +170,8 @@ self: super: { ## Upstreamed + ## Upstreamed, awaiting a Hackage release haskell-gi = overrideCabal super.haskell-gi (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## Setup: Encountered missing dependencies: ## haskell-gi-base ==0.20.* src = pkgs.fetchFromGitHub { @@ -203,18 +180,13 @@ self: super: { rev = "30d2e6415c5b57760f8754cd3003eb07483d60e6"; sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr"; }; - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; }); + ## Upstreamed, awaiting a Hackage release haskell-gi-base = overrideCabal super.haskell-gi-base (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## Setup: Encountered missing dependencies: ## haskell-gi-base ==0.21.* - ## cannot build derivation ‘/nix/store/b3d6yr1rzk4hpzg87yk4n5i4321i824f-gi-cairo-1.0.14.drv’: 1 dependencies couldn't be built + ## cannot build derivation ‘/nix/store/qvnrni6j2sz8z26kmjz1hgxfxvggkvjl-gi-cairo-1.0.14.drv’: 1 dependencies couldn't be built src = pkgs.fetchFromGitHub { owner = "haskell-gi"; repo = "haskell-gi"; @@ -224,9 +196,8 @@ self: super: { prePatch = "cd base; "; }); + ## Upstreamed, awaiting a Hackage release haskell-src-exts = overrideCabal super.haskell-src-exts (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## • Could not deduce (Semigroup (ParseResult m)) ## arising from the superclasses of an instance declaration ## from the context: Monoid m @@ -238,9 +209,8 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release lambdacube-compiler = overrideCabal super.lambdacube-compiler (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## Setup: Encountered missing dependencies: ## aeson >=0.9 && <0.12, ## base >=4.7 && <4.10, @@ -255,9 +225,8 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release lambdacube-ir = overrideCabal super.lambdacube-ir (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## Setup: Encountered missing dependencies: ## aeson >=0.9 && <0.12, base >=4.8 && <4.10, vector ==0.11.* src = pkgs.fetchFromGitHub { @@ -269,9 +238,8 @@ self: super: { prePatch = "cd lambdacube-ir.haskell; "; }); + ## Upstreamed, awaiting a Hackage release simple-reflect = overrideCabal super.simple-reflect (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## • No instance for (Semigroup Expr) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Expr’ @@ -283,9 +251,8 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release singletons = overrideCabal super.singletons (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## Setup: Encountered missing dependencies: ## th-desugar ==1.7.* src = pkgs.fetchFromGitHub { @@ -296,9 +263,8 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release th-desugar = overrideCabal super.th-desugar (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## • Could not deduce (MonadIO (DsM q)) ## arising from the 'deriving' clause of a data type declaration ## from the context: Quasi q @@ -310,9 +276,8 @@ self: super: { }; }); + ## Upstreamed, awaiting a Hackage release websockets = overrideCabal super.websockets (drv: { - ## Upstreamed, awaiting a Hackage release - ## ## • No instance for (Semigroup SizeLimit) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid SizeLimit’ @@ -327,9 +292,8 @@ self: super: { ## Unmerged + ## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10 blaze-builder = overrideCabal super.blaze-builder (drv: { - ## Unmerged. PR: https://github.com/lpsmith/blaze-builder/pull/10 - ## ## • No instance for (Semigroup Poke) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Poke’ @@ -341,9 +305,8 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 bytestring-trie = overrideCabal super.bytestring-trie (drv: { - ## Unmerged. PR: https://github.com/wrengr/bytestring-trie/pull/3 - ## ## • Could not deduce (Semigroup (Trie a)) ## arising from the superclasses of an instance declaration ## from the context: Monoid a @@ -364,9 +327,8 @@ self: super: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-or ]; }); + ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: { - ## Unmerged. PR: https://github.com/gtk2hs/gtk2hs/pull/233 - ## ## Setup: Encountered missing dependencies: ## Cabal >=1.24.0.0 && <2.1 src = pkgs.fetchFromGitHub { @@ -378,9 +340,8 @@ self: super: { prePatch = "cd tools; "; }); + ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 hashtables = overrideCabal super.hashtables (drv: { - ## Unmerged. PR: https://github.com/gregorycollins/hashtables/pull/46 - ## ## • No instance for (Semigroup Slot) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Slot’ @@ -392,41 +353,8 @@ self: super: { }; }); - language-c = overrideCabal super.language-c (drv: { - ## Unmerged. PR: https://github.com/visq/language-c/pull/45 - ## - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "language-c"; - rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; - sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; - }; - ## /bin/sh: cabal: command not found - doCheck = false; - }); - - language-c_0_7_0 = overrideCabal super.language-c_0_7_0 (drv: { - ## Unmerged. PR: https://github.com/visq/language-c/pull/45 - ## - ## Ambiguous occurrence ‘<>’ - ## It could refer to either ‘Prelude.<>’, - ## imported from ‘Prelude’ at src/Language/C/Pretty.hs:15:8-24 - src = pkgs.fetchFromGitHub { - owner = "deepfire"; - repo = "language-c"; - rev = "03b120c64c12946d134017f4922b55c6ab4f52f8"; - sha256 = "1mcv46fq37kkd20rhhdbn837han5knjdsgc7ckqp5r2r9m3vy89r"; - }; - ## /bin/sh: cabal: command not found - doCheck = false; - }); - + ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 monadplus = overrideCabal super.monadplus (drv: { - ## Unmerged. PR: https://github.com/hanshoglund/monadplus/pull/3 - ## ## • No instance for (Semigroup (Partial a b)) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid (Partial a b)’ @@ -438,9 +366,8 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158 reflex = overrideCabal super.reflex (drv: { - ## Unmerged. PR: https://github.com/reflex-frp/reflex/pull/158 - ## ## • Could not deduce (Semigroup (Event t a)) ## arising from the superclasses of an instance declaration ## from the context: (Semigroup a, Reflex t) @@ -466,9 +393,8 @@ self: super: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.data-default self.haskell-src-exts self.lens self.monad-control self.prim-uniq self.reflection self.split self.template-haskell self.unbounded-delays ]; }); + ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 regex-tdfa = overrideCabal super.regex-tdfa (drv: { - ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 - ## ## • No instance for (Semigroup (CharMap a)) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid (CharMap a)’ @@ -480,9 +406,8 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/vincenthz/hs-securemem/pull/12 securemem = overrideCabal super.securemem (drv: { - ## Unmerged. PR: https://github.com/vincenthz/hs-securemem/pull/12 - ## ## • No instance for (Semigroup SecureMem) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid SecureMem’ @@ -494,9 +419,8 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/bos/text-format/pull/21 text-format = overrideCabal super.text-format (drv: { - ## Unmerged. PR: https://github.com/bos/text-format/pull/21 - ## ## • No instance for (Semigroup Format) ## arising from the superclasses of an instance declaration ## • In the instance declaration for ‘Monoid Format’ @@ -508,9 +432,8 @@ self: super: { }; }); + ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { - ## Unmerged. PR: https://github.com/ivan-m/wl-pprint-text/pull/17 - ## ## Ambiguous occurrence ‘<>’ ## It could refer to either ‘PP.<>’, ## imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36 @@ -549,13 +472,6 @@ self: super: { jailbreak = true; }); - bytes = overrideCabal super.bytes (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; - }); - cabal-doctest = overrideCabal super.cabal-doctest (drv: { ## Setup: Encountered missing dependencies: ## Cabal >=1.10 && <2.1, base >=4.3 && <4.11 @@ -564,26 +480,17 @@ self: super: { ChasingBottoms = overrideCabal super.ChasingBottoms (drv: { ## Setup: Encountered missing dependencies: - ## base >=4.2 && <4.11 + ## QuickCheck >=2.3 && <2.11, base >=4.2 && <4.11 jailbreak = true; }); - comonad = overrideCabal super.comonad (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; - }); - deepseq-generics = overrideCabal super.deepseq-generics (drv: { ## https://github.com/haskell-hvr/deepseq-generics/pull/4 jailbreak = true; }); - distributive = overrideCabal super.distributive (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies + doctest_0_14_0 = overrideCabal super.doctest_0_14_0 (drv: { + ## uncaught exception: IOException of type NoSuchThing (test/integration/testImport: changeWorkingDirectory: does not exist (No such file or directory)) doCheck = false; }); @@ -611,6 +518,13 @@ self: super: { jailbreak = true; }); + here = overrideCabal super.here (drv: { + ## Setup: Encountered missing dependencies: + ## base >=4.5 && <4.11 + ## https://github.com/tmhedberg/here/pull/22 + jailbreak = true; + }); + integer-logarithms = overrideCabal super.integer-logarithms (drv: { ## Setup: Encountered missing dependencies: ## base >=4.3 && <4.11 @@ -641,10 +555,9 @@ self: super: { jailbreak = true; }); - linear = overrideCabal super.linear (drv: { + megaparsec = overrideCabal super.megaparsec (drv: { ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies + ## QuickCheck >=2.7 && <2.11 doCheck = false; }); @@ -654,6 +567,13 @@ self: super: { jailbreak = true; }); + ## Issue: https://github.com/pcapriotti/optparse-applicative/issues/288 + optparse-applicative = overrideCabal super.optparse-applicative (drv: { + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.8 && <2.11 + doCheck = false; + }); + quickcheck-instances = overrideCabal super.quickcheck-instances (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 @@ -666,6 +586,12 @@ self: super: { jailbreak = true; }); + scientific = overrideCabal super.scientific (drv: { + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.5 && <2.11 + doCheck = false; + }); + tasty-expected-failure = overrideCabal super.tasty-expected-failure (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 @@ -678,6 +604,13 @@ self: super: { jailbreak = true; }); + ## Issue: https://github.com/haskell/test-framework/issues/35 + test-framework-quickcheck2 = overrideCabal super.test-framework-quickcheck2 (drv: { + ## Setup: Encountered missing dependencies: + ## QuickCheck >=2.4 && <2.11 + jailbreak = true; + }); + text-lens = overrideCabal super.text-lens (drv: { ## Setup: Encountered missing dependencies: ## base >=4.9.0.0 && <4.10, @@ -699,13 +632,6 @@ self: super: { jailbreak = true; }); - trifecta = overrideCabal super.trifecta (drv: { - ## Setup: Encountered missing dependencies: - ## ghc >=7.0 && <8.4 - ## /run/current-system/sw/bin/nix-shell: failed to build all dependencies - doCheck = false; - }); - unliftio-core = overrideCabal super.unliftio-core (drv: { ## Setup: Encountered missing dependencies: ## base >=4.5 && <4.11 From 4f79874f5708b16dbf03b80af5f47fd61c9d116d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 22 Feb 2018 00:20:51 +0100 Subject: [PATCH 034/133] llvm_*: fix build by using older gcc on i686-linux Tested all builds before and after. --- pkgs/top-level/all-packages.nix | 36 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5349ccb23ce3..af00f82e7f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6429,29 +6429,41 @@ with pkgs; stdenv = libcxxStdenv; }; - llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 { + llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({ isl = isl_0_12; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); - llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { + llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); - llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 { + llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); - llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 { + llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); - llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 { + llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); - llvmPackages_4 = callPackage ../development/compilers/llvm/4 { + llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({ inherit (stdenvAdapters) overrideCC; - }; + } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; + }); llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({ inherit (stdenvAdapters) overrideCC; From 48154a95dabcb4f0a25ca49aee7f78712cac82b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 22 Feb 2018 00:35:58 +0100 Subject: [PATCH 035/133] abcm2ps: 8.13.19 -> 8.13.20 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 6d50a849a778..f93231d80222 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "abcm2ps-${version}"; - version = "8.13.19"; + version = "8.13.20"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0iv8fzl601rkww9dplajwzlfdb8r7142qdsj8xmvrbwqkaval51f"; + sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx"; }; prePatch = '' From e2398e409345ba242084a0f2fb5cd2f0903a97e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 22 Feb 2018 00:40:40 +0100 Subject: [PATCH 036/133] linuxPackages: 4.9 -> 4.14 /cc #31640. --- 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 16903ae9ebf1..1f05623beb0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13333,7 +13333,7 @@ with pkgs; }); # The current default kernel / kernel modules. - linuxPackages = linuxPackages_4_9; + linuxPackages = linuxPackages_4_14; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! From f3b899d3a6ea7d750879b270810823086fb9ad64 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 00:26:49 +0000 Subject: [PATCH 037/133] libguestfs: fix sandbox build --- pkgs/development/libraries/libguestfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7e7f46673580..d7d0fbe8094d 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = [ "--disable-appliance" "--disable-daemon" ] + configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; From c6463f89132436de320d17c2032f0e432cc145b7 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 11 Oct 2017 16:34:20 -0400 Subject: [PATCH 038/133] easyloggingpp: remove static library MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added a pkg-config file and copied the relevant source file into the nix store. The idea is that the user may now relatively easily include the library’s source file in their project using common CMake features. --- .../libraries/easyloggingpp/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index fe14a1b2b77c..e8b4abd68b3e 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -1,3 +1,6 @@ +# To use this package with a CMake and pkg-config build: +# pkg_check_modules(EASYLOGGINGPP REQUIRED easyloggingpp) +# add_executable(main src/main.cpp ${EASYLOGGINGPP_PREFIX}/include/easylogging++.cc) { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; @@ -10,9 +13,22 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [cmake]; buildInputs = [gtest]; - cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"]; + cmakeFlags = [ "-Dtest=ON" ]; NIX_CFLAGS_COMPILE = "-std=c++11" + stdenv.lib.optionalString stdenv.isLinux " -pthread"; + postInstall = '' + mkdir -p $out/include + cp ../src/easylogging++.cc $out/include + mkdir -p $out/lib/pkgconfig + cat << EOF > $out/lib/pkgconfig/easyloggingpp.pc + Name: easyloggingpp + Description: A C++ Logging Library + Version: ${version} + prefix=$out + includedir=\''${prefix}/include + Cflags: -I\''${includedir} + EOF + ''; meta = { description = "C++ logging library"; homepage = https://muflihun.github.io/easyloggingpp/; From d12c93b62d7c4a0271412406b0064f28d68da228 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 14 Feb 2018 03:18:35 -0500 Subject: [PATCH 039/133] easyloggingpp: 9.95.0 -> 9.96.0 --- .../libraries/easyloggingpp/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index e8b4abd68b3e..80c3f7b100e1 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -4,13 +4,14 @@ { stdenv, fetchFromGitHub, cmake, gtest }: stdenv.mkDerivation rec { name = "easyloggingpp-${version}"; - version = "9.95.0"; + version = "9.96.0"; src = fetchFromGitHub { owner = "muflihun"; repo = "easyloggingpp"; rev = "v${version}"; - sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq"; + sha256 = "134arh13rksfsxa80h6xw104458ihzp1mpblz5sprx5gxkq7yqfv"; }; + nativeBuildInputs = [cmake]; buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; @@ -19,15 +20,6 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/include cp ../src/easylogging++.cc $out/include - mkdir -p $out/lib/pkgconfig - cat << EOF > $out/lib/pkgconfig/easyloggingpp.pc - Name: easyloggingpp - Description: A C++ Logging Library - Version: ${version} - prefix=$out - includedir=\''${prefix}/include - Cflags: -I\''${includedir} - EOF ''; meta = { description = "C++ logging library"; From ce8bd325e671712deea2e99f7c2a5232e7272ea7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 22 Feb 2018 02:20:18 +0200 Subject: [PATCH 040/133] ncurses: Add temporary mirror for sources Issue #35264 --- pkgs/development/libraries/ncurses/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 308a916b0bd0..d63536e75f06 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ + # Remove this mirror on next upgrade, it's only needed because upstream took ncurses-6.0-20171125.tgz down! + "http://bld1.alpinelinux.org/distfiles/v3.5/ncurses-${version}.tgz" + "ftp://ftp.invisible-island.net/ncurses/current/ncurses-${version}.tgz" "https://invisible-mirror.net/archives/ncurses/current/ncurses-${version}.tgz" ]; From b332924e6aac9e34168f43cf7db5181bcd01f0e5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 21 Feb 2018 22:08:58 +0800 Subject: [PATCH 041/133] hugo: 0.32.2 -> 0.36.1 --- pkgs/applications/misc/hugo/default.nix | 16 +-- pkgs/applications/misc/hugo/deps.nix | 141 ++++++++++++++---------- 2 files changed, 92 insertions(+), 65 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 86b806a916c3..f984cb712c7a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,23 +2,23 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.32.2"; + version = "0.36.1"; goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { - owner = "gohugoio"; - repo = "hugo"; - rev = "v${version}"; - sha256 = "0k62sg9rvr4aqzh1r60m456cw8mj6kxjpri2nnj4c2dxmvll8qhr"; + owner = "gohugoio"; + repo = "hugo"; + rev = "v${version}"; + sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z"; }; goDeps = ./deps.nix; - meta = { + meta = with stdenv.lib; { description = "A fast and modern static website engine."; homepage = https://gohugo.io; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; + maintainers = with maintainers; [ schneefux ]; }; } diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 6c870833d1af..cf55ef4b64b2 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "c9f612c1940a4951cd2b55811744632a7b3b3bb2"; - sha256 = "0s1mzb175s96adxfx5vhyazpzfq9j4dzx4sr4n8gj7r8afkqys8h"; + rev = "df4ec264daccb2ecb17bde9134830100701199c5"; + sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "8d868be6e9bf9d5350910bab97a050e49887600f"; - sha256 = "0vy096wzkq1z59in1if486k0adaj1idvma0ax9z1igh9qpq53vd9"; + rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"; + sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx"; }; } { @@ -72,15 +72,6 @@ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; }; } - { - goPackagePath = "github.com/dchest/cssmin"; - fetch = { - type = "git"; - url = "https://github.com/dchest/cssmin"; - rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; - sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; - }; - } { goPackagePath = "github.com/disintegration/imaging"; fetch = { @@ -113,8 +104,26 @@ fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; - sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d"; + sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b"; + sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs"; }; } { @@ -122,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "d965e9adc66deebadcc7d0c6c7598e2a4baa7838"; - sha256 = "0ka8pvby06farlji7pixlrk3zb962qp5xarvy2vxnfrdzlarv7xb"; + rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9"; + sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq"; }; } { @@ -131,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "8aac2701530899b64bdea735a1de8da899815220"; - sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6"; + rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; + sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; }; } { @@ -140,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; + sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; }; } { @@ -163,12 +172,12 @@ }; } { - goPackagePath = "github.com/kardianos/osext"; + goPackagePath = "github.com/joho/godotenv"; fetch = { type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + url = "https://github.com/joho/godotenv"; + rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c"; + sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f"; }; } { @@ -185,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"; - sha256 = "0cnvcd4q88nvxk3q9617dcis2kng2xxsx3iivi5xs8azk290lpyy"; + rev = "2c9e9502788518c97fe44e8955cd069417ee89df"; + sha256 = "1w0rl9rla61m0qbha75jg48yiq1vs91sfy96rgqa6nags9v9b1rl"; }; } { @@ -194,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "a12c3aec81a6a938bf584a4bac567afed9256586"; - sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; + rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923"; + sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj"; }; } { @@ -216,13 +225,31 @@ sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; }; } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "06020f85339e21b2478f756a78e295255ffa4d6a"; - sha256 = "12zb5jh7ri4vna3f24y9g10nzrnz9wbvwnk29wjk3vg0ljia64s9"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/muesli/smartcrop"; + fetch = { + type = "git"; + url = "https://github.com/muesli/smartcrop"; + rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f"; + sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar"; }; } { @@ -230,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "aa0ce51472e0a9982717fd19cf02cb08b1e433aa"; - sha256 = "0355fxpd69wnw56m6dak8k7rlw3q36bql8algg3jkjnxjpgfii4p"; + rev = "ec04da47793482067e2e376d810e1622277368e4"; + sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr"; }; } { @@ -239,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/olekukonko/tablewriter"; - rev = "65fec0d89a572b4367094e2058d3ebe667de3b60"; - sha256 = "116waspmr33dqq3zxj2msnqp2f5v2b6ihk3rxqj7gz25rmcxh5wp"; + rev = "b8a9be070da40449e501c3c4730a889e42d87a9e"; + sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7"; }; } { @@ -248,8 +275,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "0131db6d737cfbbfb678f8b7d92e55e27ce46224"; - sha256 = "10sz1bh45346wdv8i3nffdmpfh8fb6xd0b3r474cs2mk961pw73v"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; }; } { @@ -257,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "6d1ef893fcb01b4f50cb6e57ed7df3e2e627b6b2"; - sha256 = "13p2xq5624b9j2f6j6j76j1h4l2lvmh7w6vcv2f5xsvzjy779r27"; + rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; + sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; }; } { @@ -275,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "57afd63c68602b63ed976de00dd066ccb3c319db"; - sha256 = "0jf9v16m7k46j3mgw469yilhs5p3i32qvzi5954cqyigs6zzqbnk"; + rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163"; + sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l"; }; } { @@ -284,8 +311,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; - sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; }; } { @@ -293,8 +320,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ccaecb155a2177302cb56cae929251a256d0f646"; - sha256 = "1zm89akryx6x0vzvn50736z732gdm3jsx5898annr0zr1cfpf443"; + rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b"; + sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn"; }; } { @@ -311,8 +338,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "12bd96e66386c1960ab0f74ced1362f66f552f7b"; - sha256 = "1abvqd1dl3m7mxv44wvl0vwd50l6qpndzrxk28vyb77x41rc8b2g"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; }; } { @@ -329,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "4c012f6dcd9546820e378d0bdda4d8fc772cdfea"; - sha256 = "0plmm67lkm25ir0lczwh7hmanyilrs1vxmbp8a0dyr282ji1dqm5"; + rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73"; + sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk"; }; } { @@ -365,8 +392,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d866cfc389cec985d6fda2859936a575a55a3ab6"; - sha256 = "10iahqcsiih5hgmqw8yfgv5b3fimfwl1skxg5062avcjjks59f03"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; }; } { @@ -383,8 +410,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "83801418e1b59fb1880e363299581ee543af32ca"; - sha256 = "0ilykaanvnzb27d42kmbr4i37hcn7hgqbx98z945gy63aa8dskji"; + rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd"; + sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg"; }; } { @@ -392,8 +419,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3"; - sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w"; + rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e"; + sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry"; }; } { @@ -401,8 +428,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5"; - sha256 = "15502klds9wwv567vclb9kx95gs8lnyzn4ybsk6l9fc7a67lk831"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; }; } ] From 39f61d5c02fb4271526148c77726a538c86a6145 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 21 Feb 2018 20:55:22 -0600 Subject: [PATCH 042/133] gcc7: fix native and cross-musl build, sync w/gcc6 fixes --- pkgs/development/compilers/gcc/7/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index bbf87eccac75..e8997b1efb06 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -143,6 +143,9 @@ let version = "7.3.0"; "--disable-shared" "--disable-libatomic" # libatomic requires libc "--disable-decimal-float" # libdecnumber requires libc + # maybe only needed on musl, PATH_MAX + # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62 + "--disable-libmpx" ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" else "--with-headers=${getDev libcCross}/include") @@ -166,6 +169,8 @@ let version = "7.3.0"; # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" + # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 + "--disable-libmpx" ] ++ [ "--enable-threads=posix" "--enable-nls" @@ -268,7 +273,7 @@ stdenv.mkDerivation ({ -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' done '' - + stdenv.lib.optionalString (hostPlatform.libc == "musl") + + stdenv.lib.optionalString (targetPlatform.libc == "musl") '' sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' From 1cacfe357b580dd6e9882d89cffa0f23eb8b8f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 22 Feb 2018 04:04:49 +0100 Subject: [PATCH 043/133] nixos.tests.boot-stage1: fix missing libelf --- nixos/tests/boot-stage1.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index eeaca9f50edc..b2e74bff6fcd 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: { kver = config.boot.kernelPackages.kernel.modDirVersion; ksrc = "${kdev}/lib/modules/${kver}/build"; hardeningDisable = [ "pic" ]; + nativeBuildInputs = kdev.moduleBuildDependencies; } '' echo "obj-m += $name.o" > Makefile echo "$source" > "$name.c" From 89343b4d43665e63bb49286f4aa96038d4015d30 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 11:52:04 +0800 Subject: [PATCH 044/133] dbus-broker: 9 -> 11 --- pkgs/os-specific/linux/dbus-broker/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 51d0fb5e1254..6e7034e0c1e1 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig -, dbus, glib, systemd }: +, dbus, glib, linuxHeaders, systemd }: stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "9"; + version = "11"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; + sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; fetchSubmodules = true; }; nativeBuildInputs = [ docutils meson ninja pkgconfig ]; - buildInputs = [ dbus glib systemd ]; + buildInputs = [ dbus glib linuxHeaders systemd ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f05623beb0d..5e3d0c118bba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,7 +1056,10 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; - dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; + # dbus-broker needs kernel 4.14+ + dbus-broker = callPackage ../os-specific/linux/dbus-broker { + linuxHeaders = linuxHeaders_4_15; + }; ioport = callPackage ../os-specific/linux/ioport {}; From 541d8795f6d36cc2929d487c7e3979a91ea2ec62 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 04:18:19 +0000 Subject: [PATCH 045/133] jetbrains-editors: minor updates --- pkgs/applications/editors/jetbrains/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 0e77094b819c..a02773f715c4 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -247,25 +247,25 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.2.3"; /* updated by script */ + version = "2017.3.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */ + sha256 = "1hfy0mxdsvydjjklh8fwdz6f6qxajhngmcmyyzw0gdfhw6ldrv9c"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; - update-channel = "datagrip_2017_2"; + update-channel = "datagrip_2017_3"; }; goland = buildGoland rec { name = "goland-${version}"; - version = "2017.3.1"; /* updated by script */ + version = "2017.3.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0cfjfv01ra67sr8n8ijqwd9zm2yzb1nm447kf0mr5cynr124ch0z"; /* updated by script */ + sha256 = "0bhvj1xqlpy58yq2s5nrhhaw53i913zpr135b1f6r5s22nvkigvm"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -338,15 +338,15 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.2.1"; /* updated by script */ + version = "2017.3.1"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1zviknxamp1y7lrlg5qfj3ijp96z0dqvcr42ca0fbx1xb887wzww"; /* updated by script */ + sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */ }; wmClass = "jetbrains-rider"; - update-channel = "rider_2017_2"; + update-channel = "rider_2017_3"; }; ruby-mine = buildRubyMine rec { From e5a64bd1f12937c6705060e3912150eb661e94bb Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Thu, 22 Feb 2018 15:02:24 +1030 Subject: [PATCH 046/133] awsebcli: 3.12.2 -> 3.12.3 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 5e5f76975bae..f380b62e6a49 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -67,11 +67,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.12.2"; + version = "3.12.3"; src = fetchPypi { inherit pname version; - sha256 = "19sgx43fyq35rqp0q8zbqavgg0k0n46iy1fqsxvw9lf0g0v62pjh"; + sha256 = "0jj6xhvsrgvc5pm05zbd95zvx36ssywq70j6q1kzcdv1flfzzyp9"; }; checkInputs = [ From 49a8b3d22cddc13fab952d29ca4a90672b87c9e0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 12:41:18 +0800 Subject: [PATCH 047/133] packagekit: 1.1.7 -> 1.1.8 --- pkgs/tools/package-management/packagekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 78ef19706d18..4f027560547f 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit"; rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "076rrczmyhapj87pxqldsar5pbz4mid6cm9l1n91zh2q403chdkb"; + sha256 = "0bn9flsjbzlwmlbv2gphqwgzy9sx8ahch28z6dzgak4csbz5wcws"; }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ] From 353b00f2962b8ad23854e039571b6f053e10bc33 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 12:28:33 +0800 Subject: [PATCH 048/133] packagekit-qt: init at 1.0.1 --- .../package-management/packagekit/qt.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/package-management/packagekit/qt.nix diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix new file mode 100644 index 000000000000..c38ef25f3548 --- /dev/null +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, qtbase, qttools, packagekit }: + +stdenv.mkDerivation rec { + name = "packagekit-qt-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "hughsie"; + repo = "PackageKit-Qt"; + rev = "v${version}"; + sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk"; + }; + + buildInputs = [ packagekit ]; + + nativeBuildInputs = [ cmake pkgconfig qttools ]; + + enableParallelBuilding = true; + + meta = packagekit.meta // { + description = "System to facilitate installing and updating packages - Qt"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 911c13fbe29b..091bc24bc4b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4017,6 +4017,8 @@ with pkgs; nix = nixUnstable; }; + packagekit-qt = libsForQt5.callPackage ../tools/package-management/packagekit/qt.nix { }; + packetdrill = callPackage ../tools/networking/packetdrill { }; padthv1 = callPackage ../applications/audio/padthv1 { }; From 41ef8a13b588cc762ac20e7db5e76a488e712148 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 12:48:22 +0800 Subject: [PATCH 049/133] Revert "dbus-broker: 9 -> 11" This reverts commit 89343b4d43665e63bb49286f4aa96038d4015d30. Breaks master. --- pkgs/os-specific/linux/dbus-broker/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 6e7034e0c1e1..51d0fb5e1254 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig -, dbus, glib, linuxHeaders, systemd }: +, dbus, glib, systemd }: stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "11"; + version = "9"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; + sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; fetchSubmodules = true; }; nativeBuildInputs = [ docutils meson ninja pkgconfig ]; - buildInputs = [ dbus glib linuxHeaders systemd ]; + buildInputs = [ dbus glib systemd ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e3d0c118bba..1f05623beb0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1056,10 +1056,7 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; - # dbus-broker needs kernel 4.14+ - dbus-broker = callPackage ../os-specific/linux/dbus-broker { - linuxHeaders = linuxHeaders_4_15; - }; + dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; ioport = callPackage ../os-specific/linux/ioport {}; From 57ce02b574aa5aa5d9da343df6f957dd54bf8fb7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 10:58:22 +0800 Subject: [PATCH 050/133] appstream: 0.10.6 -> 0.11.8 --- .../libraries/appstream/default.nix | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index b79f274b9c3a..61ee182ce627 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,37 +1,55 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool -, xmlto, docbook_xsl, docbook_xml_dtd_45 -, glib, xapian, libxml2, libyaml, gobjectIntrospection +{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext +, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt +, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection , pcre, itstool }: stdenv.mkDerivation rec { name = "appstream-${version}"; - version = "0.10.6"; + version = "0.11.8"; src = fetchFromGitHub { - owner = "ximion"; - repo = "appstream"; - rev = "APPSTREAM_0_10_6"; - sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy"; + owner = "ximion"; + repo = "appstream"; + rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; + sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; }; + patches = [ + # drop this in version 0.11.9 and above + (fetchpatch { + name = "define-location-and-soname.patch"; + url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; + sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; + }) + ]; + nativeBuildInputs = [ - cmake pkgconfig gettext intltool - xmlto docbook_xsl docbook_xml_dtd_45 + meson ninja pkgconfig gettext + libxslt xmlto docbook_xsl docbook_xml_dtd_45 gobjectIntrospection itstool ]; - buildInputs = [ pcre glib xapian libxml2 libyaml ]; + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; - cmakeFlags = '' - -DSTEMMING=off - ''; + prePatch = '' + substituteInPlace meson.build \ + --replace /usr/include ${libstemmer}/include + + substituteInPlace data/meson.build \ + --replace /etc $out/etc + ''; + + mesonFlags = [ + "-Dapidocs=false" + "-Ddocs=false" + "-Dgir=false" + ]; meta = with stdenv.lib; { description = "Software metadata handling library"; homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; - longDescription = - '' + longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides specifications for meta-information which is shipped by upstream projects and From fbde9ea74408baee36fffbd60d2d3d75fe8d4599 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 10:58:35 +0800 Subject: [PATCH 051/133] appstream-qt: init at 0.11.8 --- pkgs/development/libraries/appstream/qt.nix | 25 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/appstream/qt.nix diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix new file mode 100644 index 000000000000..beff83f2365b --- /dev/null +++ b/pkgs/development/libraries/appstream/qt.nix @@ -0,0 +1,25 @@ +{ stdenv, appstream, qtbase, qttools }: + +stdenv.mkDerivation rec { + name = "appstream-qt-${version}"; + inherit (appstream) version src patches prePatch; + + buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; + + nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ]; + + mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + + postInstall = '' + rm -rf $out/{bin,etc,include/appstream,lib/pkgconfig,lib/libappstream.so*,share} + ''; + + preFixup = '' + patchelf --add-needed ${appstream}/lib/libappstream.so.4 \ + $out/lib/libAppStreamQt.so + ''; + + meta = appstream.meta // { + description = "Software metadata handling library - Qt"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 911c13fbe29b..2a9ee3437406 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5755,7 +5755,7 @@ with pkgs; compcert = callPackage ../development/compilers/compcert { }; cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { @@ -8185,6 +8185,8 @@ with pkgs; appstream-glib = callPackage ../development/libraries/appstream-glib { }; + appstream-qt = libsForQt5.callPackage ../development/libraries/appstream/qt.nix { }; + apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { From e17a222f94852bf2e7ea5b7bb983a72233748cac Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 22 Feb 2018 10:41:30 +0300 Subject: [PATCH 052/133] autorandr: embed path to xrandr --- pkgs/tools/misc/autorandr/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index b744e70a4e2f..db2e1fc622fa 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -2,19 +2,23 @@ , python3Packages , fetchFromGitHub , systemd -, xrandr -, makeWrapper }: +, xrandr }: let python = python3Packages.python; - wrapPython = python3Packages.wrapPython; version = "1.4"; in stdenv.mkDerivation { name = "autorandr-${version}"; buildInputs = [ python ]; - nativeBuildInputs = [ makeWrapper ]; + + # no wrapper, as autorandr --batch does os.environ.clear() + buildPhase = '' + substituteInPlace autorandr.py \ + --replace 'os.popen("xrandr' 'os.popen("${xrandr}/bin/xrandr' \ + --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' + ''; installPhase = '' runHook preInstall @@ -40,11 +44,6 @@ in runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/autorandr \ - --prefix PATH : ${xrandr}/bin - ''; - src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; From 4f098b070e79a50013f695cce4c24543f92aac26 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 16:01:15 +0800 Subject: [PATCH 053/133] xdg-desktop-portal-kde: init at 5.12.1 --- pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index baa4b028d013..f00c4e73a887 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -135,6 +135,7 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix new file mode 100644 index 000000000000..115c5f2ac718 --- /dev/null +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, + extra-cmake-modules, gettext, kdoctools, python, + kcoreaddons, knotifications +}: + +mkDerivation { + name = "xdg-desktop-portal-kde"; + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; + buildInputs = [ + kcoreaddons knotifications + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f05623beb0d..f59f576c3bca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19276,7 +19276,7 @@ with pkgs; kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings; + systemsettings xdg-desktop-portal-kde; ### SCIENCE From 022cbdd7e75db244f6182efe362f95cdcb4250f3 Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Thu, 22 Feb 2018 09:08:28 +0100 Subject: [PATCH 054/133] xdg-utils: fix homepage URL --- pkgs/tools/X11/xdg-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index f71bcdef9f4f..52ecdc267340 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://portland.freedesktop.org/wiki/; + homepage = https://www.freedesktop.org/wiki/Software/xdg-utils/; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; From eb5ad9bb0cb57c06690e85770b0d5d65555c0954 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 22 Feb 2018 11:52:04 +0800 Subject: [PATCH 055/133] dbus-broker: 9 -> 11 --- pkgs/os-specific/linux/dbus-broker/default.nix | 11 +++++++---- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 51d0fb5e1254..c97f1b54622a 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchgit, fetchFromGitHub, docutils, meson, ninja, pkgconfig -, dbus, glib, systemd }: +, dbus, glib, linuxHeaders, systemd }: stdenv.mkDerivation rec { name = "dbus-broker-${version}"; - version = "9"; + version = "11"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${version}"; - sha256 = "0q0kbinkkia96bsy7jczlyjz8xgdrfkyx8v6gdr2zflgv0mgbsab"; + sha256 = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b"; fetchSubmodules = true; }; nativeBuildInputs = [ docutils meson ninja pkgconfig ]; - buildInputs = [ dbus glib systemd ]; + buildInputs = [ dbus glib linuxHeaders systemd ]; enableParallelBuilding = true; @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm644 ../README $out/share/doc/dbus-broker/README + + sed -i $out/lib/systemd/{system,user}/dbus-broker.service \ + -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,' ''; checkPhase = "ninja test"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 911c13fbe29b..e6caf1b4bc00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1047,7 +1047,7 @@ with pkgs; devmem2 = callPackage ../os-specific/linux/devmem2 { }; - dbus-broker = callPackage ../os-specific/linux/dbus-broker {}; + dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; ioport = callPackage ../os-specific/linux/ioport {}; @@ -5755,7 +5755,7 @@ with pkgs; compcert = callPackage ../development/compilers/compcert { }; cpp-gsl = callPackage ../development/libraries/cpp-gsl { }; - + # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. cryptol = haskellPackages.cryptol.overrideDerivation (oldAttrs: { From 9ea5a00a4b8e08cbff3749ea5ed6ba5f703f6761 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 22 Feb 2018 17:33:11 +0800 Subject: [PATCH 056/133] go: Remove unused patches --- .../compilers/go/new-binutils.patch | 194 ------------------ pkgs/development/compilers/go/strip.patch | 12 -- 2 files changed, 206 deletions(-) delete mode 100644 pkgs/development/compilers/go/new-binutils.patch delete mode 100644 pkgs/development/compilers/go/strip.patch diff --git a/pkgs/development/compilers/go/new-binutils.patch b/pkgs/development/compilers/go/new-binutils.patch deleted file mode 100644 index a547e3ab9b9a..000000000000 --- a/pkgs/development/compilers/go/new-binutils.patch +++ /dev/null @@ -1,194 +0,0 @@ -https://github.com/golang/go/issues/13114 -https://gnats.netbsd.org/50777 - ---- a/src/cmd/6l/asm.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/6l/asm.c 2016-03-10 21:00:29.032083210 +0100 -@@ -118,6 +118,8 @@ - return; - - case 256 + R_X86_64_GOTPCREL: -+ case 256 + R_X86_64_GOTPCRELX: -+ case 256 + R_X86_64_REX_GOTPCRELX: - if(targ->type != SDYNIMPORT) { - // have symbol - if(r->off >= 2 && s->p[r->off-2] == 0x8b) { ---- a/src/cmd/8l/asm.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/8l/asm.c 2016-03-10 21:02:16.702064080 +0100 -@@ -115,6 +115,7 @@ - return; - - case 256 + R_386_GOT32: -+ case 256 + R_386_GOT32X: - if(targ->type != SDYNIMPORT) { - // have symbol - if(r->off >= 2 && s->p[r->off-2] == 0x8b) { ---- a/src/cmd/ld/elf.h 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/ld/elf.h 2016-03-10 21:00:29.033083211 +0100 -@@ -478,32 +478,47 @@ - * Relocation types. - */ - --#define R_X86_64_NONE 0 /* No relocation. */ --#define R_X86_64_64 1 /* Add 64 bit symbol value. */ --#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ --#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ --#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ --#define R_X86_64_COPY 5 /* Copy data from shared object. */ --#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ --#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ --#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ --#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ --#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ --#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ --#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ --#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ --#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ --#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ --#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ --#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ --#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ --#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ --#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ --#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ --#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ --#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ -- --#define R_X86_64_COUNT 24 /* Count of defined relocation types. */ -+#define R_X86_64_NONE 0 -+#define R_X86_64_64 1 -+#define R_X86_64_PC32 2 -+#define R_X86_64_GOT32 3 -+#define R_X86_64_PLT32 4 -+#define R_X86_64_COPY 5 -+#define R_X86_64_GLOB_DAT 6 -+#define R_X86_64_JMP_SLOT 7 -+#define R_X86_64_RELATIVE 8 -+#define R_X86_64_GOTPCREL 9 -+#define R_X86_64_32 10 -+#define R_X86_64_32S 11 -+#define R_X86_64_16 12 -+#define R_X86_64_PC16 13 -+#define R_X86_64_8 14 -+#define R_X86_64_PC8 15 -+#define R_X86_64_DTPMOD64 16 -+#define R_X86_64_DTPOFF64 17 -+#define R_X86_64_TPOFF64 18 -+#define R_X86_64_TLSGD 19 -+#define R_X86_64_TLSLD 20 -+#define R_X86_64_DTPOFF32 21 -+#define R_X86_64_GOTTPOFF 22 -+#define R_X86_64_TPOFF32 23 -+#define R_X86_64_PC64 24 -+#define R_X86_64_GOTOFF64 25 -+#define R_X86_64_GOTPC32 26 -+#define R_X86_64_GOT64 27 -+#define R_X86_64_GOTPCREL64 28 -+#define R_X86_64_GOTPC64 29 -+#define R_X86_64_GOTPLT64 30 -+#define R_X86_64_PLTOFF64 31 -+#define R_X86_64_SIZE32 32 -+#define R_X86_64_SIZE64 33 -+#define R_X86_64_GOTPC32_TLSDEC 34 -+#define R_X86_64_TLSDESC_CALL 35 -+#define R_X86_64_TLSDESC 36 -+#define R_X86_64_IRELATIVE 37 -+#define R_X86_64_PC32_BND 40 -+#define R_X86_64_GOTPCRELX 41 -+#define R_X86_64_REX_GOTPCRELX 42 - - - #define R_ALPHA_NONE 0 /* No reloc */ -@@ -581,39 +596,42 @@ - #define R_ARM_COUNT 38 /* Count of defined relocation types. */ - - --#define R_386_NONE 0 /* No relocation. */ --#define R_386_32 1 /* Add symbol value. */ --#define R_386_PC32 2 /* Add PC-relative symbol value. */ --#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ --#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ --#define R_386_COPY 5 /* Copy data from shared object. */ --#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ --#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ --#define R_386_RELATIVE 8 /* Add load address of shared object. */ --#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ --#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ --#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ --#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ --#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */ --#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ --#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ --#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ --#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ --#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */ --#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */ --#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */ --#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ --#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */ --#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ --#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */ --#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ --#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ --#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ --#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ -- --#define R_386_COUNT 38 /* Count of defined relocation types. */ -+#define R_386_NONE 0 -+#define R_386_32 1 -+#define R_386_PC32 2 -+#define R_386_GOT32 3 -+#define R_386_PLT32 4 -+#define R_386_COPY 5 -+#define R_386_GLOB_DAT 6 -+#define R_386_JMP_SLOT 7 -+#define R_386_RELATIVE 8 -+#define R_386_GOTOFF 9 -+#define R_386_GOTPC 10 -+#define R_386_TLS_TPOFF 14 -+#define R_386_TLS_IE 15 -+#define R_386_TLS_GOTIE 16 -+#define R_386_TLS_LE 17 -+#define R_386_TLS_GD 18 -+#define R_386_TLS_LDM 19 -+#define R_386_TLS_GD_32 24 -+#define R_386_TLS_GD_PUSH 25 -+#define R_386_TLS_GD_CALL 26 -+#define R_386_TLS_GD_POP 27 -+#define R_386_TLS_LDM_32 28 -+#define R_386_TLS_LDM_PUSH 29 -+#define R_386_TLS_LDM_CALL 30 -+#define R_386_TLS_LDM_POP 31 -+#define R_386_TLS_LDO_32 32 -+#define R_386_TLS_IE_32 33 -+#define R_386_TLS_LE_32 34 -+#define R_386_TLS_DTPMOD32 35 -+#define R_386_TLS_DTPOFF32 36 -+#define R_386_TLS_TPOFF32 37 -+#define R_386_TLS_GOTDESC 39 -+#define R_386_TLS_DESC_CALL 40 -+#define R_386_TLS_DESC 41 -+#define R_386_IRELATIVE 42 -+#define R_386_GOT32X 43 - - #define R_PPC_NONE 0 /* No relocation. */ - #define R_PPC_ADDR32 1 ---- a/src/cmd/ld/ldelf.c 2015-09-23 06:20:05.000000000 +0200 -+++ b/src/cmd/ld/ldelf.c 2016-03-10 21:00:29.033083211 +0100 -@@ -888,12 +888,15 @@ - case R('6', R_X86_64_PC32): - case R('6', R_X86_64_PLT32): - case R('6', R_X86_64_GOTPCREL): -+ case R('6', R_X86_64_GOTPCRELX): -+ case R('6', R_X86_64_REX_GOTPCRELX): - case R('8', R_386_32): - case R('8', R_386_PC32): - case R('8', R_386_GOT32): - case R('8', R_386_PLT32): - case R('8', R_386_GOTOFF): - case R('8', R_386_GOTPC): -+ case R('8', R_386_GOT32X): - *siz = 4; - break; - case R('6', R_X86_64_64): diff --git a/pkgs/development/compilers/go/strip.patch b/pkgs/development/compilers/go/strip.patch deleted file mode 100644 index 7b036802d51c..000000000000 --- a/pkgs/development/compilers/go/strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go -index 0b14725..a7608ce 100644 ---- a/src/cmd/go/build.go -+++ b/src/cmd/go/build.go -@@ -2310,6 +2310,7 @@ func (gcToolchain) ld(b *builder, root *action, out string, allactions []*action - } - } - var ldflags []string -+ ldflags = append(ldflags, "-s") - if buildContext.InstallSuffix != "" { - ldflags = append(ldflags, "-installsuffix", buildContext.InstallSuffix) - } From 804a21ea0063fbe8da20eb9404bf4ef275381147 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 22 Feb 2018 17:34:22 +0800 Subject: [PATCH 057/133] go_1_6: Go 1.6 is EOL --- pkgs/development/compilers/go/1.6.nix | 168 ------------------ .../compilers/go/fix-systime-1.6.patch | 45 ----- .../compilers/go/remove-tools-1.5.patch | 48 ----- pkgs/top-level/all-packages.nix | 8 - 4 files changed, 269 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.6.nix delete mode 100644 pkgs/development/compilers/go/fix-systime-1.6.patch delete mode 100644 pkgs/development/compilers/go/remove-tools-1.5.patch diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix deleted file mode 100644 index 0eebc92ee594..000000000000 --- a/pkgs/development/compilers/go/1.6.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand -, perl, which, pkgconfig, patch, fetchpatch -, pcre -, Security, Foundation, bash }: - -let - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.6.4"; - - src = fetchurl { - url = "https://github.com/golang/go/archive/go${version}.tar.gz"; - sha256 = "1212pijypippg3sq9c9645kskq4ib73y1f8cv0ka6n279smk0mq9"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ - Security Foundation - ]; - - hardeningDisable = [ "all" ]; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - topdir=$PWD - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go - patchShebangs ./ # replace /bin/bash - - # This script produces another script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/test.bash \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - '' + lib.optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + lib.optionalString stdenv.isDarwin '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - rm src/crypto/x509/root_darwin_test.go src/crypto/x509/verify_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - - mkdir $topdir/dirtyhacks - cat < $topdir/dirtyhacks/clang - #!${bash}/bin/bash - $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - exit $? - EOF - chmod +x $topdir/dirtyhacks/clang - PATH=$topdir/dirtyhacks:$PATH - ''; - - patches = [ - ./remove-tools-1.5.patch - ./creds-test.patch - ./fix-systime-1.6.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"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - echo Building - ./all.bash - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.6"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/fix-systime-1.6.patch b/pkgs/development/compilers/go/fix-systime-1.6.patch deleted file mode 100644 index e4a3932001e5..000000000000 --- a/pkgs/development/compilers/go/fix-systime-1.6.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s -index e09b906ba5..fa8ff2f65c 100644 ---- a/src/runtime/sys_darwin_amd64.s -+++ b/src/runtime/sys_darwin_amd64.s -@@ -157,6 +157,7 @@ systime: - // Fall back to system call (usually first call in this thread). - MOVQ SP, DI - MOVQ $0, SI -+ MOVQ $0, DX // required as of Sierra; Issue 16570 - MOVL $(0x2000000+116), AX - SYSCALL - CMPQ AX, $0 -diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go -index 70b53b87f4..79083117b6 100644 ---- a/src/syscall/syscall_darwin_amd64.go -+++ b/src/syscall/syscall_darwin_amd64.go -@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) { - } - - //sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error) --func Gettimeofday(tv *Timeval) (err error) { -- // The tv passed to gettimeofday must be non-nil -- // but is otherwise unused. The answers come back -- // in the two registers. -+func Gettimeofday(tv *Timeval) error { -+ // The tv passed to gettimeofday must be non-nil. -+ // Before macOS Sierra (10.12), tv was otherwise unused and -+ // the answers came back in the two registers. -+ // As of Sierra, gettimeofday return zeros and populates -+ // tv itself. - sec, usec, err := gettimeofday(tv) -- tv.Sec = sec -- tv.Usec = usec -- return err -+ if err != nil { -+ return err -+ } -+ if sec != 0 || usec != 0 { -+ tv.Sec = sec -+ tv.Usec = usec -+ } -+ return nil - } - - func SetKevent(k *Kevent_t, fd, mode, flags int) { diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch deleted file mode 100644 index 5aad4b4abc3f..000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.5.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index 61e3d8d..b8422ad 100644 ---- a/src/cmd/go/pkg.go -+++ b/src/cmd/go/pkg.go -@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{ - "cmd/trace": toTool, - "cmd/vet": toTool, - "cmd/yacc": toTool, -- "golang.org/x/tools/cmd/godoc": toBin, -+ "nixos.org/x/tools/cmd/godoc": toBin, - "code.google.com/p/go.tools/cmd/cover": stalePath, - "code.google.com/p/go.tools/cmd/godoc": stalePath, - "code.google.com/p/go.tools/cmd/vet": stalePath, -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87e11668d7b6..0e12ff17fbd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6200,10 +6200,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_6 = callPackage ../development/compilers/go/1.6.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - go_1_7 = callPackage ../development/compilers/go/1.7.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; @@ -11854,10 +11850,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo16Package = callPackage ../development/go-modules/generic { - go = go_1_6; - }; - buildGo17Package = callPackage ../development/go-modules/generic { go = go_1_7; }; From b144524ec8dc30da11eb05ed097eb1ec885d3619 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 22 Feb 2018 17:35:04 +0800 Subject: [PATCH 058/133] go_1_7: Go 1.7 is EOL --- pkgs/development/compilers/go/1.7.nix | 168 ------------------ .../compilers/go/remove-tools-1.7.patch | 35 ---- pkgs/top-level/all-packages.nix | 8 - 3 files changed, 211 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.7.nix delete mode 100644 pkgs/development/compilers/go/remove-tools-1.7.patch diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix deleted file mode 100644 index 82ed9b53c60f..000000000000 --- a/pkgs/development/compilers/go/1.7.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, fetchpatch -, pcre, cacert -, Security, Foundation, bash }: - -let - - inherit (stdenv.lib) optional optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.7.6"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch ]; - buildInputs = [ cacert pcre ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isDarwin '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - ''; - - patches = - [ ./remove-tools-1.7.patch - ./ssl-cert-file.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"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - installPhase = '' - cp -r . $GOROOT - ( cd $GOROOT/src && ./all.bash ) - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.7"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch deleted file mode 100644 index b53e48e1a515..000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 9706b8b..f250751 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1513,7 +1513,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 441dcd9..a50277e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -230,6 +230,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e12ff17fbd0..908122a3b5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6200,10 +6200,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_7 = callPackage ../development/compilers/go/1.7.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - go_1_8 = callPackage ../development/compilers/go/1.8.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; @@ -11850,10 +11846,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo17Package = callPackage ../development/go-modules/generic { - go = go_1_7; - }; - buildGo18Package = callPackage ../development/go-modules/generic { go = go_1_8; }; From b846847a3292e885c78a0e4117bf02cd7759439a Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Thu, 22 Feb 2018 10:55:44 +0100 Subject: [PATCH 059/133] trezor: Add pyblake2, click, libusb1 and ecdsa as propagatedBuildInput --- pkgs/development/python-modules/trezor/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index d283465b43c5..16fc8530a0da 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic -, requests +{ lib, fetchPypi, buildPythonPackage, + protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1 }: buildPythonPackage rec { @@ -12,9 +12,7 @@ buildPythonPackage rec { sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de"; }; - propagatedBuildInputs = [ protobuf hidapi requests mnemonic ]; - - buildInputs = [ ecdsa ]; + propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ]; # There are no actual tests: "ImportError: No module named tests" doCheck = false; From a14ab86e315bbaf996e0fa2da082ad3120376739 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 22 Feb 2018 11:30:40 +0100 Subject: [PATCH 060/133] fcitx-engines.table-other: 0.2.3 -> 0.2.4 --- .../fcitx-engines/fcitx-table-other/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix index 227e17347c1f..929cdb30b919 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix @@ -1,22 +1,16 @@ -{ stdenv, fetchurl, fetchpatch, cmake, fcitx, gettext }: +{ stdenv, fetchurl, cmake, fcitx, gettext }: stdenv.mkDerivation rec { name = "fcitx-table-other-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz"; - sha256 = "12fqbsjrpx5pndx2jf7fksrlp01a4yxz62h2vpxrbkpk73ljly4v"; + sha256 = "1di60lr6l5k2sdwi3yrc0hl89j2k0yipayrsn803vd040w1fgfhq"; }; buildInputs = [ cmake fcitx gettext ]; - patches = [ - (fetchpatch { url = https://sources.debian.net/data/main/f/fcitx-table-other/0.2.3-3/debian/patches/0001-table-other-fix-build.patch; - sha256 = "06n1df9szfgfjm5al8r1mvp4cib5h0cm601kwngl6k1vqyyjzg1j"; - }) - ]; - preInstall = '' substituteInPlace tables/cmake_install.cmake \ --replace ${fcitx} $out From 831ef4756e372bfff77332713ae319daa3a42742 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 22 Feb 2018 18:43:00 +0800 Subject: [PATCH 061/133] electrum: Patch compat with python trezor>=0.9.0 --- pkgs/applications/misc/electrum/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 6835db35b606..40fc10a56731 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3, python3Packages, zbar }: +{ stdenv, fetchurl, python3, python3Packages, zbar, fetchpatch }: python3Packages.buildPythonApplication rec { name = "electrum-${version}"; @@ -9,6 +9,15 @@ python3Packages.buildPythonApplication rec { sha256 = "01dnqiazjl2avrmdiq68absjvcfv24446y759z2s9dwk8ywzjkrg"; }; + patches = [ + # Trezor compat patch should be included in electrum > 3.0.6 + (fetchpatch { + name = "trezor-compat.patch"; + url = "https://patch-diff.githubusercontent.com/raw/spesmilo/electrum/pull/3621.patch"; + sha256 = "1bk1r2ikhnvw1fpfh71y4za2lnskcbkv50k8ynjxi5slx2wrfpl0"; + }) + ]; + propagatedBuildInputs = with python3Packages; [ dnspython ecdsa From 6e286742470928b5ed238e3ef99c3f72ae5719ef Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 22 Feb 2018 13:18:10 +0200 Subject: [PATCH 062/133] sit: init at 0.1.2 --- .../version-management/sit/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/version-management/sit/default.nix diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix new file mode 100644 index 000000000000..5a4fdbe9316c --- /dev/null +++ b/pkgs/applications/version-management/sit/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "sit-${version}"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "sit-it"; + repo = "sit"; + rev = "v${version}"; + sha256 = "0fvxv9x971s5qvhw6gpbw9ggsxynkwfy1fn5rln50gn9yrjf7612"; + }; + + cargoSha256 = "1y8a8a9jn9f374sy5fs1snmpiqyckqc0aw7idwnpfr912c1zzrxw"; + + meta = with stdenv.lib; { + description = "SCM-agnostic, file-based, offline-first, immutable issue tracker"; + homepage = http://sit-it.org/; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b643ab1f6eb6..f1049e2e3bb5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4688,6 +4688,8 @@ with pkgs; sisco.lv2 = callPackage ../applications/audio/sisco.lv2 { }; + sit = callPackage ../applications/version-management/sit { }; + skippy-xd = callPackage ../tools/X11/skippy-xd {}; sks = callPackage ../servers/sks { inherit (ocamlPackages_4_02) ocaml camlp4; }; From 1a9316e47d378d3a56e0d21fecaff017bb50e3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Feb 2018 11:35:21 +0000 Subject: [PATCH 063/133] go_1_10: init at 1.10 and set as default Changes are minor from 1.9, so let's just set it as default straight. --- pkgs/development/compilers/go/1.10.nix | 187 ++++++++++++++++++ pkgs/development/compilers/go/1.9.nix | 2 +- .../compilers/go/creds-test-1.9.patch | 14 ++ .../development/compilers/go/creds-test.patch | 23 ++- .../compilers/go/remove-test-pie.patch | 38 ++++ pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 256 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/compilers/go/1.10.nix create mode 100644 pkgs/development/compilers/go/creds-test-1.9.patch create mode 100644 pkgs/development/compilers/go/remove-test-pie.patch diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix new file mode 100644 index 000000000000..4105da3633ec --- /dev/null +++ b/pkgs/development/compilers/go/1.10.nix @@ -0,0 +1,187 @@ +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin +, perl, which, pkgconfig, patch, procps +, pcre, cacert, llvm +, Security, Foundation, bash +, makeWrapper, git, subversion, mercurial, bazaar }: + +let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + +in + +stdenv.mkDerivation rec { + name = "go-${version}"; + version = "1.10"; + + src = fetchFromGitHub { + owner = "golang"; + repo = "go"; + rev = "go${version}"; + sha256 = "1dzs1mz3zxgg1qyi2lrlxdz1lsvazxvmj9cb69pgqnwjlh3jpw0l"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] + ++ optionals stdenv.isLinux [ procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/areturn' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/areturn' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go + '' + optionalString stdenv.isArm '' + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + 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 + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go + sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestRead0/areturn' src/os/os_test.go + sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + + sed -i '1 a\exit 0' misc/cgo/errors/test.bash + ''; + + patches = [ + ./remove-tools-1.9.patch + ./ssl-cert-file-1.9.patch + ./remove-test-pie.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" + substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil + ''; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.isArm then "arm" + else if stdenv.isAarch64 then "arm64" + else throw "Unsupported system"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # The go build actually checks for CC=*/clang and does something different, so we don't + # just want the generic `cc` here. + CC = if stdenv.isDarwin then "clang" else "cc"; + + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ulimit -a + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + + installPhase = '' + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) + + # (https://github.com/golang/go/wiki/GoGetTools) + wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" + ''; + + preFixup = '' + rm -r $out/share/go/pkg/bootstrap + ln -s $out/share/go/bin $out/bin + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ go_bootstrap ]; + + meta = with stdenv.lib; { + branch = "1.9"; + homepage = http://golang.org/; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej wkennington ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index f1017d4a48c4..c866212170c4 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.9.patch ./ssl-cert-file-1.9.patch - ./creds-test.patch + ./creds-test-1.9.patch ./remove-test-pie-1.9.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch diff --git a/pkgs/development/compilers/go/creds-test-1.9.patch b/pkgs/development/compilers/go/creds-test-1.9.patch new file mode 100644 index 000000000000..09f78959ff9c --- /dev/null +++ b/pkgs/development/compilers/go/creds-test-1.9.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go +--- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 +@@ -62,8 +62,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } + } + diff --git a/pkgs/development/compilers/go/creds-test.patch b/pkgs/development/compilers/go/creds-test.patch index 09f78959ff9c..6a18e6cc42e8 100644 --- a/pkgs/development/compilers/go/creds-test.patch +++ b/pkgs/development/compilers/go/creds-test.patch @@ -1,14 +1,13 @@ -diff -ru -x '*~' ./result/src/syscall/creds_test.go go-go1.7.4-src/src/syscall/creds_test.go ---- ./result/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 -+++ go-go1.7.4-src/src/syscall/creds_test.go 2016-12-21 14:06:39.559932164 +0100 -@@ -62,8 +62,8 @@ - if sys, ok := err.(*os.SyscallError); ok { - err = sys.Err +--- source.org/src/syscall/creds_test.go 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/syscall/creds_test.go 2018-02-22 10:43:47.223615358 +0000 +@@ -76,8 +76,8 @@ + if sys, ok := err.(*os.SyscallError); ok { + err = sys.Err + } +- if err != syscall.EPERM { +- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) ++ if err != syscall.EPERM && err != syscall.EINVAL { ++ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) + } } -- if err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err != syscall.EPERM && err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } - } diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch new file mode 100644 index 000000000000..90498be18eb7 --- /dev/null +++ b/pkgs/development/compilers/go/remove-test-pie.patch @@ -0,0 +1,38 @@ +--- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 ++++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 +@@ -526,21 +526,6 @@ + }) + } + +- // Test internal linking of PIE binaries where it is supported. +- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { +- // Issue 18243: We don't have a way to set the default +- // dynamic linker used in internal linking mode. So +- // this test is skipped on Alpine. +- t.tests = append(t.tests, distTest{ +- name: "pie_internal", +- heading: "internal linking of -buildmode=pie", +- fn: func(dt *distTest) error { +- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) +- return nil +- }, +- }) +- } +- + // sync tests + t.tests = append(t.tests, distTest{ + name: "sync_cpu", +@@ -705,11 +690,11 @@ + heading: "API check", + fn: func(dt *distTest) error { + if t.compileOnly { +-return nil ++ return nil + t.addCmd(dt, "src", "go", "build", filepath.Join(goroot, "src/cmd/api/run.go")) + return nil + } +-return nil ++ return nil + t.addCmd(dt, "src", "go", "run", filepath.Join(goroot, "src/cmd/api/run.go")) + return nil + }, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 140da3dd2f2b..b07ead36b3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6216,7 +6216,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security Foundation; }; - go = go_1_9; + go_1_10 = callPackage ../development/compilers/go/1.10.nix { + inherit (darwin.apple_sdk.frameworks) Security Foundation; + }; + + go = go_1_10; go-repo-root = callPackage ../development/tools/go-repo-root { }; From a7ab32ba9884a27d438bc9affe47d5d1af3695df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Feb 2018 11:46:30 +0000 Subject: [PATCH 064/133] cargo: unbreak aarch64 build --- pkgs/development/compilers/rust/cargo.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index fecf80a44853..46caabf33917 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { passthru.rustc = rustc; + # changes hash of vendor directory otherwise on aarch64 + dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then "1" else null; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cacert file curl python openssl cmake zlib makeWrapper libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; From ee5602112e26582d95f2ede707a9257ee6801885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Feb 2018 12:06:58 +0000 Subject: [PATCH 065/133] go_1_10: misc/cgo/errors/test.bash no longer exists --- pkgs/development/compilers/go/1.10.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 4105da3633ec..db62b31b9e72 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -111,8 +111,6 @@ stdenv.mkDerivation rec { sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash ''; patches = [ From 37ef0b8ab694ef808444a6c71cad5e97bd4c8cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Feb 2018 12:16:08 +0000 Subject: [PATCH 066/133] go_1_10: add mic92 and velovix to maintainers cc @velovix --- pkgs/development/compilers/go/1.10.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index db62b31b9e72..145f6a17978d 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { homepage = http://golang.org/; description = "The Go Programming language"; license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej wkennington ]; + maintainers = with maintainers; [ cstrahan orivej velovix mic92 ]; platforms = platforms.linux ++ platforms.darwin; }; } From 394981c23677807fae1c3116191b1b76ba32047e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 22 Feb 2018 12:17:31 +0000 Subject: [PATCH 067/133] go_1_10: cleanup remove-test-pie.patch --- .../development/compilers/go/remove-test-pie.patch | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch index 90498be18eb7..fb8e116af76f 100644 --- a/pkgs/development/compilers/go/remove-test-pie.patch +++ b/pkgs/development/compilers/go/remove-test-pie.patch @@ -22,17 +22,3 @@ // sync tests t.tests = append(t.tests, distTest{ name: "sync_cpu", -@@ -705,11 +690,11 @@ - heading: "API check", - fn: func(dt *distTest) error { - if t.compileOnly { --return nil -+ return nil - t.addCmd(dt, "src", "go", "build", filepath.Join(goroot, "src/cmd/api/run.go")) - return nil - } --return nil -+ return nil - t.addCmd(dt, "src", "go", "run", filepath.Join(goroot, "src/cmd/api/run.go")) - return nil - }, From 2977296f37f9fdbb144c2a08fae84c3e41ce364b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 22 Feb 2018 07:53:10 -0500 Subject: [PATCH 068/133] connman: fix build with upstream patch This is needed for newer kernels, apparently. Fixes #35332. --- pkgs/tools/networking/connman/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index f40b1ce6f4c9..45fabeee1393 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, +{ stdenv, fetchurl, fetchpatch, pkgconfig, openconnect, file, gawk, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, wpa_supplicant, readline6, pptp, ppp }: @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig file gawk ]; + patches = [ + (fetchpatch { + name = "header-include.patch"; + url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24"; + sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf"; + }) + ]; + preConfigure = '' export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant export PPPD=${ppp}/sbin/pppd From 9f71de75aff50ca8bb4392ab7ea979f41da5f031 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 13 Nov 2017 13:42:20 -0500 Subject: [PATCH 069/133] rtl8723bs: Only include in enableAllFirmware if valid --- nixos/modules/hardware/all-firmware.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index afaa65f6ce35..b61acf1815d9 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -37,8 +37,9 @@ in { hardware.firmware = with pkgs; [ firmwareLinuxNonfree intel2200BGFirmware - rtl8723bs-firmware rtl8192su-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ + rtl8723bs-firmware ]; }) (mkIf cfg.enableAllFirmware { From fc42c85baf894b8e86d7f5828b04eadac3a4f8f4 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Wed, 21 Feb 2018 21:48:38 +0200 Subject: [PATCH 070/133] keepass-keepassrpc: init at 1.7.3.1 Repackaged as the name was confusing and there is a dedicated repository for this plugin, ready to use and with the fresh plugin version. Left an alias to an old package name. --- .../misc/keepass-plugins/keefox/default.nix | 34 ------------------ .../keepass-plugins/keepassrpc/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +-- 3 files changed, 38 insertions(+), 36 deletions(-) delete mode 100644 pkgs/applications/misc/keepass-plugins/keefox/default.nix create mode 100644 pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix deleted file mode 100644 index 0215c5a71c2f..000000000000 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildEnv, fetchurl, mono, unzip }: - -let - version = "1.6.4"; - drv = stdenv.mkDerivation { - name = "keefox-${version}"; - src = fetchurl { - url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "0nj4l9ssyfwbl1pxgxvd2h9q0mqhx7i0yzm4a2xjqlqwam534d1w"; - }; - - meta = { - description = "Keepass plugin for keefox Firefox add-on"; - homepage = http://keefox.org; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.mjanczyk ]; - }; - - buildInputs = [ unzip ]; - - pluginFilename = "KeePassRPC.plgx"; - - unpackCmd = "unzip $src deps/$pluginFilename "; - sourceRoot = "deps"; - - 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/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix new file mode 100644 index 000000000000..b2980bcd8aea --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.7.3.1"; + drv = stdenv.mkDerivation { + name = "keepassrpc-${version}"; + src = fetchurl { + url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx"; + sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k"; + }; + + meta = with stdenv.lib; { + description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; + homepage = https://github.com/kee-org/keepassrpc; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl2; + maintainers = with maintainers; [ mjanczyk svsdep ]; + }; + + pluginFilename = "KeePassRPC.plgx"; + + unpackCmd = '' + mkdir deps/ + cp -p $src deps/$pluginFilename + ''; + sourceRoot = "deps"; + + 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 b643ab1f6eb6..c59bb361ce44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15237,10 +15237,11 @@ with pkgs; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; - keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; - keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; + keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; + keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; From 76879b83ac55e1454a7e5a5de92740d2577d14d7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Feb 2018 08:33:27 -0600 Subject: [PATCH 071/133] release-cross: minor cleanup, add aarch64-musl --- pkgs/top-level/release-cross.nix | 33 +++++++++++++------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 61cf865371df..74394379b399 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -50,6 +50,15 @@ let buildPackages.binutils = darwin; }; + rpiCommon = linuxCommon // { + vim = nativePlatforms; + unzip = nativePlatforms; + ddrescue = nativePlatforms; + lynx = nativePlatforms; + patchelf = nativePlatforms; + buildPackages.binutils = nativePlatforms; + mpg123 = nativePlatforms; + }; in { @@ -111,30 +120,14 @@ in fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon; /* Linux on Raspberrypi */ - rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // { - vim = nativePlatforms; - unzip = nativePlatforms; - ddrescue = nativePlatforms; - lynx = nativePlatforms; - patchelf = nativePlatforms; - buildPackages.binutils = nativePlatforms; - mpg123 = nativePlatforms; - }); + rpi = mapTestOnCross lib.systems.examples.raspberryPi rpiCommon; + rpi-musl = mapTestOnCross lib.systems.examples.muslpi rpiCommon; /* Linux on Aarch64 (TODO make android for real) */ - android = mapTestOnCross lib.systems.examples.aarch64-multiplatform (linuxCommon // { - }); + android = mapTestOnCross lib.systems.examples.aarch64-multiplatform linuxCommon; + aarch64-musl = mapTestOnCross lib.systems.examples.aarch64-multiplatform-musl linuxCommon; x86_64-musl = mapTestOnCross lib.systems.examples.musl64 linuxCommon; - rpi-musl = mapTestOnCross lib.systems.examples.muslpi (linuxCommon // { - vim = nativePlatforms; - unzip = nativePlatforms; - ddrescue = nativePlatforms; - lynx = nativePlatforms; - patchelf = nativePlatforms; - buildPackages.binutils = nativePlatforms; - mpg123 = nativePlatforms; - }); /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let From 6daf813b1cd84a8e9c96b252df95a33fcf7d7255 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Feb 2018 08:45:32 -0600 Subject: [PATCH 072/133] release-cross: add nix and nixUnstable Essential software for every platform! :) 'nix' won't work for now, but add it anyway so later this tests "stable" nix 2. --- pkgs/top-level/release-cross.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 74394379b399..be6dd89bf7dd 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -16,6 +16,8 @@ let buildPackages.binutils = nativePlatforms; gmp = nativePlatforms; libcCross = nativePlatforms; + nix = nativePlatforms; + nixUnstable = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { From 1bf7dfaabeaa37c8b84e1f173e39d4fd476b3b7a Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 22 Feb 2018 10:13:37 -0500 Subject: [PATCH 073/133] timetrap: 1.10.0 -> 1.15.1 --- pkgs/applications/office/timetrap/Gemfile.lock | 8 ++++---- pkgs/applications/office/timetrap/default.nix | 11 +++++++---- pkgs/applications/office/timetrap/gemset.nix | 13 +++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index 5f451ca02b13..f71f4eaa4085 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -2,11 +2,11 @@ GEM remote: https://rubygems.org/ specs: chronic (0.10.2) - sequel (4.0.0) - sqlite3 (1.3.11) - timetrap (1.10.0) + sequel (4.43.0) + sqlite3 (1.3.13) + timetrap (1.15.1) chronic (~> 0.10.2) - sequel (~> 4.0.0) + sequel (~> 4.43.0) sqlite3 (~> 1.3.3) PLATFORMS diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index e68c753750f5..3564454a6741 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,14 +1,17 @@ { stdenv, lib, bundlerEnv, ruby }: -bundlerEnv { - name = "timetrap-1.10.0"; +bundlerEnv rec { + name = "timetrap-${version}"; + version = (import gemset).timetrap.version; inherit ruby; gemdir = ./.; + gemset = ./gemset.nix; - meta = { + meta = with lib; { description = "A simple command line time tracker written in ruby"; homepage = https://github.com/samg/timetrap; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = [ maintainers.jerith666 ]; }; } diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index cbf90f8018ce..5764016573fc 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -10,25 +10,26 @@ sequel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "17kqm0vd15p9qxbgcysvmg6a046fd7zvxl3xzpsh00pg6v454svm"; + sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; type = "gem"; }; - version = "4.0.0"; + version = "4.43.0"; }; sqlite3 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; type = "gem"; }; - version = "1.3.11"; + version = "1.3.13"; }; timetrap = { + dependencies = ["chronic" "sequel" "sqlite3"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdaa27zvdgmbsbwa59g3dvfwb95nz7x1wycmviby94j5lywyzfc"; + sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; type = "gem"; }; - version = "1.10.0"; + version = "1.15.1"; }; } \ No newline at end of file From 18691c6b6578c02607357626e27a1088a086d60c Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Thu, 22 Feb 2018 17:25:20 +0200 Subject: [PATCH 074/133] keepass: fix auto-type and clipboard features This fixes paths to `xdotool`, `xprop` and `xsel`. These are required tools for auto-type to work correctly. --- pkgs/applications/misc/keepass/default.nix | 12 ++- .../applications/misc/keepass/fix-paths.patch | 87 +++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/keepass/fix-paths.patch diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index bee86cb0ed39..911be6721acb 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, gtk2, plugins ? [] }: +{ stdenv, lib, fetchurl, buildDotnetPackage, substituteAll, makeWrapper, makeDesktopItem, + unzip, icoutils, gtk2, xorg, xdotool, xsel, plugins ? [] }: # KeePass looks for plugins in under directory in which KeePass.exe is # located. It follows symlinks where looking for that directory, so @@ -19,6 +20,15 @@ with builtins; buildDotnetPackage rec { buildInputs = [ unzip makeWrapper icoutils ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xsel = "${xsel}/bin/xsel"; + xprop = "${xorg.xprop}/bin/xprop"; + xdotool = "${xdotool}/bin/xdotool"; + }) + ]; + preConfigure = '' rm -rvf Build/* find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \; diff --git a/pkgs/applications/misc/keepass/fix-paths.patch b/pkgs/applications/misc/keepass/fix-paths.patch new file mode 100644 index 000000000000..318f8a358985 --- /dev/null +++ b/pkgs/applications/misc/keepass/fix-paths.patch @@ -0,0 +1,87 @@ +diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs +index 7495a1c..4ef4727 100644 +--- a/KeePass/Native/NativeMethods.Unix.cs ++++ b/KeePass/Native/NativeMethods.Unix.cs +@@ -128,7 +128,7 @@ namespace KeePass.Native + try + { + Application.DoEvents(); // E.g. for clipboard updates +- string strOutput = NativeLib.RunConsoleApp("xdotool", strParams); ++ string strOutput = NativeLib.RunConsoleApp("@xdotool@", strParams); + Application.DoEvents(); // E.g. for clipboard updates + return (strOutput ?? string.Empty); + } +diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs +index e93a22a..3fd9a2b 100644 +--- a/KeePass/Util/ClipboardUtil.Unix.cs ++++ b/KeePass/Util/ClipboardUtil.Unix.cs +@@ -62,7 +62,7 @@ namespace KeePass.Util + // "-out -selection clipboard"); + // if(str != null) return str; + +- string str = NativeLib.RunConsoleApp("xsel", ++ string str = NativeLib.RunConsoleApp("@xsel@", + "--output --clipboard", null, XSelFlags); + if(str != null) return str; + +@@ -83,10 +83,10 @@ namespace KeePass.Util + if(string.IsNullOrEmpty(str)) + { + // xsel with an empty input can hang, thus use --clear +- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", + null, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", + null, XSelFlags); + return; + } +@@ -97,10 +97,10 @@ namespace KeePass.Util + } + + // xsel does not support --primary and --clipboard together +- if(NativeLib.RunConsoleApp("xsel", "--input --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", + str, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--input --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", + str, XSelFlags); + return; + } +diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs +index ddd8f57..150eb82 100644 +--- a/KeePassLib/Native/ClipboardU.cs ++++ b/KeePassLib/Native/ClipboardU.cs +@@ -27,7 +27,7 @@ namespace KeePassLib.Native + { + internal static class ClipboardU + { +- private const string XSel = "xsel"; ++ private const string XSel = "@xsel@"; + private const string XSelV = "--version"; + private const string XSelR = "--output --clipboard"; + private const string XSelC = "--clear --clipboard"; +diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs +index 0da7019..f6a1022 100644 +--- a/KeePassLib/Utility/MonoWorkarounds.cs ++++ b/KeePassLib/Utility/MonoWorkarounds.cs +@@ -41,7 +41,7 @@ namespace KeePassLib.Utility + { + public static class MonoWorkarounds + { +- private const string AppXDoTool = "xdotool"; ++ private const string AppXDoTool = "@xdotool@"; + + private static Dictionary g_dForceReq = new Dictionary(); + private static Thread g_thFixClip = null; +@@ -303,7 +303,7 @@ namespace KeePassLib.Utility + // } + // else { Debug.Assert(false); } + +- string strWmClass = (NativeLib.RunConsoleApp("xprop", ++ string strWmClass = (NativeLib.RunConsoleApp("@xprop@", + "-id " + strHandle + " WM_CLASS") ?? string.Empty); + + if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", From fbeb32994b835ea20599aa72c77a6342a1b409c4 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 22 Feb 2018 18:37:59 +0300 Subject: [PATCH 075/133] softether module: fix dataDir option --- .../modules/services/networking/softether.nix | 33 +++++++++---------- pkgs/servers/softether/4.18.nix | 4 +-- pkgs/servers/softether/4.20.nix | 4 +-- pkgs/servers/softether/4.25.nix | 4 +-- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 9087b75c29c1..65df93a00da9 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.softether; + package = cfg.package.override { dataDir = cfg.dataDir; }; + in { @@ -49,7 +51,7 @@ in dataDir = mkOption { type = types.string; - default = "${cfg.package.dataDir}"; + default = "/var/lib/softether"; description = '' Data directory for SoftEther VPN. ''; @@ -64,11 +66,8 @@ in config = mkIf cfg.enable ( mkMerge [{ - environment.systemPackages = [ - (pkgs.lib.overrideDerivation cfg.package (attrs: { - dataDir = cfg.dataDir; - })) - ]; + environment.systemPackages = [ package ]; + systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; wantedBy = [ "network.target" ]; @@ -80,11 +79,11 @@ in for d in vpnserver vpnbridge vpnclient vpncmd; do if ! test -e ${cfg.dataDir}/$d; then ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d - install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 + install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 fi done rm -rf ${cfg.dataDir}/vpncmd/vpncmd - ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd + ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ''; }; } @@ -97,12 +96,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnserver start"; - ExecStop = "${cfg.package}/bin/vpnserver stop"; + ExecStart = "${package}/bin/vpnserver start"; + ExecStop = "${package}/bin/vpnserver stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver - ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver + ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ''; postStop = '' rm -rf ${cfg.dataDir}/vpnserver/vpnserver @@ -118,12 +117,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnbridge start"; - ExecStop = "${cfg.package}/bin/vpnbridge stop"; + ExecStart = "${package}/bin/vpnbridge start"; + ExecStop = "${package}/bin/vpnbridge stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge - ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge + ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ''; postStop = '' rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge @@ -139,12 +138,12 @@ in wantedBy = [ "network.target" ]; serviceConfig = { Type = "forking"; - ExecStart = "${cfg.package}/bin/vpnclient start"; - ExecStop = "${cfg.package}/bin/vpnclient stop"; + ExecStart = "${package}/bin/vpnclient start"; + ExecStop = "${package}/bin/vpnclient stop"; }; preStart = '' rm -rf ${cfg.dataDir}/vpnclient/vpnclient - ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient + ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ''; postStart = '' sleep 1 diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix index 69c6cbe2c864..d8c3fe944cc3 100644 --- a/pkgs/servers/softether/4.18.nix +++ b/pkgs/servers/softether/4.18.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.18"; build = "9570"; compiledDate = "2015.07.26"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix index c6ef5a3a4df2..5d6f642ddc0a 100644 --- a/pkgs/servers/softether/4.20.nix +++ b/pkgs/servers/softether/4.20.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.20"; build = "9608"; compiledDate = "2016.04.17"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index b1e9c5c1a455..2dcb69d28f14 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl -, openssl, readline, ncurses, zlib }: +, openssl, readline, ncurses, zlib +, dataDir ? "/var/lib/softether" }: let os = if stdenv.isLinux then "1" @@ -17,7 +18,6 @@ stdenv.mkDerivation rec { version = "4.25"; build = "9656"; compiledDate = "2018.01.15"; - dataDir = "/var/lib/softether"; src = fetchurl { url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; From 186c76539855a8d1a3e76af0ff95b5de50aa48f8 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 19 Feb 2018 18:54:16 +0100 Subject: [PATCH 076/133] rabbitmq: 3.6.10 -> 3.6.15 (and various improvements) - split outputs (doc, man, out) - a new runtime dependency on getconf - fix up SCRIPTS_DIR in wrapper - clean output folder of stray doc files - add license & maintainer Tested with `nixos/tests/rabbitmq.nix`, inside a docker image and manually. --- nixos/release.nix | 1 + pkgs/servers/amqp/rabbitmq-server/default.nix | 59 +++++++++++++++---- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index ee7dcd985a33..c85150190587 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -339,6 +339,7 @@ in rec { tests.pumpio = callTest tests/pump.io.nix {}; # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; + tests.rabbitmq = callTest tests/rabbitmq.nix {}; tests.radicale = callTest tests/radicale.nix {}; tests.rspamd = callSubTests tests/rspamd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 889ec4d3745f..3d4a8902c918 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,40 +1,73 @@ -{ stdenv, fetchurl, erlang, python, libxml2, libxslt, xmlto +{ stdenv, fetchurl, runCommand +, erlang, python, libxml2, libxslt, xmlto , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync , AppKit, Carbon, Cocoa }: -stdenv.mkDerivation rec { - name = "rabbitmq-server-${version}"; +let + # we only need that one glibc binary (28k instead of 2.7M) + getconf = runCommand "getconf" {} '' + install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf + ''; - version = "3.6.10"; +in stdenv.mkDerivation rec { + name = "rabbitmq-server-${version}"; + version = "3.6.15"; src = fetchurl { url = "https://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.xz"; - sha256 = "0k1rhg1a51201b1hp6vaf4fk48hqz7m9hw55b8xnnyz2ld88jiqg"; + sha256 = "1zdmil657mhjmd20jv47s5dfpj2liqwvyg0zv2ky3akanfpgj98y"; }; buildInputs = [ erlang python libxml2 libxslt xmlto docbook_xml_dtd_45 docbook_xsl zip unzip rsync ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ]; - preBuild = - '' - # Fix the "/usr/bin/env" in "calculate-relative". - patchShebangs . - ''; + outputs = [ "out" "man" "doc" ]; + + postPatch = with stdenv.lib; '' + # patch the path to getconf + substituteInPlace deps/rabbit_common/src/vm_memory_monitor.erl \ + --replace "getconf PAGESIZE" "${getconf}/bin/getconf PAGESIZE" + ''; + + preBuild = '' + # Fix the "/usr/bin/env" in "calculate-relative". + patchShebangs . + ''; installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; installTargets = "install install-man"; - postInstall = - '' - echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env + postInstall = '' + echo 'PATH=${erlang}/bin:''${PATH:+:}$PATH' >> $out/sbin/rabbitmq-env + + # we know exactly where rabbitmq is gonna be, + # so we patch that into the env-script + substituteInPlace $out/sbin/rabbitmq-env \ + --replace 'RABBITMQ_SCRIPTS_DIR=`dirname $SCRIPT_PATH`' \ + "RABBITMQ_SCRIPTS_DIR=$out/sbin" + + # there’s a few stray files that belong into share + mkdir -p $doc/share/doc/rabbitmq-server + mv $out/LICENSE* $doc/share/doc/rabbitmq-server + + # and an unecessarily copied INSTALL file + rm $out/INSTALL + + # patched into a source file above; + # needs to be explicitely passed to not be stripped by fixup + mkdir -p $out/nix-support + echo "${getconf}" > $out/nix-support/dont-strip-getconf + ''; meta = { homepage = http://www.rabbitmq.com/; description = "An implementation of the AMQP messaging protocol"; + license = stdenv.lib.licenses.mpl11; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; } From 80cc3bd29ac9cafbcc8f255c3e286fc80abaa0fa Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 16:41:51 +0000 Subject: [PATCH 077/133] tortoisehg: 4.3.1 -> 4.5 --- pkgs/applications/version-management/tortoisehg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index f06a0c90db14..437062f7f5e1 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,18 +2,18 @@ python2Packages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "4.3.1"; + version = "4.5"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "0lxppjdqjmwl5y8fmp2am0my7a3mks811yg4fff7cx0569hdp62n"; + sha256 = "11m2hir2y1hblg9sqmansv16rcp560j2d3nhqzfhkim46a59fxvk"; }; pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; - doCheck = true; + doCheck = false; # tests fail with "thg: cannot connect to X server" dontStrip = true; buildPhase = ""; installPhase = '' From e28cf0cbfb34dbcf218530936ba36cc6f2e8130e Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 17:14:43 +0000 Subject: [PATCH 078/133] data/mime-types: make derivation fixed-output --- pkgs/data/misc/mime-types/default.nix | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index bce1c5d81d89..65ad964736d1 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -1,21 +1,15 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - name = "mime-types-${version}"; +let version = "9"; - - src = fetchurl { - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - sha256 = "0pib8v0f5xwwm3xj2ygdi2dlxxvbq6p95l3fah5f66qj9xrqlqxl"; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - install -Dm644 -t $out/etc mime.types - runHook postInstall +in fetchzip rec { + name = "mime-types-${version}"; + url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; + postFetch = '' + mkdir -p $out/etc + tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 ''; + sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; meta = with stdenv.lib; { description = "A database of common mappings of file extensions to MIME types"; From 4b73b8ccc31da62d2bc5fe2cd9cf6db564beb02e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 23 Feb 2018 01:41:24 +0800 Subject: [PATCH 079/133] perkeep: Build with go 1.9 --- pkgs/applications/misc/perkeep/default.nix | 45 +++++++++++++++++++++- pkgs/top-level/all-packages.nix | 5 ++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 3b64cf4aa6c0..746a319c2e1e 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -1,5 +1,29 @@ -{ stdenv, lib, go_1_8, fetchzip, git }: +{ stdenv, lib, go, fetchzip, git, fetchpatch, fetchFromGitHub, fetchgit }: +# When perkeep is updated all deps in the let block should be removed +let + gopherjs = fetchFromGitHub { + owner = "gopherjs"; + repo = "gopherjs"; + # Rev matching https://github.com/perkeep/perkeep/commit/2e46fca5cc1179dbd90bec49fec3870e6eca6c45 + rev = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"; + sha256 = "0kniz8dg5bymb03qriizza1h3gpymf97vsgq9vd222282pdj0vyc"; + }; + + gotool = fetchFromGitHub { + owner = "kisielk"; + repo = "gotool"; + rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + + gcimporter15 = fetchgit { + url = "https://go.googlesource.com/tools"; + rev = "f8f2f88271bf2c23f28a09d288d26507a9503c97"; + sha256 = "1pchwizx1sdli59g8r0p4djfjkchcvh8msfpp3ibvz3xl250jh0n"; + }; + +in stdenv.mkDerivation rec { name = "perkeep-${version}"; version = "20170505"; @@ -9,7 +33,24 @@ stdenv.mkDerivation rec { sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa"; }; - buildInputs = [ git go_1_8 ]; + # When perkeep is updated postPatch should be removed + postPatch = '' + rm -r ./vendor/github.com/gopherjs/gopherjs/ + cp -a ${gopherjs} ./vendor/github.com/gopherjs/gopherjs + mkdir -p ./vendor/github.com/kisielk/ + cp -a ${gotool} ./vendor/github.com/kisielk/gotool + mkdir -p ./vendor/golang.org/x/tools/go + cp -a ${gcimporter15}/go/gcimporter15 ./vendor/golang.org/x/tools/go/gcimporter15 + + substituteInPlace vendor/github.com/gopherjs/gopherjs/build/build.go \ + --replace '"github.com/fsnotify/fsnotify"' 'fsnotify "camlistore.org/pkg/misc/fakefsnotify"' + + substituteInPlace ./make.go \ + --replace "goVersionMinor = '8'" "goVersionMinor = '9'" \ + --replace "gopherJSGoMinor = '8'" "gopherJSGoMinor = '9'" + ''; + + buildInputs = [ git go ]; goPackagePath = ""; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236f8ae64014..e7007514e977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14684,7 +14684,10 @@ with pkgs; openjpeg = openjpeg_1; }; - perkeep = callPackage ../applications/misc/perkeep { }; + perkeep = callPackage ../applications/misc/perkeep { + # Perkeep is very particular about which go version to build with. + go = go_1_9; + }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; From 2116146b00a0f75d7ab02f52d3dc3e215348dc47 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 23 Feb 2018 01:44:10 +0800 Subject: [PATCH 080/133] cockroachdb: 1.1.2 -> 1.1.5 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index e97b483fa062..f40a5df0f5c0 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "cockroach-${version}"; - version = "1.1.2"; + version = "1.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0h1fijzihp85a18flq4brdc3b38gj867kfkp31gncnmff0xb8kam"; + sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d"; }; nativeBuildInputs = [ cmake xz which autoconf ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7007514e977..ba820c41007c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12778,10 +12778,7 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # Go 1.9 build fails with "go1.8.* required (see CONTRIBUTING.md)". - buildGoPackage = buildGo18Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not From 1cba8cc2753751854d4e19033c12a35e5e848690 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 23 Feb 2018 01:46:29 +0800 Subject: [PATCH 081/133] go_1_8: Go 1.8 is EOL --- pkgs/development/compilers/go/1.8.nix | 182 ------------------ .../compilers/go/remove-test-pie-1.8.patch | 23 --- .../compilers/go/remove-tools-1.8.patch | 35 ---- .../compilers/go/ssl-cert-file.patch | 80 -------- pkgs/top-level/all-packages.nix | 8 - 5 files changed, 328 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.8.nix delete mode 100644 pkgs/development/compilers/go/remove-test-pie-1.8.patch delete mode 100644 pkgs/development/compilers/go/remove-tools-1.8.patch delete mode 100644 pkgs/development/compilers/go/ssl-cert-file.patch diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix deleted file mode 100644 index 7775a17a646c..000000000000 --- a/pkgs/development/compilers/go/1.8.nix +++ /dev/null @@ -1,182 +0,0 @@ -{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin -, perl, which, pkgconfig, patch, procps -, pcre, cacert, llvm -, Security, Foundation, bash -, makeWrapper, git, subversion, mercurial, bazaar }: - -let - - inherit (stdenv.lib) optional optionals optionalString; - - clangHack = writeScriptBin "clang" '' - #!${stdenv.shell} - exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - ''; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - -in - -stdenv.mkDerivation rec { - name = "go-${version}"; - version = "1.8.7"; - - src = fetchFromGitHub { - owner = "golang"; - repo = "go"; - rev = "go${version}"; - sha256 = "06v83fb75079dy2dc1927sr9bwvcpkkzl9d4wcw10scj70vj4a0x"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch makeWrapper ] - ++ optionals stdenv.isLinux [ procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${stdenv.shell}' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isArm '' - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - 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 - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - sed -i '/TestCurrent/areturn' src/os/user/user_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - sed -i 's/unrecognized/unknown/' src/cmd/go/build.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - - sed -i '1 a\exit 0' misc/cgo/errors/test.bash - ''; - - patches = - [ ./remove-tools-1.8.patch - ./ssl-cert-file.patch - ./creds-test.patch - ./remove-test-pie-1.8.patch - ]; - - postPatch = optionalString stdenv.isDarwin '' - echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil" - substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil - ''; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.isArm then "arm" - else if stdenv.isAarch64 then "arm64" - else throw "Unsupported system"; - GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - configurePhase = '' - mkdir -p $out/share/go/bin - export GOROOT=$out/share/go - export GOBIN=$GOROOT/bin - export PATH=$GOBIN:$PATH - ulimit -a - ''; - - postConfigure = optionalString stdenv.isDarwin '' - export PATH=${clangHack}/bin:$PATH - ''; - - installPhase = '' - cp -r . $GOROOT - ( cd $GOROOT/src && ./all.bash ) - - # (https://github.com/golang/go/wiki/GoGetTools) - wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}" - ''; - - preFixup = '' - rm -r $out/share/go/pkg/bootstrap - ln -s $out/share/go/bin $out/bin - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ go_bootstrap ]; - - meta = with stdenv.lib; { - branch = "1.8"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan wkennington ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/remove-test-pie-1.8.patch b/pkgs/development/compilers/go/remove-test-pie-1.8.patch deleted file mode 100644 index d09e143c74c1..000000000000 --- a/pkgs/development/compilers/go/remove-test-pie-1.8.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go -index c51dcea..8fbec5e 100644 ---- a/src/cmd/dist/test.go -+++ b/src/cmd/dist/test.go -@@ -461,17 +461,5 @@ func (t *tester) registerTests() { - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if t.goos == "linux" && t.goarch == "amd64" { -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag("")) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", \ No newline at end of file diff --git a/pkgs/development/compilers/go/remove-tools-1.8.patch b/pkgs/development/compilers/go/remove-tools-1.8.patch deleted file mode 100644 index b53e48e1a515..000000000000 --- a/pkgs/development/compilers/go/remove-tools-1.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 9706b8b..f250751 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1513,7 +1513,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 441dcd9..a50277e 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -230,6 +230,17 @@ func GOROOT() string { - return sys.DefaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/pkgs/development/compilers/go/ssl-cert-file.patch b/pkgs/development/compilers/go/ssl-cert-file.patch deleted file mode 100644 index 052655eed52c..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go -index a4b33c7..9700b75 100644 ---- a/src/crypto/x509/root_cgo_darwin.go -+++ b/src/crypto/x509/root_cgo_darwin.go -@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { - import "C" - import ( - "errors" -+ "io/ioutil" -+ "os" - "unsafe" - ) - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - var data C.CFDataRef = nil - err := C.FetchPEMRoots(&data) -diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go -index 66cdb5e..bb28036 100644 ---- a/src/crypto/x509/root_darwin.go -+++ b/src/crypto/x509/root_darwin.go -@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) { - println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy))) - } - -- cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -- data, err := cmd.Output() -- if err != nil { -- return nil, err -- } -- - var ( - mu sync.Mutex - roots = NewCertPool() - numVerified int // number of execs of 'security verify-cert', for debug stats - ) - -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ -+ cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") -+ data, err := cmd.Output() -+ if err != nil { -+ return nil, err -+ } -+ - blockCh := make(chan *pem.Block) - var wg sync.WaitGroup -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index 7bcb3d6..3986e1a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } -+ - var firstErr error - for _, file := range certFiles { - data, err := ioutil.ReadFile(file) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba820c41007c..4644f1d9c8a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6202,10 +6202,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_8 = callPackage ../development/compilers/go/1.8.nix { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - go_1_9 = callPackage ../development/compilers/go/1.9.nix { inherit (darwin.apple_sdk.frameworks) Security Foundation; }; @@ -11849,10 +11845,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo18Package = callPackage ../development/go-modules/generic { - go = go_1_8; - }; - buildGo19Package = callPackage ../development/go-modules/generic { go = go_1_9; }; From 073d3f086932a2fadad113196a073a3ecb2d1f7e Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 17:55:33 +0000 Subject: [PATCH 082/133] =?UTF-8?q?nixos/programs.chromium:=20remove=20uni?= =?UTF-8?q?code=20char=20'=E2=86=AA'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/modules/programs/chromium.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 54739feab976..e50e06c7a531 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -52,8 +52,7 @@ in description = "Chromium default search provider url."; default = null; example = - "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google: - ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; + "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; }; defaultSearchProviderSuggestURL = mkOption { From 8cd9194a8008fe8250afe059d57201b34e370fcd Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 22 Feb 2018 19:36:06 +0100 Subject: [PATCH 083/133] perl-Importer: 0.024 -> 0.025 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6ebbd816d4d6..8223fa698f18 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7119,10 +7119,10 @@ let self = _self // overrides; _self = with self; { }; Importer = buildPerlPackage rec { - name = "Importer-0.024"; + name = "Importer-0.025"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "1d19760ceb366b664985ace9a7ee1b54a438b1e060a5bca6eff0c6a35b07a557"; + sha256 = "0745138c487d74033d0cbeb36f06595036dc7e688f1a5dbec9cc2fa799e13946"; }; meta = { description = "Alternative but compatible interface to modules that export symbols"; From 89d660f7f1c7a5b8bd2341177e3117e535755cac Mon Sep 17 00:00:00 2001 From: troydm Date: Thu, 22 Feb 2018 21:18:01 +0200 Subject: [PATCH 084/133] rtl8192eu: init at 4.4.1 --- lib/maintainers.nix | 1 + pkgs/os-specific/linux/rtl8192eu/default.nix | 39 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/rtl8192eu/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index afbe5a95508f..fc83bb5263a3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -705,6 +705,7 @@ treemo = "Matthieu Chevrier "; trevorj = "Trevor Joynson "; trino = "Hubert Mühlhans "; + troydm = "Dmitry Geurkov "; tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>"; ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix new file mode 100644 index 000000000000..52542aabfded --- /dev/null +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +with lib; + +let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; + +in stdenv.mkDerivation rec { + name = "rtl8192eu-${kernel.version}-${version}"; + version = "4.4.1"; + + src = fetchFromGitHub { + owner = "Mange"; + repo = "rtl8192eu-linux-driver"; + rev = "4094004"; + sha256 = "0rgcsp8bd5i5ik9b35qipdhq0xd8pva8kdijixxfaxm4vw6kbrvr"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + ''; + + meta = { + description = "Realtek rtl8192eu driver"; + homepage = https://github.com/Mange/rtl8192eu-linux-driver; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ troydm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c48fce84f0..ade65357f76c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13129,6 +13129,8 @@ with pkgs; ply = callPackage ../os-specific/linux/ply { }; + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; From eef641aa6d09f16844fc22645dbda7a7d0eac51f Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 19:44:21 +0000 Subject: [PATCH 085/133] nixos/label: no prepend '-' if there are no tags --- nixos/modules/misc/label.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix index 250914e8f82e..8e5e57b3b83b 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -65,8 +65,8 @@ in # This is set here rather than up there so that changing it would # not rebuild the manual system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL" - (concatStringsSep "-" (sort (x: y: x < y) cfg.tags) - + "-" + maybeEnv "NIXOS_LABEL_VERSION" cfg.version)); + (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags) + ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ]))); }; } From 381ace583c3d523e0ac5aea0d1793d2e287b36d7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Feb 2018 13:57:36 -0600 Subject: [PATCH 086/133] musl: 1.1.18 -> 1.1.19 Remove patch, no longer needed. --- pkgs/os-specific/linux/musl/default.nix | 6 +- .../linux/musl/few-more-uapi-fixes.patch | 71 ------------------- 2 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index f74ac9c41eee..0f8f088945aa 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.18"; + version = "1.1.19"; src = fetchurl { url = "http://www.musl-libc.org/releases/musl-${version}.tar.gz"; - sha256 = "0651lnj5spckqjf83nz116s8qhhydgqdy3rkl4icbh5f05fyw5yh"; + sha256 = "1nf1wh44bhm8gdcfr75ayib29b99vpq62zmjymrq7f96h9bshnfv"; }; enableParallelBuilding = true; @@ -47,8 +47,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./few-more-uapi-fixes.patch ]; - dontDisableStatic = true; dontStrip = true; diff --git a/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch b/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch deleted file mode 100644 index f84ca2c5aec8..000000000000 --- a/pkgs/os-specific/linux/musl/few-more-uapi-fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://www.openwall.com/lists/musl/2018/01/06/3 - -Date: Sat, 6 Jan 2018 23:32:52 +0100 -From: Hauke Mehrtens -To: musl@...ts.openwall.com -Cc: felix.janda@...teo.de, - Hauke Mehrtens -Subject: [PATCH v2] Add additional uapi guards for Linux kernel header files - -With Linux kernel 4.16 it will be possible to guard more parts of the -Linux header files from a libc. Make use of this in musl to guard all -the structures and other definitions from the Linux header files which -are also defined by the header files provided by musl. This will make -musl compile with the unmodified Linux kernel user space headers. - -This extends the definitions done in commit 04983f227238 ("make -netinet/in.h suppress clashing definitions from kernel headers") - -The needed patches were recently accepted into the netdev tree and will be integrated in Linux 4.16: -https://patchwork.ozlabs.org/patch/854342/ -https://patchwork.ozlabs.org/patch/855293/ ---- - include/net/if.h | 7 +++++++ - include/netinet/if_ether.h | 1 + - include/sys/xattr.h | 2 ++ - 3 files changed, 10 insertions(+) - -diff --git a/include/net/if.h b/include/net/if.h -index 2f2fcc10..0ee48cd7 100644 ---- a/include/net/if.h -+++ b/include/net/if.h -@@ -125,6 +125,13 @@ struct ifconf { - #define ifc_req ifc_ifcu.ifcu_req - #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) - -+#define __UAPI_DEF_IF_IFCONF 0 -+#define __UAPI_DEF_IF_IFMAP 0 -+#define __UAPI_DEF_IF_IFNAMSIZ 0 -+#define __UAPI_DEF_IF_IFREQ 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+ - #endif - - #ifdef __cplusplus -diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h -index d9a131aa..c2c6e944 100644 ---- a/include/netinet/if_ether.h -+++ b/include/netinet/if_ether.h -@@ -133,5 +133,6 @@ do { \ - (enaddr)[5] = ((uint8_t *)ipaddr)[3]; \ - } while(0) - -+#define __UAPI_DEF_ETHHDR 0 - - #endif -diff --git a/include/sys/xattr.h b/include/sys/xattr.h -index 6479fcc6..52e3dd89 100644 ---- a/include/sys/xattr.h -+++ b/include/sys/xattr.h -@@ -24,6 +24,8 @@ int removexattr(const char *, const char *); - int lremovexattr(const char *, const char *); - int fremovexattr(int, const char *); - -+#define __UAPI_DEF_XATTR 0 -+ - #ifdef __cplusplus - } - #endif --- -2.11.0 From 823facf2ccf3e3d680f9b37db4d29502675cc79b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 22 Feb 2018 21:03:08 +0100 Subject: [PATCH 087/133] electron: 1.7.11 -> 1.8.2 (#35342) --- pkgs/development/tools/electron/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 0df2decef2cb..f2b9348103ab 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: let - version = "1.7.11"; + version = "1.8.2"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.system}"; @@ -10,8 +10,8 @@ let description = "Cross platform desktop application shell"; homepage = https://github.com/electron/electron; license = licenses.mit; - maintainers = [ maintainers.travisbhartwell ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ travisbhartwell manveru ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; }; linux = { @@ -20,15 +20,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "0mxrayczs6fc2a53fzfbgs88l71wm7hadq9ir510kicakblmdbyx"; + sha256 = "12q5h6gh9zzhndg6yfka821rblq3l80d2qzqrq4nbq6rlsshjp9d"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0v22xhzbq9lcbc83laqs45pbx8gzv648qfkj01pxfsmv3lb4myrl"; + sha256 = "07ggq9wgfz3z5z0lwzzgs6im0qs83pz0pcfwr0r42zgmwg7j78b8"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "02n2y69zwzacigqp6f4vg47cmjzf8gvbbispmzkg3pnzk4qc9473"; + sha256 = "1b0p5x9zigyd6d8gz2hxc4scllrpnbx1dzzwlsvw6ilqbj1ypc7i"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; + sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd"; }; }.${stdenv.system} or throwSystem; @@ -56,7 +60,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "19kfb09ap780ayk7miqfr6gmba9rd10f9q9aphj35yk7cl22znbr"; + sha256 = "0pq587vr1i87jdwcpbf6n136i9dp6i39dp5s95kihnm9qglxr42b"; }; buildInputs = [ unzip ]; From ba58b425f10854cc4d7fb2dce9fbb79d09f882e8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 22 Feb 2018 21:18:04 +0100 Subject: [PATCH 088/133] neovim: fix bundlerEnv --- pkgs/applications/editors/neovim/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 187474de5b6f..a27b5a41ac70 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -25,7 +25,7 @@ let name = "neovim-ruby-env"; gemdir = ./ruby_provider; postBuild = '' - ln -s ${ruby}/bin/* $out/bin + ln -sf ${ruby}/bin/* $out/bin ''; }; From 9261c17ad01b69018f50f5f8e1a5b979bacf5d4a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 22 Feb 2018 14:47:11 -0600 Subject: [PATCH 089/133] busybox: 1.28.0 -> 1.28.1 --- pkgs/os-specific/linux/busybox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index c83a526b2460..744f37b8b8c4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.0"; + name = "busybox-1.28.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1701carjf02y7r3djm1yvyd5kzrcxm4szinp7agfv7fmvfvm6ib0"; + sha256 = "0bk52cxxlya5hg9va87snr9caz9ppdrpdyjwrnbwamhi64y1vzlq"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; From e9abedbe29d23afb6bc4b41f83750bf9f8bee020 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 21:47:36 +0000 Subject: [PATCH 090/133] geoip: fix regression --- pkgs/development/libraries/geoip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index d93430ac1f51..cb8138dc115e 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' + postConfigure = '' find . -name Makefile.in -exec sed -i -r 's#^pkgdatadir\s*=.+$#pkgdatadir = ${dataDir}#' {} \; ''; From a43e33d0e48b2284ac3a2222d7f1965cef66f5e2 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 22 Feb 2018 23:06:31 +0100 Subject: [PATCH 091/133] nixos: disable sound by default, if stateVersion >= 18.03 (#35355) --- nixos/doc/manual/release-notes/rl-1803.xml | 3 +++ nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++++ nixos/modules/services/audio/alsa.nix | 10 +++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index ce58c4dc95b0..469c6a9f338c 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -209,6 +209,9 @@ following incompatible changes: For stateVersion = "17.09" or lower the old behavior is preserved. + + sound.enable now defaults to false. + matrix-synapse uses postgresql by default instead of sqlite. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a82ee63fd0cd..0e0744a52e42 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -603,6 +603,10 @@ $bootLoaderConfig # Enable CUPS to print documents. # services.printing.enable = true; + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + # Enable the X11 windowing system. # services.xserver.enable = true; # services.xserver.layout = "us"; diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index acf48d3c3d03..161d873686a8 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; - default = true; + defaultText = "!versionAtLeast system.stateVersion \"18.03\""; description = '' Whether to enable ALSA sound. ''; @@ -78,7 +78,11 @@ in ###### implementation - config = mkIf config.sound.enable { + config = mkMerge [ + ({ + sound.enable = mkDefault (!versionAtLeast config.system.stateVersion "18.03"); + }) + (mkIf config.sound.enable { environment.systemPackages = [ alsaUtils ]; @@ -124,6 +128,6 @@ in ]; }; - }; + })]; } From 483200692b134c3e8ec0a25d38dd3759f7e4f092 Mon Sep 17 00:00:00 2001 From: Clemens Fruhwirth Date: Thu, 22 Feb 2018 13:08:20 +0100 Subject: [PATCH 092/133] oath-toolkit: Switch over to git branch (GCC7 fix) The git repo doesn't contain a configure script which adds a lot of build dependencies. --- pkgs/tools/security/oath-toolkit/default.nix | 20 +++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 965ecda164be..e41ca6f05014 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pam, xmlsec }: +{ stdenv, fetchgit, pam, xmlsec, autoconf, automake, libtool, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -8,13 +8,23 @@ in stdenv.mkDerivation rec { name = "oath-toolkit-2.6.2"; - src = fetchurl { - url = "mirror://savannah/oath-toolkit/${name}.tar.gz"; - sha256 = "182ah8vfbg0yhv6mh1b6ap944d0na6x7lpfkwkmzb6jl9gx4cd5h"; + src = fetchgit { + url = "https://gitlab.com/oath-toolkit/oath-toolkit.git"; + sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; }; + buildInputs = [ securityDependency automake autoconf libtool pkgconfig libxml2 gtkdoc perl gengetopt bison help2man ]; - buildInputs = [ securityDependency ]; + configureFlags = [ "--disable-pskc" ]; + + preConfigure = '' + # Replicate the steps from cfg.mk + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc + printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc + touch ChangeLog + autoreconf --force --install + ''; meta = { homepage = http://www.nongnu.org/oath-toolkit/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236f8ae64014..91f588cd23e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3887,7 +3887,7 @@ with pkgs; nzbget = callPackage ../tools/networking/nzbget { }; - oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oathToolkit = callPackage ../tools/security/oath-toolkit { inherit (gnome2) gtkdoc; }; obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; From a87d974dfb12e76374fb78d3066ab5b2b9657d9c Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Thu, 22 Feb 2018 23:27:44 +0100 Subject: [PATCH 093/133] leaps: 0.5.1 -> 0.9.0 --- pkgs/development/tools/leaps/default.nix | 8 +- pkgs/development/tools/leaps/deps.nix | 277 +++++++++++++++-------- 2 files changed, 188 insertions(+), 97 deletions(-) diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 8032b256905b..9e41ef381318 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "leaps-${version}"; - version = "0.5.1"; + version = "0.9.0"; - goPackagePath = "github.com/jeffail/leaps"; + goPackagePath = "github.com/Jeffail/leaps"; src = fetchFromGitHub { - owner = "jeffail"; + owner = "Jeffail"; repo = "leaps"; - sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj"; + sha256 = "1bzas7ixyfsfh81lnvplhx59yghkmnmy5p7jv9rnwp219dwbylpz"; rev = "v${version}"; }; diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index d611d9b49540..afaf42779b3e 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,94 +1,185 @@ -[ - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7"; - sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2"; - sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i"; - }; - } - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"; - sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73"; - sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df"; - sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0"; - }; - } - { - goPackagePath = "github.com/jeffail/gabs"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/gabs"; - rev = "ee1575a53249b51d636e62464ca43a13030afdb5"; - sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351"; - }; - } - { - goPackagePath = "github.com/jeffail/util"; - fetch = { - type = "git"; - url = "https://github.com/jeffail/util"; - rev = "48ada8ff9fcae546b5986f066720daa9033ad523"; - sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4"; - sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f9ab0dce87d815821e221626b772e3475a0d2749"; - sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; - }; - } -] + # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep) + [ + + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "fc3b03a2d2d1f43fad3007038bd16f044f870722"; + sha256 = "1j6aqbizlpiqcywdsj4dy4i76g8fbqc7d61c22ppc9knw0968h4r"; + }; + } + + { + goPackagePath = "github.com/Jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/Jeffail/gabs"; + rev = "2a3aa15961d5fee6047b8151b67ac2f08ba2c48c"; + sha256 = "1fx6fyl5x037viwlj319f3gsq749an17q5l6n2zvf3ny5wq0iqxr"; + }; + } + + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; + sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; + }; + } + + { + goPackagePath = "github.com/azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/azure/azure-sdk-for-go"; + rev = "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f"; + sha256 = "0zlhrh3n9mc5w7r0sdaqmpqfm2d290b50an0k1bvrr892m4cnxaq"; + }; + } + + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "61153c768f31ee5f130071d08fc82b85208528de"; + sha256 = "08x77mgb9zsj047n74rx6c16jjx985lmy4s6fl58mdgxgxjv54y5"; + }; + } + + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; + sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; + }; + } + + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "d1ed5c67e5794de818ea85e6b522fda02623a484"; + sha256 = "0gw18k9kg93hvdks93hckrdqppg1bav82sp2c98q6z36dkvaih24"; + }; + } + + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "a0583e0143b1624142adab07e0e97fe106d99561"; + sha256 = "1rw1m91dpm23s6nn6jc4zi6rq2mgl7zx07gyadrdn0sh7cj8c89d"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "925541529c1fa6821df4e44ce2723319eb2be768"; + sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; + }; + } + + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; + sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; + }; + } + + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "88edab0803230a3898347e77b474f8c1820a1f20"; + sha256 = "02y7c8xy33x5q4167x2drzrys41nfi7wxxp9hy4vpazfws88al9p"; + }; + } + + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bdf7d1a087ccc975cf37dd6507da50698fd19ca"; + sha256 = "1mxcigzfc1bbh5b616hm89bp06allhwcsas9v9lks235h0acgn4x"; + }; + } + + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"; + sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf"; + }; + } + + { + goPackagePath = "gopkg.in/alexcesaro/statsd.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alexcesaro/statsd.v2"; + rev = "7fea3f0d2fab1ad973e641e51dba45443a311a90"; + sha256 = "02jdx68vicwsgabrnwgg1rvc45rinyh8ikinqgbqc56c5hkx3brj"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; + sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; + }; + } + +] \ No newline at end of file From 7ea15ef9c6aeeb8b6bae39756a4966e636f3d1d5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Feb 2018 05:12:24 +0100 Subject: [PATCH 094/133] nixpkgs module: update config example firefox.enableGeckoMediaPlayer does not exist anymore. --- nixos/modules/misc/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index e747fbc6755c..11bd148d5dee 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -93,7 +93,7 @@ in default = {}; example = literalExample '' - { firefox.enableGeckoMediaPlayer = true; } + { allowBroken = true; allowUnfree = true; } ''; type = configType; description = '' From 4e4ae18c199ffa1ad9352eb101a2f0df9cad39e2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 23 Feb 2018 00:25:40 +0100 Subject: [PATCH 095/133] browserpass module: add firefox support --- nixos/modules/programs/browserpass.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index a073c7e66eb8..5f8a44a9848e 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/nixos/modules/programs/browserpass.nix @@ -18,5 +18,6 @@ with lib; "opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; "opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json"; }; + nixpkgs.config.firefox.enableBrowserpass = true; }; } From a04f6245a8c95a24b37a407e1092074220bb7fc4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 23 Feb 2018 00:28:20 +0100 Subject: [PATCH 096/133] nixos/manual: fix build Broken due to a43e33d0e48b2284ac3a2222d7f1965cef66f5e2. --- nixos/doc/manual/release-notes/rl-1803.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 469c6a9f338c..7a9c5a2303c2 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -210,7 +210,9 @@ following incompatible changes: - sound.enable now defaults to false. + + sound.enable now defaults to false. + From 23ea377a7be5ab3ff95f67b31be4cf6cbfbc29fc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 22 Feb 2018 20:34:30 -0500 Subject: [PATCH 097/133] linux: 4.4.116 -> 4.4.117 --- 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 94425f4d1e47..6f6a39fcff27 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.116"; + version = "4.4.117"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18sz68gbms5rvjiy51b1dg1jlr7pwazw9fg6q5ffczk22icflvsn"; + sha256 = "0s2d5vaa8wzfsamf9wkafk6nv46q7809j7x6a394sy39jq7lj3qj"; }; } // (args.argsOverride or {})) From 9b55ac28c992d41da800e96e765bec6f2d926171 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 22 Feb 2018 20:35:24 -0500 Subject: [PATCH 098/133] linux: 4.9.82 -> 4.9.83 --- 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 80db885170e4..473fa052bbd4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.82"; + version = "4.9.83"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "105im51ax2cwfqkljfi1sqh6sap6sc76zh5l9n7fpbys04khnwab"; + sha256 = "1csh557b9b0zsldlk1lalmy5wgn5rhk857fryn3v4nh8kj3y4mw9"; }; } // (args.argsOverride or {})) From 371595432bf0189ed7367422c70d0893bbe28482 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 22 Feb 2018 20:35:43 -0500 Subject: [PATCH 099/133] linux: 4.14.20 -> 4.14.21 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index b5fd5168cf82..3796ed7b037c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,13 +3,13 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.20"; + version = "4.14.21"; # branchVersion needs to be x.y extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14njnspxmyzpapjzm8macrv411ss63xb39nb00xix75glqmg9dsa"; + sha256 = "1vda6l61755wjbqjz3xbdkhgzzvd8lhnlliga3chfprxq348kpqr"; }; } // (args.argsOverride or {})) From 472dd33ea4905d562d9380d42ff09365e4b79a7e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 22 Feb 2018 20:35:59 -0500 Subject: [PATCH 100/133] linux: 4.15.4 -> 4.15.5 --- pkgs/os-specific/linux/kernel/linux-4.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix index 4bdcfba5db73..b2a55ba4b1ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.15.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.15.4"; + version = "4.15.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fla9k90y6vaqvyjk81f59smcifcwickx4yr662m4whzkhd7wgd2"; + sha256 = "08l0m6pj690v6a0jjd7369zqkwnmgnm7k74g7s8sfwfxq0dsi2wj"; }; } // (args.argsOverride or {})) From 41d2d75ea0eedb06e78c4d12619fa247ca4e25f5 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 20 Feb 2018 20:06:15 -0500 Subject: [PATCH 101/133] elpa-packages: 2018-02-22 --- .../editors/emacs-modes/elpa-generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7264dcb92a37..9ed028234a51 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -400,10 +400,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; - sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; + url = "https://elpa.gnu.org/packages/company-0.9.5.tar"; + sha256 = "1x9c5dw884rv0lvl24ggzdxp2k484w543azdiw55bw01635pg531"; }; packageRequires = [ emacs ]; meta = { @@ -713,10 +713,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar"; - sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6"; + url = "https://elpa.gnu.org/packages/ebdb-0.4.3.tar"; + sha256 = "1xq0nhhgzgzrvxbb0lgpz71rfd0dcjakh87wg8wi3cpiw9w7zx41"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1637,10 +1637,10 @@ }) {}; paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "paced"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.1.2.tar"; - sha256 = "1hxbzlzmlndj2gs9n741whi7rj6vbcnxdn89lg2l0997pqmsx58y"; + url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; + sha256 = "1gaszf68h0nnv6p6yzv48m24csw6v479nsq0f02y6slixxaflnwl"; }; packageRequires = [ async emacs ]; meta = { @@ -1704,10 +1704,10 @@ python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; - version = "0.25.2"; + version = "0.26"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.25.2.el"; - sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i"; + url = "https://elpa.gnu.org/packages/python-0.26.el"; + sha256 = "197sq42xd4ryqq2zy1802pns6wf6n4vzx90yxgn1zzqpwffpv317"; }; packageRequires = [ cl-lib emacs ]; meta = { From 13fd5f1b052e66cf4cb6b807e2f26ba6439c4156 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 20 Feb 2018 20:06:26 -0500 Subject: [PATCH 102/133] org-packages: 2018-02-22 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index a8815b4d3d87..afd25bb3cfe8 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180212"; + version = "20180219"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180212.tar"; - sha256 = "09wgmiavby009mkc5v2d0znrrs40fnmhzq252hni4zjy8kbgwfzk"; + url = "https://orgmode.org/elpa/org-20180219.tar"; + sha256 = "0yqyvkcal74jmpj6zl7xkcn85hdw2qpqjisb4dbdsr4312g45f3d"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180212"; + version = "20180219"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180212.tar"; - sha256 = "0wy9j2iagjzzjkqfsz1askxg4jmaxc0p0f42jbzx2ja7h4qkm9nj"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180219.tar"; + sha256 = "1y7c2prbxpka0j32jam4fbfpslsh9h5049xbxfqymih456j8q7s2"; }; packageRequires = []; meta = { From a65ec7eb1d7f81176f9f298cd1be8fefa15e4e44 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 22 Feb 2018 21:30:49 -0500 Subject: [PATCH 103/133] melpa-stable-packages: 2018-02-22 Removals: - ac-anaconda: removed from melpa --- .../emacs-modes/melpa-stable-generated.nix | 506 +++++++++++++----- 1 file changed, 372 insertions(+), 134 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 148099d1005d..af69ebd66678 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -125,27 +125,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "0.1.0"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8"; - sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cake"; @@ -2023,15 +2002,36 @@ license = lib.licenses.free; }; }) {}; + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "aurora-config-mode"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "0a7ca7987c3a0824e25470389c7d25c337a81593"; + sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "5ca6a838489c1175de3df7af025751559eb13cb3"; - sha256 = "10y6grxwp8sw24fv8i9f50lc83qcdxnkw2bm1v983fw6di4i3a8w"; + rev = "6af0458a6b586cc5004fa652f23615433304924d"; + sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3775,12 +3775,12 @@ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "4.6.1pre2"; + version = "4.6.1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "b057bd0758f63f41fd8853ee025c58368e33ed21"; - sha256 = "1s066clvar4ws0mingh68jrj87dak52grs8mnd2ibcf1kf21w08q"; + rev = "81dc8e8fcf923baa5e5208f9bc4228930c7c3d56"; + sha256 = "0pn25c3v8xnihnyzk1w297ci5ca05hcdv46m21522sgpcinbvkc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -3838,12 +3838,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "afdd191b97e76c8393f656336699419a2b39ca1a"; - sha256 = "10qiapg6kp890q8n2pamvnnpxwcgcldw20mp23pmwzh9nsvqrpbs"; + rev = "ccfe38ae133cc843865f87607d3f4f3960b76870"; + sha256 = "1bv0lganh5xhjp2r84js596p1sqndvxnhn3q6l7m7lcdxrjckcy8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -4772,12 +4772,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.10.2"; + version = "3.11.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "c1e087a9d3af74299d7681c9f9de59e5977a1539"; - sha256 = "08qw6kq3l7dv37s5mppqxb6ys22h733k0qh2llzk2430wv5y9crk"; + rev = "02edf08be2b9476f442b702c6c00447912425cc2"; + sha256 = "1ppq3g1525izfl4d8779rj6lq8jkgqh50wnbyb0cmj6bp7b7c9sz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5087,12 +5087,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; - sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; + rev = "7cc0901489dff3d73ddc845ae060f938ecb85615"; + sha256 = "1kqj0nvnp8k7kg9fskl9g6z4pn1ik2a3lnvs01r1cxi1b5ixqjmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -5399,22 +5399,22 @@ license = lib.licenses.free; }; }) {}; - company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: + company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "1.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "86fda23d29b732ba3987bf20901034da1515b077"; - sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l"; name = "company-lsp"; }; - packageRequires = [ company emacs lsp-mode s ]; + packageRequires = [ company dash emacs lsp-mode s ]; meta = { homepage = "https://melpa.org/#/company-lsp"; license = lib.licenses.free; @@ -6059,12 +6059,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "2219bf8d9a4584abc905c7470455777553496056"; - sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; + rev = "80038731a5be72310ae499173ee793f36ac148b1"; + sha256 = "0psvdrxwlzhl8hxzvvdjc25xmk4v5v7ili5d0r78lrsq0k17nrg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -6728,22 +6728,22 @@ license = lib.licenses.free; }; }) {}; - dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "0.15"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "e6635b390235cf16a8081763768cf925ca2d9133"; - sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; + rev = "f3a7c7b71fb12d02fa02700bc10426cb10010d01"; + sha256 = "1g0c37qfqki7v1a5rxf6sy7k07i529rw3f1wmjl7g1zhd9bwsml2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla"; name = "dart-mode"; }; - packageRequires = [ cl-lib dash flycheck ]; + packageRequires = [ cl-lib dash emacs flycheck s ]; meta = { homepage = "https://melpa.org/#/dart-mode"; license = lib.licenses.free; @@ -7571,12 +7571,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; - sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; + rev = "5b55dac12467689083ff995777f54a304ff47be1"; + sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -7914,12 +7914,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "bc747b3b65baf737f99dc4ccf68558581958bbba"; - sha256 = "0j5aywwh8cw0bb55frrpmyfmbzg6d6jv29ys61p1xf49gvki870m"; + rev = "98120f9b362b53983e932f126cf92848297b745a"; + sha256 = "03pnnbqa09iqyypgbgwlkxr6w1j46rla6pivbq7fy366yk2x03x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -8522,12 +8522,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.11.6"; + version = "2.11.8"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; - sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; + rev = "fb43f9354f9f9c4c65091ae15732b1d941475186"; + sha256 = "16l6l2qpkq10wkd95vbch2f7qcsb0jw4rjdf0gck2q8si8i2xi9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -9160,12 +9160,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "245cbc218e94793909ecede2e0d360c7d86f3122"; - sha256 = "1qcxh8v5dj2wcxxs3qcdny00p906nj33wsxyswwa4jbhh2vfxz12"; + rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; + sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -9304,6 +9304,27 @@ license = lib.licenses.free; }; }) {}; + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-lint"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "gonewest818"; + repo = "elisp-lint"; + rev = "9d894e99377859171ee54cb7d2b2e7f2cc7c267c"; + sha256 = "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; + name = "elisp-lint"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elisp-lint"; + license = lib.licenses.free; + }; + }) {}; elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; @@ -10465,12 +10486,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.2.2"; + version = "20.2.4"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "194513197e19cd592f3f5c2231510542f5193fe4"; - sha256 = "1cns1qcmmr00nyvcvcj4p4n2gvliyjynlwfqc7qzpkjjnkb7fzl6"; + rev = "13c6a4bf01d39a5002e09ef1f82619cde9f2c90c"; + sha256 = "1j8fqzaw36j8naafrrq1s329jlvlb06ra1f03hl76xr0bbxm44ks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -11679,6 +11700,27 @@ license = lib.licenses.free; }; }) {}; + evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-swap-keys"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-swap-keys"; + rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a"; + sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; + sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; + name = "evil-swap-keys"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/evil-swap-keys"; + license = lib.licenses.free; + }; + }) {}; evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; @@ -12415,12 +12457,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.4.7"; + version = "5.5.1"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "7be14de3c737e70606d208d8d443b89e58cd646d"; - sha256 = "1sdnyqv69mipbgs9yax88m9b6crsa59rjhwrih197pifl4089awr"; + rev = "ad7d8e3e72ca5044602af060ab2a39c8bbaa0c7b"; + sha256 = "04p9fv4rv5m9ll6dfbffq46wl3inzayjnrfr3v0wdnppyvpl411c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -12734,6 +12776,27 @@ license = lib.licenses.free; }; }) {}; + flower = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "0.3.6"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "2c89a7b0bc9d7b2e95d98e159a059d41ae43933f"; + sha256 = "1ilj0wa53qs8863d7ri9k8m57jd4n2zm3ijs3s2i7fn8a3svmmhy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flx"; @@ -14246,6 +14309,27 @@ license = lib.licenses.free; }; }) {}; + fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fortune-cookie"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "andschwa"; + repo = "fortune-cookie"; + rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6"; + sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie"; + sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78"; + name = "fortune-cookie"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fortune-cookie"; + license = lib.licenses.free; + }; + }) {}; fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; @@ -14467,12 +14551,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "81b858a79b29622a1db732f97225cad705c4acf5"; - sha256 = "04zxal7j58whcy384sscwc7npcqdjlq01jjjn0i35pf2v7r045xy"; + rev = "631c493b97b3e2f928892fb25fa29daca4927f83"; + sha256 = "1a6qr5r62q84m1jcs1xj36p7jr9c042gh38lb7cmfcxf2x693h68"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -14874,8 +14958,8 @@ sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; packageRequires = [ emacs ]; @@ -16536,12 +16620,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98"; + sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -17541,12 +17625,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -18654,12 +18738,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "1.7.2"; + version = "1.7.4"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc"; - sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -20334,12 +20418,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "c15f5a2b4a48fd53b446e0fa291bdb8323b80c27"; - sha256 = "07fzsjmbbq4nx2w23pbb0z88iqmclm156yd87nxsdivndmzvsgw2"; + rev = "5ece767ea30a350dcdb1a4defaca174e85efedc5"; + sha256 = "1djkzjxv7idqg5pmbqf60lmvibp3ccvgdkdwb48wzn2yvnqr2vw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -21843,12 +21927,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "d730208cff185ee86a81f8a5a6feadfea78ab9cc"; - sha256 = "0xfb8zi6jvwdivklc3lk5dzf8nnx05pm4fip44s4al6ajns8hgya"; + rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; + sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -22575,6 +22659,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "54d2c51c1c3da7e06be47b829bf465bf467ab53f"; + sha256 = "0qda9i5yjjf2x5cpg6nxkzqwa8fzzjxk0yyc4295kbawwd83vglr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -23025,12 +23130,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8.2"; + version = "0.9"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; - sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -23214,12 +23319,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd"; - sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -24068,12 +24173,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; - sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; + rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; + sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -25620,12 +25725,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "749f48b510d0fd47dac67850f4089119fbff142a"; - sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -27076,12 +27181,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.9"; + version = "0.1.1"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98"; - sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660"; + rev = "0752659f7a19cead182584fabc9544464f69b83e"; + sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -27398,6 +27503,27 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; + sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-static-blog"; @@ -27671,22 +27797,22 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wild-notifier"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "28f6af12a9efbcab53e310363c451f53ce8ea3f2"; - sha256 = "00v4f26np4i947xgqr03wylz4ichc168znlwxn4l6np1s85i3mzb"; + rev = "5da63fc00db20b60eb46a241cc8308547d85b3ad"; + sha256 = "1269az078d6d0x7ims2qa6wdv8ql2hn70fwigfqw116v9602ywjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "org-wild-notifier"; }; - packageRequires = [ alert dash org ]; + packageRequires = [ alert dash emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -27788,12 +27914,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; + sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -28250,12 +28376,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "940c991ccd0dab53bd7c120601b3db35669c5e73"; - sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp"; + rev = "d6f926e3688d1c8d3c9d06cbfdd5a31f85accf00"; + sha256 = "072dlzskl0w4xcnrzgy36gzn4sla4hw84yr82rv04akb9mg4ya9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -30979,6 +31105,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "440f65ff4859fe45ae411dead032d74a2eb1d035"; + sha256 = "1di8jdvaknr4vx2a68hr4pb040lbfjw2ckzfgmzv527ln5ndww6b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; @@ -32059,12 +32213,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "68984092d0e0725057e7b67ba32016903170f189"; - sha256 = "0qd3qh640339n1dn1isk23xhnkj0pds08yzfak4ijxyzlgl63bdq"; + rev = "562ac6fd6291f828ee6116db62982c77ddd52956"; + sha256 = "0r5pqjmjwn5qpm8kns1730a6cq3bqxjp8ha63w0n1hnrd4gb24sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -32350,6 +32504,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ calc, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "1.2"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "7ec955639865ca8e99a941843e19b12be5015a47"; + sha256 = "0fdjg6gpg45m5myq517vkprmvh50xw10dqa8vwr9hfz2z8dy18ja"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ calc cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -34973,6 +35148,27 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "0.18"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "3df606d14f6673fede6cdf5fad921a664c03e108"; + sha256 = "0ydgg744m671nkhg7h4q2z3b9vpbc9914rbc0wcgimqfqsxkxx2y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-edit"; @@ -35161,6 +35357,48 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; + sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudo-edit"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nflath"; + repo = "sudo-edit"; + rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b"; + sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; + sha256 = "10vz7q8m0l2dyhiy9r9nj17qlwyv032glshzljzhm1n20w8y1fq4"; + name = "sudo-edit"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/sudo-edit"; + license = lib.licenses.free; + }; + }) {}; suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; @@ -35311,12 +35549,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; - sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -36548,12 +36786,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -36569,12 +36807,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -36590,12 +36828,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2bab3bfb6e75d44d42e1055c4e9bb44400a46475"; - sha256 = "0zzm17cv1j25b2hj6vlqwi7iglqckijqbsvap0lkijimaipzpq52"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -36776,22 +37014,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae"; - sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884"; + rev = "ad1dccc9c445f9e4465e1c67cbbfea9583153047"; + sha256 = "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -39687,4 +39925,4 @@ license = lib.licenses.free; }; }) {}; - } \ No newline at end of file + } From 2af43907e01e1bfa4f7fcbbb37bbb74b938c1599 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 22 Feb 2018 21:24:06 -0500 Subject: [PATCH 104/133] melpa-packages: 2018-02-22 Removals: - ac-anaconda: removed from melpa - cider-profile: removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1730 ++++++++++------- 1 file changed, 1026 insertions(+), 704 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b66c988580e2..0bfdb6c11ce6 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -229,27 +229,6 @@ license = lib.licenses.free; }; }) {}; - ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ac-anaconda"; - version = "20160221.1123"; - src = fetchFromGitHub { - owner = "proofit404"; - repo = "ac-anaconda"; - rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462"; - sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda"; - sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf"; - name = "ac-anaconda"; - }; - packageRequires = [ anaconda-mode auto-complete dash ]; - meta = { - homepage = "https://melpa.org/#/ac-anaconda"; - license = lib.licenses.free; - }; - }) {}; ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-c-headers"; @@ -404,8 +383,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -761,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; + sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20180206.202"; + version = "20180222.224"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; + sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1201,8 +1180,8 @@ src = fetchFromGitHub { owner = "gonewest818"; repo = "adafruit-wisdom.el"; - rev = "c0fdfcbbbc49927e0c93656f6d4a877cca774224"; - sha256 = "0vjx5aaj9ndpz399czhg5qsfwgibaycvb8j2acfc26mzhpycc2qy"; + rev = "a63ca24cad86dd0953c6062bacf7ea70866a8776"; + sha256 = "0ca0igkx4lr8d7cayz3b52mzfck018sk5hjf348bafi6y1p04pwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18483af52c26f719fbfde626db84a67750bf4754/recipes/adafruit-wisdom"; @@ -1838,8 +1817,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "8d5ff5e8a6d2e585b0f8f2765099e4e6357470ae"; - sha256 = "0483690q1qg3hlx04ngifmc9d3s47879x3nbz14g2xzc91pcni26"; + rev = "b3f742620c17f9866f3a85ec771f4d0b239f2970"; + sha256 = "1ycfq11x1nshv69d891am50j5zclk62krwyfgia8wk3rxmgnaj53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2610,12 +2589,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20171010.1420"; + version = "20180220.1237"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "b4d5a2fedec176d3562943668609766fab0b23ff"; - sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0"; + rev = "d4ce0e01081ce5ce3fea533ef2e3a78795255350"; + sha256 = "0byg86719jv9fgdvjb49pwfg7y98vfj1jssp8mfdnmswdwmyyf02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2739,8 +2718,8 @@ src = fetchFromGitLab { owner = "ukaszg"; repo = "aria2"; - rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"; - sha256 = "1xkgz3l7idw5bk1xlffdaddf5v1q6fm3grbryl4xvssrbwgnyisf"; + rev = "7a944c5100812269369225af7aa9580fedab175f"; + sha256 = "1pwnx6k7b35xhwqvzd3rl6rf5ydvbrrdmbadns8w0iyz2yafdxji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89a55e7c313066ae1bc0db0af5c289814c85fcb1/recipes/aria2"; @@ -2987,12 +2966,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20180201.1853"; + version = "20180215.828"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "bf5b76e472d22577fa406c7088a1c2d99fe4b636"; - sha256 = "08hrnv7jyzcnh4iyf5r3b1y4wbynk4fraxhkdgwmxzr666aq7cn7"; + rev = "f67722244554025db1d1ccd2a30e9fa22f8985cd"; + sha256 = "1slk5zbwjr7jv21hxsn61ppijj6p98sqh0k0flnd4512gywdrz2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3026,6 +3005,27 @@ license = lib.licenses.free; }; }) {}; + attrap = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: + melpaBuild { + pname = "attrap"; + version = "20180218.1243"; + src = fetchFromGitHub { + owner = "jyp"; + repo = "attrap"; + rev = "0a733deccaf48350511346b2f5a51d328df4dfc8"; + sha256 = "1ck6m30m76jad7w4mwnpv2gl0kzsjpjvmgjblc5a4gw1wsz3i2iz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b7420eca80a8c1776d68b1f121511cc265cc70dc/recipes/attrap"; + sha256 = "1gxnrlsn9xcnnx0nhjxnhrz9bdpk2kpzjhj8jhjmwws9y361fimh"; + name = "attrap"; + }; + packageRequires = [ dash emacs f flycheck s ]; + meta = { + homepage = "https://melpa.org/#/attrap"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -3110,15 +3110,36 @@ license = lib.licenses.free; }; }) {}; + aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "aurora-config-mode"; + version = "20180216.1502"; + src = fetchFromGitHub { + owner = "bdd"; + repo = "aurora-config-mode.el"; + rev = "8273ec7937a21b469b9dbb6c11714255b890f410"; + sha256 = "1dlhf35hhjgkd9bqbpwrb825g1z6nh14mg31jg2avv55s28j0riy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10a44bed8edee646bf68abf7dffbe352a137a278/recipes/aurora-config-mode"; + sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c"; + name = "aurora-config-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/aurora-config-mode"; + license = lib.licenses.free; + }; + }) {}; auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20180129.34"; + version = "20180214.558"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "0470e6bde546b34677e393c92e2b064db61b6e9b"; - sha256 = "0m309nhiqbyrk2mwymha66xcl05x5vryzz0vj90pak62yil15mnr"; + rev = "6af0458a6b586cc5004fa652f23615433304924d"; + sha256 = "150cx8ida9bl0g84iq051rziy64ic2pxz6hn0blsys1qcp9lf8wa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -3551,22 +3572,22 @@ license = lib.licenses.free; }; }) {}; - auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-org-md"; - version = "20160923.708"; + version = "20180213.1543"; src = fetchFromGitHub { owner = "jamcha-aa"; repo = "auto-org-md"; - rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb"; - sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg"; + rev = "9318338bdb7fe8bd698d88f3af89b2d6413efdd2"; + sha256 = "1dzxc1f4yvj8xww5drcpzmn3fyi8ziimh1cmy6l3i399l1zl0njj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md"; sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk"; name = "auto-org-md"; }; - packageRequires = [ emacs org ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/auto-org-md"; license = lib.licenses.free; @@ -4121,12 +4142,12 @@ aws-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "aws-snippets"; - version = "20180207.622"; + version = "20180213.835"; src = fetchFromGitHub { owner = "baron42bba"; repo = "aws-snippets"; - rev = "a6e7d102c5b1143f4787a160cbf52c1e8ab48d09"; - sha256 = "08nbcddmi2fq6hf324qhywy29pwixlfd5lnd5qlfirzrvdyz7crv"; + rev = "619c9a401f873042e45547e8cf57f23d0c8947e4"; + sha256 = "19yrdsn76vscqgxmapxn3gv6nrxp7i20p37anylmjss3xkvblxn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/485aa401a6a14cd4a916474d9a7df12cdf45d591/recipes/aws-snippets"; @@ -4341,8 +4362,8 @@ src = fetchFromGitHub { owner = "mschuldt"; repo = "bart-mode"; - rev = "3d8573713b6dbaf52402de9c15cb34eb3c89a67b"; - sha256 = "0192fc8fnkmnpwjf1qncvp5h7m8n1hlc697mrsn8ls7pnna01phq"; + rev = "6feeb8f9badbc2ce4b60499bf7bf4acdae4cfed7"; + sha256 = "1i1fcrwcswdqwb59154yzijccv7n0fqvm0ck3d8dqx5vczzmqixh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f9cb09c07cb9fdef15de3e8dbfb6725d97dff6f/recipes/bart-mode"; @@ -5445,6 +5466,27 @@ license = lib.licenses.free; }; }) {}; + bmx-mode = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "bmx-mode"; + version = "20180219.247"; + src = fetchFromGitHub { + owner = "josteink"; + repo = "bmx-mode"; + rev = "e0081608162b69090bcd3580adcae111a1c7fb19"; + sha256 = "1aygwyxrqp2l698vndcvghbp3gah56gv7az85nbj4n16cm438ifc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f456d2b2b8f5a33bcb0f2ffd19e6e0276950f24/recipes/bmx-mode"; + sha256 = "04g8l4cw20k3yhbija9mz1l4nx3bzhzj7nb35s0xdyvwbc2mhrwb"; + name = "bmx-mode"; + }; + packageRequires = [ cl-lib company dash s ]; + meta = { + homepage = "https://melpa.org/#/bmx-mode"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bnfc"; @@ -5595,12 +5637,12 @@ borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "borg"; - version = "20180125.849"; + version = "20180220.505"; src = fetchFromGitHub { owner = "emacscollective"; repo = "borg"; - rev = "593314b8f1f4542155eb4dae0ff1be375895b83d"; - sha256 = "095l5cakz0clmna7njqdng3k1gpy4q6h1bld0pvichkkbqh8is6c"; + rev = "28abb4b602d060bba38e6f38623b2d3f309e1ede"; + sha256 = "15iim40gzirw75h6b3alhb95x7pmzmanx6pbdrfmyw7yv4bjsdbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; @@ -5700,12 +5742,12 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20170930.642"; + version = "20180220.1044"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3"; - sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds"; + rev = "af84a83dea09d86e77d87ac30604f2c5b4bf4117"; + sha256 = "1r2prq9j6fmzzkl1f3r9drn6lna2wzd9qv127x7z5g6n8pgb6ipx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; @@ -6350,12 +6392,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20180128.228"; + version = "20180216.614"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "6848057a224e2548a58ec81ce042c81a44dd481c"; - sha256 = "0qzfj57lwxqff3d9kpdg290ishy8h3il43y114kqs1gxcgyxzsv2"; + rev = "85aebcd6aa38dabc9eb16fdfb836144693ac5b84"; + sha256 = "168yrcanig12xcf9gsq0ynynfh0bfsgpr4r2wwsa9k36sdp2bbld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6767,6 +6809,27 @@ license = lib.licenses.free; }; }) {}; + call-graph = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild, tree-mode }: + melpaBuild { + pname = "call-graph"; + version = "20180222.208"; + src = fetchFromGitHub { + owner = "beacoder"; + repo = "call-graph"; + rev = "10f6153156ace869e6b4c1f8f51799eab5f6be5c"; + sha256 = "022l13yv3lavxccs06v29dl85l5vmdmp5xnxd3sw3jzvw3n5faa2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6acf099e2510c82b4b03e2f35051afc3d28af45/recipes/call-graph"; + sha256 = "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc"; + name = "call-graph"; + }; + packageRequires = [ emacs hierarchy tree-mode ]; + meta = { + homepage = "https://melpa.org/#/call-graph"; + license = lib.licenses.free; + }; + }) {}; calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; @@ -6816,8 +6879,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "932f5db4425fdf7bae491d98e8cd702ab58e9667"; - sha256 = "1m1xm7vagjvc2zlh8iddvjfzlgxm4fgl76afzlpvjhxmwb8zkw5v"; + rev = "2d6ed01bd89099e93b3a8dd7cad941156f70bce5"; + sha256 = "08ml8whr8ncrign73xb1zaa4m9zgm4nlx2qqh0qfpm8j0hn9a5vj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7319,8 +7382,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "cc2c7d130d7ae5f1402c5edcad53237d9d63fe87"; - sha256 = "18s6bcddwc8h34bn59xq4hkrn1gyhrqrkwc8y2bz4zsffmjd99z7"; + rev = "8a24c2cb8a59bc4eba0a9271e86d078c80a3864c"; + sha256 = "17my98032fx95kbi0hklwnk52c5n8w9npynd24255637fan46x30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7441,12 +7504,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20171229.435"; + version = "20180215.2335"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "e0462b42218c94288f5c8a62f2b217bb8037995a"; - sha256 = "1v64yx8pr3aqds3grh79y27qg8x5ad3hwxv96pw0hlhvqc62s4ai"; + rev = "71dff335ee593ff1db9e7cafd5edb6c80d709f74"; + sha256 = "070vjgwv1nrg0i4fby4g28h0sxw9pkhd9ym8vpx9g1236351d4r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7903,12 +7966,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180211.538"; + version = "20180219.1846"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "36f1934dc8ff9557e3abef9a93ac468ac453404c"; - sha256 = "0n3xk50jkj2k04j80p1wlxicagh1mrhgsxs4lfgdqsj4ypb9s1ay"; + rev = "38ae9418c8870766a744feaa5fce3749e0c34748"; + sha256 = "0jsfl06zq87zkiz9jysqig4wkxwjgydvxn3zvlb7jsmi2qznq6jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7984,27 +8047,6 @@ license = lib.licenses.free; }; }) {}; - cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cider-profile"; - version = "20141120.625"; - src = fetchFromGitHub { - owner = "thunknyc"; - repo = "nrepl-profile"; - rev = "9aa7e404f53f5136ac8d15301ce8ca2924785cb3"; - sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/440708bbf501e7b3d0aff1b9432ac71b5f9f8eab/recipes/cider-profile"; - sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs"; - name = "cider-profile"; - }; - packageRequires = [ cider ]; - meta = { - homepage = "https://melpa.org/#/cider-profile"; - license = lib.licenses.free; - }; - }) {}; cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }: melpaBuild { pname = "cider-spy"; @@ -8843,8 +8885,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "0465d3c204e8cc7c677dd6a34d3ea884bc5e7954"; - sha256 = "08xv33w6ai51zfsqh73cfcyc6b2dalqqpgavqh4gxp7g34zncg5h"; + rev = "a08ede979bd0c57906c8ebf4120192f8202ce0d8"; + sha256 = "0yqj3h52gxfywa0ky0q1aakk3n2qjaj3rgs2sjvb9ljgg1vlz7mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8941,6 +8983,27 @@ license = lib.licenses.free; }; }) {}; + cobalt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cobalt"; + version = "20180218.2342"; + src = fetchFromGitHub { + owner = "cobalt-org"; + repo = "cobalt.el"; + rev = "ab92a6c5b173f06fafc92fe30864f7c254d19ed0"; + sha256 = "0lpm3pm3xkf2hz73m7hqlll3s43r8qd427g440y9fsmc9sj0q5iz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b2435d98e7564d333c8224b67ac6ad9c95debda1/recipes/cobalt"; + sha256 = "0r3fx1xx24x4qapbj2p8krc67rjmrjm88y89baf1x2swk7xdza92"; + name = "cobalt"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cobalt"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -9595,12 +9658,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20180211.1604"; + version = "20180221.354"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "38ef92d6273113c2b3d2a302129ad37a30f98998"; - sha256 = "0l9hhflmirv1a0znjsg6ysvrsg270pwnkmhakihhqy39fgv3qdfa"; + rev = "c96626f35c3a7886b49c34d5f2986c991dda29be"; + sha256 = "0g80rgzw9cxa7ziiwgcrfnw75gakiw0869n6j23wzxmckccqyh7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9812,12 +9875,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20171202.1243"; + version = "20180219.751"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "dcad9c07ecbd90d261520ac09251eaa3480ea98a"; - sha256 = "132dw17d8k8sk3g0vbs0qqb359rw33ck4pqx3w2p8kb2zmzam597"; + rev = "e2bbd06af9661628198d12e7b4725a17ef260dd9"; + sha256 = "01qyy4037isa5ghy7gwl77byydn3s5mc6pvd7w79910cg5h60dkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9861,12 +9924,12 @@ company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "company-dict"; - version = "20160528.53"; + version = "20180216.156"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75"; - sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq"; + rev = "7ab6331d8095e9b93c726da754102fd708c0002e"; + sha256 = "18lfqankivzdijsklyi49a1v6nqixbmk4d1m6syqd63qj849aixa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -9928,8 +9991,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9987,12 +10050,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170325.810"; + version = "20180216.857"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "339f502e46e7d9214b61498d539b17f8f0322d17"; - sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9"; + rev = "4443a7fb06ae0f701cc9f661fcd889b71cd67da0"; + sha256 = "1yihx3qv8hbsfmcsyl0j4l5hgn4nx1191rkfxrj41wwbnbjkhs9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -10218,12 +10281,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180211.2052"; + version = "20180216.2325"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "b58c8c4cbfb0e01ee9020f09dfd25cfadda58cc1"; - sha256 = "1fs92qd0ni7bwbbccyjycrklcdb1nwms6yabfwr37aizkbrg28lw"; + rev = "4512d062c38922d8b8cf402ca6043c246e915694"; + sha256 = "0q95lgw02qy5dn3vpdhspmvjhnfzmmn2asajaf15q5lkjbsvxfrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10348,8 +10411,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "cf9db85af2db9150e9d9b4fecad874e16ce43f0d"; - sha256 = "0gm15f5l91sh7syf60lnvlfnf3vivbk36gddsf3yndiwfsqh7xd0"; + rev = "e0b857aa3d24b9efd1cf2ddc70c38b86a6dae75d"; + sha256 = "0jvhzyq8d779hx3xbizcqmkbsvxqsyy8m423ksmjlh3afwvq4n6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10501,8 +10564,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10539,12 +10602,12 @@ company-solidity = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-solidity"; - version = "20180206.821"; + version = "20180221.1330"; src = fetchFromGitHub { owner = "ssmolkin1"; repo = "company-solidity"; - rev = "0687c09671403888b88e27d58e70f1bc969d1425"; - sha256 = "1clxzxyvnnf6mvadlqslbn7is7g2b625mnb4c5k7iyflc081wpz2"; + rev = "9a57a4ff4cad1d423429c78457cd05c38826801c"; + sha256 = "1v9h85vb6lqjlb5w9g2i042zb3w3y916in7h8jph2b74187a9nl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef246601ff6d92d6dfcd809f637e50d9838da0b8/recipes/company-solidity"; @@ -10711,8 +10774,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -11022,12 +11085,12 @@ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "copy-file-on-save"; - version = "20171211.1744"; + version = "20180217.914"; src = fetchFromGitHub { owner = "emacs-php"; repo = "emacs-auto-deployment"; - rev = "11c2004947e0200e88991e265a5ae971adfbd7b2"; - sha256 = "1snlh828zq6b3znrdg4mfl4an76qbqhmld23pwl89ncp37f2lbhv"; + rev = "1ad10401711a3bf0a0894eeed357b402238be113"; + sha256 = "1ydpsh5j9j168crn30lpzv73rw2z80prp0hn2rybgrhvqfs3rbx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; @@ -11148,12 +11211,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180211.1029"; + version = "20180221.1013"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "b656f818efd797422886bec455d3cc15a9816c87"; + sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11211,12 +11274,12 @@ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-etags"; - version = "20180129.219"; + version = "20180214.2057"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "counsel-etags"; - rev = "2219bf8d9a4584abc905c7470455777553496056"; - sha256 = "0kcxcbf1rm7cm74s5z87pv0bflx42h4j2lnb8b3r0nznj94ywnj3"; + rev = "250ba92bd4b38c5c5e9cc72fd0f57db2d5f62d6d"; + sha256 = "05g2fx6i9gb7y0prlslff31f2rl78pyy21k4dkhb0cz84dz546zb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; @@ -11295,12 +11358,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20180204.1147"; + version = "20180217.2349"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "1c1e7eff065e1660981428ef326185c404488705"; - sha256 = "18b66rv73y6gx0hhjjfixywj0ig41rxb4k4ngpxap56cy7b8kfj9"; + rev = "bf98fbd1988885e82129823bf189b777dd52a084"; + sha256 = "0z940554lqsyrj1wljmgl4najrxpv4d6kqf5n60a6sj630ak0blc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11547,12 +11610,12 @@ cquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "cquery"; - version = "20180204.912"; + version = "20180221.1057"; src = fetchFromGitHub { owner = "cquery-project"; repo = "emacs-cquery"; - rev = "e3ce2127f9937eb0a7b7a22e81f205ff150f4ecd"; - sha256 = "1p3idygppqi5xgbjq9pr5pqpm4isw1cb8qq8szf5mb6ypq2dlszm"; + rev = "49f0a893b00c23c6b568865fbb3ad96b3e7bc63d"; + sha256 = "1ympaq2f8k2f7frhv1nfl63alfv16zfh1pgpyghccklmqcndf22i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3cd3bffff0d2564c39735f844f9a02a660272caa/recipes/cquery"; @@ -12303,12 +12366,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20170907.1648"; + version = "20180213.854"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "829d7bbef5173771bcf9ffdf2e7e30e96f98e99e"; - sha256 = "10671yczbixg90x5c8rgd838w5la21x9jqdm03vcrz03i2ccjs99"; + rev = "cf12b08972616c824c11b0035716fa930ca34dc9"; + sha256 = "1yqnj22b7alma31pdxvxc3yz2rafhjii89fiwv47ykdjjm6fs200"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12345,12 +12408,12 @@ d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20161022.717"; + version = "20180215.727"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; - rev = "a97c92ced57224287a84e7fc48ba9aac6b2afc08"; - sha256 = "0ln38lkl8qcnpcpjqck3i6hd5zjv43g7vka3kapz2bnz4s33jn3p"; + rev = "398f1854d53863185e60873b494eec0263bdd0dd"; + sha256 = "0xka4k0j0rl4kjjyzryx7a7ngf9qzry148nhpzc66yirlrp5hjn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c13e9ccc358743de660b1f0e89d6bb709c42bff/recipes/d-mode"; @@ -12450,12 +12513,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20180129.634"; + version = "20180221.541"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "13e5ea8758465e7d23081fbb524603394b09a689"; - sha256 = "1zhn2bblafmxc83rg33ipy8pd0i7qrn9630cy74bigl3x5zxs3xd"; + rev = "7b32dcdad3933e0eab03d2702014c0b56fc73b9a"; + sha256 = "1sxqnf8c48p8jnrxabjikijah8d7v11c4k4mvmc67vvn92p20ag5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12471,12 +12534,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lcr, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180202.48"; + version = "20180219.650"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "c1c9bde9a83a87c46731466af56cd31262d057fa"; - sha256 = "01krdh3cz2ddhlhpyc072izm4y29qbpjkmwj0fq4vi5hcqzbalsk"; + rev = "f8f811d61aecb08cb0189b7f9b6de9bafd61fa27"; + sha256 = "05y0gglaizq3ggd8l34iikaik7dwj6kh1a6vq932mg96bmfk55gx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12681,12 +12744,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dart-mode"; - version = "20171024.2137"; + version = "20180219.1614"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "adef2a5b672d503ae3e92b30bb80095879b030d0"; - sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69"; + rev = "4feac341db7d2b80841fedcf1798dee9070d68bf"; + sha256 = "031f9lkxyhirasj7m0rj67gk8rh3ry640qcppw2p88k937kc6765"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode"; @@ -13646,12 +13709,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180210.1348"; + version = "20180217.2011"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "263d330d8f9e99c9c3d3235fe6cf90ecaca90e7c"; - sha256 = "1dg5pf54w9479br40i0b66y86xdn1xj99iq7rmagzva908q5rpyy"; + rev = "d033fdda154e688e45cca35902dbff9915351b98"; + sha256 = "1d457029zyabfjhzrgayibdmxfmia5yr7rqn50kc16k3aavw32f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14129,12 +14192,12 @@ dired-sidebar = callPackage ({ dired-subtree, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sidebar"; - version = "20180126.1812"; + version = "20180218.1717"; src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "6b2d1df460d4b0dd1448b092d3753314cba784c5"; - sha256 = "1i5ia9m7r63gr91ll9xmqq48y9823hg0mqq69rnzfvbw0zjbgkrq"; + rev = "e43864a70ee240bf8dcaddd7bb88b77c6e1e9fe6"; + sha256 = "1s70qlm1jxq7larwq5gr2zc58q4qxch5f2qk6fzqwkpcvsvlv304"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -14276,12 +14339,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20171221.138"; + version = "20180213.1238"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "b1c14f307652e5a039165d196a799638feb16cd8"; - sha256 = "0vxa29z08idy74y0140c2ddxysj98d644zih9vvddjjmggj7czna"; + rev = "5b55dac12467689083ff995777f54a304ff47be1"; + sha256 = "0sjrnab8rx1bpnxim268b8jfpyh8h0iy3j38925r0jqjgjb19ksn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -15165,12 +15228,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180205.1204"; + version = "20180219.1227"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "d84a0172202243f4fe0ae5738d7ea9b1eb2d38c6"; - sha256 = "0za6cq7wr7zpqjq5g6ac7zqnzq544s0zkkhsc0djcwc2x67vr95g"; + rev = "aa57d222b65a4dc9dddd76f66adbe6ac003f57a6"; + sha256 = "05chhg1mpnp3jqjgwwsnzkh19ci4429sgq9xpx4jxfbbalhd4z11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15585,12 +15648,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20180211.946"; + version = "20180218.1123"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "34f2e23de514deeb61888557e66ccc9790ff8eed"; - sha256 = "09fjr4m5cxgfdxpnrlc7hdvckz0l0lrx1vyglb7kwyyacyp1vdly"; + rev = "3ea5136bde1240f93fbf3ce30fffc4f279a58d27"; + sha256 = "0lkc8y09lhlpg7vrn2459c5fxn0nvxbzqhwadmkgc046i3aapqpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15669,12 +15732,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180123.1100"; + version = "20180214.2106"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "3bd7c23c3e4ac0936679ad6ebb68f14e37c7bc5d"; - sha256 = "0vnbp8q059z9bfhf1bq1n6cvc4ia3rkdk0iambgwd48i959mdsvs"; + rev = "3b172e2adc374cb8f96adb7c9cf76f0e10c8f79c"; + sha256 = "0fd7zarm7xlfw02anjcbnqhkd20nrf1fnw26cmbxsrw23xx9skdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -16050,8 +16113,8 @@ src = fetchFromGitHub { owner = "redguardtoo"; repo = "eacl"; - rev = "ec601f3a8da331dd0a9e7a93d40ae3925bd06700"; - sha256 = "1kgayh2q97rxzds5ba1zc9ah08kbah9lqbwhmb7pxxgvgx9yfagg"; + rev = "0e4d4e016caedbfed8dea0e700a33a043e798029"; + sha256 = "06dcv3ws91ldld3qjpbpp5j7jnjp0s8ng6g7w8wj0rspjbcb2dg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl"; @@ -16256,12 +16319,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20180204.1402"; + version = "20180213.531"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "7212edd2f54f2e289230b8d884dfcb3155c65fcc"; - sha256 = "11fmi0pxx83qmhh62ilc6i2icrl7x8pj34rrkxlc5plyph8cczjd"; + rev = "cbad0a51d7905712201d83e9f4f52a7bb047652f"; + sha256 = "1jmg63q4msy83nr0xzivay9n8nv48kawqj5jxlfq83fwkvnk1szm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16302,8 +16365,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4f27d04c30a026f24c0ff18c3a7d36e3fb5b57a5"; - sha256 = "1krrm123vzv6hw54kbkbh1xj6j090rdm4r2fcqp76b3hg8j8cpn1"; + rev = "6396ad1cd25c0a197109343ec1cce5d5080acdff"; + sha256 = "04ci3qb3vgqdvsdfivhwfsxrgalh61b41bsr1cafk4gv3g3rdr13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16919,8 +16982,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "bbcd5d93f3cd61b593c4d565a374ccc8bafa9020"; - sha256 = "19am1hmi3gjpwqmjnlsqdnvwr225y212lr9ff37jkyhdfny71lnr"; + rev = "a41addef812318bb6bc0a693ce3a22606f27a3cf"; + sha256 = "1303m6d53qdkv3j7bx708ipvrjb4mjdj1b58600x8471bddamgh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16997,12 +17060,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20180124.1435"; + version = "20180214.1442"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "63388e5d0cf318bdb687054e2de4a4205108ed73"; - sha256 = "0c1pd2d0yv0d4zclh6ri1mwcj1pa7bxbf376kwia4rz400jx5fah"; + rev = "b130d4b3fe15b2a8859baa7e0d2c9d203219d0ce"; + sha256 = "0frl3cb8qjgc96bn2j7ndr34xylbfmz4bl9kl29spqwqn163i385"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17070,12 +17133,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20180212.55"; + version = "20180215.627"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "0981cdf3ecef13a6be1d15bfad303d71ba85e625"; - sha256 = "105y6rfyfcdgzc0xi3dy7y919dm51330sbg2acfpgsqkmiwpp6j7"; + rev = "ef19d5e33b632d776e9e369281c522e26e632384"; + sha256 = "1q8gh79rfcn4v8ps4z3a0s60qr5nf9j93p0mkq0fdll57h2y6cbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -17364,12 +17427,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "20170804.2142"; + version = "20180216.2005"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; - sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; + rev = "742b2e4de42026edbff20dfcc6f63200c1d0ad40"; + sha256 = "0ji8ngf6zzhhq2vhn9i04dpgg1sgqcs0vzq7wdyfl9cfa0cpwlps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -17385,12 +17448,12 @@ elbank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "elbank"; - version = "20180206.701"; + version = "20180215.556"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Elbank"; - rev = "817047305e9db1260956ae5ac6b60c9027868895"; - sha256 = "0i5nqfjm69kbvnkvrcvfv8gbz0608cldmi3zwq2vpld7p35d5d26"; + rev = "f494716105b1a9f4f52f43bc3dd37c9cd0309bf5"; + sha256 = "0bvx6nq0gjjbjs0mzd1x1ajyjpa181z0n4kv4aknh3is210gbpbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05d252ee84adae2adc88fd325540f76b6cdaf010/recipes/elbank"; @@ -17595,12 +17658,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180127.1442"; + version = "20180219.1340"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; - sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; + rev = "fc49bee1f7ca74dd160111173aad35b1af304494"; + sha256 = "0l678rznj3gkmfb1np7m0140cnqjb8hil50kn5m3pqh7m5q0w5a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17690,8 +17753,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "e2b0e255fc3a3cb3e9d69c05df3b8e9d7ca70e86"; - sha256 = "1sq2w40ac8nc6pvifl0r5ri255jcd237x5rxfliwd2wdwqhk9izd"; + rev = "fc49bee1f7ca74dd160111173aad35b1af304494"; + sha256 = "0l678rznj3gkmfb1np7m0140cnqjb8hil50kn5m3pqh7m5q0w5a1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17788,22 +17851,22 @@ license = lib.licenses.free; }; }) {}; - elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + elisp-lint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; - version = "20150430.1558"; + version = "20180218.1247"; src = fetchFromGitHub { - owner = "nschum"; + owner = "gonewest818"; repo = "elisp-lint"; - rev = "1168b12575f1ed54ee523d34a90757459a6e42a3"; - sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy"; + rev = "a8342bc7e756f1df72b8a6c10d6eaa1658f54eee"; + sha256 = "0yw5rchnyb5vvr4gnrym2ngbfyld5ngchhbak99g49gcgvv5mx79"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3744ee1bbde7ec8cecf2796d6ee875c327eb698c/recipes/elisp-lint"; - sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/61595c78ac7f15eef47bf28636ad796f74741509/recipes/elisp-lint"; + sha256 = "13cxcn0qp63f2nkv37c3w47dby9cqm4l1f8xilgpczdaxd86kd63"; name = "elisp-lint"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/elisp-lint"; license = lib.licenses.free; @@ -17879,8 +17942,8 @@ src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "861788186f4dbd500209656dcf38a15b3efe74dd"; - sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra"; + rev = "e928aaf118e399fca2df47c91712b9a469eb1764"; + sha256 = "0x0ip0mh7zn6lmzj3p3v3jlc9x1j0afrq5rfgi22zk40zkyh26zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -18148,12 +18211,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180210.1445"; + version = "20180218.1254"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "a86165de49f44013ba07d92d90f949a22ff9299a"; - sha256 = "0b2qpsxrda2h2x82sqqqg7vqi6a1hx1jagri4al7sl9s74axdkr4"; + rev = "04c8c6cbdde2858defd9a1ba53f06f433ede63df"; + sha256 = "09y1ik86wf9ssrriq8jc1idqqzxvnzasl5qfy8x915m0730mjdxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18765,11 +18828,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20180103.520"; + version = "20180217.1219"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "3a8d16d91edae81ffb2bb9efa12d41712edfd4f8"; - sha256 = "1cwsjrjasb2gi28aavy64g4sg9wwfq3wab24klssh3290qrr3gkb"; + rev = "0459003a1686b5742e660d08e7c936d1b06e8e7c"; + sha256 = "1gym522bhxbip4vfg0lxkpjnb00nb4rh08xdmz33r71rclh4vrkv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -19414,12 +19477,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20180112.457"; + version = "20180221.1318"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99"; - sha256 = "0kf1gcyfmh7zids4q2jwz6b0kffdhalfqx9ibk11adla8sf6bvj0"; + rev = "5d0bf705ccb617fafe28f2748d566d2a990aba06"; + sha256 = "1igiwnvl3w907hz83x8hwf298wdv86s5c54zs4naw1pbi875j7zw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19896,12 +19959,12 @@ eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; - version = "20160809.2053"; + version = "20180221.1313"; src = fetchFromGitHub { owner = "justinhj"; repo = "eredis"; - rev = "0d7d524592be488309c7c339d137ba836e52bfff"; - sha256 = "0hj8czwqzdjs7ciyg4xf0imdqfv423c6q862gy83ni09zk5ncm3i"; + rev = "8a96034805fe0664132ce2e12deb9936503af2d4"; + sha256 = "1w4z98vr7iy6yxdk3lha7flk48ckxl2baaq8kx7abkirzfl8j4hh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; @@ -19984,8 +20047,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "5e7286acceec0811fd95898c7337921ac91c97b4"; - sha256 = "0ccynwiajdcb3h2xhb2y91kgf61pj9i3h3h4g4d6142j3mr4anl4"; + rev = "4c21bcd5bd08d67f00471455f9489867cc1766fc"; + sha256 = "1imzh9rhixv2ws7mxaxs2lsbla5k4yzzz61c21sjgqw078b278k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20064,11 +20127,11 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20180207.1348"; + version = "20180208.935"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "45a359a94dbeb00838df5dbee15ad42e061af431"; - sha256 = "05nwq8w7rczmn41bxz97sinn561rx8vb01dv0hsx0xllni7xwf59"; + rev = "b335d7fb84d6af381a5dbc40c324078faf397b66"; + sha256 = "0nbpqhpff3my4ndsf148iqgnl84ilsbq6na5jnn3nddyhbmidcxb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -20105,12 +20168,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20171111.451"; + version = "20180215.857"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "80ff435058f0e9815d0ac8c7a53143c474e00db3"; - sha256 = "1mgbrfgdvby25aaw3l9d0h4b7h5zap6s1m1vlxmmv20fhxza7wbc"; + rev = "0de42343a9de834320397d169c81725b2827e41f"; + sha256 = "0jc7n6mdv1kka47wmjjhgfw46l16mqlj5kkkyw16gd9g8dwcf6sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -20147,12 +20210,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20180126.711"; + version = "20180212.1425"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "8c1c601a72fbc9b0e0a80974856abfc679843c86"; - sha256 = "0ppci48cz453ivkd37zbs3sgan0v7nf9d65qy77zvkn55qn2f4bq"; + rev = "c5ad728ce3fc2c513108e0ada2cd0c08ab94f870"; + sha256 = "0drmxxqgml36fymn4gqxbjimh8dgmm4yr68hsmsd0iz1lxglgda1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -20609,12 +20672,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20180211.1419"; + version = "20180216.1616"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "2622184dca12e76c856443251ee61066af5392ee"; - sha256 = "0w7c7g8kxni5bgaxmmjp57z5di7r500yvvcpldr0n4cjx7qf9gjg"; + rev = "f10792493602cb5c77a7010b1b4c7063c7c41add"; + sha256 = "03spbyi24gpmw7wlf0aifg0aa793sm0s1lxk9xw2lm974rj0g6w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -21113,12 +21176,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180202.1722"; + version = "20180219.140"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "f04fd5eef32728cb146d2dc5f3701b1d4733a2bf"; - sha256 = "12magy7l325cfi25b8y8gd5b9n3smhn3w07mxb4nbp3rfg7nv2db"; + rev = "7f0988479ac6c8620ffa0e33ab1cb1acf08738ff"; + sha256 = "1nj752rpv1rmqga5vr8jghq3y0gb0831r18z1k01kfdahb2n25vk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -22230,8 +22293,8 @@ src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15"; - sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn"; + rev = "c617fecb91303f8c63f85a6101a503fdc88aae84"; + sha256 = "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -22435,12 +22498,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20180211.1557"; + version = "20180212.1529"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "e8e4fbb77008bbb50e6733571655e815cc30a5bf"; - sha256 = "1igbis1784f2hs2cdva87nhzjfxaj6h14n2k07r4fy3igfd9qfa0"; + rev = "ff3ef4f6fa38c93b99becad977c7810c990a4d2f"; + sha256 = "1kp6q55g3dcya4y79x877vqwxa4z2rkkvhs49pkwr3wljf4af2pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22624,12 +22687,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170916.2015"; + version = "20180222.327"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "abb210ff56134cc6a285d91b875f3115bc951ad0"; - sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8"; + rev = "5978c89e384d1edf4ef170733c0941004882ec4a"; + sha256 = "114k71dyhzljqcllq4pcxnq3lclr2w9rzrmf3ph987x8rf07657r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -23343,12 +23406,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20180201.2102"; + version = "20180222.437"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "cf20dda6050b11bee871b55f758716d8daa07b46"; - sha256 = "0f4mkhdb56bnyp7wkg4bkv74rl51k4dxciv0zqf5x91lfzhz8jd0"; + rev = "ad7d8e3e72ca5044602af060ab2a39c8bbaa0c7b"; + sha256 = "04p9fv4rv5m9ll6dfbffq46wl3inzayjnrfr3v0wdnppyvpl411c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23574,12 +23637,12 @@ firrtl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firrtl-mode"; - version = "20180122.1950"; + version = "20180221.1555"; src = fetchFromGitHub { owner = "ibm"; repo = "firrtl-mode"; - rev = "285f5c18722de98fd3dae195a2bd653497cf7daa"; - sha256 = "1a4dhx2dv7ld14jn4r941w5mdrh085nxnlc1w93r93h13fj352q3"; + rev = "1ac00d526018945389bcb2292dbdd8395381774a"; + sha256 = "02xznsiij39lhjr261vl7yz4k4i76vshh5kwa7ax95zpj2zbs0v6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbf9ab9db03410c35b8b73a23bf8062b10f0815/recipes/firrtl-mode"; @@ -24018,6 +24081,27 @@ license = lib.licenses.free; }; }) {}; + flower = callPackage ({ clomacs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flower"; + version = "20180219.1131"; + src = fetchFromGitHub { + owner = "PositiveTechnologies"; + repo = "flower"; + rev = "f6341389d7ed0bcfb5ee8f75ab073b7cb6e5591c"; + sha256 = "0sqx7jalnsamvx2xhg7bgq6gwxs7a7iisvkix25m0rhk7zaqc1za"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8a731715d360aea9af2b898242fd4eee5419d14/recipes/flower"; + sha256 = "1cb9ppgspdrg4yrrlq4sfajpa6s7xiwvdf9b3947rmmxizgqgynd"; + name = "flower"; + }; + packageRequires = [ clomacs emacs ]; + meta = { + homepage = "https://melpa.org/#/flower"; + license = lib.licenses.free; + }; + }) {}; fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "fluxus-mode"; @@ -24105,12 +24189,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20180211.911"; + version = "20180221.1302"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b1c1ead1292b56fdb59916cf9a2e36312979f205"; - sha256 = "1dqkn8j0k2wiv7ycfxgqiblj2dnj95aj7yyy9ijbw1prqmr5dy06"; + rev = "1c167a2d7c8110079c626e7e06c730b80fc09dee"; + sha256 = "077h8gciwn0ryvc4i2277mg3mlf6ws9xnidr7dln0010cs9dkdgx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24252,12 +24336,12 @@ flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-analyzer"; - version = "20170704.2333"; + version = "20180215.345"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-clang-analyzer"; - rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; - sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; + rev = "b4cb26dd2341f8da8c04c17c9a7c3199306cea15"; + sha256 = "1zvamzf86zfrj1yj3lfcz9cp6l9436d77m5k3dciykrdayw3ligw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; @@ -24588,12 +24672,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20180208.855"; + version = "20180220.15"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "0b374e5cd3cc87954e3b6193a671dbc060d88339"; - sha256 = "0g357wm84yc80g3cfxm6ffk15jw49za3qsfh60jij8619k1d6719"; + rev = "3d378a59492c810842b7c72506d2037bf70b8545"; + sha256 = "0y8iqyml27sx2d765w2hhbyrdx0alaqvj5ls8x1zf53xfwv88x3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24693,12 +24777,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20171121.514"; + version = "20180216.1156"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "d9d1262b9139df1cab8072e5ab15563571f32b8f"; - sha256 = "0lahgqjp6w8c8b9bfgc3awajlwgr99zsly3jylnd0waiwps5gknz"; + rev = "8173accf0e389f7ba0936d399da84839a7f887af"; + sha256 = "14g3mi8i4iy5f3fd3f7yx8ha18zi0kxqgn3sxkvdnk9rp1cdfnk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -25390,8 +25474,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -25663,8 +25747,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26940,12 +27024,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20180211.2037"; + version = "20180215.2005"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "863e9a0d6753ce46e978819a624659ca8d4385a4"; - sha256 = "0smr5a19qvak45hx21j5g507jmrb1g5y19gz3n9yb82darlvpdh5"; + rev = "f131de1052d724f14c6c4a19d72978be7c70e5ad"; + sha256 = "04dqdzyiy6iqi9p8dy8k2zml5nmlrin0p60b9p5hhxabmkwawmbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -27233,8 +27317,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "5fb53c851ca2e37f9e71f165d5536d3fcd553466"; - sha256 = "1bqryhbz9hyjvfagss0rdffhpg0j1ay3c0al99dgs0gd3cx2dp42"; + rev = "0d7fdb92b5bcca4195ead0f6d2a1e58a2c0a4f9c"; + sha256 = "0mr2iqkzmx0lpakgp7i76w1bqv1zqsipcd9lg1f0jg7wzvwsrmif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -27359,8 +27443,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "f3a37a6f749262dee56b4dbdac3a974b2413ff95"; - sha256 = "0pddsg1map44sxdljb1gnrzcb60iahxa7hzzffc5q2y1a8iqpd8d"; + rev = "e0c57994431a7b6aba4c9be11feb95b626feb3f4"; + sha256 = "1znvd30bfn7hsldsim7ynwsd4s79dr188vljbx3g4wi3wyd0fia5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27689,12 +27773,12 @@ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20180130.2055"; + version = "20180215.1455"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "63333fcc7fc181949601b75a4296fd3a338f287c"; - sha256 = "11lfia2jx1vaizd1afln0v5s8y2czkhrrdgn01j1mq104kapxain"; + rev = "de82992bba6226f1be3aac9ed6568f1a3b23295b"; + sha256 = "1693mrknq0mwzgwrh5z92nv7c80g6ynlymk5qfq8icpii4rlz5n2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -27983,16 +28067,16 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20180201.414"; + version = "20180221.1319"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "b267bb6c55b0c05aec4d3fe0e9385ab0e1139463"; - sha256 = "10rwl2nv8gk9bzj7cwmgzvcsscgb83aw5ag9jj7sv638w4acmn21"; + rev = "bd16d17006488bcbcea32b258752ddf625954c78"; + sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; - sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/ghub"; + sha256 = "031bzp61aal2id5sazwjz30svydjvxvphw5wbv5cyy4dqyh7w2ps"; name = "ghub"; }; packageRequires = [ emacs let-alist ]; @@ -28022,6 +28106,27 @@ license = lib.licenses.free; }; }) {}; + gif-screencast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gif-screencast"; + version = "20180213.2"; + src = fetchFromGitHub { + owner = "Ambrevar"; + repo = "emacs-gif-screencast"; + rev = "ab832e7976102adc0f0aae0d531eb077bac8c228"; + sha256 = "146bi1k86kxkrb73p6xrif942lqzqc54fmnygv6nw66fnih045jg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b149509fb245975b450d15470c7d915e3c7b474d/recipes/gif-screencast"; + sha256 = "12kjr76b1180g3grfycghmgr3xf4vmhlhks8x3ri1gigdf0j8vaa"; + name = "gif-screencast"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gif-screencast"; + license = lib.licenses.free; + }; + }) {}; gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gift-mode"; @@ -28218,8 +28323,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; - sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; + rev = "a50ae25e10601ada0730caf4bbb2064053c3428f"; + sha256 = "11niwd86y0i078yxws7giyv6as59ndfiwia8298qja6a3hqkgvfp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28512,8 +28617,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -28554,8 +28659,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -28764,8 +28869,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; - sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; + rev = "8ca6595b1362d5882d5642e79f7bb2f18f1c8bbe"; + sha256 = "1crpndp5flw16vrbnd24bk3r99s60xa9zc34apkdglg2s3n50wh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -28883,22 +28988,22 @@ license = lib.licenses.free; }; }) {}; - glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + glab = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20170924.359"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "glab"; - rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c"; - sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba"; + version = "20180218.652"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ghub"; + rev = "bd16d17006488bcbcea32b258752ddf625954c78"; + sha256 = "0fqkl0dhiqq53p51044aw1zx64phdqklz5c0c1kd3vx92j76zsp6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; - sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/70a4dbd62fd6ebb4e056d0e97fa1a958437ddc91/recipes/glab"; + sha256 = "0ym8bgym11mdv5bw22lgkcxyqy7qgxxm0yjmrq8qx7i55gqayyb8"; name = "glab"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs ghub ]; meta = { homepage = "https://melpa.org/#/glab"; license = lib.licenses.free; @@ -29852,12 +29957,12 @@ golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golint"; - version = "20150414.1730"; + version = "20180221.1215"; src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; - sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; + rev = "ead987a65e5c7e053cf9633f9eac1f734f6b4fe3"; + sha256 = "1sq6865rfhsg6q29gl8msfr9vcgp65ji4nqdh0m8i8f3gxy87amn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29919,8 +30024,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "cfce3c3a866cfa9ec12fff08d5e575ca875f787b"; - sha256 = "0h35802dp9y29yvrqvkhd2b9x6jkqlwz46k5lgvabsiddqq4x2sn"; + rev = "209d38166b1a56b177de486d894d39ae6822eee6"; + sha256 = "1qssg9sz6b5mx1x6x9ygi5kjmazi1787h8pph990fblh8gvp41wx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -30192,8 +30297,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "d9021ec5f7105414166ac8b535b7de9f1c115cfd"; - sha256 = "02vdb7xp3dgqv83qcandsyq60i8pxvz4yq0d3lk3xl15hi3l75ji"; + rev = "0f82f03a2bbf14037d2331cf02f1d4157bbef6cc"; + sha256 = "19bbx8jmigflyarmydf03ms8lsjwlpn6hl97s63dcw3l4gz4jab2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -30318,8 +30423,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; - sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; + rev = "771a9f448593216b8d93deb8cb18465f3551406d"; + sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30535,12 +30640,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20171005.1641"; + version = "20180220.1332"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; - sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; + rev = "374d14b99f4959fa039c0e1ce8e0e7991b726d98"; + sha256 = "135w5vwbk2468b82v6icc8nh50d9flpi7zd63xch8vpvsri0vpw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -30719,22 +30824,22 @@ license = lib.licenses.free; }; }) {}; - groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + groovy-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180109.718"; + version = "20180214.810"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; - sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; + rev = "771a9f448593216b8d93deb8cb18465f3551406d"; + sha256 = "1gyj8j02if4hlrj06j5mya1qa8c3vm11y1s4qamsak07r7p26n4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal"; name = "groovy-mode"; }; - packageRequires = [ emacs s ]; + packageRequires = [ dash emacs s ]; meta = { homepage = "https://melpa.org/#/groovy-mode"; license = lib.licenses.free; @@ -31100,12 +31205,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20180206.1739"; + version = "20180220.419"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "087af78262c40fddf9412fa73f7d4d8c6811282a"; - sha256 = "0s8hazfw1nd7sk7nky22d1lq8vqhfba5a2gm4y96s6g31h5wd71d"; + rev = "89077fdb98ab1e77459c7839decdf21b87f4341b"; + sha256 = "11id6gp6mz97sm2izz6y47n3sphlibdb6nzvbkcxl7l7av53wxg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -31707,12 +31812,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180209.2348"; + version = "20180221.555"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; - sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; + rev = "d4a23dd3ca15ed96f219bf213f90012e761b79ee"; + sha256 = "1qaa360kw830gg6c678psgl3w8ga4drjzcw9x8wlwrncidv0ijm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31938,12 +32043,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20180124.338"; + version = "20180216.333"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; - sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; + rev = "bb73c3dd28e70c3996cbee5ef32933a4904eaa22"; + sha256 = "0hq558j3qls3fcf35zy0s8qw9rvx66z0a08s5rkwzzy4nn39rwzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -32316,12 +32421,12 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20170608.1029"; + version = "20180213.1405"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "helm-company"; - rev = "ae4e1a05455f5eaf07e61b8627934ea1df4eb048"; - sha256 = "05lfqdg5pzwji3j5w1l892qab9nffd3if8ha0545gbxfn94lnx90"; + rev = "acc9c7901e094c1591327a0db1ec7a439f67a84d"; + sha256 = "1d4q9clp0q56br80c21a4wz1gc4jw3mdy97z9mq07x9i8rhlppzs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company"; @@ -32337,12 +32442,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180206.10"; + version = "20180222.224"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "749904ca3e49db17751b906a9781c3da0e4a2b43"; - sha256 = "0zx052y7pxa0zcrgxn2krv6xz4w8l4fcn6wxks64rwkci7n5ywim"; + rev = "d4a23dd3ca15ed96f219bf213f90012e761b79ee"; + sha256 = "1qaa360kw830gg6c678psgl3w8ga4drjzcw9x8wlwrncidv0ijm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -33118,8 +33223,8 @@ src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "6490074b81ecbc6d96df662fa076cf9194158f17"; - sha256 = "0xriaaz3qrxc9j68x0fm55hb8iwag5y03xx179yfa6884jx0iik7"; + rev = "f9b5f0dfd51e16278eba70d8fc94a599563dab61"; + sha256 = "1s2y4fyax4487bz7p16jhgwsjjnzqrjz7pq22p8h23jzcvgh6wzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -34224,22 +34329,22 @@ license = lib.licenses.free; }; }) {}; - helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + helm-rg = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, pcre2el }: melpaBuild { pname = "helm-rg"; - version = "20180205.2231"; + version = "20180220.731"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "helm-rg"; - rev = "906aa2af60998b1ac2b37e30d7316f2059c9ea55"; - sha256 = "1yibmlx1na4ff0h9r6j4cqw55z2ggfrzj02b20m2bwm19pyxacm2"; + rev = "775ee76d8b6f45eab1330c714ddac1da20c87fe3"; + sha256 = "11f7m143qnmh2x4987a56ir3acxbp0n54msak3mp5nc1i1h8hq31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/958fbafdcb214f1ec89fd0d84c6600c89890e0cf/recipes/helm-rg"; sha256 = "0gfq59540q9s6mr04q7dz638zqmqbqmbl1qaczddgmjn4vyjmf7v"; name = "helm-rg"; }; - packageRequires = [ cl-lib dash emacs helm ]; + packageRequires = [ cl-lib dash emacs helm pcre2el ]; meta = { homepage = "https://melpa.org/#/helm-rg"; license = lib.licenses.free; @@ -34315,8 +34420,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34563,12 +34668,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20170923.2127"; + version = "20180215.354"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "66a951700e0ef0621cc705791bdd6699488ab121"; - sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976"; + rev = "c66336b8245ddc51c4206f19c119f1081920985c"; + sha256 = "0b23j1bkpg4pm310hqdhgnl4mxsj05gpl08b6kb2ja4fzrg6adsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -34857,12 +34962,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180209.1706"; + version = "20180220.1512"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "874351d34d32f935e3f20485a544681de369c756"; - sha256 = "11mfk5bd1837ln8b2ryi9rksmjsg7lwkylzy8qxb054l5i94vc19"; + rev = "4abe04870467beb8a5a798773e1f145f65298e59"; + sha256 = "1la6im11wmid8k2smsaks1vgw42b4plpy65mr4z22c2bx4q1a24w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -36073,11 +36178,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20171225.652"; + version = "20180213.604"; src = fetchgit { url = "https://scm.osdn.net/gitroot/howm/howm.git"; - rev = "1329df206e5de11e78b5064050b5dc6c5b775d9d"; - sha256 = "0k6b03ifz1d5c3055imm6hicvfryss621bcd9i39pdccazpccj67"; + rev = "2b5849007c14e4339ad2dc29db2d0bfe78c545f9"; + sha256 = "14v4gy1y8882ybdn9lkzqqs6w9vx6fpkxliw5nqvh758ipgphy24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm"; @@ -36655,6 +36760,27 @@ license = lib.licenses.free; }; }) {}; + ibuffer-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ibuffer-sidebar"; + version = "20180218.1731"; + src = fetchFromGitHub { + owner = "jojojames"; + repo = "ibuffer-sidebar"; + rev = "7ddf1b5a158b33e9a7d3fe5dad7ea626a464d2bc"; + sha256 = "18rl379bfilzvyi4f4kmy74l4vq2q8hhy5i8kflcgvn0ibipwqjz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19c7c36af8e30b9a9ccc4afda2a7b7e39e8d32ff/recipes/ibuffer-sidebar"; + sha256 = "0rzdybkqaf8r6v19isgw4wv0mwdqxvf55gq1ig4shscjc7ys22wp"; + name = "ibuffer-sidebar"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ibuffer-sidebar"; + license = lib.licenses.free; + }; + }) {}; ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-tramp"; @@ -36868,12 +36994,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20180122.1340"; + version = "20180221.1438"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; + rev = "d3493021f4d825c7a7cf57a9b34bd262e4ff9927"; + sha256 = "0dsgi4zhwklcgxg4ypvi71r5mgxy3gmc02d6n87x9a2llvjk6xyf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -37183,12 +37309,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20180122.1340"; + version = "20180216.949"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "51861afe385f59f3262ee40acbe772ccb3dd52e7"; - sha256 = "0hspgk8m4acyhpcldwg3xqla9xp3fjrhf37cnjp45j1b3h94x3iy"; + rev = "d3493021f4d825c7a7cf57a9b34bd262e4ff9927"; + sha256 = "0dsgi4zhwklcgxg4ypvi71r5mgxy3gmc02d6n87x9a2llvjk6xyf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; @@ -37831,12 +37957,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20180131.943"; + version = "20180221.1434"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "71299e9bc0d3c75b25ef65e57e9a57c9a17294b4"; - sha256 = "0f9lnsz8fp68qr67l5rq2ippr1fc0rw8nk2f8cm9x90fd82fxwdl"; + rev = "001ef02a2a3ac0803f0f89fb90ea92d7a6e23db2"; + sha256 = "08plikqy6k1drc1m08c9jsln8laq3mzh6056ib64pxip64fwpl62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -37873,12 +37999,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20180129.1828"; + version = "20180218.343"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "630471b5141cb493305b623e6800c26bc91b3913"; - sha256 = "00jfx1bavyzla7cid9bhw6fcdfqw8bgnwr920kzg3wmfd8nfv5ry"; + rev = "be3e2e7c5ec9302cf1a7d5e39defc2ecc78bd9de"; + sha256 = "0zgf6ikap9h0rc3f2ify8a5rlkk34lv4a5xzarw3nlnnvvhp521s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -38376,12 +38502,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20180210.937"; + version = "20180221.149"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "f85e1b47df3bb328be0de34120950cecb3465055"; - sha256 = "1zng4sliygg1l0jamprx9pfs85jiy19gwxpcy2hs3s4hc7yxjdds"; + rev = "752e5ab174bdde87dcadccf478ca43fe328d8aeb"; + sha256 = "0darhg4iwzgfpi62f2l9p83fvl877dw1fml8y4sfn9vrwqnvy93f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -38985,12 +39111,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180211.1010"; + version = "20180220.938"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "b656f818efd797422886bec455d3cc15a9816c87"; + sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -39010,8 +39136,8 @@ src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "f5f7d45fb9d636fad1429867ccbc327a446bb350"; - sha256 = "1dpxw8h6aqdajqf929hwmrm2iik7vwhkv05m0vl8vf1i5zbz307i"; + rev = "bb73c3dd28e70c3996cbee5ef32933a4904eaa22"; + sha256 = "0hq558j3qls3fcf35zy0s8qw9rvx66z0a08s5rkwzzy4nn39rwzh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -39136,8 +39262,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "b656f818efd797422886bec455d3cc15a9816c87"; + sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -39213,6 +39339,27 @@ license = lib.licenses.free; }; }) {}; + ivy-posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, posframe }: + melpaBuild { + pname = "ivy-posframe"; + version = "20180222.343"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "ivy-posframe"; + rev = "ddaf875d5f5a8629ba49731c199e0ca57effd3d8"; + sha256 = "0k7mc268lrkkv7ril7z4vnm5z1ha7hl4274av8m2vfsd1szryip2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9e7c6f7ca439683abf11dcaa38672ac139c0da4f/recipes/ivy-posframe"; + sha256 = "1sv4xvdvb1g8g5m4f1f159lxbxaz96drsmvhh0k43hp1dh3bhj3b"; + name = "ivy-posframe"; + }; + packageRequires = [ emacs ivy posframe ]; + meta = { + homepage = "https://melpa.org/#/ivy-posframe"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -39262,8 +39409,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39823,12 +39970,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20180109.1233"; + version = "20180218.919"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "bffcac3e7a8c57da359185e01ae5a6bdce0ba8e0"; - sha256 = "0bv1pkl6a9a9cs7ka3v17lqb45nx11mg779x7l54rvlkxg4ppchs"; + rev = "6244d4608fe1ec1a1cac7b4b45cf6d1edb06cb91"; + sha256 = "00bscgxv2gmxbmb88p8yhb5ckz73srm251h1vsdfz84cn7vsk1wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -40159,12 +40306,12 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20171116.815"; + version = "20180213.755"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; - rev = "8384a1926cc22000e5e42f86f28d807fd6149f8e"; - sha256 = "0fa84jln0vddrc218s8scz6hx12ym0wimh6dm58wqxias7gm9fgk"; + rev = "d1fca4613ec90c2c0b8241f4603eba733dd1ac73"; + sha256 = "0sgpl03dqm4lv081l3ff3xp38c39q5i2miyvpsqdjmgnixg3nm8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode"; @@ -41079,12 +41226,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180210.710"; + version = "20180220.631"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "3cf42c74e05982f811417a8d5e7b359732462f8e"; - sha256 = "0p32zgmmdnsmvcjnkxfbbqq775n9f29w45q54bhdvw63gicnvdwg"; + rev = "8a229fcd1d73876920a063f0eba906a5080275a7"; + sha256 = "0w35862sjyizj7grb9ixjns8kpxq2wgdgn1n06jdhmnnaqdyq911"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41587,8 +41734,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "1aa4315396c0ee15c282b94f227bbe54b53e7e0a"; - sha256 = "0w856f20brgakxzngvsikaywkhci961vnasnqyn4a4a5913aa8rw"; + rev = "cd592c1e8050c811be131f151cdd3c9b29a60001"; + sha256 = "0jdwli3xilgk4n33hnfsmrlq74r05y73ymjwhygln7g8i0knhgmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -41667,12 +41814,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20180205.1242"; + version = "20180213.635"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "4be03d90ac8249ce31df3ef0edb71e0ca11b5ff3"; - sha256 = "19xg7xss7j1b8hq1wk3kvfprn1lsnym59728v144cxc2f801fh17"; + rev = "f16490c4b960017b3f36cb3df96d9ea605a7c127"; + sha256 = "0q0qmh8yr8iagsaqgd23gia3fh5lb0lprylki1hiw1x8jn6i68yz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -41772,12 +41919,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20171009.1301"; + version = "20180219.853"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d"; - sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00"; + rev = "a2c2628d55c4e8b018ffe9f55ca38d89302a1bbc"; + sha256 = "12zng3rq134f0d49fr2rsf0jgmxl3qc7kkhziy7r27hx6ny9h8z2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -42170,12 +42317,12 @@ latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-preview-pane"; - version = "20151023.1303"; + version = "20180219.1002"; src = fetchFromGitHub { owner = "jsinglet"; repo = "latex-preview-pane"; - rev = "1a0539ab70eaf5dd31c2c94773dddd6f437fed41"; - sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa"; + rev = "474d7aa9d62df3d733d9a9088127c6e0d9fc5831"; + sha256 = "06q67rvv7y4b510v97n8x93ay8zl4y8il5czb9ssw0zhmbi3fvhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3227f2e35d701915a8d3479d20581dcbe3a778/recipes/latex-preview-pane"; @@ -42422,12 +42569,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20180210.1940"; + version = "20180219.2149"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "980e191e08db0b6719b324b131b3ba042f8487c8"; - sha256 = "0xb5x9wz7bg39x0xhy5fg3k91vdqym63a4r4p3h6n37rg0d0iwcf"; + rev = "1e953bb33d6a534d5c29cecc832e12fbbe4c7395"; + sha256 = "0bk9dqg14i05l2yz7lk7vpi14cgz6n4daxfw7a5lvqxa0ms836s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42776,6 +42923,27 @@ license = lib.licenses.free; }; }) {}; + line-up-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "line-up-words"; + version = "20180219.224"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "line-up-words"; + rev = "b2cedc45295fd27f534f3b025d2ce72041850c2d"; + sha256 = "0f3601k1clflan8h7a2g4l8ag2f5i5f1gh37mg5hrny8b98n009z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28ac7764a19fee2e1e2a89d95569815f1940c5e4/recipes/line-up-words"; + sha256 = "0agsrrkwwfmbiy4z3g4hkrpfr3nqgd5lwfn18qrdxynijd5rqs79"; + name = "line-up-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/line-up-words"; + license = lib.licenses.free; + }; + }) {}; lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; @@ -42997,12 +43165,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180208.2204"; + version = "20180215.1527"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "9ac289883012a0c973addb0c8fe4db84259a8019"; - sha256 = "0gd9d9qid36vbr23npgnr9356av2mlkf13xcx0gq2xxck2p4gl58"; + rev = "ae975815db5da512ea86c8547e5907cf04af54bc"; + sha256 = "02s5242yc0c93g9wdry75pg3wrf53da9a3hdvm57zg7b1sjw6p4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -43039,12 +43207,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20180120.1206"; + version = "20180218.1555"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "d9ae0dd5e3e86b5c0ae37bd3b469949b0dc71374"; - sha256 = "0a3l5a836slh99vzwc6a46nc6xj0wjcfj9726rs8haxkav6wzv61"; + rev = "d99f08d5971613bcecdd2768241b9c6d617a24c7"; + sha256 = "12kjh2b9jdwrf6naq6qvskbhlv8xkjsqr1igbldg9mi8qmas60b9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -43316,8 +43484,8 @@ src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "e0a5627e6591e1cbb9f93aabc44adbdc50b346c9"; - sha256 = "0dhm7gdd1smlibj5jmzps97kwkpzcigbdp0l26baa2mkc6155y66"; + rev = "22406984b66201441c7ad5689ab010bdfadd768b"; + sha256 = "0ni1cvrabxiprb4gl5rd5hgwl5csy9q6b0yjd40ffvl1x5lmb0qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -43687,12 +43855,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20180128.1429"; + version = "20180216.1445"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "60b86ec5888d3bbd857f4abb434a6ae3406b7c93"; - sha256 = "0f292yh493lpwllgs9mihfdmp6ian2rqmldfv92qz0jb348khmdn"; + rev = "9ec279d933923dab2d8d1f140adc43073dab6433"; + sha256 = "1qhzs75pxnaksbhczmpdcy2zmrqavlzkzss7ik5nv2wf9vs0sn02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -43918,12 +44086,12 @@ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "lsp-javacomp"; - version = "20180203.1204"; + version = "20180218.2334"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "lsp-javacomp"; - rev = "57554723983c5d76c21a7a5c16534066de6dcf23"; - sha256 = "0n105j1i8gwayfzwvr9d37b9ra35l9prlgx7vqblvv167q4w9d63"; + rev = "cb080824e1fc08e2724d6ecde7034f1acfd565f0"; + sha256 = "0ihb4bld8pzw2mxfwygxldsv2hclvmzkr7cp8nimzjam1nlgjhic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; @@ -43960,12 +44128,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180210.441"; + version = "20180222.508"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "a38ce26c9ebd56a690085d29a80f4494843e53c3"; - sha256 = "0mlnz3aqa40gavb0lr7bzlyzfm58d1c4np546v1401ljdc95fcgi"; + rev = "5b2bd6cb90900f37f5c2c96164287c100ced9589"; + sha256 = "05nl13079j6zknwgzzyzrsin99cfhrim20sipdawbdgf5a3bn81f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -44002,11 +44170,11 @@ lsp-php = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-php"; - version = "20180104.152"; + version = "20180214.624"; src = fetchFromGitHub { owner = "tszg"; repo = "lsp-php"; - rev = "6f332a08c28d2f402a783b91e1846234e55ec130"; + rev = "ff5f5ba417342aa05869a1a9c6a0fc2d42c8acc3"; sha256 = "05rq7sqb6chymzfqvk5xk9bgi7nsdf1ldimams8df9ml6242zjsg"; }; recipeFile = fetchurl { @@ -44044,12 +44212,12 @@ lsp-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, markdown-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20180126.6"; + version = "20180213.2304"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "660dfa99917440acf79e1e2d3ede4d3a90f0d196"; - sha256 = "1drr2wlbgn6zyr15hjgdwldw94ryi1dbazbb44f4h9qakw7nqd2b"; + rev = "b4053425d57101f0c16ee3d4f7e3a3c483205f90"; + sha256 = "037y7ns1p6riyycf65gq6myn921zjc2ga3h804yjx1n11wvrw9al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -44062,22 +44230,22 @@ license = lib.licenses.free; }; }) {}; - lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, melpaBuild }: + lsp-ui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180209.1302"; + version = "20180219.455"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "6a669ca3bb14b48ba61f87e32f3a4eddc95dbf9a"; - sha256 = "0p4lr98asfhz78pj9mq7m7lk7syfz8w16xhrfv012llr8412g8cw"; + rev = "ab286490315d4b120bf8e148d57740d626b5fcd4"; + sha256 = "0rfhvjwl0z6xc7kqh0lgygw29n9z09408wwqqsaivss1q1zqqahi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; sha256 = "00y5i44yd79z0v00a9lvgixb4mrx9nq5vcgmib70h41ffffaq42j"; name = "lsp-ui"; }; - packageRequires = [ dash emacs flycheck lsp-mode ]; + packageRequires = [ dash emacs flycheck lsp-mode markdown-mode ]; meta = { homepage = "https://melpa.org/#/lsp-ui"; license = lib.licenses.free; @@ -44380,12 +44548,12 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20161214.1017"; + version = "20180219.752"; src = fetchFromGitHub { owner = "emacs-php"; repo = "magic-filetype.el"; - rev = "9a20137474697063898902b43a40423daa4eb64d"; - sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i"; + rev = "019494add5ff02dd36cb3f500142fc51125522cc"; + sha256 = "1hw77d4wgqrms8rvkv3xd50v4y9qjvm7cpz5rkgmvizs34pjqy22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype"; @@ -44422,12 +44590,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180211.700"; + version = "20180221.1834"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "10a1f08f39373bfc2ed86858cf02d82bfcdb7be8"; - sha256 = "1bk1a34yi37gsb6n7a68pkia100q0jyj2x5bs8hkf0q48rh4dvl3"; + rev = "a50ae25e10601ada0730caf4bbb2064053c3428f"; + sha256 = "11niwd86y0i078yxws7giyv6as59ndfiwia8298qja6a3hqkgvfp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9a6277974a7a38c0c46d9921b54747a85501a/recipes/magit"; @@ -44578,12 +44746,12 @@ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-imerge"; - version = "20180120.1554"; + version = "20180212.1648"; src = fetchFromGitHub { owner = "magit"; repo = "magit-imerge"; - rev = "1969c445d16e5c59db9548a61a5fe5f0b7448cd3"; - sha256 = "0yiqjaxnrb46z38bbcg1dlswi6sp8994hcmbnp31xf27m29vr2fx"; + rev = "79a2fccc460695df5547204ad6c05529868ba1fd"; + sha256 = "1ks17wl0h4a5rhwfzq47rf60192rxyvkwqhnp3fg9sa85b0nqc3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge"; @@ -44641,12 +44809,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20180119.111"; + version = "20180217.910"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "ab75385a1fb8c0fba0769d448b13ba8324835261"; - sha256 = "0ky4l3k3camh1paa5ap9frr9hcadj7nj40l3imiiqfcvgyl8ijp6"; + rev = "48cf02b8e4d7d4a83bc22cacd64cbf4e6a266aa2"; + sha256 = "0dnfa3djgnfgig279v46xl4gz3lzjmc48nq27gdlksnkp1mwnn3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -44767,12 +44935,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20180209.1711"; + version = "20180217.601"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "eb8a794df0db2e7edea1106a87bf03f94ec7e192"; - sha256 = "1q7s822ygqc8rz0b1fqgwdjnj5l0fhnqahlnf02aqz5by47sgaqg"; + rev = "252a4a0c854c307a618ec3fb767d6439c335f8d7"; + sha256 = "173ipqalbk40600d0g76sxb4vxy7ailidyp4p5a3rln1manay1lf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -45587,8 +45755,8 @@ sha256 = "1spyfnkw6j0v947m6yj6mv6ni1za0a9m9iycpjycpcb42q7d9rlg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode"; - sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49/recipes/matlab-mode"; + sha256 = "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q"; name = "matlab-mode"; }; packageRequires = []; @@ -45831,12 +45999,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20171230.802"; + version = "20180218.538"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "98ad6a5361c725319a355522d2d1ba0e0fbb7cde"; - sha256 = "06iryz4dbldc9vxy67g977hih8r1bfvjld53lvwnjsc7r3x9i07q"; + rev = "ca20c57c9c389d4dd9fe88d9a3da33d5af78e4d0"; + sha256 = "1k9dpvvz7qcscq9z76xvsas96lj0xsnp725z3w97sahqsi0sdxq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -47151,12 +47319,12 @@ monotropic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monotropic-theme"; - version = "20180205.2000"; + version = "20180218.357"; src = fetchFromGitHub { owner = "caffo"; repo = "monotropic-theme"; - rev = "a5dc696e79115f96a2482ba2e01f0569c5e4c4be"; - sha256 = "17985wdlgz4d45jznl9df34826mm5xc8h5xcar70rdrw4gqp4ccy"; + rev = "b46e94a712e01cebe69a6f7d950e91d7c7dd1b66"; + sha256 = "0lmyfqi6c5f2cr9ha1l2qnc4ayigb1zj9gz8xi5xxadhad3zymwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38222d109ece0030b0bfafb242aa100694b2bfcf/recipes/monotropic-theme"; @@ -48074,12 +48242,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20180116.740"; + version = "20180214.837"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "a27879c4d0ef1d3f8494efa18490dd17d707375b"; - sha256 = "0v2qar878z6imh6ih4qxwc7jmwga8l6c626zrzz81l60b675li8x"; + rev = "508efa3a616d4b371039053b1fa80b057422196c"; + sha256 = "067m1r19fc4zhgwc7gwb6khbh3sz74li2fcxfj42d9sx1dqhy218"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -48326,12 +48494,12 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20161012.1214"; + version = "20180215.1421"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "108f16e743aecd35401c0e914c896572cf1d5082"; - sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h"; + rev = "79d7ba8e9b8f3093e93172bdb4c5a4d31b0fa3e0"; + sha256 = "11xghz03csj5w3qfbjyr48liaxr08gl6gy73hmmrq2bl57six5n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -48913,12 +49081,12 @@ ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "ng2-mode"; - version = "20180206.1128"; + version = "20180216.743"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "00822c2e43ff4793cf030fbbd67f83cfdb689b3a"; - sha256 = "19qbs0c0q98rp506a8sj7wkigrk8xzv0s87q9bcl5zxk9jx6m304"; + rev = "d41ed14f276f1f08fb7eaacc863f471654e2c2fa"; + sha256 = "0rys2gnbw9d32i1gqqf46mbf36x2s9lz7v144yw901b2i8p6c5ja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -49017,12 +49185,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20171119.1027"; + version = "20180212.1040"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "91450d3117a4dec975d913b58f1ece6808e5c2ba"; - sha256 = "01h0wyjh8s91s1wyy6drwnvc3gw7a905xg85ikv7ddywi920c169"; + rev = "bff7065f6d2419ec517d247f0f3aaf935820064e"; + sha256 = "0iqsm843msw41jxhfi7dbsj6x4qanvd84xhg2j6wl6ncabdmwnjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -49038,12 +49206,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20180129.536"; + version = "20180220.440"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "22c4a1cf1ce8686c01a341477502d2676829699b"; - sha256 = "1sf8ijk08kivfj0dxgmx73l10hkd921z766z5x4w1p3axwc8w9j1"; + rev = "451a570d656e18e66d58182577685da0e43c87a3"; + sha256 = "02bvvrvbfg7cgbd83y7544ra5a0hfrk8kh938hwygq991krc2zhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -49080,12 +49248,12 @@ nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-buffer"; - version = "20170809.1128"; + version = "20180212.718"; src = fetchFromGitHub { owner = "shlevy"; repo = "nix-buffer"; - rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f"; - sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr"; + rev = "db57cda36e7477bdc7ef5a136357b971b1d4d099"; + sha256 = "0b01b4l9c70sad5r5py5hvg7s6k6idwwp0pv3rn8rj0fq5wlyixj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; @@ -49101,12 +49269,12 @@ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20180126.1935"; + version = "20180215.1331"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix-mode"; - rev = "664fa51cfa9d8e4c39f2086ad1b6b6fdc1e8fbd7"; - sha256 = "0nnxd2lis4qx2zakfcy5ypvlp1nrw70dq2jcf0gldg0qmr1dhlgk"; + rev = "0ac0271f6c8acdbfddfdbb1211a1972ae562ec17"; + sha256 = "157vy4xkvaqd76km47sh41wykbjmfrzvg40jxgppnalq9pjxfinp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode"; @@ -49458,12 +49626,12 @@ nordless-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nordless-theme"; - version = "20180204.48"; + version = "20180215.454"; src = fetchFromGitHub { owner = "lthms"; repo = "nordless-theme.el"; - rev = "3fb123eaaf7f38d024effdda4b3e88cc66e67300"; - sha256 = "0i5b7qg97qcgvhk8vv7x5xpwps06q140jndkz4i2rakg5hr3z98g"; + rev = "aeecad74c19121fa2f68dfd85efb9a4f34e8a911"; + sha256 = "1ypwh4kz9kjxikmhgh8aac8ihnyinijsvsjwa8s4lc1j4nfzffih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3de9da6cb8c1a75ff1d41a69e156c21be00713b6/recipes/nordless-theme"; @@ -49538,12 +49706,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20180115.1407"; + version = "20180215.1206"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "4ef20ebb587ffb0ab73c85ad5748d41af1071596"; - sha256 = "03s0qjvwk1f7y3i4wh2p5y3z4hdv00adgz8za3vphzc0q8i1kjzb"; + rev = "b0eab94b84464aa4508ccfee59af5b8df49666a2"; + sha256 = "0r4wy99kpdzs0c8b6ini8k0xixjrb48bbml3nz3sfxy3w7kb4kyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -49664,12 +49832,12 @@ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }: melpaBuild { pname = "nu-mode"; - version = "20180104.1243"; + version = "20180220.1315"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "91056b70667036bc78d6c8585cf0bc8fe7ba21c0"; - sha256 = "0pf8ng0r829lrbqjz61wjdag9cb27cx0cj2idgpy92hfiy9s6saa"; + rev = "9c9fcb1395a3bd317cb5433c6c4defaa9bb3c7dd"; + sha256 = "0snynh8mk1ivdphrrpznh16szw2jcagxl7w056wv7j2zmb17agcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; @@ -50219,8 +50387,8 @@ src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "ob-fsharp"; - rev = "65ec2b626ac55313d8a04e746940370f615fed1e"; - sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi"; + rev = "0b2fdd9bb4f38af8b5cf4914627af52f5b43d9f7"; + sha256 = "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp"; @@ -50828,8 +50996,8 @@ src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "764d8dfa931f2336fa9f469aea7d38bcb4990723"; - sha256 = "1h0rgcifhzqxb7glax7b7whxkcrrd1mmvsdn7z2xgwjla3qmx4w2"; + rev = "9bbd079199ef7308d4fa3cf0fafd2d7d8b4bf2d4"; + sha256 = "117xwqxnmg2f2np1zqyc8hhnxmrrd2gcixqclb5lkwk68kisjmi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -51652,12 +51820,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180209.534"; + version = "20180221.444"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "7f96d1417fa3b676d402524b2de92447174cc101"; - sha256 = "1lrvi15qzqbdgkar2mxzsjhna8wbhr95hnym93rwvksgmn8dgivg"; + rev = "10b558fc01192515d0a54bfbc2198e626508615c"; + sha256 = "0mcc67nln443j45i81v9r7gi0a25qpm3pjg3cz3sli5yr68sy0rp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -52386,12 +52554,12 @@ org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20171105.1440"; + version = "20180220.1906"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "64a3f56651369b2a8b0a601abea1cf1216db2ded"; - sha256 = "0jvknbiilik3dwkz1kpjf7ac1fqkdh74pljzpyxxyg3slqha0d50"; + rev = "0752659f7a19cead182584fabc9544464f69b83e"; + sha256 = "06lay5w03ah3w156spgh4bv2ma4x42pyhr3glfxw7vplfr5klvfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -52449,12 +52617,12 @@ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mru-clock"; - version = "20171219.314"; + version = "20180219.359"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-mru-clock"; - rev = "ccf477735d76c078b44bba7bff12e7e30e66bdb3"; - sha256 = "17dxdghnh3h24584pa374pmz0a7qr13p0a4rfsndns9xv8wfzbic"; + rev = "0894a5dad148524f6e31cd089eda2879fc85fbe4"; + sha256 = "0ya3f86kryaminjja1868wh6db5hsnczhqldq3hgh7bvlnnsvp6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; @@ -52512,12 +52680,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20180210.1836"; + version = "20180212.1437"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "8841704afc019c0ebd66795343562be8b8fa77f1"; - sha256 = "1ba2l0nyxxg0x9kn53xif7nzn4di0dp3dkni6qihns9v0n8vl56s"; + rev = "2aa588ff38ce1e612ab7d2457f44f1c9db7bdc18"; + sha256 = "105j7jkrfl853mfhgv4jhp053v6cj6ii7s3a7vpvjiy8hlqsf5j0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52924,12 +53092,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20180207.1846"; + version = "20180220.805"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "e828a32d00b24af2c6c657481c3ad163de6c8e02"; - sha256 = "0inmayxdhfdh5lnjzqxkm65f160p2inc0mz7m254wm81z50033km"; + rev = "090138c45c5cbee62f3da19a63b9d7c6106761f3"; + sha256 = "0hq4cg6vxk7wkb213lbp83x9wp7s8jfn6x5dzskisc1ga9i4nkjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52995,6 +53163,27 @@ license = lib.licenses.free; }; }) {}; + org-rich-yank = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-rich-yank"; + version = "20180218.156"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-rich-yank"; + rev = "ffa90b29604e27a60ad341c06d0e43769af19715"; + sha256 = "1z9137nirbaydqpw5b7ii3qnpn09v1kiqnyxsxkgc0q3arb1m1f6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1261823d88459b6ac42d6c55c157a326173663df/recipes/org-rich-yank"; + sha256 = "1v0sc90g5sl6b9ylxbk2y8s3pvxkf4v7k2rkzpgpbp4nrq0miy4y"; + name = "org-rich-yank"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-rich-yank"; + license = lib.licenses.free; + }; + }) {}; org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "org-rtm"; @@ -53124,12 +53313,12 @@ org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; - version = "20150817.754"; + version = "20180221.1127"; src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; - rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8"; - sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy"; + rev = "fedddd20384de9919ba8e0b08344ff9356508805"; + sha256 = "0hkr5m795srmx8vzqaa4rhrnnm7qyxnadj5wlkdgsa8c3vcjl5gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync"; @@ -53397,12 +53586,12 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20170727.1911"; + version = "20180124.229"; src = fetchFromGitHub { owner = "tesujimath"; repo = "org-wc"; - rev = "d294ad7117c150445e6166fc0d88c14a8386f34e"; - sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl"; + rev = "6ff202a4612fe65b4e96bd551893fe8df67b0f51"; + sha256 = "1yqiqscj7cmnqd4s1lgbf7jbhcqlf3bwr52sabz7mqfs4iwdryhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc"; @@ -53436,22 +53625,22 @@ license = lib.licenses.free; }; }) {}; - org-wild-notifier = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + org-wild-notifier = callPackage ({ alert, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wild-notifier"; - version = "20180125.721"; + version = "20180221.2025"; src = fetchFromGitHub { owner = "akhramov"; repo = "org-wild-notifier.el"; - rev = "3f87465d6c4ea63010b9beab8de3cfa54429bce8"; - sha256 = "1vxjlfdkl6yxgh50nmz87qsyga71wf8cmrggnp6bkljak88vgz98"; + rev = "d0df145d9bbb72b2c315b7d8007cb6a59fea2095"; + sha256 = "1xcnb5x539776b6ljd9qyl9jadp2r4qg805m4m8yfz9sk00dv7yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/114552a24f73f13b253e3db4885039b680f6ef33/recipes/org-wild-notifier"; sha256 = "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp"; name = "org-wild-notifier"; }; - packageRequires = [ alert dash org ]; + packageRequires = [ alert dash emacs ]; meta = { homepage = "https://melpa.org/#/org-wild-notifier"; license = lib.licenses.free; @@ -53658,12 +53847,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20170731.1003"; + version = "20180217.1320"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663"; - sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf"; + rev = "976f3c7d25ad92c57341b52dad9af89b49c37f0c"; + sha256 = "0m8mghh0iydbvlsrg0zd2xajfhdxgxk79dm4gwircrh6zv8194ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -54372,12 +54561,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180211.2258"; + version = "20180221.1031"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a8ae44e692f30fa7d0c76c21ad2dd6ebf65da700"; - sha256 = "0856n634k43ingr7smcwvjjzd9h96mvh0d767q7qcg6h2f5lmgg7"; + rev = "99da80afdc6a7d72351f8e2ed43c404e922b18f2"; + sha256 = "0lmjbc4rkj3gdv9pzay5izpkmdq1fy53rvl9pl4xan522qi8iglq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -54603,12 +54792,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20180115.405"; + version = "20180222.533"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "58715dcba3922b5c7fc8ed5e7915277a9732fae3"; - sha256 = "1267rfj1rq04g9ngw0yglsdjma6bb04j3fc8afwsjixnbqv618kj"; + rev = "313640ac945ec63b7de37fe58d4e71098c2fa4d8"; + sha256 = "0frxwb5mi4gzv2qfqjvw10xl2vnxkra8p73hp6hx7dawbgxb56j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -55233,12 +55422,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161117.502"; + version = "20180216.334"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; - sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; + rev = "e5dd26f67ba8fa8ab1631a00ddea4117805b3fd0"; + sha256 = "09x8glw949hivbzikki5blgjkzyws69hck501ym99663k4irdir1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -55378,12 +55567,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20180208.1751"; + version = "20180214.1040"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "4e0d585e85a0e27c7703dc6c6edbadc1b4ce1ce0"; - sha256 = "0cq1jkizivjkr0mq0fmv0i9vp01g00w0l500s8r25v6npzjmgq6j"; + rev = "05f554bb5633d48e1ffb053aa3cca462c52600cf"; + sha256 = "1dxvwc48z4z23pl317pkcrnlpwpyw1qyggzn89xcv7p3abyqqhpz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -55592,8 +55781,8 @@ src = fetchFromGitHub { owner = "zx2c4"; repo = "password-store"; - rev = "ffef92ee0ed10551b20521f2d6e5637c8f9da798"; - sha256 = "12j2fjrhxpgha1ay0r4c5cjc6d16s350iclyrvcma35y5dqih2n9"; + rev = "fab65bda88ea979dbbc49f3d856a1d14ee4f1296"; + sha256 = "0yicj227h21lqa97kcaa1pw4xyaakjqh9ynr2pynixkafalfkxhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; @@ -56176,11 +56365,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20171001.503"; + version = "20180217.317"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "64d41f0ee5970b2d875880994eb287b97cad24a1"; - sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c"; + rev = "524c001eed50ceee40095d6680787e435b9d3624"; + sha256 = "1559x7wxmflgzjykkbdsgw61zayswpil940n71979qkgqzcc5ggq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -56867,12 +57056,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20180211.751"; + version = "20180219.1806"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "0d7f970dfffc6532814b5f2290d59391e1cabb78"; - sha256 = "16dvhamcy8a4c4g9k7vxgqaic1wz03adshvhbh4nqflwwyzz7ldp"; + rev = "372284777949e3a645ab236f6036112b07bcc1ca"; + sha256 = "1h0c32z41yrrf47wdfv5jnz65jpykxqlhh8ah5yzc20yw289wbms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -57032,6 +57221,27 @@ license = lib.licenses.free; }; }) {}; + pickle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pickle"; + version = "20180218.1840"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "pickle-mode"; + rev = "d672186129a19581c908bae3063e09baa815869c"; + sha256 = "10jl9xinljzb8nra59r6wyrmsr8sbbl40yahpzn4558nmmdckcnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4cb71882f074d3fef1f5a7b504dafcb6adff8ed4/recipes/pickle"; + sha256 = "0fryzmrs6bn6r590qp08jyzx9g6jakf1pahxhcfglsv9k3jbfp13"; + name = "pickle"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/pickle"; + license = lib.licenses.free; + }; + }) {}; picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picolisp-mode"; @@ -57245,12 +57455,12 @@ pipenv = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pipenv"; - version = "20180207.1216"; + version = "20180222.359"; src = fetchFromGitHub { owner = "pwalsh"; repo = "pipenv.el"; - rev = "cb10661cb11bed9f781c2aef01708f3304f83de1"; - sha256 = "1m8pdn3vyrzna0a1adwm4s22zgykr6cr9pp9p1v6q1ar80hxchrx"; + rev = "364eaf1c823a28db97fe55e7fe85106107a23234"; + sha256 = "1f3xx606xvsmcc73mqml0w07xbkkm2xjirc4pfkb2883cfsk3fq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d46738976f5dfaf899ee778b1ba6dcee455fd271/recipes/pipenv"; @@ -57480,8 +57690,8 @@ src = fetchFromGitHub { owner = "Shirakumo"; repo = "plaster"; - rev = "11eb23920410818fe444887b97ad4c8722d66c85"; - sha256 = "0lqz8m8a2ahvgm0i9cz0j4bisi34czc4s29z70p5p6rdg4g21fk1"; + rev = "c6c9c223d634041411d111b4397574f65e140585"; + sha256 = "0pzdw9jb1p1bi5zc59sjvwxzczg8laz5vlsrs73ah1pk9jckqwf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e363cffa021e649c052f38cedb7cc01dbe9e24a/recipes/plaster"; @@ -58322,12 +58532,12 @@ posframe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "posframe"; - version = "20180212.136"; + version = "20180212.1717"; src = fetchFromGitHub { owner = "tumashu"; repo = "posframe"; - rev = "2073a1f7480aaee8a21405edf44ba28888f64aff"; - sha256 = "0in8nvdgjaj89rg2ckq828vpfpfswj9830zghi7xsky74wysc00k"; + rev = "c1abab14827b06296d631d7b9ebdb035a77c21f0"; + sha256 = "1p1khm0mcjq6acjh08z5gaw24hns6sg7p1iy8x6zf63c8kyfq2ls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa3488f2ede1201faf4a147313456ed90271f050/recipes/posframe"; @@ -58557,8 +58767,8 @@ src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; - sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; + rev = "fac9dd29720f8417bd8cd5dd8ab5138c6dd7d701"; + sha256 = "00bgwzvha2i2sfi05jdzgpxvbjfpjhj5gv2vn3bnalgd1z3cz89r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -58763,12 +58973,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20171121.512"; + version = "20180214.1249"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "da9ab59dc807968841ef369617edd6a67a9ad1de"; - sha256 = "08nr9gppkn1z8s3llhf7vlxg0hfgx7hzbakahw0qfaf1xri4mzg9"; + rev = "a90f917390cac8ae7e95b57e88a1527b7f3242b3"; + sha256 = "0b53xgja04vsw22yqxj5vnn4w2x23zcm3fsjwzfxlcgy4h50y3ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy"; @@ -59417,8 +59627,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "e34ec6077af141dd5dfc1c334ecdcce3c6b51612"; - sha256 = "15hvnhkj2ias3h9zkg713p0gixqpnhdxvjp6msbvnm8k99qxccw6"; + rev = "177108aa8a6e6a0e947c90308f6ebb3d1203bb0c"; + sha256 = "0m0lxjdg6kh4amsgnigjjkxwv24vw23xqls18hyfqwlyjc0gmv3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -60093,12 +60303,12 @@ pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }: melpaBuild { pname = "pyenv-mode-auto"; - version = "20160122.2341"; + version = "20180216.2352"; src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; - rev = "783a93488e255346f9b1b2658424ffe0d670e8cf"; - sha256 = "090c5lnw2fz674c49szjsac3hdj5dwbnrbn921kvhw6q5lsn8z47"; + rev = "51248f13e98240ab146ff45a8247e0f5286277b2"; + sha256 = "1y5fmc6jrw9xrafq1j2j0k1p5hydvbw1m3zy47b5c55ll97dsflj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3fcb707356bd16fd0b573c176023534cd69d0d7/recipes/pyenv-mode-auto"; @@ -60286,8 +60496,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "5e79774c5028eb492e59bed92d25088b081cf2db"; - sha256 = "14nxl62cnzab0nrf1j45a9p55sqmcy9mgmkh1wv9lb0v1fyi1x3k"; + rev = "04481735e10c8d4584447a6dba97df8653fc7ec5"; + sha256 = "1v100ccggdhprj7zgs8cs7qi86a6xs2pkzx0whi2hvb8nyyp9gx9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -60307,8 +60517,8 @@ src = fetchFromGitHub { owner = "ebanner"; repo = "pynt"; - rev = "76fa85dd0c791a6493d59bd564ce5f6ec20ab40d"; - sha256 = "06rhaqf5wkwk6xl8mp2kyyncnyjclvykal06iqj9sbd4kn5nnq5p"; + rev = "92b3f0e7ee88dde641b9f62c50431f7c499dcf1e"; + sha256 = "1wn1gjql7g2dg7bnwqgx3r66b0hnxcmpmbh1wc5nc312wnklpz6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fdb297084188a957a46dcd036e65d9d893044bea/recipes/pynt"; @@ -60468,6 +60678,34 @@ license = lib.licenses.free; }; }) {}; + python-pytest = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, projectile, s }: + melpaBuild { + pname = "python-pytest"; + version = "20180220.210"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "emacs-python-pytest"; + rev = "af1bf11a1d1ddd176e65ab25b6a01191f8752778"; + sha256 = "1hn8ix5xrfj0yhb3hxsc53gmvp9iyvi50rz6g96aarbshbwkg7my"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d95442748827911e082a55f4fd7c348a3757e274/recipes/python-pytest"; + sha256 = "0n97akqq7dss7rsww311ljh9w1hyc4j64wjmpxjlc9lg5aqwjbh4"; + name = "python-pytest"; + }; + packageRequires = [ + dash + dash-functional + emacs + magit-popup + projectile + s + ]; + meta = { + homepage = "https://melpa.org/#/python-pytest"; + license = lib.licenses.free; + }; + }) {}; python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-switch-quotes"; @@ -60513,12 +60751,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20171006.336"; + version = "20180218.1447"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174"; - sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5"; + rev = "35d6719953e809a07c0bb8f770deb5fa712d00e5"; + sha256 = "1s24a9ji549nhlanm13gq7ghnz0zj6mwpbbmbqk8igsw3arx2nvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -61926,12 +62164,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180207.1002"; + version = "20180216.646"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "113c07f5b7ae112d7e199aa33665352852ac7f12"; - sha256 = "106b8nmhdwwpg6l4p9s3jm55r2b9zlj49iklp7qfbjb2wv6qci8n"; + rev = "61081e703a5454d426adca1fa2d63acd8d7bbc15"; + sha256 = "0q5zb7da4sjd2v9h1nfcmd1mhd3rm5m1idzklf7x1kwnrwapg5m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -62139,8 +62377,8 @@ version = "20161002.2310"; src = fetchgit { url = "https://bitbucket.org/lyude/related"; - rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; - sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; + rev = "73420e62700c2fdf6d9f96a9179b8618864c19ae"; + sha256 = "0pp96vybmfyjh78qlx2qri70w1kj19a84hba00kzrma3l5q6sfpb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related"; @@ -62538,8 +62776,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; - sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; + rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b"; + sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -62559,8 +62797,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "0ce4513a6b5ff1e63c73fda30f11efdb7a296c38"; - sha256 = "194526djlzn96b35pqgsdc5vi4nkib0jma0smp97lay8vj22mjs8"; + rev = "7242da37f7a3973c5fc5e84e8a62ff1aa09eef1b"; + sha256 = "0ll1aws1m46c0k1dxgd05bajj09fxf20ya4rs2wapvzm4mwrbz2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -62618,12 +62856,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170721.940"; + version = "20180213.525"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "63fb1edee017177c44f8b663a707201b3dd78345"; - sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp"; + rev = "16931909115a922b1cf3846b1f60509b6590001f"; + sha256 = "0ccpnd1n9z18wpf8m9xyx5gps2xh5kxv8s1q2zan2zs9f46sz9pc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -62702,12 +62940,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20180122.855"; + version = "20180218.1129"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "0a4df0c3a64ace6a5aebbfeea5c0161e752471ab"; - sha256 = "0z1igj5c74qdjx5knsf73d7qwfyybfixyilw7z7chbyffw77z1km"; + rev = "26413536ee71ac6ee07f193b94e60e544d800655"; + sha256 = "1ic4ym575qj38xd3565nvwyrhzw7lx2mflbirb5aycnz7dis9xsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -62769,8 +63007,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4"; - sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b"; + rev = "a50d9b2fd059f6a0e5b22063a5375851a087f61a"; + sha256 = "126slgxa786rcbxdnazyn7svkwk31hy1c2ab7kzswf8f0k81fqk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -63147,8 +63385,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2b0c88cc470b06b65232c23df4b6fbfc4b534580"; - sha256 = "047w0khlcawwr9rz7ss52x9jzam4pdqd1cwgx7nqiyv3cd47xfsy"; + rev = "5bc23ba31379150f8dff3348b867ec6c32975ae4"; + sha256 = "098k563c7fqvnqqc0rzingh3cgmpjk55xvbqlnpy70c5m08b8prl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -63182,6 +63420,27 @@ license = lib.licenses.free; }; }) {}; + rubik = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rubik"; + version = "20180213.327"; + src = fetchFromGitHub { + owner = "Kurvivor19"; + repo = "rubik-mode"; + rev = "a93481c990867a70281d1325aab746e5337a17ad"; + sha256 = "1qfjm95ag2hcxzspgm1cg7m0sqgrdy12ddj11wqfff4dccs5f0v3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/00946ed21b0f05b753c792863f6bcc99c26c32a3/recipes/rubik"; + sha256 = "07bbh5vjw3jdxf06lxqm45y8ijcai391mf97xw5c29z33vhqs267"; + name = "rubik"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/rubik"; + license = lib.licenses.free; + }; + }) {}; rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; @@ -63563,12 +63822,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20180109.544"; + version = "20180221.1130"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "cfb440810a010b099e7196f8701c9d990a3641d8"; - sha256 = "17mm7mk8s4s9ka7035bf7bd6sfxwi3m2iss9q3pg2d7931nzh1dz"; + rev = "cc2435b9e5899c0787929a62dc6e6dcdb982febc"; + sha256 = "0aq665cd28k4szc07m6cfl50dvr87i4pkbggfj8qim0gwzsgc4bi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -63626,12 +63885,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20180114.1004"; + version = "20180222.415"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "4dbe9e472306e5d293213842d9488c0b531eae8b"; - sha256 = "0l4153dczvkl88xnppqwdmj78c9rfj1bhl2d4c2sr1gc6hy7nj9l"; + rev = "4d10e251ca734548e48e7f0785b3b69a6e863f67"; + sha256 = "1pqq2mzrfam7lzilpgqnzr192dsisgxnnnkilyksqfk1q199p9my"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -63752,12 +64011,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20171119.234"; + version = "20180215.35"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "e4e7523178f09270a28b8b712191b1e980e6e8c9"; - sha256 = "11lk7fpzpak36jgihw3bm99j3w6x18zynqhy714rxmjjhy4lpla2"; + rev = "9f07ff835e8d19afe571dbe414afb690c7b1cb5c"; + sha256 = "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -64029,8 +64288,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "ec8aded3241766dda3b89e26fa914d07562de429"; - sha256 = "0lh9zlic3iyhxbbsa0pdxl96gi4s8z7x7nphr8hlzl4if3zb5fg0"; + rev = "04373916379177adabc29d11bcf0ef40eafd15ac"; + sha256 = "07rdx8ydg5v758smkpip4bz3slijcz7ipxir6f6d6b5cmckrqg6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -65850,12 +66109,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20180205.1031"; + version = "20180218.538"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "be73a176a19fff8260369652f688a316e652fc03"; - sha256 = "1ifl1qsg6vxxmj3vysrvw94nn31x8krydin42vpp35w6pspx9f0z"; + rev = "c252765de191441cc25068b35bdff6a912745268"; + sha256 = "08n41cshzxjjd06n8q94yivc72kmwwnmbg469w61v8sanzv0j04q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -66228,12 +66487,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20180208.323"; + version = "20180218.1356"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "8511e9b1180589c307909c623aa5f558f697f203"; - sha256 = "0dbnmvrrd84syn96jz90rgddb3n1cfza2rmzw7p57fzknzmv349w"; + rev = "bb663e97339d1ff217c674d649088493b82d08a9"; + sha256 = "0sc7k7b5fixwpmjx15vpbh3fmaxqz6m21z1ajd4c25jfnxvvhyck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -66396,12 +66655,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20180208.226"; + version = "20180221.1414"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "cbf84c36c4eca8b032e3fd16177a7bc02df3ec4c"; - sha256 = "13dyhsravn591p7g6is01mp2ynzjnnj7pwgi57r6xqmd4611y9vh"; + rev = "486bfbe95612bcdc0960c490207970a188e0fbb9"; + sha256 = "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -66417,12 +66676,12 @@ sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-company"; - version = "20160308.557"; + version = "20180212.1653"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-company"; - rev = "08aef69394fbef31dfeb3d3bb72a4557df9d7624"; - sha256 = "128gb6hsb7zig4czwgwjcm58lgqk6rmj7qi17a9cz5gsnggjcwii"; + rev = "dfe18218e4b2ee9874394b50f82f5172f41c462c"; + sha256 = "1bj8w2wfq944cnhsk5xx41mfrjv89scrg4w98kqgda5drkpdf8a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/sly-company"; @@ -66519,6 +66778,27 @@ license = lib.licenses.free; }; }) {}; + sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: + melpaBuild { + pname = "sly-repl-ansi-color"; + version = "20171020.816"; + src = fetchFromGitHub { + owner = "PuercoPop"; + repo = "sly-repl-ansi-color"; + rev = "b9cd52d1cf927bf7e08582d46ab0bcf1d4fb5048"; + sha256 = "0fgcn6bwgz8yyjza07kfi86siargvpq4kp4j20hs6b67ckxjxx0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/981e01f562c40e02cb6d56dc1347e922fbad9c18/recipes/sly-repl-ansi-color"; + sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi"; + name = "sly-repl-ansi-color"; + }; + packageRequires = [ cl-lib sly ]; + meta = { + homepage = "https://melpa.org/#/sly-repl-ansi-color"; + license = lib.licenses.free; + }; + }) {}; smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-backspace"; @@ -66920,12 +67200,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20180212.202"; + version = "20180219.758"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "a03debdf4aeb3232ae54a9712790f6727a592538"; - sha256 = "027nam0jq6ldwgix200w78zj1hp2khqskhcvxavkhychpl8v501y"; + rev = "3452c21f34751bf04f2ede175b3f8eb3fe6ae282"; + sha256 = "0df4q6467a2rkpsml7bg7s9y336cw6zlgrp1s9h04f92fhv8z9c2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -67872,12 +68152,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20180117.1333"; + version = "20180214.758"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "fb2a88a604b0eb6bdeb02506733b947e155a9e64"; - sha256 = "0ic09n4ddxv78sb4h5gz9a1frnnbsdkvizdhj2lfdr5xy00hais2"; + rev = "0cd15af82bb3adb5fa18bef795a2ea7f021b7e20"; + sha256 = "19mifs075kkn45dxkgcqixvmf9d72rp79g12vpxi0rp5aw90ddfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -68562,22 +68842,22 @@ license = lib.licenses.free; }; }) {}; - ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ssh-deploy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20180129.245"; + version = "20180221.2207"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5d70d89cddae17e4e412c9246871c3cbc860e3c6"; - sha256 = "02cdd5jx03n1xzkkswlcb0l4zf32ysmz2hn76cc7lh4i20iqi06q"; + rev = "c07b006416daeebf12fdc9e62aaeceda4fd20ca7"; + sha256 = "0s954cjkk7s7rc2c7ppygbva6vvz84yrl9h38nzbpd3y2jhpfych"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; sha256 = "1ys3cc5fz8y4rsiq3daqgcpa14ssv1q4cw0pqbfscql6mps0mjdm"; name = "ssh-deploy"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/ssh-deploy"; license = lib.licenses.free; @@ -68835,6 +69115,27 @@ license = lib.licenses.free; }; }) {}; + stgit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stgit"; + version = "20171130.759"; + src = fetchFromGitHub { + owner = "ctmarinas"; + repo = "stgit"; + rev = "df9fb86e74c30134e63eaaa9370e03ad6a90816d"; + sha256 = "11vqnscs6g5pajq0g7cr7r6vbcvh2f3215q2a6ziq9hv96kzkm69"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/726da64b7baea1735a916b826bdfb8f575860e21/recipes/stgit"; + sha256 = "1gbr0pvvig2vg94svy1r6zp57rhyg6n9yp7qvlkfal1z2lhzhs0g"; + name = "stgit"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stgit"; + license = lib.licenses.free; + }; + }) {}; sticky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sticky"; @@ -69211,6 +69512,27 @@ license = lib.licenses.free; }; }) {}; + sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sudden-death"; + version = "20180216.1623"; + src = fetchFromGitHub { + owner = "yewton"; + repo = "sudden-death.el"; + rev = "791a63d3f4df192e71f4232a9a4c5588f4b43dfb"; + sha256 = "0z3adwd6ymapkdniny3ax2i3wzxp11g6in4bghbcr9bfdxcsf7ps"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f20f389a2d7ddf49ca64d945b41584a7c120faf/recipes/sudden-death"; + sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh"; + name = "sudden-death"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sudden-death"; + license = lib.licenses.free; + }; + }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; @@ -69277,12 +69599,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20180206.1327"; + version = "20180214.1523"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "27c5c7722248baff572a0f3a672662618be4eebc"; - sha256 = "0pwd0cic3kj977171mpl0kkzas5l6cr806w1mhymcncgbybnr1pk"; + rev = "66051b2fd3d21a8e103928782a8c926ea434beba"; + sha256 = "1xj3jzsh44ymah8nvjvm7i8g81vkq6wk7mcq2rm2qvaxin4l1bcp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -69592,12 +69914,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20180124.2324"; + version = "20180222.232"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "7739e4954cc614ecd6b37e935f82ad057e256d56"; - sha256 = "09mvwfi3nv4hkdvh76d7737nl3zaxn4a5vpmv2645q9s4vcq8zj8"; + rev = "4e2227906c90631bfe5109df3e7f57bc1e70ac29"; + sha256 = "02xpb453jdaqwx8rsc3zg2fnxzfv8fs993kw1bk45s4dja1f95p4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -69634,12 +69956,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180211.1018"; + version = "20180213.819"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "cc5197d5de78ba981df54815c8615d795e0ffdc5"; - sha256 = "0c8866mb2ca419b6zh153vp298dxwldj29lbrynwr1jlpjf1dbr5"; + rev = "b656f818efd797422886bec455d3cc15a9816c87"; + sha256 = "166sgr3qj2gzzxzw0ikg5p14z9d2f3b6j11ngpbggppqggy470sv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -69760,12 +70082,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20180209.1414"; + version = "20180212.1101"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "95100fa3c933f6b00519baa3c7073b882a1b4603"; - sha256 = "010mlsry5s8xdah928zxy55xr51k91sqrbxv7fprir21y7nv044j"; + rev = "833435fbf90d1c9e927d165b155f3b1ef39271de"; + sha256 = "1369xaxq1vy3d9yh862ddnhddikdpg2d0wv1ly00pnvdp9v4cqgd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -69781,12 +70103,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20171103.2306"; + version = "20180218.729"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "305ef1d283923d2b0f1cd751f57f71754ab714e6"; - sha256 = "0j5542283mmdl30syk0k5p6ybb0w3xlnamjrrafdaj618v3anvgv"; + rev = "1d610fa5023e210e59f823e1bbe819f0fb8727ef"; + sha256 = "14v5rw2yby2n3dhzc7y1jwnmz53apljb34a9g64h08wdpg2ff0wq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -70371,8 +70693,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "b6838add6e418eccb557f8261c49ea5d65a7068d"; - sha256 = "157gxkdryzh1zzcinljmzpbmb1vhrmkz37zfkbyl3ls8ibnw3lxb"; + rev = "23ab76bf7cdefe2e1f7e9551d61d4c49dddaf63a"; + sha256 = "1c25nya8yfd6dsgln8580bbbahdvja1q9fi287q89f1a4i9i7sh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -70535,12 +70857,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20171109.1616"; + version = "20180220.109"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "b3eaf4b8254bb1031f85ce7ac73ffdc856059d9a"; - sha256 = "1g2gpfqxs3mxwskrkdszab02mxfmwfli0h0yw8b5izb4g2a4gkiz"; + rev = "3e73a0ed2457e7b6991ea6555a1379bf9b77053b"; + sha256 = "0bwicz1xymq5j57m2kc8myjnc2dyfljm1jz2l80ifmlkdn549x92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -71295,8 +71617,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "35d62edd6e9ff84b0fdd472e132a739b663a41c2"; - sha256 = "012sgyx7zqll08zfl2v1jkik5p4wxzvp40njm6h5kps5igx2wnal"; + rev = "d907cc92db5b93e699a4282e979d097ea863215a"; + sha256 = "1zswprjkjyav2502dfsyyvh9w0hs43qpfwq9q4617p909d0sj1nb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71375,12 +71697,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20180208.246"; + version = "20180212.2229"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "ca8a1c49eff59a07fefadb40d5bd60b4eee73605"; - sha256 = "0avxxgmgl1q23yj087y9vfi0r6w8ckm0l3pj9syd9yj1l05wbrwz"; + rev = "d80f62c07ab880fa486853846dbcda15351b61b5"; + sha256 = "00bky1vxw08s0z1s9jm813acrnawj0s6mkg71d82lc4ig5x4lbvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -72293,12 +72615,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, ht, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180207.2220"; + version = "20180221.1229"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -72318,8 +72640,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -72339,8 +72661,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "9ad516c8bd2a8db58ed9934420f6626921ab7b47"; - sha256 = "09qbz4ss5k6wd7r00y280kkhsp4dx57ghrzdld53fkx2gmhq6zr1"; + rev = "e8be02971ad6c7a9c33ec544fa41b4b2f6827a35"; + sha256 = "0fk45jmnx34azldxa4yrv6lqmkaxkpkqbnwnn29q7y4ld0ljghs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72543,12 +72865,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20180207.836"; + version = "20180218.130"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "45f73c8fb4c6467fc54a5a905deea322ffae180c"; - sha256 = "1xhbnz0lv771bbpb6vizacdn2j47y2spdf42m72iv5iix6cgpnmq"; + rev = "b9941efaba0dbf40ee96c9f1829b562052b3f2d3"; + sha256 = "1nlb46mkyzdfb0k98wsqqk7mwyh6dfw4i83wxmdpixskww4iywfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -72624,22 +72946,22 @@ license = lib.licenses.free; }; }) {}; - turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + turing-machine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turing-machine"; - version = "20170512.1438"; + version = "20180221.2038"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "turing-machine"; - rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d"; - sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk"; + rev = "fa60b76a5bac1f54b7a1b3dc55aae7602c7e385b"; + sha256 = "0k1r0zkcr44kiki8cvdqwx09xpvpz7nkbq9w6i4gqy5h78zy5k79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine"; sha256 = "1ndy953q9hr1psqqkkqsffyvj800cnqdxcrixqiw0ls77f2kczcn"; name = "turing-machine"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/turing-machine"; license = lib.licenses.free; @@ -72816,12 +73138,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20180118.2305"; + version = "20180222.534"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "7249d76e2d4580c5c2f1f5978490b1fe0ffc57dc"; - sha256 = "0bvarlk3pmzh1g489rdbsh0c255fj78si99m9a6l4ha9jk4xa5b6"; + rev = "2815dd1b4bbf902fb61e0a8f1aca6319c7b0c940"; + sha256 = "0d97frhcf6g4ijr1vphfnvrchj2p1rfpj7zrvj8i3jzb6dakyw4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -73005,12 +73327,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170905.1505"; + version = "20180214.824"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "d08fe8e01db6df151b38c3001fba239a9a22369a"; - sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8"; + rev = "bf724ce7806a738d2043544061e5f9bbfc56e674"; + sha256 = "0pz26q5qfq4wiqcpfkq26f19q5gyiv8q71sq4k77hkss5a5b5fqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -73981,12 +74303,12 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20171018.2216"; + version = "20180215.835"; src = fetchFromGitHub { owner = "venks1"; repo = "emacs-fossil"; - rev = "abdb5487831e641c291c0dcb3848f539ca11f400"; - sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn"; + rev = "7c5af95181213db38f81f5f9586f3334301a3ea0"; + sha256 = "1c18ywvs0l5w7ip2igksjy48awzas8mph7plpvp1v8c67a3a3m2m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; @@ -75156,12 +75478,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20180211.945"; + version = "20180220.906"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "d667edc2e35f5e4fe8cc4465e6359ee001a1516a"; - sha256 = "072x1kgzm9pp3bg1sq7zb1v95m19ksnnjdvf26ablwcldsgapncd"; + rev = "eea5179afd9822775a580844f46a8e8c09753681"; + sha256 = "1gp2n5illnpmza7wj45abydapx1hhkpcmx79rmzlqcrm8rz6wfj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -75727,8 +76049,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "1b09b1b2848ab21c412f2fe7a259b1dcea2c733c"; - sha256 = "1g53id1wc6xfa3066m9c4f0f0chsnsv8mqqs5v6zx7yf4nv9v9ja"; + rev = "5922cf54533e1f8a3b1db5f57f07ececf9a20e1e"; + sha256 = "1qjs9xkqv3084hj67vk9cz4pnkw7hzl48fzps5kng8ip94yiazh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -75786,12 +76108,12 @@ wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wilt"; - version = "20151105.518"; + version = "20180220.54"; src = fetchFromGitHub { owner = "sixty-north"; repo = "emacs-wilt"; - rev = "5febe367c6c3729848654358af4d17ee2987da8d"; - sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd"; + rev = "04dbe37fa35d0b24c791421785d2c97a8cbfe2cc"; + sha256 = "197kqp22pyy1in2rq063mahvrf00vrfvgnfkqp0zy7hpkhiiqvim"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eea4f2ca8b4f9ea93cc02151fdda6cfee5b68b70/recipes/wilt"; @@ -76142,12 +76464,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20180111.433"; + version = "20180217.548"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; - sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; + rev = "fcbccec6ec0f6639eab769d6ff8e97f25347a48e"; + sha256 = "079dy4b409i9016j3fkgwxggw8332hkvnnm86am46va3lqpd3jr9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -76688,12 +77010,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20180120.241"; + version = "20180219.2311"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "ee1c71cd2b3fc00a76e55789ad9a74eed4ae59c2"; - sha256 = "16wbdm2a5wdpfhxwd1wlqnj0h1ivrrq00nk8ddzp7qsdc8m1i4gn"; + rev = "cf452fd0f2e742812a4c69e41cb5403f22b0a16a"; + sha256 = "1wjj3sj90az5y4a7cy0pblwxi0xbj5gg72jdr9wbm95si582vk58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -76709,12 +77031,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170828.1"; + version = "20180221.1746"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "6e94446566df206911afa107d06aec50ac3a56fc"; - sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6"; + rev = "81adab6b7ef1c35e839b2438809200c12382b079"; + sha256 = "00rrb01jccdm65ag8c9ryw8mfh2hz21nh9jf6jpxb4f8y3yxf2q6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode"; @@ -76751,12 +77073,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20180211.1348"; + version = "20180221.1809"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "b88e84bafc93b109c53cee2be88b8fd6517187be"; - sha256 = "1394v3mgmx7hwxi3slszhlc82hds6c4p0pfglyd2bf33c56shk6h"; + rev = "c01ddd038e03051bcc8010629b7548838db2531b"; + sha256 = "132afibrgz6381nanjhalkgqmxwia6ykyprrasa19m9kbm96xwdl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76814,12 +77136,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170905.849"; + version = "20180216.1040"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "fcdfbed46ff81c8da84422611e0009c6b267e359"; - sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0"; + rev = "16a441944da3fb3f844b93d0add1e042e1b5377a"; + sha256 = "1vr7dkibw5ibd1c3snxy2pw055yl620pi2vynxszsk82shz2xvbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input"; @@ -77427,8 +77749,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "b028fc03a1526b166043e783add3be4f04b7a92e"; - sha256 = "0abl81q726jdhlirz77vl55xdbhpyfqrfqc2x6qdz9jmh04r912g"; + rev = "c2912e845d74a22436bdf720eb9bc543d0e0c45c"; + sha256 = "1swnr1nrlyd7ij4m05dvqwdfmpj41b3ibfqmb45qm073f27gvj65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -77465,12 +77787,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20180204.2333"; + version = "20180212.1556"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "7f4103736178fc6e3a9a9ba3b3d0516986ab8b71"; - sha256 = "0y153522yg5qmkdcbf7h87zcambgl9hf9bwk8dq22c0vgdc04v3i"; + rev = "3fc5a33760b0bbb6e67adbce48ab3dc4ae34b847"; + sha256 = "1ijq7ay5lx77nibzqc1kih64v4bg4790as1zg26igp7ivg66l1m6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -77549,12 +77871,12 @@ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20180127.254"; + version = "20180220.1049"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "4b04dd134599b2e360c10d8be9110078aa1aca9d"; - sha256 = "031v4r5spgsl8i0vgfzrwvcp8s8vbdw0kf56wj7qz9732hmb14j7"; + rev = "de672dab9df4a0bffb44cdadaace93d00d9a8848"; + sha256 = "1w0lkn1prv9xd4pn81kqxk26s37ia1xk0kz8qahcvjg7z4igyy9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -77696,12 +78018,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180211.1442"; + version = "20180218.459"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "c9277d326e9c8b6052bbb35eb86467e43a7e9424"; - sha256 = "0hddvg7b3ba1irydhybr011d9dfxvnqj9km4km9l3xk9fx0kkqvw"; + rev = "3d7cafccf8d7ea9d62e0ccd63c30769de5b8cf01"; + sha256 = "0m5z46vdv5npwpkqc87jsf488k31mpqphsg1yayy4pjqz2bn68vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -77717,12 +78039,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180122.521"; + version = "20180222.440"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "b42c2b670bdd761b9c1c232998ebf4bbc5b914e8"; - sha256 = "0mzfck8jdcy6p18r37nc06w888zhvd3kamaaxzspbda4yws7y2wk"; + rev = "2373036c13d71c5fab2616d97498213f54688bd6"; + sha256 = "18sdc92qaacxp757yqdv71hx2pjhcy33vshkwjdi6mmmqa1d2zq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -77824,8 +78146,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "e21c99de8fd2992031adaa758df0d495e55d682a"; - sha256 = "1l9xsqlcqi25mdka806gz3h4y4x0dh00n6bajh3x908ayixjgf91"; + rev = "a35a2ddd911da6d3a926bdef2614a2898055a5e2"; + sha256 = "1nig77gqi74k01309r3nfy45ylhi5mj7ajxlhib6i58zlib8ycbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -78438,12 +78760,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20170109.2040"; + version = "20180218.1053"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; - sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; + rev = "5b3715bab55c9f17f134a8fada5b68c07aa66cad"; + sha256 = "1hz1m4190yi6knz3y088ql8wy3pmsl8lsznqby2vpnn9p74fvl37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -78480,11 +78802,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20180205.2109"; + version = "20180220.2131"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "53a247d2c21b"; - sha256 = "1a45l3i1gg0pyka13z6hra3wyp6x564cz66gbi10sqly2jlwgxda"; + rev = "63926bbaffde"; + sha256 = "00y7qskqic6lxv7n8rghfkj792iqxaz4rfgyhl5zyhmi77xj7y0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; @@ -78500,12 +78822,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20180210.717"; + version = "20180215.1021"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "d078dafa74f4e2a001f1aeecf718c0716779d77e"; - sha256 = "1skhvq48f6pl1i53gaa1bplbwd1ik21a12vryby3gk3w5ccw3wng"; + rev = "67a1d90595353ab57fd424651c567df9851b9494"; + sha256 = "01qv400zp4bdfah62l3ixkc3kvkwrjj5ngc36m6w783q0zmr105r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; From 61c1a307a9dbd3456c4040c39787f7c1c3f65700 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 23 Feb 2018 02:47:16 +0000 Subject: [PATCH 105/133] libtoxcore: add libconfig to buildInputs $out/bin/tox-bootstrapd is not built without it, silently --- pkgs/development/libraries/libtoxcore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index a742be3c1e4d..16fca9ce3d39 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libsodium libmsgpack ncurses + libsodium libmsgpack ncurses libconfig ] ++ stdenv.lib.optionals (!stdenv.isArm) [ libopus libvpx From 1474ec59877113695cb1638d051ce7693634bf69 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Thu, 8 Feb 2018 17:47:18 -0800 Subject: [PATCH 106/133] golint: 20160428 -> 20180208 --- pkgs/development/tools/golint/default.nix | 6 +++--- pkgs/development/tools/golint/deps.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index c54a924a1a65..99f049314ae8 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "lint-${version}"; - version = "20160428-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f"; + version = "20180208-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "e14d9b0f1d332b1420c1ffa32562ad2dc84d645d"; goPackagePath = "github.com/golang/lint"; excludedPackages = "testdata"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/golang/lint"; - sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; + sha256 = "15ynf78v39n71aplrhbqvzfblhndp8cd6lnknm586sdl81wama6p"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix index f03bf9b5b23b..caf3615c666b 100644 --- a/pkgs/development/tools/golint/deps.nix +++ b/pkgs/development/tools/golint/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + rev = "66487607e2081c7c2af2281c62c14ee000d5024b"; + sha256 = "03wiraqkms4jb5gi7vmp52mpmp4av08yw4gr2nk31c2rnhyd3jv4"; }; } ] From 985a4bb87cdb93f7c044fd1062e213fcc587ac43 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 23 Feb 2018 03:26:18 +0000 Subject: [PATCH 107/133] nixos/tox-bootstrapd: new command line format --- nixos/modules/services/networking/tox-bootstrapd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix index c1f945773e23..cb0e6b158651 100644 --- a/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -69,7 +69,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = - { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}"; + { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}"; Type = "forking"; inherit PIDFile; User = "tox-bootstrapd"; From e1aecec4cd4c98756839631efa3637fe8124d1cc Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 23 Feb 2018 11:17:03 +0700 Subject: [PATCH 108/133] build-support/rust: make use of abandoned cargoUpdateHook Previously, cargoUpdateHook was meaningful as it was used in [`cargo-fetch-deps`](https://github.com/NixOS/nixpkgs/blob/19d3cf81d3436a6600f261579b55b9132a6ca8fb/pkgs/build-support/rust/fetch-cargo-deps#L71). However, this entire file was removed in 5f8cf0048ea089fa73d17512fc4f9f0f0644e225. As far as I can tell, nothing in the code is using it, but it is still being passed around: https://github.com/NixOS/nixpkgs/search?q=cargoUpdateHook&type=Code&utf8=%E2%9C%93 There are, however, legitimate use cases for it. For example, in some software, some dependencies are not locked in Cargo.toml and this causes Cargo to try fetching another version of them. This doesn't work well with vendoring crates. This hook allows to inject patching or whatever necessary workarounds in the crate vendoring process. I suppose that's what it was for in there in the first place. This patch restores this hook and makes it usable again. --- pkgs/build-support/rust/fetchcargo.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index d03d85c07888..42a3ac27cb5b 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { export CARGO_HOME=$(mktemp -d cargo-home.XXX) + ${cargoUpdateHook} + cargo vendor cp -ar vendor $out From e09caecb0619ede0508b01d47186cb6c0bb78a11 Mon Sep 17 00:00:00 2001 From: Carl Sverre Date: Wed, 14 Feb 2018 13:34:31 -0800 Subject: [PATCH 109/133] sift: 0.8.0 -> 0.9.0 --- pkgs/tools/text/sift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index fd4cef27ba17..efa5e539bd14 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "sift-${version}"; - version = "0.8.0"; + version = "0.9.0"; rev = "v${version}"; goPackagePath = "github.com/svent/sift"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "svent"; repo = "sift"; - sha256 = "1nb042k420xr6000ipwhqn41vg8jfp6ghq4z7y1sjnndkrhclzm1"; + sha256 = "0bgy0jf84z1c3msvb60ffj4axayfchdkf0xjnsbx9kad1v10g7i1"; }; goDeps = ./deps.nix; From 71b0de10199e8b1cc184fead33eaec4819698a9d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 23 Feb 2018 01:50:04 +0200 Subject: [PATCH 110/133] rogue: Fix build after ncurses5 changes Fixes build after commit 3d24ae9b4426bb8adfcb08de57be21fdf0a377f8: https://hydra.nixos.org/build/69789236 Thanks to dtzWill for the pointer: https://github.com/NixOS/nixpkgs/pull/34477#issuecomment-367359351 --- pkgs/games/rogue/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 05fd9ab523b6..40f0b1754941 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + meta = { homepage = http://rogue.rogueforge.net/rogue-5-4/; description = "The final version of the original Rogue game developed for the UNIX operating system"; From 8afcfb2bb6681c56ecf21e056d91d6748d953997 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 23 Feb 2018 01:54:50 +0200 Subject: [PATCH 111/133] ocamlPackages.curses: Fix build after ncurses5 changes Fixes build after commit 3d24ae9b4426bb8adfcb08de57be21fdf0a377f8: https://github.com/NixOS/nixpkgs/commit/3d24ae9b4426bb8adfcb08de57be21fdf0a377f8#commitcomment-27714305 Thanks to dtzWill for the pointer: https://github.com/NixOS/nixpkgs/pull/34477#issuecomment-367359351 --- pkgs/development/ocaml-modules/curses/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 4fd75e7aac53..eebb2f68f3dd 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; + # Fix build for recent ncurses versions + NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + createFindlibDestdir = true; postPatch = '' From dbfcf2899c2f3cf61251d52338ccdd3d3a78bdc3 Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Fri, 23 Feb 2018 06:15:04 +0100 Subject: [PATCH 112/133] arpoison: init at 0.7 (#35109) --- pkgs/tools/networking/arpoison/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/networking/arpoison/default.nix diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix new file mode 100644 index 000000000000..cedd8597870b --- /dev/null +++ b/pkgs/tools/networking/arpoison/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchzip, libnet }: + +stdenv.mkDerivation rec { + name = "arpoison-0.7"; + + buildInputs = [ libnet ]; + + src = fetchzip { + url = "http://www.arpoison.net/${name}.tar.gz"; + sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37"; + }; + + postPatch = "substituteInPlace Makefile --replace gcc cc"; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man8 + gzip arpoison.8 + cp arpoison $out/bin + cp arpoison.8.gz $out/share/man/man8 + ''; + + meta = with stdenv.lib; { + description = "UNIX arp cache update utility"; + homepage = http://www.arpoison.net/; + license = with licenses; [ gpl2 ]; + maintainers = [ maintainers.michalrus ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e7730f67144..6aeec322adc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1381,6 +1381,8 @@ with pkgs; arping = callPackage ../tools/networking/arping { }; + arpoison = callPackage ../tools/networking/arpoison { }; + asciidoc = callPackage ../tools/typesetting/asciidoc { inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; w3m = w3m-batch; From af2d94fed54e2a6515174bd35be13521a76b07f7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 23 Feb 2018 13:18:52 +0800 Subject: [PATCH 113/133] virtmanager-qt: 0.48.79 -> 0.52.80 --- pkgs/applications/virtualization/virt-manager/qt.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 4c5000f0208c..e723cd02bd05 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,17 +1,17 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtmultimedia, qtsvg +, qtbase, qtmultimedia, qtsvg, qttools , libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol }: mkDerivation rec { name = "virt-manager-qt-${version}"; - version = "0.48.79"; + version = "0.52.80"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = "${version}"; - sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k"; + sha256 = "131rs6c90vdf1j40qj7k6s939y8la9ma0q3labxb7ac3r8hvhn6a"; }; cmakeFlags = [ @@ -24,7 +24,7 @@ mkDerivation rec { libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; From 7d8f7da81eeab206d3c08067ce91501356466457 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 23 Feb 2018 13:43:28 +0800 Subject: [PATCH 114/133] pkgs.plasma5.user-manager: init --- pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/user-manager.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/plasma-5/user-manager.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index f00c4e73a887..5bb8b0f9ef80 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -135,6 +135,7 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; + user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; }; in diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/pkgs/desktops/plasma-5/user-manager.nix new file mode 100644 index 000000000000..f46792fc48f7 --- /dev/null +++ b/pkgs/desktops/plasma-5/user-manager.nix @@ -0,0 +1,13 @@ +{ + mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml, + ki18n, kiconthemes, kio, kwindowsystem, libpwquality +}: + +mkDerivation { + name = "user-manager"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem + libpwquality + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7015f2d97d91..35d6da56b8ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19274,7 +19274,7 @@ with pkgs; kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings xdg-desktop-portal-kde; + systemsettings user-manager xdg-desktop-portal-kde; ### SCIENCE From c2b781a70ed433ab7158906b8fc79a4b608213a3 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Wed, 21 Feb 2018 19:28:46 +0200 Subject: [PATCH 115/133] maintainers: add svsdep --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d2aa34c65bda..0cc8fe522a21 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -671,6 +671,7 @@ stumoss = "Stuart Moss "; SuprDewd = "Bjarki Ágúst Guðmundsson "; suvash = "Suvash Thapaliya "; + svsdep = "Vasyl Solovei "; swarren83 = "Shawn Warren "; swflint = "Samuel W. Flint "; swistak35 = "Rafał Łasocha "; From 5118a47baa64f853ff5f208e48b3e214d44a7447 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Wed, 21 Feb 2018 19:55:39 +0200 Subject: [PATCH 116/133] gnomeExtensions.no-title-bar: init at 8 --- .../extensions/no-title-bar/default.nix | 35 ++++++++++++ .../extensions/no-title-bar/fix-paths.patch | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 92 insertions(+) create mode 100644 pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix create mode 100644 pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix new file mode 100644 index 000000000000..43e94ce6bfbb --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-no-title-bar-${version}"; + version = "8"; + + src = fetchFromGitHub { + owner = "franglais125"; + repo = "no-title-bar"; + rev = "v${version}"; + sha256 = "0n3ayf7k2icy913sjl1d6iwm21i8fivv0f7wj7gck8q7q2j7i3bz"; + }; + + nativeBuildInputs = [ + glib gettext + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + xprop = "${xorg.xprop}/bin/xprop"; + xwininfo = "${xorg.xwininfo}/bin/xwininfo"; + }) + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "Integrates maximized windows with the top panel"; + homepage = https://github.com/franglais125/no-title-bar; + license = licenses.gpl2; + maintainers = with maintainers; [ jonafato svsdep ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch new file mode 100644 index 000000000000..9a53d63860da --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch @@ -0,0 +1,56 @@ +--- a/decoration.js ++++ b/decoration.js +@@ -181,7 +181,7 @@ + let act = win.get_compositor_private(); + let xwindow = act && act['x-window']; + if (xwindow) { +- let xwininfo = GLib.spawn_command_line_sync('xwininfo -children -id 0x%x'.format(xwindow)); ++ let xwininfo = GLib.spawn_command_line_sync('@xwininfo@ -children -id 0x%x'.format(xwindow)); + if (xwininfo[0]) { + let str = xwininfo[1].toString(); + +@@ -207,7 +207,7 @@ + // Try enumerating all available windows and match the title. Note that this + // may be necessary if the title contains special characters and `x-window` + // is not available. +- let result = GLib.spawn_command_line_sync('xprop -root _NET_CLIENT_LIST'); ++ let result = GLib.spawn_command_line_sync('@xprop@ -root _NET_CLIENT_LIST'); + if (result[0]) { + let str = result[1].toString(); + +@@ -218,7 +218,7 @@ + + // For each window ID, check if the title matches the desired title. + for (var i = 0; i < windowList.length; ++i) { +- let cmd = 'xprop -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; ++ let cmd = '@xprop@ -id "' + windowList[i] + '" _NET_WM_NAME _NO_TITLE_BAR_ORIGINAL_STATE'; + let result = GLib.spawn_command_line_sync(cmd); + + if (result[0]) { +@@ -258,7 +258,7 @@ + } + + let id = this._guessWindowXID(win); +- let cmd = 'xprop -id ' + id; ++ let cmd = '@xprop@ -id ' + id; + + let xprops = GLib.spawn_command_line_sync(cmd); + if (!xprops[0]) { +@@ -277,7 +277,7 @@ + m = str.match(/^_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED(\(CARDINAL\))? = ([0-9]+)$/m); + if (m) { + let state = !!parseInt(m[2]); +- cmd = ['xprop', '-id', id, ++ cmd = ['@xprop@', '-id', id, + '-f', '_NO_TITLE_BAR_ORIGINAL_STATE', '32c', + '-set', '_NO_TITLE_BAR_ORIGINAL_STATE', + (state ? '0x1' : '0x0')]; +@@ -358,7 +358,7 @@ + let winXID = this._guessWindowXID(win); + if (winXID == null) + return; +- let cmd = ['xprop', '-id', winXID, ++ let cmd = ['@xprop@', '-id', winXID, + '-f', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', '32c', + '-set', '_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED', + (hide ? '0x1' : '0x0')]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6aeec322adc5..ef4fb974f99e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19190,6 +19190,7 @@ with pkgs; icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; + no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; From 4da66a7cf971f5526bfe60220e45a160f386a346 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 22 Feb 2018 23:40:01 -0500 Subject: [PATCH 117/133] gnomeExtensions.pixel-saver: remove This extension is being replaced by gnomeExtensions.no-title-bar in #35281. --- .../extensions/pixel-saver/default.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 29 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix b/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix deleted file mode 100644 index ccc3fd578e94..000000000000 --- a/pkgs/desktops/gnome-3/extensions/pixel-saver/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extension-pixel-saver-${version}"; - version = "1.10"; - - src = fetchFromGitHub { - owner = "deadalnix"; - repo = "pixel-saver"; - rev = version; - sha256 = "040ayzhpv9jq49vp32w85wvjs57047faa7872qm4brii450iy7v4"; - }; - - uuid = "pixel-saver@deadalnix.me"; - - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - ''; - - meta = with stdenv.lib; { - description = "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way"; - license = licenses.mit; - maintainers = with maintainers; [ jonafato ]; - platforms = platforms.linux; - homepage = https://github.com/deadalnix/pixel-saver; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef4fb974f99e..dcbdff9b534b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19191,7 +19191,6 @@ with pkgs; mediaplayer = callPackage ../desktops/gnome-3/extensions/mediaplayer { }; nohotcorner = callPackage ../desktops/gnome-3/extensions/nohotcorner { }; no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; - pixel-saver = callPackage ../desktops/gnome-3/extensions/pixel-saver { }; remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; From 66796b2f08b0f93c3fb0d43eea97b870d6190124 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Fri, 23 Feb 2018 15:50:01 +0900 Subject: [PATCH 118/133] Groonga: 7.1.0 -> 8.0.0 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 25cd46aa98b2..e3555d0076f6 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1v0dyahlq7801bgcyvawj8waw6z84r0sr90x2b8nnrisrac3b8m7"; + sha256 = "14il1biqpx5qs5dkmsrikw33pc8gj8scmr90y639wap87z5i3dcz"; }; buildInputs = with stdenv.lib; From 317da085aa80d3c34f20ed5488af0a0d3dd85610 Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Fri, 23 Feb 2018 14:41:52 +0700 Subject: [PATCH 119/133] winetricks: 20171222 -> 20180217 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index c276a24b1832..a84165ccedef 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -58,8 +58,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20171222"; - sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9"; + version = "20180217"; + sha256 = "0k3vlsqjbzys5dfbxwgw76al8gh44jsjqkc06va103frkrgjxvc5"; owner = "Winetricks"; repo = "winetricks"; rev = version; From e066751227b8ddf9d61c3f52a552e4d7a1da1c2a Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Thu, 22 Feb 2018 13:06:07 +0900 Subject: [PATCH 120/133] jbuilder: 1.0+beta14 -> 1.0+beta18 --- pkgs/development/tools/ocaml/jbuilder/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index bef994f30b7c..2bfc832a0f0a 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchzip, ocaml, opam }: +{ stdenv, fetchFromGitHub, ocaml, opam }: -stdenv.mkDerivation { - name = "jbuilder-1.0+beta14"; - src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta14.tar.gz; - sha256 = "0vq4chqp7bm3rd5n6ry1j1ia6xqlz463059ljd1jmawa4dcyilvl"; +stdenv.mkDerivation rec { + name = "jbuilder-${version}"; + version = "1.0+beta18"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "dune"; + rev = "${version}"; + sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6"; }; buildInputs = [ ocaml ]; From a35d106d070a03a78d57b04f9bdb96faa10dcee0 Mon Sep 17 00:00:00 2001 From: Ryan Scheel Date: Fri, 23 Feb 2018 02:22:30 -0800 Subject: [PATCH 121/133] mdbook: init at 0.1.3 (#35250) * mdbook: Init at 0.1.3 * mdbook: simplification * Mark mdbook as broken on Darwin --- pkgs/tools/text/mdbook/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/text/mdbook/default.nix diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix new file mode 100644 index 000000000000..5bbe8cfd0943 --- /dev/null +++ b/pkgs/tools/text/mdbook/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform, CoreServices }: + +rustPlatform.buildRustPackage rec { + name = "mdbook-${version}"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "rust-lang-nursery"; + repo = "mdBook"; + rev = "v${version}"; + sha256 = "0m0vprjpd02z4nr3vd4qha2jka7l36k4liw8jcbf4xs09c584sjv"; + }; + + cargoSha256 = "19hpr78p9rzgirq6fjw8v11d5mgcglms6vbqgjyvg49xmkklsqzr"; + depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = with stdenv.lib; { + description = "Create books from MarkDown"; + homepage = https://github.com/rust-lang-nursery/mdbook; + license = [ licenses.asl20 licenses.mit ]; + maintainers = [ maintainers.havvy ]; + platforms = platforms.all; + + # Because CoreServices needs to be updated, + # but Apple won't release the source. + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d06485e70b96..7dcaf5f64336 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3172,6 +3172,10 @@ with pkgs; matrix-synapse = callPackage ../servers/matrix-synapse { }; + mdbook = callPackage ../tools/text/mdbook { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + memtester = callPackage ../tools/system/memtester { }; minidlna = callPackage ../tools/networking/minidlna { }; From 0b0b5a5e2870676bd591ce85a86844eeb19e0399 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 23 Feb 2018 18:47:34 +0800 Subject: [PATCH 122/133] go-ethereum: Dont install sources in $out --- pkgs/applications/altcoins/go-ethereum.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index f35213a085b1..18a9d043e189 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -12,6 +12,17 @@ buildGoPackage rec { # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) hardeningDisable = [ "fortify" ]; + # Only install binaries in $out, source is not interesting and takes ~50M + outputs = [ "out" ]; + preFixup = '' + export bin="''${out}" + ''; + installPhase = '' + mkdir -p $out/bin $out + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $out + ''; + src = fetchFromGitHub { owner = "ethereum"; repo = "go-ethereum"; From cb025f228534c7519a016a5eac6523f961f366cf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Feb 2018 05:53:31 -0500 Subject: [PATCH 123/133] linux_riscv: Move patches to my Linux fork. All patches there are also submitted upstream and will be removed if rejected. Also includes some fixes to get module loading working. --- pkgs/os-specific/linux/kernel/linux-riscv.nix | 10 +-- pkgs/os-specific/linux/kernel/patches.nix | 29 --------- .../linux/kernel/riscv-initrd-free.patch | 21 ------ .../linux/kernel/riscv-initrd.patch | 48 -------------- .../linux/kernel/riscv-install.patch | 65 ------------------- .../linux/kernel/riscv-irq-busy.patch | 42 ------------ .../linux/kernel/riscv-modules.patch | 11 ---- pkgs/top-level/all-packages.nix | 10 +-- 8 files changed, 7 insertions(+), 229 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/riscv-initrd-free.patch delete mode 100644 pkgs/os-specific/linux/kernel/riscv-initrd.patch delete mode 100644 pkgs/os-specific/linux/kernel/riscv-install.patch delete mode 100644 pkgs/os-specific/linux/kernel/riscv-irq-busy.patch delete mode 100644 pkgs/os-specific/linux/kernel/riscv-modules.patch diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix index b2eb0a69a8ec..45795e24c542 100644 --- a/pkgs/os-specific/linux/kernel/linux-riscv.nix +++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc1"; - modDirVersion = "4.16.0-rc1"; + version = "4.16-rc2"; + modDirVersion = "4.16.0-rc2"; extraMeta.branch = "4.16"; src = fetchFromGitHub { - owner = "riscv"; + owner = "shlevy"; repo ="riscv-linux"; - rev = "a31991a9c6ce2c86fd676cf458a0ec10edc20d37"; - sha256 = "0n97wfbi3pnp5c70xfj7s0fk8zjjkjz6ldxh7n54kbf64l4in01f"; + rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6"; + sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 42e14ad7c40b..e163459d7f4f 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -73,33 +73,4 @@ rec { }; }; - riscv_modules = { - name = "riscv-modules"; - patch = ./riscv-modules.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000054.html - riscv_irq_busy = { - name = "riscv-irq-busy"; - patch = ./riscv-irq-busy.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000059.html - riscv_install = { - name = "riscv-install"; - patch = ./riscv-install.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000056.html - riscv_initrd = { - name = "riscv-initrd"; - patch = ./riscv-initrd.patch; - }; - - # http://lists.infradead.org/pipermail/linux-riscv/2018-February/000058.html - riscv_initrd_free = { - name = "riscv-initrd-free"; - patch = ./riscv-initrd-free.patch; - }; - } diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch b/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch deleted file mode 100644 index 680448385246..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-initrd-free.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b1fbec8b74ace263ce1371e6bcfdd1dd71b52070 -Author: Shea Levy -Date: Tue Feb 20 08:48:12 2018 -0500 - - riscv: Implement free_initrd_mem. - - v2: Remove incorrect page alignment. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c -index c77df8142be2..1b6daa5184e0 100644 ---- a/arch/riscv/mm/init.c -+++ b/arch/riscv/mm/init.c -@@ -66,5 +66,6 @@ void free_initmem(void) - #ifdef CONFIG_BLK_DEV_INITRD - void free_initrd_mem(unsigned long start, unsigned long end) - { -+ free_reserved_area((void *)start, (void *)end, -1, "initrd"); - } - #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/pkgs/os-specific/linux/kernel/riscv-initrd.patch b/pkgs/os-specific/linux/kernel/riscv-initrd.patch deleted file mode 100644 index 2313e7645843..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-initrd.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 1e5f6473492f41355289d022003a049ebf8995fa -Author: Shea Levy -Date: Tue Feb 20 07:52:14 2018 -0500 - - riscv: Respect the initrd found in the dt, if any. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c -index 41d34008faf6..c4ebc907af34 100644 ---- a/arch/riscv/kernel/setup.c -+++ b/arch/riscv/kernel/setup.c -@@ -88,15 +88,20 @@ static void __init setup_initrd(void) - extern unsigned long __initramfs_size; - unsigned long size; - -+ if (initrd_start) -+ goto found; -+ - if (__initramfs_size > 0) { - initrd_start = (unsigned long)(&__initramfs_start); - initrd_end = initrd_start + __initramfs_size; - } - -+ initrd_below_start_ok = 1; - if (initrd_start >= initrd_end) { - printk(KERN_INFO "initrd not found or empty"); - goto disable; - } -+found: - if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { - printk(KERN_ERR "initrd extends beyond end of memory"); - goto disable; -@@ -104,13 +109,13 @@ static void __init setup_initrd(void) - - size = initrd_end - initrd_start; - memblock_reserve(__pa(initrd_start), size); -- initrd_below_start_ok = 1; - - printk(KERN_INFO "Initial ramdisk at: 0x%p (%lu bytes)\n", - (void *)(initrd_start), size); - return; - disable: - pr_cont(" - disabling initrd\n"); -+ initrd_below_start_ok = 0; - initrd_start = 0; - initrd_end = 0; - } diff --git a/pkgs/os-specific/linux/kernel/riscv-install.patch b/pkgs/os-specific/linux/kernel/riscv-install.patch deleted file mode 100644 index 707230e9a336..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-install.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 365fc1312f4911bfae25c5914c398f9aca21948f -Author: Shea Levy -Date: Mon Feb 19 10:50:58 2018 -0500 - - riscv: Add install target to Makefile. - - Signed-off-by: Shea Levy - -diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile -index 6719dd30ec5b..26892daefa05 100644 ---- a/arch/riscv/Makefile -+++ b/arch/riscv/Makefile -@@ -70,3 +70,7 @@ core-y += arch/riscv/kernel/ arch/riscv/mm/ - libs-y += arch/riscv/lib/ - - all: vmlinux -+ -+PHONY += install -+install: vmlinux -+ sh $(srctree)/arch/riscv/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)" -diff --git a/arch/riscv/install.sh b/arch/riscv/install.sh -new file mode 100644 -index 000000000000..8b3155a11a4a ---- /dev/null -+++ b/arch/riscv/install.sh -@@ -0,0 +1,39 @@ -+#!/bin/sh -+# -+# arch/riscv/install.sh -+# -+# This file is subject to the terms and conditions of the GNU General Public -+# License. See the file "COPYING" in the main directory of this archive -+# for more details. -+# -+# Copyright (C) 1995 by Linus Torvalds -+# -+# Adapted from code in arch/ia64/Makefile by Shea Levy -+# -+# "make install" script for riscv architecture -+# -+# Arguments: -+# $1 - kernel version -+# $2 - kernel image file -+# $3 - kernel map file -+# $4 - default install path (blank if root directory) -+# -+ -+# User may have a custom install script -+ -+if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi -+if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi -+ -+# Default install - no bootloader configuration (yet?) -+base=$(basename $2) -+ -+if [ -f $4/$base ]; then -+ mv $4/$base $4/$base.old -+fi -+ -+if [ -f $4/System.map ]; then -+ mv $4/System.map $4/System.old -+fi -+ -+cat $2 > $4/$base -+cp $3 $4/System.map diff --git a/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch b/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch deleted file mode 100644 index 5f5e8f0c8b7b..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-irq-busy.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit 2603e6087b26e9428b806b267aee6bcb919abcea -Author: Shea Levy -Date: Sun Feb 18 20:08:30 2018 -0500 - - set_handle_irq: Return EBUSY if the handler has already been registered. - - This is what's expected by the comments and at least by irq-riscv-intc.c - - Signed-off-by: Shea Levy - -diff --git a/include/linux/irq.h b/include/linux/irq.h -index 2930fd2572e4..77e97872a13e 100644 ---- a/include/linux/irq.h -+++ b/include/linux/irq.h -@@ -1179,7 +1179,7 @@ int ipi_send_mask(unsigned int virq, const struct cpumask *dest); - * Returns 0 on success, or -EBUSY if an IRQ handler has already been - * registered. - */ --void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)); -+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)); - - /* - * Allows interrupt handlers to find the irqchip that's been registered as the -diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c -index dee4f9a172ca..3570c715c3e7 100644 ---- a/kernel/irq/handle.c -+++ b/kernel/irq/handle.c -@@ -213,11 +213,12 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) - } - - #ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER --void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) -+int __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) - { - if (handle_arch_irq) -- return; -+ return -EBUSY; - - handle_arch_irq = handle_irq; -+ return 0; - } - #endif diff --git a/pkgs/os-specific/linux/kernel/riscv-modules.patch b/pkgs/os-specific/linux/kernel/riscv-modules.patch deleted file mode 100644 index 6d5356e0e46f..000000000000 --- a/pkgs/os-specific/linux/kernel/riscv-modules.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur linux-4.15.4-orig/arch/riscv/configs/defconfig linux-4.15.4/arch/riscv/configs/defconfig ---- linux-4.15.4-orig/arch/riscv/configs/defconfig 2018-02-16 14:07:01.000000000 -0500 -+++ linux-4.15.4/arch/riscv/configs/defconfig 2018-02-18 18:33:09.488431900 -0500 -@@ -12,6 +12,7 @@ - CONFIG_NAMESPACES=y - CONFIG_USER_NS=y - CONFIG_BLK_DEV_INITRD=y -+CONFIG_MODULES=y - CONFIG_EXPERT=y - CONFIG_CHECKPOINT_RESTORE=y - CONFIG_BPF_SYSCALL=y diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7dcaf5f64336..b889a0328d7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13162,13 +13162,7 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - ] ++ lib.optionals hostPlatform.isRiscV [ - kernelPatches.riscv_modules - kernelPatches.riscv_irq_busy - kernelPatches.riscv_install - kernelPatches.riscv_initrd - kernelPatches.riscv_initrd_free - ]; + ]; }; linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix { @@ -13179,7 +13173,7 @@ with pkgs; # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - ]; + ]; }; /* Linux kernel modules are inherently tied to a specific kernel. So From c6cd69341afe66ee15d4eb0ab3b6e203ac8b99f2 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 23 Feb 2018 15:23:50 +0300 Subject: [PATCH 124/133] softether: blacklist aarch64-linux platform --- pkgs/servers/softether/4.18.nix | 2 +- pkgs/servers/softether/4.20.nix | 2 +- pkgs/servers/softether/4.25.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix index d8c3fe944cc3..5b0d15136f89 100644 --- a/pkgs/servers/softether/4.18.nix +++ b/pkgs/servers/softether/4.18.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } diff --git a/pkgs/servers/softether/4.20.nix b/pkgs/servers/softether/4.20.nix index 5d6f642ddc0a..91dd0d0411f8 100644 --- a/pkgs/servers/softether/4.20.nix +++ b/pkgs/servers/softether/4.20.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 2dcb69d28f14..04053174f4e4 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.linux; + platforms = filter (p: p != "aarch64-linux") platforms.linux; }; } From e74b61eddea2eb0a48c3761b0a2e503ffde49eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 23 Feb 2018 13:55:29 +0100 Subject: [PATCH 125/133] knot-resolver: 2.1.0 -> 2.1.1 (bugfix) https://gitlab.labs.nic.cz/knot/knot-resolver/blob/v2.1.1/NEWS --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 56b4a1552fe6..a222805fc459 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "0e90ac37965839705bc2154cb07587cb31dd5816e37a14f3552d65676638fc6a"; + sha256 = "0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3"; }; outputs = [ "out" "dev" ]; From 8c3e7149dfab9485db33c5063257c9344f9dae81 Mon Sep 17 00:00:00 2001 From: DarkScythe97 Date: Fri, 23 Feb 2018 18:26:41 +1030 Subject: [PATCH 126/133] oxipng: 1.0.0 -> 1.0.1 --- pkgs/tools/graphics/oxipng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 1a2b5b19e37a..21d86f4c44b6 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "1.0.0"; + version = "1.0.1"; name = "oxipng-${version}"; src = fetchFromGitHub { owner = "shssoichiro"; repo = "oxipng"; rev = "v${version}"; - sha256 = "1w3y9qy72sfz6zv1iizp843fd39rf1qfh7b9mllbn5w8w4hd658w"; + sha256 = "0w39f0dhq9cxk25vy0wh8vicxyckvj1vmglx5va4550i3q0hsrws"; }; - cargoSha256 = "0mj45svb0nly3cl5d1fmm7nh2zswxpgb56g9xnb4cks5186sn5fi"; + cargoSha256 = "00nbx6n73yl4ax05pqkmim1vhy0pymgz5la1cc4y18gjbjjj9w4h"; meta = with stdenv.lib; { homepage = https://github.com/shssoichiro/oxipng; From 27dd924b4918faeab8fd5ecef1e0ca54338f519c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 23 Feb 2018 08:35:23 -0500 Subject: [PATCH 127/133] linux-copperhead: 4.15.4.a -> 4.15.5.a --- pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix index 0e39bc421c95..e17e9045d6cd 100644 --- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix +++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.15.4"; + version = "4.15.5"; revision = "a"; - sha256 = "0j7nla8vjrxr82nfx8dl34qk8b56piwqbndqch9rv7plgl30hkj7"; + sha256 = "082b5mwkklf111516qld980dqh4q7g1afb2y7mhc2in5pgkgqrws"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 098c7f3d945c36f6eb57f41aeed9638e2561ad18 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 23 Feb 2018 08:37:36 -0500 Subject: [PATCH 128/133] atom: 1.23.3 -> 1.24.0 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 39b4b2e045ed..2194ff226b56 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.23.3"; + version = "1.24.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0vq0pics8ajjqwqlk396dxl10k80059f9bik0j4wj2cals42bifc"; + sha256 = "1yvwz4lkf7ya775h3fvrg1wkdc30321j666vfjlmax5mbcjrxkzf"; name = "${name}.deb"; }; From 2267553271f64e46bb93ba9a70306ed96fca25bd Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 23 Feb 2018 06:42:19 -0800 Subject: [PATCH 129/133] mattermost: 4.7.0 -> 4.7.2 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4890ed5babf6..bff973d786a1 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,18 +2,18 @@ buildGoPackage rec { name = "mattermost-${version}"; - version = "4.7.0"; + version = "4.7.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "11rw2m26mf4x6xbxkf37c1j16kyxx059jv3cdajkpv31xn82s7iv"; + sha256 = "129rvmwf9c19jbdpiclysb870svs2fbhdybcal0jbmzgx2zr8qma"; }; webApp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "09dzkvrwj4ynk8yqrcbnhmv9hm3z3r3vyjrbzpvmznfrwcccc7lr"; + sha256 = "14gr7zzx77q862qccjcdwrzd6n8g2z8yngw8aa4g3q6hypsqi4v3"; }; goPackagePath = "github.com/mattermost/mattermost-server"; From 34a37c5e94e87664f642e1c383e9bda5b35f8854 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Feb 2018 13:39:24 +0300 Subject: [PATCH 130/133] cups: fix path to socket and run directory We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be /run/cups.sock. Return it to default. --- pkgs/misc/cups/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index db344b32d218..3e215cba101c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" - "--with-rundir=/run" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ From cf4c07734364e7e59414f486381360b42a9f88ea Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Feb 2018 13:41:15 +0300 Subject: [PATCH 131/133] cups service: fix client sockets Use systemd to create the directory for UNIX socket. Also use localhost instead of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when available. --- nixos/modules/services/printing/cupsd.nix | 7 +++++-- nixos/tests/printing.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 4c7f58d1d8bc..ecab8cfc7df9 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,7 +124,7 @@ in listenAddresses = mkOption { type = types.listOf types.str; - default = [ "127.0.0.1:631" ]; + default = [ "localhost:631" ]; example = [ "*:631" ]; description = '' A list of addresses and ports on which to listen. @@ -321,7 +321,10 @@ in ''} ''; - serviceConfig.PrivateTmp = true; + serviceConfig = { + PrivateTmp = true; + RuntimeDirectory = [ "cups" ]; + }; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 2d3ecaf94cfa..989008830613 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,7 +39,9 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - $client->succeed("lpstat -H") =~ "localhost:631" or die; + # Test that UNIX socket is used for connections. + $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; + # Test that HTTP server is available too. $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/"); From dccf85a354dd3e65a9a6c2d630bdbd87fafa44ba Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Feb 2018 18:47:35 +0300 Subject: [PATCH 132/133] Revert "cups: fix path to socket and run directory" This reverts commit 34a37c5e94e87664f642e1c383e9bda5b35f8854. --- pkgs/misc/cups/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 3e215cba101c..db344b32d218 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" + "--with-rundir=/run" "--enable-raw-printing" "--enable-threads" ] ++ optionals stdenv.isLinux [ From cc52eff6c61d69441d4df0bbdac237346deac968 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 23 Feb 2018 18:47:43 +0300 Subject: [PATCH 133/133] Revert "cups service: fix client sockets" This reverts commit cf4c07734364e7e59414f486381360b42a9f88ea. --- nixos/modules/services/printing/cupsd.nix | 7 ++----- nixos/tests/printing.nix | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index ecab8cfc7df9..4c7f58d1d8bc 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -124,7 +124,7 @@ in listenAddresses = mkOption { type = types.listOf types.str; - default = [ "localhost:631" ]; + default = [ "127.0.0.1:631" ]; example = [ "*:631" ]; description = '' A list of addresses and ports on which to listen. @@ -321,10 +321,7 @@ in ''} ''; - serviceConfig = { - PrivateTmp = true; - RuntimeDirectory = [ "cups" ]; - }; + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 989008830613..2d3ecaf94cfa 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -39,9 +39,7 @@ import ./make-test.nix ({pkgs, ... }: { $client->waitForUnit("cups.service"); $client->sleep(10); # wait until cups is fully initialized $client->succeed("lpstat -r") =~ /scheduler is running/ or die; - # Test that UNIX socket is used for connections. - $client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; - # Test that HTTP server is available too. + $client->succeed("lpstat -H") =~ "localhost:631" or die; $client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://server:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/");