From 231a4b663ea58f8a01bb87a52c0c7a3d4ef36ed2 Mon Sep 17 00:00:00 2001 From: coolneng Date: Thu, 23 Mar 2023 06:56:25 +0100 Subject: [PATCH] Use latest version of Gitea --- flake.lock | 18 +++++++++++++++++- flake.nix | 12 +++++++++--- modules/devops.nix | 4 +++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 26f911e..083641c 100644 --- a/flake.lock +++ b/flake.lock @@ -142,12 +142,28 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1679437018, + "narHash": "sha256-vOuiDPLHSEo/7NkiWtxpHpHgoXoNmrm+wkXZ6a072Fc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", "nix-matrix-appservices": "nix-matrix-appservices", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index d20abb6..a0aa019 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-22.11"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -14,13 +15,15 @@ }; }; - outputs = { self, nixpkgs, agenix, nixos-hardware, nix-matrix-appservices, ... - }@inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, agenix, nixos-hardware + , nix-matrix-appservices, ... }@inputs: let system = "aarch64-linux"; pkgs = import pkgs { inherit system; }; + pkgs-unstable = import inputs.nixpkgs-unstable { inherit system; }; + lib = nixpkgs.lib; in { @@ -32,7 +35,10 @@ nixos-hardware.nixosModules.raspberry-pi-4 nix-matrix-appservices.nixosModule ]; - specialArgs = { inherit inputs; }; + specialArgs = { + inherit inputs; + inherit pkgs-unstable; + }; }; }; diff --git a/modules/devops.nix b/modules/devops.nix index 8ccf02a..42a1727 100644 --- a/modules/devops.nix +++ b/modules/devops.nix @@ -1,9 +1,10 @@ -{ config, pkgs, lib, ... }: { +{ config, pkgs, pkgs-unstable, lib, ... }: { # Set up Gitea with LFS support services.gitea = { enable = true; domain = "git.coolneng.duckdns.org"; rootUrl = "https://git.coolneng.duckdns.org"; + package = pkgs-unstable.gitea; database = { type = "postgres"; passwordFile = config.age.secrets.gitea.path; @@ -18,6 +19,7 @@ ui.DEFAULT_THEME = "arc-green"; session.COOKIE_SECURE = true; server.DISABLE_SSH = true; + actions.ENABLED = true; }; }; }