From 75d8c81868fdbffbc27fe0ae94c6870da5f42143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Mon, 26 Mar 2018 13:01:25 +0200
Subject: [PATCH] pymol: 1.8.4 -> 2.1.0

---
 .../applications/science/chemistry/pymol/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 39c027706ee..e7dd04377be 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeDesktopItem
 , python3, python3Packages
-, glew, freeglut, libpng, libxml2, tk, freetype }:
+, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }:
 
 
 with stdenv.lib;
 
 let
   pname = "pymol";
-  ver_maj = "1.8";
-  ver_min = "4";
+  ver_maj = "2";
+  ver_min = "1";
   version = "${ver_maj}.${ver_min}.0";
   description = "A Python-enhanced molecular graphics tool";
 
@@ -16,7 +16,7 @@ let
     name = "${pname}";
     exec = "${pname}";
     desktopName = "PyMol Molecular Graphics System";
-    genericName = "Molecular Modeller";
+    genericName = "Molecular Modeler";
     comment = description;
     mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;";
     categories = "Graphics;Education;Science;Chemistry;";
@@ -26,10 +26,10 @@ python3Packages.buildPythonApplication {
   name = "pymol-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2";
-    sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n";
+    sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
   };
 
-  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ];
+  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ];
   NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
   installPhase = ''