8 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
index e4dd9b0f2dc7c..3d43862cbe0eb 100644
--- a/pkgs/servers/web-apps/morty/default.nix
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchgit }:
 
 buildGoPackage rec {
-  name = "morty-${version}";
+  pname = "morty";
   version = "0.2.0";
 
   goPackagePath = "github.com/asciimoo/morty";
diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
index c4f49b36bf808..ef2b3b653bf16 100644
--- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
+++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, lib } : 
 
 stdenv.mkDerivation rec {
-  name = "pgpkeyserver-lite-${version}";
+  pname = "pgpkeyserver-lite";
   version = "2017-07-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix
index 946606e37013f..5c105e85a8729 100644
--- a/pkgs/servers/web-apps/restya-board/default.nix
+++ b/pkgs/servers/web-apps/restya-board/default.nix
@@ -15,7 +15,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "rstya-board-${version}";
+  pname = "rstya-board";
   version = "0.6";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 615efa3b36720..f6000fc421177 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "selfoss-${version}";
+  pname = "selfoss";
   version = "2.18";
 
   src = fetchurl {
-    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip";
+    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip";
     sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
   };
 
diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix
index 64ae1dbbe1d5e..33db6fb6e6561 100644
--- a/pkgs/servers/web-apps/shaarli/default.nix
+++ b/pkgs/servers/web-apps/shaarli/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-${version}";
+  pname = "shaarli";
   version = "0.11.0";
 
   src = fetchurl {
diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix
index 5fd941e9467ce..ef0a4331d41dd 100644
--- a/pkgs/servers/web-apps/shaarli/material-theme.nix
+++ b/pkgs/servers/web-apps/shaarli/material-theme.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "shaarli-material-${version}";
+  pname = "shaarli-material";
   version = "0.10.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix
index 0c51b6b13cddb..4be14b37bd2bd 100644
--- a/pkgs/servers/web-apps/virtlyst/default.nix
+++ b/pkgs/servers/web-apps/virtlyst/default.nix
@@ -2,7 +2,7 @@
 , qtbase, libvirt, cutelyst, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "virtlyst-${version}";
+  pname = "virtlyst";
   version = "1.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index eafe916d02cad..a105531ff4e6b 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wallabag-${version}";
+  pname = "wallabag";
   version = "2.3.8";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur