rebase :)
This commit is contained in:
parent
321846d2da
commit
5645c097b1
|
@ -9,9 +9,6 @@
|
|||
}
|
||||
},
|
||||
"require": {
|
||||
"simplesamlphp/simplesamlphp": "~1.19.8",
|
||||
"erusev/parsedown": "^1.7",
|
||||
"simplesamlphp/saml2": "^4.6",
|
||||
"gettext/gettext": "^4.8"
|
||||
"simplesamlphp/simplesamlphp": "^2.2"
|
||||
}
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -36,7 +36,7 @@ CREATE TABLE "motd" (
|
|||
"content" TEXT
|
||||
);
|
||||
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" (
|
||||
"time" INTEGER PRIMARY KEY,
|
||||
|
@ -47,4 +47,4 @@ VALUES (0, FALSE);
|
|||
|
||||
|
||||
INSERT INTO users (uname, groups)
|
||||
VALUES ("min_test_bruker", 1);
|
||||
VALUES ('min_test_bruker', 1);
|
||||
|
|
10
flake.nix
10
flake.nix
|
@ -21,12 +21,12 @@
|
|||
pvv-nettsiden = pkgs.callPackage ./nix/package.nix { php = pkgs.php82; };
|
||||
});
|
||||
|
||||
overlays = forAllSystems (system: pkgs: {
|
||||
default = prev: final: {
|
||||
inherit (self.packages.${system}) pvv-nettsiden;
|
||||
formats = final.formats // { php = import ./nix/php-generator.nix { pkgs = final; lib = final.lib; }; };
|
||||
overlays.default = final: prev: {
|
||||
inherit (self.packages.${final.system}) pvv-nettsiden;
|
||||
formats = final.formats // {
|
||||
php = import ./nix/php-generator.nix { pkgs = final; lib = final.lib; };
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
nixosModules.default = nix/module.nix;
|
||||
|
||||
|
|
Loading…
Reference in New Issue