git.iko.soy/typeable/nixpkgs
on master help sign in
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

commitf28acbdd33b67db1113e36f1a14fb5d723e5ee19 authorMaximilian Bosch <maximilian@mbosch.me> dateTue 4 Feb 2020, 22:25 (7 years ago) parent84630a1294f667
5 files changed+16−95
nixos/doc/manual/release-notes/rl-2003.xml+9 pkgs/development/tools/database/sqldeveloper/18.2.nix−84 pkgs/development/tools/database/sqldeveloper/default.nix+5−5 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−6
nixos/doc/manual/release-notes/rl-2003.xml+9
@@ -589,6 +589,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
589589 <literal>qesteidutil</literal> has been deprecated in favor of <literal>qdigidoc</literal>.
590590 </para>
591591 </listitem>
592+ <listitem>
593+ <para>
594+ <package>sqldeveloper_18</package> has been removed as it's not maintained anymore,
595+ <package>sqldeveloper</package> has been updated to version <literal>19.4</literal>.
596+ Please note that this means that this means that the <package>oraclejdk</package> is now
597+ required. For further information please read the
598+ <link xlink:href="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-relnotes-194-5908846.html">release notes</link>.
599+ </para>
600+ </listitem>
592601 </itemizedlist>
593602 </section>
594603
pkgs/development/tools/database/sqldeveloper/18.2.nixdeleted−84
@@ -1,84 +0,0 @@
1−{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
2−
3−let
4− version = "18.2.0.183.1748";
5−
6− desktopItem = makeDesktopItem {
7− name = "sqldeveloper";
8− exec = "sqldeveloper";
9− icon = "sqldeveloper";
10− desktopName = "Oracle SQL Developer 18";
11− genericName = "Oracle SQL Developer 18";
12− comment = "Oracle's Oracle DB GUI client";
13− categories = "Application;Development;";
14− };
15−in
16− stdenv.mkDerivation {
17−
18− inherit version;
19− pname = "sqldeveloper";
20−
21− src = requireFile rec {
22− name = "sqldeveloper-${version}-no-jre.zip";
23− url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
24− message = ''
25− This Nix expression requires that ${name} already be part of the store. To
26− obtain it you need to
27−
28− - navigate to ${url}
29− - make sure that it says "Version ${version}" above the list of downloads
30− - if it does not, click on the "Previous Version" link below the downloads
31− and repeat until the version is correct. This is necessarry because as the
32− time of this writing there exists no permanent link for the current version
33− yet.
34− Also consider updating this package yourself (you probably just need to
35− change the `version` variable and update the sha256 to the one of the
36− new file) or opening an issue at the nixpkgs repo.
37− - accept the license agreement
38− - download the file listed under "Other Platforms"
39− - sign in or create an oracle account if neccessary
40−
41− and then add the file to the Nix store using either:
42−
43− nix-store --add-fixed sha256 ${name}
44−
45− or
46−
47− nix-prefetch-url --type sha256 file:///path/to/${name}
48− '';
49− sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k";
50− };
51−
52− buildInputs = [ makeWrapper unzip ];
53−
54− unpackCmd = "unzip $curSrc";
55−
56− installPhase = ''
57− mkdir -p $out/libexec $out/share/{applications,pixmaps}
58− mv * $out/libexec/
59−
60− mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
61− cp ${desktopItem}/share/applications/* $out/share/applications
62−
63− makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
64− --set JAVA_HOME ${jdk.home} \
65− --run "cd $out/libexec/sqldeveloper/bin"
66− '';
67−
68− meta = with stdenv.lib; {
69− description = "Oracle's Oracle DB GUI client";
70− longDescription = ''
71− Oracle SQL Developer is a free integrated development environment that
72− simplifies the development and management of Oracle Database in both
73− traditional and Cloud deployments. SQL Developer offers complete
74− end-to-end development of your PL/SQL applications, a worksheet for
75− running queries and scripts, a DBA console for managing the database,
76− a reports interface, a complete data modeling solution, and a migration
77− platform for moving your 3rd party databases to Oracle.
78− '';
79− homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
80− license = licenses.unfree;
81− platforms = [ "x86_64-linux" ];
82− maintainers = with maintainers; [ ardumont flokli ma27 ];
83− };
84−}
pkgs/development/tools/database/sqldeveloper/default.nix+5−5
@@ -1,7 +1,7 @@
11{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
22
33let
4− version = "17.4.1.054.0712";
4+ version = "19.4.0.354.1759";
55
66 desktopItem = makeDesktopItem {
77 name = "sqldeveloper";
@@ -20,7 +20,7 @@ in
2020
2121 src = requireFile rec {
2222 name = "sqldeveloper-${version}-no-jre.zip";
23− url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
23+ url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html";
2424 message = ''
2525 This Nix expression requires that ${name} already be part of the store. To
2626 obtain it you need to
@@ -46,7 +46,7 @@ in
4646
4747 nix-prefetch-url --type sha256 file:///path/to/${name}
4848 '';
49− sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
49+ sha256 = "1hk3hfxyl6ryp4v1l9mgzflban565ayfmm2k412azmw5rnmjf6fv";
5050 };
5151
5252 buildInputs = [ makeWrapper unzip ];
@@ -78,7 +78,7 @@ in
7878 '';
7979 homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
8080 license = licenses.unfree;
81− platforms = [ "x86_64-linux" "x86_64-darwin" ];
82− maintainers = with maintainers; [ ardumont flokli ];
81+ platforms = [ "x86_64-linux" ];
82+ maintainers = with maintainers; [ ardumont ma27 ];
8383 };
8484}
pkgs/top-level/aliases.nix+1
@@ -569,4 +569,5 @@ mapAliases ({
569569 oraclejdk8psu_distro = oraclejdk8psu;
570570
571571 dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
572+ sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # added 2020-02-04
572573})
pkgs/top-level/all-packages.nix+1−6
@@ -8863,12 +8863,7 @@ in
88638863
88648864 spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { };
88658865
8866− sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
8867−
8868− # sqldeveloper_18 needs JavaFX, which currently only is available inside the
8869− # (non-free and net yet packaged for Darwin) OracleJDK
8870− # we might be able to get rid of it, as soon as we have an OpenJDK with OpenJFX included
8871− sqldeveloper_18 = callPackage ../development/tools/database/sqldeveloper/18.2.nix {
8866+ sqldeveloper = callPackage ../development/tools/database/sqldeveloper {
88728867 jdk = oraclejdk;
88738868 };
88748869