mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-02-21 09:27:51 +01:00
Compare commits
1 Commits
98a3c2ebcc
...
selective_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fd9b964eb |
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -97,7 +97,6 @@ let
|
||||
'';
|
||||
|
||||
"modules/authpwauth/src/Auth/Source/PwAuth.php" = ./authpwauth.php;
|
||||
#"modules/ssp-theme" = pkgs.simplesamlphptheme;
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -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/
|
||||
'';
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user