From 6d402731689fbeb403b03a0f486b8c8a26530d5a Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Thu, 15 Jun 2023 20:52:28 +0000 Subject: libuv: use finalAttrs instead of rec (#237140) Co-authored-by: figsoda --- pkgs/development/libraries/libuv/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 544ad537729..3f9a0e6f4bb 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -22,14 +22,14 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.45.0"; pname = "libuv"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; + owner = "libuv"; + repo = "libuv"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-qKw9QFR24Uw7pVA9isPH8Va+9/5DYuqXz6l6jWcXn+4="; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { "shutdown_close_pipe" ]; tdRegexp = lib.concatStringsSep "\\|" toDisable; - in lib.optionalString doCheck '' + in lib.optionalString (finalAttrs.doCheck) '' sed '/${tdRegexp}/d' -i test/test-list.h ''; @@ -112,10 +112,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; - changelog = "https://github.com/libuv/libuv/blob/v${version}/ChangeLog"; + changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; maintainers = with maintainers; [ cstrahan ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; -} +}) -- cgit 1.4.1