From 521190297bc2fa7380383df26ba559053ab246d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 18 Aug 2024 17:24:45 +0200
Subject: [PATCH 1/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'disko':
'github:nix-community/disko/0257e44f4ad472b54f19a6dd1615aee7fa48ed49' (2024-08-05)
→ 'github:nix-community/disko/276a0d055a720691912c6a34abb724e395c8e38a' (2024-08-15)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/0ab9c4c1e0cab782fcde00ec2b32436abfd2a6d4' (2024-08-05)
→ 'github:nixos/nixpkgs/1cbd3d585263dc620c483e138d352a39b9f0e3ec' (2024-08-17)
• Updated input 'nixpkgs-unstable':
'github:nixos/nixpkgs/41d21a82c38e226e234e16f4ff213b3fcf85e6e9' (2024-08-05)
→ 'github:nixos/nixpkgs/abcef4da4ebb72240bddc370a27263627e64877f' (2024-08-18)
• Updated input 'sops-nix':
'github:Mic92/sops-nix/eb34eb588132d653e4c4925d862f1e5a227cc2ab' (2024-07-27)
→ 'github:Mic92/sops-nix/be0eec2d27563590194a9206f551a6f73d52fa34' (2024-08-12)
---
flake.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index c541444..78327bf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -27,11 +27,11 @@
]
},
"locked": {
- "lastModified": 1722821805,
- "narHash": "sha256-FGrUPUD+LMDwJsYyNSxNIzFMldtCm8wXiQuyL2PHSrM=",
+ "lastModified": 1723685519,
+ "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
"owner": "nix-community",
"repo": "disko",
- "rev": "0257e44f4ad472b54f19a6dd1615aee7fa48ed49",
+ "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
"type": "github"
},
"original": {
@@ -226,11 +226,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1722849152,
- "narHash": "sha256-Es/syckEivSAJWxVF6vRYAFMAgXhJpIPdxMwN70NYxo=",
+ "lastModified": 1723957280,
+ "narHash": "sha256-J08Yqf2IJ73y7myI69qEKsQ048ibweG6FeJeCxbIdB4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "41d21a82c38e226e234e16f4ff213b3fcf85e6e9",
+ "rev": "abcef4da4ebb72240bddc370a27263627e64877f",
"type": "github"
},
"original": {
@@ -242,11 +242,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1722821716,
- "narHash": "sha256-VZMyGaYBuuQ+PCF4iRNeqJ/lbowOMQnnVF2Vg0tR3Dk=",
+ "lastModified": 1723920526,
+ "narHash": "sha256-USs6A60raDKZ/8BEpqja1XjZIsRzADX+NtWKH6wIxIw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0ab9c4c1e0cab782fcde00ec2b32436abfd2a6d4",
+ "rev": "1cbd3d585263dc620c483e138d352a39b9f0e3ec",
"type": "github"
},
"original": {
@@ -442,11 +442,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1722114803,
- "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=",
+ "lastModified": 1723501126,
+ "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab",
+ "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
"type": "github"
},
"original": {
From 0ad265f6aa269c953c76cbc998550a864ec72653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 18 Aug 2024 18:51:16 +0200
Subject: [PATCH 2/3] pkgs/sources: Update package sources
---
pkgs/_sources_nextcloud/generated.json | 12 ++++++------
pkgs/_sources_nextcloud/generated.nix | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json
index 73a69ea..4071726 100644
--- a/pkgs/_sources_nextcloud/generated.json
+++ b/pkgs/_sources_nextcloud/generated.json
@@ -7,11 +7,11 @@
"passthru": null,
"pinned": false,
"src": {
- "sha256": "sha256-32xlI+cQNlJT255F3lmx04FkeZdzd93YzSA3wPcETlQ=",
+ "sha256": "sha256-V4zZsAwPn8QiCXEDqOgNFHaXqMOcHMpMbJ1Oz3Db0pc=",
"type": "tarball",
- "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.3/bookmarks-14.2.3.tar.gz"
+ "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz"
},
- "version": "14.2.3"
+ "version": "14.2.4"
},
"calendar": {
"cargoLocks": null,
@@ -21,11 +21,11 @@
"passthru": null,
"pinned": false,
"src": {
- "sha256": "sha256-k73g1SpepMz0kBWX67dLahE/vE1AgTzTV+Sq6UBNPuU=",
+ "sha256": "sha256-sipXeyOL4OhENz7V2beFeSYBAoFZdCWtqftIy0lsqEY=",
"type": "tarball",
- "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.14/calendar-v4.7.14.tar.gz"
+ "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz"
},
- "version": "v4.7.14"
+ "version": "v4.7.15"
},
"contacts": {
"cargoLocks": null,
diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix
index 918c8d2..53e26d1 100644
--- a/pkgs/_sources_nextcloud/generated.nix
+++ b/pkgs/_sources_nextcloud/generated.nix
@@ -3,18 +3,18 @@
{
bookmarks = {
pname = "bookmarks";
- version = "14.2.3";
+ version = "14.2.4";
src = fetchTarball {
- url = "https://github.com/nextcloud/bookmarks/releases/download/v14.2.3/bookmarks-14.2.3.tar.gz";
- sha256 = "sha256-32xlI+cQNlJT255F3lmx04FkeZdzd93YzSA3wPcETlQ=";
+ url = "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz";
+ sha256 = "sha256-V4zZsAwPn8QiCXEDqOgNFHaXqMOcHMpMbJ1Oz3Db0pc=";
};
};
calendar = {
pname = "calendar";
- version = "v4.7.14";
+ version = "v4.7.15";
src = fetchTarball {
- url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.14/calendar-v4.7.14.tar.gz";
- sha256 = "sha256-k73g1SpepMz0kBWX67dLahE/vE1AgTzTV+Sq6UBNPuU=";
+ url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.7.15/calendar-v4.7.15.tar.gz";
+ sha256 = "sha256-sipXeyOL4OhENz7V2beFeSYBAoFZdCWtqftIy0lsqEY=";
};
};
contacts = {
From 3a591863b01d275a472ae6706bb58ed4794b305e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Sun, 18 Aug 2024 17:36:45 +0200
Subject: [PATCH 3/3] flake.nix: Add default package to allow easily creating
gc root
---
flake.nix | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/flake.nix b/flake.nix
index e3ff531..56f3972 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,16 @@
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
+
+ vm = nixpkgs.lib.nixosSystem {
+ inherit system;
+ specialArgs.flake-inputs = inputs;
+
+ modules = [
+ ./configuration
+ ./configuration/hardware-specific/vm.nix
+ ];
+ };
in
{
##################
@@ -83,6 +93,12 @@
#########
checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+ ###########################
+ # Garbage collection root #
+ ###########################
+
+ packages.${system}.default = vm.config.system.build.vm;
+
###################
# Utility scripts #
###################
@@ -93,15 +109,6 @@
type = "app";
program =
let
- vm = nixpkgs.lib.nixosSystem {
- inherit system;
- specialArgs.flake-inputs = inputs;
-
- modules = [
- ./configuration
- ./configuration/hardware-specific/vm.nix
- ];
- };
in
(pkgs.writeShellScript "" ''
${vm.config.system.build.vm.outPath}/bin/run-testvm-vm