From d783afb8de9a375d4573e31c2d6b455093385492 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 29 Aug 2021 18:07:51 +0200 Subject: [PATCH 1/3] cozy: 1.0.3 -> 1.1.2 --- pkgs/applications/audio/cozy-audiobooks/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 88ac8002140e..3a53f7d2df92 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , gobject-introspection , libhandy +, libdazzle , python3Packages , file , cairo @@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.0.3"; + version = "1.1.2"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +34,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "0m0xiqpb87pwr3fhy0a4qxg67yjhwchcxj3x2anyy0li4inryxag"; + sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ python3Packages.buildPythonApplication rec { cairo gettext gnome.adwaita-icon-theme + libdazzle libhandy pantheon.granite ] ++ (with gst_all_1; [ From a3c6a337686cea58eab5d52625b5935c917c809e Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Wed, 28 Jul 2021 21:22:21 +0200 Subject: [PATCH 2/3] cozy: add gst-plugin-bad This adds support for: ISO Media, Apple iTunes ALAC/AAC-LC (.M4A) Audio --- pkgs/applications/audio/cozy-audiobooks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index 3a53f7d2df92..fa864700dbe7 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec { gst-plugins-good gst-plugins-ugly gst-plugins-base + gst-plugins-bad ]); propagatedBuildInputs = with python3Packages; [ From c8624013d3cd14134349f43f3272d97c32092ee9 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 29 Aug 2021 18:11:36 +0200 Subject: [PATCH 3/3] cozy: rename directory and drop unused argument Suggestions by @mweinelt and @r-rmcgibbo. --- pkgs/applications/audio/{cozy-audiobooks => cozy}/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/applications/audio/{cozy-audiobooks => cozy}/default.nix (99%) diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy/default.nix similarity index 99% rename from pkgs/applications/audio/cozy-audiobooks/default.nix rename to pkgs/applications/audio/cozy/default.nix index fa864700dbe7..afceca2a54ba 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -11,7 +11,6 @@ , libhandy , libdazzle , python3Packages -, file , cairo , gettext , gnome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3597b93ea47d..de106c6efa8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1450,7 +1450,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) PCSC; }; - cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cozy = callPackage ../applications/audio/cozy { }; cpuid = callPackage ../os-specific/linux/cpuid { };