diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2026-05-25 09:45:06 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2026-05-25 10:06:59 +0300 |
| commit | a7996fee16f96ae356e9092c7a957c7f03671925 (patch) | |
| tree | f9b6600afbc0bfd8f36943a66b3b7a00e1cd6681 /gnu/packages/rust-sources.scm | |
| parent | ae10a358e3e0d630c933052446d1fe8f3c4ab509 (diff) | |
gnu: Remove unreferenced rust crates.
* gnu/packages/rust-sources.scm (rust-codex-0.120.0,
rust-pipewire-0.8.0.93138d0, rust-pubgrub-0.3.0.b70cf70,
rust-smithay-0.6.0.ede2707): Remove variables.
* gnu/packages/rust-crates.scm: Remove some unused rust crates.
(lookup-cargo-inputs): Update accordingly.
* gnu/packages/patches/codex-0.98.0-remove-patch-sections.patch,
gnu/packages/patches/rust-codex-0.117.0-remove-patch-sections.patch,
gnu/packages/patches/rust-codex-0.120.0-connectors-cache-test-race.patch,
gnu/packages/patches/rust-codex-0.120.0-core-remove-self-dep.patch,
gnu/packages/patches/rust-codex-0.98.0-core-remove-self-dep.patch,
gnu/packages/patches/rust-codex-0.98.0-test-timeout.patch,
gnu/packages/patches/rust-codex-0.98.0-windows-sandbox-protocol-version.patch:
Remove files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Change-Id: I34d0aa3f5f06cea77d80b484fe7205fd3ae68d4a
Diffstat (limited to 'gnu/packages/rust-sources.scm')
| -rw-r--r-- | gnu/packages/rust-sources.scm | 370 |
1 files changed, 75 insertions, 295 deletions
diff --git a/gnu/packages/rust-sources.scm b/gnu/packages/rust-sources.scm index dc599762523..a386306335b 100644 --- a/gnu/packages/rust-sources.scm +++ b/gnu/packages/rust-sources.scm | |||
| @@ -610,25 +610,6 @@ UTF-32 support.") | |||
| 610 | (description "This package provides Rust bindings for PipeWire.") | 610 | (description "This package provides Rust bindings for PipeWire.") |
| 611 | (license license:expat))))) | 611 | (license license:expat))))) |
| 612 | 612 | ||
| 613 | (define-public rust-pipewire-0.8.0.93138d0 | ||
| 614 | (let ((commit "93138d01b23628521b29b5604bbebe991cba4c65")) | ||
| 615 | (hidden-package | ||
| 616 | (package | ||
| 617 | (inherit rust-pipewire-0.8.0.fd3d8f7) | ||
| 618 | (name "rust-pipewire") | ||
| 619 | (version (git-version "0.8.0" "0" commit)) | ||
| 620 | (source | ||
| 621 | (origin | ||
| 622 | (method git-fetch) | ||
| 623 | (uri (git-reference | ||
| 624 | (url "https://gitlab.freedesktop.org/pipewire/pipewire-rs.git") | ||
| 625 | (commit commit))) | ||
| 626 | (file-name (git-file-name name version)) | ||
| 627 | (sha256 | ||
| 628 | (base32 | ||
| 629 | "0zgqklzmyk893n82zq8d0is57npvy9lsfpqb83h1bbx9c42fl35p")))) | ||
| 630 | (inputs (cargo-inputs 'rust-pipewire-0.8.0.93138d0)))))) | ||
| 631 | |||
| 632 | ;; Workspace dependency of zed. | 613 | ;; Workspace dependency of zed. |
| 633 | ;; | 614 | ;; |
| 634 | ;; Cargo side: Cargo unifies dependency versions across zed's | 615 | ;; Cargo side: Cargo unifies dependency versions across zed's |
| @@ -700,38 +681,6 @@ UTF-32 support.") | |||
| 700 | "This package provides Python environment tools.") | 681 | "This package provides Python environment tools.") |
| 701 | (license license:expat)))) | 682 | (license license:expat)))) |
| 702 | 683 | ||
| 703 | (define-public rust-pubgrub-0.3.0.b70cf70 | ||
| 704 | (let ((commit "b70cf707aa43f21b32f3a61b8a0889b15032d5c4") | ||
| 705 | (revision "0")) | ||
| 706 | (hidden-package | ||
| 707 | (package | ||
| 708 | (name "rust-pubgrub") | ||
| 709 | (version (git-version "0.3.0" revision commit)) | ||
| 710 | (source (origin | ||
| 711 | (method git-fetch) | ||
| 712 | (uri (git-reference | ||
| 713 | (url "https://github.com/astral-sh/pubgrub") | ||
| 714 | (commit commit))) | ||
| 715 | (file-name (git-file-name name version)) | ||
| 716 | (sha256 | ||
| 717 | (base32 | ||
| 718 | "08rfk4hh2cx4v8fi62j365mwga3fgww9wcfszq7i5g4zmlhp8p8l")) | ||
| 719 | (modules '((guix build utils))) | ||
| 720 | ;; Pretend to be version 0.3.0. | ||
| 721 | (snippet | ||
| 722 | '(substitute* "Cargo.toml" | ||
| 723 | (("0\\.3\\.0-alpha\\.1") "0.3.0"))))) | ||
| 724 | (build-system cargo-build-system) | ||
| 725 | (arguments | ||
| 726 | (list #:skip-build? #t | ||
| 727 | #:cargo-package-crates ''("version-ranges" "pubgrub"))) | ||
| 728 | (inputs (cargo-inputs 'rust-pubgrub-0.3.0.b70cf70)) | ||
| 729 | (home-page "https://github.com/pubgrub-rs/pubgrub") | ||
| 730 | (synopsis "PubGrub version solving algorithm") | ||
| 731 | (description | ||
| 732 | "This package provides the @code{PubGrub} version solving algorithm.") | ||
| 733 | (license license:mpl2.0))))) | ||
| 734 | |||
| 735 | (define-public rust-ring-0.17 | 684 | (define-public rust-ring-0.17 |
| 736 | (hidden-package | 685 | (hidden-package |
| 737 | (package | 686 | (package |
| @@ -1013,27 +962,27 @@ UTF-32 support.") | |||
| 1013 | incrementalized computation (experimental).") | 962 | incrementalized computation (experimental).") |
| 1014 | (license (list license:asl2.0 license:expat))))) | 963 | (license (list license:asl2.0 license:expat))))) |
| 1015 | 964 | ||
| 1016 | (define-public rust-smithay-0.6.0.ede2707 | 965 | (define-public rust-smithay-0.7.0.ff5fa7d |
| 1017 | (let ((commit "ede27079f45eeb7c21796e22f3bc25b741b024ea") | 966 | (let ((commit "ff5fa7df392cecfba049ffed55cdaa4e98a8e7ef")) |
| 1018 | (revision "2")) | ||
| 1019 | (hidden-package | 967 | (hidden-package |
| 1020 | (package | 968 | (package |
| 1021 | (name "rust-smithay") | 969 | (name "rust-smithay") |
| 1022 | (version (git-version "0.6.0" revision commit)) | 970 | (version (git-version "0.7.0" "0" commit)) |
| 1023 | (source (origin | 971 | (source |
| 1024 | (method git-fetch) | 972 | (origin |
| 1025 | (uri (git-reference | 973 | (method git-fetch) |
| 1026 | (url "https://github.com/Smithay/smithay") | 974 | (uri (git-reference |
| 1027 | (commit commit))) | 975 | (url "https://github.com/Smithay/smithay") |
| 1028 | (file-name (git-file-name name version)) | 976 | (commit commit))) |
| 1029 | (sha256 | 977 | (file-name (git-file-name name version)) |
| 1030 | (base32 | 978 | (sha256 |
| 1031 | "187vdwhy6fjjym9xmyzdhpw1r5xfdfsbbn7y8xv0x9dv12f1var2")))) | 979 | (base32 |
| 980 | "1dfksva7hizx675vh128ibrbf6ggjh2a01jm41qgb0dgyi6wcpsd")))) | ||
| 1032 | (build-system cargo-build-system) | 981 | (build-system cargo-build-system) |
| 1033 | (arguments | 982 | (arguments |
| 1034 | (list #:skip-build? #t | 983 | (list #:skip-build? #t |
| 1035 | #:cargo-package-crates ''("smithay" "smithay-drm-extras"))) | 984 | #:cargo-package-crates ''("smithay" "smithay-drm-extras"))) |
| 1036 | (inputs (cargo-inputs 'rust-smithay-0.6.0.ede2707)) | 985 | (inputs (cargo-inputs 'rust-smithay-0.7.0.ff5fa7d)) |
| 1037 | (home-page "https://github.com/Smithay/smithay") | 986 | (home-page "https://github.com/Smithay/smithay") |
| 1038 | (synopsis "Smithy for Rust Wayland compositors") | 987 | (synopsis "Smithy for Rust Wayland compositors") |
| 1039 | (description | 988 | (description |
| @@ -1046,25 +995,6 @@ It supports the @code{wayland}, @code{wayland-protocols}, and some external | |||
| 1046 | extensions, such as @code{wlr-protocols} and @code{plasma-wayland-protocols}.") | 995 | extensions, such as @code{wlr-protocols} and @code{plasma-wayland-protocols}.") |
| 1047 | (license license:expat))))) | 996 | (license license:expat))))) |
| 1048 | 997 | ||
| 1049 | (define-public rust-smithay-0.7.0.ff5fa7d | ||
| 1050 | (let ((commit "ff5fa7df392cecfba049ffed55cdaa4e98a8e7ef")) | ||
| 1051 | (hidden-package | ||
| 1052 | (package | ||
| 1053 | (inherit rust-smithay-0.6.0.ede2707) | ||
| 1054 | (name "rust-smithay") | ||
| 1055 | (version (git-version "0.7.0" "0" commit)) | ||
| 1056 | (source | ||
| 1057 | (origin | ||
| 1058 | (method git-fetch) | ||
| 1059 | (uri (git-reference | ||
| 1060 | (url "https://github.com/Smithay/smithay") | ||
| 1061 | (commit commit))) | ||
| 1062 | (file-name (git-file-name name version)) | ||
| 1063 | (sha256 | ||
| 1064 | (base32 | ||
| 1065 | "1dfksva7hizx675vh128ibrbf6ggjh2a01jm41qgb0dgyi6wcpsd")))) | ||
| 1066 | (inputs (cargo-inputs 'rust-smithay-0.7.0.ff5fa7d)))))) | ||
| 1067 | |||
| 1068 | (define inspired-github-color-scheme-for-rust-syntect-5 | 998 | (define inspired-github-color-scheme-for-rust-syntect-5 |
| 1069 | (let ((version "1.3.0")) | 999 | (let ((version "1.3.0")) |
| 1070 | (origin | 1000 | (origin |
| @@ -1406,20 +1336,20 @@ language models.") | |||
| 1406 | repository, used as dependencies by codex-acp.") | 1336 | repository, used as dependencies by codex-acp.") |
| 1407 | (license license:asl2.0)))) | 1337 | (license license:asl2.0)))) |
| 1408 | 1338 | ||
| 1409 | (define-public rust-codex-0.120.0 | 1339 | (define-public rust-codex-0.124.0 |
| 1410 | (hidden-package | 1340 | (hidden-package |
| 1411 | (package | 1341 | (package |
| 1412 | (name "rust-codex") | 1342 | (name "rust-codex") |
| 1413 | (version "0.120.0") | 1343 | (version "0.124.0") |
| 1414 | (source | 1344 | (source |
| 1415 | (origin | 1345 | (origin |
| 1416 | (method git-fetch) | 1346 | (method git-fetch) |
| 1417 | (uri (git-reference | 1347 | (uri (git-reference |
| 1418 | (url "https://github.com/openai/codex") | 1348 | (url "https://github.com/openai/codex") |
| 1419 | (commit "65319eb1400cbd2890c43d572263dabd25f18ba9"))) | 1349 | (commit "e9fb49366c93a1478ec71cc41ecee415a197d036"))) |
| 1420 | (file-name (git-file-name name version)) | 1350 | (file-name (git-file-name name version)) |
| 1421 | (sha256 | 1351 | (sha256 |
| 1422 | (base32 "0gqzkqndb8jwvb9j5dxqgidyzk67x00ccfzhg54gdlv4adc1cgwj")) | 1352 | (base32 "06il60npjnc0h91afyp3wk725cgy3ywk3hx2sbvzdxx6037z6nb0")) |
| 1423 | (modules '((guix build utils))) | 1353 | (modules '((guix build utils))) |
| 1424 | (snippet '(begin | 1354 | (snippet '(begin |
| 1425 | ;;; These are JSON manifests with a dotslash | 1355 | ;;; These are JSON manifests with a dotslash |
| @@ -1431,7 +1361,8 @@ repository, used as dependencies by codex-acp.") | |||
| 1431 | (delete-file-recursively "codex-rs/vendor/bubblewrap"))) | 1361 | (delete-file-recursively "codex-rs/vendor/bubblewrap"))) |
| 1432 | (patches (search-patches | 1362 | (patches (search-patches |
| 1433 | "codex-acp-0.11.1-disable-code-mode.patch" | 1363 | "codex-acp-0.11.1-disable-code-mode.patch" |
| 1434 | "rust-codex-0.120.0-core-remove-self-dep.patch" | 1364 | "rust-codex-0.124.0-code-mode-stub-toolname.patch" |
| 1365 | "rust-codex-0.124.0-remove-patch-sections.patch" | ||
| 1435 | "rust-codex-0.120.0-remove-libwebrtc.patch")))) | 1366 | "rust-codex-0.120.0-remove-libwebrtc.patch")))) |
| 1436 | (build-system cargo-build-system) | 1367 | (build-system cargo-build-system) |
| 1437 | (arguments | 1368 | (arguments |
| @@ -1440,10 +1371,8 @@ repository, used as dependencies by codex-acp.") | |||
| 1440 | #:cargo-package-crates | 1371 | #:cargo-package-crates |
| 1441 | ;; Order matters: dependencies must come before packages that need them | 1372 | ;; Order matters: dependencies must come before packages that need them |
| 1442 | ''(;; Topologically sorted by internal dependency order. | 1373 | ''(;; Topologically sorted by internal dependency order. |
| 1443 | "codex-experimental-api-macros" | ||
| 1444 | "codex-utils-absolute-path" | ||
| 1445 | "codex-git-utils" | ||
| 1446 | "codex-async-utils" | 1374 | "codex-async-utils" |
| 1375 | "codex-utils-absolute-path" | ||
| 1447 | "codex-execpolicy" | 1376 | "codex-execpolicy" |
| 1448 | "codex-utils-home-dir" | 1377 | "codex-utils-home-dir" |
| 1449 | "codex-utils-rustls-provider" | 1378 | "codex-utils-rustls-provider" |
| @@ -1453,6 +1382,8 @@ repository, used as dependencies by codex-acp.") | |||
| 1453 | "codex-utils-string" | 1382 | "codex-utils-string" |
| 1454 | "codex-utils-template" | 1383 | "codex-utils-template" |
| 1455 | "codex-protocol" | 1384 | "codex-protocol" |
| 1385 | "codex-agent-identity" | ||
| 1386 | "codex-experimental-api-macros" | ||
| 1456 | "codex-shell-command" | 1387 | "codex-shell-command" |
| 1457 | "codex-utils-cargo-bin" | 1388 | "codex-utils-cargo-bin" |
| 1458 | "codex-app-server-protocol" | 1389 | "codex-app-server-protocol" |
| @@ -1461,7 +1392,12 @@ repository, used as dependencies by codex-acp.") | |||
| 1461 | "codex-otel" | 1392 | "codex-otel" |
| 1462 | "codex-features" | 1393 | "codex-features" |
| 1463 | "codex-model-provider-info" | 1394 | "codex-model-provider-info" |
| 1395 | "codex-utils-path" | ||
| 1464 | "codex-config" | 1396 | "codex-config" |
| 1397 | "codex-sandboxing" | ||
| 1398 | "codex-utils-pty" | ||
| 1399 | "codex-exec-server" | ||
| 1400 | "codex-git-utils" | ||
| 1465 | "codex-keyring-store" | 1401 | "codex-keyring-store" |
| 1466 | "codex-terminal-detection" | 1402 | "codex-terminal-detection" |
| 1467 | "codex-login" | 1403 | "codex-login" |
| @@ -1469,29 +1405,29 @@ repository, used as dependencies by codex-acp.") | |||
| 1469 | "codex-plugin" | 1405 | "codex-plugin" |
| 1470 | "codex-analytics" | 1406 | "codex-analytics" |
| 1471 | "codex-ansi-escape" | 1407 | "codex-ansi-escape" |
| 1472 | "codex-utils-pty" | ||
| 1473 | "codex-exec-server" | ||
| 1474 | "codex-apply-patch" | 1408 | "codex-apply-patch" |
| 1475 | "codex-code-mode" | 1409 | "codex-code-mode" |
| 1476 | "codex-connectors" | 1410 | "codex-connectors" |
| 1477 | "codex-instructions" | ||
| 1478 | "codex-skills" | 1411 | "codex-skills" |
| 1412 | "codex-utils-output-truncation" | ||
| 1479 | "codex-core-skills" | 1413 | "codex-core-skills" |
| 1414 | "codex-core-plugins" | ||
| 1480 | "codex-feedback" | 1415 | "codex-feedback" |
| 1481 | "codex-hooks" | 1416 | "codex-hooks" |
| 1482 | "codex-rmcp-client" | 1417 | "codex-rmcp-client" |
| 1483 | "codex-mcp" | 1418 | "codex-mcp" |
| 1419 | "codex-aws-auth" | ||
| 1420 | "codex-model-provider" | ||
| 1484 | "codex-collaboration-mode-templates" | 1421 | "codex-collaboration-mode-templates" |
| 1485 | "codex-response-debug-context" | 1422 | "codex-response-debug-context" |
| 1486 | "codex-utils-output-truncation" | ||
| 1487 | "codex-models-manager" | 1423 | "codex-models-manager" |
| 1488 | "codex-file-search" | 1424 | "codex-file-search" |
| 1489 | "codex-state" | 1425 | "codex-state" |
| 1490 | "codex-utils-path" | ||
| 1491 | "codex-rollout" | 1426 | "codex-rollout" |
| 1492 | "codex-sandboxing" | 1427 | "codex-rollout-trace" |
| 1493 | "codex-secrets" | 1428 | "codex-secrets" |
| 1494 | "codex-shell-escalation" | 1429 | "codex-shell-escalation" |
| 1430 | "codex-thread-store" | ||
| 1495 | "codex-tools" | 1431 | "codex-tools" |
| 1496 | "codex-utils-readiness" | 1432 | "codex-utils-readiness" |
| 1497 | "codex-utils-stream-parser" | 1433 | "codex-utils-stream-parser" |
| @@ -1504,12 +1440,15 @@ repository, used as dependencies by codex-acp.") | |||
| 1504 | "codex-utils-cli" | 1440 | "codex-utils-cli" |
| 1505 | "codex-chatgpt" | 1441 | "codex-chatgpt" |
| 1506 | "codex-cloud-requirements" | 1442 | "codex-cloud-requirements" |
| 1443 | "codex-device-key" | ||
| 1507 | "codex-utils-json-to-toml" | 1444 | "codex-utils-json-to-toml" |
| 1508 | "codex-app-server" | 1445 | "codex-app-server" |
| 1509 | "codex-app-server-client" | 1446 | "codex-app-server-client" |
| 1510 | "codex-app-server-test-client" | 1447 | "codex-app-server-test-client" |
| 1511 | "codex-cloud-tasks-client" | 1448 | "codex-cloud-tasks-client" |
| 1512 | "codex-cloud-tasks-mock-client" | 1449 | "codex-cloud-tasks-mock-client" |
| 1450 | "codex-install-context" | ||
| 1451 | "codex-realtime-webrtc" | ||
| 1513 | "codex-utils-approval-presets" | 1452 | "codex-utils-approval-presets" |
| 1514 | "codex-utils-elapsed" | 1453 | "codex-utils-elapsed" |
| 1515 | "codex-utils-fuzzy-match" | 1454 | "codex-utils-fuzzy-match" |
| @@ -1518,49 +1457,52 @@ repository, used as dependencies by codex-acp.") | |||
| 1518 | "codex-utils-oss" | 1457 | "codex-utils-oss" |
| 1519 | "codex-utils-sandbox-summary" | 1458 | "codex-utils-sandbox-summary" |
| 1520 | "codex-utils-sleep-inhibitor" | 1459 | "codex-utils-sleep-inhibitor" |
| 1521 | "codex-realtime-webrtc" | ||
| 1522 | "codex-exec" | 1460 | "codex-exec" |
| 1523 | "codex-mcp-server" | 1461 | "codex-mcp-server" |
| 1524 | "codex-process-hardening" | 1462 | "codex-process-hardening" |
| 1525 | "codex-responses-api-proxy" | 1463 | "codex-responses-api-proxy" |
| 1464 | "codex-uds" | ||
| 1526 | "codex-stdio-to-uds" | 1465 | "codex-stdio-to-uds" |
| 1527 | "codex-debug-client" | 1466 | "codex-debug-client" |
| 1528 | "codex-execpolicy-legacy") | 1467 | "codex-execpolicy-legacy" |
| 1468 | "codex-test-binary-support") | ||
| 1529 | #:phases | 1469 | #:phases |
| 1530 | #~(modify-phases %standard-phases | 1470 | #~(modify-phases %standard-phases |
| 1531 | (add-after 'unpack 'chdir-to-workspace | 1471 | (add-after 'unpack 'chdir-to-workspace |
| 1532 | (lambda _ | 1472 | (lambda _ |
| 1533 | (chdir "codex-rs"))) | 1473 | (chdir "codex-rs"))) |
| 1534 | (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor | 1474 | (add-after 'chdir-to-workspace 'patch-git-deps-to-vendor |
| 1535 | (lambda _ | 1475 | (lambda _ |
| 1536 | (substitute* "Cargo.toml" | 1476 | (substitute* "Cargo.toml" |
| 1537 | (("crossterm = \\{ git = [^}]+\\}") | 1477 | (("crossterm = \\{ git = [^}]+\\}") |
| 1538 | "crossterm = { version = \"0.28.1\" }") | 1478 | "crossterm = { version = \"0.28.1\" }") |
| 1539 | (("ratatui = \\{ git = [^}]+\\}") | 1479 | (("ratatui = \\{ git = [^}]+\\}") |
| 1540 | "ratatui = { version = \"0.29.0\" }") | 1480 | "ratatui = { version = \"0.29.0\" }") |
| 1541 | (("tokio-tungstenite = \\{ git = [^}]+\\}") | 1481 | (("tokio-tungstenite = \\{ git = [^}]+\\}") |
| 1542 | "tokio-tungstenite = { version = \"0.28.0\" }") | 1482 | "tokio-tungstenite = { version = \"0.28.0\" }") |
| 1543 | (("nucleo = \\{ git = [^}]+\\}") | 1483 | (("nucleo = \\{ git = [^}]+\\}") |
| 1544 | "nucleo = { version = \"0.5.0\" }") | 1484 | "nucleo = { version = \"0.5.0\" }") |
| 1545 | (("runfiles = \\{ git = [^}]+\\}") | 1485 | (("runfiles = \\{ git = [^}]+\\}") |
| 1546 | "runfiles = { version = \"0.1.0\" }")) | 1486 | "runfiles = { version = \"0.1.0\" }")) |
| 1547 | ;; Disable V8 runtime in codex-code-mode. | 1487 | ;; Disable V8 runtime in codex-code-mode. |
| 1548 | (substitute* "Cargo.toml" | 1488 | (substitute* "Cargo.toml" |
| 1549 | (("codex-code-mode = \\{ path = \"code-mode\" \\}") | 1489 | (("codex-code-mode = \\{ path = \"code-mode\" \\}") |
| 1550 | "codex-code-mode = { path = \"code-mode\", default-features = false }")))) | 1490 | "codex-code-mode = { path = \"code-mode\", default-features = false }")))) |
| 1551 | (add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps | 1491 | (add-after 'patch-git-deps-to-vendor 'add-version-to-workspace-deps |
| 1552 | (lambda _ | 1492 | (lambda _ |
| 1553 | ;; cargo package requires all dependencies to have versions. | 1493 | (let ((cargo-files (find-files "." "^Cargo\\.toml$"))) |
| 1554 | ;; Add version = "0.120.0" to internal path dependencies. | 1494 | (substitute* cargo-files |
| 1555 | (let ((cargo-files (find-files "." "^Cargo\\.toml$"))) | 1495 | (("(codex[_-][a-z0-9_-]+) = \\{ path = " all name) |
| 1556 | (substitute* cargo-files | 1496 | (string-append name " = { version = \"0.124.0\", path = ")) |
| 1557 | (("(codex-[a-z0-9-]+) = \\{ path = " all name) | 1497 | (("(codex[_-][a-z0-9_-]+) = \\{ package = " all name) |
| 1558 | (string-append name " = { version = \"0.120.0\", path = ")) | 1498 | (string-append name " = { version = \"0.124.0\", package = ")) |
| 1559 | (("(codex-[a-z0-9-]+) = \\{ package = " all name) | 1499 | (("^(path = \"\\.\\./[^\"]*\")" all path-line) |
| 1560 | (string-append name " = { version = \"0.120.0\", package = ")) | 1500 | (string-append path-line "\nversion = \"0.124.0\"")))))) |
| 1561 | (("^(path = \"\\.\\./[^\"]*\")" all path-line) | 1501 | (add-after 'add-version-to-workspace-deps 'break-dev-dep-cycles |
| 1562 | (string-append path-line "\nversion = \"0.120.0\""))))))))) | 1502 | (lambda _ |
| 1563 | (inputs (cargo-inputs 'rust-codex-0.0.0.785c0c43)) | 1503 | (substitute* '("exec-server/Cargo.toml" "core/Cargo.toml") |
| 1504 | (("^codex-test-binary-support = \\{[^}]*\\}\n") ""))))))) | ||
| 1505 | (inputs (cargo-inputs 'rust-codex-0.124.0)) | ||
| 1564 | (home-page "https://github.com/openai/codex") | 1506 | (home-page "https://github.com/openai/codex") |
| 1565 | (synopsis "OpenAI Codex workspace crates") | 1507 | (synopsis "OpenAI Codex workspace crates") |
| 1566 | (description | 1508 | (description |
| @@ -1568,168 +1510,6 @@ repository, used as dependencies by codex-acp.") | |||
| 1568 | and runtime for AI-assisted coding.") | 1510 | and runtime for AI-assisted coding.") |
| 1569 | (license license:asl2.0)))) | 1511 | (license license:asl2.0)))) |
| 1570 | 1512 | ||
| 1571 | (define-public rust-codex-0.124.0 | ||
| 1572 | (hidden-package | ||
| 1573 | (package | ||
| 1574 | (inherit rust-codex-0.120.0) | ||
| 1575 | (version "0.124.0") | ||
| 1576 | (source | ||
| 1577 | (origin | ||
| 1578 | (method git-fetch) | ||
| 1579 | (uri (git-reference | ||
| 1580 | (url "https://github.com/openai/codex") | ||
| 1581 | (commit "e9fb49366c93a1478ec71cc41ecee415a197d036"))) | ||
| 1582 | (file-name (git-file-name "rust-codex" "0.124.0")) | ||
| 1583 | (sha256 | ||
| 1584 | (base32 "06il60npjnc0h91afyp3wk725cgy3ywk3hx2sbvzdxx6037z6nb0")) | ||
| 1585 | (modules '((guix build utils))) | ||
| 1586 | (snippet '(begin | ||
| 1587 | ;;; These are JSON manifests with a dotslash | ||
| 1588 | ;;; shebang that download and run pre-built | ||
| 1589 | ;;; binaries (ripgrep, bash) at runtime. | ||
| 1590 | (delete-file "codex-cli/bin/rg") | ||
| 1591 | ;; Bundled bubblewrap source tree; includes a | ||
| 1592 | ;; compiled BPF blob (demos/flatpak.bpf). | ||
| 1593 | (delete-file-recursively "codex-rs/vendor/bubblewrap"))) | ||
| 1594 | (patches (search-patches | ||
| 1595 | "codex-acp-0.11.1-disable-code-mode.patch" | ||
| 1596 | "rust-codex-0.124.0-code-mode-stub-toolname.patch" | ||
| 1597 | "rust-codex-0.124.0-remove-patch-sections.patch" | ||
| 1598 | "rust-codex-0.120.0-remove-libwebrtc.patch")))) | ||
| 1599 | (arguments | ||
| 1600 | (substitute-keyword-arguments (package-arguments rust-codex-0.120.0) | ||
| 1601 | ;; 0.124 differs from 0.120 by a single removal | ||
| 1602 | ;; (codex-instructions) and ten additions placed at topo-correct | ||
| 1603 | ;; positions; the order also shifts in a few spots to satisfy new | ||
| 1604 | ;; deps (e.g. codex-utils-cargo-bin moves before codex-app-server- | ||
| 1605 | ;; protocol). Replace the whole list rather than computing a | ||
| 1606 | ;; delta against the inherited one. | ||
| 1607 | ((#:cargo-package-crates _) | ||
| 1608 | ''(;; Topologically sorted by internal dependency order. | ||
| 1609 | "codex-async-utils" | ||
| 1610 | "codex-utils-absolute-path" | ||
| 1611 | "codex-execpolicy" | ||
| 1612 | "codex-utils-home-dir" | ||
| 1613 | "codex-utils-rustls-provider" | ||
| 1614 | "codex-network-proxy" | ||
| 1615 | "codex-utils-cache" | ||
| 1616 | "codex-utils-image" | ||
| 1617 | "codex-utils-string" | ||
| 1618 | "codex-utils-template" | ||
| 1619 | "codex-protocol" | ||
| 1620 | "codex-agent-identity" | ||
| 1621 | "codex-experimental-api-macros" | ||
| 1622 | "codex-shell-command" | ||
| 1623 | "codex-utils-cargo-bin" | ||
| 1624 | "codex-app-server-protocol" | ||
| 1625 | "codex-client" | ||
| 1626 | "codex-api" | ||
| 1627 | "codex-otel" | ||
| 1628 | "codex-features" | ||
| 1629 | "codex-model-provider-info" | ||
| 1630 | "codex-utils-path" | ||
| 1631 | "codex-config" | ||
| 1632 | "codex-sandboxing" | ||
| 1633 | "codex-utils-pty" | ||
| 1634 | "codex-exec-server" | ||
| 1635 | "codex-git-utils" | ||
| 1636 | "codex-keyring-store" | ||
| 1637 | "codex-terminal-detection" | ||
| 1638 | "codex-login" | ||
| 1639 | "codex-utils-plugins" | ||
| 1640 | "codex-plugin" | ||
| 1641 | "codex-analytics" | ||
| 1642 | "codex-ansi-escape" | ||
| 1643 | "codex-apply-patch" | ||
| 1644 | "codex-code-mode" | ||
| 1645 | "codex-connectors" | ||
| 1646 | "codex-skills" | ||
| 1647 | "codex-utils-output-truncation" | ||
| 1648 | "codex-core-skills" | ||
| 1649 | "codex-core-plugins" | ||
| 1650 | "codex-feedback" | ||
| 1651 | "codex-hooks" | ||
| 1652 | "codex-rmcp-client" | ||
| 1653 | "codex-mcp" | ||
| 1654 | "codex-aws-auth" | ||
| 1655 | "codex-model-provider" | ||
| 1656 | "codex-collaboration-mode-templates" | ||
| 1657 | "codex-response-debug-context" | ||
| 1658 | "codex-models-manager" | ||
| 1659 | "codex-file-search" | ||
| 1660 | "codex-state" | ||
| 1661 | "codex-rollout" | ||
| 1662 | "codex-rollout-trace" | ||
| 1663 | "codex-secrets" | ||
| 1664 | "codex-shell-escalation" | ||
| 1665 | "codex-thread-store" | ||
| 1666 | "codex-tools" | ||
| 1667 | "codex-utils-readiness" | ||
| 1668 | "codex-utils-stream-parser" | ||
| 1669 | "codex-windows-sandbox" | ||
| 1670 | "codex-core" | ||
| 1671 | "codex-linux-sandbox" | ||
| 1672 | "codex-arg0" | ||
| 1673 | "codex-backend-openapi-models" | ||
| 1674 | "codex-backend-client" | ||
| 1675 | "codex-utils-cli" | ||
| 1676 | "codex-chatgpt" | ||
| 1677 | "codex-cloud-requirements" | ||
| 1678 | "codex-device-key" | ||
| 1679 | "codex-utils-json-to-toml" | ||
| 1680 | "codex-app-server" | ||
| 1681 | "codex-app-server-client" | ||
| 1682 | "codex-app-server-test-client" | ||
| 1683 | "codex-cloud-tasks-client" | ||
| 1684 | "codex-cloud-tasks-mock-client" | ||
| 1685 | "codex-install-context" | ||
| 1686 | "codex-realtime-webrtc" | ||
| 1687 | "codex-utils-approval-presets" | ||
| 1688 | "codex-utils-elapsed" | ||
| 1689 | "codex-utils-fuzzy-match" | ||
| 1690 | "codex-lmstudio" | ||
| 1691 | "codex-ollama" | ||
| 1692 | "codex-utils-oss" | ||
| 1693 | "codex-utils-sandbox-summary" | ||
| 1694 | "codex-utils-sleep-inhibitor" | ||
| 1695 | "codex-exec" | ||
| 1696 | "codex-mcp-server" | ||
| 1697 | "codex-process-hardening" | ||
| 1698 | "codex-responses-api-proxy" | ||
| 1699 | "codex-uds" | ||
| 1700 | "codex-stdio-to-uds" | ||
| 1701 | "codex-debug-client" | ||
| 1702 | "codex-execpolicy-legacy" | ||
| 1703 | "codex-test-binary-support")) | ||
| 1704 | ((#:phases orig) | ||
| 1705 | ;; Two changes from the inherited phases: | ||
| 1706 | ;; (1) 'add-version-to-workspace-deps stamps the literal | ||
| 1707 | ;; 0.120.0 version inside its substitute pattern, so we | ||
| 1708 | ;; swap the whole phase for one stamping 0.124.0 (and | ||
| 1709 | ;; using a regex that also matches the codex_windows_ | ||
| 1710 | ;; sandbox underscore alias introduced in 0.124). | ||
| 1711 | ;; (2) Add a new phase 'break-dev-dep-cycles to strip the | ||
| 1712 | ;; codex-test-binary-support dev-dep from exec-server and | ||
| 1713 | ;; core; it forms a cycle (test-binary-support -> arg0 -> | ||
| 1714 | ;; {exec-server,core} -> test-binary-support) that cargo | ||
| 1715 | ;; package --no-verify still rejects. | ||
| 1716 | #~(modify-phases #$orig | ||
| 1717 | (replace 'add-version-to-workspace-deps | ||
| 1718 | (lambda _ | ||
| 1719 | (let ((cargo-files (find-files "." "^Cargo\\.toml$"))) | ||
| 1720 | (substitute* cargo-files | ||
| 1721 | (("(codex[_-][a-z0-9_-]+) = \\{ path = " all name) | ||
| 1722 | (string-append name " = { version = \"0.124.0\", path = ")) | ||
| 1723 | (("(codex[_-][a-z0-9_-]+) = \\{ package = " all name) | ||
| 1724 | (string-append name " = { version = \"0.124.0\", package = ")) | ||
| 1725 | (("^(path = \"\\.\\./[^\"]*\")" all path-line) | ||
| 1726 | (string-append path-line "\nversion = \"0.124.0\"")))))) | ||
| 1727 | (add-after 'add-version-to-workspace-deps 'break-dev-dep-cycles | ||
| 1728 | (lambda _ | ||
| 1729 | (substitute* '("exec-server/Cargo.toml" "core/Cargo.toml") | ||
| 1730 | (("^codex-test-binary-support = \\{[^}]*\\}\n") "")))))))) | ||
| 1731 | (inputs (cargo-inputs 'rust-codex-0.124.0))))) | ||
| 1732 | |||
| 1733 | ;; Also update (@ (gnu packages gnome) glycin-loaders) when updating this. | 1513 | ;; Also update (@ (gnu packages gnome) glycin-loaders) when updating this. |
| 1734 | (define-public rust-glycin-3 | 1514 | (define-public rust-glycin-3 |
| 1735 | (package | 1515 | (package |
