Switch to Hydra "fork"

Signed-off-by: magic_rb <richard@brezak.sk>
This commit is contained in:
magic_rb 2023-10-21 16:34:41 +02:00
parent 1b3d44bd76
commit 9e9c65dd59
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
5 changed files with 193 additions and 53 deletions

View file

@ -117,8 +117,8 @@
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_13",
"flake-compat": "flake-compat_4",
"nixpkgs": "nixpkgs_14",
"utils": "utils"
},
"locked": {
@ -279,6 +279,22 @@
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -294,7 +310,7 @@
"type": "github"
}
},
"flake-compat_3": {
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1648199409,
@ -310,7 +326,7 @@
"type": "github"
}
},
"flake-compat_4": {
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1627913399,
@ -325,7 +341,7 @@
"type": "indirect"
}
},
"flake-compat_5": {
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -341,7 +357,7 @@
"type": "github"
}
},
"flake-compat_6": {
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -814,6 +830,26 @@
"type": "indirect"
}
},
"hydra_2": {
"inputs": {
"nix": "nix_3",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1691022464,
"narHash": "sha256-zMBrWTJaP48nz9eDZj1eYgk7lDvij6uQU1gU60IWB6Y=",
"owner": "t184256",
"repo": "hydra",
"rev": "a5ff881c96061841dfc82a264e7dd5201a973512",
"type": "github"
},
"original": {
"owner": "t184256",
"ref": "nix-ca-reprise",
"repo": "hydra",
"type": "github"
}
},
"ical2org": {
"flake": false,
"locked": {
@ -908,6 +944,22 @@
}
},
"lowdown-src_3": {
"flake": false,
"locked": {
"lastModified": 1633514407,
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
"owner": "kristapsdz",
"repo": "lowdown",
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
"type": "github"
},
"original": {
"owner": "kristapsdz",
"repo": "lowdown",
"type": "github"
}
},
"lowdown-src_4": {
"flake": false,
"locked": {
"lastModified": 1632468475,
@ -942,7 +994,7 @@
"microvm": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1696405736,
@ -977,7 +1029,7 @@
"nil": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -1015,7 +1067,7 @@
},
"nix-matlab": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs"
]
@ -1073,8 +1125,33 @@
},
"nix_3": {
"inputs": {
"flake-compat": "flake-compat_2",
"lowdown-src": "lowdown-src_3",
"nixpkgs": "nixpkgs_14"
"nixpkgs": [
"hydra",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression_3"
},
"locked": {
"lastModified": 1686048923,
"narHash": "sha256-/XCWa2osNFIpPC5MkxlX6qTZf/DaTLwS3LWN0SRFiuU=",
"owner": "NixOS",
"repo": "nix",
"rev": "84050709ea18f3285a85d729f40c8f8eddf5008e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "2.16.1",
"repo": "nix",
"type": "github"
}
},
"nix_4": {
"inputs": {
"lowdown-src": "lowdown-src_4",
"nixpkgs": "nixpkgs_15"
},
"locked": {
"lastModified": 1633098935,
@ -1091,7 +1168,7 @@
},
"nixinate": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1682599469,
@ -1109,7 +1186,7 @@
},
"nixng": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1696704869,
@ -1127,7 +1204,7 @@
},
"nixng_2": {
"inputs": {
"nixpkgs": "nixpkgs_17"
"nixpkgs": "nixpkgs_18"
},
"locked": {
"lastModified": 1686222921,
@ -1163,7 +1240,7 @@
"flake-parts": "flake-parts_2",
"nixos-2305": "nixos-2305",
"nixos-images": "nixos-images",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_10",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -1401,6 +1478,22 @@
"type": "github"
}
},
"nixpkgs-regression_3": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1685801374,
@ -1434,6 +1527,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1694669921,
"narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1696193975,
"narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=",
@ -1449,7 +1558,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1686412476,
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=",
@ -1462,7 +1571,7 @@
"type": "indirect"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1689885880,
"narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=",
@ -1478,7 +1587,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_14": {
"locked": {
"lastModified": 1648219316,
"narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
@ -1494,7 +1603,7 @@
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_15": {
"locked": {
"lastModified": 1632864508,
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
@ -1509,7 +1618,7 @@
"type": "indirect"
}
},
"nixpkgs_15": {
"nixpkgs_16": {
"locked": {
"lastModified": 1674736538,
"narHash": "sha256-/DszFMkAgYyB9dTWKkoZa9i0zcrA6Z4hYrOr/u/FSxY=",
@ -1523,7 +1632,7 @@
"type": "indirect"
}
},
"nixpkgs_16": {
"nixpkgs_17": {
"locked": {
"lastModified": 1676569297,
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
@ -1536,7 +1645,7 @@
"type": "indirect"
}
},
"nixpkgs_17": {
"nixpkgs_18": {
"locked": {
"lastModified": 1668984258,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
@ -1552,7 +1661,7 @@
"type": "github"
}
},
"nixpkgs_18": {
"nixpkgs_19": {
"locked": {
"lastModified": 1693565476,
"narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
@ -1617,6 +1726,22 @@
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1687379288,
"narHash": "sha256-cSuwfiqYfeVyqzCRkU9AvLTysmEuSal8nh6CYr+xWog=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ef0bc3976340dab9a4e087a0bcff661a8b2e87f3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1696019113,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
@ -1632,7 +1757,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1690441914,
"narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
@ -1648,7 +1773,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1653060744,
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
@ -1664,7 +1789,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1668984258,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=",
@ -1680,25 +1805,9 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1694669921,
"narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"notnft": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1691616520,
@ -1733,7 +1842,7 @@
"numen-nix": {
"inputs": {
"dotool": "dotool",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_13",
"numen": "numen"
},
"locked": {
@ -1801,7 +1910,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"nixpkgs": [
@ -1832,6 +1941,7 @@
"flake-parts": "flake-parts",
"haskell-nix": "haskell-nix",
"home-manager": "home-manager",
"hydra": "hydra_2",
"ical2org": "ical2org",
"impermenance": "impermenance",
"microvm": "microvm",
@ -1840,7 +1950,7 @@
"nixinate": "nixinate",
"nixng": "nixng",
"nixos-anywhere": "nixos-anywhere",
"nixpkgs": "nixpkgs_10",
"nixpkgs": "nixpkgs_11",
"nixpkgs-hashicorp": "nixpkgs-hashicorp",
"notnft": "notnft",
"numen-nix": "numen-nix",
@ -1898,8 +2008,8 @@
"secret": {
"flake": false,
"locked": {
"lastModified": 1696687409,
"narHash": "sha256-9griICSNiS0utPi11m7hpBmLqQ0FuBUiM9Bso4ZWvI8=",
"lastModified": 1696715022,
"narHash": "sha256-FsZub6K05+rrJfziI78OBMyZ/loXrbl1LgN4vjMTPyc=",
"path": "/home/main/dotfiles/secret",
"type": "path"
},
@ -1911,15 +2021,15 @@
"serokell-nix": {
"inputs": {
"deploy-rs": "deploy-rs",
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_3",
"get-tested-src": "get-tested-src",
"gitignore-nix": "gitignore-nix",
"haskell-nix": [
"haskell-nix"
],
"nix": "nix_3",
"nixpkgs": "nixpkgs_15"
"nix": "nix_4",
"nixpkgs": "nixpkgs_16"
},
"locked": {
"lastModified": 1694938339,
@ -2050,7 +2160,7 @@
},
"tuxedo-nixos": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-compat": "flake-compat_6",
"nixpkgs": [
"nixpkgs"
]
@ -2110,7 +2220,7 @@
"uterranix": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_16",
"nixpkgs": "nixpkgs_17",
"terranix": "terranix"
},
"locked": {
@ -2186,7 +2296,7 @@
"modus-themes": "modus-themes",
"nix-mode": "nix-mode",
"nixng": "nixng_2",
"nixpkgs": "nixpkgs_18",
"nixpkgs": "nixpkgs_19",
"org-special-block-extras": "org-special-block-extras",
"org-thtml": "org-thtml",
"s-el": "s-el",

View file

@ -20,6 +20,7 @@
notnft.url = "github:chayleaf/notnft";
impermenance.url = "path:///nix/persist/home/main/repos/impermanence";
numen-nix.url = "github:anpandey/numen-nix";
hydra.url = "github:t184256/hydra/nix-ca-reprise";
disko.url = "github:nix-community/disko";
nixos-anywhere.url = "github:numtide/nixos-anywhere";

View file

@ -0,0 +1,26 @@
{ inputs, ... }:
{
flake.nixngConfigurations.fileStash =
inputs.nixng.nglib.makeSystem {
system = "x86_64-linux";
name = "filestash";
inherit (inputs) nixpkgs;
config =
{ pkgs, ... }:
{
dumb-init = {
enable = true;
type.services = {};
};
nixpkgs.overlays = [
inputs.filestash-nix.overlays.default
];
services.filestash = {
enable = true;
package = pkgs.filestash;
};
};
};
}

View file

@ -4,6 +4,7 @@ let
inherit (inputs.nixng.nglib)
makeSystem;
inherit (inputs)
hydra
nixpkgs;
};
in

View file

@ -1,5 +1,6 @@
{ makeSystem
, nixpkgs
, hydra
}:
makeSystem {
system = "x86_64-linux";
@ -37,6 +38,7 @@ makeSystem {
};
services.hydra = {
enable = true;
package = hydra.packages.x86_64-linux.hydra;
hydraURL = "https://hydra.redalder.org";
notificationSender = "hydra@redalder.org";
useSubstitutes = true;