From 0181793068ea05e7e88132e8397bf87cd1851790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 24 Mar 2024 14:25:30 -0700 Subject: [PATCH 1/2] mousai: 0.7.6 -> 0.7.7 Diff: https://github.com/SeaDve/Mousai/compare/v0.7.6...v0.7.7 --- pkgs/applications/audio/mousai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 1ce6a0ea8209..48535143a509 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -23,19 +23,19 @@ stdenv.mkDerivation rec { pname = "mousai"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - hash = "sha256-QInnKjGYaWlIj+F3upQ8CJ6RqCM72Y+BGrrezndqfOg="; + hash = "sha256-8N/31WhE79qLzhWxa0EJXJ4k/rg7HUqXZkidbgwNHo4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/AwTNuDdhAhj/kbc6EdC3FKGO1LfZIY68utPjcrw0S0="; + hash = "sha256-FjnRI1vHA9YF/Uw2+hDtMJmeJVa5RcxaYoG4XgXa9Ds="; }; nativeBuildInputs = [ From a8e5c604cccfa65423bea577879abfe15443f5d4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:44:22 +0200 Subject: [PATCH 2/2] mousai: move to pkgs/by-name --- pkgs/applications/audio/mousai/paths.patch | 13 ------------- .../default.nix => by-name/mo/mousai/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 15 deletions(-) delete mode 100644 pkgs/applications/audio/mousai/paths.patch rename pkgs/{applications/audio/mousai/default.nix => by-name/mo/mousai/package.nix} (100%) diff --git a/pkgs/applications/audio/mousai/paths.patch b/pkgs/applications/audio/mousai/paths.patch deleted file mode 100644 index 35b328ad0ea3..000000000000 --- a/pkgs/applications/audio/mousai/paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/backend/utils.py b/src/backend/utils.py -index cebc009..0087c09 100644 ---- a/src/backend/utils.py -+++ b/src/backend/utils.py -@@ -79,7 +79,7 @@ class Utils: - @staticmethod - def get_default_audio_sources(): - pactl_output = subprocess.run( -- ['/usr/bin/pactl', 'info'], -+ ['@pactl@', 'info'], - stdout=subprocess.PIPE, - text=True - ).stdout.splitlines() diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/by-name/mo/mousai/package.nix similarity index 100% rename from pkgs/applications/audio/mousai/default.nix rename to pkgs/by-name/mo/mousai/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 888cbbbb9b01..8f6c25d94a02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32850,8 +32850,6 @@ with pkgs; motif = callPackage ../development/libraries/motif { }; - mousai = callPackage ../applications/audio/mousai { }; - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };