about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-06-16 23:08:45 +0200
committerGitHub <noreply@github.com>2020-06-16 23:08:45 +0200
commit75e756b8e121e8b26557a5c6b00e4e9bcc051fd2 (patch)
tree9087e5625dfc6b2db1dee1b619a129d2cd70812c /pkgs/top-level
parent1419b35e77b8dc27e60b050330a6b62836a71f3e (diff)
parent9c95e8150ab98e6ea68304c0f9cbdcfe04020890 (diff)
downloadnixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar.gz
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar.bz2
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar.lz
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar.xz
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.tar.zst
nixlib-75e756b8e121e8b26557a5c6b00e4e9bcc051fd2.zip
Merge pull request #90051 from fabianhauser/hamster-time-tracker
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e502fab10d7c..64392f49a52e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -201,7 +201,6 @@ mapAliases ({
   gupnp_igd = gupnp-igd; # added 2018-02-25
   gupnptools = gupnp-tools;  # added 2015-12-19
   gutenberg = zola;  # added 2018-11-17
-  hamster-time-traker = throw "hamster-time-tracker has been removed from nixpkgs, as it was unmaintained."; # added 2019-12-10
   heimdalFull = heimdal; # added 2018-05-01
   hepmc = hepmc2; # added 2019-08-05
   hexen = throw "hexen (SDL port) has been removed: Abandoned by upstream."; # added 2019-12-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00d902ca1473..05c9669b677d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20087,6 +20087,8 @@ in
 
   hakuneko = callPackage ../tools/misc/hakuneko { };
 
+  hamster = callPackage ../applications/misc/hamster { };
+
   hashit = callPackage ../tools/misc/hashit { };
 
   hactool = callPackage ../tools/compression/hactool { };