From b57fba4a09e184550e12e01737db2993b8476361 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 12 May 2022 18:23:32 +0200 Subject: [PATCH] hydra: get hydra-dev to build --- flake.lock | 8 ++++---- flake.nix | 1 - hosts/hydra/hydra.nix | 7 ------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 0e4bf5fb..ab333f71 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1652280837, - "narHash": "sha256-N4To3tjnks/20pze4r1Wiu7s9+o21RxzKRfVX6+CDNo=", - "owner": "nixos", + "lastModified": 1649172203, + "narHash": "sha256-Q3nYaXqbseDOvZrlePKeIrx0/KzqyrtNpxHIUbtFHuI=", + "owner": "NixOS", "repo": "nix", - "rev": "b944b588fa280b0555b8269c0f6d097352f8716f", + "rev": "5fe4fe823c193cbb7bfa05a468de91eeab09058d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e24c8feb..85b01f6c 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,6 @@ hydra = { url = "github:nixos/hydra"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix.url = "github:nixos/nix"; }; }; diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix index 5008f0b0..7932cd6c 100644 --- a/hosts/hydra/hydra.nix +++ b/hosts/hydra/hydra.nix @@ -29,13 +29,6 @@ in { logo = ./c3d2.svg; notificationSender = "hydra@spam.works"; # package = pkgs.hydra-unstable.overrideAttrs (oa: { - # src = pkgs.fetchFromGitHub { - # owner = "nixos"; - # repo = "hydra"; - # # master as of 2022-05-02 - # rev = "7c133a98f8e689cdc13f8a1adaaa9cd75d039a35"; - # sha256 = "01mgg9ngpjinlwbgm2s287namilm3ddlwpn0hjs6267608vjgi02"; - # }; # # HACK for Hydra error: cannot write modified lock file of flake # patchPhase = '' # ${pkgs.lib.optionalString (oa ? patchPhase) oa.patchPhase}