From 53a7d5ec99ca2df635b16ce4236af60ac19a01b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 03:28:01 -0800 Subject: [PATCH] squirrel-sql: 3.8.1 -> 3.9.0 * squirrel-sql: 3.8.1 -> 3.9.0 (#52029) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/squirrel-sql/versions * squirrel-sql: cleanup * squirrel-sql: don't pass stdenv as a build input --- .../tools/database/squirrel-sql/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 7d4cf6ea5d5..548268bb762 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,29 +5,34 @@ , drivers ? [] }: let - version = "3.8.1"; + version = "3.9.0"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; + sha256 = "0b16l7p7klagxnwkx2az4mbyd35kv4aj8xxbwm27pp3spz9dk8m0"; }; - buildInputs = [ - jre makeWrapper stdenv unzip - ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ jre ]; unpackPhase = '' + runHook preUnpack unzip ${src} + runHook postUnpack ''; buildPhase = '' + runHook preBuild cd squirrelsql-${version}-standard chmod +x squirrel-sql.sh + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/squirrel-sql cp -r . $out/share/squirrel-sql @@ -47,6 +52,8 @@ in stdenv.mkDerivation rec { ln -s $out/share/squirrel-sql/icons/acorn.png \ $out/share/icons/hicolor/32x32/apps/squirrel-sql.png ln -s ${desktopItem}/share/applications $out/share + + runHook postInstall ''; desktopItem = makeDesktopItem { @@ -59,11 +66,11 @@ in stdenv.mkDerivation rec { icon = "squirrel-sql"; }; - meta = { + meta = with stdenv.lib; { description = "Universal SQL Client"; homepage = http://squirrel-sql.sourceforge.net/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ khumba ]; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ khumba ]; }; }