Skip to content

lalala #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tascord merged 1 commit into from
Mar 11, 2026
Merged

lalala #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .devenv.flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
inputs =
let
vars = {
version = "1.11.2";
version = "1.11.1";
system = "x86_64-linux";
devenv_root = "/home/flora/Projects/loft";
project_input_ref = "path:/home/flora/Projects/loft";
devenv_dotfile = "/home/flora/Projects/loft/.devenv";
devenv_root = "/nixos-config/services/loft";
project_input_ref = "path:/nixos-config/services/loft";
devenv_dotfile = "/nixos-config/services/loft/.devenv";
devenv_dotfile_path = ./.devenv;
devenv_tmpdir = "/run/user/1000";
devenv_runtime = "/run/user/1000/devenv-85aefbd";
devenv_runtime = "/run/user/1000/devenv-4e329cf";
devenv_istesting = false;
devenv_direnvrc_latest_version = 1;
container_name = null;
active_profiles = [
];
hostname = "floramobile";
hostname = "imflopet";
username = "flora";
git_root = "/home/flora/Projects/loft";
git_root = "/nixos-config/services/loft";
secretspec = null;
};
in
Expand All @@ -39,22 +39,22 @@
{ nixpkgs, ... }@inputs:
let
vars = {
version = "1.11.2";
version = "1.11.1";
system = "x86_64-linux";
devenv_root = "/home/flora/Projects/loft";
project_input_ref = "path:/home/flora/Projects/loft";
devenv_dotfile = "/home/flora/Projects/loft/.devenv";
devenv_root = "/nixos-config/services/loft";
project_input_ref = "path:/nixos-config/services/loft";
devenv_dotfile = "/nixos-config/services/loft/.devenv";
devenv_dotfile_path = ./.devenv;
devenv_tmpdir = "/run/user/1000";
devenv_runtime = "/run/user/1000/devenv-85aefbd";
devenv_runtime = "/run/user/1000/devenv-4e329cf";
devenv_istesting = false;
devenv_direnvrc_latest_version = 1;
container_name = null;
active_profiles = [
];
hostname = "floramobile";
hostname = "imflopet";
username = "flora";
git_root = "/home/flora/Projects/loft";
git_root = "/nixos-config/services/loft";
secretspec = null;
};
devenv =
Expand Down
3 changes: 2 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
];
in
pkgs.writeShellScriptBin "loft-serve" ''
export PATH="${lib.makeBinPath runtimeDeps}:$PATH"
export PATH="${lib.makeBinPath runtimeDeps}:${loftPkg}/bin:$PATH"
export LOFT_BIN="${loftPkg}/bin/loft"
export SHELL="${pkgs.bash}/bin/bash"
export CC="cc"

Expand Down
10 changes: 6 additions & 4 deletions registry/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ struct AppState {
storage_dir: String,
oauth_client: LoftOauthClient,
jwt_secret: String,
loft_bin: String,
}

impl AppState {
Expand Down Expand Up @@ -118,6 +119,7 @@ impl AppState {
storage_dir,
oauth_client,
jwt_secret: std::env::var("JWT_SECRET").unwrap_or_else(|_| "secret".to_string()),
loft_bin: std::env::var("LOFT_BIN").unwrap_or_else(|_| "loft".to_string()),
}
}

Expand Down Expand Up @@ -623,7 +625,7 @@ async fn publish_package(
fs::create_dir_all(&docs_output).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;

// Run loft doc command from extracted directory
let doc_result = std::process::Command::new("loft")
let doc_result = std::process::Command::new(&state.loft_bin)
.arg("doc")
.arg("-o")
.arg(&docs_output)
Expand All @@ -646,7 +648,7 @@ async fn publish_package(
);
}
Err(e) => {
eprintln!("! Could not run doc generator: {}", e);
eprintln!("! Could not run doc generator (LOFT_BIN='{}'): {}", state.loft_bin, e);
}
}

Expand Down Expand Up @@ -728,7 +730,7 @@ async fn main() {
let mut archive = Archive::new(gz);
if archive.unpack(&temp_extract_dir).is_ok() {
fs::create_dir_all(&docs_dir).ok();
let doc_result = std::process::Command::new("loft")
let doc_result = std::process::Command::new(&state.loft_bin)
.arg("doc")
.arg("-o")
.arg(&docs_dir)
Expand All @@ -742,7 +744,7 @@ async fn main() {
eprintln!("⚠ Startup: Doc gen failed for {}@{}: {}", package_name, version, String::from_utf8_lossy(&output.stderr));
}
Err(e) => {
eprintln!("⚠ Startup: Could not run doc generator: {}", e);
eprintln!("⚠ Startup: Could not run doc generator (LOFT_BIN='{}'): {}", state.loft_bin, e);
}
}
}
Expand Down
16 changes: 0 additions & 16 deletions src/runtime/builtins/random.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,20 +228,4 @@ mod tests {
_ => panic!("Expected array"),
}
}

#[test]
fn test_random_seed_reproducibility() {
random_seed(&Value::Unit, &[Value::Number(Decimal::from(42))]).unwrap();
let r1 = random_random(&Value::Unit, &[]).unwrap();

random_seed(&Value::Unit, &[Value::Number(Decimal::from(42))]).unwrap();
let r2 = random_random(&Value::Unit, &[]).unwrap();

match (r1, r2) {
(Value::Number(n1), Value::Number(n2)) => {
assert_eq!(n1, n2);
}
_ => panic!("Expected numbers"),
}
}
}
Loading