summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimir Serov <me@cab404.ru>2021-08-19 00:31:15 +0300
committerVladimir Serov <me@cab404.ru>2021-08-19 10:16:38 +0300
commit8992ae0cff94de1c44215b37dbe2e063217df684 (patch)
tree799a42326c0a39fa8259e8a9c72bb29faaba5870
parent52657498f71af8c0247e6d5f861a6c97534ccd87 (diff)
downloadnixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar.gz
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar.bz2
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar.lz
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar.xz
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.tar.zst
nixpkgs-8992ae0cff94de1c44215b37dbe2e063217df684.zip
pymol: 2.3.0 -> 2.5.0
-rw-r--r--pkgs/applications/science/chemistry/pymol/default.nix28
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 2df8b0e6d47..39bbae77a66 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,8 +1,18 @@
-{ lib, fetchurl, fetchFromGitHub, makeDesktopItem
-, python3, python3Packages
-, glew, glm, freeglut, libpng, libxml2, tk, freetype, msgpack }:
-
-
+{ lib
+, fetchFromGitHub
+, makeDesktopItem
+, python3
+, python3Packages
+, netcdf
+, glew
+, glm
+, freeglut
+, libpng
+, libxml2
+, tk
+, freetype
+, msgpack
+}:
 let
   pname = "pymol";
   description = "A Python-enhanced molecular graphics tool";
@@ -20,15 +30,15 @@ let
 in
 python3Packages.buildPythonApplication rec {
   inherit pname;
-  version = "2.3.0";
+  version = "2.5.0";
   src = fetchFromGitHub {
     owner = "schrodinger";
     repo = "pymol-open-source";
     rev = "v${version}";
-    sha256 = "175cqi6gfmvv49i3ws19254m7ljs53fy6y82fm1ywshq2h2c93jh";
+    sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM=";
   };
 
-  buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack ];
+  buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ];
   NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
   hardeningDisable = [ "format" ];
 
@@ -49,7 +59,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    description = description;
+    inherit description;
     homepage = "https://www.pymol.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ samlich ];