package and add phpunit to to devenv

This commit is contained in:
Jonas Heinrich 2023-02-19 20:47:38 +01:00
parent 8595321b8e
commit d8449c60c5
4 changed files with 13 additions and 11 deletions

12
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674407282, "lastModified": 1676835210,
"narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "narHash": "sha256-tqv1+j4DcKqvhH4rPnqWpP+zLZbpxtzOHV2ukHbjrN0=",
"owner": "NixOS", "owner": "onny",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "rev": "c91187f0f1c0449955a3e1e2cc98af7bad05a22f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "onny",
"ref": "nixos-22.11", "ref": "phpunit",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,5 +1,7 @@
{ {
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; # FIXME
inputs.nixpkgs.url = "github:onny/nixpkgs/phpunit";
#inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
@ -8,10 +10,10 @@
{ {
devShells.x86_64-linux.default = pkgs.mkShell { devShells.x86_64-linux.default = pkgs.mkShell {
packages = with pkgs; [ packages = with pkgs; [
php82Packages.composer phpPackages.composer
phpPackages.phpunit
nixos-shell nixos-shell
nodejs nodejs
# phpunit
]; ];
}; };
}; };

2
server

@ -1 +1 @@
Subproject commit b4ac9d22d12b3623bd5b1a654a83bc5ba0190c78 Subproject commit 6e77eaa618820ca61fadaa3bbc8950efad3602ce

View file

@ -11,7 +11,7 @@
]; ];
imports = [ imports = [
./nextcloud.nix ./nextcloud.nix
"${fetchTarball "https://github.com/onny/nixpkgs/archive/maddy-acc.tar.gz"}/nixos/modules/services/mail/maddy.nix" "${fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz"}/nixos/modules/services/mail/maddy.nix"
]; ];
nixpkgs = { nixpkgs = {