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

Merge pull request #262697 from natsukium/dssp/update 

dssp: 4.4.3 -> 4.4.4.1; libcifpp: 5.2.1 -> 5.2.2
parents 8311cc79 30e00f04

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

+11 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, cmake

, eigen

, fetchFromGitHub

, fetchpatch

, libcifpp

, libmcfp

, zlib
@@ -15,18 +16,26 @@ let 
      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.3";

  version = "4.4.4.1";



  src = fetchFromGitHub {

    owner = "PDB-REDO";

    repo = "dssp";

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

    hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM=";

    hash = "sha256-sy6GBCnTGRD1YP00dKIolkr1RMboLGcd0f4kU8gCOnA=";

  };



  nativeBuildInputs = [

pkgs/development/libraries/libcifpp/default.nix

+2 −11
Original line number Diff line number Diff line
@@ -10,24 +10,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libcifpp";

  version = "5.2.1";

  version = "5.2.2";



  src = fetchFromGitHub {

    owner = "PDB-REDO";

    repo = "libcifpp";

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

    hash = "sha256-9je4oj5XvclknD14Nh0LnBONHMeO40nY0+mZ9ACQYmY=";

    hash = "sha256-+OVfMXkBALT8v/30JU8v2gTsw12FM5n1I2COV/b5vGY=";

  };



  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=";

    })

  ];



  nativeBuildInputs = [

    cmake

  ];