diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-21 19:35:45 +0100 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-01-21 19:37:48 +0100 |
commit | abb97f60228f4ffdd073cf5c16449e9e39a4bb94 (patch) | |
tree | 075a203a25edddd5b3bd64ec76bb79696f6d1e6f | |
parent | 27e48d2c55d7023fa39abdd4cac2f2a8d95ecdcb (diff) | |
download | nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar.gz nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar.bz2 nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar.lz nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar.xz nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.tar.zst nixlib-abb97f60228f4ffdd073cf5c16449e9e39a4bb94.zip |
ebtks: migrate to by-name, rename from EBTKS
-rw-r--r-- | pkgs/applications/science/biology/N3/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/biology/inormalize/default.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/eb/ebtks/package.nix (renamed from pkgs/development/libraries/science/biology/EBTKS/default.nix) | 8 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/applications/science/biology/N3/default.nix b/pkgs/applications/science/biology/N3/default.nix index 2f4aa4ce3927..974d6f0ec0c1 100644 --- a/pkgs/applications/science/biology/N3/default.nix +++ b/pkgs/applications/science/biology/N3/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, - libminc, EBTKS }: + libminc, ebtks }: stdenv.mkDerivation rec { pname = "N3"; @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ libminc EBTKS ]; + buildInputs = [ libminc ebtks ]; propagatedBuildInputs = with perlPackages; [ perl MNI-Perllib GetoptTabular ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${ebtks}/lib/" ]; postFixup = '' for p in $out/bin/*; do diff --git a/pkgs/applications/science/biology/inormalize/default.nix b/pkgs/applications/science/biology/inormalize/default.nix index b4999193e177..ddb97cecb44a 100644 --- a/pkgs/applications/science/biology/inormalize/default.nix +++ b/pkgs/applications/science/biology/inormalize/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, perlPackages, - libminc, EBTKS }: + libminc, ebtks }: stdenv.mkDerivation rec { pname = "inormalize"; @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { patches = [ ./lgmask-interp.patch ./nu_correct_norm-interp.patch ]; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ libminc EBTKS ]; + buildInputs = [ libminc ebtks ]; propagatedBuildInputs = with perlPackages; [ perl GetoptTabular MNI-Perllib ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${EBTKS}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" "-DEBTKS_DIR=${ebtks}/lib/" ]; postFixup = '' for p in $out/bin/*; do diff --git a/pkgs/development/libraries/science/biology/EBTKS/default.nix b/pkgs/by-name/eb/ebtks/package.nix index 7a6122fbc8db..44daf2678d9b 100644 --- a/pkgs/development/libraries/science/biology/EBTKS/default.nix +++ b/pkgs/by-name/eb/ebtks/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, libminc }: -stdenv.mkDerivation rec { - pname = "EBTKS"; +stdenv.mkDerivation { + pname = "ebtks"; version = "unstable-2017-09-23"; src = fetchFromGitHub { owner = "BIC-MNI"; - repo = pname; + repo = "EBTKS"; rev = "67e4e197d8a32d6462c9bdc7af44d64ebde4fb5c"; sha256 = "1a1qw6i47fs1izx60l1ysabpmyx9j5sjnbdv8b47wi2xcc9i3hpq"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" ]; meta = with lib; { - homepage = "https://github.com/BIC-MNI/${pname}"; + homepage = "https://github.com/BIC-MNI/EBTKS"; description = "Library for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ed5f2afd2372..e43f954c4820 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -225,6 +225,7 @@ mapAliases ({ ### E ### + EBTKS = ebtks; # Added 2024-01-21 ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08 ec2_api_tools = ec2-api-tools; # Added 2021-10-08 ec2-utils = amazon-ec2-utils; # Added 2022-02-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 487409b9396e..356ed3f939cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5208,8 +5208,6 @@ with pkgs; easyocr = with python3.pkgs; toPythonApplication easyocr; - EBTKS = callPackage ../development/libraries/science/biology/EBTKS { }; - ecasound = callPackage ../applications/audio/ecasound { }; edac-utils = callPackage ../os-specific/linux/edac-utils { }; |