From 06c7c05cc24bd1181e93bac72d5791d2807a421b Mon Sep 17 00:00:00 2001 From: Raymond Gauthier <jraygauthier@gmail.com> Date: Thu, 9 Nov 2017 10:16:11 -0500 Subject: [PATCH 1/2] schemaspy: Init at 6.0.0-rc2 --- .../tools/database/schemaspy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/tools/database/schemaspy/default.nix diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix new file mode 100644 index 000000000000..a1d355259865 --- /dev/null +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl, jre, makeWrapper, graphviz }: + +stdenv.mkDerivation rec { + version = "6.0.0-rc2"; + name = "schemaspy-${version}"; + + src = fetchurl { + url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${name}.jar"; + sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; + }; + + unpackPhase = "true"; + + buildInputs = [ + jre + makeWrapper + ]; + + buildPhase = "true"; + + wrappedPath = lib.makeBinPath [ + graphviz + ]; + + installPhase = + '' + mkdir -p "$out/share/java" + cp ${src} "$out/share/java/${name}.jar" + + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/schemaspy \ + --add-flags "-jar $out/share/java/${name}.jar" \ + --prefix PATH : "$wrappedPath" + ''; + + meta = with lib; { + homepage = "http://schemaspy.org"; + description = "Document your database simply and easily"; + license = licenses.mit; + maintainers = with maintainers; [ jraygauthier ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b2dc79ce65..f7ba3baccc75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7597,6 +7597,8 @@ with pkgs; shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + schemaspy = callPackage ../development/tools/database/schemaspy { }; + shncpd = callPackage ../tools/networking/shncpd { }; sigrok-cli = callPackage ../development/tools/sigrok-cli { }; From cca9bb1cc5e4593eaff0476a642b4e8a39c25260 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim <joerg@thalheim.io> Date: Sun, 19 Nov 2017 15:11:34 +0000 Subject: [PATCH 2/2] schemaspy: nitpicks --- .../tools/database/schemaspy/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index a1d355259865..ab62fdf3d523 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -13,25 +13,23 @@ stdenv.mkDerivation rec { buildInputs = [ jre - makeWrapper ]; - buildPhase = "true"; + nativeBuildInputs = [ + makeWrapper + ]; wrappedPath = lib.makeBinPath [ graphviz ]; - installPhase = - '' - mkdir -p "$out/share/java" - cp ${src} "$out/share/java/${name}.jar" + installPhase = '' + install -D ${src} "$out/share/java/${name}.jar" - mkdir -p $out/bin - makeWrapper ${jre}/bin/java $out/bin/schemaspy \ - --add-flags "-jar $out/share/java/${name}.jar" \ - --prefix PATH : "$wrappedPath" - ''; + makeWrapper ${jre}/bin/java $out/bin/schemaspy \ + --add-flags "-jar $out/share/java/${name}.jar" \ + --prefix PATH : "$wrappedPath" + ''; meta = with lib; { homepage = "http://schemaspy.org";