about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-06-07 09:25:12 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-06-07 09:25:12 +0200
commit6b8223e634b1326f448b870351ae53a0607aa043 (patch)
treecc1754cc8e195a5b84bdadf0d01db22f73da25af /pkgs/applications/science
parent43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff)
parent1c3e3e081c22ba4dbf8f1b8cb31a55830596b838 (diff)
downloadnixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.gz
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.bz2
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.lz
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.xz
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.tar.zst
nixlib-6b8223e634b1326f448b870351ae53a0607aa043.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/chemistry/molden/default.nix4
-rw-r--r--pkgs/applications/science/logic/lean/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 5e5df85a5279..0d7e81cd9dab 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, which, gfortran, libGLU, xorg } :
 
 stdenv.mkDerivation rec {
-  version = "6.2";
+  version = "6.3";
   pname = "molden";
 
   src = fetchurl {
     url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
-    sha256 = "01m5p7v5pz1fi77var50sp1bzlvdckwr6kn4wanvic2jmvgp9q5n";
+    sha256 = "02qi16pz2wffn3cc47dpjqhfafzwfmb79waw4nnhfyir8a4h3cq1";
   };
 
   nativeBuildInputs = [ which ];
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 2f5943dfa9b5..451aab6c049a 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.14.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "1dlzap3j26rh93ick1lqb7g3jkqjpd33gl4gqfcbx22v62258y5b";
+    sha256 = "0fl8v8n53fr5qdnabici1mj3zpmjrkssx970y3q4m48s68q665v6";
   };
 
   nativeBuildInputs = [ cmake ];