Skip to content
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

buck2: 2024-10-15 -> 2025-01-02 #370393

Merged
merged 2 commits into from
Jan 3, 2025
Merged

buck2: 2024-10-15 -> 2025-01-02 #370393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2aca53
buck2: migrate to `pkgs/by-name`
thoughtpolice Jan 3, 2025
4ff3bcd
buck2: 2024-10-15 -> 2025-01-02
thoughtpolice Jan 3, 2025
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
7 changes: 7 additions & 0 deletions pkgs/by-name/bu/buck2/hashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ "_comment": "@generated by pkgs/by-name/bu/buck2/update.sh"
, "_prelude": "sha256-o/YUIu8vuIIk2kfkMaijZNVLqwELwum4mFJ9sbqnDIs="
, "x86_64-linux": "sha256-kN+nB1PAYIxG52BGM7kOmgUxVDKXhcWzyGyvWQ+CvTo="
, "x86_64-darwin": "sha256-oRDdUjHwtGB4xBj0tzJEIiAyI6LUVEVQbjNqdEJwu5E="
, "aarch64-linux": "sha256-9Y5ODzE90sAIKjxtZMA8nEkKPLfrpcQjPw0HPzzh/Hs="
, "aarch64-darwin": "sha256-kyPtJvkJ/fWCFqwtueqXsiazeu8xcAeXxvwQG+FjQ4M="
}
4 changes: 2 additions & 2 deletions ...nt/tools/build-managers/buck2/default.nix → pkgs/by-name/bu/buck2/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ let
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);

# our version of buck2; this should be a git tag
version = "2024-10-15";
version = "2025-01-02";

# the platform-specific, statically linked binary — which is also
# zstd-compressed
Expand Down Expand Up @@ -72,7 +72,7 @@ let
# tooling
prelude-src =
let
prelude-hash = "615f852ad43a901d8a09b2cbbb3aefff61626c52";
prelude-hash = "d11a72de049a37b9b218a3ab8db33d3f97b9413c";
name = "buck2-prelude-${version}.tar.gz";
hash = buildHashes."_prelude";
url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz";
Expand Down
6 changes: 3 additions & 3 deletions ...ment/tools/build-managers/buck2/update.sh → pkgs/by-name/bu/buck2/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ ARCHS=(
"aarch64-darwin:aarch64-apple-darwin"
)

NFILE=pkgs/development/tools/build-managers/buck2/default.nix
HFILE=pkgs/development/tools/build-managers/buck2/hashes.json
NFILE=pkgs/by-name/bu/buck2/package.nix
HFILE=pkgs/by-name/bu/buck2/hashes.json
rm -f "$HFILE" && touch "$HFILE"

PRELUDE_SHA256HASH="$(nix-prefetch-url --type sha256 "$PRELUDE_DL_URL")"
PRELUDE_SRIHASH="$(nix hash to-sri --type sha256 "$PRELUDE_SHA256HASH")"

printf "{ \"_comment\": \"@generated by pkgs/development/tools/build-managers/buck2/update.sh\"\n" >> "$HFILE"
printf "{ \"_comment\": \"@generated by pkgs/by-name/bu/buck2/update.sh\"\n" >> "$HFILE"
printf ", \"_prelude\": \"$PRELUDE_SRIHASH\"\n" >> "$HFILE"

for arch in "${ARCHS[@]}"; do
Expand Down
7 changes: 0 additions & 7 deletions pkgs/development/tools/build-managers/buck2/hashes.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7860,8 +7860,6 @@ with pkgs;
python3 = python311;
};

buck2 = callPackage ../development/tools/build-managers/buck2 { stdenv = stdenvNoCC; };

build2 = callPackage ../development/tools/build-managers/build2 {
# Break cycle by using self-contained toolchain for bootstrapping
build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { };
Expand Down
Loading