Merge branch 'release-1.7.2'

mujx · mujx · commit 6bc7d95f3fa3 · 2022-09-19T21:05:19.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.2] - 2022-09-17
+
+### Bug fixes
+
+- Convert projects with empty name to 'Unknown project' (#62)
+
 ## [1.7.1] - 2022-04-10
 
 ### Bug fixes
diff --git a/README.md b/README.md
@@ -55,15 +55,15 @@ You can use the following docker-compose setup for testing locally or an actual
 deployment. Change `HAKA_BADGE_URL` to match the actual external endpoint of your
 instance.
 
-Deploying on ARM is also possible using the `mujx/hakatime:latest-arm` or `mujx/hakatime:v1.7.1-arm` image or the dedicated
+Deploying on ARM is also possible using the `mujx/hakatime:latest-arm` or `mujx/hakatime:v1.7.2-arm` image or the dedicated
 Dockerfile ([`Dockerfile.arm`](/Dockerfile.arm)) to build the image.
 
 ```yaml
 version: "3"
 services:
   server:
     container_name: hakatime
-    image: mujx/hakatime:v1.7.1
+    image: mujx/hakatime:v1.7.2
     environment:
       # DB settings.
       HAKA_DB_HOST: haka_db
@@ -147,7 +147,7 @@ npm run prod
 ## CLI options
 
 ```
-hakatime :: v1.7.1
+hakatime :: v1.7.2
 
 Usage: hakatime COMMAND
   Wakatime server implementation
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dashboard",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Dashboard for Hakatime",
   "author": "Konstantinos Sideris <siderisk@auth.gr>",
   "license": "UNLICENSE",
diff --git a/default.nix b/default.nix
@@ -2,16 +2,16 @@
 , case-insensitive, containers, contravariant-extras, cookie
 , cryptonite, fakedata, file-embed, hasql, hasql-pool, hasql-queue
 , hasql-transaction, http-client, http-client-tls, http-media
-, http-types, katip, lib, modern-uri, mr-env, optparse-applicative
+, http-types, katip, modern-uri, mr-env, optparse-applicative
 , postgresql-binary, postgresql-simple, postgresql-simple-migration
 , random, raw-strings-qq, relude, req, safe-exceptions, servant
-, servant-client, servant-server, system-filepath, text, time, unix
-, uuid, uuid-types, vector, wai, wai-cors, wai-extra, wai-logger
-, warp
+, servant-client, servant-server, stdenv, system-filepath, text
+, time, unix, uuid, uuid-types, vector, wai, wai-cors, wai-extra
+, wai-logger, warp
 }:
 mkDerivation {
   pname = "hakatime";
-  version = "1.7.1";
+  version = "1.7.2";
   src = ./.;
   isLibrary = true;
   isExecutable = true;
@@ -34,5 +34,5 @@ mkDerivation {
   doHaddock = false;
   doCheck = false;
   description = "Wakatime API server implementation / Dashboard UI";
-  license = lib.licenses.unlicense;
+  license = stdenv.lib.licenses.unlicense;
 }
diff --git a/hakatime.cabal b/hakatime.cabal
@@ -1,6 +1,6 @@
 cabal-version:       3.0
 name:                hakatime
-version:             1.7.1
+version:             1.7.2
 synopsis:            Wakatime API server implementation / Dashboard UI
 description:         Wakatime compatible server with an analytics dashboard.
 license:             Unlicense

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dashboard",`
`3`		`- "version": "1.7.1",`
	`3`	`+ "version": "1.7.2",`
`4`	`4`	`"description": "Dashboard for Hakatime",`
`5`	`5`	`"author": "Konstantinos Sideris <[email protected]>",`
`6`	`6`	`"license": "UNLICENSE",`