From 67370cd48414d339b78e2a91f879e6e11939539f Mon Sep 17 00:00:00 2001 From: Robbie Buxton <67549526+RobbieBuxton@users.noreply.github.com> Date: Tue, 9 Jan 2024 21:31:58 +0000 Subject: [PATCH] successfully pinned to 23.11 tapir after bug fix implimented upstream and added user.group.rootless to vm" (#105) Signed-off-by: Robbie Buxton --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- modules/nixos/vm.nix | 2 ++ package.nix | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2868f1a..69f5ef2 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1704152458, + "narHash": "sha256-DS+dGw7SKygIWf9w4eNBUZsK+4Ug27NwEWmn2tnbycg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "88a2cd8166694ba0b6cb374700799cec53aef527", "type": "github" }, "original": { @@ -38,16 +38,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1704420045, + "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "type": "indirect" } }, diff --git a/flake.nix b/flake.nix index f9c6da2..4f59e8d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Containerd snapshotter that understands nix store paths natively."; inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-23.11"; flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/modules/nixos/vm.nix b/modules/nixos/vm.nix index a3f5ed4..46a179f 100644 --- a/modules/nixos/vm.nix +++ b/modules/nixos/vm.nix @@ -55,6 +55,8 @@ in { }; }; + users.groups.rootless = {}; + virtualisation = { memorySize = 4096; cores = 4; diff --git a/package.nix b/package.nix index 02f8e2d..250425d 100644 --- a/package.nix +++ b/package.nix @@ -18,7 +18,7 @@ let ".tar" ]; }; - vendorSha256 = "sha256-gK7FAK6RQ9hL3K4PY2f2z4nBDBJXRctUZbVHuVqOIYE="; + vendorHash = "sha256-gK7FAK6RQ9hL3K4PY2f2z4nBDBJXRctUZbVHuVqOIYE="; passthru = { inherit buildImage; }; };