use packaged hmr-enabler app

This commit is contained in:
Jonas Heinrich 2024-07-20 15:58:36 +02:00
parent f97c7e1cd7
commit 75bb6bd1fc
3 changed files with 12 additions and 27 deletions

15
flake.lock generated
View file

@ -35,17 +35,18 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1720954236,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
"owner": "NixOS",
"lastModified": 1721471800,
"narHash": "sha256-+qIOk9CTI7yFtXJ6WU3OxLS5N9RUP57wiZ4aG9WJAxk=",
"owner": "onny",
"repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
"rev": "1ab2b701851fdddd2480ca5a472a2f8e4a68a805",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-24.05",
"type": "indirect"
"owner": "onny",
"ref": "hmr-enabler",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {

View file

@ -2,7 +2,9 @@
description = "Spawns lightweight nixos vm in a shell";
inputs = {
nixpkgs.url = "nixpkgs/nixos-24.05";
# FIXME
#nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs.url = "github:onny/nixpkgs/hmr-enabler";
nixos-shell.url = "github:Mic92/nixos-shell";
};

View file

@ -33,25 +33,7 @@
package = pkgs.nextcloud29;
hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts calendar user_oidc;
# FIXME
# enable hmr when debug flag is enabled
hmr_enabler = pkgs.php.buildComposerProject (finalAttrs: {
pname = "hmr_enabler";
version = "1.0.0";
src = pkgs.fetchFromGitHub {
owner = "nextcloud";
repo = "hmr_enabler";
rev = "b8d3ad290bfa6fe407280587181a5167d71a2617";
hash = "sha256-yXFby5zlDiPdrw6HchmBoUdu9Zjfgp/bSu0G/isRpKg=";
};
composerNoDev = false;
vendorHash = "sha256-PCWWu/SqTUGnZXUnXyL8c72p8L14ZUqIxoa5i49XPH4=";
postInstall = ''
cp -r $out/share/php/hmr_enabler/* $out/
rm -r $out/share
'';
});
inherit contacts calendar user_oidc hmr_enabler;
};
extraAppsEnable = true;
config = {