From 27232c4f9b535295aa7885e2698814ff11448ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 26 Sep 2024 05:25:44 +0200 Subject: [PATCH] build(deps): remove semnix deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'flake-utils': 'github:semnix/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17) • Updated input 'naersk': 'github:semnix/naersk/aeb58d5e8faead8980a807c840232697982d47b9' (2023-10-27) → 'github:nix-community/naersk/3fb418eaf352498f6b6c30592e3beb63df42ef11' (2024-07-23) • Updated input 'pre-commit-hooks': 'github:semnix/pre-commit-hooks.nix/e5ee5c5f3844550c01d2131096c7271cec5e9b78' (2023-11-25) → 'github:cachix/pre-commit-hooks.nix/4e743a6920eab45e8ba0fbe49dc459f1423a4b74' (2024-09-19) • Removed input 'pre-commit-hooks/flake-utils' • Updated input 'pre-commit-hooks/nixpkgs-stable': 'github:NixOS/nixpkgs/c37ca420157f4abc31e26f436c1145f8951ff373' (2023-06-03) → 'github:NixOS/nixpkgs/babc25a577c3310cce57c72d5bed70f4c3c3843a' (2024-09-23) • Updated input 'rust-overlay': 'github:semnix/rust-overlay/2cfb76b8e836a26efecd9f853bea78355a11c58a' (2023-12-09) → 'github:oxalica/rust-overlay/a3d832f389606d7dc61a45b244c72ea472d1fcd4' (2024-09-26) • Removed input 'rust-overlay/flake-utils' • Updated input 'treefmt-nix': 'github:semnix/treefmt-nix/e8cea581dd2b7c9998c1e6662db2c1dc30e7fdb0' (2023-12-07) → 'github:numtide/treefmt-nix/1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3' (2024-09-25) Signed-off-by: Christina Sørensen --- flake.lock | 76 +++++++++++++++++++----------------------- flake.nix | 98 +++++++++++++++++++++++++++++------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index b411adae..502c7bdd 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "advisory-db": { "flake": false, "locked": { - "lastModified": 1706115649, - "narHash": "sha256-Qrqb54qGaRsFdLDj8EJtI5leFGFfqWHLRgC+t6KWlpQ=", + "lastModified": 1727306865, + "narHash": "sha256-okbcHbpPc9wDVrppp8kQDOWd+PBwlHNkbiCLQ/GArvM=", "owner": "rustsec", "repo": "advisory-db", - "rev": "1d2202ea2b32fabd3307641010301bfe187ef11a", + "rev": "6960f548f3abd498f948105b627d33065e23e37c", "type": "github" }, "original": { @@ -39,15 +39,15 @@ ] }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "semnix", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { - "owner": "semnix", + "owner": "numtide", "repo": "flake-utils", "type": "github" } @@ -80,26 +80,26 @@ ] }, "locked": { - "lastModified": 1698420672, - "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", - "owner": "semnix", + "lastModified": 1721727458, + "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", + "owner": "nix-community", "repo": "naersk", - "rev": "aeb58d5e8faead8980a807c840232697982d47b9", + "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", "type": "github" }, "original": { - "owner": "semnix", + "owner": "nix-community", "repo": "naersk", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1706173671, - "narHash": "sha256-lciR7kQUK2FCAYuszyd7zyRRmTaXVeoZsCyK6QFpGdk=", + "lastModified": 1727140925, + "narHash": "sha256-ZHSasdLwEEjSOD/WTW1o7dr3/EjuYsdwYB4NSgICZ2I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4fddc9be4eaf195d631333908f2a454b03628ee5", + "rev": "189e5f171b163feb7791a9118afa778d9a1db81f", "type": "github" }, "original": { @@ -111,16 +111,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1727129439, + "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -160,9 +160,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": [ - "flake-utils" - ], "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -170,15 +167,15 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", - "owner": "semnix", + "lastModified": 1726745158, + "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", + "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", "type": "github" }, "original": { - "owner": "semnix", + "owner": "cachix", "repo": "pre-commit-hooks.nix", "type": "github" } @@ -198,23 +195,20 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1702088052, - "narHash": "sha256-FkwIBTAMsxyceQce0Mbm+/+cOjj2r5IHBK4R/ekPNaw=", - "owner": "semnix", + "lastModified": 1727317727, + "narHash": "sha256-yGYahXzCquyYEgf5GTtvtaN5hXbw20Ok2+o8uVxoaFs=", + "owner": "oxalica", "repo": "rust-overlay", - "rev": "2cfb76b8e836a26efecd9f853bea78355a11c58a", + "rev": "a3d832f389606d7dc61a45b244c72ea472d1fcd4", "type": "github" }, "original": { - "owner": "semnix", + "owner": "oxalica", "repo": "rust-overlay", "type": "github" } @@ -241,15 +235,15 @@ ] }, "locked": { - "lastModified": 1701958734, - "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", - "owner": "semnix", + "lastModified": 1727252110, + "narHash": "sha256-3O7RWiXpvqBcCl84Mvqa8dXudZ1Bol1ubNdSmQt7nF4=", + "owner": "numtide", "repo": "treefmt-nix", - "rev": "e8cea581dd2b7c9998c1e6662db2c1dc30e7fdb0", + "rev": "1bff2ba6ec22bc90e9ad3f7e94cca0d37870afa3", "type": "github" }, "original": { - "owner": "semnix", + "owner": "numtide", "repo": "treefmt-nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 6cc27717..c9f5bb28 100644 --- a/flake.nix +++ b/flake.nix @@ -6,19 +6,19 @@ systems.url = "github:nix-systems/default"; flake-utils = { - url = "github:semnix/flake-utils"; + url = "github:numtide/flake-utils"; inputs = { systems.follows = "systems"; }; }; naersk = { - url = "github:semnix/naersk"; + url = "github:nix-community/naersk"; inputs.nixpkgs.follows = "nixpkgs"; }; rust-overlay = { - url = "github:semnix/rust-overlay"; + url = "github:oxalica/rust-overlay"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -26,7 +26,7 @@ }; treefmt-nix = { - url = "github:semnix/treefmt-nix"; + url = "github:numtide/treefmt-nix"; inputs = { nixpkgs.follows = "nixpkgs"; }; @@ -44,7 +44,7 @@ }; pre-commit-hooks = { - url = "github:semnix/pre-commit-hooks.nix"; + url = "github:cachix/pre-commit-hooks.nix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; @@ -55,20 +55,22 @@ }; }; - outputs = { - self, - flake-utils, - naersk, - nixpkgs, - treefmt-nix, - rust-overlay, - powertest, - pre-commit-hooks, - ... - }: + outputs = + { + self, + flake-utils, + naersk, + nixpkgs, + treefmt-nix, + rust-overlay, + powertest, + pre-commit-hooks, + ... + }: flake-utils.lib.eachDefaultSystem ( - system: let - overlays = [(import rust-overlay)]; + system: + let + overlays = [ (import rust-overlay) ]; pkgs = (import nixpkgs) { inherit system overlays; @@ -89,8 +91,9 @@ pkgs.darwin.apple_sdk.frameworks.Security ]; - buildInputs = [pkgs.zlib] ++ darwinBuildInputs; - in rec { + buildInputs = [ pkgs.zlib ] ++ darwinBuildInputs; + in + rec { # For `nix fmt` formatter = treefmtEval.config.build.wrapper; @@ -138,7 +141,7 @@ homepage = "https://github.com/eza-community/eza"; license = licenses.mit; mainProgram = "eza"; - maintainers = with maintainers; [cafkafk]; + maintainers = with maintainers; [ cafkafk ]; }; }; @@ -177,9 +180,9 @@ bash devtools/dir-generator.sh tests/test_dir && echo "Dir generated" bash devtools/generate-timestamp-test-dir.sh tests/timestamp_test_dir ''; - cargoTestOptions = opts: opts ++ ["--features nix"]; + cargoTestOptions = opts: opts ++ [ "--features nix" ]; inherit buildInputs; - nativeBuildInputs = with pkgs; [git]; + nativeBuildInputs = with pkgs; [ git ]; }; # TODO: add conditionally to checks. @@ -197,7 +200,8 @@ touch --date=@0 tests/itest/* && bash devtools/dir-generator.sh tests/test_dir bash devtools/generate-timestamp-test-dir.sh tests/timestamp_test_dir ''; - cargoTestOptions = opts: + cargoTestOptions = + opts: opts ++ [ "--features nix" @@ -205,7 +209,7 @@ "--features powertest" ]; inherit buildInputs; - nativeBuildInputs = with pkgs; [git]; + nativeBuildInputs = with pkgs; [ git ]; }; # Run `nix build .#trydump` to dump testing files @@ -229,7 +233,8 @@ rm tests/ptests/*.stdout || echo; rm tests/ptests/*.stderr || echo; ''; - cargoTestOptions = opts: + cargoTestOptions = + opts: opts ++ [ "--features nix" @@ -241,14 +246,15 @@ cp dump $out -r ''; inherit buildInputs; - nativeBuildInputs = with pkgs; [git]; + nativeBuildInputs = with pkgs; [ git ]; }; }; # For `nix develop`: devShells.default = pkgs.mkShell { inherit (self.checks.${system}.pre-commit-check) shellHook; - nativeBuildInputs = with pkgs; + nativeBuildInputs = + with pkgs; [ rustup toolchain @@ -275,29 +281,29 @@ # For `nix flake check` checks = { - pre-commit-check = let - # some treefmt formatters are not supported in pre-commit-hooks we filter them out for now. - toFilter = - # This is a nice hack to not have to manually filter we should keep in mind for a future refactor. - # (builtins.attrNames pre-commit-hooks.packages.${system}) - ["yamlfmt"]; - filterFn = n: _v: (!builtins.elem n toFilter); - treefmtFormatters = pkgs.lib.mapAttrs (_n: v: {inherit (v) enable;}) ( - pkgs.lib.filterAttrs filterFn (import ./treefmt.nix).programs - ); - in + pre-commit-check = + let + # some treefmt formatters are not supported in pre-commit-hooks we + # filter them out for now. + toFilter = [ + "yamlfmt" + "nixfmt" + ]; + filterFn = n: _v: (!builtins.elem n toFilter); + treefmtFormatters = pkgs.lib.mapAttrs (_n: v: { inherit (v) enable; }) ( + pkgs.lib.filterAttrs filterFn (import ./treefmt.nix).programs + ); + in pre-commit-hooks.lib.${system}.run { src = ./.; - hooks = - treefmtFormatters - // { - convco.enable = true; # not in treefmt - }; + hooks = treefmtFormatters // { + nixfmt-rfc-style.enable = true; + convco.enable = true; # not in treefmt + }; }; formatting = treefmtEval.config.build.check self; build = packages.check; - inherit - (packages) + inherit (packages) default test trycmd