Upgrade stable to 23.05

This commit is contained in:
Greg Hellings
2023-05-29 02:42:37 +00:00
parent 64e0ed0b6f
commit 18c165663d
7 changed files with 13 additions and 17 deletions
Generated
+4 -4
View File
@@ -158,16 +158,16 @@
}, },
"nixstable": { "nixstable": {
"locked": { "locked": {
"lastModified": 1682600000, "lastModified": 1685094109,
"narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", "narHash": "sha256-u+awry81RAVV+fJBCZt+GKWsISSLJKUNbVwKccHeaPU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", "rev": "551a52bfdd02e7b75be5faf9b42f864112d88654",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-22.05", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
+1 -1
View File
@@ -5,7 +5,7 @@
description = "Greg's machines!"; description = "Greg's machines!";
inputs = { inputs = {
nixstable.url = "github:nixos/nixpkgs/nixos-22.05"; nixstable.url = "github:nixos/nixpkgs/nixos-23.05";
nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
+3 -6
View File
@@ -23,22 +23,19 @@ in {
services.gitea = rec { services.gitea = rec {
enable = true; enable = true;
appName = "Greg's Sources"; appName = "Greg's Sources";
cookieSecure = true;
database = { database = {
type = "postgres"; type = "postgres";
user = "gitea"; user = "gitea";
}; };
disableRegistration = true;
domain = srcDomain; domain = srcDomain;
dump = { dump = {
enable = true; enable = true;
type = "tar.xz"; type = "tar.xz";
}; };
settings = { settings = {
server.HTTP_PORT = 3001; service.DISABLE_REGISTRATION = pkgs.lib.mkForce true;
}; session.COOKIE_SECURE = pkgs.lib.mkForce true;
log = { log.level = "Info";
level = "Info";
}; };
rootUrl = "https://${domain}/"; rootUrl = "https://${domain}/";
}; };
+1
View File
@@ -9,6 +9,7 @@
package = pkgs.nextcloud25; package = pkgs.nextcloud25;
appstoreEnable = true; appstoreEnable = true;
hostName = "next.${config.networking.domain}"; hostName = "next.${config.networking.domain}";
#enableBrokenCiphersForSSE = false;
https = true; https = true;
config = { config = {
adminpassFile = config.age.secrets.nextcloudadmin.path; adminpassFile = config.age.secrets.nextcloudadmin.path;
+2 -4
View File
@@ -53,10 +53,8 @@ root root postgres
postgresLog = { postgresLog = {
enable = true; enable = true;
files = "/var/lib/postgresql/*/log/*.log"; files = "/var/lib/postgresql/*/log/*.log";
extraConfig = (lib.strings.concatStringsSep "\n" [ compress = true;
"compress" compresscmd = "${pkgs.xz}/bin/xz";
"compresscmd=${pkgs.xz}/bin/xz"
]);
}; };
}; };
}; };
+1
View File
@@ -36,6 +36,7 @@
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ permittedInsecurePackages = [
"qtwebkit-5.212.0-alpha4" "qtwebkit-5.212.0-alpha4"
"openssl-1.1.1t"
]; ];
}; };
+1 -2
View File
@@ -50,8 +50,7 @@ let
}); });
in rec { in rec {
#gitea = super.unstable.gitea; #python3 = self.unstable.python3;
gregpy = myPython; gregpy = myPython;
my-py-addons = rec { my-py-addons = rec {