From df6eb03089fe16908ad44c015605dab5a9e54743 Mon Sep 17 00:00:00 2001 From: sefidel Date: Thu, 15 Aug 2024 00:45:06 +0900 Subject: fix(flake): hydra: use provided nixpkgs --- flake.lock | 30 ++++++++++++++++++++++-------- flake.nix | 1 - 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b01ebac..7c0ec5e 100644 --- a/flake.lock +++ b/flake.lock @@ -538,9 +538,7 @@ "hydra": { "inputs": { "nix": "nix", - "nixpkgs": [ - "unstable" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1722499110, @@ -720,7 +718,7 @@ "inputs": { "flake-parts": "flake-parts_6", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -783,16 +781,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723221148, - "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-23.11-small", "repo": "nixpkgs", "type": "github" } @@ -943,6 +941,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1723640496, diff --git a/flake.nix b/flake.nix index a5026c3..29fad25 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,6 @@ flake-compat.flake = false; hydra.url = "github:NixOS/hydra"; - hydra.inputs.nixpkgs.follows = "unstable"; attic.url = "github:zhaofengli/attic"; attic.inputs.nixpkgs.follows = "unstable"; -- cgit 1.4.1