From f9d95f30a4989200ff7f34f3d572d787e47dbbf6 Mon Sep 17 00:00:00 2001 From: mlatus Date: Wed, 9 Jun 2021 11:42:03 +0800 Subject: [PATCH 01/12] use steam-run to launch wps --- .../applications/office/wpsoffice/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index b18f22b6c1dc..ded01babc796 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -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 ''; } From 7c47e9dc91de5d073956c43e896e2e3d6b0960f7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 23 Sep 2021 21:16:55 +0000 Subject: [PATCH 02/12] python38Packages.pyscard: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pyscard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index fd31b15fdc77..caa5e4e24405 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -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 '' From 5ffc897238e5cef63795a06a028f1e6afbff97f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Sep 2021 03:11:29 +0000 Subject: [PATCH 03/12] python38Packages.databricks-connect: 8.1.13 -> 8.1.14 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 38095ea009df..a719658a509b 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -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 = "."; From 011031876426009d398db7b1e17d20398a885fdd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 Oct 2021 10:22:39 +0000 Subject: [PATCH 04/12] python38Packages.python-stdnum: 1.16 -> 1.17 --- pkgs/development/python-modules/python-stdnum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 581813fac4d9..bb809674e830 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -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 ]; From a1e297d282475408c56bf90ad97063e97765642f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Oct 2021 00:35:56 +0000 Subject: [PATCH 05/12] mavproxy: 1.8.43 -> 1.8.44 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f988dee102a2..4d231aa6e425 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -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 = '' From bb3ea37eeed0da6dbd2c6a6c08abbdd16cf5f875 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Fri, 1 Oct 2021 18:08:39 -0600 Subject: [PATCH 06/12] nixos/networking: add the wakeonlan option --- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/tasks/network-interfaces-scripted.nix | 2 ++ nixos/modules/tasks/network-interfaces.nix | 7 +++++++ 4 files changed, 18 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 0688de77af68..64ada2c75344 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -326,6 +326,13 @@
Backward Incompatibilities + + + The services.wakeonlan option was removed, + and replaced with + networking.interfaces.<name>.wakeOnLan. + + The security.wrappers option now requires diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 56babf8ac006..3018a26d520f 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -101,6 +101,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..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. diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 11bd159319a3..79624ec7072c 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -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); diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 34a44b383a49..82893d91fbba 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -284,6 +284,13 @@ let ''; }; + wakeOnLan = { + enable = mkOption { + type = types.bool; + default = false; + description = "Wether to enable wol on this interface."; + }; + }; }; config = { From 31f04fec3c4c993d75ea4c7243fbc57103525282 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 2 Oct 2021 09:41:02 -0600 Subject: [PATCH 07/12] nixos/wakeonlan: remove --- nixos/modules/module-list.nix | 1 - .../modules/services/networking/wakeonlan.nix | 70 ------------------- 2 files changed, 71 deletions(-) delete mode 100644 nixos/modules/services/networking/wakeonlan.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bff7b83ea711..16a863a649c3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -878,7 +878,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 diff --git a/nixos/modules/services/networking/wakeonlan.nix b/nixos/modules/services/networking/wakeonlan.nix deleted file mode 100644 index c6291366b0f1..000000000000 --- a/nixos/modules/services/networking/wakeonlan.nix +++ /dev/null @@ -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; - -} From f3cdffa9de55cc6152085d5d9df99329aa3dae8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 Oct 2021 06:43:16 +0000 Subject: [PATCH 08/12] python38Packages.chess: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index baef04eab5b5..94eea88efe8b 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -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" ]; From 757d3b91a6cac8a3668bd003aa62c041022432f1 Mon Sep 17 00:00:00 2001 From: Piper McCorkle Date: Fri, 8 Oct 2021 16:15:05 -0500 Subject: [PATCH 09/12] plexamp: update hash due to silent release --- pkgs/applications/audio/plexamp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 81912379de1d..c542517797e7 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -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 { From 83d2927d1e1dcaee7e07e89b00a58aa63e84494f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Oct 2021 00:08:46 -0700 Subject: [PATCH 10/12] python3Packages.colorlog: 6.4.1 -> 6.5.0 --- pkgs/development/python-modules/colorlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 6abb6ff023ad..d8a800f70ce0 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -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 ]; From 4c9f6db483bcea854306e297b1426f07c035793f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Oct 2021 09:57:43 +0200 Subject: [PATCH 11/12] python3Packages.proxmoxer: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/proxmoxer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index cdbec22bc1fe..125984554a0c 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -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 = [ From 903dc5bf924c87a466e93ed37001f9c1a6afbbd5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 9 Oct 2021 11:49:23 +0900 Subject: [PATCH 12/12] git: darwin: disable flaky tests --- .../version-management/git-and-tools/git/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9c9fa6032c6c..a5a20b3aa971 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -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