DGNum/infrastructure
12
6
Fork 2
Code Issues 18 Pull requests 30 Projects 1 Releases Packages Wiki Activity Actions

feat(nix-pkgs): use overlay
All checks were successful
Check meta / check_dns (pull_request) Successful in 15s
Details
Check workflows / check_workflows (pull_request) Successful in 16s
Details
Build all the nodes / netcore02 (pull_request) Successful in 21s
Details
Check meta / check_meta (pull_request) Successful in 34s
Details
Run pre-commit on all files / pre-commit (pull_request) Successful in 26s
Details
Build the shell / build-shell (pull_request) Successful in 27s
Details
Run pre-commit on all files / pre-commit (push) Successful in 26s
Details
Build all the nodes / ap01 (pull_request) Successful in 1m23s
Details
Build all the nodes / geo01 (pull_request) Successful in 1m43s
Details
Build all the nodes / tower01 (pull_request) Successful in 1m52s
Details
Build all the nodes / web03 (pull_request) Successful in 1m48s
Details
Build all the nodes / hypervisor03 (pull_request) Successful in 2m0s
Details
Build all the nodes / bridge01 (pull_request) Successful in 2m3s
Details
Build all the nodes / web01 (pull_request) Successful in 1m59s
Details
Build all the nodes / hypervisor02 (pull_request) Successful in 2m10s
Details
Build all the nodes / hypervisor01 (pull_request) Successful in 2m13s
Details
Build all the nodes / rescue01 (pull_request) Successful in 2m16s
Details
Build all the nodes / geo02 (pull_request) Successful in 2m19s
Details
Build all the nodes / web02 (pull_request) Successful in 2m11s
Details
Build all the nodes / vault01 (pull_request) Successful in 2m24s
Details
Build all the nodes / storage01 (pull_request) Successful in 2m38s
Details
Build all the nodes / compute01 (pull_request) Successful in 2m59s
Details

Browse source
This commit is contained in:
sinavir 2025-01-09 15:10:20 +01:00
parent 30c5f016c6
commit 07a014047f
No known key found for this signature in database
11 changed files with 10 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hive.nix
View file

@ -11,8 +11,6 @@ let
sources = import ./sources.nix;
inherit (sources) bootstrapNixpkgs;
lib = sources.fullLib;
inherit (lib.extra) mapSingleFuse;
@ -44,7 +42,7 @@ let
mkNixpkgsConfig =
system:
{
nixos = _: { }; # TODO: add nix-pkgs overlay here
nixos = _: { overlays = [ (import "${sources.nix-pkgs}/overlay.nix").default ]; };
zyxel-nwa50ax = mkLiminixConfig system;
netconf = _: { };
}

25
machines/nixos/compute01/dgsi/default.nix
View file

@ -14,30 +14,7 @@
let
inherit (lib) toLower;
python =
let
python3 = pkgs.python312;
nix-pkgs = import sources.nix-pkgs { inherit pkgs python3; };
in
python3.override {
packageOverrides = _: _: {
inherit (nix-pkgs)
django-allauth
django-allauth-cas
django-browser-reload
django-bulma-forms
django-sass-processor
django-sass-processor-dart-sass
django-unfold
pykanidm
python-cas
loadcredential
xlwt
;
};
};
pythonEnv = python.withPackages (
pythonEnv = pkgs.python312.withPackages (
ps:
[
ps.django

15
machines/nixos/web02/cas-eleves/default.nix
View file

@ -19,18 +19,9 @@ let
port = 9889;
python3 =
let
nix-pkgs = import sources.nix-pkgs {
inherit pkgs;
python3 = pkgs.python312;
};
in
pkgs.python312.override {
packageOverrides = _: _: {
inherit (nix-pkgs) django-browser-reload django-bulma-forms loadcredential;
django-cas-server = nix-pkgs.django-cas-server.overridePythonAttrs (_: {
python3 = pkgs.python312.override {
packageOverrides = _: prev: {
django-cas-server = prev.django-cas-server.overridePythonAttrs (_: {
patches = [ ./01-pytest-cas.patch ];
});
};

19
machines/nixos/web02/kadenios/default.nix
View file

@ -16,28 +16,11 @@ let
host = "vote.dgnum.eu";
port = 9888;
python3 =
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
pkgs.python3.override {
packageOverrides = _: _: {
inherit (nix-pkgs)
authens
django-background-tasks
django-browser-reload
django-bulma-forms
django-translated-fields
loadcredential
;
};
};
pythonEnv =
{
debug ? false,
}:
python3.withPackages (
pkgs.python3.withPackages (
ps:
[
ps.django

10
machines/nixos/web03/django-apps/annuaire.nix
View file

@ -3,16 +3,10 @@
# SPDX-License-Identifier: EUPL-1.2
{
pkgs,
sources,
config,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.django-apps.sites.annuaire = {
source = "https://git.dgnum.eu/DGNum/annuaire-eleves";
@ -26,10 +20,6 @@ in
webHookSecret = config.age.secrets."webhook-annuaire_token".path;
python = pkgs.python3.override {
packageOverrides = _: _: { inherit (nix-pkgs) authens loadcredential; };
};
dependencies = ps: [
ps.django
ps.pillow

10
machines/nixos/web03/django-apps/bocal.nix
View file

@ -3,16 +3,10 @@
# SPDX-License-Identifier: EUPL-1.2
{
pkgs,
sources,
config,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.django-apps.sites.bocal = {
source = "https://git.dgnum.eu/DGNum/www-bocal";
@ -26,10 +20,6 @@ in
webHookSecret = config.age.secrets."webhook-bocal_token".path;
python = pkgs.python3.override {
packageOverrides = _: _: { inherit (nix-pkgs) django-cas-ng django-solo loadcredential; };
};
dependencies = ps: [
ps.django
ps.django-cas-ng

17
machines/nixos/web03/django-apps/ernestophone.nix
View file

@ -3,16 +3,10 @@
# SPDX-License-Identifier: EUPL-1.2
{
pkgs,
sources,
config,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.django-apps.sites.ernestophone = {
source = "https://git.dgnum.eu/DGNum/ernestophone.ens.fr";
@ -31,17 +25,6 @@ in
webHookSecret = config.age.secrets."webhook-ernestophone_token".path;
python = pkgs.python3.override {
packageOverrides = _: _: {
inherit (nix-pkgs)
django-avatar
django-cas-ng
django-solo
loadcredential
;
};
};
dependencies = ps: [
ps.django
ps.django-avatar

18
machines/nixos/web03/django-apps/gestiojeux.nix
View file

@ -3,16 +3,10 @@
# SPDX-License-Identifier: EUPL-1.2
{
pkgs,
sources,
config,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.django-apps.sites.gestiojeux = {
source = "https://git.dgnum.eu/DGNum/gestiojeux";
@ -31,18 +25,8 @@ in
module = "gestiojeux";
};
python = pkgs.python3.override {
packageOverrides = _: _: {
inherit (nix-pkgs)
django-autoslug
django-cas-ng
loadcredential
markdown-icons
;
};
};
django = ps: ps.django_4;
dependencies = ps: [
ps.django-autoslug
ps.loadcredential

10
machines/nixos/web03/django-apps/interludes.nix
View file

@ -4,15 +4,9 @@
{
config,
pkgs,
sources,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.webhook.extraArgs = [ "-debug" ];
services.django-apps.sites.interludes = {
@ -36,10 +30,6 @@ in
dbType = "sqlite";
python = pkgs.python3.override {
packageOverrides = _: _: { inherit (nix-pkgs) python-cas loadcredential; };
};
django = ps: ps.django_4;
dependencies = ps: [
ps.loadcredential

17
machines/nixos/web03/django-apps/wikiens.nix
View file

@ -3,16 +3,10 @@
# SPDX-License-Identifier: EUPL-1.2
{
pkgs,
sources,
config,
...
}:
let
nix-pkgs = import sources.nix-pkgs { inherit pkgs; };
in
{
services.django-apps.sites.wikiens = {
source = "https://git.dgnum.eu/DGNum/wiki-eleves";
@ -26,17 +20,6 @@ in
webHookSecret = config.age.secrets."webhook-wikiens_token".path;
python = pkgs.python3.override {
packageOverrides = _: _: {
inherit (nix-pkgs)
django-allauth
django-allauth-ens
django-wiki
loadcredential
;
};
};
dependencies =
ps:
[

4
modules/nixos/django-apps/default.nix
View file

@ -392,10 +392,6 @@ in
webhook = {
enable = true;
package = pkgs.webhook.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./01-webhook.patch ];
});
# extraArgs = [ "-debug" ];
# Only listen on localhost