diff --git a/flake.lock b/flake.lock index 3ace795..a8f48fe 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", - "owner": "NixOS", + "lastModified": 1676835210, + "narHash": "sha256-tqv1+j4DcKqvhH4rPnqWpP+zLZbpxtzOHV2ukHbjrN0=", + "owner": "onny", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "c91187f0f1c0449955a3e1e2cc98af7bad05a22f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.11", + "owner": "onny", + "ref": "phpunit", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 291a3ee..59262e5 100644 --- a/flake.nix +++ b/flake.nix @@ -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 }: let @@ -8,10 +10,10 @@ { devShells.x86_64-linux.default = pkgs.mkShell { packages = with pkgs; [ - php82Packages.composer + phpPackages.composer + phpPackages.phpunit nixos-shell nodejs - # phpunit ]; }; }; diff --git a/server b/server index b4ac9d2..6e77eaa 160000 --- a/server +++ b/server @@ -1 +1 @@ -Subproject commit b4ac9d22d12b3623bd5b1a654a83bc5ba0190c78 +Subproject commit 6e77eaa618820ca61fadaa3bbc8950efad3602ce diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index 18d1fe7..e660bd6 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -11,7 +11,7 @@ ]; imports = [ ./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 = {