diff --git a/all-packages.nix b/all-packages.nix index a4b7d5d4..25160e8e 100644 --- a/all-packages.nix +++ b/all-packages.nix @@ -1,7 +1,6 @@ { newScope, ... }: let self = rec { - flarum = callPackage ./pkgs/flarum { }; gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli { }; liberaforms = callPackage ./pkgs/liberaforms { }; liberaforms-env = callPackage ./pkgs/liberaforms/env.nix { }; diff --git a/pkgs/flarum/default.nix b/pkgs/flarum/default.nix index f78c01ae..ac6591ab 100644 --- a/pkgs/flarum/default.nix +++ b/pkgs/flarum/default.nix @@ -1,12 +1,10 @@ { pkgs }: -rec { - pname = "flarum"; - version = "v1.8.0"; +{ src = builtins.fetchFromGitHub { owner = "flarum"; repo = "flarum"; - rev = version; + rev = "v1.8.0"; sha256 = ""; }; diff --git a/pkgs/flarum/php-packages.nix b/pkgs/flarum/php-packages.nix index e94a37a9..74186e9c 100644 --- a/pkgs/flarum/php-packages.nix +++ b/pkgs/flarum/php-packages.nix @@ -1348,7 +1348,8 @@ in composerEnv.buildPackage { inherit packages devPackages noDev; name = "flarum-flarum"; - src = composerEnv.filterSrc ./.; + # src = composerEnv.filterSrc ./.; + src = ./src; executable = false; symlinkDependencies = false; meta = {