Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix

2 files changed, 44 insertions, 2 deletions

diff --git a/nixpkgs/pkgs/by-name/so/soco-cli/package.nix b/nixpkgs/pkgs/by-name/so/soco-cli/package.nix
new file mode 100644
index 000000000000..b2b415414c79
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/so/soco-cli/package.nix
@@ -0,0 +1,42 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "soco-cli";
+  version = "0.4.73";
+  format = "setuptools";
+
+  disabled = python3.pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "avantrec";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-WxBwHjh5tCXclQXqrHrpvZdcQU93RObteAfZyyVvKf0=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    fastapi
+    rangehttpserver
+    soco
+    tabulate
+    uvicorn
+  ];
+
+  # Tests wants to communicate with hardware
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "soco_cli"
+  ];
+
+  meta = {
+    description = "Command-line interface to control Sonos sound systems";
+    homepage = "https://github.com/avantrec/soco-cli";
+    license = with lib.licenses; [ asl20 ];
+    mainProgram = "sonos";
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/nixpkgs/pkgs/by-name/so/sov/package.nix b/nixpkgs/pkgs/by-name/so/sov/package.nix
index d6d9f4053123..abb204ed8fa7 100644
--- a/nixpkgs/pkgs/by-name/so/sov/package.nix
+++ b/nixpkgs/pkgs/by-name/so/sov/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sov";
-  version = "0.93";
+  version = "0.94";
 
   src = fetchFromGitHub {
     owner = "milgra";
     repo = "sov";
     rev = finalAttrs.version;
-    hash = "sha256-Oc25ixrl0QX0jBBMV34BPAixyBikvevXJ1JNGZymPhg=";
+    hash = "sha256-JgLah21ye3G9jE3UTZu8r+nanwBDIQXmqv9iP1C+aUw=";
   };
 
   patches = [