flarum: jack

Signed-off-by: Jack Leightcap <jack.leightcap@trailofbits.com>
ngi-nix · Jul 24, 2023 · 65fa58e · 65fa58e
1 parent 8e9ddc4
commit 65fa58e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 = {