From 14cbd4d17a0c34f5f7d35b87edb82895db5a8f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 16 May 2018 22:57:45 -0300 Subject: [PATCH 01/86] xkeyboard-config: enable xkb rules symlink --- pkgs/servers/x11/xorg/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 07faa8d3cc7..228c32a1fbb 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2476,6 +2476,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; + configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit libX11 xproto ;}; From 7098b0fcdfd7fa4b82c036d8116b60b78f497316 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 11 May 2018 19:13:10 +0200 Subject: [PATCH 02/86] nixos/switch-to-configuration: Never stop system.slice Problem: Restarting (stopping) system.slice would not only stop X11 but also most system units/services. We obviously don't want this happening to users when they switch from 18.03 to 18.09 or nixos-unstable. Reason: The following change in systemd: https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798 The commit adds system.slice to the perpetual units, which means removing the unit file and adding it to the source code. This is done so that system.slice can't be stopped anymore but in our case it ironically would cause this script to stop system.slice because the unit file was removed (and an older systemd version is still running). Related issue: https://github.com/NixOS/nixpkgs/issues/39791 --- .../activation/switch-to-configuration.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index 2ce04ed5342..ecd35767e01 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -166,6 +166,24 @@ while (my ($unit, $state) = each %{$activePrev}) { if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { + # Ignore (i.e. never stop) these units: + if ($unit eq "system.slice") { + # TODO: This can be removed a few months after 18.09 is out + # (i.e. after everyone switched away from 18.03). + # Problem: Restarting (stopping) system.slice would not only + # stop X11 but also most system units/services. We obviously + # don't want this happening to users when they switch from 18.03 + # to 18.09 or nixos-unstable. + # Reason: The following change in systemd: + # https://github.com/systemd/systemd/commit/d8e5a9338278d6602a0c552f01f298771a384798 + # The commit adds system.slice to the perpetual units, which + # means removing the unit file and adding it to the source code. + # This is done so that system.slice can't be stopped anymore but + # in our case it ironically would cause this script to stop + # system.slice because the unit was removed (and an older + # systemd version is still running). + next; + } my $unitInfo = parseUnit($prevUnitFile); $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes"); } From 182b7f63af2635dbdf168238bf89c630a2110637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 21 Jul 2018 21:45:48 +0900 Subject: [PATCH 03/86] matrix-synapse: 0.31.2 -> 0.33.0 --- pkgs/servers/matrix-synapse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 302aa8d5593..10c2ae8b10e 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -26,13 +26,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.31.2"; + version = "0.33.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "15nfdq5s0d4bv1in6vymhq70hpz48p0nlzx25wxpibbrix630h8q"; + sha256 = "1immk6k0wgiks1s39dhyjg79n6rgans9zy85r5wmkp4dlc3r5rx6"; }; patches = [ @@ -45,7 +45,7 @@ in pythonPackages.buildPythonApplication rec { signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client matrix-angular-sdk bleach netaddr jinja2 psycopg2 psutil msgpack-python lxml matrix-synapse-ldap3 - phonenumbers jsonschema affinity bcrypt + phonenumbers jsonschema affinity bcrypt sortedcontainers ]; # Checks fail because of Tox. @@ -59,6 +59,6 @@ in pythonPackages.buildPythonApplication rec { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = [ maintainers.ralith maintainers.roblabla ]; + maintainers = with maintainers; [ ralith roblabla ekleog ]; }; } From 2b1417a940098a72d373cf1a19c377712c895f6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Jul 2018 11:51:50 +0200 Subject: [PATCH 04/86] parity-ui: fix after merge --- pkgs/applications/altcoins/parity-ui/env.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix index 3f9b0939b62..625a008af91 100644 --- a/pkgs/applications/altcoins/parity-ui/env.nix +++ b/pkgs/applications/altcoins/parity-ui/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }: +, nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }: let packages = [ From 66d7126255b96a3d9c1cc0cdd7c2cd79d1789758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2018 21:50:19 +0200 Subject: [PATCH 05/86] Take me (viric) out of most maintenance Since years I'm not maintaining anything of the list below other than some updates when I needed them for some reason. Other people is doing that maintenance on my behalf so I better take me out but for very few packages. Finally! --- pkgs/applications/audio/mikmod/default.nix | 2 +- pkgs/applications/gis/qgis/default.nix | 2 +- pkgs/applications/graphics/giv/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/graphics/paraview/default.nix | 2 +- pkgs/applications/graphics/pinta/default.nix | 2 +- pkgs/applications/graphics/rawtherapee/default.nix | 2 +- pkgs/applications/graphics/sane/xsane.nix | 2 +- pkgs/applications/graphics/smartdeblur/default.nix | 2 +- pkgs/applications/misc/calibre/default.nix | 2 +- pkgs/applications/misc/dmenu/default.nix | 2 +- pkgs/applications/misc/eaglemode/default.nix | 2 +- pkgs/applications/misc/merkaartor/default.nix | 2 +- pkgs/applications/misc/mupdf/default.nix | 2 +- pkgs/applications/misc/navipowm/default.nix | 2 +- pkgs/applications/misc/navit/default.nix | 2 +- pkgs/applications/misc/ocropus/default.nix | 2 +- pkgs/applications/misc/st/default.nix | 2 +- pkgs/applications/misc/truecrypt/default.nix | 2 +- pkgs/applications/misc/xterm/default.nix | 2 +- pkgs/applications/networking/browsers/links2/default.nix | 2 +- .../applications/networking/instant-messengers/qtox/default.nix | 2 +- .../networking/instant-messengers/toxic/default.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/git.nix | 2 +- pkgs/applications/networking/p2p/qbittorrent/default.nix | 2 +- pkgs/applications/networking/pjsip/default.nix | 2 +- pkgs/applications/networking/znc/default.nix | 2 +- pkgs/applications/office/homebank/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/office/libreoffice/still.nix | 2 +- pkgs/applications/science/electronics/gtkwave/default.nix | 2 +- pkgs/applications/science/electronics/ngspice/default.nix | 2 +- pkgs/applications/video/avidemux/default.nix | 2 +- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/applications/virtualization/qemu/default.nix | 2 +- pkgs/applications/window-managers/tabbed/default.nix | 2 +- pkgs/applications/window-managers/vwm/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/compilers/gcc/5/default.nix | 2 +- pkgs/development/compilers/gcc/6/default.nix | 2 +- pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.7/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- pkgs/development/compilers/llvm/4/llvm.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 2 +- pkgs/development/compilers/llvm/6/llvm.nix | 2 +- pkgs/development/compilers/mono/generic-cmake.nix | 2 +- pkgs/development/compilers/mono/generic.nix | 2 +- pkgs/development/interpreters/octave/default.nix | 2 +- pkgs/development/libraries/filter-audio/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/libsodium/default.nix | 2 +- pkgs/development/libraries/libtoxcore/new-api.nix | 2 +- pkgs/development/libraries/openct/default.nix | 2 +- pkgs/development/libraries/opencv/3.x.nix | 2 +- pkgs/development/libraries/opencv/default.nix | 2 +- pkgs/development/libraries/ucommon/default.nix | 2 +- pkgs/development/libraries/vtk/default.nix | 2 +- pkgs/development/tools/cdecl/default.nix | 2 +- pkgs/development/tools/misc/cgdb/default.nix | 2 +- pkgs/development/tools/misc/openocd/default.nix | 2 +- pkgs/games/asc/default.nix | 2 +- pkgs/games/dxx-rebirth/default.nix | 2 +- pkgs/games/rigsofrods/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 2 +- pkgs/games/xmoto/default.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- pkgs/os-specific/linux/batman-adv/default.nix | 2 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/cryptsetup/default.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 2 +- pkgs/os-specific/linux/firmware/raspberrypi/tools.nix | 2 +- pkgs/os-specific/linux/v4l-utils/default.nix | 2 +- pkgs/servers/bird/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/mail/dovecot/default.nix | 2 +- pkgs/servers/sip/freeswitch/default.nix | 2 +- pkgs/servers/sip/sipwitch/default.nix | 2 +- pkgs/tools/backup/dar/default.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix | 2 +- pkgs/tools/graphics/jhead/default.nix | 2 +- pkgs/tools/misc/mktorrent/default.nix | 2 +- pkgs/tools/misc/pv/default.nix | 2 +- pkgs/tools/misc/remind/default.nix | 2 +- pkgs/tools/networking/aircrack-ng/default.nix | 2 +- pkgs/tools/networking/inadyn/default.nix | 2 +- pkgs/tools/networking/isync/default.nix | 2 +- pkgs/tools/networking/nuttcp/default.nix | 2 +- pkgs/tools/networking/nylon/default.nix | 2 +- pkgs/tools/security/ccid/default.nix | 2 +- pkgs/tools/security/opensc/default.nix | 2 +- pkgs/tools/security/pcsclite/default.nix | 2 +- pkgs/tools/security/pcsctools/default.nix | 2 +- pkgs/tools/text/dos2unix/default.nix | 2 +- pkgs/tools/text/kdiff3/default.nix | 2 +- pkgs/tools/typesetting/htmldoc/default.nix | 2 +- pkgs/tools/typesetting/pdftk/default.nix | 2 +- pkgs/tools/video/rtmpdump/default.nix | 2 +- 104 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 343ec8679fe..42fa8b7621a 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Tracker music player for the terminal"; homepage = http://mikmod.shlomifish.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c2ead5a1914..f9220e107f3 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation rec { homepage = http://www.qgis.org; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [viric mpickering]; + maintainers = with stdenv.lib.maintainers; [mpickering]; }; } diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index dea3fd4e3c6..fbc84521de0 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 8107ed8aa44..1c5b8d1b81d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = http://hugin.sourceforge.net/; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric hrdinka ]; + maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1d9956245a6..9839bb74077 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [viric guibert]; + maintainers = with stdenv.lib.maintainers; [guibert]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index a3151238438..14090376684 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -77,7 +77,7 @@ buildDotnetPackage rec { homepage = http://www.pinta-project.com/; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index eb97a2b9b3b..52cdc0bc067 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ca0f49e0c94..09b431fdb11 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric peti]; + maintainers = with stdenv.lib.maintainers; [peti]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 55c856c1912..377a5ae6168 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Y-Vladimir/SmartDeblur; description = "Tool for restoring blurry and defocused images"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0fa859ac84b..0a98f387ff8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { description = "Comprehensive e-book software"; homepage = https://calibre-ebook.com; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ viric domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; platforms = platforms.linux; inherit version; }; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 3b620fc0606..3ee2006ab0c 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; license = licenses.mit; - maintainers = with maintainers; [ viric pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index d83eb1ed86a..b08ce5baa5b 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://eaglemode.sourceforge.net; description = "Zoomable User Interface"; license = licenses.gpl3; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = true; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index d1befec3408..70a6efb90dd 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "OpenStreetMap editor"; homepage = http://merkaartor.be/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 1857c3118dd..bce2a79cde3 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ viric vrthra fpletz ]; + maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 447fc4570a7..9a40e3bc105 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://navipowm.sourceforge.net/; description = "Car navigation system"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 92269e03e58..362d28d2607 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.navit-project.org/; description = "Car navigation system with routing engine using OSM maps"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index 35931707ed6..40432c18aa3 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -53,7 +53,7 @@ pythonPackages.buildPythonApplication rec { description = "Open source document analysis and OCR system"; license = licenses.asl20; homepage = https://github.com/tmbdev/ocropy/; - maintainers = with maintainers; [ domenkozar viric ]; + maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 3562a4f9b16..e5cfa145bc2 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { homepage = https://st.suckless.org/; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; - maintainers = with maintainers; [viric andsild]; + maintainers = with maintainers; [andsild]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix index 48e0d19e20b..5bb614ac68b 100644 --- a/pkgs/applications/misc/truecrypt/default.nix +++ b/pkgs/applications/misc/truecrypt/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = http://www.truecrypt.org/; license = "TrueCrypt License Version 2.6"; - maintainers = with stdenv.lib.maintainers; [ viric ryantm ]; + maintainers = with stdenv.lib.maintainers; [ ryantm ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 8b15b030789..aa36ccd49e2 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://invisible-island.net/xterm; license = with stdenv.lib.licenses; [ mit ]; - maintainers = with stdenv.lib.maintainers; [viric vrthra]; + maintainers = with stdenv.lib.maintainers; [vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index bb8eb83d6bf..ff165f99ae9 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = with maintainers; [ raskin viric ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index f1d33b83fd0..fa481b7fe66 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -44,7 +44,7 @@ in mkDerivation rec { description = "Qt Tox client"; homepage = https://tox.chat; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; + maintainers = with maintainers; [ jgeerds akaWolf peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 8a45e988c07..646b41cfe75 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference CLI for Tox"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 13f7bce4921..8f1960b58cd 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -62,7 +62,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = https://mumble.info; license = licenses.bsd3; - maintainers = with maintainers; [ viric jgeerds wkennington ]; + maintainers = with maintainers; [ jgeerds wkennington ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index e15c3588c29..8e1777b0ce7 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index 9763c0ee97f..9428b276458 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a5d861093c9..a1f27572396 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = https://www.qbittorrent.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ Anton-Latukha viric ]; + maintainers = with maintainers; [ Anton-Latukha ]; }; } diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 2a4991b9318..f7f989dc3a9 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = http://pjsip.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric olynch]; + maintainers = with stdenv.lib.maintainers; [olynch]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 80b1e9caeaa..30fa41de12d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; homepage = https://wiki.znc.in/ZNC; - maintainers = with maintainers; [ viric schneefux lnl7 ]; + maintainers = with maintainers; [ schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 28b85936a28..94e0e46767a 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Free, easy, personal accounting for everyone"; homepage = http://homebank.free.fr/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric pSub ]; + maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7125343dee6..b2f06386003 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -278,7 +278,7 @@ in stdenv.mkDerivation rec { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = https://libreoffice.org/; license = licenses.lgpl3; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5958a5aa79e..eb99cac8e9e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -275,7 +275,7 @@ in stdenv.mkDerivation rec { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; homepage = https://libreoffice.org/; license = licenses.lgpl3; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index d4cf7f5ea90..78c981ded56 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "VCD/Waveform viewer for Unix and Win32"; homepage = http://gtkwave.sourceforge.net; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice viric ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index af2ee49daee..196374706e1 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = http://ngspice.sourceforge.net; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ bgamari viric rongcuid ]; + maintainers = with maintainers; [ bgamari rongcuid ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 0637e813b48..5fcab43c86b 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://fixounet.free.fr/avidemux/; description = "Free video editor designed for simple video editing tasks"; - maintainers = with maintainers; [ viric abbradar ma27 ]; + maintainers = with maintainers; [ abbradar ma27 ]; # "CPU not supported" errors on AArch64 platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index 3a595da96d0..a76608bdd90 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A script system that allows advanced non-linear editing"; homepage = https://github.com/avxsynth/avxsynth; license = licenses.gpl2Plus; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; broken = true; # 2018-04-10 }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 05d8c1edec2..742c2fb03f7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { homepage = http://www.qemu.org/; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric eelco ]; + maintainers = with maintainers; [ eelco ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 5e1098e9706..3bb79f6a77d 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = https://tools.suckless.org/tabbed; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 8ed144a32ea..3423b0e181d 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://vwm.sourceforge.net/; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 943391611de..101a6feeeae 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -443,7 +443,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index bf3b192e1bb..1df87cc3d42 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -462,7 +462,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 0564329967e..1215c971f23 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -461,7 +461,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 50d55aef234..0fb39075895 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -469,7 +469,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric peti ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; platforms = stdenv.lib.platforms.linux ++ diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 25bb0828414..accdfbf23b5 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -88,7 +88,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 7dc134b4fcf..388da007d33 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -97,7 +97,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "armv7l-linux"]; }; } diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index 98b6f4adbbf..e540469c627 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 8cfcb1af43d..d7324665240 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index c974eb6f6d3..dfeddf2fe65 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -169,7 +169,7 @@ in stdenv.mkDerivation rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 514c3a006e3..8cfeb02225a 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -158,7 +158,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 68eebc33c6b..3a6dea806f3 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -141,7 +141,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index a86f5b5039e..4d981398b9a 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index c8afd0dcc90..57d5fc0c83b 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; darwin ++ linux; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e39de76117a..06dcfb8b393 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = stdenv.lib.platforms.x86; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice obadz vrthra ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? } // meta; } diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ce3ce584434..f6bd96af40f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = if overridePlatforms == null then (with stdenv.lib.platforms; linux ++ darwin) else overridePlatforms; diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 3faba45714a..9dc0776f08a 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight audio filtering library made from webrtc code"; license = licenses.bsd3; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index 5790672d8e5..f524c940255 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://nongnu.org/libchop/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 0b341b38917..f2f8aed065f 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A modern and easy-to-use crypto library"; homepage = http://doc.libsodium.org/; license = licenses.isc; - maintainers = with maintainers; [ raskin viric wkennington ]; + maintainers = with maintainers; [ raskin wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index 785bc6f3c84..401d9c7d8a2 100644 --- a/pkgs/development/libraries/libtoxcore/new-api.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5eb08ecd601..bddb0e1479e 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/OpenSC/openct/; license = licenses.lgpl21; description = "Drivers for several smart card readers"; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 264c05e1af9..d2c2cec6221 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -277,7 +277,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; + maintainers = with stdenv.lib.maintainers; [mdaiter basvandijk]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d2d10682716..66a840fa2a9 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; license = licenses.bsd3; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 8665be26925..416cf53ab49 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index bdfe3d1c5c6..b85d76640cf 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 388f6b0db43..7981681a641 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Translator English -- C/C++ declarations"; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [viric joelteon]; + maintainers = with stdenv.lib.maintainers; [joelteon]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 32c888b7e62..31e720b13f2 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ vrthra ]; }; } diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 73c5b762318..cea86f090d6 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; homepage = http://openocd.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 6b7ead6d203..c8f5deef924 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index e48ac612b32..5334e4cbd12 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { description = "Source Port of the Descent 1 and 2 engines"; homepage = https://www.dxx-rebirth.com/; license = licenses.free; - maintainers = with maintainers; [ viric peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index e75698e7279..274a095de6f 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = http://rigsofrods.sourceforge.net/; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index 10ce55f4e21..4bf03fec9de 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "Car racing game - TORCS fork with more experimental approach"; homepage = http://speed-dreams.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index e43d01d2eca..a0fc6d5ca71 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Obstacled race game"; homepage = http://xmoto.tuxfamily.org; - maintainers = with maintainers; [ raskin viric pSub ]; + maintainers = with maintainers; [ raskin pSub ]; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3b95907a789..9ccda9178f1 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 79d3a0613dc..4a98b4f169d 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric fpletz ]; + maintainers = with stdenv.lib.maintainers; [ fpletz ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index bfd79cb42dc..9ac69662130 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = https://busybox.net/; license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index a09fa93cb78..fc13d97429c 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/cryptsetup/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 83ca21719fa..b29cf88f168 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/raspberrypi/firmware; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg viric tavyc ]; + maintainers = with maintainers; [ dezgeg tavyc ]; }; } diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 7f4c9dae166..91e6e7f4cc5 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/raspberrypi/userland; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg viric tavyc ]; + maintainers = with maintainers; [ dezgeg tavyc ]; }; } diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index fee9b0c09d5..3665606e99c 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = https://linuxtv.org/projects.php; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 94bd92abb4f..fc7acc35c19 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -28,7 +28,7 @@ let description = "BIRD Internet Routing Daemon"; homepage = http://bird.network.cz; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; }; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index ff99f7a7cbf..6a2efdcc360 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [viric peti]; + maintainers = with stdenv.lib.maintainers; [peti]; platforms = with stdenv.lib.platforms; unix; outputsToInstall = [ "out" "dnsutils" "host" ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5a9d8e61b1f..acd08f658e6 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://dovecot.org/; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ viric peti rickynils fpletz ]; + maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 0e31cd8fe08..32acba433b1 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 0ba5a3ee5ad..9a6f2b0b5e1 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; homepage = http://www.gnu.org/software/sipwitch/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ viric ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 99c0bd4a34c..e0b4d1fee12 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index d4b6b9a72eb..ee14f2d6781 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -37,7 +37,7 @@ python2Packages.buildPythonApplication rec { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = http://www.nongnu.org/duplicity; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric peti ]; + maintainers = with maintainers; [ peti ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index b0c33212edb..9fe4f90f258 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/cryptsetup/; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 2fb1c9325c0..7bdb3444a4c 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://www.sentex.net/~mwandel/jhead/; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; - maintainers = with maintainers; [ viric rycee ]; + maintainers = with maintainers; [ rycee ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 6f56267ebf7..da1e8be7cf4 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://mktorrent.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with stdenv.lib.maintainers; [viric Profpatsch]; + maintainers = with stdenv.lib.maintainers; [Profpatsch]; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index f453199835f..8c965da451d 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://www.ivarch.com/programs/pv; description = "Tool for monitoring the progress of data through a pipeline"; license = stdenv.lib.licenses.artistic2; - maintainers = with stdenv.lib.maintainers; [ viric jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ jgeerds ]; platforms = with stdenv.lib.platforms; all; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 8dcc9ef81ff..d9933e0018f 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; + maintainers = with stdenv.lib.maintainers; [raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 6d99a5c2d1a..ab8d257d7c7 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar viric garbas chaoflow ]; + maintainers = with maintainers; [ domenkozar garbas chaoflow ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 2bd76188a63..6178181193c 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://troglobit.com/project/inadyn/; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 7dcfc6b512f..581a45eaebb 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny viric ]; + maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 23cce602875..34a34ef903d 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; homepage = http://nuttcp.net/; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index bc026d6835b..5c8f98101ee 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { homepage = http://monkey.org/~marius/nylon; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ edwtjo viric ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 9eb5858b057..903794622fb 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "ccid drivers for pcsclite"; homepage = http://pcsclite.alioth.debian.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 7624e6cfa39..70a1beb8ce7 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Set of libraries and utilities to access smart cards"; homepage = https://github.com/OpenSC/OpenSC/wiki; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 84072fd2840..495b6ee48ea 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = https://pcsclite.apdu.fr/; license = licenses.bsd3; - maintainers = with maintainers; [ viric wkennington ]; + maintainers = with maintainers; [ wkennington ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index d9e68c77d25..5b67a6d89ce 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { description = "Tools used to test a PC/SC driver, card or reader"; homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 59697891b6a..2db82c36a72 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://waterlan.home.xs4all.nl/dos2unix.html; description = "Tools to transform text files from dos to unix formats and vicervesa"; license = licenses.bsd2; - maintainers = with maintainers; [viric ndowens ]; + maintainers = with maintainers; [ndowens ]; }; } diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 38362333cad..514085bee64 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { homepage = http://kdiff3.sourceforge.net/; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index b9d5407c68d..d6c4fedc143 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Converts HTML files to PostScript and PDF"; homepage = https://michaelrsweet.github.io/htmldoc; license = licenses.gpl2; - maintainers = with maintainers; [ viric shanemikel ]; + maintainers = with maintainers; [ shanemikel ]; platforms = with platforms; linux ++ darwin; longDescription = '' diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 71cc1738837..72f25ef099b 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "Simple tool for doing everyday things with PDF documents"; homepage = https://www.pdflabs.com/tools/pdftk-server/; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 4eec47e9e75..8be02873037 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = http://rtmpdump.mplayerhq.hu/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel viric ]; + maintainers = with maintainers; [ codyopel ]; }; } From 36701d4af71bea5d042128effa4f665d28ee403a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Jul 2018 21:33:16 +0200 Subject: [PATCH 06/86] Openssl in coreutils makes *sum programs much faster. sha256sum, md5sum, etc. --- pkgs/tools/misc/coreutils/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 589c58d0acc..d904cbcd449 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, buildPackages , autoreconfHook, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, openssl ? null , hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null @@ -37,8 +38,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = - optional (singleBinary != false) + configureFlags = optional (openssl != null) "--with-openssl" + ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" @@ -49,7 +50,7 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gmp ] + buildInputs = [ gmp openssl ] ++ optional aclSupport acl ++ optional attrSupport attr ++ optionals hostPlatform.isCygwin [ autoreconfHook texinfo ] # due to patch @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. - enableParallelBuilding = false; + enableParallelBuilding = true; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; From 04e21a073b5c5db2e1748a62e412b3dc01c6de1b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 23 Jul 2018 10:00:29 +0200 Subject: [PATCH 07/86] python.pkgs.pytest-flake8: disable test, fix build --- pkgs/development/python-modules/pytest-flake8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index 101594750fd..1d7447293df 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkPhase = '' - pytest . + pytest . -k "not test_mtime_caching" ''; meta = { From 13904b44e36853f401826009f61231bd619b6c3d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Jul 2018 19:18:06 -0500 Subject: [PATCH 08/86] Revert "meson: 0.46.1 -> 0.47.0" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d. (cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d) Signed-off-by: Domen Kožar --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 2ccd6637d08..3cb906d50ed 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,12 +2,12 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.47.0"; + version = "0.46.1"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6"; + sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; }; postFixup = '' From 911b7b20c0f40547aff59b3fdedf408539d4303a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 25 Jul 2018 23:48:29 +0200 Subject: [PATCH 09/86] elixir: init 1.7.0 --- pkgs/development/beam-modules/default.nix | 29 +++++++++++-------- pkgs/development/interpreters/elixir/1.7.nix | 7 +++++ .../interpreters/elixir/generic-builder.nix | 2 +- pkgs/top-level/beam-packages.nix | 2 +- 4 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/interpreters/elixir/1.7.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f10c8ec86ff..26bed216acf 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -44,25 +44,30 @@ let # BEAM-based languages. elixir = elixir_1_6; + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + inherit rebar erlang; + debugInfo = true; + }; + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { - inherit rebar erlang; - debugInfo = true; - }; + inherit rebar erlang; + debugInfo = true; + }; lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix new file mode 100644 index 00000000000..426e5a4cbba --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.7.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.7.0"; + sha256 = "082924fngc6ypbkn1ghdwf199radk00daf4q09mm04h81jy4nmxm"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 78598ce3d81..7d3c6476131 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -37,7 +37,7 @@ in preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -v rebar + rm -vf rebar ln -s ${rebar}/bin/rebar rebar substituteInPlace Makefile \ diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3440bfafb11..da5fed4be4b 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -61,7 +61,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; + inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3; inherit (packages.erlang) lfe lfe_1_2; }; From 4301f221972a7146619a59f04ccf8a990ef6b7bb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Jul 2018 00:16:21 +0200 Subject: [PATCH 10/86] vim-plugins: automatic updates --- pkgs/misc/vim-plugins/default.nix | 156 +++++++++++++++--------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 8a9580d99e1..34699940f0c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -455,11 +455,11 @@ let }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-19"; + name = "deoplete-nvim-2018-07-22"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "0f1921799644cd662cb0a3393ba71096e5e56115"; - sha256 = "0xbi6zac45fr8ipz1vqafl6ljh7bpdhbz7dfdyv8z04aqvn621s2"; + rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; + sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; }; dependencies = []; @@ -609,11 +609,11 @@ let }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2018-04-15"; + name = "clighter8-2018-07-25"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "6d325abd043fd1bc31bea821f751996541bfc944"; - sha256 = "1kmk6q1hca97052dif1m3ygcr9zrnc3i2lrvkzlmsqb159mgfsgq"; + rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; + sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; }; dependencies = []; preFixup = '' @@ -623,11 +623,11 @@ let }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2018-07-16"; + name = "neomake-2018-07-23"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "f26a31a315f60150fd42682df911306b4d795dd8"; - sha256 = "1rxlzypzwlr6j84llg30d122142la621nai1f7735i58kvmzk51w"; + rev = "b24cac5f6aa1d8f8e8bcfae52ed255f277f4f163"; + sha256 = "00hmbip0r3l0h6fk0bxs9rqbfj0vn246804s2s7shdjsvn6a3pa0"; }; dependencies = []; @@ -876,11 +876,11 @@ let }; vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-2018-07-07"; + name = "vim-2018-07-23"; src = fetchgit { url = "https://github.com/dracula/vim"; - rev = "a88e82a94f0ff41e84e51fe501635f0f64d1bb33"; - sha256 = "1ld7vbh6dxrf3wqbya9pvvzwp7qgv2pdj74g5w7yjn1bdi597vnm"; + rev = "d329d61c1752807059aef388c4e9629296760a35"; + sha256 = "06f5jg194w1fzh4bfj7cbibn94a1zx987f8iiaylkqzj3h0fn3fm"; }; dependencies = []; @@ -920,11 +920,11 @@ let }; editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "editorconfig-vim-2017-10-14"; + name = "editorconfig-vim-2018-07-25"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-vim"; - rev = "0abb0634a8bf3c760a283e9e7475594b83869a46"; - sha256 = "1wazl37ivn9nhsy296g1ncvvwc78930lbp8arhwavr52mzpfji21"; + rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; + sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; }; dependencies = []; @@ -986,11 +986,11 @@ let }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2018-04-05"; + name = "vim-localvimrc-2018-07-23"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "736f9712dd2eb8a7a3ae15d61611db9b5a66c648"; - sha256 = "09r8hvvm8fdr5rlrgfwnhjkk967dfmis8vgi3d45c9svhsybhkja"; + rev = "a3cb22a68625e022df1da402361801cc817bcec5"; + sha256 = "0n3fl4wh5bhppxwkpd69jmnck2js08dgzfxcpfqrvx22zr22m8kc"; }; dependencies = []; @@ -1041,11 +1041,11 @@ let }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2018-07-18"; + name = "vim-go-2018-07-22"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "2c909e71e184de6ea23e3f8adc7d199856c2806b"; - sha256 = "0v42yrgnd3hi8s2i9ij7ldgyvs75jkikw1kpqblysdim9cfbbqfk"; + rev = "5e26ce6bfa9400f645aaa5898f802f46275b9585"; + sha256 = "1m380n3sdsqydn5dbjj1cafslbr1426ihz1a7rxr980z5jd43hj1"; }; dependencies = []; @@ -1349,11 +1349,11 @@ let }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2017-11-17"; + name = "vim-orgmode-2018-07-25"; src = fetchgit { url = "https://github.com/jceb/vim-orgmode"; - rev = "ce17a40108a7d5051a3909bd7c5c94b0b5660637"; - sha256 = "0ni99a5zylb0sbmik2xydia87qlv1xcl18j92nwxg8d6wxsnywb9"; + rev = "35e94218c12a0c063b4b3a9b48e7867578e1e13c"; + sha256 = "0j6zfqqysnky4z54413l87q7wxbskg0zb221zbz48ry4l1anilhx"; }; dependencies = []; @@ -1371,11 +1371,11 @@ let }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2016-06-14"; + name = "tslime-vim-2018-07-23"; src = fetchgit { url = "https://github.com/jgdavey/tslime.vim"; - rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2"; - sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1"; + rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; + sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; }; dependencies = []; @@ -1448,11 +1448,11 @@ let }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2018-07-11"; + name = "fzf-vim-2018-07-22"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "8d56bdd6ade7899f0b0a10cfc219804b4ccbc109"; - sha256 = "0m3p2gp42hshxb7hrgw63fp155a5l1x9fjr2k21dv22xqlaqy9hj"; + rev = "6ce58caad320be3cf9ff5d275191f88524edf326"; + sha256 = "02s6ky1mnb18iy91p6syy3qnp55zwg2d52ybm6cic2gwvj1az1sf"; }; dependencies = []; @@ -1580,11 +1580,11 @@ let }; swift-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "swift-vim-2018-04-20"; + name = "swift-vim-2018-07-21"; src = fetchgit { url = "https://github.com/keith/swift.vim"; - rev = "404df978f9830d9cf0a1f5002cb02f594e3e8996"; - sha256 = "03xhzljzcfm0678d6i8j5493pi5knav1hx0jldgn3hish892pfr3"; + rev = "40d53b215fd455e4b7fd413eaf14d1a028a504ab"; + sha256 = "1lbxi0n5x5xnskfylbcpazch00lxbfhnc2h70x196yc4fhwz9153"; }; dependencies = []; @@ -1679,11 +1679,11 @@ let }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2018-07-13"; + name = "vimtex-2018-07-25"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "e3dabe0a369dac556508ac5d1132979d654bc753"; - sha256 = "10wkfh106xc89bk72n0xc2xa7iva74p4pj0n9wfd3dbspagrf9j2"; + rev = "5c5cd72b680bca8c3b5b45ee790f3f6f5890e77c"; + sha256 = "1pahrkf536ay56jdiqdda1bq0q5d788bvf099r0wvxwgqk77hr6n"; }; dependencies = []; @@ -1870,22 +1870,22 @@ let }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2018-07-08"; + name = "vim-signify-2018-07-25"; src = fetchgit { url = "https://github.com/mhinz/vim-signify"; - rev = "9303070b022c4a642a8d35361e3680622c525144"; - sha256 = "0was67gn22dn361jg1qc4iscdkm0cg65dprfyd7r6ifhi6v01jmz"; + rev = "a9fc705b9bdffaac46f13e47d6565c904102dedc"; + sha256 = "0hk24anfhh1v62zn03cbqrf8c260q6g5cka8dpq8c5943v6kln59"; }; dependencies = []; }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2018-07-03"; + name = "vim-startify-2018-07-21"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "7bbc46e1c2eb9e2e6e4e5a34a634b40d85eb1bde"; - sha256 = "1q5gxyd85xfhl4i8gzw23dq36bg14lld5i91vnz8xys25idzjs1s"; + rev = "8cde338d1f35057fd64146090c960a55b953dcd9"; + sha256 = "01aali5s946589cxy8k5qb0qzhxwlgwv4grri3x60h2520fc1z29"; }; dependencies = []; @@ -2094,11 +2094,11 @@ let }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2018-06-13"; + name = "python-mode-2018-07-23"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "bb746d0d0cba9adedbac856429e37a0dbfc599c6"; - sha256 = "1zlzlfz4arb2gi9ba5mdkpfkirhyk21g18cwx1f150b14baq734f"; + rev = "d241974f40e8d206f9970e51fb0069951862ba35"; + sha256 = "1cjhlbk71785zy0g0lf2bmsdsnvqwx03v8lxq7i7j2qazalszxci"; }; dependencies = []; @@ -2334,11 +2334,11 @@ let }; denite-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "denite-nvim-2018-07-19"; + name = "denite-nvim-2018-07-22"; src = fetchgit { url = "https://github.com/shougo/denite.nvim"; - rev = "0cab5543d755be4a6c9d331672b07235f8473f1f"; - sha256 = "1r9a29fjmab7r10f5c39xdmbpq14jc6lwyj7d63b5p2dnlva2wr0"; + rev = "93d8eb0bf21eb6db3f6a0bf6a84a98bd578176c8"; + sha256 = "0bhvg9rynqr2nkj7h2h8ws6mm1s7wmgif8avwbirq4pxby5j5f8r"; }; dependencies = []; @@ -2672,11 +2672,11 @@ let }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2018-07-18"; + name = "vim-dispatch-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "43760f9d8469d59fd629a97e19dce4491192cca6"; - sha256 = "16kziq3y4v0nksilrblryf2vham87w9c3y133xm6zznyjsjp2x90"; + rev = "dbb9320d000caa56dfada5f99fe0b5209ef0590b"; + sha256 = "1yqc8fwyf66jckvjf8z8h62399kzgfdzcbnnd9ax8q3wjyk3lfsh"; }; dependencies = []; @@ -2694,11 +2694,11 @@ let }; vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-fugitive-2018-07-18"; + name = "vim-fugitive-2018-07-25"; src = fetchgit { url = "https://github.com/tpope/vim-fugitive"; - rev = "9b9a81b170040ab0061ebd5beec1f5e2e1177056"; - sha256 = "189w34rjh67j1hs77284xaxq8xlhc0zrk4nnk3qnprwg5qfr4plz"; + rev = "6bab1a0c398a9a6aaef607a5361709393eba79ac"; + sha256 = "1rsiha7a0k7ib455dvxrl46zl7x386i70rhwnbmy8lk6wa32mz7v"; }; dependencies = []; @@ -2727,11 +2727,11 @@ let }; vim-rhubarb = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-rhubarb-2018-07-19"; + name = "vim-rhubarb-2018-07-21"; src = fetchgit { url = "https://github.com/tpope/vim-rhubarb"; - rev = "186bf27e05ab8713193b1d1210cd3c79f392445a"; - sha256 = "127gv59dkw1z7lpspxk7by2pf1mqqb6jxc58g359m76lfqpkcvvv"; + rev = "848841083d5d4550b5ebbd3bd67dfb3e5146b64a"; + sha256 = "19b36lbsry994y78lnnnjl83q2laz7j6xvk6h6xbl8kj10v6m4l9"; }; dependencies = []; @@ -2771,11 +2771,11 @@ let }; vim-surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-surround-2018-06-15"; + name = "vim-surround-2018-07-23"; src = fetchgit { url = "https://github.com/tpope/vim-surround"; - rev = "aa1f120ad3a29c27cc41d581cda3751c59343cce"; - sha256 = "1vblmvmbl9k2fzm0fjlbvvbb5izyljaxg187s29cp6p4xm0frcql"; + rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; + sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; }; dependencies = []; @@ -2848,11 +2848,11 @@ let }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2018-07-24"; + name = "youcompleteme-2018-07-25"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "459b3e620e45191b15c48c66b02ff89f1a0674db"; - sha256 = "0s4sndx0mm13xcb559agfcqqdwhp2sr7kpp4ksc9gx41k7626rdr"; + rev = "15362d9cb8ec054c929e9a202252825eabe47e58"; + sha256 = "0nk3wqlz15pvm6hbla8shd3sskbdmwd1x9cq85la223h6s138hwy"; }; dependencies = []; buildPhase = '' @@ -2874,11 +2874,11 @@ let }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2018-07-13"; + name = "vim-airline-2018-07-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline"; - rev = "4cc255a3849c15484f7da5b5039d73f1a567a7e2"; - sha256 = "124pl87zwfg4fnb3il5jy5dz03bq5vzyk10z60dvkfw4cr57hlfw"; + rev = "59f3669a42728406da6d1b948608cae120d1453f"; + sha256 = "12rgvaqfqh0mfv85qdqpr5zn3q3v6npbk11al62fzpa9s55q0025"; }; dependencies = []; @@ -2896,11 +2896,11 @@ let }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2018-01-11"; + name = "vim-pandoc-2018-07-23"; src = fetchgit { url = "https://github.com/vim-pandoc/vim-pandoc"; - rev = "3a686781ab5ea622616798475deb394e48d3cc48"; - sha256 = "1nvz8v52jydkvnlid5w8dkjmr548ryla2vaxnlgj125aamkvmgn3"; + rev = "0060e5c6ac9e4a2391e8a36359dcbbb5827978cb"; + sha256 = "0y0ppy1imy4kjkyflxwh5hfp6vcs93xia6myyd5sc6l3gbcg1lrk"; }; dependencies = []; @@ -3127,33 +3127,33 @@ let }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2018-06-12"; + name = "vimwiki-2018-07-21"; src = fetchgit { url = "https://github.com/vimwiki/vimwiki"; - rev = "9f8b0082dbd99e706cc18de2076f7a66c2ca0a90"; - sha256 = "0q9ik2shvg9lcavds2y7ffsj34zl5ichprm2sylz2bfhjcqgsslw"; + rev = "9f797f6ad9fd2a5e943bc99b5f9cd44b2cbd0fb4"; + sha256 = "0snqxbfpc9jy9zy3n0g2xc01kgxznnnd0g00v2nb17vs3m1b7arc"; }; dependencies = []; }; dhall-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dhall-vim-2018-07-15"; + name = "dhall-vim-2018-07-23"; src = fetchgit { url = "https://github.com/vmchale/dhall-vim"; - rev = "a17c1ebb1487f2a69dd5230e9d4b8a247b50e2ae"; - sha256 = "1xrlzvi626bhxh8rs0gz4hjkx7qc0f6bb0vl6ainnkjqafb310qw"; + rev = "5bdddb86e660f172841109a28e2a98efb76448ce"; + sha256 = "0rkzgn5ny84624q7phc8wdm4nvkq2ypkq5lkbmahhm26cxvlkqlq"; }; dependencies = []; }; ale = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ale-2018-07-17"; + name = "ale-2018-07-25"; src = fetchgit { url = "https://github.com/w0rp/ale"; - rev = "5453e0e1a43302226da1d1d753e162af0231f9d3"; - sha256 = "0zcgfjssvfcc30ksgp42khc9s91gxymkz3dzdhnvwkm0vx90mjlp"; + rev = "79ffdde267323a206a96227904549c370f27decf"; + sha256 = "02np0jnz50qs3fl6n0wh1xfzgq8lbfgagf2mw8cbj8a4gmzx67fg"; }; dependencies = []; From 9ac035b5a6664d3b20522267ebd2a3d593dbc7df Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 26 Jul 2018 00:37:14 +0200 Subject: [PATCH 11/86] vim-plugins: add extra plugins - isort - splice - a bunch of tpope's missing plugins --- pkgs/misc/vim-plugins/default.nix | 115 ++++++++++++++++-- pkgs/misc/vim-plugins/vim-plugin-names | 10 +- .../vim2nix/additional-nix-code/vim-isort | 4 + 3 files changed, 116 insertions(+), 13 deletions(-) create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 34699940f0c..b3dfed3d265 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -32,7 +32,7 @@ let # Documentation & usage see vim-utils.nix. # attribute names should be the same as used by vim-pi to make dependency # resolution work - self = rec { +self = rec { # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations # which recreates this the following derivations based on ./vim-plugin-names pluginnames2nix = vimUtils.pluginnames2Nix { @@ -454,17 +454,6 @@ let }; - deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2018-07-22"; - src = fetchgit { - url = "https://github.com/Shougo/deoplete.nvim"; - rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; - sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; - }; - dependencies = []; - - }; - ultisnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ultisnips-2018-04-30"; src = fetchgit { @@ -1051,6 +1040,20 @@ let }; + vim-isort = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-isort-2017-03-12"; + src = fetchgit { + url = "https://github.com/fisadev/vim-isort"; + rev = "65bd9fecd5412c8c127de86f8dcf6cfe4dd70fda"; + sha256 = "0d9r2p557czrqhn3z35jsrzp3iw6n0vjhxcgkk6l0y79ni3dar1m"; + }; + dependencies = []; + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; + }; + vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-colorschemes-2017-08-22"; src = fetchgit { @@ -2344,6 +2347,17 @@ let }; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2018-07-22"; + src = fetchgit { + url = "https://github.com/shougo/deoplete.nvim"; + rev = "59fbd61d492b0a1728f34b8958d8e4dbce165c73"; + sha256 = "06x46dhyy9bix0svl2c0jxxk7rs8ahzl18yq6hmfb1j45jlv5qiz"; + }; + dependencies = []; + + }; + echodoc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "echodoc-vim-2018-03-26"; src = fetchgit { @@ -2484,6 +2498,17 @@ let ''; }; + fugitive-gitlab-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fugitive-gitlab-vim-2018-07-04"; + src = fetchgit { + url = "https://github.com/shumphrey/fugitive-gitlab.vim"; + rev = "b8e7b6986c5d13f3e2de2163816af06f74a6f838"; + sha256 = "1lvll9hjqsm79f0ls84d8b8s12043b9p5qa4i6iwf3v1qbq7kb8d"; + }; + dependencies = []; + + }; + gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "gundo-vim-2017-05-09"; src = fetchgit { @@ -2495,6 +2520,17 @@ let }; + splice-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "splice-vim-2017-09-03"; + src = fetchgit { + url = "https://github.com/sjl/splice.vim"; + rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; + sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + }; + dependencies = []; + + }; + last256 = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "last256-2017-06-11"; src = fetchgit { @@ -2660,6 +2696,17 @@ let }; + vim-abolish = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-abolish-2017-03-10"; + src = fetchgit { + url = "https://github.com/tpope/vim-abolish"; + rev = "b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd"; + sha256 = "0i9q3l7r5p8mk4in3c1j4x0jbln7ir9lg1cqjxci0chjjzfzc53m"; + }; + dependencies = []; + + }; + vim-commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-commentary-2018-07-11"; src = fetchgit { @@ -2693,6 +2740,17 @@ let }; + vim-flagship = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-flagship-2018-07-24"; + src = fetchgit { + url = "https://github.com/tpope/vim-flagship"; + rev = "5e70829913900eb3a37dd6c055ac660c33fa6bff"; + sha256 = "1v2kaisydi1vjfy66bwq2whllbickr3ppp9wqxjqv2qhfsnqny8f"; + }; + dependencies = []; + + }; + vim-fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-fugitive-2018-07-25"; src = fetchgit { @@ -2715,6 +2773,17 @@ let }; + vim-projectionist = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-projectionist-2018-07-24"; + src = fetchgit { + url = "https://github.com/tpope/vim-projectionist"; + rev = "873e492b4bb92834beb186028fbf6d4e5edfca5a"; + sha256 = "0np7vm97y5ga8gz6qma15awcmgxi41hljp50bgy49sz62z8h0psz"; + }; + dependencies = []; + + }; + vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-repeat-2018-07-02"; src = fetchgit { @@ -2737,6 +2806,17 @@ let }; + vim-scriptease = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scriptease-2018-07-18"; + src = fetchgit { + url = "https://github.com/tpope/vim-scriptease"; + rev = "baea08bb5fff63cd2adf6e46429cad1f75bc7300"; + sha256 = "01xfnda5paywfsb6ziq00zcgia7ls0v2924i1mcnvnqg4md890x4"; + }; + dependencies = []; + + }; + vim-sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-sensible-2018-07-16"; src = fetchgit { @@ -2781,6 +2861,17 @@ let }; + vim-tbone = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-tbone-2018-06-27"; + src = fetchgit { + url = "https://github.com/tpope/vim-tbone"; + rev = "8bc7348f658c32bea57365aa6acf3a7dde12e737"; + sha256 = "17s2b66xxkvv17pzf3xrw6ba7y9awpd2k2d21v0pag924c5hi6d4"; + }; + dependencies = []; + + }; + vim-vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-vinegar-2018-06-20"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9e7f70925a2..4d0e85e153c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -52,6 +52,7 @@ "github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:FelikZ/ctrlp-py-matcher" +"github:fisadev/vim-isort" "github:flazz/vim-colorschemes" "github:floobits/floobits-neovim" "github:frigoeu/psc-ide-vim" @@ -194,7 +195,7 @@ "github:sheerun/vim-polyglot" "github:shougo/context_filetype.vim" "github:shougo/denite.nvim" -"github:Shougo/deoplete.nvim" +"github:shougo/deoplete.nvim" "github:shougo/echodoc.vim" "github:shougo/neco-syntax" "github:shougo/neco-vim" @@ -207,8 +208,10 @@ "github:shougo/tabpagebuffer.vim" "github:shougo/unite.vim" "github:shougo/vimproc.vim" +"github:shumphrey/fugitive-gitlab.vim" "github:SirVer/ultisnips" "github:sjl/gundo.vim" +"github:sjl/splice.vim" "github:sk1418/last256" "github:slashmili/alchemist.vim" "github:t9md/vim-smalls" @@ -224,17 +227,22 @@ "github:tomasr/molokai" "github:tomlion/vim-solidity" "github:tomtom/tlib_vim" +"github:tpope/vim-abolish" "github:tpope/vim-commentary" "github:tpope/vim-dispatch" "github:tpope/vim-eunuch" +"github:tpope/vim-flagship" "github:tpope/vim-fugitive" "github:tpope/vim-pathogen" +"github:tpope/vim-projectionist" "github:tpope/vim-repeat" "github:tpope/vim-rhubarb" +"github:tpope/vim-scriptease" "github:tpope/vim-sensible" "github:tpope/vim-sleuth" "github:tpope/vim-speeddating" "github:tpope/vim-surround" +"github:tpope/vim-tbone" "github:tpope/vim-vinegar" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort new file mode 100644 index 00000000000..febd2185bac --- /dev/null +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-isort @@ -0,0 +1,4 @@ + postPatch = '' + substituteInPlace ftplugin/python_vimisort.vim \ + --replace 'import vim' 'import vim; import sys; sys.path.append("${pythonPackages.isort}/${python.sitePackages}")' + ''; From 67ef19791914471dc422b18a0c83e57ebb848783 Mon Sep 17 00:00:00 2001 From: Vladyslav Mykhailichenko Date: Thu, 26 Jul 2018 12:38:50 +0300 Subject: [PATCH 12/86] iwd: 0.3 -> 0.4 --- pkgs/os-specific/linux/iwd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index de9787a0fa7..833609f9fc2 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -3,17 +3,17 @@ let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.6"; - sha256 = "0cs0a7rjg9gl9gn9sc3b1y8mv2zbjg7rb87mla6kcrknjci76pgm"; + rev = "0.7"; + sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.3"; + version = "0.4"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "151bqc85vchl1arhl9pyvfashxq886cjrbi6js4csx4vzscbhzzm"; + sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; }; nativeBuildInputs = [ From 1d0caa7b035875cee70bf8072b46b19e4965c65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 26 Jul 2018 18:31:18 +0200 Subject: [PATCH 13/86] release/metrics: drop requiredSystemFeatures Lack of a "benchmark" machine on Hydra prevents it from building, and that blocks channels. --- pkgs/top-level/metrics.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 77f620da724..f4e778aed12 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -4,7 +4,7 @@ with pkgs; runCommand "nixpkgs-metrics" { buildInputs = [ nix time ]; - requiredSystemFeatures = [ "benchmark" ]; + # requiredSystemFeatures = [ "benchmark" ]; # TODO: a 1-job machine for this on Hydra? } '' export NIX_DB_DIR=$TMPDIR From 330c501be009f18888e9ce92c54ea18ce950968a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 26 Jul 2018 16:46:33 +0200 Subject: [PATCH 14/86] pari: 2.9.5 -> 2.11.0 The pari update makes it necessary to disable a giac test that only fails because it directly tests the pari interface. --- pkgs/applications/science/math/giac/default.nix | 10 +++++++++- pkgs/applications/science/math/pari/default.nix | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index d32beeef4f4..6a0b686602f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,7 +9,7 @@ assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; attr = if enableGUI then "giac-with-xcas" else "giac"; - version = "1.4.9-59"; + version = "1.4.9-59"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; @@ -50,6 +50,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; doCheck = true; + preCheck = '' + # One test in this file fails. That test just tests a part of the pari + # interface that isn't actually used in giac. Of course it would be better + # to only remove that one test, but that would require a patch. + # Removing the whole test set should be good enough for now. + # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326 + echo > check/chk_fhan11 + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a811c9da8c2..9fe1d9df46d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { name = "pari-${version}"; - version = "2.9.5"; + version = "2.11.0"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb"; + sha256 = "18f9yj8ffn3dxignbxj1x36771zbxy4js0r18mv6831ymb6cld9q"; }; buildInputs = [ @@ -67,8 +67,8 @@ stdenv.mkDerivation rec { run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = "http://pari.math.u-bordeaux.fr/"; - downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + homepage = http://pari.math.u-bordeaux.fr; + downloadPage = http://pari.math.u-bordeaux.fr/download.html; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin; From 4f5837668bd02ff2df7865b50c1f679a25d51a53 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 26 Jul 2018 15:34:39 -0500 Subject: [PATCH 15/86] hindent: build Emacs package with latest Melpa recipe The hindent Emacs package is built with the latest Melpa recipe, but the same source version as in haskellPackages. --- .../editors/emacs-modes/melpa-packages.nix | 8 ++++++++ .../emacs-modes/melpa-stable-packages.nix | 8 ++++++++ pkgs/top-level/emacs-packages.nix | 17 ----------------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 2e474ed3410..56b17a865df 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -94,6 +94,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index c0febd803cc..f3b77c708a7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -108,6 +108,14 @@ self: # Expects bash to be at /bin/bash helm-rtags = markBroken super.helm-rtags; + # Build same version as Haskell package + hindent = super.hindent.overrideAttrs (attrs: { + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ self.haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + }); + # upstream issue: missing file header ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 5d042c3385e..ba82bd217fd 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -298,23 +298,6 @@ let helm-words = callPackage ../applications/editors/emacs-modes/helm-words { }; - hindent = melpaBuild rec { - pname = "hindent"; - version = external.hindent.version; - src = external.hindent.src; - packageRequires = [ haskell-mode ]; - propagatedUserEnvPkgs = [ external.hindent ]; - recipe = writeText "recipe" '' - (hindent - :repo "commercialhaskell/hindent" :fetcher github - :files ("elisp/*.el")) - ''; - meta = { - description = "Indent haskell code using the \"hindent\" program"; - license = bsd3; - }; - }; - icicles = callPackage ../applications/editors/emacs-modes/icicles { }; redshank = callPackage ../applications/editors/emacs-modes/redshank { }; From 6d2ab189159e9438be83da4ee251e4e620f6730e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 22 Jul 2018 20:49:28 +0200 Subject: [PATCH 16/86] sieve-connect: Init at 0.89 --- .../networking/sieve-connect/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/networking/sieve-connect/default.nix diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix new file mode 100644 index 00000000000..78910d1ecf6 --- /dev/null +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { + name = "sieve-connect-${version}"; + version = "0.89"; + + src = fetchFromGitHub { + owner = "philpennock"; + repo = "sieve-connect"; + rev = "v${version}"; + sha256 = "0g7cv29wd5673inl4c87xb802k86bj6gcwh131xrbbg0a0g1c8fp"; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ makeWrapper ]; + + preBuild = '' + # Fixes failing build when not building in git repo + mkdir .git + touch .git/HEAD + echo "${version}" > versionfile + echo "$(date +%Y-%m-%d)" > datefile + ''; + + buildFlags = [ "PERL5LIB=${stdenv.lib.makePerlPath [ perlPackages.FileSlurp ]}" "bin" "man" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/man/man1 + install -m 755 sieve-connect $out/bin + gzip -c sieve-connect.1 > $out/share/man/man1/sieve-connect.1.gz + + wrapProgram $out/bin/sieve-connect \ + --prefix PERL5LIB : "${stdenv.lib.makePerlPath (with perlPackages; [ + AuthenSASL Socket6 IOSocketInet6 IOSocketSSL NetSSLeay NetDNS PodUsage + TermReadKey TermReadLineGnu ])}" + ''; + + meta = with stdenv.lib; { + description = "A client for the MANAGESIEVE Protocol"; + longDescription = '' + This is sieve-connect. A client for the ManageSieve protocol, + as specifed in RFC 5804. Historically, this was MANAGESIEVE as + implemented by timsieved in Cyrus IMAP. + ''; + homepage = https://github.com/philpennock/sieve-connect; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1bcfaced0a..c9f6c16e992 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5065,6 +5065,8 @@ with pkgs; siege = callPackage ../tools/networking/siege {}; + sieve-connect = callPackage ../applications/networking/sieve-connect {}; + sigal = callPackage ../applications/misc/sigal { inherit (pythonPackages) buildPythonApplication fetchPypi; }; From af44ab8400de82ce16bb846164b55fd7b779b230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 26 Jul 2018 15:23:07 +0200 Subject: [PATCH 17/86] plasma.kwin: Adds libdrm depdency Libdrm is required to enable the DRM backend that is used by Wayland. --- pkgs/desktops/plasma-5/kwin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a0b09e30338..b8f381e9714 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap + plasma-framework, qtsensors, libcap, libdrm }: mkDerivation { @@ -27,7 +27,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap + libcap libdrm ]; outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); From 6e5d977b97966c832dfbb51c9dfded86e2bde172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 26 Jul 2018 15:24:17 +0200 Subject: [PATCH 18/86] plasma-workspace: Improve the NixOS patch set We changed some if condition that is not required to be changed. --- .../plasma-5/plasma-workspace/plasma-workspace.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 272088b72b7..7f45d51d160 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644 - } fi - kstartupconfig5 +-kstartupconfig5 ++@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5 returncode=$? --if test $returncode -ne 0; then -+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then + if test $returncode -ne 0; then exit 1 fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig From a14a75a5676a942311976b1c0644a3a803099909 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 26 Jul 2018 18:43:45 -0500 Subject: [PATCH 19/86] foundationdb: include debug info in all builds This puts the debug information in a separate output, as expected. This allows meaningful symbol names to appear in DWARF-based tools like perf and gdb. Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 461b90bc978..bb0d5e84e78 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -85,6 +85,7 @@ let --replace 'LDFLAGS :=' 'LDFLAGS := -ltls -lssl -lcrypto' ''; + separateDebugInfo = true; enableParallelBuilding = true; makeFlags = [ "all" "fdb_java" ] @@ -92,7 +93,9 @@ let # it gets statically linked in ++ lib.optional (!lib.versionAtLeast version "6.0") [ "fdb_c" ] # Needed environment overrides - ++ [ "KVRELEASE=1" ]; + ++ [ "KVRELEASE=1" + "NOSTRIP=1" + ]; # on 6.0 and later, we can specify all this information manually configurePhase = lib.optionalString (lib.versionAtLeast version "6.0") '' From f8e8ecde51b49132d7f8d5adb971c0e37eddcdc2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 26 Jul 2018 18:58:40 -0500 Subject: [PATCH 20/86] foundationdb60: 6.0.2pre2430 -> 6.0.3pre2446 Signed-off-by: Austin Seipp --- pkgs/servers/foundationdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index bb0d5e84e78..7c7da361246 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -155,9 +155,9 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.2pre2430_${substring 0 8 rev}"; + version = "6.0.3pre2446_${substring 0 8 rev}"; branch = "release-6.0"; - rev = "7938d247a5eaf886a176575de6592b76374df58c"; - sha256 = "0g8h2zs0f3aacs7x4hyjh0scybv33gjj6dqfb789h4n6r4gd7d9h"; + rev = "dd5481fb60ee1652986b2a028b31dcbb6cb171b5"; + sha256 = "0mhlb728badk1h3410jbhy7f48m3jjnjna26wwyw5680xz72d6dm"; }; } From 04f0c2522294c75e298ed756ffa8ad14e841d4e6 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Tue, 24 Jul 2018 20:31:21 +0200 Subject: [PATCH 21/86] Fix pname to ename propagation if null --- pkgs/build-support/emacs/melpa.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 4ceaf77373e..2ee99ce973e 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -13,7 +13,7 @@ with lib; /* ename: Original Emacs package name, possibly containing special symbols. */ -, ename ? pname +, ename ? null , version , recipe , meta ? {} @@ -30,6 +30,11 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo; } ({ + ename = + if isNull(ename) + then pname + else ename; + melpa = fetchFromGitHub { owner = "melpa"; repo = "melpa"; From 264077482e32f7de846a8d124c876e19d5d520c9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 27 Jul 2018 14:55:02 +0300 Subject: [PATCH 22/86] zsh-command-time: disable exec flag --- pkgs/shells/zsh/zsh-command-time/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 390039944c0..c82b455200a 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -18,8 +18,10 @@ stdenv.mkDerivation rec { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; + phases = [ "installPhase" ]; + installPhase = '' - install -D $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time + install -Dm444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time ''; meta = with stdenv.lib; { From cd3283f9218b70fdf39640ba1be6fa16e137c209 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Thu, 26 Jul 2018 20:06:46 +0400 Subject: [PATCH 23/86] chromium: 67.0.3396.99 -> 68.0.3440.75 --- .../networking/browsers/chromium/common.nix | 4 -- .../patches/nix_plugin_paths_52.patch | 70 ------------------- .../browsers/chromium/upstream-info.nix | 18 ++--- 3 files changed, 9 insertions(+), 83 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c2471d8a0ea..ff9b8b10b18 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,10 +138,6 @@ let # for updated patches and hints about build flags # (gentooPatch "" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch - ] ++ optionals (versionRange "66" "68") [ - ./patches/nix_plugin_paths_52.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch ] ++ optionals (versionRange "68" "69") [ ./patches/remove-webp-include-68.patch diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch deleted file mode 100644 index fc1b609479b..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_52.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index f4e119d..d9775bd 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -68,21 +68,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - // Gets the path for bundled implementations of components. Note that these -@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_COMPONENTS: -@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 16873ead34f..7f2f4387da5 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0m82ag02mydq5xkd0pamk2nq035j7yzhl47hnwl1irm632rpnfb4"; - sha256bin64 = "0xx6kjaa13al1ka0rfcrz1aj0nwhdwzqakz533ghk8qyvhanypkp"; - version = "68.0.3440.59"; + sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57"; + sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv"; + version = "68.0.3440.68"; }; dev = { - sha256 = "1gpjf213ai3sjh894jsl5ziild15049p6bnh36z0r1f5w68pzakg"; - sha256bin64 = "1slj3gj4786lqrypng48zy5030snar8pirqwm92b5pq25xd595j8"; - version = "69.0.3486.0"; + sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv"; + sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx"; + version = "69.0.3497.12"; }; stable = { - sha256 = "0am0q0wkmrvhidi4x07fvgb4ymv5q3agmwzgm808dj7ninfnnba5"; - sha256bin64 = "06baih4wf88rpmw73vfhap4dxd61vjgmr256ix8qd937x2hv7qd3"; - version = "67.0.3396.99"; + sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw"; + sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij"; + version = "68.0.3440.75"; }; } From 28b2c8b27ac3c98e1f7db7569b9ae80076b1c5cc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 26 Jul 2018 19:18:57 -0500 Subject: [PATCH 24/86] universal-ctags: 2018-01-0 -> 2018-07-23 --- pkgs/development/tools/misc/universal-ctags/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index eb51abe0321..57de59605f3 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "universal-ctags-${version}"; - version = "2018-01-05"; + version = "2018-07-23"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; - rev = "c66bdfb4db99977c1bd0568e33e60853a48dca65"; - sha256 = "0fdzhr0704cj84ym00plkl5l9w83haal6i6w70lx6f4968pcliyi"; + rev = "3522685695ad3312cf4b19399e0c44f3395dd089"; + sha256 = "1f67hy8c2yr9z4ydsqd7wg8iagzn01qjw2ccx6g8mngv3i3jz9mv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ]; From 993937d09e03202f0cee42c4ccb730cf9bcc925e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 27 Jul 2018 08:53:42 -0500 Subject: [PATCH 25/86] gcc8: 8.1 -> 8.2 https://gcc.gnu.org/gcc-8/changes.html --- pkgs/development/compilers/gcc/8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 38d8bcd83cf..fa19e9c533d 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -38,7 +38,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "8.1.0"; +let version = "8.2.0"; enableParallelBuilding = true; @@ -127,7 +127,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; }; inherit patches; From 980674f08c320cbc8b7d21cd2eb6f9e6e240403b Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 24 Jul 2018 10:50:32 +0200 Subject: [PATCH 26/86] opencv: 3.4.1 -> 3.4.2 --- pkgs/development/libraries/opencv/3.x.nix | 48 +++++++------------ .../libraries/opencv/fix-dnn.patch | 13 +++++ 2 files changed, 31 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/libraries/opencv/fix-dnn.patch diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 264c05e1af9..cc970483fb0 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -35,20 +35,20 @@ }: let - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "08yahgf427d2qbs2mw02xww6bv5yjkfc1hihihh7fhqgfz0jnj1h"; + sha256 = "0q752s1ir6iyqbp3pn425fi215fi7bzjl4aa3arvgh6sridda9lx"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "00x1x53qv2pnc7i56244b5nf44wm2mp77hj486i5697r6hikk8n3"; + sha256 = "1fbgbf9xdby9a5yy6bmnkzchdsfii0jagfd373y015cjpr1mrlvz"; }; # Contrib must be built in order to enable Tesseract support: @@ -59,16 +59,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "dfe3162c237af211e98b8960018b564bc209261d"; - sha256 = "1k5xiwdi5r2y3fs5g70lpknxqi4pj32w6l311gfwng3q1cb2crif"; + rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a"; + sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8"; } + "/ippicv"; - files = let name = platform : "ippicv_2017u3_${platform}_general_20170822.tgz"; in + files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in if stdenv.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "4e0352ce96473837b1d671ce87f17359"; } + { ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; } else if stdenv.system == "i686-linux" then - { ${name "lnx_ia32"} = "dcdb0ba4b123f240596db1840cd59a76"; } + { ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; } else if stdenv.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "c1ebb5dfa5b7f54b0c44e1917805a463"; } + { ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -132,17 +132,6 @@ let ln -s "${extra.src}/${name}" "${extra.dst}/${md5}-${name}" '') extra.files); - # See opencv_contrib/modules/dnn_modern/CMakeLists.txt - tinyDnn = rec { - src = fetchurl { - url = "https://github.com/tiny-dnn/tiny-dnn/archive/${name}"; - sha256 = "12x1b984cn0psn6kz1fy75zljgzqvkdyjy8i292adfnyqpl1rip2"; - }; - name = "v1.0.0a3.tar.gz"; - md5 = "adb1c512e09ca2c7a6faef36f9c53e59"; - dst = ".cache/tiny_dnn"; - }; - opencvFlag = name: enabled: "-DWITH_${name}=${printEnabled enabled}"; printEnabled = enabled : if enabled then "ON" else "OFF"; @@ -156,6 +145,11 @@ stdenv.mkDerivation rec { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + # TODO: remove the following patch once commit + # https://github.com/opencv/opencv/commit/e2b5d112909b9dfd764f14833b82e38e4bc2f81f + # is released. + patches = [ ./fix-dnn.patch ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with @@ -174,9 +168,6 @@ stdenv.mkDerivation rec { ${installExtraFiles vgg} ${installExtraFiles boostdesc} ${installExtraFiles face} - - mkdir -p "${tinyDnn.dst}" - ln -s "${tinyDnn.src}" "${tinyDnn.dst}/${tinyDnn.md5}-${tinyDnn.name}" ''); buildInputs = @@ -243,9 +234,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" - - # On OS X the tiny-dnn-1.0.0a3 dependency of dnn_modern fails to build. - "-DBUILD_opencv_dnn_modern=OFF" ]; enableParallelBuilding = true; @@ -273,11 +261,11 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enablePython { pythonPath = []; }; - meta = { + meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; - license = with stdenv.lib.licenses; if enableUnfree then unfree else bsd3; - maintainers = with stdenv.lib.maintainers; [viric mdaiter basvandijk]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + license = with licenses; if enableUnfree then unfree else bsd3; + maintainers = with maintainers; [viric mdaiter basvandijk]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/fix-dnn.patch b/pkgs/development/libraries/opencv/fix-dnn.patch new file mode 100644 index 00000000000..62234a43e46 --- /dev/null +++ b/pkgs/development/libraries/opencv/fix-dnn.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 730c752ce..abbce0453 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1120,7 +1120,7 @@ bool ReadProtoFromTextFile(const char* filename, Message* proto) { + std::ifstream fs(filename, std::ifstream::in); + CHECK(fs.is_open()) << "Can't open \"" << filename << "\""; + IstreamInputStream input(&fs); +- return google::protobuf::TextFormat::Parser(true).Parse(&input, proto); ++ return google::protobuf::TextFormat::Parser().Parse(&input, proto); + } + + bool ReadProtoFromBinaryFile(const char* filename, Message* proto) { From e0d23b12ef9d51ca4618e702917b2669bb683fe4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 26 Jul 2018 12:58:43 +0200 Subject: [PATCH 27/86] php: Enable mysqlnd as default MySQL Native Driver was implemented by PHP back in 5.3.0 and has been default in most distributions for a very long time. The option was added in 41cd4f2459d63c5ad19a227c3dd5d7704df6161c and I don't see any reason why it would default to false. Overview of mysqlnd by PHP: https://secure.php.net/manual/en/mysqlnd.overview.php --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7c866911c59..9bf8577923c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -17,7 +17,7 @@ let , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true , mysqlSupport ? (config.php.mysql or true) && (!php7) - , mysqlndSupport ? config.php.mysqlnd or false + , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true , libxml2Support ? config.php.libxml2 or true From c83584515297638f135089ed5a71ecf01f1ef59a Mon Sep 17 00:00:00 2001 From: John Boehr Date: Thu, 26 Jul 2018 14:34:09 -0700 Subject: [PATCH 28/86] altcoins.mist: 0.10.0 -> 0.11.1 * Add gtk2 as dependency, see #43297 * Don't include version number in mist executable name --- pkgs/applications/altcoins/mist.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index f809b30189f..5f89b0a0c17 100644 --- a/pkgs/applications/altcoins/mist.nix +++ b/pkgs/applications/altcoins/mist.nix @@ -1,8 +1,8 @@ -{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv }: +{ stdenv, makeWrapper, fetchurl, unzip, atomEnv, makeDesktopItem, buildFHSUserEnv, gtk2 }: let - version = "0.10.0"; - name = "mist-${version}"; + version = "0.11.1"; + name = "mist"; throwSystem = throw "Unsupported system: ${stdenv.system}"; @@ -31,11 +31,11 @@ let src = { i686-linux = fetchurl { url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux32-${urlVersion}.zip"; - sha256 = "01hvxlm9w522pwvsjdy18gsrapkfjr7d1jjl4bqjjysxnjaaj2lk"; + sha256 = "1ffzp9aa0g6w3d5pzp69fljk3sd51cbqdgxa1x16vj106sqm0gj7"; }; x86_64-linux = fetchurl { url = "https://github.com/ethereum/mist/releases/download/v${version}/Mist-linux64-${urlVersion}.zip"; - sha256 = "01k17j7fdfhxfd26njdsiwap0xnka2536k9ydk32czd8db7ya9zi"; + sha256 = "0yx4x72l8gk68yh9saki48zgqx8k92xnkm79dc651wdpd5c25cz3"; }; }.${stdenv.system} or throwSystem; @@ -50,13 +50,14 @@ let ln -s ${desktopItem}/share/applications/* $out/share/applications patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/mist" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/mist" \ $out/lib/mist/mist ''; }); in buildFHSUserEnv { - inherit name meta; + name = "mist"; + inherit meta; targetPkgs = pkgs: with pkgs; [ mist From fcb4e32e9a939db0fca1796c8abd4e14e0acde04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Lang?= Date: Fri, 27 Jul 2018 12:27:42 -0300 Subject: [PATCH 29/86] fzf: fix invalid symlink on vim-plugins The fzf vim plugin wasn't working because it was making a symlink to a directory with the full source code. This directory isn't present anymore since the commit e95f17e2720e67e2eabd59d7754c814d3e27a0b2 wich removes it because it isn't so useful for the go packages. I fixed it by manually copying the plugin/ directory into the out derivation, which is the only part of the source that contains the vim plugin. --- pkgs/tools/misc/fzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index e8e2152f711..b85d2bffc34 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -42,8 +42,8 @@ buildGoPackage rec { cp $src/bin/fzf-tmux $bin/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins - ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} + mkdir -p $out/share/vim-plugins/${name} + cp -r $src/plugin $out/share/vim-plugins/${name} cp -R $src/shell $bin/share/fzf cat <