Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

flake: pin bazel to 7.1.2 (#3142)

Browse Source 
Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
This commit is contained in:
Moritz Sanft 2024-06-04 16:50:52 +02:00 committed by GitHub
parent 72555e9ba1
commit 5f0ed2b865
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flake.lock
View File

@ -18,13 +18,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsUnstable": { "nixpkgsBazel": {
"locked": { "locked": {
"lastModified": 1715161350, "lastModified": 1717414489,
"narHash": "sha256-5ZU8DVwHO0gjw2sKoKkToYOXMJFRBpRsa17Ebm8fgj0=", "narHash": "sha256-fhvJv8hkJwotkqxhoSQfvh6UfKG+sTYIQ3hchariEDk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c4200cb341ee794775185ecd4105fbbfb5ca73a0", "rev": "c429fa2ffa21229eeadbe37c11a47aff35f53ce0",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c429fa2ffa21229eeadbe37c11a47aff35f53ce0",
"type": "github"
}
},
"nixpkgsUnstable": {
"locked": {
"lastModified": 1717399147,
"narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,6 +53,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgsBazel": "nixpkgsBazel",
"nixpkgsUnstable": "nixpkgsUnstable", "nixpkgsUnstable": "nixpkgsUnstable",
"uplosi": "uplosi" "uplosi": "uplosi"
} }
@ -66,11 +83,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714468720, "lastModified": 1715947971,
"narHash": "sha256-i/RVCoeQLeOaPaEtJS/l+42CVohMucA6cBBt0mdJ4uE=", "narHash": "sha256-1YpxN5R3lEQnOUg94B2B/Ah2WDABUQTZ6kpyQMPt/xI=",
"owner": "edgelesssys", "owner": "edgelesssys",
"repo": "uplosi", "repo": "uplosi",
"rev": "7c881351a2f7c664d04c4e235562e5b427b167f2", "rev": "73b6208ac21603bb69e8079fa8be821e590de286",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View File

@ -5,6 +5,11 @@
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";
}; };
@ -18,6 +23,7 @@
outputs = outputs =
{ self { self
, nixpkgsUnstable , nixpkgsUnstable
, nixpkgsBazel
, flake-utils , flake-utils
, uplosi , uplosi
}: }:
@ -25,6 +31,8 @@
let let
pkgsUnstable = import nixpkgsUnstable { inherit system; }; pkgsUnstable = import nixpkgsUnstable { inherit system; };
bazelPkgsUnstable = import nixpkgsBazel { inherit system; };
callPackage = pkgsUnstable.callPackage; callPackage = pkgsUnstable.callPackage;
mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec { mkosiDev = (pkgsUnstable.mkosi.overrideAttrs (oldAttrs: rec {
@ -55,7 +63,7 @@
openssl-static = pkgsUnstable.openssl.override { static = true; }; openssl-static = pkgsUnstable.openssl.override { static = true; };
bazel_7 = callPackage ./nix/packages/bazel.nix { pkgs = pkgsUnstable; nixpkgs = nixpkgsUnstable; }; bazel_7 = bazelPkgsUnstable.callPackage ./nix/packages/bazel.nix { pkgs = bazelPkgsUnstable; nixpkgs = nixpkgsBazel; };
in in
{ {