one of the hydra tryouts was removed, updated zen flake to one that is maintained
This commit is contained in:
parent
6a629c392a
commit
62a27d27af
|
@ -1,55 +0,0 @@
|
||||||
{
|
|
||||||
nixpkgs,
|
|
||||||
# pulls,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
pkgs = import nixpkgs { };
|
|
||||||
|
|
||||||
# prs = builtins.fromJSON (builtins.readFile pulls);
|
|
||||||
# prJobsets = pkgs.lib.mapAttrs (num: info: {
|
|
||||||
# enabled = 1;
|
|
||||||
# hidden = false;
|
|
||||||
# description = "PR ${num}: ${info.title}";
|
|
||||||
# checkinterval = 60;
|
|
||||||
# schedulingshares = 20;
|
|
||||||
# enableemail = false;
|
|
||||||
# emailoverride = "";
|
|
||||||
# keepnr = 1;
|
|
||||||
# type = 1;
|
|
||||||
# flake = "github:shawn8901/nix-configuration/pull/${num}/head";
|
|
||||||
# }) prs;
|
|
||||||
mkFlakeJobset = branch: {
|
|
||||||
description = "Build ${branch}";
|
|
||||||
checkinterval = "3600";
|
|
||||||
enabled = "1";
|
|
||||||
schedulingshares = 100;
|
|
||||||
enableemail = false;
|
|
||||||
emailoverride = "";
|
|
||||||
keepnr = 3;
|
|
||||||
hidden = false;
|
|
||||||
type = 1;
|
|
||||||
flake = "github:shawn8901/nix-configuration/${branch}";
|
|
||||||
};
|
|
||||||
|
|
||||||
desc = {
|
|
||||||
"main" = mkFlakeJobset "main";
|
|
||||||
};
|
|
||||||
|
|
||||||
log = {
|
|
||||||
# pulls = prs;
|
|
||||||
jobsets = desc;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
jobsets = pkgs.runCommand "spec-jobsets.json" { } ''
|
|
||||||
cat >$out <<EOF
|
|
||||||
${builtins.toJSON desc}
|
|
||||||
EOF
|
|
||||||
# This is to get nice .jobsets build logs on Hydra
|
|
||||||
cat >tmp <<EOF
|
|
||||||
${builtins.toJSON log}
|
|
||||||
EOF
|
|
||||||
${pkgs.jq}/bin/jq . tmp
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
{
|
|
||||||
"enabled": 1,
|
|
||||||
"hidden": false,
|
|
||||||
"description": "system flake",
|
|
||||||
"nixexprinput": "nixexpr",
|
|
||||||
"nixexprpath": ".hydra/jobsets.nix",
|
|
||||||
"checkinterval": 3600,
|
|
||||||
"schedulingshares": 100,
|
|
||||||
"enableemail": false,
|
|
||||||
"emailoverride": "",
|
|
||||||
"keepnr": 3,
|
|
||||||
"type": 0,
|
|
||||||
"inputs": {
|
|
||||||
"nixexpr": {
|
|
||||||
"value": "https://git.christophhollizeck.dev/Daholli/nixos-config.git main",
|
|
||||||
"type": "git",
|
|
||||||
"emailresponsible": false
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
|
||||||
"value": "https://github.com/NixOS/nixpkgs unstable",
|
|
||||||
"type": "git",
|
|
||||||
"emailresponsible": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
10
flake.lock
10
flake.lock
|
@ -1946,15 +1946,15 @@
|
||||||
"nixpkgs": "nixpkgs_9"
|
"nixpkgs": "nixpkgs_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732835488,
|
"lastModified": 1735791650,
|
||||||
"narHash": "sha256-r1nomBVEMO4I0y3pMfqLletQxKak5xfpk9DhlO1AsuI=",
|
"narHash": "sha256-2t6v5LcNyJOEMshCqEuCq70WPhJLtCoItbk5K8fqf5A=",
|
||||||
"owner": "ch4og",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "d8fbf602685f5cf2a6475eaf20595a6dc6628891",
|
"rev": "4cbef43b946c0e620fd283b74d505408a28a00d1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ch4og",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
sops-nix.url = "github:Mic92/sops-nix";
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
|
|
||||||
## temporary
|
## temporary
|
||||||
zen-browser.url = "github:ch4og/zen-browser-flake";
|
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
||||||
|
|
||||||
raspberry-pi-nix = {
|
raspberry-pi-nix = {
|
||||||
url = "github:nix-community/raspberry-pi-nix";
|
url = "github:nix-community/raspberry-pi-nix";
|
||||||
|
|
|
@ -18,7 +18,6 @@ in
|
||||||
|
|
||||||
# eve
|
# eve
|
||||||
# bottles
|
# bottles
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.pathsToLink = [ "/libexec" ];
|
environment.pathsToLink = [ "/libexec" ];
|
||||||
|
|
Loading…
Reference in a new issue