update flake
This commit is contained in:
parent
1ab33067a8
commit
bb43071b42
6 changed files with 53 additions and 35 deletions
3
Makefile
3
Makefile
|
|
@ -1,7 +1,6 @@
|
||||||
build:
|
build:
|
||||||
git submodule update --remote --init
|
git submodule update --remote --init --recursive
|
||||||
# Build server
|
# Build server
|
||||||
cd server && git submodule update --init
|
|
||||||
cd server && make dev-setup
|
cd server && make dev-setup
|
||||||
cd server && make build-js
|
cd server && make build-js
|
||||||
cd server && npm run sass
|
cd server && npm run sass
|
||||||
|
|
|
||||||
2
calendar
2
calendar
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7f818aaa46935bf57c6988a0b6577ef9179c9db7
|
Subproject commit 60ddbc10f913fd2d055a11b5476734bac0f20858
|
||||||
2
dav
2
dav
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2106db0eed5dea58e294712a54413bd451a54252
|
Subproject commit 2d8f6d9b9851a3d5fec007b7033d86b1dc241663
|
||||||
22
flake.lock
generated
22
flake.lock
generated
|
|
@ -1,12 +1,27 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"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": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676835210,
|
"lastModified": 1676898135,
|
||||||
"narHash": "sha256-tqv1+j4DcKqvhH4rPnqWpP+zLZbpxtzOHV2ukHbjrN0=",
|
"narHash": "sha256-PyYBbRhl6YoN1ApIIzs9sBL3HNt5pYiKKkr/7OZDH5w=",
|
||||||
"owner": "onny",
|
"owner": "onny",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c91187f0f1c0449955a3e1e2cc98af7bad05a22f",
|
"rev": "6a64e05f6e2894df5cff91eab1a6a38a311e4f24",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -18,6 +33,7 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
19
flake.nix
19
flake.nix
|
|
@ -1,11 +1,15 @@
|
||||||
{
|
{
|
||||||
|
inputs = {
|
||||||
# FIXME
|
# FIXME
|
||||||
inputs.nixpkgs.url = "github:onny/nixpkgs/phpunit";
|
|
||||||
#inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
#inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
||||||
|
nixpkgs.url = "github:onny/nixpkgs/phpunit";
|
||||||
outputs = { self, nixpkgs }:
|
# Required for multi platform support
|
||||||
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
|
};
|
||||||
|
outputs = { self, nixpkgs, flake-utils }:
|
||||||
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
pkgs = import nixpkgs { inherit system; };
|
||||||
start =
|
start =
|
||||||
pkgs.writeShellScriptBin "start" ''
|
pkgs.writeShellScriptBin "start" ''
|
||||||
set -e
|
set -e
|
||||||
|
|
@ -14,16 +18,15 @@
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
devShells.x86_64-linux.default = pkgs.mkShell {
|
devShell = pkgs.mkShell {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
phpPackages.composer
|
phpPackages.composer
|
||||||
phpunit
|
phpunit
|
||||||
nixos-shell
|
|
||||||
nodejs
|
nodejs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
packages = { inherit start; };
|
packages = { inherit start; };
|
||||||
defaultPackage = start;
|
defaultPackage = start;
|
||||||
};
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
2
vobject
2
vobject
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5f6665f08b8c4c6b47a5cf94bf14f6f6bea30530
|
Subproject commit 198196c9cfe436c8c0ee5637a5129a455c9bf404
|
||||||
Loading…
Add table
Add a link
Reference in a new issue