diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 12:01:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-04 12:01:06 +0000 |
commit | a6fdcf8d5293f99ed9484354b3eed7320744a62c (patch) | |
tree | 03e1d45961bc4d1c24645c20b10027355e21f67f /pkgs/applications/science | |
parent | 89ee82a6e9e46e3394e6e87e30f9fd46b0b7947e (diff) | |
parent | 4849dec4e93a9ee51d285b760a6fda4272e78483 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/elan/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/math/qalculate-gtk/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d20be86daf0b3..a49262e7cb65c 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk="; + sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; }; - cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4="; + cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 56b6df94e8fb1..7807ae613e8c1 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-hE0di7B6dCnMmMBLgFkb6vPS4hS/7zD6BbviIucrn1I="; + sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"; }; hardeningDisable = [ "format" ]; |