diff --git a/flake.lock b/flake.lock index 31ed4ba..f3a40e9 100644 --- a/flake.lock +++ b/flake.lock @@ -136,18 +136,17 @@ }, "hydra": { "inputs": { - "newNixpkgs": "newNixpkgs", "nix": "nix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1661016802, - "narHash": "sha256-rLPOvSCAobCvUlJn3LVZ2R8TENMcZROvtydFVBzISDY=", + "lastModified": 1662645314, + "narHash": "sha256-eMStY0/cS/blRGyyp1DUpP3N0SxYZrxah+hNJeKwDSw=", "owner": "NixOS", "repo": "hydra", - "rev": "222a8047e4d29329d568207469fd8b30581843c0", + "rev": "d6cbf227cba90cf281f72f464393d75a45f2f3a8", "type": "github" }, "original": { @@ -194,22 +193,6 @@ "type": "github" } }, - "newNixpkgs": { - "locked": { - "lastModified": 1647380550, - "narHash": "sha256-909TI9poX7CIUiFx203WL29YON6m/I6k0ExbZvR7bLM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6e3ee8957637a60f5072e33d78e05c0f65c54366", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -217,16 +200,16 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1654014617, - "narHash": "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g=", + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", "owner": "NixOS", "repo": "nix", - "rev": "624e38aa43f304fbb78b4779172809add042b513", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "2.9.1", + "ref": "2.11.0", "repo": "nix", "type": "github" } @@ -270,11 +253,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1662221733, - "narHash": "sha256-dw1xjYyQ0JidXIpzeQh/gQX+ih1sJO1zBHKs5QSYp8Q=", + "lastModified": 1662864125, + "narHash": "sha256-AtjyEFK7Zp9+hOOUNO1/YZRADV/wC94R3yeKN8saUK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "013e8d86d9a3f33074c903c8ffcab0d34087b1ed", + "rev": "e6f053b6079c16e7df97531e3e0524ace1304d4d", "type": "github" }, "original": { @@ -310,9 +293,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", + "repo": "nixpkgs", "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "indirect" + "type": "github" } }, "nixpkgs-update": { @@ -385,26 +369,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1662070595, - "narHash": "sha256-fYrdaUXhV4oPhkehHRwj78d1VjATnK4SF0fElEQUyLw=", + "lastModified": 1662940775, + "narHash": "sha256-SIgHTMjM+PqXWaXDzXsy/XmrDuTu7zpPvizgS7C9n+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f867325b5da6c4c9211707abdb481e1d0b3e589", + "rev": "faa93c4e19e79e7a6de31d6d3492b8f00760ca82", "type": "github" }, "original": { @@ -431,11 +416,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1662096612, - "narHash": "sha256-R+Q8l5JuyJryRPdiIaYpO5O3A55rT+/pItBrKcy7LM4=", + "lastModified": 1662818301, + "narHash": "sha256-uRjbKN924ptf5CvQ4cfki3R9nIm5EhrJBeb/xUxwfcM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21de2b973f9fee595a7a1ac4693efff791245c34", + "rev": "a25f0b9bbdfedee45305da5d1e1410c5bcbd48f6", "type": "github" }, "original": { @@ -488,11 +473,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1662265707, - "narHash": "sha256-nSCTmU6Ol02JMUzueAQGq1B/TC8JLrhrYivFzEmV0iQ=", + "lastModified": 1662870301, + "narHash": "sha256-O+ABD+WzEBLVH6FwxKCIpps0hsR6b5dpYe6fB3e3Ju8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "00da5de7380e0fc01e009e7ea9eb3f391d4b6e02", + "rev": "20929e1c5722a6db2f2dbe4cd36d4af0de0a9df0", "type": "github" }, "original": { diff --git a/services/hydra/default.nix b/services/hydra/default.nix index 2c6d17d..bdef0fa 100644 --- a/services/hydra/default.nix +++ b/services/hydra/default.nix @@ -64,7 +64,7 @@ in ]; }; - services.hydra.package = hydra.defaultPackage.${pkgs.system}; + services.hydra.package = hydra.packages.${pkgs.system}.default; sops.secrets.nix-community-cachix.sopsFile = ../../roles/nix-community-cache.yaml; sops.secrets.id_buildfarm = { };