Compare commits

..

No commits in common. "6bc11767ca1f8fd5857db0b88fbcbebabc4080ac" and "5acc8b3fcab1f112a2ef475992862379fbcaf6e6" have entirely different histories.

4 changed files with 765 additions and 913 deletions

View File

@ -8,7 +8,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.nextcloud = { services.nextcloud = {
https = true; https = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud29;
hostName = "neet.cloud"; hostName = "neet.cloud";
config.dbtype = "sqlite"; config.dbtype = "sqlite";
config.adminuser = "jeremy"; config.adminuser = "jeremy";

View File

@ -7,16 +7,16 @@
}: }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "actual-server"; pname = "actual-server";
version = "24.10.1"; version = "24.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "actualbudget"; owner = "actualbudget";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-VJAD+lNamwuYmiPJLXkum6piGi5zLOHBp8cUeZagb4s="; hash = "sha256-y51Dhdn84AWR/gM4LnAzvBIBpvKwUiclnPnwzkRoJ0I=";
}; };
npmDepsHash = "sha256-Z2e4+JMhI/keLerT0F4WYdLnXHRQCqL7NjNyA9SFEF8="; npmDepsHash = "sha256-/UM2Tz8t4hi621HtXSu0LTDIzZ9SWMqKXqKfPwkdpE8=";
patches = [ patches = [
./migrations-should-use-pkg-path.patch ./migrations-should-use-pkg-path.patch

View File

@ -1,5 +1,5 @@
diff --git a/src/load-config.js b/src/load-config.js diff --git a/src/load-config.js b/src/load-config.js
index d99ce42..42d1351 100644 index d3cc5dd..cfcad8a 100644
--- a/src/load-config.js --- a/src/load-config.js
+++ b/src/load-config.js +++ b/src/load-config.js
@@ -3,7 +3,8 @@ import path from 'node:path'; @@ -3,7 +3,8 @@ import path from 'node:path';
@ -12,7 +12,7 @@ index d99ce42..42d1351 100644
const debugSensitive = createDebug('actual-sensitive:config'); const debugSensitive = createDebug('actual-sensitive:config');
const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url))); const projectRoot = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
@@ -108,6 +109,7 @@ const finalConfig = { @@ -90,6 +91,7 @@ const finalConfig = {
serverFiles: process.env.ACTUAL_SERVER_FILES || config.serverFiles, serverFiles: process.env.ACTUAL_SERVER_FILES || config.serverFiles,
userFiles: process.env.ACTUAL_USER_FILES || config.userFiles, userFiles: process.env.ACTUAL_USER_FILES || config.userFiles,
webRoot: process.env.ACTUAL_WEB_ROOT || config.webRoot, webRoot: process.env.ACTUAL_WEB_ROOT || config.webRoot,
@ -21,7 +21,7 @@ index d99ce42..42d1351 100644
process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT process.env.ACTUAL_HTTPS_KEY && process.env.ACTUAL_HTTPS_CERT
? { ? {
diff --git a/src/migrations.js b/src/migrations.js diff --git a/src/migrations.js b/src/migrations.js
index cba7db0..9983471 100644 index 964e1f2..3a341d7 100644
--- a/src/migrations.js --- a/src/migrations.js
+++ b/src/migrations.js +++ b/src/migrations.js
@@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
@ -37,12 +37,11 @@ index cba7db0..9983471 100644
export default function run(direction = 'up') { export default function run(direction = 'up') {
console.log( console.log(
@@ -13,7 +19,7 @@ export default function run(direction = 'up') { @@ -13,6 +19,7 @@ export default function run(direction = 'up') {
stateStore: `${path.join(config.dataDir, '.migrate')}${ stateStore: `${path.join(config.dataDir, '.migrate')}${
config.mode === 'test' ? '-test' : '' config.mode === 'test' ? '-test' : ''
}`, }`,
- migrationsDirectory: `${path.join(config.projectRoot, 'migrations')}`, + migrationsDirectory,
+ migrationsDirectory
}, },
(err, set) => { (err, set) => {
if (err) { if (err) {

File diff suppressed because it is too large Load Diff