Unverified Commit 0895642c authored by Markus Kowalewski's avatar Markus Kowalewski Committed by GitHub
Browse files

avogadro2: 1.99.0 -> 1.100.0 (#379066)

parents 70ab4640 b78688e1

pkgs/applications/science/chemistry/avogadro2/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "avogadro2";

  version = "1.99.0";

  version = "1.100.0";



  src = fetchFromGitHub {

    owner = "OpenChemistry";

    repo = "avogadroapp";

    rev = version;

    hash = "sha256-m8kX4WzOmPE/BZQRePOoUAdMPdWb6pmcqtPvDdEIIao=";

    hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU=";

  };



  postUnpack = ''

pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix

+2 −11
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "avogadrolibs";

  version = "1.99.0";

  version = "1.100.0";



  src = fetchFromGitHub {

    owner = "OpenChemistry";

    repo = pname;

    rev = version;

    hash = "sha256-3jUbzEd7tUeHlVFAO9KJ+LOQlkLzJQvwmHp8gOriZRI=";

    hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E=";

  };



  postUnpack = ''
@@ -64,15 +64,6 @@ stdenv.mkDerivation rec { 
    cp -r ${fragmentsRepo} fragments

  '';



  patches = [

    # Fix a Cmake error when searching the fragments directory.

    # Can be removed upon next release

    (fetchpatch {

      url = "https://github.com/OpenChemistry/avogadrolibs/commit/6e2e84dbb088a40d69117c1836f4306792f57acd.patch";

      hash = "sha256-0tY9kHh6e5IDZQ8cWPgTpwIBhfZQlgUEZbPHOmtOVUQ=";

    })

  ];



  nativeBuildInputs = [

    cmake

    wrapQtAppsHook