mirror of
https://github.com/openai/codex.git
synced 2026-03-05 21:45:28 +03:00
a4bb59884b
## Summary - When building via `nix build`, the binary reports `codex-cli 0.0.0` because the workspace `Cargo.toml` uses `0.0.0` as a placeholder on `main`. This causes the update checker to always prompt users to upgrade even when running the latest code. - Reads the version from `codex-rs/Cargo.toml` at flake evaluation time using `builtins.fromTOML` and patches it into the workspace `Cargo.toml` before cargo builds via `postPatch`. - On release commits (e.g. tag `rust-v0.101.0`), the real version is used as-is. On `main` branch builds, falls back to `0.0.0-dev+<shortRev>` (or `0.0.0-dev+dirty`), which the update checker's `parse_version` ignores — suppressing the spurious upgrade prompt. | Scenario | Cargo.toml version | Nix `version` | Binary reports | Upgrade nag? | |---|---|---|---|---| | Release commit (e.g. `rust-v0.101.0`) | `0.101.0` | `0.101.0` | `codex-cli 0.101.0` | Only if newer exists | | Main branch (committed) | `0.0.0` | `0.0.0-dev+b934ffc` | `codex-cli 0.0.0-dev+b934ffc` | No | | Main branch (uncommitted) | `0.0.0` | `0.0.0-dev+dirty` | `codex-cli 0.0.0-dev+dirty` | No | ## Test plan - [ ] `nix build` from `main` branch and verify `codex --version` reports `0.0.0-dev+<shortRev>` instead of `0.0.0` - [ ] Verify the update checker does not show a spurious upgrade prompt for dev builds - [ ] Confirm that on a release commit where `Cargo.toml` has a real version, the binary reports that version correctly
88 lines
2.6 KiB
Nix
88 lines
2.6 KiB
Nix
{
|
|
description = "Development Nix flake for OpenAI Codex CLI";
|
|
|
|
inputs = {
|
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
rust-overlay = {
|
|
url = "github:oxalica/rust-overlay";
|
|
inputs.nixpkgs.follows = "nixpkgs";
|
|
};
|
|
};
|
|
|
|
outputs = { self, nixpkgs, rust-overlay, ... }:
|
|
let
|
|
systems = [
|
|
"x86_64-linux"
|
|
"aarch64-linux"
|
|
"x86_64-darwin"
|
|
"aarch64-darwin"
|
|
];
|
|
forAllSystems = f: nixpkgs.lib.genAttrs systems f;
|
|
|
|
# Read the version from the workspace Cargo.toml (the single source of
|
|
# truth used by the release workflow).
|
|
cargoToml = builtins.fromTOML (builtins.readFile ./codex-rs/Cargo.toml);
|
|
cargoVersion = cargoToml.workspace.package.version;
|
|
|
|
# When building from a release commit the Cargo.toml already carries the
|
|
# real version (e.g. "0.101.0"). On the main branch it is the placeholder
|
|
# "0.0.0", so we fall back to a dev version derived from the flake source.
|
|
version =
|
|
if cargoVersion != "0.0.0"
|
|
then cargoVersion
|
|
else "0.0.0-dev+${self.shortRev or "dirty"}";
|
|
in
|
|
{
|
|
packages = forAllSystems (system:
|
|
let
|
|
pkgs = import nixpkgs {
|
|
inherit system;
|
|
overlays = [ rust-overlay.overlays.default ];
|
|
};
|
|
codex-rs = pkgs.callPackage ./codex-rs {
|
|
inherit version;
|
|
rustPlatform = pkgs.makeRustPlatform {
|
|
cargo = pkgs.rust-bin.stable.latest.minimal;
|
|
rustc = pkgs.rust-bin.stable.latest.minimal;
|
|
};
|
|
};
|
|
in
|
|
{
|
|
codex-rs = codex-rs;
|
|
default = codex-rs;
|
|
}
|
|
);
|
|
|
|
devShells = forAllSystems (system:
|
|
let
|
|
pkgs = import nixpkgs {
|
|
inherit system;
|
|
overlays = [ rust-overlay.overlays.default ];
|
|
};
|
|
rust = pkgs.rust-bin.stable.latest.default.override {
|
|
extensions = [ "rust-src" "rust-analyzer" ];
|
|
};
|
|
in
|
|
{
|
|
default = pkgs.mkShell {
|
|
buildInputs = [
|
|
rust
|
|
pkgs.pkg-config
|
|
pkgs.openssl
|
|
pkgs.cmake
|
|
pkgs.llvmPackages.clang
|
|
pkgs.llvmPackages.libclang.lib
|
|
];
|
|
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
|
|
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
|
|
# Use clang for BoringSSL compilation (avoids GCC 15 warnings-as-errors)
|
|
shellHook = ''
|
|
export CC=clang
|
|
export CXX=clang++
|
|
'';
|
|
};
|
|
}
|
|
);
|
|
};
|
|
}
|