Skip to content

Commit

Permalink
mob next [ci-skip] [ci skip] [skip ci]
Browse files Browse the repository at this point in the history
lastFile:pkgs/flarum/default.nix.bak
  • Loading branch information
albertchae committed Jul 20, 2023
1 parent 743fcc3 commit 29f6b9c
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 36 deletions.
14 changes: 0 additions & 14 deletions pkgs/flarum/composer2nix-default.nix

This file was deleted.

34 changes: 12 additions & 22 deletions pkgs/flarum/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
{ stdenv, fetchFromGitHub, php, phpPackages, ... }:

stdenv.mkDerivation rec {
pname = "flarum";
version = "v1.8.1";
src = fetchFromGitHub {
owner = "flarum";
repo = "framework";
rev = version;
sha256 = "sha256-Q6+MxRTuMGzwkwnmgaLffkg6rpTlalA+49O/UGaz7HE=";
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, noDev ? false, php ? pkgs.php, phpPackages ? pkgs.phpPackages}:

let
composerEnv = import ./composer-env.nix {
inherit (pkgs) stdenv lib writeTextFile fetchurl unzip;
inherit php phpPackages;
};

buildInputs = [ php phpPackages.composer ];

buildPhase = ''
composer install
'';

installPhase = ''
mkdir -p $out/www
cp -r * $out/www
'';
in
import ./php-packages.nix {
inherit composerEnv noDev;
inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
}

35 changes: 35 additions & 0 deletions pkgs/flarum/default.nix.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ stdenv, fetchFromGitHub, php, phpPackages, ... }:

let
composerEnv = import ./composer-env.nix {
inherit (pkgs) stdenv lib writeTextFile fetchurl unzip;
inherit php phpPackages;
};
in

stdenv.mkDerivation rec {
pname = "flarum";
version = "v1.8.1";
src = fetchFromGitHub {
owner = "flarum";
repo = "framework";
rev = version;
sha256 = "sha256-Q6+MxRTuMGzwkwnmgaLffkg6rpTlalA+49O/UGaz7HE=";
};

buildInputs = [ php phpPackages.composer ];

buildPhase = ''
composer install
'';

installPhase = ''
mkdir -p $out/www
cp -r * $out/www
'';
}

import ./php-packages.nix {
inherit composerEnv noDev;
inherit (pkgs) fetchurl fetchgit fetchhg fetchsvn;
}

0 comments on commit 29f6b9c

Please sign in to comment.