update flake

This commit is contained in:
Jonas Heinrich 2023-02-20 14:40:13 +01:00
parent 1ab33067a8
commit bb43071b42
6 changed files with 53 additions and 35 deletions

View file

@ -1,7 +1,6 @@
build:
git submodule update --remote --init
git submodule update --remote --init --recursive
# Build server
cd server && git submodule update --init
cd server && make dev-setup
cd server && make build-js
cd server && npm run sass

@ -1 +1 @@
Subproject commit 7f818aaa46935bf57c6988a0b6577ef9179c9db7
Subproject commit 60ddbc10f913fd2d055a11b5476734bac0f20858

2
dav

@ -1 +1 @@
Subproject commit 2106db0eed5dea58e294712a54413bd451a54252
Subproject commit 2d8f6d9b9851a3d5fec007b7033d86b1dc241663

22
flake.lock generated
View file

@ -1,12 +1,27 @@
{
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1676835210,
"narHash": "sha256-tqv1+j4DcKqvhH4rPnqWpP+zLZbpxtzOHV2ukHbjrN0=",
"lastModified": 1676898135,
"narHash": "sha256-PyYBbRhl6YoN1ApIIzs9sBL3HNt5pYiKKkr/7OZDH5w=",
"owner": "onny",
"repo": "nixpkgs",
"rev": "c91187f0f1c0449955a3e1e2cc98af7bad05a22f",
"rev": "6a64e05f6e2894df5cff91eab1a6a38a311e4f24",
"type": "github"
},
"original": {
@ -18,6 +33,7 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
}
}

View file

@ -1,11 +1,15 @@
{
inputs = {
# FIXME
inputs.nixpkgs.url = "github:onny/nixpkgs/phpunit";
#inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
outputs = { self, nixpkgs }:
nixpkgs.url = "github:onny/nixpkgs/phpunit";
# Required for multi platform support
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { system = "x86_64-linux"; };
pkgs = import nixpkgs { inherit system; };
start =
pkgs.writeShellScriptBin "start" ''
set -e
@ -14,16 +18,15 @@
'';
in
{
devShells.x86_64-linux.default = pkgs.mkShell {
devShell = pkgs.mkShell {
packages = with pkgs; [
phpPackages.composer
phpunit
nixos-shell
nodejs
];
};
packages = { inherit start; };
defaultPackage = start;
};
}
});
}

@ -1 +1 @@
Subproject commit 5f6665f08b8c4c6b47a5cf94bf14f6f6bea30530
Subproject commit 198196c9cfe436c8c0ee5637a5129a455c9bf404