diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/java | |
parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/java')
5 files changed, 8 insertions, 37 deletions
diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 96d2a76df018..bd0f7c273e79 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.10"; + version = "3.11"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "144057jrx1jral6dnnb039h3k8rnrx0nj3ii428s725jfhazg68f"; + sha256 = "08w7zg9v48rlaq0n17dnph8jydz9srh1pl3ffs3xdfsg9a7axjm4"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix index 5e5741516508..0133138b4784 100644 --- a/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, gettext, jdk, libmatthew_java}: +{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +let jdk = jdk8; in stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { diff --git a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix index d9139ec1d823..88f32866b0d0 100644 --- a/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.0"; + version = "2.5.1"; underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j"; + sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix b/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix deleted file mode 100644 index 5bc0f15b205d..000000000000 --- a/nixpkgs/pkgs/development/libraries/java/jzmq/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zeromq3, jdk }: - -stdenv.mkDerivation rec { - pname = "jzmq"; - version = "3.1.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "jzmq"; - rev = "v${version}"; - sha256 = "1wlzs604mgmqmrgpk4pljx2nrlxzdfi3r8k59qlm90fx8qkqkc63"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ zeromq3 jdk ]; - - preConfigure = '' - ${if stdenv.hostPlatform.system == "x86_64-darwin" then - '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure - '' else ""} - ''; - - meta = { - homepage = "http://www.zeromq.org"; - description = "Java bindings for ZeroMQ"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vizanto ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index f48c4821d923..5928d99b6c24 100644 --- a/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.10"; + name = "lombok-1.18.12"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1ymjwxg01dq8qq89hx23yvk5h46hwfb8ihbqbvabmz1vh9afjdi8"; + sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; }; buildCommand = '' |