From 98f15912a864772d450d00bb2d7d44bab80ddbe6 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Sun, 21 Jan 2024 23:08:09 +0100 Subject: [PATCH] Wrong package name and add the right inputs to flake lock --- flake.lock | 106 ++++++++++++++++++ .../package-configs/conduit/configuration.nix | 2 +- 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 9770d24..31906c6 100644 --- a/flake.lock +++ b/flake.lock @@ -67,6 +67,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -107,6 +125,26 @@ "type": "github" } }, + "linger": { + "inputs": { + "flake-utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1670283645, + "narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=", + "owner": "mindsbackyard", + "repo": "linger-flake", + "rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "linger-flake", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -270,13 +308,66 @@ "type": "github" } }, + "pihole": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "linger": [ + "linger" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1670284048, + "narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=", + "owner": "mindsbackyard", + "repo": "pihole-flake", + "rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8", + "type": "github" + }, + "original": { + "owner": "mindsbackyard", + "repo": "pihole-flake", + "type": "github" + } + }, + "plasma-manager": { + "inputs": { + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705257805, + "narHash": "sha256-hx88TjxRWR9hEYrePm2aR/rKAu4VFx4irgN7AofE0Wg=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "87ca0e29c6fccfb7f09be6ff137716db5a7c8d8f", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, "root": { "inputs": { "extest": "extest", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "linger": "linger", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "pihole": "pihole", + "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" } @@ -324,6 +415,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1605370193, diff --git a/nixos/server/package-configs/conduit/configuration.nix b/nixos/server/package-configs/conduit/configuration.nix index 2df9dcd..1a0e2d5 100644 --- a/nixos/server/package-configs/conduit/configuration.nix +++ b/nixos/server/package-configs/conduit/configuration.nix @@ -40,7 +40,7 @@ in { # This causes NixOS to use the flake defined in this repository instead of # the build of Conduit built into nixpkgs. - package = pkgs.conduit; + package = pkgs.matrix-conduit; settings.global = { inherit server_name;