diff --git a/flake.lock b/flake.lock index f70e21f952..fc64d19e38 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688465017, - "narHash": "sha256-xzFcCnzPOgQaX7Acprfqo+tqHJ2UKWC38pXrcqvdXHU=", + "lastModified": 1689230645, + "narHash": "sha256-5PKMCkMQIhdW6DFpNVm4DOQ81PoSPsYcTL3fqlBUWpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d5682acc109add20f70440269587a1b169cc2fe", + "rev": "686945e0c07d68a6ca624438f1623fd3284ec15d", "type": "github" }, "original": { @@ -51,11 +51,11 @@ ] }, "locked": { - "lastModified": 1688438033, - "narHash": "sha256-wOmpZis06pVKTR+5meGwhrW10/buf98lnA26uQLaqek=", + "lastModified": 1689215707, + "narHash": "sha256-Wuqkwdjtox/CfCq71p1pVBRd0VTR1Hw3+cb/zdvxOHI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c3e43223dece545cfe06ddd92fd782adc73d56c3", + "rev": "7a1c8fd0f90694af49b89181344096e3375f2e23", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 304411e0de..c0d4f64d34 100644 --- a/flake.nix +++ b/flake.nix @@ -33,60 +33,6 @@ extensions = [ "rust-analyzer" "rust-src" ]; }; - # Pending an upstream Buck2 package we download pre-built system binaries. - # References: https://github.com/NixOS/nixpkgs/issues/226677 - buck2 = pkgs.stdenv.mkDerivation rec { - # These are the primary variables to control the "version" of Buck2 that we want from S3. - # - # To upload the latest objects and get the hashes needed for this flake, run the update - # script from the support directory via Buck2 itself. You can run that target again to - # find the hashes, even if the objects have already been uploaded. - - releaseDate = "2023-06-29"; - hash = { - "x86_64-linux" = "sha256-uCIbLPms8Ees8SYFZgMuDBKcd2AVdRES/AOzkuCbl1o="; - "aarch64-linux" = "sha256-2f1MOzw+maXlw75Qfd9YIOF4447PuU+seHHGOJ2als0="; - "x86_64-darwin" = "sha256-UFez/5wucCv54riuhsQKCw9EfyUW7xdacbYTVi9ZQ1U="; - "aarch64-darwin" = "sha256-pm9tf3aLllwq5ov3Fg9Umy25mpewGhBEjP5xSBzmFfQ="; - }.${system}; - - pname = "buck2"; - version = "unstable-${releaseDate}"; - - nativeBuildInputs = with pkgs; [ zstd ]; - - triple = { - "x86_64-linux" = "x86_64-unknown-linux-gnu"; - "aarch64-linux" = "aarch64-unknown-linux-gnu"; - "x86_64-darwin" = "x86_64-apple-darwin"; - "aarch64-darwin" = "aarch64-apple-darwin"; - }.${system}; - - urlPrefix = "https://buck2-binaries.s3.us-east-2.amazonaws.com/${releaseDate}"; - archiveName = "buck2-${triple}.zst"; - - src = pkgs.fetchurl { - url = "${urlPrefix}/${archiveName}"; - sha256 = hash; - }; - - unpackPhase = ":"; - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/bin - zstd -d ${src} -o buck2 - install -m755 -D buck2 $out/bin/buck2 - ''; - - fixupPhase = if pkgs.stdenv.isLinux then '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/buck2 - '' else - ""; - }; - in with pkgs; { devShells.default = mkShell { packages = [