diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-07 21:31:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-07 21:31:17 +0100 |
commit | d53dfa2dbdf9c26b754e2d98f333499a180405b3 (patch) | |
tree | 191548214817b3e36846386e201ffb7e73126f26 /pkgs/applications/office | |
parent | fbdf78236a346f57f716fb66ed62e1993260c9e5 (diff) | |
parent | b52ab3b712cc44b5eb88557ad2ca206dcd10af20 (diff) |
Merge pull request #144983 from Stunkymonkey/application-pname-version-2
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/keepnote/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/office/tagainijisho/default.nix | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 14f48da22309e..1ff88d49d2b7b 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,11 +1,12 @@ { lib, fetchurl, python2Packages }: -python2Packages.buildPythonApplication { - name = "keepnote-0.7.8"; +python2Packages.buildPythonApplication rec { + pname = "keepnote"; + version = "0.7.8"; namePrefix = ""; src = fetchurl { - url = "http://keepnote.org/download/keepnote-0.7.8.tar.gz"; + url = "http://keepnote.org/download/keepnote-${version}.tar.gz"; sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 18126b5e2b762..7869b54a5f047 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl, qt4, cmake, sqlite }: -stdenv.mkDerivation { - name = "tagainijisho-1.0.3"; +stdenv.mkDerivation rec { + pname = "tagainijisho"; + version = "1.0.3"; + src = fetchurl { - url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; + url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -14,8 +16,10 @@ stdenv.mkDerivation { description = "A free, open-source Japanese dictionary and kanji lookup tool"; homepage = "https://www.tagaini.net/"; license = with licenses; [ - /* program */ gpl3Plus - /* data */ cc-by-sa-30 + /* program */ + gpl3Plus + /* data */ + cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; |