diff options
Diffstat (limited to 'pkgs')
134 files changed, 278 insertions, 183 deletions
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix index f809b30189f4..5f89b0a0c173 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 diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 343ec8679feb..42fa8b7621a5 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/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index da15081173da..7a700e0956b8 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -112,12 +112,9 @@ in stdenv.mkDerivation rec { "--enable-luainterp" ] ++ stdenv.lib.optionals pythonSupport [ - "--enable-python${if isPython3 then "3" else ""}" - ] - ++ stdenv.lib.optionals (pythonSupport && stdenv.isDarwin) [ # Why only for Darwin? - "--enable-python${if isPython3 then "3" else ""}interp=yes" # Duplicate? + "--enable-python${if isPython3 then "3" else ""}interp=yes" "--with-python${if isPython3 then "3" else ""}-config-dir=${python}/lib" - "--disable-python${if isPython3 then "" else "3"}interp" + "--disable-python${if (!isPython3) then "3" else ""}interp" ] ++ stdenv.lib.optional nlsSupport "--enable-nls" ++ stdenv.lib.optional perlSupport "--enable-perlinterp" diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index c2ead5a19141..f9220e107f3c 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 dea3fd4e3c61..fbc84521de08 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 8107ed8aa449..1c5b8d1b81dd 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 1d9956245a63..9839bb740778 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 a3151238438b..140903766848 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 eb97a2b9b3b6..52cdc0bc0676 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 ca0f49e0c948..09b431fdb116 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 55c856c19127..377a5ae61687 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 0fa859ac84bb..0a98f387ff86 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 3b620fc0606c..3ee2006ab0c0 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/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index bd7fbe863163..504ef78743c2 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "doomseeker-${version}"; - version = "2018-03-03"; + version = "2018-03-05"; src = fetchFromBitbucket { owner = "Doomseeker"; repo = "doomseeker"; - rev = "072110a8fe0643c4a72461e7768560813bb0a62b"; - sha256 = "1w4g5f7yifqk2d054dqrmy8qj4n5hxdan7n59845m1xh2f2r8i0p"; + rev = "c2c7f37b1afb"; + sha256 = "17fna3a604miqsvply3klnmypps4ifz8axgd3pj96z46ybxs8akw"; }; - patches = [ ./fix_paths.patch ]; + patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; diff --git a/pkgs/applications/misc/doomseeker/qt_build_fix.patch b/pkgs/applications/misc/doomseeker/qt_build_fix.patch new file mode 100644 index 000000000000..e21b53b3cc53 --- /dev/null +++ b/pkgs/applications/misc/doomseeker/qt_build_fix.patch @@ -0,0 +1,47 @@ +diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp +--- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -32,6 +32,7 @@ + #include <QInputDialog> + #include <QMessageBox> + #include <QToolBar> ++#include <QTabBar> + + DClass<IRCDock> : public Ui::IRCDock + { +diff -r c2c7f37b1afb src/core/gui/logdock.cpp +--- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -21,6 +21,8 @@ + // Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com> + //------------------------------------------------------------------------------ + ++#include <QAction> ++ + #include "clipboard.h" + #include "logdock.h" + #include "log.h" +diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp +--- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -21,6 +21,7 @@ + // Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net> + //------------------------------------------------------------------------------ + ++#include <QAction> + #include <QBoxLayout> + + #include "serverdetailsdock.h" +diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp +--- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100 ++++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700 +@@ -20,6 +20,9 @@ + //------------------------------------------------------------------------------ + // Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com> + //------------------------------------------------------------------------------ ++ ++#include <QAction> ++ + #include "serverfilterdock.h" + #include "ui_serverfilterdock.h" + diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index d83eb1ed86a7..b08ce5baa5b6 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 d1befec34082..70a6efb90ddc 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 1857c3118ddd..bce2a79cde33 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 447fc4570a76..9a40e3bc1053 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 92269e03e58d..362d28d2607f 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 35931707ed6b..40432c18aa38 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 5ed8b81eabb5..efaf986a9e54 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -28,7 +28,7 @@ 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 48e0d19e20b9..5bb614ac68b1 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 8b15b0307897..aa36ccd49e23 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 bb8eb83d6bf0..ff165f99ae9b 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 f1d33b83fd0c..fa481b7fe663 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 8a45e988c07d..646b41cfe75a 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 13f7bce49218..8f1960b58cd8 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 e15c3588c298..8e1777b0ce79 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 9763c0ee97fa..9428b2764585 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 a5d861093c90..a1f275723966 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 2a4991b9318f..f7f989dc3a9d 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 80b1e9caeaa9..30fa41de12d1 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 28b85936a281..94e0e46767a0 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 7125343dee67..b2f063860032 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 5958a5aa79e4..eb99cac8e9ec 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 d4cf7f5ea907..78c981ded56f 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 af2ee49daee9..196374706e1f 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 0637e813b48c..5fcab43c86ba 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 3a595da96d07..a76608bdd900 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 05d8c1edec29..742c2fb03f7c 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 5e1098e97064..3bb79f6a77da 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 8ed144a32ea4..3423b0e181d5 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/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 91f9e7c71e35..2048220361ac 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -43,10 +43,8 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; - # See description in cc-wrapper. - infixSalt = dashlessTarget; + infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; # The dynamic linker has different names on different platforms. This is a # shell glob that ought to match it. diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index aca96f58ed97..a981ffea7081 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -45,14 +45,12 @@ let default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; - dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; - # The "infix salt" is a arbitrary string added in the middle of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used # without interfering. For the moment, it is defined as the target triple, # adjusted to be a valid bash identifier. This should be considered an # unstable implementation detail, however. - infixSalt = dashlessTarget; + infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a0b09e30338f..b8f381e97149 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); diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 272088b72b7b..7f45d51d1609 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 diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index f10c8ec86ff9..26bed216acfa 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/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 943391611de1..101a6feeeae3 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 bf3b192e1bbd..1df87cc3d429 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 0564329967e5..1215c971f239 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 50d55aef2342..0fb390758954 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/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 38d8bcd83cf5..fa19e9c533d5 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; diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 25bb08284142..accdfbf23b56 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 7dc134b4fcfd..388da007d33d 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 98b6f4adbbf6..e540469c6278 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 8cfcb1af43d4..d7324665240f 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 c974eb6f6d39..dfeddf2fe65a 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 e474f9a73fe8..1b186c730c06 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 4b24e6dad726..760969f34690 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 a86f5b5039e7..4d981398b9aa 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 c8afd0dcc906..57d5fc0c83b7 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 e39de76117af..06dcfb8b3933 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/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index d94179e16fe9..dac8b0279ad9 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,23 +4,24 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "1zpzcyh82xl0grvgcj8b7yzh053i9z94kbym5qrv413pcx7w50cm"; + sha256 = "1pbgijglyqrm998a6z5ahp4phd72crzr3s8vq17a9dz3i0a9hcj5"; }; isLibrary = false; isExecutable = true; executableHaskellDepends = with haskellPackages; [ - aeson aeson-pretty optparse-applicative system-filepath turtle + aeson aeson-pretty either errors optparse-applicative + system-filepath turtle ]; - description = "An experimental package manager for PureScript"; + description = "A package manager for PureScript based on package sets"; license = licenses.bsd3; maintainers = with lib.maintainers; [ Profpatsch ]; } diff --git a/pkgs/development/interpreters/elixir/1.7.nix b/pkgs/development/interpreters/elixir/1.7.nix new file mode 100644 index 000000000000..426e5a4cbba0 --- /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 78598ce3d81e..7d3c6476131d 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/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ce3ce584434f..f6bd96af40f5 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 3faba45714a0..9dc0776f08a7 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 5790672d8e51..f524c9402558 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 0b341b38917d..f2f8aed065f0 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 785bc6f3c843..401d9c7d8a2e 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 5eb08ecd6014..bddb0e1479e2 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 cc970483fb01..e97aa0d391e0 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -265,7 +265,7 @@ stdenv.mkDerivation rec { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = https://opencv.org/; license = with licenses; if enableUnfree then unfree else bsd3; - maintainers = with maintainers; [viric mdaiter basvandijk]; + maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d2d106827169..66a840fa2a9e 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 8665be26925e..416cf53ab496 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 bdfe3d1c5c60..b85d76640cf0 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/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index c0c8eb51f71f..9f04dac343c4 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -1,4 +1,8 @@ -{ stdenv, buildOcaml, fetchurl }: +{ stdenv, buildOcaml, ocaml, fetchurl }: + +if stdenv.lib.versionAtLeast ocaml.version "4.06" +then throw "estring is not available for OCaml ${ocaml.version}" +else buildOcaml rec { name = "estring"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a05d49245b25..7db07e77d84e 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -33,8 +33,9 @@ rec { }; base = janePackage { + version = "0.11.1"; name = "base"; - hash = "0ad5xcyds2lwy9dk7gqwygxk5y769ckrgrjcykdalwdh8qfbi6nf"; + hash = "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir"; propagatedBuildInputs = [ sexplib0 ]; meta.description = "Full standard library replacement for OCaml"; }; diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix index 363d5850ec60..c7ed72dc523c 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/default.nix @@ -1,19 +1,32 @@ -{ stdenv, buildOcaml, fetchurl, batteries, csv, ocaml_lwt, ocaml_sqlite3, estring }: +{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt +, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3 +}: -buildOcaml rec { - name = "sqlexpr"; - version = "0.5.5"; +stdenv.mkDerivation rec { + version = "0.9.0"; + name = "ocaml${ocaml.version}-sqlexpr-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1203/ocaml-sqlexpr-${version}.tar.gz"; - sha256 = "02pi0xxr3xzalwpvcaq96k57wz2vxj20l2mga1a4d2ddvhran8kr"; + url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz"; + sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd"; }; - propagatedBuildInputs = [ batteries csv ocaml_lwt ocaml_sqlite3 estring ]; + buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - meta = with stdenv.lib; { - homepage = https://github.com/mfp/ocaml-sqlexpr; + propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; + + buildPhase = "dune build -p sqlexpr"; + + doCheck = true; + checkPhase = "dune runtest -p sqlexpr"; + + inherit (jbuilder) installPhase; + + meta = { description = "Type-safe, convenient SQLite database access"; - license = licenses.lgpl21; + homepage = "https://github.com/mfp/ocaml-sqlexpr"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix new file mode 100644 index 000000000000..c15378e8240a --- /dev/null +++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -0,0 +1,15 @@ +{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit +, ppx_core, ppx_tools_versioned, re, lwt_ppx +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}"; + inherit (sqlexpr) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; + + buildPhase = "dune build -p ppx_sqlexpr"; + + doCheck = true; + checkPhase = "dune runtest -p ppx_sqlexpr"; +} diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 388f6b0db439..7981681a6414 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 32c888b7e62f..31e720b13f29 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 73c5b7623184..cea86f090d6a 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/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index eb51abe03214..57de59605f30 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 ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index ef74842da1c0..0dcc1287791d 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0yzjbmdhhwbg551bm06xwwdjdm5kdqw37pgd7hals8qxb0dzmmh8"; + sha256 = "03qzqy3indqghqy7rnli1zrrlnyfkygxjpb2s7041cik54kf2krw"; }; - cargoSha256 = "1ml4a7xp40l3bhfhpwdrwj3k99zhan9dzpkw71fa689xmv6pdj62"; + cargoSha256 = "0c3xpzff8jldqbn5a25yy6c2hlz5xy636ml6sj5d24wzcgwg5a2i"; meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index 6b7ead6d2030..c8f5deef9240 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 e48ac612b32d..5334e4cbd12c 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 e75698e72799..274a095de6f4 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 10ce55f4e217..4bf03fec9de9 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 e43d01d2ecaf..a0fc6d5ca718 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/misc/themes/kde2/default.nix b/pkgs/misc/themes/kde2/default.nix index 1d281b3ac90d..91584bfa1fe3 100644 --- a/pkgs/misc/themes/kde2/default.nix +++ b/pkgs/misc/themes/kde2/default.nix @@ -25,5 +25,6 @@ in stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.bsd2; platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; }; } diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 3b95907a7893..9ccda9178f10 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 79d3a0613dcc..4a98b4f169dd 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 c4a01ce09bd0..c5f63d6671c8 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 a09fa93cb782..fc13d97429c2 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 83ca21719faa..b29cf88f168f 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 7f4c9dae166a..91e6e7f4cc59 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/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index de9787a0fa74..833609f9fc2c 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 = [ diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 2bff43c93dee..c5a53555d20f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.58"; + version = "4.14.59"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zfyrcfsx9410gnjk1hrjs5d4p93qm6k2r9q24i5c1nhfhzf0rgz"; + sha256 = "16ribg80jk830wyk4k7v86jysmnkj59v62rlkqil3advc7337iky"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix index 2ac619232d4c..71984ec5c779 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.17.10"; + version = "4.17.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1s0vzzdcixy2m3ybd9z1h5b2wiiz2mgnwn09jxvj1v4rwjix457a"; + sha256 = "133jyd75a0gq71m783s3ydjkpnzw5xxn4wrk1zal6fr19znq87nv"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d4a2c56a8943..8bb2d53da9e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.144"; + version = "4.4.145"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "11lsf62qd9qm6n6ilxwx0zag3phvfmfjpbdc24j4p2c9gfgqpyss"; + sha256 = "1max0d1b1y1ndrfprrcyb7c9y12pkx2whxzlr70qypcb5jz0v7ff"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 3fe55b2a6f38..d89d0151d9b9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.115"; + version = "4.9.116"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0fddhw9v5l8k2j31zlfikd2g397ngyynfbwg92z17vp510fxjf20"; + sha256 = "07gzjfv24jrn76aga7c8f1y5xsz5if6xbdli1cpfzg60ps8q57lr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index fee9b0c09d56..3665606e99c8 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 94bd92abb4f8..fc7acc35c19a 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 f72ec76cc649..53c8411a22c3 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 5a9d8e61b1fe..acd08f658e66 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 0e31cd8fe08e..32acba433b12 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 0ba5a3ee5adb..9a6f2b0b5e1a 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/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 390039944c09..c82b455200a9 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; { diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 99c0bd4a34ca..e0b4d1fee124 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 d4b6b9a72eba..ee14f2d6781d 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 b0c33212edb3..9fe4f90f258b 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 2fb1c9325c03..7bdb3444a4c1 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/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 8d1ee7b7bfbe..3769860d469b 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -24,5 +24,6 @@ in stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; + maintainers = with maintainers; [ gnidorah ]; }; } diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index 6f56267ebf72..da1e8be7cf49 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 f453199835f5..8c965da451d7 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 8dcc9ef81ff6..d9933e0018f9 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 6d99a5c2d1a5..ab8d257d7c76 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 2bd76188a638..6178181193cf 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 7dcfc6b512fb..581a45eaebb9 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 23cce602875a..34a34ef903d2 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 bc026d6835b8..5c8f98101eed 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/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 07c130f1cb38..5c8341941ed6 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -71,7 +71,9 @@ let doInstallCheck = true; # not cross # socket path becomes too long otherwise - preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp"; + preInstallCheck = lib.optional stdenv.isDarwin '' + export TMPDIR=$NIX_BUILD_TOP + ''; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 9eb5858b0573..903794622fb0 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 7624e6cfa39e..70a1beb8ce7c 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 84072fd2840e..495b6ee48ea7 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 d9e68c77d25c..5b67a6d89ceb 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 59697891b6a3..2db82c36a72a 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 38362333cadd..514085bee64e 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 b9d5407c68de..d6c4fedc1434 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 71cc1738837c..72f25ef099bc 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 4eec47e9e759..8be028730377 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 ]; }; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3440bfafb110..da5fed4be4b9 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; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9bfb2f97c6e4..003f21aa81aa 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -644,6 +644,8 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; + ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; + ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} |