From 1e68ff3ee9d30565b684d9d93a89cc6f87485723 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:43:22 +0900 Subject: [PATCH 1/3] kent: 404 -> 446 https://github.com/ucscGenomeBrowser/kent/compare/v404_base...v446_base --- pkgs/applications/science/biology/kent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 12bbfa09c251..d59ad3b2ad0c 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "404"; + version = "446"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - sha256 = "0l5lmqqc6sqkf4hyk3z4825ly0vdlj5xdfad6zd0708cb1v81nbx"; + hash = "sha256-d8gcoyMwINdHoD6xaNKt4rCKrKir99+i4KIzJ2YnxRw="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; From 5b62152599b15c85a8b7420c9fed2eeff6838aa3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:45:38 +0900 Subject: [PATCH 2/3] kent: add runHooks --- pkgs/applications/science/biology/kent/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index d59ad3b2ad0c..8f3e312b20c1 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -25,14 +25,20 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; patchPhase = '' + runHook prePatch + substituteInPlace ./src/checkUmask.sh \ --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace ./src/hg/sqlEnvTest.sh \ --replace "which mysql_config" "${which}/bin/which ${libmysqlclient}/bin/mysql_config" + + runHook postPatch ''; buildPhase = '' + runHook preBuild + export MACHTYPE=$(uname -m) export CFLAGS="-fPIC" export MYSQLINC=$(mysql_config --include | sed -e 's/^-I//g') @@ -56,14 +62,20 @@ stdenv.mkDerivation rec { cd ../utils make + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin mkdir -p $out/lib cp $NIX_BUILD_TOP/lib/jkOwnLib.a $out/lib cp $NIX_BUILD_TOP/lib/jkweb.a $out/lib cp $NIX_BUILD_TOP/bin/x86_64/* $out/bin + + runHook postInstall ''; meta = with lib; { From 23205d28d2c0d134508ae0b6d79ba0f9a53835ab Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 20 Apr 2023 15:50:30 +0900 Subject: [PATCH 3/3] kent: add missing information to the meta --- pkgs/applications/science/biology/kent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index 8f3e312b20c1..a41cdfc5dee4 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "UCSC Genome Bioinformatics Group's suite of biological analysis tools, i.e. the kent utilities"; + homepage = "http://genome.ucsc.edu"; + changelog = "https://github.com/ucscGenomeBrowser/kent/releases/tag/v${version}_base"; license = licenses.unfree; maintainers = with maintainers; [ scalavision ]; platforms = platforms.linux;