Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-28 23:00:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce patches

Browse source
This commit is contained in:
Julien Malka 2024-04-01 01:28:46 +02:00
parent 0f33efd0fc
commit caf3591656
Signed by: Luj
GPG key ID: 6FC74C847011FD83
4 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -1,9 +1,11 @@
let let
inputs = import ./deps; inputs = import ./deps;
patch = import inputs.nix-patches { patchFile = ./patches; };
inputs_final = inputs // { nixpkgs_patched = patch.mkNixpkgsSrc { src = inputs.unstable; version = "nixos-unstable"; }; };
nixpkgs = import inputs.nixpkgs { }; nixpkgs = import inputs.nixpkgs { };
lib = nixpkgs.lib.extend (import ./lib inputs); lib = nixpkgs.lib.extend (import ./lib inputs_final);
machines_plats = lib.lists.unique (lib.mapAttrsToList (_name: value: value.arch) (lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines)); machines_plats = lib.lists.unique (lib.mapAttrsToList (_name: value: value.arch) (lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines));
mkMachine = import ./lib/mkmachine.nix inputs lib; mkMachine = import ./lib/mkmachine.nix inputs_final lib;
nixpkgs_plats = builtins.listToAttrs (builtins.map nixpkgs_plats = builtins.listToAttrs (builtins.map
(plat: { (plat: {

13
deps/sources.json vendored
View file

@ -96,6 +96,19 @@
"url": "https://github.com/mic92/nix-index-database/archive/2844b5f3ad3b478468151bd101370b9d8ef8a3a7.tar.gz", "url": "https://github.com/mic92/nix-index-database/archive/2844b5f3ad3b478468151bd101370b9d8ef8a3a7.tar.gz",
"hash": "1kg8h513n2wk83bqh06pv73cvipfj171x5qqqzgv8kr5zimavx14" "hash": "1kg8h513n2wk83bqh06pv73cvipfj171x5qqqzgv8kr5zimavx14"
}, },
"nix-patches": {
"type": "GitRelease",
"repository": {
"type": "Git",
"url": "https://git.hubrecht.ovh/hubrecht/nix-patches.git"
},
"pre_releases": false,
"version_upper_bound": null,
"version": "v0.4.0",
"revision": "616b23a27a7ad72fcbde78962a9a96fba686f8b8",
"url": null,
"hash": "1msf33xs77h32fviziq949n57b3fckxwwmpjdpycp16lva36affm"
},
"nixos-mailserver": { "nixos-mailserver": {
"type": "Git", "type": "Git",
"repository": { "repository": {

2
lib/luj.nix
View file

@ -44,7 +44,7 @@ inputs: lib: with lib; let
}; };
x2100 = { x2100 = {
arch = "x86_64-linux"; arch = "x86_64-linux";
nixpkgs_version = inputs.unstable; nixpkgs_version = inputs.nixpkgs_patched;
hm_version = inputs.home-manager-unstable; hm_version = inputs.home-manager-unstable;
}; };
fischer = { fischer = {

11
patches/default.nix Normal file
View file

@ -0,0 +1,11 @@
{
"nixos-unstable" = [
{
# nixos/bcachefs: support unlock with clevis in systemd stage 1
id = "295736";
hash = "sha256-JKuzNtI1X7sFT2raEC9UOf4feGdS8bg5uG2r8TMtFag=";
}
];
}