about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-23 13:49:12 +0000
committerAlyssa Ross <hi@alyssa.is>2021-04-23 13:49:12 +0000
commit4f4d95bbc2f76f9118c31aa45e2c7030c1b37538 (patch)
tree20ba164294ae24fff93e13b9af999979dbc7fe96 /pkgs/applications/science
parentca65d6f7d263021b4ec6795958b1150b128d1c7c (diff)
parent638936f65785aaebfb96990604b984d0eb0bfedd (diff)
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pyvex/default.nix
	pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/logic/potassco/clingo.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix
index f473c4f5366e4..091b098fa3f24 100644
--- a/pkgs/applications/science/logic/potassco/clingo.nix
+++ b/pkgs/applications/science/logic/potassco/clingo.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clingo";
-  version = "5.4.1";
+  version = "5.5.0";
 
   src = fetchzip {
     url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz";
-    sha256 = "1f0q5f71s696ywxcjlfz7z134m1h7i39j9sfdv8hlw2w3g5nppc3";
+    sha256 = "sha256-6xKtNi5IprjaFNadfk8kKjKzuPRanUjycLWCytnk0mU=";
   };
 
   nativeBuildInputs = [ cmake ];