From 15c8c25ff983ee636824f96cc9a712a1e061e054 Mon Sep 17 00:00:00 2001 From: leo60228 Date: Mon, 23 Dec 2024 12:07:40 -0500 Subject: [PATCH] upd8 flake --- flake.lock | 163 +++++++++++++++++++++++++----------- nixpkgs/nur.nix | 2 +- pkgs/vscode-fhs/default.nix | 4 +- 3 files changed, 116 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index f3adecf..b2e815f 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,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": { @@ -189,6 +189,27 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-programs-sqlite": { "inputs": { "nixpkgs": [ @@ -197,11 +218,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1732991462, - "narHash": "sha256-gtnhoJEpdWKkf2yE+37hwWl8SPGmCKIDTg5fChwUQg8=", + "lastModified": 1734968544, + "narHash": "sha256-kunOyFwo2gBEC/x4GbvOY0f34b4usonII902vxNWBo0=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "413137262e1601d72d0792e40b625ed35c7d77bb", + "rev": "5953ae011a587a6e08b340fc866e61aae2edb571", "type": "github" }, "original": { @@ -470,11 +491,11 @@ ] }, "locked": { - "lastModified": 1732884235, - "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", + "lastModified": 1734944412, + "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "819f682269f4e002884702b87e445c82840c68f2", + "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e", "type": "github" }, "original": { @@ -496,11 +517,11 @@ ] }, "locked": { - "lastModified": 1732915394, - "narHash": "sha256-OIPFkXbL1DzswQvNuds9Sm6r7lwRA5Fnalr/PNXTGtQ=", - "rev": "6285440304e74fdad01490f95419a6fe04cdc718", + "lastModified": 1733503045, + "narHash": "sha256-VoMam8Zzbk+X6dIYwH2f9NqItL6g9YDhQvGybzSl8xQ=", + "rev": "eccf01d4fef67f87b6383f96c73781bd08b686ac", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/hydra/archive/6285440304e74fdad01490f95419a6fe04cdc718.tar.gz?rev=6285440304e74fdad01490f95419a6fe04cdc718" + "url": "https://git.lix.systems/api/v1/repos/lix-project/hydra/archive/eccf01d4fef67f87b6383f96c73781bd08b686ac.tar.gz?rev=eccf01d4fef67f87b6383f96c73781bd08b686ac" }, "original": { "type": "tarball", @@ -545,11 +566,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1732899308, - "narHash": "sha256-1jsQqcbMbaWuFim3sqEUdB1/E2KqHa0+cHbTzd/GYFE=", + "lastModified": 1733932114, + "narHash": "sha256-LN4pgLjGWztTlJ4oDcKWvDuTFeUUVgbmXoZ2EXG20Gw=", "ref": "refs/heads/main", - "rev": "2e5780ebc848f3b021f11dd94533b0b68362d989", - "revCount": 16545, + "rev": "92ed9fee7d169febf53ea85961174fc0a22c2115", + "revCount": 16599, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -655,11 +676,11 @@ ] }, "locked": { - "lastModified": 1721727458, - "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "lastModified": 1733346208, + "narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=", "owner": "nmattia", "repo": "naersk", - "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", + "rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921", "type": "github" }, "original": { @@ -822,11 +843,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1731473366, - "narHash": "sha256-sE2WfD3YyNrCROfRZKqMDR77g3KV4FXUaJ7NWe+A7ro=", + "lastModified": 1733377410, + "narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "3eee753e4b074790342fadb1c4e7183d037ddac4", + "rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929", "type": "github" }, "original": { @@ -837,11 +858,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -852,11 +873,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732837521, - "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -915,6 +936,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1730157240, "narHash": "sha256-P8wF4ag6Srmpb/gwskYpnIsnspbjZlRvu47iN527ABQ=", @@ -931,12 +968,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1732988797, - "narHash": "sha256-0Q9bns9/zcyWx1mNVxF5Qam+xbX8jSBKGpappzADtjo=", + "lastModified": 1734972189, + "narHash": "sha256-yE05pfSQEyjhljwjBGA3e/egtNY7ETF7XJkQmwvxreI=", "owner": "nix-community", "repo": "NUR", - "rev": "47864a2407f2a3caaadd007ae4187200f08ce61e", + "rev": "dc7d0b05ee32bb917daa70c723e1707c5ec4f56f", "type": "github" }, "original": { @@ -949,9 +991,9 @@ "inputs": { "flake-utils": "flake-utils_8", "nix-github-actions": "nix-github-actions_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_8", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1731205797, @@ -975,7 +1017,7 @@ "nixpkgs" ], "systems": "systems_10", - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_4" }, "locked": { "lastModified": 1731205797, @@ -994,11 +1036,11 @@ "pre-commit-hooks": { "flake": false, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -1044,11 +1086,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -1100,7 +1142,7 @@ "pre-commit-hooks": "pre-commit-hooks_2", "rom-properties": "rom-properties", "rust-overlay": "rust-overlay_4", - "treefmt-nix": "treefmt-nix_4", + "treefmt-nix": "treefmt-nix_5", "upd8r": "upd8r" } }, @@ -1174,11 +1216,11 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1734834660, + "narHash": "sha256-bm8V+Cu8rWJA+vKQnc94mXTpSDgvedyoDKxTVi/uJfw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "b070e6030118680977bc2388868c4b3963872134", "type": "github" }, "original": { @@ -1425,6 +1467,27 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "poetry2nix", @@ -1445,7 +1508,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_4": { "inputs": { "nixpkgs": [ "poetry2nix-src", @@ -1466,18 +1529,18 @@ "type": "github" } }, - "treefmt-nix_4": { + "treefmt-nix_5": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { diff --git a/nixpkgs/nur.nix b/nixpkgs/nur.nix index 586af10..92a3ede 100644 --- a/nixpkgs/nur.nix +++ b/nixpkgs/nur.nix @@ -1 +1 @@ -{ nur, ... }: nur.overlay +{ nur, ... }: nur.overlays.default diff --git a/pkgs/vscode-fhs/default.nix b/pkgs/vscode-fhs/default.nix index 837e44d..7cd5b32 100644 --- a/pkgs/vscode-fhs/default.nix +++ b/pkgs/vscode-fhs/default.nix @@ -12,7 +12,7 @@ systemd, fontconfig, libdbusmenu, - buildFHSUserEnv, + buildFHSEnv, vscode, # Attributes inherit from specific versions @@ -21,7 +21,7 @@ executableName ? vscode.executableName, pname ? vscode.pname, }: -buildFHSUserEnv { +buildFHSEnv { name = executableName; # additional libraries which are commonly needed for extensions