Drift/pvv-nixos-config
Drift
/
pvv-nixos-config
16
4
Fork 1
Code Issues Pull Requests 6 Wiki Activity

rebase :)

This commit is contained in:
Oystein Kristoffer Tveit 2024-04-02 21:37:08 +02:00
parent 321846d2da
commit a28715f126
5 changed files with 953 additions and 2360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -9,9 +9,6 @@
} }
}, },
"require": { "require": {
"simplesamlphp/simplesamlphp": "~1.19.8", "simplesamlphp/simplesamlphp": "^2.2"
"erusev/parsedown": "^1.7",
"simplesamlphp/saml2": "^4.6",
"gettext/gettext": "^4.8"
} }
} }

3292
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
dist/pvv.sql vendored
View File

@ -36,7 +36,7 @@ CREATE TABLE "motd" (
"content" TEXT "content" TEXT
); );
INSERT INTO motd (title, content) INSERT INTO motd (title, content)
VALUES ("MOTD ./dev.sh", "du kan endre motd i admin panelet"); VALUES ('MOTD ./dev.sh', 'du kan endre motd i admin panelet');
CREATE TABLE "door" ( CREATE TABLE "door" (
"time" INTEGER PRIMARY KEY, "time" INTEGER PRIMARY KEY,
@ -47,4 +47,4 @@ VALUES (0, FALSE);
INSERT INTO users (uname, groups) INSERT INTO users (uname, groups)
VALUES ("min_test_bruker", 1); VALUES ('min_test_bruker', 1);

10
flake.nix
View File

@ -21,12 +21,12 @@
pvv-nettsiden = pkgs.callPackage ./nix/package.nix { php = pkgs.php82; }; pvv-nettsiden = pkgs.callPackage ./nix/package.nix { php = pkgs.php82; };
}); });
overlays = forAllSystems (system: pkgs: { overlays.default = final: prev: {
default = prev: final: { inherit (self.packages.${final.system}) pvv-nettsiden;
inherit (self.packages.${system}) pvv-nettsiden; formats = prev.formats // {
formats = final.formats // { php = import ./nix/php-generator.nix { pkgs = final; lib = final.lib; }; }; php = import ./nix/php-generator.nix { pkgs = prev; lib = prev.lib; };
}; };
}); };
nixosModules.default = nix/module.nix; nixosModules.default = nix/module.nix;

2
nix/package.nix
View File

@ -4,7 +4,7 @@ php.buildComposerProject rec {
src = ./..; src = ./..;
pname = "pvv-nettsiden"; pname = "pvv-nettsiden";
version = "0.0.1"; version = "0.0.1";
vendorHash = "sha256-DSn0ifj7Hjjia1SF/1wfziD/IdsiOES8XNDVz3F/cTI="; vendorHash = "sha256-W+8tLv6X2l13LmN4e1mvGn23MDMhANUCoH3pQBNViQc=";
passthru.simplesamlphpPath = "share/php/pvv-nettsiden/vendor/simplesamlphp/simplesamlphp"; passthru.simplesamlphpPath = "share/php/pvv-nettsiden/vendor/simplesamlphp/simplesamlphp";