Working with local mailman module override
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing

This commit is contained in:
Benjamin Bädorf 2023-02-04 14:40:05 +01:00
parent 237085c5d4
commit dd76c6a5eb
No known key found for this signature in database
GPG key ID: 4406E80E13CD656C
5 changed files with 42 additions and 6 deletions

View file

@ -299,11 +299,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1675115703, "lastModified": 1675362331,
"narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=", "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44", "rev": "a100acd7bbf105915b0004427802286c37738fef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,13 +313,25 @@
"type": "github" "type": "github"
} }
}, },
"local": {
"locked": {
"lastModified": 1675517877,
"narHash": "sha256-I345MML405WkdyPGaDQxXTHnWD1kNoAH6LmUlM/omiE=",
"path": "/home/ben/Workspace/nixpkgs",
"type": "path"
},
"original": {
"path": "/home/ben/Workspace/nixpkgs",
"type": "path"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1675154384, "lastModified": 1675410244,
"narHash": "sha256-gUXzyTS3WsO3g2Rz0qOYR2a26whkyL2UfTr1oPH9mm8=", "narHash": "sha256-ODj6egMoH/HgAF/0wIy0EfRBeUx5FMuLl6uAdUW3kCI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0218941ea68b4c625533bead7bbb94ccce52dceb", "rev": "f7543a7539a007e9562e4d8d24e17a4bcf369b68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -382,6 +394,7 @@
"home": "home", "home": "home",
"keycloak-theme-pub-solar": "keycloak-theme-pub-solar", "keycloak-theme-pub-solar": "keycloak-theme-pub-solar",
"latest": "latest", "latest": "latest",
"local": "local",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur", "nur": "nur",

View file

@ -10,6 +10,8 @@
nixos.url = "github:nixos/nixpkgs/nixos-22.11"; nixos.url = "github:nixos/nixpkgs/nixos-22.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
local.url = "path:/home/ben/Workspace/nixpkgs";
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-compat.flake = false; flake-compat.flake = false;
@ -73,6 +75,7 @@
overlays = []; overlays = [];
}; };
latest = {}; latest = {};
local = {};
}; };
lib = import ./lib {lib = digga.lib // nixos.lib;}; lib = import ./lib {lib = digga.lib // nixos.lib;};

View file

@ -1,6 +1,7 @@
{ {
config, config,
latestModulesPath, latestModulesPath,
localModulesPath,
lib, lib,
inputs, inputs,
pkgs, pkgs,
@ -26,9 +27,11 @@ in {
profiles.users.barkeeper profiles.users.barkeeper
"${latestModulesPath}/services/misc/gitea.nix" "${latestModulesPath}/services/misc/gitea.nix"
"${localModulesPath}/services/mail/mailman.nix"
]; ];
disabledModules = [ disabledModules = [
"services/misc/gitea.nix" "services/misc/gitea.nix"
"services/mail/mailman.nix"
]; ];
config = { config = {

View file

@ -33,6 +33,18 @@ in {
hyperkitty.enable = true; hyperkitty.enable = true;
webHosts = ["list.pub.solar"]; webHosts = ["list.pub.solar"];
siteOwner = "admins@pub.solar"; siteOwner = "admins@pub.solar";
extraPythonPackages = ps:
with ps; [
(buildPythonPackage rec {
pname = "django-keycloak";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-YoT+fi1w8e4tGW4nK7QmK+WBFQ+IlNXo64FSp0ff/aM=";
};
doCheck = false;
})
];
}; };
# TODO add django-keycloak as auth provider # TODO add django-keycloak as auth provider

View file

@ -21,6 +21,11 @@ channels: final: prev: {
gitea gitea
; ;
inherit
(channels.local)
mailmanPackages
;
haskellPackages = haskellPackages =
prev.haskellPackages.override prev.haskellPackages.override
(old: { (old: {