Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-11-08 23:06:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

flake: update to Bazel 7.4.1 (#3534)

Browse source
This commit is contained in:
Moritz Sanft 2024-12-10 07:13:54 +01:00 • committed by GitHub
parent cdb3e461bb
commit 23354f23a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1731533236,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,29 +18,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsBazel": {
"locked": {
"lastModified": 1717414489,
"narHash": "sha256-fhvJv8hkJwotkqxhoSQfvh6UfKG+sTYIQ3hchariEDk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c429fa2ffa21229eeadbe37c11a47aff35f53ce0",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c429fa2ffa21229eeadbe37c11a47aff35f53ce0",
"type": "github"
}
},
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1725816686, "lastModified": 1733376361,
"narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=", "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "add0443ee587a0c44f22793b8c8649a0dbc3bb00", "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,7 +37,6 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgsBazel": "nixpkgsBazel",
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable",
"uplosi": "uplosi" "uplosi": "uplosi"
} }
@ -83,11 +66,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725522308, "lastModified": 1733317519,
"narHash": "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk=", "narHash": "sha256-Q/qCh655Cga1nKs4qMF+2JYLxy+mLvFofKxukoREZ3Q=",
"owner": "edgelesssys", "owner": "edgelesssys",
"repo": "uplosi", "repo": "uplosi",
"rev": "c8a482de299b5442f558d7381f0cbf898e0de0e1", "rev": "137f7b6557087fc198e919b2ef8c167ecbe94f91",
"type": "github" "type": "github"
}, },
"original": { "original": {

22
flake.nix
View file

@ -5,11 +5,6 @@
nixpkgsUnstable = { nixpkgsUnstable = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 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 = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
}; };
@ -24,7 +19,6 @@
{ {
self, self,
nixpkgsUnstable, nixpkgsUnstable,
nixpkgsBazel,
flake-utils, flake-utils,
uplosi, uplosi,
}: }:
@ -33,12 +27,10 @@
let let
pkgsUnstable = import nixpkgsUnstable { inherit system; }; pkgsUnstable = import nixpkgsUnstable { inherit system; };
bazelPkgsUnstable = import nixpkgsBazel { inherit system; };
callPackage = pkgsUnstable.callPackage; callPackage = pkgsUnstable.callPackage;
mkosiDev = ( mkosiDev = (
pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec { pkgsUnstable.mkosi.overrideAttrs (oldAttrs: {
propagatedBuildInputs = propagatedBuildInputs =
oldAttrs.propagatedBuildInputs oldAttrs.propagatedBuildInputs
++ (with pkgsUnstable; [ ++ (with pkgsUnstable; [
@ -66,14 +58,6 @@
); );
uplosiDev = uplosi.outputs.packages."${system}".uplosi; 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 in
{ {
packages.mkosi = mkosiDev; packages.mkosi = mkosiDev;
@ -104,13 +88,11 @@
packages.awscli2 = pkgsUnstable.awscli2; packages.awscli2 = pkgsUnstable.awscli2;
packages.bazel_7 = bazel_7;
packages.createrepo_c = pkgsUnstable.createrepo_c; packages.createrepo_c = pkgsUnstable.createrepo_c;
packages.dnf5 = pkgsUnstable.dnf5; 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; formatter = nixpkgsUnstable.legacyPackages.${system}.nixpkgs-fmt;
} }