Skip to content

Commit

Permalink
flake: update to Bazel 7.4.1
Browse files Browse the repository at this point in the history
Previously, we supplied Bazel 7.1.2 through our Nix flake, which was insufficient to build Constellation for quite some time. Now, we can finally have a matching version on Bazel 7.4.1 again, so update to that in our Flake, allowing us to drop a fork!
  • Loading branch information
msanft committed Dec 9, 2024
1 parent d7728fe commit 41f806a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 46 deletions.
35 changes: 9 additions & 26 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 2 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
nixpkgsUnstable = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
};
# TODO(msanft): Remove once https://github.com/NixOS/nixpkgs/commit/c429fa2ffa21229eeadbe37c11a47aff35f53ce0
# lands in nixpkgs-unstable.
nixpkgsBazel = {
url = "github:NixOS/nixpkgs/c429fa2ffa21229eeadbe37c11a47aff35f53ce0";
};
flake-utils = {
url = "github:numtide/flake-utils";
};
Expand All @@ -24,7 +19,6 @@
{
self,
nixpkgsUnstable,
nixpkgsBazel,
flake-utils,
uplosi,
}:
Expand All @@ -33,12 +27,10 @@
let
pkgsUnstable = import nixpkgsUnstable { inherit system; };

bazelPkgsUnstable = import nixpkgsBazel { inherit system; };

callPackage = pkgsUnstable.callPackage;

mkosiDev = (
pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
pkgsUnstable.mkosi.overrideAttrs (oldAttrs: {
propagatedBuildInputs =
oldAttrs.propagatedBuildInputs
++ (with pkgsUnstable; [
Expand Down Expand Up @@ -66,14 +58,6 @@
);

uplosiDev = uplosi.outputs.packages."${system}".uplosi;

openssl-static = pkgsUnstable.openssl.override { static = true; };

bazel_7 = bazelPkgsUnstable.callPackage ./nix/packages/bazel.nix {
pkgs = bazelPkgsUnstable;
nixpkgs = nixpkgsBazel;
};

in
{
packages.mkosi = mkosiDev;
Expand Down Expand Up @@ -104,13 +88,11 @@

packages.awscli2 = pkgsUnstable.awscli2;

packages.bazel_7 = bazel_7;

packages.createrepo_c = pkgsUnstable.createrepo_c;

packages.dnf5 = pkgsUnstable.dnf5;

devShells.default = callPackage ./nix/shells/default.nix { inherit bazel_7; };
devShells.default = callPackage ./nix/shells/default.nix { };

formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt;
}
Expand Down

0 comments on commit 41f806a

Please sign in to comment.