felixalb
/
pvv-nixos-config
mirror of https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bicep/matrix: use synapse package from stable 

It's fixed now
This commit is contained in:
Daniel Olsen 2023-12-16 00:22:02 +01:00
parent bcd5292f78
commit 4ea90380ad
3 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
flake.lock
View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702479765, "lastModified": 1702569759,
"narHash": "sha256-wjNYsFhciYoJkZ/FBKvFj55k+vkLbu6C2qYQ7K+s8pI=", "narHash": "sha256-Ze3AdEEsVZBRJ4wn13EZpV1Uubkzi59TkC4j2G9xoFI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bd8fbc3f274288ac905bcea66bc2a5428abde458", "rev": "98ab91109716871f50ea8cb0e0ac7cc1e1e14714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,11 +80,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1702332891, "lastModified": 1702601832,
"narHash": "sha256-0OJldHAo405QynEaoo+0VVgPNi454eUpH/VBNEWugtc=", "narHash": "sha256-z+GyetKtwj7ZVZrRcI73N8Xy1B3JGAqDyPniBFRpIgo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10cff3acda0e8d514f0ea1b330fc0f6d2bb5f6d0", "rev": "dff64d4ba6e9dc3f0a4ef8737f372a528d5bc8d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,22 +108,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-matrix-buildenv": {
"locked": {
"lastModified": 1702493286,
"narHash": "sha256-qkw063Xoee7NbMhgcIw/eqix4R2mEQbOOMlPzgukgL4=",
"owner": "dali99",
"repo": "nixpkgs",
"rev": "a695ad5fb5eca79e5844c1de0a4c9f5589fcf38c",
"type": "github"
},
"original": {
"owner": "dali99",
"ref": "synapse-buildenv",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1702148972, "lastModified": 1702148972,
@ -142,11 +126,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1702397419, "lastModified": 1702635820,
"narHash": "sha256-CBMSwZHT7GLq2JdOPWAVDBaYFbUHWD1+jPFrYk0JeLM=", "narHash": "sha256-rClms9NTmSL/WIN5VmEccVhUExMkjCrRNswxU9QGNNo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "73ca2df642228129df7a968bad6499732dbc7ddd", "rev": "02357adddd0889782362d999628de9d309d202dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,7 +166,6 @@
"grzegorz-clients": "grzegorz-clients", "grzegorz-clients": "grzegorz-clients",
"matrix-next": "matrix-next", "matrix-next": "matrix-next",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-matrix-buildenv": "nixpkgs-matrix-buildenv",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"pvv-calendar-bot": "pvv-calendar-bot", "pvv-calendar-bot": "pvv-calendar-bot",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"

2
flake.nix
View File

@ -15,8 +15,6 @@
pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs";
matrix-next.url = "github:dali99/nixos-matrix-modules"; matrix-next.url = "github:dali99/nixos-matrix-modules";
# https://github.com/NixOS/nixpkgs/pull/273262
nixpkgs-matrix-buildenv.url = "github:dali99/nixpkgs/synapse-buildenv";
grzegorz.url = "github:Programvareverkstedet/grzegorz"; grzegorz.url = "github:Programvareverkstedet/grzegorz";
grzegorz.inputs.nixpkgs.follows = "nixpkgs-unstable"; grzegorz.inputs.nixpkgs.follows = "nixpkgs-unstable";

1
hosts/bicep/services/matrix/synapse.nix
View File

@ -29,7 +29,6 @@ in {
services.matrix-synapse-next = { services.matrix-synapse-next = {
enable = true; enable = true;
package = inputs.nixpkgs-matrix-buildenv.legacyPackages.x86_64-linux.matrix-synapse;
plugins = [ plugins = [
(pkgs.python3Packages.callPackage ./smtp-authenticator { }) (pkgs.python3Packages.callPackage ./smtp-authenticator { })