From d1f0c093ec0996feaec6bfc9f7993becfff25493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Wed, 20 Apr 2022 08:58:47 +0100 Subject: [PATCH] hydra please evaluate --- flake.lock | 60 ++++++------------------------------------------------ flake.nix | 2 ++ 2 files changed, 8 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 510276ad..87f601dc 100644 --- a/flake.lock +++ b/flake.lock @@ -178,9 +178,10 @@ }, "hydra": { "inputs": { - "nix": "nix", + "nix": [ + "nix" + ], "nixpkgs": [ - "hydra", "nix", "nixpkgs" ] @@ -232,22 +233,6 @@ "type": "github" } }, - "lowdown-src_2": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "miifox-net": { "flake": false, "locked": { @@ -267,25 +252,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1642583127, - "narHash": "sha256-WyCL2SDApuIjQngO0UozOBI/iDUUoDW1QEQ/MUUu/Ec=", - "owner": "NixOS", - "repo": "nix", - "rev": "bc443511eb65420b51d10708e25427fe50de37a8", - "type": "github" - }, - "original": { - "id": "nix", - "type": "indirect" - } - }, - "nix_2": { - "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -396,21 +363,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1632864508, - "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-21.05-small", - "type": "indirect" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1650440487, "narHash": "sha256-AVdo5xeN3r6PE4aAVteBGWbeiXxMfxiAbwvsat+ypx0=", @@ -488,9 +440,9 @@ "hosts-list": "hosts-list", "hydra": "hydra", "miifox-net": "miifox-net", - "nix": "nix_2", + "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nur": "nur", "polymc": "polymc", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index f539cdf5..3594d6a9 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,8 @@ rec { dns.url = "github:DarkKirb/dns.nix?ref=master"; hydra.url = github:thufschmitt/hydra/nix-ca; nix.url = github:NixOS/nix/2.6.1; + hydra.inputs.nix.follows = "nix"; + hydra.inputs.nixpkgs.follows = "nix/nixpkgs"; hosts-list.url = github:StevenBlack/hosts; hosts-list.flake = false; nixos-hardware.url = github:NixOS/nixos-hardware;