c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Use Mic's maintained harmonia fork

This commit is contained in:
Sandro - 2023-01-25 22:22:33 +01:00
parent bf619eeb07
commit 85608221c5
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
flake.lock
View File

@ -216,11 +216,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1674454979, "lastModified": 1674627787,
"narHash": "sha256-7m0JdDvfnzKQs0cKECpZajxg6RKA8gm4xVF6CeAvye0=", "narHash": "sha256-xFEeBht9d10FvuB4Pna8TDkRPWHRYG8+2QTxdZkprC8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "b2edf8473d14d6c6ffb2ca5e30459aa4bcd486aa", "rev": "bd1c8433f42528135491b38511c3e49d57855f13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,16 +247,15 @@
"harmonia": { "harmonia": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674059028, "lastModified": 1674486892,
"narHash": "sha256-hBL+Bcj6WwKDCytXaBtMsUBAAdAEACyd7FBnPMmE5/k=", "narHash": "sha256-nclLpNBFXtqCzd1Uw0foI0OsOuB2Xq+aoO7s25Pbuy0=",
"owner": "Mic92", "owner": "nix-community",
"repo": "harmonia", "repo": "harmonia",
"rev": "6637bae4ffcd449c3aeccf7eb17b7c36b8d1e24b", "rev": "e29357899f74892dadc971bf1886ea4f5c9cd148",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Mic92", "owner": "nix-community",
"ref": "fix-build",
"repo": "harmonia", "repo": "harmonia",
"type": "github" "type": "github"
} }
@ -357,11 +356,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1674509860, "lastModified": 1674584171,
"narHash": "sha256-BKoamZV9jfq2FSxRxs9Wn45zJ891JTnydFc7962dFMU=", "narHash": "sha256-EldpU0/EKDNi9mDoR9WMoR4Y8KWho2S2qTYKLSvW1U8=",
"owner": "SuperSandro2000", "owner": "SuperSandro2000",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0345fb03d79bef91076a99c35ec9a745c7c8e942", "rev": "4a99f085ba6deecec70d9ecfaa4d0833f90755ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +372,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1674498916, "lastModified": 1674550793,
"narHash": "sha256-rKacwgM76ymSu496esvcNPMCV4QX4n+7RvVSBB0zwCg=", "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4cff4f40b9db3baddff811ca00bf1aac2c4879cb", "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +441,11 @@
"openwrt": { "openwrt": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673532055, "lastModified": 1674644476,
"narHash": "sha256-MyFf9yguZuxTNOIPx1Xyfh9TheQDBYPZjPNPtqepqjU=", "narHash": "sha256-Xaxng0EY19/fpD6ODIZ7jhKb+B+dpXFua6phRkfna4I=",
"ref": "openwrt-21.02", "ref": "openwrt-21.02",
"rev": "8b46a263ab4afaf9857f0d29d369c2eefbf8a4f4", "rev": "944265347a81eadc3354731d5f739a6a4fdf6e7b",
"revCount": 51281, "revCount": 51282,
"type": "git", "type": "git",
"url": "https://git.openwrt.org/openwrt/openwrt.git" "url": "https://git.openwrt.org/openwrt/openwrt.git"
}, },
@ -463,11 +462,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674467118, "lastModified": 1674552100,
"narHash": "sha256-QWuD5kQ6ggSHilz2UgrJwLXM1rWbe1NgLYvFLMyEmZI=", "narHash": "sha256-WqH3TiRAqFyo04lgR0qXjqPazmKb1U9V5KBC1a+emgg=",
"owner": "astro", "owner": "astro",
"repo": "nix-openwrt-imagebuilder", "repo": "nix-openwrt-imagebuilder",
"rev": "cb28adf3fb60de29ae558d4e9f8cff3687a21cbb", "rev": "34dafe2c3ed658f6bafd9e44ff2d67625e5759e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +515,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1674325502, "lastModified": 1674566839,
"narHash": "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0=", "narHash": "sha256-1Kaz4+x3fKefYJ1fpMUXn3jf582R5PaEgE9FzW+NmSE=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "daa0138e4c159d5753e41a447201b6191437276e", "rev": "e86bac92f485ff8f17a3fe49f8f7e7a10bacfecc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +539,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674440843, "lastModified": 1674527079,
"narHash": "sha256-kMCGL1wADpbcgGiMgj1pcOxbLy2zfmzsn46YCMWwtIE=", "narHash": "sha256-WqehnSvo9YYfAoh7HMTxp6YVwq5eyLz663vPufeSsQs=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "57b363f390f031b8b8d26235c2d21b0ad5a84640", "rev": "187b7835d59b9c040e0782b5b129de113207c2d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +616,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674356914, "lastModified": 1674546403,
"narHash": "sha256-gY5vsvZD7u2vQhrFU89kKHrwTVfsbJermcpeiXVbzXA=", "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "51fdbd2d6fc2a7ba318e823a12609276bcc4dbe9", "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -779,11 +778,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674348319, "lastModified": 1674510549,
"narHash": "sha256-4JoSOUeTEwjf7cYLgIevgalVy0VIEp7eZ5+9GncucT0=", "narHash": "sha256-Xw9teadTkZZhpN5+5mRrIhNsJRKiiGU3ZgLn8mN54js=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "d3d82d4807c203f8b04d3620b24f83f43bfdc7ea", "rev": "d6c14b1b0e12d7f668443a435c2cf4dcaf41ed9a",
"revCount": 1738, "revCount": 1739,
"type": "git", "type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git" "url": "https://gitea.c3d2.de/zentralwerk/network.git"
}, },

3
flake.nix
View File

@ -88,8 +88,7 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
harmonia = { harmonia = {
# url = "github:helsinki-systems/harmonia"; # url = "github:helsinki-systems/harmonia";
# https://github.com/helsinki-systems/harmonia/pull/79 url = "github:nix-community/harmonia";
url = "github:Mic92/harmonia/fix-build";
flake = false; flake = false;
}; };
heliwatch = { heliwatch = {