Merge pull request #79221 from Ma27/bump-oracle-sqldeveloper

sqldeveloper: {17.4.1.054.0712,18.2.0.183.1748} -> 19.4.0.354.1759
This commit is contained in:
Maximilian Bosch 2020-02-04 22:25:44 +01:00 committed by GitHub
commit f28acbdd33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 95 deletions

View file

@ -589,6 +589,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
<literal>qesteidutil</literal> has been deprecated in favor of <literal>qdigidoc</literal>.
</para>
</listitem>
<listitem>
<para>
<package>sqldeveloper_18</package> has been removed as it's not maintained anymore,
<package>sqldeveloper</package> has been updated to version <literal>19.4</literal>.
Please note that this means that this means that the <package>oraclejdk</package> is now
required. For further information please read the
<link xlink:href="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html">release notes</link>.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -1,84 +0,0 @@
{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
let
version = "18.2.0.183.1748";
desktopItem = makeDesktopItem {
name = "sqldeveloper";
exec = "sqldeveloper";
icon = "sqldeveloper";
desktopName = "Oracle SQL Developer 18";
genericName = "Oracle SQL Developer 18";
comment = "Oracle's Oracle DB GUI client";
categories = "Application;Development;";
};
in
stdenv.mkDerivation {
inherit version;
pname = "sqldeveloper";
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
message = ''
This Nix expression requires that ${name} already be part of the store. To
obtain it you need to
- navigate to ${url}
- make sure that it says "Version ${version}" above the list of downloads
- if it does not, click on the "Previous Version" link below the downloads
and repeat until the version is correct. This is necessarry because as the
time of this writing there exists no permanent link for the current version
yet.
Also consider updating this package yourself (you probably just need to
change the `version` variable and update the sha256 to the one of the
new file) or opening an issue at the nixpkgs repo.
- accept the license agreement
- download the file listed under "Other Platforms"
- sign in or create an oracle account if neccessary
and then add the file to the Nix store using either:
nix-store --add-fixed sha256 ${name}
or
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k";
};
buildInputs = [ makeWrapper unzip ];
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir -p $out/libexec $out/share/{applications,pixmaps}
mv * $out/libexec/
mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
cp ${desktopItem}/share/applications/* $out/share/applications
makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
--set JAVA_HOME ${jdk.home} \
--run "cd $out/libexec/sqldeveloper/bin"
'';
meta = with stdenv.lib; {
description = "Oracle's Oracle DB GUI client";
longDescription = ''
Oracle SQL Developer is a free integrated development environment that
simplifies the development and management of Oracle Database in both
traditional and Cloud deployments. SQL Developer offers complete
end-to-end development of your PL/SQL applications, a worksheet for
running queries and scripts, a DBA console for managing the database,
a reports interface, a complete data modeling solution, and a migration
platform for moving your 3rd party databases to Oracle.
'';
homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ardumont flokli ma27 ];
};
}

View file

@ -1,7 +1,7 @@
{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
let
version = "17.4.1.054.0712";
version = "19.4.0.354.1759";
desktopItem = makeDesktopItem {
name = "sqldeveloper";
@ -20,7 +20,7 @@ in
src = requireFile rec {
name = "sqldeveloper-${version}-no-jre.zip";
url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html";
message = ''
This Nix expression requires that ${name} already be part of the store. To
obtain it you need to
@ -46,7 +46,7 @@ in
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
sha256 = "1hk3hfxyl6ryp4v1l9mgzflban565ayfmm2k412azmw5rnmjf6fv";
};
buildInputs = [ makeWrapper unzip ];
@ -78,7 +78,7 @@ in
'';
homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ ardumont flokli ];
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ ardumont ma27 ];
};
}

View file

@ -569,4 +569,5 @@ mapAliases ({
oraclejdk8psu_distro = oraclejdk8psu;
dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04
})

View file

@ -8863,12 +8863,7 @@ in
spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
# sqldeveloper_18 needs JavaFX, which currently only is available inside the
# (non-free and net yet packaged for Darwin) OracleJDK
# we might be able to get rid of it, as soon as we have an OpenJDK with OpenJFX included
sqldeveloper_18 = callPackage ../development/tools/database/sqldeveloper/18.2.nix {
sqldeveloper = callPackage ../development/tools/database/sqldeveloper {
jdk = oraclejdk;
};