Merge master into staging-next

nixos/modules/services/monitoring/prometheus/exporters.nix

@@ -41,6 +41,7 @@ let
     "openvpn"
     "postfix"
     "postgres"
+    "py-air-control"
     "redis"
     "rspamd"
     "rtl_433"

nixos/modules/services/monitoring/prometheus/exporters/py-air-control.nix

@@ -0,0 +1,62 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.py-air-control;
+
+  py-air-control-exporter-env = pkgs.python3.withPackages (pyPkgs: [
+      pyPkgs.py-air-control-exporter
+  ]);
+
+  workingDir = "/var/lib/${cfg.stateDir}";
+
+in
+{
+  port = 9896;
+  extraOpts = {
+    deviceHostname = mkOption {
+      type = types.str;
+      example = "192.168.1.123";
+      description = ''
+        The hostname of the air purification device from which to scrape the metrics.
+      '';
+    };
+    protocol = mkOption {
+      type = types.str;
+      default = "http";
+      description = ''
+        The protocol to use when communicating with the air purification device.
+        Available: [http, coap, plain_coap]
+      '';
+    };
+    stateDir = mkOption {
+      type = types.str;
+      default = "prometheus-py-air-control-exporter";
+      description = ''
+        Directory below <literal>/var/lib</literal> to store runtime data.
+        This directory will be created automatically using systemd's StateDirectory mechanism.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = false;
+      StateDirectory = cfg.stateDir;
+      WorkingDirectory = workingDir;
+      ExecStart = ''
+        ${py-air-control-exporter-env}/bin/python -c \
+          "from py_air_control_exporter import app; app.create_app().run( \
+              debug=False, \
+              port=${toString cfg.port}, \
+              host='${cfg.listenAddress}', \
+          )"
+      '';
+      Environment = [
+        "PY_AIR_CONTROL_HOST=${cfg.deviceHostname}"
+        "PY_AIR_CONTROL_PROTOCOL=${cfg.protocol}"
+        "HOME=${workingDir}"
+      ];
+    };
+  };
+}

nixos/modules/services/web-servers/nginx/default.nix

@@ -390,13 +390,24 @@ in
       };
 
       config = mkOption {
+        type = types.str;
         default = "";
-        description = "
-          Verbatim nginx.conf configuration.
-          This is mutually exclusive with the structured configuration
-          via virtualHosts and the recommendedXyzSettings configuration
-          options. See appendConfig for appending to the generated http block.
-        ";
+        description = ''
+          Verbatim <filename>nginx.conf</filename> configuration.
+          This is mutually exclusive to any other config option for
+          <filename>nginx.conf</filename> except for
+          <itemizedlist>
+          <listitem><para><xref linkend="opt-services.nginx.appendConfig" />
+          </para></listitem>
+          <listitem><para><xref linkend="opt-services.nginx.httpConfig" />
+          </para></listitem>
+          <listitem><para><xref linkend="opt-services.nginx.logError" />
+          </para></listitem>
+          </itemizedlist>
+
+          If additional verbatim config in addition to other options is needed,
+          <xref linkend="opt-services.nginx.appendConfig" /> should be used instead.
+        '';
       };
 
       appendConfig = mkOption {

nixos/tests/prometheus-exporters.nix

@@ -530,6 +530,21 @@ let
       '';
     };
 
+    py-air-control = {
+      nodeName = "py_air_control";
+      exporterConfig = {
+        enable = true;
+        deviceHostname = "127.0.0.1";
+      };
+      exporterTest = ''
+        wait_for_unit("prometheus-py-air-control-exporter.service")
+        wait_for_open_port(9896)
+        succeed(
+            "curl -sSf http://localhost:9896/metrics | grep -q 'py_air_control_sampling_error_total'"
+        )
+      '';
+    };
+
     redis = {
       exporterConfig = {
         enable = true;

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -252,12 +252,6 @@ let
             (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
         });
 
-        magit-stgit = super.magit-stgit.overrideAttrs (attrs: {
-          # searches for Git at build time
-          nativeBuildInputs =
-            (attrs.nativeBuildInputs or [ ]) ++ [ external.git ];
-        });
-
         magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: {
           # searches for Git at build time
           nativeBuildInputs =
@@ -426,21 +420,36 @@ let
         # upstream issue: missing file header
         initsplit = markBroken super.initsplit;
 
+        # upstream issue: missing file header
+        instapaper = markBroken super.instapaper;
+
         # upstream issue: missing file header
         jsfmt = markBroken super.jsfmt;
 
         # upstream issue: missing file header
         maxframe = markBroken super.maxframe;
 
+        # upstream issue: doesn't build
+        magit-stgit = markBroken super.magit-stgit;
+
+        # upstream issue: missing file header
+        melancholy-theme = markBroken super.melancholy-theme;
+
         # upstream issue: doesn't build
         eterm-256color = markBroken super.eterm-256color;
 
+        # upstream issue: doesn't build
+        per-buffer-theme = markBroken super.per-buffer-theme;
+
         # upstream issue: missing file header
         qiita = markBroken super.qiita;
 
         # upstream issue: missing file header
         speech-tagger = markBroken super.speech-tagger;
 
+        # upstream issue: missing file header
+        sql-presto = markBroken super.sql-presto;
+
         # upstream issue: missing file header
         textmate = markBroken super.textmate;
 

pkgs/applications/editors/emacs/generic.nix

@@ -141,8 +141,7 @@ in stdenv.mkDerivation {
 
     siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
 
-    rm -rf $out/var
-    rm -rf $siteVersionDir
+    rm -r $out/share/emacs/$siteVersionDir/site-lisp
   '' + lib.optionalString withCsrc ''
     for srcdir in src lisp lwlib ; do
       dstdir=$out/share/emacs/$siteVersionDir/$srcdir

pkgs/applications/editors/emacs/site-start.el

@@ -22,6 +22,17 @@ least specific (the system profile)"
                              (nix--profile-paths)))))
   (setq load-path (append paths load-path)))
 
+;;; Remove wrapper site-lisp from EMACSLOADPATH so it's not propagated
+;;; to any other Emacsen that might be started as subprocesses.
+(let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLisp"))
+      (env-load-path (getenv "EMACSLOADPATH")))
+  (when wrapper-site-lisp
+    (setenv "emacsWithPackages_siteLisp" nil))
+  (when (and wrapper-site-lisp env-load-path)
+    (let* ((env-list (split-string env-load-path ":"))
+           (new-env-list (delete wrapper-site-lisp env-list)))
+      (setenv "EMACSLOADPATH" (when new-env-list
+                                (mapconcat 'identity new-env-list ":"))))))
 
 ;;; Make `woman' find the man pages
 (defvar woman-manpath)

pkgs/applications/networking/cluster/istioctl/default.nix

@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "0fwc56797gmcg9pcy0jpv5lb0b6wwiqh242xn1chd4a4hp8in7h9";
+    sha256 = "1m97hszmw0hfzj3jvd1is7fa3mpqkm7jbq3ik337rb9yq1f0gasv";
   };
-  vendorSha256 = "0ing5pih2rz974dcianlb05fpgrj3y7h32awf3cp41gh448gxd24";
+  vendorSha256 = "0ividxxmil69vpvyjlgyzb2jzipmh9rpvk19kv7266d29ky3q7s6";
 
   doCheck = false;
 

pkgs/applications/video/bomi/default.nix

@@ -1,118 +0,0 @@
-{ mkDerivation, config, stdenv, fetchFromGitHub
-, fetchpatch, pkgconfig, perl, python, which
-, libX11, libxcb, libGLU, libGL
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
-, libchardet
-, ffmpeg
-
-, mpg123
-, libass
-, libdvdread
-, libdvdnav
-, icu
-, libquvi
-, alsaLib
-, libvdpau, libva
-, libbluray
-, jackSupport ? false, jack ? null
-, portaudioSupport ? false, portaudio ? null
-, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
-, cddaSupport ? false, libcdda ? null
-, youtubeSupport ? true, youtube-dl ? null
-}:
-
-with stdenv.lib;
-
-assert jackSupport -> jack != null;
-assert portaudioSupport -> portaudio != null;
-assert pulseSupport -> libpulseaudio != null;
-assert cddaSupport -> libcdda != null;
-assert youtubeSupport -> youtube-dl != null;
-
-mkDerivation rec {
-  pname = "bomi";
-  version = "0.9.11";
-
-  src = fetchFromGitHub {
-    owner = "xylosper";
-    repo = "bomi";
-    rev = "v${version}";
-    sha256 = "0a7n46gn3n5098lxxvl3s29s8jlkzss6by9074jx94ncn9cayf2h";
-  };
-
-  patches = [
-    (fetchpatch rec {
-      name = "bomi-compilation-fix.patch";
-      url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725";
-      sha256 = "1dwryya5ljx35dbx6ag9d3rjjazni2mfn3vwirjdijdy6yz22jm6";
-    })
-    (fetchpatch rec {
-      name = "bomi-fix-expected-unqualified-id-before-numeric-constant-unix.patch";
-      url = "https://svnweb.mageia.org/packages/cauldron/bomi/current/SOURCES/${name}?revision=995725&view=co&pathrev=995725";
-      sha256 = "0n3xsrdrggimzw30gxlnrr088ndbdjqlqr46dzmfv8zan79lv5ri";
-    })
-  ];
-
-  buildInputs = with stdenv.lib;
-                [ libX11
-                  libxcb
-                  libGLU libGL
-                  qtbase
-                  qtx11extras
-                  qtdeclarative
-                  qtquickcontrols
-                  ffmpeg
-                  libchardet
-
-                  mpg123
-                  libass
-                  libdvdread
-                  libdvdnav
-                  icu
-                  libquvi
-                  alsaLib
-                  libvdpau
-                  libva
-                  libbluray
-                ]
-                ++ optional jackSupport jack
-                ++ optional portaudioSupport portaudio
-                ++ optional pulseSupport libpulseaudio
-                ++ optional cddaSupport libcdda
-                ;
-
-  preConfigure = ''
-    patchShebangs configure
-  '';
-
-  preBuild = ''
-    patchShebangs src/mpv/waf
-    patchShebangs build-mpv
-  '';
-
-  dontWrapQtApps = true;
-  postInstall = ''
-    wrapQtApp $out/bin/bomi \
-      ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
-  '';
-
-  dontUseQmakeConfigure = true;
-
-  configureFlags = with stdenv.lib;
-                   [ "--qmake=qmake" ]
-                   ++ optional jackSupport "--enable-jack"
-                   ++ optional portaudioSupport "--enable-portaudio"
-                   ++ optional pulseSupport "--enable-pulseaudio"
-                   ++ optional cddaSupport "--enable-cdda"
-                   ;
-
-  nativeBuildInputs = [ pkgconfig perl python which qttools qmake ];
-
-  meta = with stdenv.lib; {
-    description = "Powerful and easy-to-use multimedia player";
-    homepage = "https://bomi-player.github.io/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.abbradar ];
-    platforms = platforms.linux;
-  };
-}

pkgs/build-support/emacs/elpa.nix

@@ -7,9 +7,18 @@ with lib;
 { pname
 , version
 , src
+, meta ? {}
 , ...
 }@args:
 
+let
+
+  defaultMeta = {
+    homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html";
+  };
+
+in
+
 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
 
   phases = "installPhase fixupPhase distPhase";
@@ -23,6 +32,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
 
     runHook postInstall
   '';
+
+  meta = defaultMeta // meta;
 }
 
 // removeAttrs args [ "files" "fileSpecs"

pkgs/build-support/emacs/melpa.nix

@@ -23,7 +23,7 @@ with lib;
 let
 
   defaultMeta = {
-    homepage = args.src.meta.homepage or "http://melpa.org/#/${pname}";
+    homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}";
   };
 
 in

pkgs/build-support/emacs/wrapper.nix

@@ -155,8 +155,12 @@ runCommand
     for prog in $emacs/bin/*; do # */
       local progname=$(basename "$prog")
       rm -f "$out/bin/$progname"
-      makeWrapper "$prog" "$out/bin/$progname" \
-        --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"
+
+      substitute ${./wrapper.sh} $out/bin/$progname \
+        --subst-var-by bash ${emacs.stdenv.shell} \
+        --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
+        --subst-var prog
+      chmod +x $out/bin/$progname
     done
 
     # Wrap MacOS app
@@ -168,8 +172,12 @@ runCommand
             $emacs/Applications/Emacs.app/Contents/PkgInfo \
             $emacs/Applications/Emacs.app/Contents/Resources \
             $out/Applications/Emacs.app/Contents
-      makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \
-        --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:"
+
+      substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \
+        --subst-var-by bash ${emacs.stdenv.shell} \
+        --subst-var-by wrapperSiteLisp "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" \
+        --subst-var prog
+      chmod +x $out/bin/$progname
     fi
 
     mkdir -p $out/share

pkgs/build-support/emacs/wrapper.sh

@@ -0,0 +1,27 @@
+#!@bash@
+
+IFS=:
+
+newLoadPath=()
+added=
+
+if [[ -n $EMACSLOADPATH ]]
+then
+    while read -rd: entry
+    do
+        if [[ -z $entry && -z $added ]]
+        then
+            newLoadPath+=(@wrapperSiteLisp@)
+            added=1
+        fi
+        newLoadPath+=("$entry")
+    done <<< "$EMACSLOADPATH:"
+else
+    newLoadPath+=(@wrapperSiteLisp@)
+    newLoadPath+=("")
+fi
+
+export EMACSLOADPATH="${newLoadPath[*]}"
+export emacsWithPackages_siteLisp=@wrapperSiteLisp@
+
+exec @prog@ "$@"

pkgs/build-support/nix-gitignore/default.nix

@@ -150,10 +150,10 @@ in rec {
       '');
 
   withGitignoreFile = patterns: root:
-    lib.toList patterns ++ [(root + "/.gitignore")];
+    lib.toList patterns ++ [ ".git" ] ++ [(root + "/.gitignore")];
 
   withRecursiveGitignoreFile = patterns: root:
-    lib.toList patterns ++ [(compileRecursiveGitignore root)];
+    lib.toList patterns ++ [ ".git" ] ++ [(compileRecursiveGitignore root)];
 
   # filterSource derivatives
 

pkgs/development/libraries/draco/default.nix

@@ -2,14 +2,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "draco";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "draco";
     rev = version;
-    sha256 = "0s65il754fpiygbg0yq2xynpbnmhiiaxghkzprjqxziyz6gi87lm";
+    sha256 = "14ln4la52x38pf8syr7i5v4vd65ya4zij8zj5kgihah03cih0qcd";
   };
 
   enableParallelBuilding = true;

pkgs/development/python-modules/vncdo/default.nix

@@ -1,18 +1,23 @@
 { stdenv, fetchFromGitHub
-, python2Packages
+, buildPythonPackage, isPy27
+, pillow
+, twisted
+, pexpect
+, nose
+, ptyprocess
 }:
-python2Packages.buildPythonPackage {
+buildPythonPackage rec {
   pname = "vncdo";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "sibson";
     repo = "vncdotool";
-    rev = "5c03a82dcb5a3bd9e8f741f8a8d0c1ce082f2834";
-    sha256 = "0k03b09ipsz8vp362x7sx7z68mxgqw9qzvkii2f8j9vx2y79rjsh";
+    rev = "v${version}";
+    sha256 = "0h3ccr8zi7xpgn6hz43x1045x5l4bhha7py8x00g8bv6gaqlbwxn";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = [
     pillow
     twisted
     pexpect
@@ -20,7 +25,7 @@ python2Packages.buildPythonPackage {
     ptyprocess
   ];
 
-  doCheck = false;
+  doCheck = !isPy27;
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/sibson/vncdotool";

pkgs/games/minecraft/default.nix

@@ -88,11 +88,11 @@ in
 stdenv.mkDerivation rec {
   pname = "minecraft-launcher";
 
-  version = "2.2.741";
+  version = "2.2.909";
 
   src = fetchurl {
     url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
-    sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw";
+    sha256 = "15x2imr8c4m2bjfs9y1l34fpvixxdf09gqls4bqb4rdvj1vhdrh2";
   };
 
   icon = fetchurl {
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
     makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
       --prefix LD_LIBRARY_PATH : ${envLibPath} \
       --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
-      --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \
+      --set JAVA_HOME ${stdenv.lib.getBin jre} \
       --run "cd /tmp" \
       "''${gappsWrapperArgs[@]}"
   '';

pkgs/servers/beanstalkd/default.nix

@@ -1,10 +1,9 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, installShellFiles }:
+
 stdenv.mkDerivation rec {
   version = "1.12";
   pname = "beanstalkd";
 
-  installPhase=''make install "PREFIX=$out"'';
-
   src = fetchurl {
     url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz";
     sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl";
@@ -12,6 +11,14 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage doc/beanstalkd.1
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://kr.github.io/beanstalkd/";
     description = "A simple, fast work queue";
@@ -20,4 +27,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
   };
 }
-

pkgs/top-level/aliases.nix

@@ -62,6 +62,7 @@ mapAliases ({
   bridge_utils = bridge-utils;  # added 2015-02-20
   bro = zeek; # added 2019-09-29
   bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10
+  bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10
   btrfsProgs = btrfs-progs; # added 2016-01-03
   bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03
   bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03

pkgs/top-level/all-packages.nix

@@ -8348,7 +8348,7 @@ in
 
   vmtouch = callPackage ../tools/misc/vmtouch { };
 
-  vncdo = callPackage ../tools/admin/vncdo { };
+  vncdo = with python3Packages; toPythonApplication vncdo;
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
@@ -20504,10 +20504,6 @@ in
 
   bombono = callPackage ../applications/video/bombono {};
 
-  bomi = libsForQt5.callPackage ../applications/video/bomi {
-    ffmpeg = ffmpeg_2;
-  };
-
   bonzomatic = callPackage ../applications/editors/bonzomatic { };
 
   brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; };

pkgs/top-level/python-packages.nix

@@ -7700,6 +7700,8 @@ in {
 
   vmprof = callPackage ../development/python-modules/vmprof { };
 
+  vncdo = callPackage ../development/python-modules/vncdo { };
+
   vobject = callPackage ../development/python-modules/vobject { };
 
   voluptuous = callPackage ../development/python-modules/voluptuous { };