firefly-iii: 6.1.25 -> 6.2.4, firefly-iii-data-importer: 1.5.7 -> 1.6.0 (#379863)
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
buildPackages,
|
||||
php83,
|
||||
php84,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
dataDir ? "/var/lib/firefly-iii-data-importer",
|
||||
@@ -13,23 +13,23 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii-data-importer";
|
||||
version = "1.5.7";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "data-importer";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CKDAPpDTTrBXPhfSQiBl/M42hOQi2KwpWDtEnlDwpuU=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-f/kvSQMA4w+wwD+hM6kGduV3AQmmYe2w5u3dhnJBS9s=";
|
||||
};
|
||||
|
||||
buildInputs = [ php83 ];
|
||||
buildInputs = [ php84 ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs.python
|
||||
buildPackages.npmHooks.npmConfigHook
|
||||
php83.composerHooks.composerInstallHook
|
||||
php83.packages.composer-local-repo-plugin
|
||||
php84.composerHooks.composerInstallHook
|
||||
php84.packages.composer-local-repo-plugin
|
||||
];
|
||||
|
||||
composerNoDev = true;
|
||||
@@ -38,15 +38,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
|
||||
vendorHash = "sha256-larFTf64oPJi+XLMK6ZuLEN4P/CkGLojUJDE/gvu8UU=";
|
||||
vendorHash = "sha256-Jn0H63VxIGjgVOT6yyXEhRdMWeIInMdv6mi5JQXp68Q=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-0xY9F/Bok2RQ1YWRr5fnENk3zB1WubnpT0Ldy+i618g=";
|
||||
hash = "sha256-hUq5pp62K2XAnjU9QhQE+PogUSla9R1xG7beW4bgrV8=";
|
||||
};
|
||||
|
||||
composerRepository = php83.mkComposerRepository {
|
||||
composerRepository = php84.mkComposerRepository {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
src
|
||||
@@ -64,7 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
phpPackage = php83;
|
||||
phpPackage = php84;
|
||||
tests = nixosTests.firefly-iii-data-importer;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
nodejs,
|
||||
fetchNpmDeps,
|
||||
buildPackages,
|
||||
php83,
|
||||
php84,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
dataDir ? "/var/lib/firefly-iii",
|
||||
@@ -13,23 +13,23 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "firefly-iii";
|
||||
version = "6.1.25";
|
||||
version = "6.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "firefly-iii";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6DZwTk67bKvgB+Zf7aPakrWWYCAjkYggrRiaFKgsMkk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IBf34RPpQUH3U0tl8ljJpL9of6QNDOTyBg7Hc1ae+W8=";
|
||||
};
|
||||
|
||||
buildInputs = [ php83 ];
|
||||
buildInputs = [ php84 ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
nodejs.python
|
||||
buildPackages.npmHooks.npmConfigHook
|
||||
php83.composerHooks.composerInstallHook
|
||||
php83.packages.composer-local-repo-plugin
|
||||
php84.composerHooks.composerInstallHook
|
||||
php84.packages.composer-local-repo-plugin
|
||||
];
|
||||
|
||||
composerNoDev = true;
|
||||
@@ -38,15 +38,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
composerStrictValidation = true;
|
||||
strictDeps = true;
|
||||
|
||||
vendorHash = "sha256-5uUjb5EPcoEBuFbWGb1EIC/U/VaSUsRp09S9COIx25E=";
|
||||
vendorHash = "sha256-LRcgWQPDLNCMbaJhaySDrcw95fXF4yVUc03SFnrteeM=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit (finalAttrs) src;
|
||||
name = "${finalAttrs.pname}-npm-deps";
|
||||
hash = "sha256-j49iltvW7xGOCV+FIB4f+ECfQo50U+wTugyaK9JGN3A=";
|
||||
hash = "sha256-K8zoX4UsD/hOpMZ5JCH3G9WBTUpJcXAertEaXaUGcys=";
|
||||
};
|
||||
|
||||
composerRepository = php83.mkComposerRepository {
|
||||
composerRepository = php84.mkComposerRepository {
|
||||
inherit (finalAttrs)
|
||||
pname
|
||||
src
|
||||
@@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
phpPackage = php83;
|
||||
phpPackage = php84;
|
||||
tests = nixosTests.firefly-iii;
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user