diff --git a/flake.lock b/flake.lock index a633bfa33..400acf062 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -18,29 +18,13 @@ "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": { "locked": { - "lastModified": 1725816686, - "narHash": "sha256-0Kq2MkQ/sQX1rhWJ/ySBBQlBJBUK8mPMDcuDhhdBkSU=", + "lastModified": 1733376361, + "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "add0443ee587a0c44f22793b8c8649a0dbc3bb00", + "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c", "type": "github" }, "original": { @@ -53,7 +37,6 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgsBazel": "nixpkgsBazel", "nixpkgsUnstable": "nixpkgsUnstable", "uplosi": "uplosi" } @@ -83,11 +66,11 @@ ] }, "locked": { - "lastModified": 1725522308, - "narHash": "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk=", + "lastModified": 1733317519, + "narHash": "sha256-Q/qCh655Cga1nKs4qMF+2JYLxy+mLvFofKxukoREZ3Q=", "owner": "edgelesssys", "repo": "uplosi", - "rev": "c8a482de299b5442f558d7381f0cbf898e0de0e1", + "rev": "137f7b6557087fc198e919b2ef8c167ecbe94f91", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ddd1521c7..e972da05b 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; }; @@ -24,7 +19,6 @@ { self, nixpkgsUnstable, - nixpkgsBazel, flake-utils, uplosi, }: @@ -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; [ @@ -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; @@ -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; }