From 1b66bf491096c910f988bf91b0a5152e3a60ac68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 11 Mar 2024 03:48:57 +0100 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'deploy-rs': 'github:serokell/deploy-rs/b709d63debafce9f5645a5ba550c9e0983b3d1f7' (2023-12-20) → 'github:serokell/deploy-rs/0a0187794ac7f7a1e62cda3dabf8dc041f868790' (2024-02-16) • Updated input 'disko': 'github:nix-community/disko/bde7dd352c07d43bd5b8245e6c39074a391fdd46' (2024-03-01) → 'github:nix-community/disko/d389901567d9ceda5a1a833fbf8e8e254e18eb0a' (2024-03-11) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d02d818f22c777aa4e854efc3242ec451e5d462a' (2023-12-25) → 'github:nixos/nixpkgs/b94a96839afcc56de3551aa7472b8d9a3e77e05d' (2024-03-09) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/cfc3698c31b1fb9cdcf10f36c9643460264d0ca8' (2023-12-27) → 'github:nixos/nixpkgs/3030f185ba6a4bf4f18b87f345f104e6a6961f34' (2024-03-09) • Updated input 'nvfetcher': 'github:berberman/nvfetcher/2bcf73dea96497ac9c36ed320b457caa705f9485' (2023-09-01) → 'github:berberman/nvfetcher/367e2eaa92d8f5133c2c5ac03a80c0cf25f301b8' (2024-02-25) • Updated input 'nvfetcher/flake-compat': 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Updated input 'nvfetcher/flake-utils': 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) • Updated input 'sops-nix': 'github:Mic92/sops-nix/e523e89763ff45f0a6cf15bcb1092636b1da9ed3' (2023-12-24) → 'github:Mic92/sops-nix/f8d5c8baa83fe620a28c0db633be9db3e34474b4' (2024-03-10) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/7790e078f8979a9fcd543f9a47427eeaba38f268' (2023-12-23) → 'github:NixOS/nixpkgs/b17375d3bb7c79ffc52f3538028b2ec06eb79ef8' (2024-03-10) --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 8a9fadc..f8fe220 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1703087360, - "narHash": "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M=", + "lastModified": 1708091384, + "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=", "owner": "serokell", "repo": "deploy-rs", - "rev": "b709d63debafce9f5645a5ba550c9e0983b3d1f7", + "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1709286488, - "narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=", + "lastModified": 1710119954, + "narHash": "sha256-e7AMYtBQgRzeRtn//k1dXu22xeiav+G0cQjm3gEky7o=", "owner": "nix-community", "repo": "disko", - "rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46", + "rev": "d389901567d9ceda5a1a833fbf8e8e254e18eb0a", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "flake-compat_2": { "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": { @@ -119,11 +119,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -170,27 +170,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1710033658, + "narHash": "sha256-yiZiVKP5Ya813iYLho2+CcFuuHpaqKc/CoxOlANKcqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "b17375d3bb7c79ffc52f3538028b2ec06eb79ef8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703637592, - "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1710021367, + "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1693539235, - "narHash": "sha256-ACmCq1+RnVq+EB7yeN6fThUR3cCJZb6lKEfv937WG84=", + "lastModified": 1708838575, + "narHash": "sha256-brhWjqJG+Yp0KGkF1LE7h0E86Z7OhDQJLo9qhWAmoYw=", "owner": "berberman", "repo": "nvfetcher", - "rev": "2bcf73dea96497ac9c36ed320b457caa705f9485", + "rev": "367e2eaa92d8f5133c2c5ac03a80c0cf25f301b8", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703387502, - "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", + "lastModified": 1710039806, + "narHash": "sha256-vC2fo/phnetp6ub/nRv6mgAi5LbhJ6ujGQWrRD2VgNs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", + "rev": "f8d5c8baa83fe620a28c0db633be9db3e34474b4", "type": "github" }, "original": { -- 2.44.1 From c44c9fd8e8a3d63463c9ae2dd2c858525a37c451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 11 Mar 2024 04:50:40 +0100 Subject: [PATCH 2/5] nextcloud: Update apps --- pkgs/_sources_nextcloud/generated.json | 36 +++++++++++++------------- pkgs/_sources_nextcloud/generated.nix | 36 +++++++++++++------------- pkgs/nextcloud-apps.toml | 5 ++-- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/pkgs/_sources_nextcloud/generated.json b/pkgs/_sources_nextcloud/generated.json index 1e731e8..55dc2d0 100644 --- a/pkgs/_sources_nextcloud/generated.json +++ b/pkgs/_sources_nextcloud/generated.json @@ -7,11 +7,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E=", + "sha256": "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo=", "type": "tarball", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz" + "url": "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz" }, - "version": "13.1.1" + "version": "13.1.3" }, "calendar": { "cargoLocks": null, @@ -21,11 +21,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g=", + "sha256": "sha256-jf6SIsgWTkQIVIYbfNiTA+KRbUM6g7NHFIOVygBwWmU=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz" + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.6/calendar-v4.6.6.tar.gz" }, - "version": "v4.5.0" + "version": "v4.6.6" }, "contacts": { "cargoLocks": null, @@ -35,11 +35,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s=", + "sha256": "sha256-HCEjiAqn6sTNXKW6O5X6Ta9Ll4ehvzmGZUj1c0ue2Xc=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz" + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz" }, - "version": "v5.4.0" + "version": "v5.5.3" }, "cookbook": { "cargoLocks": null, @@ -49,11 +49,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=", + "sha256": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=", "type": "tarball", - "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz" + "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/Cookbook-0.11.0.tar.gz" }, - "version": "0.10.2" + "version": "0.11.0" }, "news": { "cargoLocks": null, @@ -63,11 +63,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck=", + "sha256": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=", "type": "tarball", - "url": "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz" + "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz" }, - "version": "23.0.0" + "version": "24.0.0" }, "notes": { "cargoLocks": null, @@ -77,10 +77,10 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-7GkTGyGTvtDbZsq/zOdbBE7xh6DZO183W6I5XX1ekbw=", + "sha256": "sha256-rnDeo6BRqIAPdw8CcnpO1ifQrx8Bnj5WdgcU/L8aCQk=", "type": "tarball", - "url": "https://github.com/nextcloud/notes/releases/download/v4.8.1/notes.tar.gz" + "url": "https://github.com/nextcloud/notes/releases/download/v4.9.2/notes.tar.gz" }, - "version": "v4.8.1" + "version": "v4.9.2" } } \ No newline at end of file diff --git a/pkgs/_sources_nextcloud/generated.nix b/pkgs/_sources_nextcloud/generated.nix index ecdbdf3..69fe7cc 100644 --- a/pkgs/_sources_nextcloud/generated.nix +++ b/pkgs/_sources_nextcloud/generated.nix @@ -3,50 +3,50 @@ { bookmarks = { pname = "bookmarks"; - version = "13.1.1"; + version = "13.1.3"; src = fetchTarball { - url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.1/bookmarks-13.1.1.tar.gz"; - sha256 = "sha256-7baI+vGBg48vZKZY0ikme+4PQl+PLUlC6JE0Air2s5E="; + url = "https://github.com/nextcloud/bookmarks/releases/download/v13.1.3/bookmarks-13.1.3.tar.gz"; + sha256 = "sha256-JXNQNnWXoii71QhtKktuEBEIqzmONVetULBhpSjM9xo="; }; }; calendar = { pname = "calendar"; - version = "v4.5.0"; + version = "v4.6.6"; src = fetchTarball { - url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.5.0/calendar-v4.5.0.tar.gz"; - sha256 = "sha256-8KwFmnFFlyYzKy2acCCjmpRj2W5pOrbQaPRPm16ZZ7g="; + url = "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.6/calendar-v4.6.6.tar.gz"; + sha256 = "sha256-jf6SIsgWTkQIVIYbfNiTA+KRbUM6g7NHFIOVygBwWmU="; }; }; contacts = { pname = "contacts"; - version = "v5.4.0"; + version = "v5.5.3"; src = fetchTarball { - url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.4.0/contacts-v5.4.0.tar.gz"; - sha256 = "sha256-dNim0PqUlEGB6J/OTsOjyUZ2JhOBhXC60HhjTstmF4s="; + url = "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.3/contacts-v5.5.3.tar.gz"; + sha256 = "sha256-HCEjiAqn6sTNXKW6O5X6Ta9Ll4ehvzmGZUj1c0ue2Xc="; }; }; cookbook = { pname = "cookbook"; - version = "0.10.2"; + version = "0.11.0"; src = fetchTarball { - url = "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"; - sha256 = "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M="; + url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/Cookbook-0.11.0.tar.gz"; + sha256 = "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE="; }; }; news = { pname = "news"; - version = "23.0.0"; + version = "24.0.0"; src = fetchTarball { - url = "https://github.com/nextcloud/news/releases/download/23.0.0/news.tar.gz"; - sha256 = "sha256-WrLikMN8jxu+vav9Xn8J1wUoGN5wQeQGr5pbVT6GLck="; + url = "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"; + sha256 = "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4="; }; }; notes = { pname = "notes"; - version = "v4.8.1"; + version = "v4.9.2"; src = fetchTarball { - url = "https://github.com/nextcloud/notes/releases/download/v4.8.1/notes.tar.gz"; - sha256 = "sha256-7GkTGyGTvtDbZsq/zOdbBE7xh6DZO183W6I5XX1ekbw="; + url = "https://github.com/nextcloud/notes/releases/download/v4.9.2/notes.tar.gz"; + sha256 = "sha256-rnDeo6BRqIAPdw8CcnpO1ifQrx8Bnj5WdgcU/L8aCQk="; }; }; } diff --git a/pkgs/nextcloud-apps.toml b/pkgs/nextcloud-apps.toml index 69bccdc..a515930 100644 --- a/pkgs/nextcloud-apps.toml +++ b/pkgs/nextcloud-apps.toml @@ -12,10 +12,9 @@ src.github = "nextcloud-releases/contacts" fetch.tarball = "https://github.com/nextcloud-releases/contacts/releases/download/$ver/contacts-$ver.tar.gz" [cookbook] -src.github_tag = "nextcloud/cookbook" +src.github = "christianlupus-nextcloud/cookbook-releases" src.prefix = "v" -src.exclude_regex = 'v\d+\.\d+\.\d+-rc\d+' -fetch.tarball = "https://github.com/nextcloud/cookbook/releases/download/v$ver/Cookbook-$ver.tar.gz" +fetch.tarball = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v$ver/Cookbook-$ver.tar.gz" [news] src.github = "nextcloud/news" -- 2.44.1 From aaa9a164f7a9fa287fd71522a51bc4927d42edfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 11 Mar 2024 04:50:48 +0100 Subject: [PATCH 3/5] flake: Fix vm run command path --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 21731e6..f8255f6 100644 --- a/flake.nix +++ b/flake.nix @@ -109,7 +109,7 @@ writeShellScript "run-vm" '' export QEMU_OPTS="-m 3941 -smp 2 -display curses" export QEMU_NET_OPTS="${qemuNetOpts}" - "${vm.config.system.build.vm}/bin/run-tlaternet-vm" + "${vm.config.system.build.vm}/bin/run-testvm-vm" ''; update-pkgs = let -- 2.44.1 From aec7c5c7d872ece1345584b2e6dadfe637083e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 11 Mar 2024 04:50:59 +0100 Subject: [PATCH 4/5] vm: Change domain --- configuration/hardware-specific/vm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configuration/hardware-specific/vm.nix b/configuration/hardware-specific/vm.nix index f17e7ee..b2e8826 100644 --- a/configuration/hardware-specific/vm.nix +++ b/configuration/hardware-specific/vm.nix @@ -5,9 +5,9 @@ boot.kernelParams = ["nomodeset"]; networking.hostName = "testvm"; - # Sets the base domain for nginx to localhost so that we - # can easily test locally with the VM. - services.nginx.domain = "localhost"; + # Sets the base domain for nginx to a local domain so that we can + # easily test locally with the VM. + services.nginx.domain = "dev.local"; # Use the staging secrets sops.defaultSopsFile = lib.mkOverride 99 ../../keys/staging.yaml; -- 2.44.1 From 7affed34f1b01f9c7b0783c13330d77309fffddf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= Date: Mon, 11 Mar 2024 04:51:25 +0100 Subject: [PATCH 5/5] nextcloud: Remove unused variable --- configuration/services/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/configuration/services/nextcloud.nix b/configuration/services/nextcloud.nix index 75993c3..3ba967a 100644 --- a/configuration/services/nextcloud.nix +++ b/configuration/services/nextcloud.nix @@ -1,7 +1,6 @@ { pkgs, config, - options, ... }: let nextcloud = pkgs.nextcloud27; -- 2.44.1