diff --git a/src/mixed-flake.nix b/src/flake-contents/flake.nix similarity index 94% rename from src/mixed-flake.nix rename to src/flake-contents/flake.nix index c80365e..eac7e6a 100644 --- a/src/mixed-flake.nix +++ b/src/flake-contents/flake.nix @@ -26,7 +26,7 @@ allSchemas = (flake.outputs.schemas or defaultSchemas) // schemaOverrides; # FIXME: make this configurable - defaultSchemas = (builtins.getFlake "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.3/0190b841-54d3-7b7a-8550-24942bc38caf/source.tar.gz?narHash=sha256-c2AZH9cOnSpPXV8Lwy19/I8EgW7G%2BE%2BZh6YQBZZwzxI%3D").schemas; + defaultSchemas = (builtins.getFlake "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz?narHash=sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw%3D").schemas; # Ignore legacyPackages for now, since it's very big and throws uncatchable errors. schemaOverrides.legacyPackages = { @@ -90,7 +90,7 @@ value = attrs.derivation.${outputName}.outPath; } ) - attrs.derivation.outputs + (attrs.derivation.outputs or [ "out" ]) ) else null; diff --git a/src/flake_info.rs b/src/flake_info.rs index 2a61402..bd74f9f 100644 --- a/src/flake_info.rs +++ b/src/flake_info.rs @@ -257,7 +257,7 @@ impl FlakeMetadata { // error: path '/tmp' is a symlink let tempdir_path = tempdir.path().canonicalize()?; - let flake_contents = include_str!("mixed-flake.nix") + let flake_contents = include_str!("flake-contents/flake.nix") .replace( FLAKE_URL_PLACEHOLDER_UUID, &self.flake_locked_url.escape_default().to_string(),