diff --git a/flake.nix b/flake.nix index 2b1ea2be..cd96402f 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,7 @@ inherit (fwlib') blockTypes actions dataWith flakeModule grow growOn findTargets; }; in - assert inputs.nixpkgs.lib.assertMsg ((builtins.compareVersions builtins.nixVersion "2.13") >= 0) "The truth is: you'll need a newer nix version to use Standard (minimum: v2.13)."; + assert inputs.nixpkgs.lib.assertMsg ((builtins.compareVersions builtins.nixVersion "2.18") >= 0) "The truth is: you'll need a newer nix version to use Standard (minimum: v2.18)."; (import ./dogfood.nix (inputs // { std = std // {inherit (inputs.self) narHash;}; diff --git a/src/data/configs/mdbook.nix b/src/data/configs/mdbook.nix index 78e3e0f9..6ff422ac 100644 --- a/src/data/configs/mdbook.nix +++ b/src/data/configs/mdbook.nix @@ -6,7 +6,6 @@ in { packages = [ nixpkgs.alejandra nixpkgs.nodePackages.prettier - nixpkgs.nodePackages.prettier-plugin-toml nixpkgs.shfmt mdbook-paisano-preprocessor ]; diff --git a/src/data/configs/treefmt.nix b/src/data/configs/treefmt.nix index 53fcd5a2..4e77c507 100644 --- a/src/data/configs/treefmt.nix +++ b/src/data/configs/treefmt.nix @@ -5,7 +5,6 @@ in { packages = [ nixpkgs.alejandra nixpkgs.nodePackages.prettier - nixpkgs.nodePackages.prettier-plugin-toml nixpkgs.shfmt ]; @@ -17,7 +16,6 @@ in { }; prettier = { command = lib.getExe nixpkgs.nodePackages.prettier; - options = ["--plugin" "${nixpkgs.nodePackages.prettier-plugin-toml}/lib/node_modules/prettier-plugin-toml/lib/index.js" "--write"]; includes = [ "*.css" "*.html" diff --git a/src/local/flake.lock b/src/local/flake.lock index 0bbffbb3..962b76c8 100644 --- a/src/local/flake.lock +++ b/src/local/flake.lock @@ -364,15 +364,14 @@ "yants": "yants" }, "locked": { - "lastModified": 0, - "narHash": "sha256-XnaA3tCS63IMY04wTMqJ5EX47X0fDM9J+0dg6TxXvz8=", - "path": "/nix/store/5pmjinxmq96n3k708s8qii01awbr9w09-source", + "path": "../../", "type": "path" }, "original": { - "path": "/nix/store/5pmjinxmq96n3k708s8qii01awbr9w09-source", + "path": "../../", "type": "path" - } + }, + "parent": [] }, "systems": { "locked": { diff --git a/src/tests/flake.lock b/src/tests/flake.lock index f9f92882..7980fdb8 100644 --- a/src/tests/flake.lock +++ b/src/tests/flake.lock @@ -538,15 +538,14 @@ "yants": "yants" }, "locked": { - "lastModified": 0, - "narHash": "sha256-fiGxfoXDVBJzBLpoxPwdM/AcRq/dNIeZLNrMqgmuhNk=", - "path": "/nix/store/b0qrhagsdpgyw9hx9wzrszwsdg5wfnnd-source", + "path": "../../", "type": "path" }, "original": { - "path": "/nix/store/b0qrhagsdpgyw9hx9wzrszwsdg5wfnnd-source", + "path": "../../", "type": "path" - } + }, + "parent": [] }, "systems": { "locked": {