Compare commits

...

6 commits

Author SHA1 Message Date
6f70382ac1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/af7d3bf5daeba3fc28089b015c0dd43f06b176f2' (2024-08-05)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/c43d8c4a3ce84a7bebd110b06e69365484db6208' (2024-12-16)
• Updated input 'nixos-mailserver/nixpkgs-24_05':
    'github:NixOS/nixpkgs/805a384895c696f802a9bf5bf4720f37385df547' (2024-05-31)
  → 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5e7591e5e8c8cddc1e9c7cad01033e6c2d560cd0' (2024-12-08)
  → 'github:NixOS/nixpkgs/eb919d9300b6a18f8583f58aef16db458fbd7bec' (2024-12-15)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/b356fafe02dd1d01d58153ae02326268ed584a51' (2024-12-09)
  → 'github:NixOS/nixpkgs/66cdf593c0041cf1efc9b2889d80c9a5c497b284' (2024-12-16)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/c6134b6fff6bda95a1ac872a2a9d5f32e3c37856' (2024-12-02)
  → 'github:Mic92/sops-nix/2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004' (2024-12-12)
2024-12-16 20:53:51 +01:00
656987563c tracktrain: add a delay so postgres has time to start 2024-12-09 19:05:21 +01:00
37618af4da flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-mailserver/nixpkgs-24_05':
    'github:NixOS/nixpkgs/7e1ca67996afd8233d9033edd26e442836cc2ad6' (2024-12-01)
  → 'github:NixOS/nixpkgs/805a384895c696f802a9bf5bf4720f37385df547' (2024-05-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7247d0e9e88c3fc9769b025760db2b0b8698ccd0' (2024-12-03)
  → 'github:NixOS/nixpkgs/5e7591e5e8c8cddc1e9c7cad01033e6c2d560cd0' (2024-12-08)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/b9ffe0d2ef589f4d75a62f908f00dfd6344b6b6e' (2024-12-02)
  → 'github:NixOS/nixpkgs/b356fafe02dd1d01d58153ae02326268ed584a51' (2024-12-09)
2024-12-09 14:06:59 +01:00
169a165a92 nextcloud: 29 → 30 2024-12-07 15:13:20 +01:00
9ada0691dc flake: remove old nextcloud permittedInsecurePackages
this hasn't been used in some while, but nobody removed it.
2024-12-05 22:54:12 +01:00
dce974cab6 pkgs/forgejo: remove unstable override
since forgejo is currently on the same version in unstable & stable,
this seems like a good time to do it.
2024-12-05 22:53:29 +01:00
5 changed files with 19 additions and 19 deletions

View file

@ -67,11 +67,11 @@
"nixpkgs-24_05": "nixpkgs-24_05" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"lastModified": 1722877200, "lastModified": 1734370678,
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "narHash": "sha256-a8zkti1QM5Oxkdfnzr/NjrFlyqI36/kYV/X8G1jOmB4=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "rev": "c43d8c4a3ce84a7bebd110b06e69365484db6208",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -83,11 +83,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733220729, "lastModified": 1734298236,
"narHash": "sha256-BXFReJquw6GPlmeatsIKJIZNxcmy54Dg6zcwrogdlgU=", "narHash": "sha256-aWhhqY44xBjMoO9r5fyPp5u8tqUNWRZ/m/P+abMSs5c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7247d0e9e88c3fc9769b025760db2b0b8698ccd0", "rev": "eb919d9300b6a18f8583f58aef16db458fbd7bec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
}, },
"nixpkgs-24_05": { "nixpkgs-24_05": {
"locked": { "locked": {
"lastModified": 1733016324, "lastModified": 1731797254,
"narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=", "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6", "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733132332, "lastModified": 1734318609,
"narHash": "sha256-8DTh3irBPko0ooHaeGJ5kPwBD8mOwiMX4eBjFuicLsA=", "narHash": "sha256-VPbVfHSvFs58T+kbseS7wa9WP6p2z7RJmjTnV4pAPQ0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b9ffe0d2ef589f4d75a62f908f00dfd6344b6b6e", "rev": "66cdf593c0041cf1efc9b2889d80c9a5c497b284",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733128155, "lastModified": 1733965552,
"narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -36,7 +36,6 @@
sources = inputs; sources = inputs;
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
config.permittedInsecurePackages = [ "nextcloud-27.1.11" ];
}; };
in { in {
nixosConfigurations.parsons = nixpkgs.lib.nixosSystem { nixosConfigurations.parsons = nixpkgs.lib.nixosSystem {

View file

@ -11,7 +11,7 @@
# must be set manually; may not be incremented by more than one at # must be set manually; may not be incremented by more than one at
# a time, otherwise nextcloud WILL break # a time, otherwise nextcloud WILL break
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
home = "/persist/nextcloud"; home = "/persist/nextcloud";
https = true; https = true;

View file

@ -65,10 +65,13 @@ in
script = '' script = ''
cd /tmp cd /tmp
ln -sf ${pkgs.writeText "tracktrain-config.yaml" tracktrain-config} config.yaml ln -sf ${pkgs.writeText "tracktrain-config.yaml" tracktrain-config} config.yaml
sleep 3
${pkgs.tracktrain}/bin/tracktrain +RTS -T ${pkgs.tracktrain}/bin/tracktrain +RTS -T
''; '';
}; };
systemd.services.postgresql.wantedBy = [ "tracktrain.service" ];
services.postgresql = { services.postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_15; package = pkgs.postgresql_15;

View file

@ -17,8 +17,6 @@ let
buildGoModule = unstable.buildGo122Module; buildGoModule = unstable.buildGo122Module;
}; };
forgejo = unstable.forgejo;
tracktrain = import sources.tracktrain { tracktrain = import sources.tracktrain {
nixpkgs = unstable; nixpkgs = unstable;
compiler = "default"; compiler = "default";