From 705bb5dc0c59b6a2d6b72bc2ac1787820b56ecd9 Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Tue, 28 Jan 2020 10:24:03 +1000 Subject: [PATCH] Initial commit of hydra forks --- roles/hydra-dev.nix | 20 ++++++++++++++++++++ roles/hydra-fork.nix | 14 ++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 roles/hydra-dev.nix create mode 100644 roles/hydra-fork.nix diff --git a/roles/hydra-dev.nix b/roles/hydra-dev.nix new file mode 100644 index 0000000..d7a1152 --- /dev/null +++ b/roles/hydra-dev.nix @@ -0,0 +1,20 @@ +{ pkgs }: + +let + hydraSrc = pkgs.fetchFromGitHub { + owner = "nixos"; + repo = "hydra"; + rev = "906d2493c5c74673ba317d0b5ce7d97b062bd39b"; + sha256 = "0i7szp04c873gfmj1h0dcl5rsbzzldc160pcls8z9v6iphils34i"; + }; +in + pkgs.callPackage ./hydra-fork.nix { + nixpkgsPath = pkgs.path; + #patches = [ + # (pkgs.fetchpatch { + # url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch"; + # sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx"; + # }) + #]; + src = hydraSrc; + } diff --git a/roles/hydra-fork.nix b/roles/hydra-fork.nix new file mode 100644 index 0000000..6518b21 --- /dev/null +++ b/roles/hydra-fork.nix @@ -0,0 +1,14 @@ +{ fetchFromGitHub, nixpkgsPath, src }: + +let + hydraRelease = (import (src + "/release.nix") { + nixpkgs = nixpkgsPath; + hydraSrc = { + outPath = src; + rev = builtins.substring 0 6 src.rev; + revCount = 1234; + }; + }); + +in + hydraRelease.build.x86_64-linux.overrideAttrs (drv: { })