From b173e855fa73cafec99c3c0273035d991827625f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jun 2021 18:54:48 +0000
Subject: [PATCH 1/2] kalk: 0.5.4 -> 1.0.0

---
 pkgs/tools/misc/kalk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalk/default.nix
index 64fabd805a6d..44b3e3b14a3f 100644
--- a/pkgs/tools/misc/kalk/default.nix
+++ b/pkgs/tools/misc/kalk/default.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kalk";
-  version = "0.5.4";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "PaddiM8";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-lHHnNiNy8L8GdjOj5EqtticnksPrCwhFoFatFrWEQJ4=";
+    sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg=";
   };
 
-  cargoSha256 = "sha256-Qtip9CeurTM4aY67F5tSM3fis6W/dlnaIVMQ29UoBzc=";
+  cargoSha256 = "sha256-qHXlhKeuDpebpbbGr34Uvwyg//HdCL0UoTqRf9vEfmE=";
 
   nativeBuildInputs = [ m4 ];
 

From 3f297bfcbb2078ae32491bea2db2dfa38c5a8ac5 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Thu, 3 Jun 2021 12:29:19 -0700
Subject: [PATCH 2/2] kalk -> kalker

---
 pkgs/tools/misc/{kalk => kalker}/default.nix | 8 ++++----
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename pkgs/tools/misc/{kalk => kalker}/default.nix (77%)

diff --git a/pkgs/tools/misc/kalk/default.nix b/pkgs/tools/misc/kalker/default.nix
similarity index 77%
rename from pkgs/tools/misc/kalk/default.nix
rename to pkgs/tools/misc/kalker/default.nix
index 44b3e3b14a3f..503edb910f0c 100644
--- a/pkgs/tools/misc/kalk/default.nix
+++ b/pkgs/tools/misc/kalker/default.nix
@@ -4,7 +4,7 @@
 , rustPlatform
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "kalk";
+  pname = "kalker";
   version = "1.0.0";
 
   src = fetchFromGitHub {
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg=";
   };
 
-  cargoSha256 = "sha256-qHXlhKeuDpebpbbGr34Uvwyg//HdCL0UoTqRf9vEfmE=";
+  cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58=";
 
   nativeBuildInputs = [ m4 ];
 
@@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    homepage = "https://kalk.strct.net";
-    changelog = "https://github.com/PaddiM8/kalk/releases/tag/v${version}";
+    homepage = "https://kalker.strct.net";
+    changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}";
     description = "A command line calculator";
     longDescription = ''
       A command line calculator that supports math-like syntax with user-defined
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba631bb45ec5..351e3025dede 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -340,6 +340,7 @@ mapAliases ({
   jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
+  kalk = kalker; # added 2021-06-03
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
   kodiGBM = kodi-gbm;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e35b0a197ab..66152153fc76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2845,7 +2845,7 @@ in
 
   kaldi = callPackage ../tools/audio/kaldi { };
 
-  kalk = callPackage ../tools/misc/kalk { };
+  kalker = callPackage ../tools/misc/kalker { };
 
   kisslicer = callPackage ../tools/misc/kisslicer { };