diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-01 18:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 18:01:04 +0000 |
| commit | 9d5de3eca1530584115286673d3adc9ae5ddf448 (patch) | |
| tree | 8b770f2fef7711b305749215edc0e4f7c029a9bd /pkgs/applications/science | |
| parent | 26416f52eb9439d7f7579ebf7eb18c0a9de34c3c (diff) | |
| parent | 9e2a8a2f4a93a27e005dafe0dd6ed9524cc03d2b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/chemistry/jmol/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/hol/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c645693e19a10..92606f3f909ce 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.41"; + version = "14.31.42"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY="; + sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 569c455e6532c..8427249c4ce95 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mudri ]; }; } |