Compare commits

..

3 Commits

Author SHA1 Message Date
Vegard Bieker Matthey
3bcc37073c avoid using lupine-4 for gitea actions 2026-03-23 02:59:35 +01:00
h7x4
6ef02bd485 kommode/gitea: allow me to go fork myself 2026-03-10 14:50:56 +09:00
Vegard Bieker Matthey
6b1fb4c065 only cross-compile when necessary
This fixes issues with rebuilding georg and brzeczyszczykiewicz.

Reviewed-on: https://git.pvv.ntnu.no/Drift/pvv-nixos-config/pulls/128
Reviewed-by: Oystein Kristoffer Tveit <oysteikt@pvv.ntnu.no>
Co-authored-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Co-committed-by: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
2026-02-21 21:14:04 +01:00
6 changed files with 10 additions and 43 deletions

View File

@@ -94,7 +94,6 @@
}:
let
commonPkgsConfig = {
inherit localSystem crossSystem;
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg)
[
"nvidia-x11"
@@ -104,8 +103,11 @@
# Global overlays go here
inputs.roowho2.overlays.default
]) ++ overlays;
};
} // (if localSystem != crossSystem then {
inherit localSystem crossSystem;
} else {
system = crossSystem;
});
pkgs = import nixpkgs commonPkgsConfig;
unstablePkgs = import nixpkgs-unstable commonPkgsConfig;
in
@@ -171,7 +173,6 @@
(final: prev: {
mediawiki-extensions = final.callPackage ./packages/mediawiki-extensions { };
simplesamlphp = final.callPackage ./packages/simplesamlphp { };
simplesamlphptheme = final.callPackage ./packages/simplesamlphptheme { };
bluemap = final.callPackage ./packages/bluemap.nix { };
})
inputs.pvv-nettsiden.overlays.default

View File

@@ -858,11 +858,7 @@ $config = [
/*
* Which theme directory should be used?
*/
'module.enable' => [
'pvv' => TRUE,
],
'theme.use' => 'ssp-theme:pvv',
'theme.use' => 'default',
/*
* Set this option to the text you would like to appear at the header of each page. Set to false if you don't want

View File

@@ -97,7 +97,6 @@ let
'';
"modules/authpwauth/src/Auth/Source/PwAuth.php" = ./authpwauth.php;
#"modules/ssp-theme" = pkgs.simplesamlphptheme;
};
};
in

View File

@@ -131,6 +131,7 @@ in {
"repo.pulls"
"repo.releases"
];
ALLOW_FORK_INTO_SAME_OWNER = true;
};
picture = {
DISABLE_GRAVATAR = true;

View File

@@ -1,12 +1,11 @@
{ fp, values, lupineName, ... }:
{ fp, values, lib, lupineName, ... }:
{
imports = [
./hardware-configuration/${lupineName}.nix
(fp /base)
./services/gitea-runner.nix
];
# lupine-4 does not have enough ram for running nix flake check
] ++ lib.optionals (lupineName != "lupine-4") [ ./services/gitea-runner.nix ];
sops.defaultSopsFile = fp /secrets/lupine/lupine.yaml;

View File

@@ -1,29 +0,0 @@
{ lib
, php
, stdenv
, writeText
, fetchFromGitea
, extra_files ? { }
}:
stdenv.mkDerivation {
pname = "ssp-theme";
version = "v1.2026";
src = fetchFromGitea {
owner = "drift";
repo = "ssp-theme";
rev = "master";
hash = "sha256-4d0TwJubfJrThctvE50HpPg0gqdJy595hewEcjfXlrs=";
domain = "git.pvv.ntnu.no";
};
installPhase = ''
mkdir -p $out/bin
cp -r ./ $out/bin/
chmod -R +x $out/bin/
'';
}