diff --git a/flake.lock b/flake.lock index 9e647f7..961eac7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1782588036, - "narHash": "sha256-P9Yo/RUkpZ/DG9codcNFxcVetpFSaIUlTFdUzcUN+kw=", + "lastModified": 1786383053, + "narHash": "sha256-7cmIJnDfBYuzFTblGx9qz7EKID4b+/AGhRYAauzXndI=", "owner": "Mop-u", "repo": "moppkgs", - "rev": "932a32eee47ec26372da474ae4397fdd745f26a8", + "rev": "901cd03776884664fd2c581d6ffccb8ae7ce335f", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1788752844, + "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", "owner": "Nixos", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "dc5d91f840324650bac8c379428c7037a416959a", "type": "github" }, "original": { diff --git a/lib/fusesocLib.nix b/lib/fusesocLib.nix index 9f72439..9b75a16 100644 --- a/lib/fusesocLib.nix +++ b/lib/fusesocLib.nix @@ -21,7 +21,7 @@ rec { let jsonFile = runCommand "from-yaml-${baseNameOf path}" { nativeBuildInputs = [ remarshal ]; - } ''remarshal -k -if yaml -i "${path}" -of json -o "$out"''; + } ''remarshal --stringify --from yaml --to json "${path}" "$out"''; in builtins.fromJSON (builtins.readFile jsonFile); diff --git a/lib/importCore.nix b/lib/importCore.nix index 30d2210..128d44f 100644 --- a/lib/importCore.nix +++ b/lib/importCore.nix @@ -115,7 +115,7 @@ lib.extendMkDerivation { cp ${file} $out/${file} '') coreFileset )} - cp ${(formats.yaml { }).generate coreName patchedCore} $out/${coreName} + cp ${(formats.yaml_1_2 { }).generate coreName patchedCore} $out/${coreName} ''; }; }