feat(beets|packages): use beets 2.1.0 from NixOS/nixpkgs#358086

montchr · Nov 23, 2024 · f7391d4 · f7391d4
1 parent 6dc98ed
commit f7391d4
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 50 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,6 +5,7 @@
     {
       nixpkgs,
       nixpkgs-trunk,
+      nixpkgs-beets-pr-358086,
       flake-parts,
       haumea,
       namaka,
@@ -58,8 +59,12 @@
                 inherit system;
                 config.allowUnfree = true;
                 overlays = [
-                  (import ./overlays/mkDefaultOverlay.nix { inherit nixpkgs-trunk; })
-                  (import ./overlays/beets.nix)
+                  (import ./overlays/mkDefaultOverlay.nix {
+                    inherit
+                      nixpkgs-beets-pr-358086
+                      nixpkgs-trunk
+                      ;
+                  })
                 ];
               };
             };
@@ -77,6 +82,7 @@
     nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
     nixpkgs-trunk.url = "github:NixOS/nixpkgs/master";
     nixpkgs-apple-silicon.follows = "nixos-apple-silicon/nixpkgs";
+    nixpkgs-beets-pr-358086.url = "github:montchr/nixpkgs?ref=update/beets";
 
     ##: core modules+libraries
     apparat.url = "sourcehut:~montchr/apparat";

diff --git a/home/profiles/media/beets/default.nix b/home/profiles/media/beets/default.nix
@@ -15,18 +15,18 @@ let
 in
 
 {
-  nixpkgs.overlays = [ (import ../../../../overlays/beets.nix) ];
-
-  home.packages = [ flake.perSystem.packages.beetcamp ];
+  #  home.packages = [ flake.perSystem.packages.beetcamp ];
 
   programs.beets = {
     enable = true;
-    package = pkgs.beets-unstable.override {
+    # package = pkgs.beets;
+    # FIXME: broken plugins with beets 2.1.0 ?
+    package = pkgs.beets.override {
       pluginOverrides = {
-        beetcamp = {
-          enable = true;
-          propagatedBuildInputs = [ flake.perSystem.packages.beetcamp ];
-        };
+        # beetcamp = {
+        #   enable = true;
+        #   propagatedBuildInputs = [ flake.perSystem.packages.beetcamp ];
+        # };
         filetote = {
           enable = true;
           propagatedBuildInputs = [ flake.perSystem.packages.beets-filetote ];
@@ -40,8 +40,12 @@ in
 
       plugins = [
         "albumtypes"
+
         # "badfiles" # slow -- only use as needed
-        "bandcamp" # aka "beetcamp"
+
+        # FIXME: breaks
+        # "bandcamp" # aka "beetcamp"
+
         "chroma"
         "discogs"
         "edit"

diff --git a/nixos/default.nix b/nixos/default.nix
@@ -12,7 +12,6 @@ let
     nixos-apple-silicon
     nixos-generators
     nixos-hardware
-    nixpkgs-trunk
     sops-nix
     srvos
     ;
@@ -39,9 +38,13 @@ let
       crossSystem.system = "aarch64-linux";
       localSystem.system = buildPlatform;
       overlays = [
-        (import ../overlays/mkDefaultOverlay.nix { inherit nixpkgs-trunk; })
+        (import ../overlays/mkDefaultOverlay.nix {
+          inherit (inputs)
+            nixpkgs-beets-pr-358086
+            nixpkgs-trunk
+            ;
+        })
         nixos-apple-silicon.overlays.default
-        (import ../overlays/beets.nix)
       ];
     };
 

diff --git a/overlays/beets.nix b/overlays/beets.nix
diff --git a/overlays/mkDefaultOverlay.nix b/overlays/mkDefaultOverlay.nix
@@ -1,5 +1,12 @@
-{ nixpkgs-trunk }:
+{ nixpkgs-beets-pr-358086, nixpkgs-trunk }:
 final: prev: {
+  # <https://github.com/NixOS/nixpkgs/pull/358086>
+  inherit (nixpkgs-beets-pr-358086.legacyPackages.${final.system})
+    beets
+    beets-unstable
+    beetsPackages
+    ;
+
   inherit (nixpkgs-trunk.legacyPackages.${final.system})
     # HACK: for compatibility with rust v1.80 <https://github.com/NixOS/nixpkgs/issues/332957>
     nix-init

diff --git a/packages/beets-packages.nix b/packages/beets-packages.nix
@@ -0,0 +1,23 @@
+{
+  perSystem =
+    { inputs', pkgs, ... }:
+    let
+      inherit (pkgs) callPackage;
+    in
+    {
+      packages = rec {
+        beetcamp = callPackage ./beets/plugins/beetcamp.nix {
+          inherit rich-tables;
+          beets = pkgs.beetsPackages.beets-minimal;
+        };
+        beets-filetote = callPackage ./beets/plugins/filetote.nix {
+          beets = pkgs.beetsPackages.beets-minimal;
+        };
+
+        rgbxy = callPackage ./python-modules/rgbxy.nix { };
+        rich-tables = callPackage ./python-modules/rich-tables.nix {
+          inherit rgbxy;
+        };
+      };
+    };
+}
diff --git a/packages/beets/plugins/beetcamp.nix b/packages/beets/plugins/beetcamp.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
 
   beets,
+  rich-tables,
 }:
 
 python3.pkgs.buildPythonApplication rec {

diff --git a/packages/beets/plugins/filetote.nix b/packages/beets/plugins/filetote.nix
@@ -24,23 +24,31 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     sed -i -e '/audible/d' tests/helper.py
+
+    # beets v2.1.0 compat
+    # <https://github.com/beetbox/beets/commit/0e87389994a9969fa0930ffaa607609d02e286a8>
+    sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
   pytestFlagsArray = [ "-r fEs" ];
 
   disabledTests = [
-    "test_audible_m4b_files.py"
-
     # XXX: Needs update for Beets v2.0.0
     # <https://github.com/gtronset/beets-filetote/discussions/160>
     "test_move_on_modify_command"
     "test_prune_modify_query"
   ];
 
+  disabledTestPaths = [
+    "tests/test_audible_m4b_files.py"
+  ];
+
   nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     beets
+    reflink
     toml
+    typeguard
   ];
 
   preBuild = ''

diff --git a/packages/default.nix b/packages/default.nix
@@ -1,12 +1,14 @@
 { inputs, ... }:
 {
+  imports = [ ./beets-packages.nix ];
+
   perSystem =
     { pkgs, system, ... }:
     let
       inherit (pkgs) callPackage;
     in
     {
-      packages = inputs.flake-utils.lib.filterPackages system (rec {
+      packages = inputs.flake-utils.lib.filterPackages system ({
         base16-schemes = callPackage ./base16-schemes/package.nix { };
         ddi = callPackage ./ddi/package.nix { };
         fzf-tab-completion = callPackage ./fzf-tab-completion/package.nix { };
@@ -26,21 +28,6 @@
         # TODO: not ready
         # wp-cli = callPackage ./wp-cli/package.nix { };
 
-        ##: python modules
-        rgbxy = callPackage ./python-modules/rgbxy.nix { };
-        rich-tables = callPackage ./python-modules/rich-tables.nix {
-          inherit rgbxy;
-        };
-
-        ##: beets plugins
-        beetcamp = callPackage ./beets/plugins/beetcamp.nix {
-          inherit rich-tables;
-          beets = pkgs.beetsPackages.beets-minimal;
-        };
-        beets-filetote = callPackage ./beets/plugins/filetote.nix {
-          beets = pkgs.beetsPackages.beets-minimal;
-        };
-
         vscode-php-debug = callPackage ./vscode-php-debug/package.nix { };
 
         aspell-with-dicts = (
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
       fetchFromGitHub,
       beets,
+      rich-tables,
     }:
     python3.pkgs.buildPythonApplication rec {
@@ Expand Down @@