diff options
| author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2024-05-06 23:20:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 23:20:52 +0900 |
| commit | 5656abaea347f1ee0918c0a9bb7b2705f6d37b74 (patch) | |
| tree | 2faab70b3764ac7581037359c27be6ab4e158bb8 /pkgs/applications/science/biology | |
| parent | 6b01d1310ab05d158ef79527e5ecae50f5ba35b4 (diff) | |
| parent | 7d27d397a5ee26cf261286d35fd5032d6192c1cf (diff) | |
Merge pull request #308676 from natsukium/dssp/update
dssp: 4.4.5 -> 4.4.7, libcifpp: 7.0.3 -> 7.0.4
Diffstat (limited to 'pkgs/applications/science/biology')
| -rw-r--r-- | pkgs/applications/science/biology/dssp/default.nix | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 6c7157a91764c..56eb023805a3e 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -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 ]; |