aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoispha <soispha@vhack.eu>2023-07-23 08:37:20 +0200
committerSoispha <soispha@vhack.eu>2023-07-23 08:37:20 +0200
commit1566fcf695101c4fc1c05e3ba25cb4ee5d9c9911 (patch)
treebbc66a668f341190ec2900082d4ff61a1386ffaf
parentBuild(flake): Update (diff)
downloadnixos-config-1566fcf695101c4fc1c05e3ba25cb4ee5d9c9911.zip
Build(flake): Switch to stable lanzaboote to sidestep building llvm/rustc
-rw-r--r--flake.lock47
-rw-r--r--flake.nix9
2 files changed, 32 insertions, 24 deletions
diff --git a/flake.lock b/flake.lock
index 3f0ee7cd..3d20fb8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -119,11 +119,11 @@
]
},
"locked": {
- "lastModified": 1688466019,
- "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
+ "lastModified": 1680392223,
+ "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
+ "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
"type": "github"
},
"original": {
@@ -328,6 +328,9 @@
},
"lanzaboote": {
"inputs": {
+ "crane": [
+ "crane"
+ ],
"flake-compat": [
"flake-compat"
],
@@ -336,20 +339,24 @@
"flake-utils"
],
"nixpkgs": [
- "nixpkgs-stable-release"
+ "nixpkgs_stable_release"
],
- "pre-commit-hooks-nix": "pre-commit-hooks-nix"
+ "pre-commit-hooks-nix": "pre-commit-hooks-nix",
+ "rust-overlay": [
+ "rust-overlay"
+ ]
},
"locked": {
- "lastModified": 1689889377,
- "narHash": "sha256-ChBawisTCY3Cl06CSG+QNC2ES+G0ASiOxtOVif9uP/0=",
+ "lastModified": 1682802423,
+ "narHash": "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "e7246c6bce1733d373059e6342f67fd53f90c198",
+ "rev": "64b903ca87d18cef2752c19c098af275c6e51d63",
"type": "github"
},
"original": {
"owner": "nix-community",
+ "ref": "v0.3.0",
"repo": "lanzaboote",
"type": "github"
}
@@ -424,21 +431,21 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1685801374,
- "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+ "lastModified": 1678872516,
+ "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+ "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.05",
+ "ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-stable-release": {
+ "nixpkgs_stable_release": {
"locked": {
"lastModified": 1689956312,
"narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
@@ -472,11 +479,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1689668210,
- "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
+ "lastModified": 1681413034,
+ "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "eb433bff05b285258be76513add6f6c57b441775",
+ "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
"type": "github"
},
"original": {
@@ -566,7 +573,7 @@
"neovim_config": "neovim_config",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs",
- "nixpkgs-stable-release": "nixpkgs-stable-release",
+ "nixpkgs_stable_release": "nixpkgs_stable_release",
"ragenix": "ragenix",
"river_init_lesser": "river_init_lesser",
"rust-overlay": "rust-overlay",
@@ -592,11 +599,11 @@
]
},
"locked": {
- "lastModified": 1689992383,
- "narHash": "sha256-x/MSjx2aA9aJqQA3fUHxiH0l8uG+1vxnkRNkqAZHQ2U=",
+ "lastModified": 1690079014,
+ "narHash": "sha256-xLgQEfdb6LAzpwaLqNl1EIk1sl7jC85zVt0aVCVCv+o=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "97fcdd4793778cf8e4f9007079cb9d2b836d7ea9",
+ "rev": "c707d9606ff9acea7f9508f5ad8218e36a96b126",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index a75f9604..836c6d8e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
inputs = {
# base
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
- nixpkgs-stable-release.url = "github:NixOS/nixpkgs/nixos-23.05";
+ nixpkgs_stable_release.url = "github:NixOS/nixpkgs/nixos-23.05";
# inputs for following
systems = {
@@ -88,12 +88,13 @@
};
};
lanzaboote = {
- url = "github:nix-community/lanzaboote";
-
+ url = "github:nix-community/lanzaboote/v0.3.0";
inputs = {
+ nixpkgs.follows = "nixpkgs_stable_release";
flake-compat.follows = "flake-compat";
flake-utils.follows = "flake-utils";
- nixpkgs.follows = "nixpkgs-stable-release";
+ crane.follows = "crane";
+ rust-overlay.follows = "rust-overlay";
};
};