Unverified Commit 5656abae authored by OTABI Tomoya's avatar OTABI Tomoya Committed by GitHub
Browse files

Merge pull request #308676 from natsukium/dssp/update 

dssp: 4.4.5 -> 4.4.7, libcifpp: 7.0.3 -> 7.0.4
parents 6b01d131 7d27d397

pkgs/applications/science/biology/dssp/default.nix

+3 −22
Original line number Diff line number Diff line
@@ -3,39 +3,20 @@ 
, cmake

, eigen

, fetchFromGitHub

, fetchpatch

, libcifpp

, libmcfp

, zlib

}:

let

  libcifpp' = libcifpp.overrideAttrs (oldAttrs: {

    # dssp 4.4.3 requires specific version "5.2.0" of libcifpp

    version = "5.2.0";

    src = fetchFromGitHub {

      inherit (oldAttrs.src) owner repo rev;

      hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs=";

    };

    patches = [

      (fetchpatch {

        # https://github.com/PDB-REDO/libcifpp/issues/51

        name = "fix-build-on-darwin.patch";

        url = "https://github.com/PDB-REDO/libcifpp/commit/641f06a7e7c0dc54af242b373820f2398f59e7ac.patch";

        hash = "sha256-eWNfp9nA/+2J6xjZR6Tj+5OM3L5MxdfRi0nBzyaqvS0=";

      })

    ];

  });

in



stdenv.mkDerivation (finalAttrs: {

  pname = "dssp";

  version = "4.4.5";

  version = "4.4.7";



  src = fetchFromGitHub {

    owner = "PDB-REDO";

    repo = "dssp";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-X0aMWqoMhmQVRHWKVm2S6JAOYiBuBBMzMoivMdpNx0M=";

    hash = "sha256-qePoZYkzzWuK6j1NM+q6fPuWVRDEe4OkPmXc9Nbqobo=";

  };



  nativeBuildInputs = [
@@ -44,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    eigen

    libcifpp'

    libcifpp

    libmcfp

    zlib

  ];

pkgs/development/libraries/libcifpp/default.nix

+7 −3
Original line number Diff line number Diff line
@@ -3,20 +3,19 @@ 
, boost

, cmake

, fetchFromGitHub

, fetchpatch

, eigen

, zlib

}:



stdenv.mkDerivation (finalAttrs: {

  pname = "libcifpp";

  version = "7.0.3";

  version = "7.0.4";



  src = fetchFromGitHub {

    owner = "PDB-REDO";

    repo = "libcifpp";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-YRK648gJ2UlgeG5GHMjTid1At0lYt7Zqu4/+O5WG/OM=";

    hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I=";

  };



  nativeBuildInputs = [
@@ -34,6 +33,11 @@ stdenv.mkDerivation (finalAttrs: { 
    zlib

  ];



  # cmake requires the existence of this directory when building dssp

  postInstall = ''

    mkdir -p $out/share/libcifpp

  '';



  meta = with lib; {

    description = "Manipulate mmCIF and PDB files";

    homepage = "https://github.com/PDB-REDO/libcifpp";