Merge master into staging-next

2021-10-09 12:01:08 +00:00
parent 9d4e9ac370 a111e246c8
commit 37482ffbd6
16 changed files with 56 additions and 95 deletions
@@ -334,6 +334,13 @@
  <section xml:id="sec-release-21.11-incompatibilities">
    <title>Backward Incompatibilities</title>
    <itemizedlist>
+      <listitem>
+        <para>
+          The <literal>services.wakeonlan</literal> option was removed,
+          and replaced with
+          <literal>networking.interfaces.&lt;name&gt;.wakeOnLan</literal>.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The <literal>security.wrappers</literal> option now requires
@@ -103,6 +103,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

+- The `services.wakeonlan` option was removed, and replaced with `networking.interfaces.<name>.wakeOnLan`.
+
 - The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.
  This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe.

@@ -883,7 +883,6 @@
  ./services/video/unifi-video.nix
  ./services/networking/v2ray.nix
  ./services/networking/vsftpd.nix
-  ./services/networking/wakeonlan.nix
  ./services/networking/wasabibackend.nix
  ./services/networking/websockify.nix
  ./services/networking/wg-quick.nix
@@ -1,70 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  interfaces = config.services.wakeonlan.interfaces;
-
-  ethtool = "${pkgs.ethtool}/sbin/ethtool";
-
-  passwordParameter = password : if (password == "") then "" else
-    "sopass ${password}";
-
-  methodParameter = {method, password} :
-    if method == "magicpacket" then "wol g"
-    else if method == "password" then "wol s so ${passwordParameter password}"
-    else throw "Wake-On-Lan method not supported";
-
-  line = { interface, method ? "magicpacket", password ? "" }: ''
-    ${ethtool} -s ${interface} ${methodParameter {inherit method password;}}
-  '';
-
-  concatStrings = foldr (x: y: x + y) "";
-  lines = concatStrings (map (l: line l) interfaces);
-
-in
-{
-
-  ###### interface
-
-  options = {
-
-    services.wakeonlan.interfaces = mkOption {
-      default = [ ];
-      type = types.listOf (types.submodule { options = {
-        interface = mkOption {
-          type = types.str;
-          description = "Interface to enable for Wake-On-Lan.";
-        };
-        method = mkOption {
-          type = types.enum [ "magicpacket" "password"];
-          description = "Wake-On-Lan method for this interface.";
-        };
-        password = mkOption {
-          type = types.strMatching "[a-fA-F0-9]{2}:([a-fA-F0-9]{2}:){4}[a-fA-F0-9]{2}";
-          description = "The password has the shape of six bytes in hexadecimal separated by a colon each.";
-        };
-      };});
-      example = [
-        {
-          interface = "eth0";
-          method = "password";
-          password = "00:11:22:33:44:55";
-        }
-      ];
-      description = ''
-        Interfaces where to enable Wake-On-LAN, and how. Two methods available:
-        "magicpacket" and "password". The password has the shape of six bytes
-        in hexadecimal separated by a colon each. For more information,
-        check the ethtool manual.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config.powerManagement.powerUpCommands = lines;
-
-}
@@ -61,6 +61,8 @@ let
          MACAddress = i.macAddress;
        } // optionalAttrs (i.mtu != null) {
          MTUBytes = toString i.mtu;
+        } // optionalAttrs (i.wakeOnLan.enable == true) {
+          WakeOnLan = "magic";
        };
      };
    in listToAttrs (map createNetworkLink interfaces);
@@ -284,6 +284,13 @@ let
        '';
      };

+      wakeOnLan = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Wether to enable wol on this interface.";
+        };
+      };
    };

    config = {
@@ -8,7 +8,7 @@ let
  src = fetchurl {
    url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
    name="${pname}-${version}.AppImage";
-    sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ==";
+    sha512 = "jKuuM1vQANGYE2W0OGl+35mB1ve5K/xPcBTk2O1azPRBDlRVU0DHRSQy2T71kwhxES1ASRt91qAV/dATk6oUkw==";
  };

  appimageContents = appimageTools.extractType2 {
@@ -1,7 +1,6 @@
 { lib, stdenv
 , mkDerivation
 , fetchurl
-, autoPatchelfHook
 , dpkg
 , wrapGAppsHook
 , wrapQtAppsHook
@@ -34,6 +33,8 @@
 , unixODBC
 , xorg
 , zlib
+, steam
+, makeWrapper
 }:

 stdenv.mkDerivation rec {
@@ -53,7 +54,7 @@ stdenv.mkDerivation rec {
    rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so}
  '';

-  nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ];
+  nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper ];

  meta = with lib; {
    description = "Office suite, formerly Kingsoft Office";
@@ -107,6 +108,7 @@ stdenv.mkDerivation rec {
    sqlite
    unixODBC
    zlib
+    cups.lib
  ];

  dontPatchELF = true;
@@ -137,7 +139,12 @@ stdenv.mkDerivation rec {
    "tcmalloc" # gperftools
  ];

-  installPhase = ''
+  installPhase = let
+    steam-run = (steam.override {
+      extraPkgs = p: buildInputs;
+      nativeOnly = true;
+    }).run;
+  in ''
    prefix=$out/opt/kingsoft/wps-office
    mkdir -p $out
    cp -r opt $out
@@ -153,11 +160,14 @@ stdenv.mkDerivation rec {
      substituteInPlace $i \
        --replace /usr/bin $out/bin
    done
-  '';

-  runtimeLibPath = lib.makeLibraryPath [
-    cups.lib
-  ];
+    for i in wps wpp et wpspdf; do
+      mv $out/bin/$i $out/bin/.$i-orig
+      makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \
+        --add-flags $out/bin/.$i-orig \
+        --argv0 $i
+    done
+  '';

  dontWrapQtApps = true;
  dontWrapGApps = true;
@@ -166,8 +176,7 @@ stdenv.mkDerivation rec {
      echo "Wrapping $f"
      wrapProgram "$f" \
        "''${gappsWrapperArgs[@]}" \
-        "''${qtWrapperArgs[@]}" \
-        --suffix LD_LIBRARY_PATH : "$runtimeLibPath"
+        "''${qtWrapperArgs[@]}"
    done
  '';
 }
@@ -3,11 +3,11 @@

 buildPythonApplication rec {
  pname = "MAVProxy";
-  version = "1.8.43";
+  version = "1.8.44";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "685e595dc8ccf354a62b354b5ef4b1f9558c4b76b1216a093dd1cc1fae37dd27";
+    sha256 = "104000a0e57ef4591bdf28addf8057339b22cbff9501ba92b9b1720d0b2b7325";
  };

  postPatch = ''
@@ -333,6 +333,11 @@ stdenv.mkDerivation {
    # XXX: Some tests added in 2.24.0 fail.
    # Please try to re-enable on the next release.
    disable_test t7816-grep-binary-pattern
+    # fail (as of 2.33.0)
+    #===(   18623;1208  8/?  224/?  2/? )= =fatal: Not a valid object name refs/tags/signed-empty
+    disable_test t6300-for-each-ref
+    #===(   22665;1651  9/?  1/?  0/?  0/? )= =/private/tmp/nix-build-git-2.33.0.drv-2/git-2.33.0/t/../contrib/completion/git-completion.bash: line 405: compgen: command not found
+    disable_test t9902-completion
  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
    # Test fails (as of 2.17.0, musl 1.1.19)
    disable_test t3900-i18n-commit
@@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "chess";
-  version = "1.6.1";
+  version = "1.7.0";

  disabled = pythonOlder "3.7";

@@ -15,7 +15,7 @@ buildPythonPackage rec {
    owner = "niklasf";
    repo = "python-${pname}";
    rev = "v${version}";
-    sha256 = "sha256-2pyABmr6q1Y2/ivtvMYqRHE2Zjlyz2QO0us0w4l2HQM=";
+    sha256 = "0f2q9sif1rqjlgzkf7dnxrclmw8v84hzyrnq21g8k1cwqj5fx9j2";
  };

  pythonImportsCheck = [ "chess" ];
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "colorlog";
-  version = "6.4.1";
+  version = "6.5.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8";
+    sha256 = "cf62a8e389d5660d0d22be17937b25b9abef9497ddc940197d1773aa1f604339";
  };

  checkInputs = [ pytestCheckHook ];
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "databricks-connect";
-  version = "8.1.13";
+  version = "8.1.14";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2833679bccd507e3eac9ec931cfae85c8070a78ad1286159475b7d3b79a40dc2";
+    sha256 = "8f110955a1a50e46dc03dbd969a8765b9493268153de16704767b226e4fe186e";
  };

  sourceRoot = ".";
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "proxmoxer";
-  version = "1.1.1";
+  version = "1.2.0";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "09fz8zbxjaly9zqksvq6cqp66plbsyjsmndy4g25ryys45siz1ny";
+    sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ=";
  };

  propagatedBuildInputs = [
@@ -6,12 +6,12 @@ let
 in

 buildPythonPackage rec {
-  version = "2.0.1";
+  version = "2.0.2";
  pname = "pyscard";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2ba5ed0db0ed3c98e95f9e34016aa3a57de1bc42dd9030b77a546036ee7e46d8";
+    sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e";
  };

  postPatch = if withApplePCSC then ''
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, nose }:

 buildPythonPackage rec {
-  version = "1.16";
+  version = "1.17";
  pname = "python-stdnum";
  src = fetchPypi {
    inherit pname version;
-    sha256 = "4248d898042a801fc4eff96fbfe4bf63a43324854efe3b5534718c1c195c6f43";
+    sha256 = "374e2b5e13912ccdbf50b0b23fca2c3e0531174805c32d74e145f37756328340";
  };

  checkInputs = [ nose ];