From bec48d00a83bda752ce34ea8dd6c1084b3cd8271 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 08:27:39 +0000 Subject: [PATCH 1/2] commonsLang: 3.12.0 -> 3.13.0 --- pkgs/development/libraries/java/commons/lang/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index b9ccfef8382c..20c03e0672d6 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.13.0"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig="; + sha256 = "sha256-yDEbe1wqyfxuJe2DK55YnNLKLh7JcsHAgp2OohWBwWU="; }; installPhase = '' From 9c171512d960fdc4cefb49522fac1ce970164adf Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 22:11:56 +0200 Subject: [PATCH 2/2] commonsLang: use `finalAttrs` pattern --- .../libraries/java/commons/lang/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 20c03e0672d6..9eca9e3070b2 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,26 +1,31 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.13.0"; pname = "commons-lang"; src = fetchurl { - url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "sha256-yDEbe1wqyfxuJe2DK55YnNLKLh7JcsHAgp2OohWBwWU="; + url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-yDEbe1wqyfxuJe2DK55YnNLKLh7JcsHAgp2OohWBwWU="; }; installPhase = '' - tar xf ${src} + runHook preInstall + tar xf ${finalAttrs.src} mkdir -p $out/share/java cp *.jar $out/share/java/ + runHook postInstall ''; meta = { - homepage = "https://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; + homepage = "https://commons.apache.org/proper/commons-lang"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; platforms = with lib.platforms; unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; -} +})