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

Reduce duplicated inputs

This commit is contained in:
Sandro - 2022-09-14 23:16:06 +02:00
parent 928180dfab
commit 9b86c78301
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 64 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
flake.lock
View File

@ -2,15 +2,17 @@
"nodes": {
"affection-src": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
"flake-utils": "flake-utils",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1663174424,
"lastModified": 1663176622,
"narHash": "sha256-ahmQXwS2P34x7PxXt8Ve2ZVKJHW6yP1m/nZoo8sHwmE=",
"ref": "refs/heads/master",
"rev": "81a76d4eb34eaadee3585a2a1476db785858896c",
"revCount": 291,
"rev": "b56ed86e45b2a8cdf811f2659644192a69ab5818",
"revCount": 293,
"type": "git",
"url": "https://gitea.nek0.eu/nek0/affection"
},
@ -27,7 +29,9 @@
"nixpkgs": [
"nixos"
],
"rust-overlay": "rust-overlay"
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1650651512,
@ -87,11 +91,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -117,26 +121,11 @@
},
"flake-utils_3": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@ -358,7 +347,7 @@
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
@ -379,7 +368,7 @@
"nix_2": {
"inputs": {
"lowdown-src": "lowdown-src_2",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs-regression": "nixpkgs-regression_2"
},
"locked": {
@ -446,16 +435,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-22.05-small",
"repo": "nixpkgs",
"type": "github"
}
@ -508,22 +497,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1645296114,
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
@ -538,21 +511,6 @@
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1663173135,
"narHash": "sha256-QL4JZYUlbt0ex78w30XJ0h9idUMj0DBxppyDsoxEPjE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d1ddac9493642d7311a064351e643de9a0e24ee",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
@ -629,6 +587,7 @@
},
"root": {
"inputs": {
"affection-src": "affection-src",
"bevy-mandelbrot": "bevy-mandelbrot",
"eris": "eris",
"fenix": "fenix",
@ -646,6 +605,7 @@
"openwrt": "openwrt",
"openwrt-imagebuilder": "openwrt-imagebuilder",
"riscv64": "riscv64",
"rust-overlay": "rust-overlay",
"scrapers": "scrapers",
"secrets": "secrets",
"sops-nix": "sops-nix",
@ -658,28 +618,6 @@
"zentralwerk": "zentralwerk"
}
},
"rust": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"syndicate",
"nixpkgs"
]
},
"locked": {
"lastModified": 1656384549,
"narHash": "sha256-hUe2t7//B9U9SSODAplfzdKkwxwO4kHsPX2k0y95SUU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "61df523b5c22665d89710d9985cf5afe751d703f",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
@ -699,15 +637,17 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1650336226,
"narHash": "sha256-A68t/BM3JPXUDFx9JGBk24euXvsaIZuPL28+hX5TmwA=",
"lastModified": 1663124427,
"narHash": "sha256-0rhe0dv2XVUfh8DTkmqyXURThKKqnEtsBZ3LITYhIf8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "8cd3024e5b011218308eeee35c4839601af458f8",
"rev": "a65e63f15f1889c053f833767c7d624ccfba3110",
"type": "github"
},
"original": {
@ -796,7 +736,9 @@
"nixpkgs": [
"nixos"
],
"rust": "rust"
"rust": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1662481109,
@ -857,7 +799,9 @@
},
"tracer": {
"inputs": {
"affection-src": "affection-src",
"affection-src": [
"affection-src"
],
"flake-utils": [
"flake-utils"
],

36
flake.nix
View File

@ -6,15 +6,21 @@
nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:nixos/nixos-hardware";
affection-src = {
url = "git+https://gitea.nek0.eu/nek0/affection";
inputs = {
nixpkgs.follows = "nixos";
utils.follows = "flake-utils";
};
};
bevy-mandelbrot = {
url = "github:matelab/bevy_mandelbrot";
inputs = {
nixpkgs.follows = "nixos";
naersk.follows = "naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs";
# rust-overlay.follows = "rust-overlay";
# rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
# rust-overlay.inputs.flake-utils.follows = "flake-utils";
rust-overlay.follows = "rust-overlay";
};
};
eris = {
@ -66,6 +72,12 @@
url = "github:zhaofengli/nixos-riscv64";
inputs.nixpkgs.follows = "nixos";
};
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixos";
};
};
scrapers = {
url = "git+https://gitea.c3d2.de/astro/scrapers.git";
flake = false;
@ -87,6 +99,13 @@
url = "github:astro/spacemsg";
flake = false;
};
syndicate = {
url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake";
inputs = {
nixpkgs.follows = "nixos";
rust.follows = "rust-overlay";
};
};
ticker = {
url = "git+https://gitea.c3d2.de/astro/ticker.git";
inputs = {
@ -103,12 +122,11 @@
};
tracer = {
url = "git+https://gitea.nek0.eu/nek0/tracer";
inputs.nixpkgs.follows = "nixos";
inputs.flake-utils.follows = "flake-utils";
};
syndicate = {
url = "git+https://git.syndicate-lang.org/ehmry/syndicate-flake";
inputs.nixpkgs.follows = "nixos";
inputs= {
affection-src.follows = "affection-src";
nixpkgs.follows = "nixos";
flake-utils.follows = "flake-utils";
};
};
yammat = {
url = "git+https://gitea.c3d2.de/C3D2/yammat.git?ref=nix";