From b3bd50ef2b8c67b1cd32540aabf1212f02023958 Mon Sep 17 00:00:00 2001 From: Chris Montgomery Date: Fri, 27 Dec 2024 10:52:04 -0500 Subject: [PATCH] chore: update --- flake.lock | 221 ++++++++---------- flake.nix | 7 +- nixos/default.nix | 1 - overlays/mkDefaultOverlay.nix | 9 +- .../5415-Discogs-plugin-type-error.patch | 185 --------------- 5 files changed, 105 insertions(+), 318 deletions(-) delete mode 100644 packages/beets/patches/5415-Discogs-plugin-type-error.patch diff --git a/flake.lock b/flake.lock index db3b8804..56c21032 100644 --- a/flake.lock +++ b/flake.lock @@ -187,11 +187,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1731527002, - "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", + "lastModified": 1734897875, + "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=", "owner": "zhaofengli", "repo": "colmena", - "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", + "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1730493816, - "narHash": "sha256-DvvfeGE4hNugDAWtF6+Ii+iTYH1ug944d0aWQLQC/Tw=", + "lastModified": 1734452974, + "narHash": "sha256-cu4s49/JAAO1EMBqvLf23x56F4+G5G4zgnhD6amyFfM=", "owner": "astro", "repo": "deadnix", - "rev": "435226dd2a8a629eb6133415a5c2e3d9a5eb1312", + "rev": "47a0ded6df5dced6724d4931869e7f62788a714a", "type": "github" }, "original": { @@ -372,11 +372,11 @@ ] }, "locked": { - "lastModified": 1732988076, - "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=", + "lastModified": 1735048446, + "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", "owner": "nix-community", "repo": "disko", - "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1", + "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", "type": "github" }, "original": { @@ -480,11 +480,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1733764513, - "narHash": "sha256-anfaPURDUUuPMIybnQ2nQJ/gXxqkl8b1Ha/ehq2LeyM=", + "lastModified": 1735265093, + "narHash": "sha256-vTaiIj5g5AkKf2Z9mAMEeNc0y1OClaSmFNeIbQtP/0s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4f8045e953c68f261e2b870507f2a9e6c35a5629", + "rev": "4b0e7b77b538ee7a012404c62dad556c1fdf26a2", "type": "github" }, "original": { @@ -521,11 +521,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1733619594, - "narHash": "sha256-GM8OoopyhQLfVzKLF+Bd9m3p4SY680wFh7YLK5fJCRQ=", + "lastModified": 1735005475, + "narHash": "sha256-R9RNm15WfclJE1joYh61bej3FN7un/3NGyimll5mTV4=", "owner": "seadome", "repo": "firefox-addons", - "rev": "efc403c48d25922d0126ac4f23ba9b640609d513", + "rev": "6ce179e45b3adf59b6a8608f64b89dda7e8b3921", "type": "github" }, "original": { @@ -832,11 +832,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1155,11 +1155,11 @@ ] }, "locked": { - "lastModified": 1733075221, - "narHash": "sha256-1U+OGR6FWNem2Zrv92b1T64s+vw5MAFT3Prh+vWy/1I=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f78e2d1c6a9db76444e02a73f0669ebb79f8833", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -1233,11 +1233,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1733055216, - "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=", + "lastModified": 1734869532, + "narHash": "sha256-tMWJ1gDqNkCaH6jmZRXAUUhfhIrLMWJBiM+CtAtQqoY=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3", + "rev": "1451a8a6902c85c90dae3c253df5401b7eb3581f", "type": "github" }, "original": { @@ -1255,11 +1255,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1733003272, - "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=", + "lastModified": 1735074045, + "narHash": "sha256-CeYsC8J2dNiV2FCQOxK1oZ/jNpOF2io7aCEFHmfi95U=", "owner": "astro", "repo": "microvm.nix", - "rev": "e8d5f12b834a59187c7ec147a8952a0567f97939", + "rev": "2ae08de8e8068b00193b9cfbc0acc9dfdda03181", "type": "github" }, "original": { @@ -1309,11 +1309,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1732661062, - "narHash": "sha256-E8mk/P0wUpHXy7tDQqUzbpa9IJoN/DmA1a6iFBuXqgI=", + "lastModified": 1734848678, + "narHash": "sha256-HtGPXGyzOsHJLq6nwvBV763y6l7fC9FuWIM0hNh1Y6E=", "owner": "musnix", "repo": "musnix", - "rev": "629dcc6010365cfd268702065c2f8149ae19ea02", + "rev": "e76b3cdd23d49a11210a551f8ea4d49d7022e639", "type": "github" }, "original": { @@ -1457,11 +1457,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732631228, - "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=", + "lastModified": 1733909753, + "narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf", + "rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884", "type": "github" }, "original": { @@ -1541,11 +1541,11 @@ ] }, "locked": { - "lastModified": 1733629314, - "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=", + "lastModified": 1735222882, + "narHash": "sha256-kWNi45/mRjQMG+UpaZQ7KyPavYrKfle3WgLn9YeBBVg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8", + "rev": "7e3246f6ad43b44bc1c16d580d7bf6467f971530", "type": "github" }, "original": { @@ -1734,11 +1734,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -1754,16 +1754,16 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1732994859, - "narHash": "sha256-5s1l2r+txJhmPfRjdV0oOnEDC43qsKTWej3eLgMcMfg=", + "lastModified": 1735172763, + "narHash": "sha256-a6n8RsiAolz6p24Fsr/gTndx9xr9USpKqKK6kzBeXQc=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "455b13ef013b4c0e27d6e2f6572350d4cb83162d", + "rev": "3daf0637409689d7a1304cedc50d20542bc47905", "type": "github" }, "original": { "owner": "tpwrules", - "ref": "release-2024-11-30", + "ref": "release-2024-12-25", "repo": "nixos-apple-silicon", "type": "github" } @@ -1776,11 +1776,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", "type": "github" }, "original": { @@ -1791,11 +1791,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733066523, - "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fe01780d356d70fd119a19277bff71d3e78dad00", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -1806,27 +1806,27 @@ }, "nixos-stable": { "locked": { - "lastModified": 1733016324, - "narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixos-unstable": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1838,11 +1838,11 @@ }, "nixos-unstable_2": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1898,22 +1898,6 @@ "type": "indirect" } }, - "nixpkgs-beets-pr-358086": { - "locked": { - "lastModified": 1733062871, - "narHash": "sha256-X0myN2DxFeRXzPyRBBjnPNeJDrCxex4q3sZHyQb1I3U=", - "owner": "montchr", - "repo": "nixpkgs", - "rev": "7a703bcd233c1cd25e80b99d68117af9142ec6bd", - "type": "github" - }, - "original": { - "owner": "montchr", - "ref": "update/beets", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1733096140, @@ -1940,11 +1924,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1733015484, - "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=", + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", "type": "github" }, "original": { @@ -1989,11 +1973,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1735141468, + "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce", "type": "github" }, "original": { @@ -2021,11 +2005,11 @@ }, "nixpkgs-trunk": { "locked": { - "lastModified": 1733077051, - "narHash": "sha256-GqN/zfYNMPpQzCH5NkxWKcFbOqY9jBPFRyhqG2MzjWA=", + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c14612d5019cdfe1b43fc2cc32e81c3419a87fba", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", "type": "github" }, "original": { @@ -2045,11 +2029,11 @@ ] }, "locked": { - "lastModified": 1733057974, - "narHash": "sha256-f8XFY4I6f1hLPTQUXPaDeXVf4/9Dr6JtS4yxSxupBp8=", + "lastModified": 1734896070, + "narHash": "sha256-HECsyS551+KtffczDgx7w/xvruXHKoUf4JX7xW+Ecbo=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "4bc0745c996aae2c9befaf512eb85e1d610d6228", + "rev": "8988b0603fed7e3d303718328cf4cd8dd137575e", "type": "github" }, "original": { @@ -2144,11 +2128,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -2192,11 +2176,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -2288,11 +2272,11 @@ }, "nixpkgs_23": { "locked": { - "lastModified": 1732718005, - "narHash": "sha256-rBd/tZyE0iw6C/xPOwqXZwIOi6sLA29t0ZXNomhBkqw=", + "lastModified": 1734838250, + "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e245a698cd491e8d91cabc22901fd8c8cedf2e23", + "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", "type": "github" }, "original": { @@ -2382,11 +2366,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -2398,11 +2382,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1734126203, + "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", "type": "github" }, "original": { @@ -2681,11 +2665,11 @@ ] }, "locked": { - "lastModified": 1733665616, - "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -2770,7 +2754,6 @@ "nixos-apple-silicon", "nixpkgs" ], - "nixpkgs-beets-pr-358086": "nixpkgs-beets-pr-358086", "nixpkgs-trunk": "nixpkgs-trunk", "nixpkgs-wayland": "nixpkgs-wayland", "pre-commit-hooks": "pre-commit-hooks_2", @@ -2960,11 +2943,11 @@ "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -2976,11 +2959,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1729945407, - "narHash": "sha256-iGNMamNOAnVTETnIVqDWd6fl74J8fLEi1ejdZiNjEtY=", + "lastModified": 1733308308, + "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=", "ref": "refs/heads/main", - "rev": "f1d94ee7029af18637dbd5fdf4749621533693fa", - "revCount": 764, + "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2", + "revCount": 792, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -2994,11 +2977,11 @@ "nixpkgs": "nixpkgs_23" }, "locked": { - "lastModified": 1732791727, - "narHash": "sha256-E3ki8879tKii42pjibenRpJSDVW0mJFfSWHbci5Ck0s=", + "lastModified": 1735211499, + "narHash": "sha256-qmR8BbOh4hXHaeReNqIGSfFmKom2y7sXXQTJT1qNitM=", "owner": "numtide", "repo": "srvos", - "rev": "ce61f7168038e4077ed6e27a4aa9f2c3c3500099", + "rev": "2a30339b3f4336092557655d57448cdcb3a2ee77", "type": "github" }, "original": { @@ -3277,11 +3260,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fcaf6898..f144e65b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ { nixpkgs, nixpkgs-trunk, - nixpkgs-beets-pr-358086, flake-parts, haumea, namaka, @@ -61,7 +60,6 @@ overlays = [ (import ./overlays/mkDefaultOverlay.nix { inherit - nixpkgs-beets-pr-358086 nixpkgs-trunk ; }) @@ -79,10 +77,9 @@ nixpkgs.follows = "nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixos-unstable.url = "github:montchr/nixpkgs/nixos-unstable"; - nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; 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"; @@ -96,7 +93,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # nixos-apple-silicon.url = "github:montchr/nixos-apple-silicon?ref=main"; - nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon?ref=release-2024-11-30"; + nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon?ref=release-2024-12-25"; asahi-tuvok-firmware.url = "git+ssh://git@git.sr.ht/~montchr/asahi-tuvok-firmware"; nixos-hardware.url = "github:NixOS/nixos-hardware"; # FIXME: update diff --git a/nixos/default.nix b/nixos/default.nix index 1bbaed56..8a5365e9 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -40,7 +40,6 @@ let overlays = [ (import ../overlays/mkDefaultOverlay.nix { inherit (inputs) - nixpkgs-beets-pr-358086 nixpkgs-trunk ; }) diff --git a/overlays/mkDefaultOverlay.nix b/overlays/mkDefaultOverlay.nix index ae27f962..7776f53e 100644 --- a/overlays/mkDefaultOverlay.nix +++ b/overlays/mkDefaultOverlay.nix @@ -1,12 +1,5 @@ -{ nixpkgs-beets-pr-358086, nixpkgs-trunk }: +{ nixpkgs-trunk }: final: prev: { - # - 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 nix-init diff --git a/packages/beets/patches/5415-Discogs-plugin-type-error.patch b/packages/beets/patches/5415-Discogs-plugin-type-error.patch deleted file mode 100644 index 89499bc7..00000000 --- a/packages/beets/patches/5415-Discogs-plugin-type-error.patch +++ /dev/null @@ -1,185 +0,0 @@ -From f4a7ccda7402d2c3f0b3a3b5b203a6d97229b4c1 Mon Sep 17 00:00:00 2001 -From: Konstantin <78656278+amogus07@users.noreply.github.com> -Date: Tue, 10 Sep 2024 23:36:10 +0200 -Subject: [PATCH 1/9] Update discogs.py - ---- - beetsplug/discogs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py -index 344d67a243..2a28160b56 100644 ---- a/beetsplug/discogs.py -+++ b/beetsplug/discogs.py -@@ -416,7 +416,7 @@ def get_album_info(self, result): - albumtype = media = label = catalogno = labelid = None - if result.data.get("formats"): - albumtype = ( -- ", ".join(result.data["formats"][0].get("descriptions", [])) -+ ", ".join(str(result.data["formats"][0].get("descriptions", []))) - or None - ) - media = result.data["formats"][0]["name"] - -From cf6c0896158fd39222f4621b66490eabba94d561 Mon Sep 17 00:00:00 2001 -From: Konstantin <78656278+amogus07@users.noreply.github.com> -Date: Tue, 10 Sep 2024 23:41:52 +0200 -Subject: [PATCH 2/9] happy now? - ---- - beetsplug/discogs.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py -index 2a28160b56..0a32135028 100644 ---- a/beetsplug/discogs.py -+++ b/beetsplug/discogs.py -@@ -416,7 +416,9 @@ def get_album_info(self, result): - albumtype = media = label = catalogno = labelid = None - if result.data.get("formats"): - albumtype = ( -- ", ".join(str(result.data["formats"][0].get("descriptions", []))) -+ ", ".join( -+ str(result.data["formats"][0].get("descriptions", [])) -+ ) - or None - ) - media = result.data["formats"][0]["name"] - -From 59b8d72fb503f131eaa6a13bce6d5e36aca2e01f Mon Sep 17 00:00:00 2001 -From: Konstantin -Date: Thu, 12 Sep 2024 18:02:52 +0200 -Subject: [PATCH 3/9] Use list() instead of str() - ---- - beetsplug/discogs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py -index 0a32135028..a74ddaba03 100644 ---- a/beetsplug/discogs.py -+++ b/beetsplug/discogs.py -@@ -417,7 +417,7 @@ def get_album_info(self, result): - if result.data.get("formats"): - albumtype = ( - ", ".join( -- str(result.data["formats"][0].get("descriptions", [])) -+ list(result.data["formats"][0].get("descriptions", [])) - ) - or None - ) - -From 393ca44facd25a3ccf6a6ad19812cfe1291992f5 Mon Sep 17 00:00:00 2001 -From: Konstantin -Date: Wed, 18 Sep 2024 22:01:30 +0200 -Subject: [PATCH 4/9] discogs: prevent TypeError - ---- - beetsplug/discogs.py | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py -index a74ddaba03..c896febf90 100644 ---- a/beetsplug/discogs.py -+++ b/beetsplug/discogs.py -@@ -414,14 +414,10 @@ def get_album_info(self, result): - # Extract information for the optional AlbumInfo fields that are - # contained on nested discogs fields. - albumtype = media = label = catalogno = labelid = None -- if result.data.get("formats"): -- albumtype = ( -- ", ".join( -- list(result.data["formats"][0].get("descriptions", [])) -- ) -- or None -- ) -- media = result.data["formats"][0]["name"] -+ if (formats := result.data.get("formats")) and (fmt := formats[0]): -+ if descriptions := fmt["descriptions"]: -+ albumtype = ", ".join(descriptions) -+ media = fmt["name"] - if result.data.get("labels"): - label = result.data["labels"][0].get("name") - catalogno = result.data["labels"][0].get("catno") - -From fe642a78f8f831eebe217163b0ec780991f4181b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= -Date: Thu, 19 Sep 2024 13:37:12 +0100 -Subject: [PATCH 9/9] Isolate parsing formats into a separate method and test - it - ---- - beetsplug/discogs.py | 31 ++++++++++++++++++++++++++----- - test/plugins/test_discogs.py | 27 +++++++++++++++++++++++++-- - 2 files changed, 51 insertions(+), 7 deletions(-) - -diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py -index c896febf90..0dc8e8a175 100644 ---- a/beetsplug/discogs.py -+++ b/beetsplug/discogs.py -@@ -16,6 +16,8 @@ - python3-discogs-client library. - """ - -+from __future__ import annotations -+ - import http.client - import json - import os -@@ -30,6 +32,7 @@ - from discogs_client import __version__ as dc_string - from discogs_client.exceptions import DiscogsAPIError - from requests.exceptions import ConnectionError -+from typing_extensions import TypedDict - - import beets - import beets.ui -@@ -52,6 +55,12 @@ - ) - - -+class ReleaseFormat(TypedDict): -+ name: str -+ qty: int -+ descriptions: list[str] | None -+ -+ - class DiscogsPlugin(BeetsPlugin): - def __init__(self): - super().__init__() -@@ -363,6 +372,18 @@ def get_master_year(self, master_id): - ) - return None - -+ @staticmethod -+ def get_media_and_albumtype( -+ formats: list[ReleaseFormat] | None, -+ ) -> tuple[str | None, str | None]: -+ media = albumtype = None -+ if formats and (first_format := formats[0]): -+ if descriptions := first_format["descriptions"]: -+ albumtype = ", ".join(descriptions) -+ media = first_format["name"] -+ -+ return media, albumtype -+ - def get_album_info(self, result): - """Returns an AlbumInfo object for a discogs Release object.""" - # Explicitly reload the `Release` fields, as they might not be yet -@@ -413,11 +434,11 @@ def get_album_info(self, result): - - # Extract information for the optional AlbumInfo fields that are - # contained on nested discogs fields. -- albumtype = media = label = catalogno = labelid = None -- if (formats := result.data.get("formats")) and (fmt := formats[0]): -- if descriptions := fmt["descriptions"]: -- albumtype = ", ".join(descriptions) -- media = fmt["name"] -+ media, albumtype = self.get_media_and_albumtype( -+ result.data.get("formats") -+ ) -+ -+ label = catalogno = labelid = None - if result.data.get("labels"): - label = result.data["labels"][0].get("name") - catalogno = result.data["labels"][0].get("catno")