From ced6f93c1e8ffc3fc658dbd30321e07415a5f7ea Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 20 May 2024 10:52:26 +0200 Subject: [PATCH] nix/os/devices/sj-bm-hostkey0: bump versions --- nix/os/devices/sj-bm-hostkey0/flake.lock | 157 ++++++++++++++++++++--- nix/os/devices/sj-bm-hostkey0/flake.nix | 6 +- 2 files changed, 143 insertions(+), 20 deletions(-) diff --git a/nix/os/devices/sj-bm-hostkey0/flake.lock b/nix/os/devices/sj-bm-hostkey0/flake.lock index 832bf07..3df4715 100644 --- a/nix/os/devices/sj-bm-hostkey0/flake.lock +++ b/nix/os/devices/sj-bm-hostkey0/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "crane": { + "inputs": { + "nixpkgs": [ + "mycelium", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712513517, + "narHash": "sha256-VuLm5tTMqfS82NZAsNfsW7U+pTZ1+GcOU7gYR/Fb1Z4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "9caad1eb0c69a13ee6467035353b71a76c85ea53", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -7,11 +28,11 @@ ] }, "locked": { - "lastModified": 1715563999, - "narHash": "sha256-DDXZOKK0C5YeZ/GTUj7HiT+oqYIt8+qTsldaDvhWHFc=", + "lastModified": 1716168343, + "narHash": "sha256-82oT27w9smpItZ+PyN2C0PjIwZYbIocwXSM4u1igXuc=", "owner": "nix-community", "repo": "disko", - "rev": "e972a78f4a49cd92075d64b6feeef64d26bf2996", + "rev": "6f01b9710bc4d3bf006eb8df928b4b15e0430901", "type": "github" }, "original": { @@ -20,6 +41,37 @@ "type": "github" } }, + "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, "get-flake": { "locked": { "lastModified": 1714237590, @@ -56,29 +108,66 @@ "type": "github" } }, - "nixpkgs": { + "mycelium": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1715395895, - "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", + "lastModified": 1715869050, + "narHash": "sha256-FWfM+mzsJDQv129Xj696JjG1mnAQ3faopVGDRNM3lhY=", + "owner": "threefoldtech", + "repo": "mycelium", + "rev": "f9caece23b14ccd308e72ee56c77e6cff62c2c46", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.11", + "owner": "threefoldtech", + "repo": "mycelium", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1712439257, + "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -88,12 +177,29 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "get-flake": "get-flake", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "mycelium": "mycelium", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "srvos": "srvos" } @@ -105,11 +211,11 @@ ] }, "locked": { - "lastModified": 1715579044, - "narHash": "sha256-5nquTfUmom5otO4llOeSZWi7v2ij304Fia43vvJqc5g=", + "lastModified": 1716166358, + "narHash": "sha256-SmCc4nKUXgYb8bBGJ3+N+l/2MBROue2x9+CyJ2of24w=", "owner": "numtide", "repo": "srvos", - "rev": "c1448c70f0106dc664de7a3c6e899a5014a98911", + "rev": "d368bfdc3a409482b92290a105bcacc108a49d24", "type": "github" }, "original": { @@ -117,6 +223,21 @@ "repo": "srvos", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/nix/os/devices/sj-bm-hostkey0/flake.nix b/nix/os/devices/sj-bm-hostkey0/flake.nix index 3909407..234df54 100644 --- a/nix/os/devices/sj-bm-hostkey0/flake.nix +++ b/nix/os/devices/sj-bm-hostkey0/flake.nix @@ -12,6 +12,8 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; srvos.url = "github:numtide/srvos"; srvos.inputs.nixpkgs.follows = "nixpkgs"; + + mycelium.url = "github:threefoldtech/mycelium"; }; # outputs = _: {}; @@ -45,11 +47,11 @@ nix.registry.nixpkgs.flake = nixpkgs; } - { + ({lib, ...}: { nixpkgs.overlays = [ (final: previous: {}) ]; - } + }) ] ++ extraModules; }