From 9d8b60c697b7245d477984ab06f1a8943b65232a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:03:45 +0200 Subject: [PATCH 1/4] schemaspy: add passthru.updateScript --- pkgs/development/tools/database/schemaspy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 5e07beaff6f7..e8937c67b186 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -6,6 +6,7 @@ , fetchFromGitHub , graphviz , ensureNewerSourcesHook +, nix-update-script }: maven.buildMavenPackage rec { @@ -56,6 +57,8 @@ maven.buildMavenPackage rec { --prefix PATH : "$wrappedPath" ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; From eed465da4251973c72cd0bb2aa9fddfec86704c7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:07:31 +0200 Subject: [PATCH 2/4] schemaspy: 6.1.0-SNAPSHOT -> 6.2.4 https://github.com/schemaspy/schemaspy/releases/tag/v6.2.4 https://github.com/schemaspy/schemaspy/compare/v6.1.0...v6.2.4 --- .../tools/database/schemaspy/default.nix | 43 +++++-------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index e8937c67b186..35bf84f28613 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -2,59 +2,39 @@ , maven , jre , makeWrapper -, git , fetchFromGitHub , graphviz -, ensureNewerSourcesHook , nix-update-script }: maven.buildMavenPackage rec { pname = "schemaspy"; - version = "6.1.1-SNAPSHOT"; + version = "6.2.4"; src = fetchFromGitHub { owner = "schemaspy"; repo = "schemaspy"; - rev = "110b1614f9ae4aec0e4dc4e8f0e7c647274d3af6"; - hash = "sha256-X5B34zGhD/NxcK8TQvwdk1NljGJ1HwfBp47ocbE4HiU="; + rev = "refs/tags/v${version}"; + hash = "sha256-yEqhLpGrJ4hki8o+u+bigVXv+3YvEb8TvHDTYsEl8z4="; }; - mvnParameters = "-Dmaven.test.skip=true"; - mvnFetchExtraArgs = { - nativeBuildInputs = [ - # the build system gets angry if it doesn't see git (even though it's not - # actually in a git repository) - git - maven - ]; - }; - mvnHash = "sha256-1x6cNt6t3FnjRNg8iNYflkyDnuPFXGKoxhVJWoz2jIU="; + mvnParameters = "-Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; + mvnHash = "sha256-LCPRiY/DDSUnLGnaFUS9PPKnh3TmSyAOqKfEKRLRjpg="; nativeBuildInputs = [ makeWrapper - git - - # springframework boot gets angry about 1970 sources - # fix from https://github.com/nix-community/mavenix/issues/25 - (ensureNewerSourcesHook { year = "1980"; }) ]; - wrappedPath = lib.makeBinPath [ - graphviz - ]; - - preBuild = '' - VERSION=${version} - SEMVER_STR=${version} - ''; - installPhase = '' - install -D target/${pname}-${version}.jar $out/share/java/${pname}-${version}.jar + runHook preInstall + + install -D target/${pname}-${version}-app.jar $out/share/java/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/schemaspy \ --add-flags "-jar $out/share/java/${pname}-${version}.jar" \ - --prefix PATH : "$wrappedPath" + --prefix PATH : ${lib.makeBinPath [ graphviz ]} + + runHook postInstall ''; passthru.updateScript = nix-update-script { }; @@ -67,4 +47,3 @@ maven.buildMavenPackage rec { maintainers = with maintainers; [ jraygauthier ]; }; } - From 54eab3591479cafb28f17bf9abe99ce964578b0c Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:07:44 +0200 Subject: [PATCH 3/4] schemaspy: add anthonyroussel to maintainers --- pkgs/development/tools/database/schemaspy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index 35bf84f28613..4ec90ebe8e46 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -44,6 +44,6 @@ maven.buildMavenPackage rec { description = "Document your database simply and easily"; mainProgram = "schemaspy"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier anthonyroussel ]; }; } From 79eeb500d69231144d5ac3a65ce2c808e74cae0a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 24 Aug 2024 16:22:11 +0200 Subject: [PATCH 4/4] schemaspy: reformat and migrate to pkgs/by-name --- .../sc/schemaspy/package.nix} | 24 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 12 deletions(-) rename pkgs/{development/tools/database/schemaspy/default.nix => by-name/sc/schemaspy/package.nix} (80%) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/by-name/sc/schemaspy/package.nix similarity index 80% rename from pkgs/development/tools/database/schemaspy/default.nix rename to pkgs/by-name/sc/schemaspy/package.nix index 4ec90ebe8e46..4c5ac81c879a 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/by-name/sc/schemaspy/package.nix @@ -1,10 +1,11 @@ -{ lib -, maven -, jre -, makeWrapper -, fetchFromGitHub -, graphviz -, nix-update-script +{ + lib, + fetchFromGitHub, + graphviz, + jre, + makeWrapper, + maven, + nix-update-script, }: maven.buildMavenPackage rec { @@ -39,11 +40,14 @@ maven.buildMavenPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://schemaspy.org"; description = "Document your database simply and easily"; mainProgram = "schemaspy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jraygauthier anthonyroussel ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ + jraygauthier + anthonyroussel + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004007fb0b72..9ede9d2fe2a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18899,8 +18899,6 @@ with pkgs; shellharden = callPackage ../development/tools/shellharden { }; - schemaspy = callPackage ../development/tools/database/schemaspy { }; - scenebuilder = callPackage ../development/tools/scenebuilder { }; scenic-view = callPackage ../development/tools/scenic-view { };