5 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/by-name/lf/lf-make-map/src/mapping/map_key.rs b/pkgs/by-name/lf/lf-make-map/src/mapping/map_key.rs
index 10b612fd..5fd046fb 100644
--- a/pkgs/by-name/lf/lf-make-map/src/mapping/map_key.rs
+++ b/pkgs/by-name/lf/lf-make-map/src/mapping/map_key.rs
@@ -157,7 +157,7 @@ This should not happen, please report the bug!",
         };
 
         assert_eq!(
-            value.len(),
+            value.chars().count(),
             number_of_chars,
             "'{}' does not have expected length of: {}",
             value,
diff --git a/pkgs/by-name/mp/mpdpopm/update.sh b/pkgs/by-name/mp/mpdpopm/update.sh
index cf04b837..e0c0821b 100755
--- a/pkgs/by-name/mp/mpdpopm/update.sh
+++ b/pkgs/by-name/mp/mpdpopm/update.sh
@@ -10,7 +10,5 @@
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/agpl.txt>.
 
-nix flake update
-
 [ "$1" = "upgrade" ] && cargo upgrade
 cargo update
diff --git a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
index fa1cac49..6c96a9d9 100755
--- a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
+++ b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh
@@ -16,6 +16,6 @@ die() {
 }
 
 cd "$XDG_MUSIC_DIR/beets" || die "No music dir!"
-exiftool "$(mpc --format '%file%' current)" -json | jq '.[0].Lyrics' --raw-output | less
+exiftool "$(mpc --format '%file%' current)" -json | jq '.[0] | if has("Lyrics") then .Lyrics elif has("Lyrics-xxx") then ."Lyrics-xxx" else "<No lyrics key>" end' --raw-output | less
 
 # vim: ft=sh
diff --git a/pkgs/by-name/mp/mpp/mpp.sh b/pkgs/by-name/mp/mpp/mpp.sh
index 3ac98ddb..e52bfcdc 100755
--- a/pkgs/by-name/mp/mpp/mpp.sh
+++ b/pkgs/by-name/mp/mpp/mpp.sh
@@ -23,6 +23,10 @@ case "${1-}" in
     shift 1
     mpp-beetrm "$@"
     ;;
+"popm")
+    shift 1
+    mpdpopm "$@"
+    ;;
 *)
     mpc "$@"
     ;;
diff --git a/pkgs/by-name/mp/mpp/package.nix b/pkgs/by-name/mp/mpp/package.nix
index f0e454f7..fe08ba46 100644
--- a/pkgs/by-name/mp/mpp/package.nix
+++ b/pkgs/by-name/mp/mpp/package.nix
@@ -16,6 +16,7 @@
   mpp-searchadd,
   mpp-lyrics,
   mpp-beetrm,
+  mpdpopm,
   # Build dependencies
   fd,
   zsh,
@@ -30,6 +31,7 @@
       mpp-searchadd
       mpp-lyrics
       mpp-beetrm
+      mpdpopm
     ];
   };