Merge master into staging-next

2021-03-14 06:17:28 +00:00
parent c596c93079 29bf7e2b89
commit 3b97019142
36 changed files with 407 additions and 100 deletions
@@ -3,14 +3,14 @@

 stdenv.mkDerivation rec {
  pname = "calc";
-  version = "2.12.8.2";
+  version = "2.12.9.0";

  src = fetchurl {
    urls = [
      "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
      "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
    ];
-    sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8=";
+    sha256 = "sha256-334WUhPG30U72hwzpHAZRNdmr/uBleOvEhu3rW9d5dM=";
  };

  postPatch = ''