From af6e140afa1eaecfd3f53eb5816bd8ad2a88622e Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 20 Mar 2023 22:23:34 +0300 Subject: [PATCH] magenta: use latest gitea --- flake.lock | 35 +++++++++++++++++++------- flake.nix | 1 + nixos/hosts/magenta/services/gitea.nix | 5 ++-- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f6ea31f..18d3ec2 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ }, "hardware": { "locked": { - "lastModified": 1678397099, - "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=", + "lastModified": 1679224149, + "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea", + "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678957507, - "narHash": "sha256-t1yAoxlfhSjgeDGoQ1WJ0LBwVReL6y3QkAfJ3H+mOSs=", + "lastModified": 1679265143, + "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=", "owner": "nix-community", "repo": "home-manager", - "rev": "5e94669f8ea8d697b1a00b916b2a86909f8c4ff5", + "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1678898370, - "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", + "lastModified": 1679172431, + "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac718d02867a84b42522a0ece52d841188208f2c", + "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", "type": "github" }, "original": { @@ -502,6 +502,22 @@ "type": "indirect" } }, + "nixpkgs_unstable": { + "locked": { + "lastModified": 1679338402, + "narHash": "sha256-w0YDouArgrXg8aaX1cslEgzIWuwhB+0ai7xb/UuDwZo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3ad3f8193f79ba34e8412dfae3781580262beec", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, "nlsp-settings-nvim": { "flake": false, "locked": { @@ -642,6 +658,7 @@ "mytools": "mytools", "nil": "nil", "nixpkgs": "nixpkgs_2", + "nixpkgs_unstable": "nixpkgs_unstable", "vnetod": "vnetod", "wd2": "wd2", "wired": "wired" diff --git a/flake.nix b/flake.nix index 27e7218..9e30c8e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs_unstable.url = "github:NixOS/nixpkgs/master"; hardware.url = "github:NixOS/nixos-hardware/master"; agenix = { diff --git a/nixos/hosts/magenta/services/gitea.nix b/nixos/hosts/magenta/services/gitea.nix index 9d86c3f..578c23b 100644 --- a/nixos/hosts/magenta/services/gitea.nix +++ b/nixos/hosts/magenta/services/gitea.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: let hostname = "git.pleshevski.ru"; @@ -17,9 +17,10 @@ in services.gitea = { enable = true; httpPort = 9901; + package = inputs.nixpkgs_unstable.legacyPackages.${pkgs.system}.gitea; domain = hostname; rootUrl = "https://${hostname}"; - appName = "Pleshevskiy Git Repositories"; + appName = "Pleshevskiy's Gitea"; mailerPasswordFile = config.age.secrets.gitea-smtp-passfile.path; database = { type = "postgres";