From 3d6a7598273dd298f05c74102123d6662680f2ae Mon Sep 17 00:00:00 2001 From: Zuckerberg Date: Sun, 12 Oct 2025 13:33:53 -0700 Subject: [PATCH] Update nixpkgs --- common/pc/vscodium.nix | 18 ++++---------- common/shell.nix | 3 +++ flake.lock | 48 ++++++++++++++++++------------------- patches/librespot-pin.patch | 11 ++++----- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/common/pc/vscodium.nix b/common/pc/vscodium.nix index 743d81d..cc33ed5 100644 --- a/common/pc/vscodium.nix +++ b/common/pc/vscodium.nix @@ -14,24 +14,14 @@ let rust-lang.rust-analyzer vadimcn.vscode-lldb tauri-apps.tauri-vscode + platformio.platformio-vscode-ide + vue.volar ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ - { - name = "platformio-ide"; - publisher = "platformio"; - version = "3.1.1"; - sha256 = "g9yTG3DjVUS2w9eHGAai5LoIfEGus+FPhqDnCi4e90Q="; - } { name = "wgsl-analyzer"; publisher = "wgsl-analyzer"; - version = "0.8.1"; - sha256 = "ckclcxdUxhjWlPnDFVleLCWgWxUEENe0V328cjaZv+Y="; - } - { - name = "volar"; - publisher = "Vue"; - version = "2.2.4"; - sha256 = "FHS/LNjSUVfCb4SVF9naR4W0JqycWzSWiK54jfbRagA="; + version = "0.12.105"; + sha256 = "sha256-NheEVNIa8CIlyMebAhxRKS44b1bZiWVt8PgC6r3ExMA="; } ]; diff --git a/common/shell.nix b/common/shell.nix index 49d1d8b..aa1697d 100644 --- a/common/shell.nix +++ b/common/shell.nix @@ -41,6 +41,9 @@ # comma uses the "nix-index" package built into nixpkgs by default. # That package doesn't use the prebuilt nix-index database so it needs to be changed. comma = prev.comma.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + prev.makeWrapper + ]; postInstall = '' wrapProgram $out/bin/comma \ --prefix PATH : ${lib.makeBinPath [ prev.fzy config.programs.nix-index.package ]} diff --git a/flake.lock b/flake.lock index 6dfb0e4..4d3ab7b 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ ] }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1749105467, - "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=", + "lastModified": 1756719547, + "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6bc76b872374845ba9d645a2f012b764fecd765f", + "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1752346111, - "narHash": "sha256-SVxCIYnbED0rNYSpm3QQoOhqxYRp1GuE9FkyM5Y2afs=", + "lastModified": 1760241904, + "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "deff7a9a0aa98a08d8c7839fe2658199ce9828f8", + "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", "type": "github" }, "original": { @@ -241,11 +241,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752431364, - "narHash": "sha256-ciGIXIMq2daX5o4Tn6pnZTd1pf5FICHbqUlHu658G9c=", + "lastModified": 1759884237, + "narHash": "sha256-tfTIIUVKUG1pRahjhQEdp3N9PJ7+ca10HJoHF31ezxE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb0f0dbfd95f0e19fdeab8e0f18bf0b5cf057b68", + "rev": "ebea684a18162e8a4210f739fcd459a74bc8d7ff", "type": "github" }, "original": { @@ -327,11 +327,11 @@ ] }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1755110674, + "narHash": "sha256-PigqTAGkdBYXVFWsJnqcirrLeFqRFN4PFigLA8FzxeI=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "f5936247dbdb8501221978562ab0b302dd75456c", "type": "gitlab" }, "original": { diff --git a/patches/librespot-pin.patch b/patches/librespot-pin.patch index 1e27f26..48f6d10 100644 --- a/patches/librespot-pin.patch +++ b/patches/librespot-pin.patch @@ -1,8 +1,8 @@ diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix -index 9694c3d0cf4f..ca9502de7ee1 100644 +index f5ff221e1bfe..b85f6b53af1d 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix -@@ -25,14 +25,19 @@ rustPlatform.buildRustPackage rec { +@@ -25,13 +25,18 @@ rustPlatform.buildRustPackage rec { version = "0.6.0"; src = fetchFromGitHub { @@ -11,13 +11,12 @@ index 9694c3d0cf4f..ca9502de7ee1 100644 repo = "librespot"; - rev = "v${version}"; - sha256 = "sha256-dGQDRb7fgIkXelZKa+PdodIs9DxbgEMlVGJjK/hU3Mo="; -+ rev = "786cc46199e583f304a84c786acb0a9b37bc3fbd"; -+ sha256 = "sha256-xaOrqC8yCjF23Tz31RD3CzqZ3xxrDM6ncW1yoovEaGQ="; ++ rev = "ab9ecb6d936edf24b18258be981966692e705a02"; ++ sha256 = "sha256-7Wx7+2OYAczNKzqRH2v8fwNAfll27Bdr3Fo23uDtQ4Y="; }; - useFetchCargoVendor = true; - cargoHash = "sha256-SqvJSHkyd1IicT6c4pE96dBJNNodULhpyG14HRGVWCk="; -+ cargoHash = "sha256-sUAZgOuBD9CGAy1mRqLRzVnVfxB0DqSCNAc2yzItTCA="; ++ cargoHash = "sha256-s6qUI+pDyfBRhuPuBsi2eVxH9DLXEgISf/N4ZY3zDgc="; + + cargoBuildFlags = [ + "--features"