Skip to content

Commit 0895642

Browse files
authored
avogadro2: 1.99.0 -> 1.100.0 (#379066)
2 parents 70ab464 + b78688e commit 0895642

File tree

2 files changed

+4
-13
lines changed
  • pkgs
    • applications/science/chemistry/avogadro2
    • development/libraries/science/chemistry/avogadrolibs

2 files changed

+4
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ let
2424
in
2525
stdenv.mkDerivation rec {
2626
pname = "avogadro2";
27-
version = "1.99.0";
27+
version = "1.100.0";
2828

2929
src = fetchFromGitHub {
3030
owner = "OpenChemistry";
3131
repo = "avogadroapp";
3232
rev = version;
33-
hash = "sha256-m8kX4WzOmPE/BZQRePOoUAdMPdWb6pmcqtPvDdEIIao=";
33+
hash = "sha256-NSozi6oElNTIFTdRW32ZcNm8Ae311xk6kN1wtrEqjaU=";
3434
};
3535

3636
postUnpack = ''

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ let
4949
in
5050
stdenv.mkDerivation rec {
5151
pname = "avogadrolibs";
52-
version = "1.99.0";
52+
version = "1.100.0";
5353

5454
src = fetchFromGitHub {
5555
owner = "OpenChemistry";
5656
repo = pname;
5757
rev = version;
58-
hash = "sha256-3jUbzEd7tUeHlVFAO9KJ+LOQlkLzJQvwmHp8gOriZRI=";
58+
hash = "sha256-zDn5cgMBJYM27mfQHujxhIf4ZTljFxvFrKl7pNa4K9E=";
5959
};
6060

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

67-
patches = [
68-
# Fix a Cmake error when searching the fragments directory.
69-
# Can be removed upon next release
70-
(fetchpatch {
71-
url = "https://github.com/OpenChemistry/avogadrolibs/commit/6e2e84dbb088a40d69117c1836f4306792f57acd.patch";
72-
hash = "sha256-0tY9kHh6e5IDZQ8cWPgTpwIBhfZQlgUEZbPHOmtOVUQ=";
73-
})
74-
];
75-
7667
nativeBuildInputs = [
7768
cmake
7869
wrapQtAppsHook

0 commit comments

Comments
 (0)