gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: flake sanity, remove relative paths

Browse source
This commit is contained in:
Kat Inskip 2022-07-26 10:56:43 -07:00
parent 8f6859fa8d
commit d10b95e21a
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
5 changed files with 8 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -28,7 +28,7 @@
flake = false; flake = false;
}; };
trusted = { trusted = {
url = "path:./flake/empty/."; url = "github:input-output-hk/empty-flake";
flake = false; flake = false;
}; };
flake-compat = { flake-compat = {

0
flake/empty/.keep
View file

240
flake/trusted/flake.lock generated
View file

@ -1,240 +0,0 @@
{
"nodes": {
"arcexprs": {
"flake": false,
"locked": {
"lastModified": 1657481944,
"narHash": "sha256-b9fAcaHvclH50zjwxCq972F7uKNEerkShjM5YFOm6RA=",
"owner": "arcnmx",
"repo": "nixexprs",
"rev": "493ec79ee75efe10f06747d83e5eaca4409a4a6c",
"type": "github"
},
"original": {
"owner": "arcnmx",
"ref": "master",
"repo": "nixexprs",
"type": "github"
}
},
"ci": {
"flake": false,
"locked": {
"lastModified": 1654122671,
"narHash": "sha256-75xNbnJ29pWK2GbOEA9yUA6mvx5hcDWBFaSOSpv5Ob0=",
"owner": "arcnmx",
"repo": "ci",
"rev": "b78a5e52a21dad03dd4ca6d46354be6da1cf727a",
"type": "github"
},
"original": {
"owner": "arcnmx",
"ref": "nix2.4",
"repo": "ci",
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"nixfiles",
"nixpkgs"
]
},
"locked": {
"lastModified": 1651916036,
"narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixfiles",
"nixpkgs"
]
},
"locked": {
"lastModified": 1649980189,
"narHash": "sha256-55dgKGs7W8eC3s9GYewll9y4IlP/KAlSinjQwshNpxM=",
"owner": "kittywitch",
"repo": "home-manager",
"rev": "c591c34311923598fc0092ed06da6e4a515354d7",
"type": "github"
},
"original": {
"owner": "kittywitch",
"ref": "master",
"repo": "home-manager",
"type": "github"
}
},
"nix-dns": {
"inputs": {
"flake-utils": [
"nixfiles",
"flake-utils"
],
"nixpkgs": [
"nixfiles",
"nixpkgs"
]
},
"locked": {
"lastModified": 1635273082,
"narHash": "sha256-EHiDP2jEa7Ai5ZwIf5uld9RVFcV77+2SUxjQXwJsJa0=",
"owner": "kirelagin",
"repo": "nix-dns",
"rev": "c7b9645da9c0ddce4f9de4ef27ec01bb8108039a",
"type": "github"
},
"original": {
"owner": "kirelagin",
"ref": "master",
"repo": "nix-dns",
"type": "github"
}
},
"nixfiles": {
"inputs": {
"arcexprs": "arcexprs",
"ci": "ci",
"darwin": "darwin",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"nix-dns": "nix-dns",
"nixpkgs": "nixpkgs",
"nur": "nur",
"tf-nix": "tf-nix",
"trusted": [
"trusted"
]
},
"locked": {
"lastModified": 0,
"narHash": "sha256-5QiIP+KsR91bepdNbtT8KZ0xDetXgZ2Jwu8GsXEbEtA=",
"path": "/nix/store/gzp4k7vdi50xil3fakkxgz58ni45brjn-source",
"type": "path"
},
"original": {
"path": "/nix/store/gzp4k7vdi50xil3fakkxgz58ni45brjn-source",
"type": "path"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1657356697,
"narHash": "sha256-sT38tcx7m0Quz+Uj6jzx+yRa2+EVW2C3cE0FkROXUzQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "87e7965bbcdbac3d103e3ed14ff04f719a4f7a58",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1657458605,
"narHash": "sha256-WAoPHlCNTV/yXLF72D7vj+gk1yjfNBM3PmZ61sCT4co=",
"owner": "nix-community",
"repo": "nur",
"rev": "fe1f99449c93be772b31de520eebaee6feb8717e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "nur",
"type": "github"
}
},
"root": {
"inputs": {
"nixfiles": "nixfiles",
"trusted": "trusted"
}
},
"tf-nix": {
"flake": false,
"locked": {
"lastModified": 1655220817,
"narHash": "sha256-5eYqmPN1KuBz8ZNnIJPpRDeQDMOuS/kFpLGNld2G0is=",
"owner": "arcnmx",
"repo": "tf-nix",
"rev": "cd7c31d794a2d6992394ce4fa8b1157f8a88c349",
"type": "github"
},
"original": {
"owner": "arcnmx",
"ref": "master",
"repo": "tf-nix",
"type": "github"
}
},
"trusted": {
"flake": false,
"locked": {
"lastModified": 1657482041,
"narHash": "sha256-AEC0DO586Xq5NcYwyEBAosFj5VRSwLSPZCH5v5ri11s=",
"ref": "main",
"rev": "76779729b344d8427f05d9e78c76a19daa7cc2a8",
"revCount": 92,
"type": "git",
"url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
},
"original": {
"ref": "main",
"type": "git",
"url": "ssh://git@github.com/kittywitch/nixfiles-trusted"
}
}
},
"root": "root",
"version": 7
}

14
inputs.nix
View file

@ -5,14 +5,12 @@ let
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
}; };
trusted = import flakeCompat {
src = ./flake/trusted;
};
nixfiles = import flakeCompat { nixfiles = import flakeCompat {
src = ./.; src = ./.;
}; };
in nixfiles.defaultNix.inputs // { trusted = import flakeCompat {
trusted = if builtins.getEnv "TRUSTED" != "" src = ./trusted;
then trusted.defaultNix.inputs.trusted };
else ./flake/empty; in nixfiles.defaultNix.inputs // (if builtins.getEnv "TRUSTED" != "" then {
} inherit (trusted.defaultNix.inputs) trusted;
} else {})

2
flake/trusted/flake.nix → trusted/flake.nix
View file

@ -5,7 +5,7 @@
flake = false; flake = false;
}; };
nixfiles = { nixfiles = {
url = "../../."; url = "github:kittywitch/nixfiles";
inputs.trusted.follows = "trusted"; inputs.trusted.follows = "trusted";
}; };
}; };