diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 13:15:49 -0500 |
| commit | b6b59334bbb7b3ca273fb729483dcaa2a6f889c8 (patch) | |
| tree | d264bcb769847136b623616512acbec02fc310a2 /pkgs/development/libraries/java | |
| parent | 83b45c228556168cb22183d5fbc772fb5a192559 (diff) | |
| parent | 32e770042e8c1ba70d89d9190f30405b26208f26 (diff) | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/celery/default.nix pkgs/development/python-modules/kombu/default.nix
Diffstat (limited to 'pkgs/development/libraries/java')
| -rw-r--r-- | pkgs/development/libraries/java/commons/io/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/java/hsqldb/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 0c5ac8f4dded5..ba8b59162c5c6 100644 --- a/pkgs/development/libraries/java/commons/io/default.nix +++ b/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.8.0"; + version = "2.11.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk"; + sha256 = "sha256-9RXVNzjEhdYCYWbB9/xW3rm+gSOuD6+jwAO9zJVt4fk="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index 19c8833db7283..8f678ce7555b7 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.6.0"; + version = "2.6.1"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-GhuTBJl1E+aoWa8pTWEqzghHDXXiCQFIt++8pjCQYik="; + sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; |