diff --git a/.bazelversion b/.bazelversion index 815da58b7..93c8ddab9 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.4.1 +7.6.0 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 0dfebe95e..271f4849b 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,5 +1,5 @@ { - "lockFileVersion": 11, + "lockFileVersion": 13, "registryFileHashes": { "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", @@ -565,7 +565,7 @@ }, "@@rules_python~//python/extensions:pip.bzl%pip": { "general": { - "bzlTransitiveDigest": "oxG8ogxHEbtSCgVhCDBRrjiTlucxn15T4guZ4/etTgo=", + "bzlTransitiveDigest": "t2sNZ+esCBM7KBCD9MlBA5Y3Yk5SQj8V+JMUGkiANSM=", "usagesDigest": "lABgNFDx2B8eu1/8FW60KMkCqsChEDxlIL/ERa0nIFc=", "recordedFileInputs": { "@@rules_python~//tools/publish/requirements_linux.txt": "d576e0d8542df61396a9b38deeaa183c24135ed5e8e73bb9622f298f2671811e", @@ -3352,7 +3352,13 @@ } } }, - "recordedRepoMappingEntries": [] + "recordedRepoMappingEntries": [ + [ + "rules_python~", + "platforms", + "platforms" + ] + ] } } } diff --git a/flake.lock b/flake.lock index 830d6fd03..872ff8e47 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1743496247, - "narHash": "sha256-RtiLfqe+Wt1MC1LnG1mYNKwIlg27LnRwkr2b0vTmEIM=", - "owner": "msanft", + "lastModified": 1743538100, + "narHash": "sha256-Bl/ynRPIb4CdtbEw3gfJYpKiHmRmrKltXc8zipqpO0o=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef4cdcad9eaa74c2ff07c065e08b4017be3665c4", + "rev": "b9d43b3fe5152d1dc5783a2ba865b2a03388b741", "type": "github" }, "original": { - "owner": "msanft", - "ref": "msanft/mkosi/fix", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 87498a7ed..d21f223eb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,7 @@ inputs = { nixpkgsUnstable = { - # TODO(msanft): Go back to upstream once the following PR lands: - # https://github.com/NixOS/nixpkgs/pull/395114 - url = "github:msanft/nixpkgs/msanft/mkosi/fix"; + url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; flake-utils = { url = "github:numtide/flake-utils";