Browse Source

treewide: name -> pname

alephone
volth 2 years ago
parent
commit
c814d72b51
100 changed files with 216 additions and 114 deletions
  1. 2
    1
      pkgs/applications/altcoins/aeon/default.nix
  2. 2
    1
      pkgs/applications/audio/abcde/default.nix
  3. 2
    1
      pkgs/applications/audio/caudec/default.nix
  4. 4
    2
      pkgs/applications/audio/clementine/default.nix
  5. 3
    2
      pkgs/applications/audio/ekho/default.nix
  6. 2
    1
      pkgs/applications/audio/faust/faust1.nix
  7. 2
    1
      pkgs/applications/audio/faust/faust2.nix
  8. 2
    1
      pkgs/applications/audio/google-play-music-desktop-player/default.nix
  9. 2
    1
      pkgs/applications/audio/gradio/default.nix
  10. 2
    1
      pkgs/applications/audio/midisheetmusic/default.nix
  11. 3
    2
      pkgs/applications/audio/mpc123/default.nix
  12. 2
    1
      pkgs/applications/audio/openmpt123/default.nix
  13. 2
    1
      pkgs/applications/audio/pmidi/default.nix
  14. 2
    1
      pkgs/applications/audio/rhvoice/default.nix
  15. 2
    1
      pkgs/applications/audio/sayonara/default.nix
  16. 2
    1
      pkgs/applications/audio/spotify/default.nix
  17. 2
    1
      pkgs/applications/audio/tree-from-tags/default.nix
  18. 2
    1
      pkgs/applications/audio/uade123/default.nix
  19. 3
    2
      pkgs/applications/audio/vmpk/default.nix
  20. 3
    2
      pkgs/applications/display-managers/lightdm/gtk-greeter.nix
  21. 2
    1
      pkgs/applications/display-managers/sddm/default.nix
  22. 2
    1
      pkgs/applications/editors/emacs-modes/d/default.nix
  23. 2
    1
      pkgs/applications/editors/emacs-modes/haskell/default.nix
  24. 2
    1
      pkgs/applications/editors/emacs-modes/hsc3/default.nix
  25. 2
    1
      pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix
  26. 2
    1
      pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
  27. 2
    1
      pkgs/applications/editors/emacs-modes/ocaml/default.nix
  28. 2
    1
      pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix
  29. 2
    1
      pkgs/applications/editors/emacs-modes/rudel/default.nix
  30. 2
    1
      pkgs/applications/editors/emacs-modes/s/default.nix
  31. 2
    1
      pkgs/applications/editors/emacs-modes/tuareg/default.nix
  32. 2
    1
      pkgs/applications/editors/emacs-modes/writegood/default.nix
  33. 3
    2
      pkgs/applications/editors/geany/default.nix
  34. 2
    1
      pkgs/applications/editors/jedit/default.nix
  35. 2
    1
      pkgs/applications/editors/kodestudio/default.nix
  36. 2
    1
      pkgs/applications/editors/netbeans/default.nix
  37. 3
    2
      pkgs/applications/editors/rstudio/default.nix
  38. 2
    1
      pkgs/applications/editors/standardnotes/default.nix
  39. 2
    1
      pkgs/applications/editors/texmacs/darwin.nix
  40. 2
    1
      pkgs/applications/graphics/awesomebump/default.nix
  41. 2
    1
      pkgs/applications/graphics/draftsight/default.nix
  42. 2
    1
      pkgs/applications/graphics/fig2dev/default.nix
  43. 2
    1
      pkgs/applications/graphics/gcolor2/default.nix
  44. 2
    1
      pkgs/applications/graphics/gcolor3/default.nix
  45. 2
    1
      pkgs/applications/graphics/guetzli/default.nix
  46. 4
    2
      pkgs/applications/graphics/synfigstudio/default.nix
  47. 2
    1
      pkgs/applications/graphics/unigine-valley/default.nix
  48. 2
    1
      pkgs/applications/graphics/xfig/default.nix
  49. 2
    1
      pkgs/applications/misc/asciiquarium/default.nix
  50. 2
    1
      pkgs/applications/misc/bashSnippets/default.nix
  51. 2
    1
      pkgs/applications/misc/bitcoinarmory/default.nix
  52. 2
    1
      pkgs/applications/misc/cardpeek/default.nix
  53. 2
    1
      pkgs/applications/misc/confclerk/default.nix
  54. 2
    1
      pkgs/applications/misc/cura/stable.nix
  55. 2
    1
      pkgs/applications/misc/curaengine/stable.nix
  56. 2
    1
      pkgs/applications/misc/dfilemanager/default.nix
  57. 2
    1
      pkgs/applications/misc/fetchmail/default.nix
  58. 3
    2
      pkgs/applications/misc/gmrun/default.nix
  59. 2
    1
      pkgs/applications/misc/gmtp/default.nix
  60. 2
    1
      pkgs/applications/misc/googleearth/default.nix
  61. 2
    1
      pkgs/applications/misc/gpg-mdp/default.nix
  62. 2
    1
      pkgs/applications/misc/hubstaff/default.nix
  63. 2
    1
      pkgs/applications/misc/keepass-plugins/keeagent/default.nix
  64. 2
    1
      pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
  65. 2
    1
      pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
  66. 3
    2
      pkgs/applications/misc/krusader/default.nix
  67. 2
    1
      pkgs/applications/misc/lxterminal/default.nix
  68. 2
    1
      pkgs/applications/misc/masterpdfeditor/default.nix
  69. 2
    1
      pkgs/applications/misc/nrsc5/default.nix
  70. 2
    1
      pkgs/applications/misc/opentx/default.nix
  71. 2
    1
      pkgs/applications/misc/playonlinux/default.nix
  72. 2
    1
      pkgs/applications/misc/qdirstat/default.nix
  73. 2
    1
      pkgs/applications/misc/qtbitcointrader/default.nix
  74. 2
    1
      pkgs/applications/misc/redshift-plasma-applet/default.nix
  75. 3
    2
      pkgs/applications/misc/roxterm/default.nix
  76. 4
    2
      pkgs/applications/misc/subsurface/default.nix
  77. 3
    2
      pkgs/applications/misc/synapse/default.nix
  78. 2
    1
      pkgs/applications/misc/teseq/default.nix
  79. 2
    1
      pkgs/applications/misc/tomboy/default.nix
  80. 2
    1
      pkgs/applications/networking/browsers/otter/default.nix
  81. 2
    1
      pkgs/applications/networking/cluster/hadoop/default.nix
  82. 2
    1
      pkgs/applications/networking/cluster/kops/default.nix
  83. 2
    1
      pkgs/applications/networking/cluster/kubecfg/default.nix
  84. 4
    3
      pkgs/applications/networking/cluster/spark/default.nix
  85. 2
    1
      pkgs/applications/networking/dropbox/cli.nix
  86. 2
    1
      pkgs/applications/networking/instant-messengers/franz/default.nix
  87. 2
    1
      pkgs/applications/networking/instant-messengers/hipchat/default.nix
  88. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
  89. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
  90. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix
  91. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
  92. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
  93. 2
    1
      pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
  94. 2
    1
      pkgs/applications/networking/instant-messengers/qtox/default.nix
  95. 2
    1
      pkgs/applications/networking/instant-messengers/quaternion/default.nix
  96. 2
    1
      pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
  97. 2
    1
      pkgs/applications/networking/instant-messengers/slack/default.nix
  98. 2
    1
      pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
  99. 2
    1
      pkgs/applications/networking/instant-messengers/wavebox/default.nix
  100. 0
    0
      pkgs/applications/networking/instant-messengers/zoom-us/default.nix

+ 2
- 1
pkgs/applications/altcoins/aeon/default.nix View File

@@ -7,7 +7,8 @@ let
7 7
   version = "0.12.9.0";
8 8
 in
9 9
 stdenv.mkDerivation {
10
-  name = "aeon-${version}";
10
+  pname = "aeon";
11
+  inherit version;
11 12
 
12 13
   src = fetchFromGitHub {
13 14
     owner = "aeonix";

+ 2
- 1
pkgs/applications/audio/abcde/default.nix View File

@@ -6,7 +6,8 @@
6 6
 let version = "2.9.3";
7 7
 in
8 8
   stdenv.mkDerivation {
9
-    name = "abcde-${version}";
9
+    pname = "abcde";
10
+    inherit version;
10 11
     src = fetchurl {
11 12
       url = "https://abcde.einval.com/download/abcde-${version}.tar.gz";
12 13
       sha256 = "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04";

+ 2
- 1
pkgs/applications/audio/caudec/default.nix View File

@@ -5,7 +5,8 @@ let
5 5
 in
6 6
 
7 7
 stdenv.mkDerivation rec {
8
-  name = "caudec-${version}";
8
+  pname = "caudec";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11 12
     url = "http://caudec.net/downloads/caudec-${version}.tar.gz";

+ 4
- 2
pkgs/applications/audio/clementine/default.nix View File

@@ -67,7 +67,8 @@ let
67 67
   '';
68 68
 
69 69
   free = stdenv.mkDerivation {
70
-    name = "clementine-free-${version}";
70
+    pname = "clementine-free";
71
+    inherit version;
71 72
     inherit src patches nativeBuildInputs postPatch;
72 73
 
73 74
     # gst_plugins needed for setup-hooks
@@ -95,7 +96,8 @@ let
95 96
 
96 97
   # Unfree Spotify blob for Clementine
97 98
   unfree = stdenv.mkDerivation {
98
-    name = "clementine-blob-${version}";
99
+    pname = "clementine-blob";
100
+    inherit version;
99 101
     # Use the same patches and sources as Clementine
100 102
     inherit src nativeBuildInputs postPatch;
101 103
 

+ 3
- 2
pkgs/applications/audio/ekho/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let
6 6
   version = "5.8.2";
7 7
 in stdenv.mkDerivation rec {
8
-  name = "ekho-${version}";
8
+  pname = "ekho";
9
+  inherit version;
9 10
 
10 11
   meta = with stdenv.lib; {
11 12
     description = "Chinese text-to-speech software";
@@ -23,7 +24,7 @@ in stdenv.mkDerivation rec {
23 24
   };
24 25
 
25 26
   src = fetchurl {
26
-    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${name}.tar.xz";
27
+    url = "mirror://sourceforge/e-guidedog/Ekho/${version}/${pname}-${version}.tar.xz";
27 28
     sha256 = "0ym6lpcpsvwvsiwlzkl1509a2hljwcw7synngrmqjq1n49ww00nj";
28 29
   };
29 30
 

+ 2
- 1
pkgs/applications/audio/faust/faust1.nix View File

@@ -25,7 +25,8 @@ let
25 25
   };
26 26
 
27 27
   faust = stdenv.mkDerivation {
28
-    name = "faust-${version}";
28
+    pname = "faust";
29
+    inherit version;
29 30
 
30 31
     inherit src;
31 32
 

+ 2
- 1
pkgs/applications/audio/faust/faust2.nix View File

@@ -35,7 +35,8 @@ let
35 35
 
36 36
   faust = stdenv.mkDerivation {
37 37
 
38
-    name = "faust-${version}";
38
+    pname = "faust";
39
+    inherit version;
39 40
 
40 41
     inherit src;
41 42
 

+ 2
- 1
pkgs/applications/audio/google-play-music-desktop-player/default.nix View File

@@ -43,7 +43,8 @@ let
43 43
 in
44 44
 
45 45
 stdenv.mkDerivation {
46
-  name = "google-play-music-desktop-player-${version}";
46
+  pname = "google-play-music-desktop-player";
47
+  inherit version;
47 48
 
48 49
   src = fetchurl {
49 50
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";

+ 2
- 1
pkgs/applications/audio/gradio/default.nix View File

@@ -19,7 +19,8 @@ let
19 19
   version = "7.2";
20 20
 
21 21
 in stdenv.mkDerivation rec {
22
-  name = "gradio-${version}";
22
+  pname = "gradio";
23
+  inherit version;
23 24
 
24 25
   src = fetchFromGitHub {
25 26
     owner = "haecker-felix";

+ 2
- 1
pkgs/applications/audio/midisheetmusic/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let
6 6
   version = "2.6";
7 7
 in stdenv.mkDerivation {
8
-  name = "midisheetmusic-${version}";
8
+  pname = "midisheetmusic";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11 12
     url = "mirror://sourceforge/midisheetmusic/MidiSheetMusic-${version}-linux-src.tar.gz";

+ 3
- 2
pkgs/applications/audio/mpc123/default.nix View File

@@ -2,10 +2,11 @@
2 2
 
3 3
 let version = "0.2.4"; in
4 4
 stdenv.mkDerivation rec {
5
-  name = "mpc123-${version}";
5
+  pname = "mpc123";
6
+  inherit version;
6 7
 
7 8
   src = fetchurl {
8
-    url = "mirror://sourceforge/mpc123/version%20${version}/${name}.tar.gz";
9
+    url = "mirror://sourceforge/mpc123/version%20${version}/${pname}-${version}.tar.gz";
9 10
     sha256 = "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1";
10 11
   };
11 12
 

+ 2
- 1
pkgs/applications/audio/openmpt123/default.nix View File

@@ -4,7 +4,8 @@
4 4
 let
5 5
   version = "0.4.1";
6 6
 in stdenv.mkDerivation rec {
7
-  name = "openmpt123-${version}";
7
+  pname = "openmpt123";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";

+ 2
- 1
pkgs/applications/audio/pmidi/default.nix View File

@@ -3,7 +3,8 @@
3 3
 , sourceSha256 ? "051mv6f13c8y13c1iv3279k1hhzpz4fm9sfczhgp9sim2bjdj055"
4 4
 }:
5 5
 stdenv.mkDerivation {
6
-  name = "pmidi-${version}";
6
+  pname = "pmidi";
7
+  inherit version;
7 8
 
8 9
   src = fetchurl {
9 10
     url = "mirror://sourceforge/pmidi/${version}/pmidi-${version}.tar.gz";

+ 2
- 1
pkgs/applications/audio/rhvoice/default.nix View File

@@ -4,7 +4,8 @@
4 4
 let
5 5
   version = "unstable-2018-02-10";
6 6
 in stdenv.mkDerivation rec {
7
-  name = "rhvoice-${version}";
7
+  pname = "rhvoice";
8
+  inherit version;
8 9
 
9 10
   src = fetchFromGitHub {
10 11
     owner = "Olga-Yakovleva";

+ 2
- 1
pkgs/applications/audio/sayonara/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "1.1.1-git1-20180828";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "sayonara-player-${version}";
7
+  pname = "sayonara-player";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "https://sayonara-player.com/sw/sayonara-player-${version}.tar.gz";

+ 2
- 1
pkgs/applications/audio/spotify/default.nix View File

@@ -60,7 +60,8 @@ let
60 60
 in
61 61
 
62 62
 stdenv.mkDerivation {
63
-  name = "spotify-${version}";
63
+  pname = "spotify";
64
+  inherit version;
64 65
 
65 66
   # fetch from snapcraft instead of the debian repository most repos fetch from.
66 67
   # That is a bit more cumbersome. But the debian repository only keeps the last

+ 2
- 1
pkgs/applications/audio/tree-from-tags/default.nix View File

@@ -7,7 +7,8 @@ let
7 7
     gemdir  = ./.;
8 8
   };
9 9
 in stdenv.mkDerivation {
10
-  name = "tree-from-tags-${version}";
10
+  pname = "tree-from-tags";
11
+  inherit version;
11 12
   src = fetchFromGitHub {
12 13
     owner  = "dbrock";
13 14
     repo   = "bongo";

+ 2
- 1
pkgs/applications/audio/uade123/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let
4 4
   version = "2.13";
5 5
 in stdenv.mkDerivation rec {
6
-  name = "uade123-${version}";
6
+  pname = "uade123";
7
+  inherit version;
7 8
   src = fetchurl {
8 9
     url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
9 10
     sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";

+ 3
- 2
pkgs/applications/audio/vmpk/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let
6 6
   version = "0.5.1";
7 7
 in stdenv.mkDerivation rec {
8
-  name = "vmpk-${version}";
8
+  pname = "vmpk";
9
+  inherit version;
9 10
 
10 11
   meta = with stdenv.lib; {
11 12
     description = "Virtual MIDI Piano Keyboard";
@@ -15,7 +16,7 @@ in stdenv.mkDerivation rec {
15 16
   };
16 17
 
17 18
   src = fetchurl {
18
-    url = "mirror://sourceforge/vmpk/${version}/${name}.tar.bz2";
19
+    url = "mirror://sourceforge/vmpk/${version}/${pname}-${version}.tar.bz2";
19 20
     sha256 = "11fqnxgs9hr9255d93n7lazxzjwn8jpmn23nywdksh0pb1ffvfrc";
20 21
   };
21 22
 

+ 3
- 2
pkgs/applications/display-managers/lightdm/gtk-greeter.nix View File

@@ -12,10 +12,11 @@ let
12 12
   version = "2.0.6";
13 13
 in
14 14
 stdenv.mkDerivation rec {
15
-  name = "lightdm-gtk-greeter-${version}";
15
+  pname = "lightdm-gtk-greeter";
16
+  inherit version;
16 17
 
17 18
   src = fetchurl {
18
-    url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.gz";
19
+    url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
19 20
     sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
20 21
   };
21 22
 

+ 2
- 1
pkgs/applications/display-managers/sddm/default.nix View File

@@ -7,7 +7,8 @@ let
7 7
   version = "0.18.1";
8 8
 
9 9
 in mkDerivation rec {
10
-  name = "sddm-${version}";
10
+  pname = "sddm";
11
+  inherit version;
11 12
 
12 13
   src = fetchFromGitHub {
13 14
     owner = "sddm";

+ 2
- 1
pkgs/applications/editors/emacs-modes/d/default.nix View File

@@ -4,7 +4,8 @@
4 4
 let version = "20150111";
5 5
 
6 6
 in stdenv.mkDerivation {
7
-  name = "emacs-d-${version}";
7
+  pname = "emacs-d";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/53efec4d83c7cee8227597f010fe7fc400ff05f1.tar.gz";

+ 2
- 1
pkgs/applications/editors/emacs-modes/haskell/default.nix View File

@@ -6,7 +6,8 @@ let
6 6
   version = "13.14-169-g0d3569d";      # git describe --tags
7 7
 in
8 8
 stdenv.mkDerivation {
9
-  name = "haskell-mode-${version}";
9
+  pname = "haskell-mode";
10
+  inherit version;
10 11
 
11 12
   src = fetchFromGitHub {
12 13
     owner = "haskell";

+ 2
- 1
pkgs/applications/editors/emacs-modes/hsc3/default.nix View File

@@ -6,7 +6,8 @@
6 6
 let version = "0.15";
7 7
 
8 8
 in stdenv.mkDerivation {
9
-  name = "hsc3-mode-${version}";
9
+  pname = "hsc3-mode";
10
+  inherit version;
10 11
   src = fetchurl {
11 12
     url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz;
12 13
     sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6";

+ 2
- 1
pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "3.6-4-gb659bf8";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "ido-ubiquitous-${version}";
7
+  pname = "ido-ubiquitous";
8
+  inherit version;
8 9
 
9 10
   src = fetchFromGitHub {
10 11
     owner = "DarwinAwardWinner";

+ 2
- 1
pkgs/applications/editors/emacs-modes/markdown-mode/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "2.0-82-gfe30ef7";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "markdown-mode-${version}";
7
+  pname = "markdown-mode";
8
+  inherit version;
8 9
 
9 10
   src = fetchFromGitHub {
10 11
     owner  = "defunkt";

+ 2
- 1
pkgs/applications/editors/emacs-modes/ocaml/default.nix View File

@@ -5,7 +5,8 @@
5 5
 
6 6
 let version = stdenv.lib.removePrefix "ocaml-" ocaml.name;
7 7
 in stdenv.mkDerivation {
8
-  name = "ocaml-mode-${version}";
8
+  pname = "ocaml-mode";
9
+  inherit version;
9 10
   inherit (ocaml) prefixKey src;
10 11
 
11 12
   # a quick configure to get the Makefile generated. Since

+ 2
- 1
pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "1.3.13";
4 4
 
5 5
 in stdenv.mkDerivation {
6
-  name = "emacs-rainbow-delimiters-${version}";
6
+  pname = "emacs-rainbow-delimiters";
7
+  inherit version;
7 8
 
8 9
   src = fetchurl {
9 10
     url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz";

+ 2
- 1
pkgs/applications/editors/emacs-modes/rudel/default.nix View File

@@ -5,7 +5,8 @@ let
5 5
 in
6 6
 stdenv.mkDerivation
7 7
 {
8
-  name = "rudel-${version}";
8
+  pname = "rudel";
9
+  inherit version;
9 10
   src = fetchurl
10 11
   {
11 12
     url = "mirror://sourceforge/rudel/rudel-${version}.tar.gz";

+ 2
- 1
pkgs/applications/editors/emacs-modes/s/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "1.9.0";
4 4
 
5 5
 in stdenv.mkDerivation {
6
-  name = "emacs-s-${version}";
6
+  pname = "emacs-s";
7
+  inherit version;
7 8
 
8 9
   src = fetchurl {
9 10
     url = "https://github.com/magnars/s.el/archive/${version}.tar.gz";

+ 2
- 1
pkgs/applications/editors/emacs-modes/tuareg/default.nix View File

@@ -6,7 +6,8 @@
6 6
 let version = "2.0.9";
7 7
 
8 8
 in stdenv.mkDerivation {
9
-  name = "tuareg-mode-${version}";
9
+  pname = "tuareg-mode";
10
+  inherit version;
10 11
   src = fetchzip {
11 12
     url = "https://github.com/ocaml/tuareg/releases/download/${version}/tuareg-${version}.tar.gz";
12 13
     sha256 = "13rh5ddwvwwz5jf0n3wagc5m9zq4cbaylnsknzjalryyvipwfyh3";

+ 2
- 1
pkgs/applications/editors/emacs-modes/writegood/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "2.0.2";
4 4
 
5 5
 in stdenv.mkDerivation {
6
-  name = "writegood-mode-${version}";
6
+  pname = "writegood-mode";
7
+  inherit version;
7 8
   src = fetchurl {
8 9
     url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
9 10
     sha256 = "1ilbqj24vzpfh9n1wph7idj0914ga290jkpv9kr1pff3a0v5hf6k";

+ 3
- 2
pkgs/applications/editors/geany/default.nix View File

@@ -7,10 +7,11 @@ let
7 7
 in
8 8
 
9 9
 stdenv.mkDerivation rec {
10
-  name = "geany-${version}";
10
+  pname = "geany";
11
+  inherit version;
11 12
 
12 13
   src = fetchurl {
13
-    url = "https://download.geany.org/${name}.tar.bz2";
14
+    url = "https://download.geany.org/${pname}-${version}.tar.bz2";
14 15
     sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim";
15 16
   };
16 17
 

+ 2
- 1
pkgs/applications/editors/jedit/default.nix View File

@@ -13,7 +13,8 @@ let
13 13
 in
14 14
 
15 15
 stdenv.mkDerivation {
16
-  name = "jedit-${version}";
16
+  pname = "jedit";
17
+  inherit version;
17 18
   src = fetchurl {
18 19
     url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2";
19 20
     sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x";

+ 2
- 1
pkgs/applications/editors/kodestudio/default.nix View File

@@ -21,7 +21,8 @@ let
21 21
 in
22 22
 
23 23
   stdenv.mkDerivation rec {
24
-    name = "kodestudio-${version}";
24
+    pname = "kodestudio";
25
+    inherit version;
25 26
 
26 27
     src = fetchurl {
27 28
         url = urlStr;

+ 2
- 1
pkgs/applications/editors/netbeans/default.nix View File

@@ -15,7 +15,8 @@ let
15 15
   };
16 16
 in
17 17
 stdenv.mkDerivation {
18
-  name = "netbeans-${version}";
18
+  pname = "netbeans";
19
+  inherit version;
19 20
   src = fetchurl {
20 21
     url = "mirror://apache/incubator/netbeans/incubating-netbeans/incubating-${version}/incubating-netbeans-${version}-bin.zip";
21 22
     sha512 = "15mv59njrnq3sjfzb0n7xcc79kpixygf37cxvbswnvm651cw6lb1i9w8wbjivh0z4zcf3f62vbmshxh5pkaxqpqsg0iyy6gddfbwzwx";

+ 3
- 2
pkgs/applications/editors/rstudio/default.nix View File

@@ -13,7 +13,8 @@ let
13 13
   gwtVer = "2.8.1";
14 14
 in
15 15
 stdenv.mkDerivation rec {
16
-  name = "RStudio-${version}";
16
+  pname = "RStudio";
17
+  inherit version;
17 18
 
18 19
   nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
19 20
 
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
98 99
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
99 100
 
100 101
   desktopItem = makeDesktopItem {
101
-    name = name;
102
+    name = "${pname}-${version}";
102 103
     exec = "rstudio %F";
103 104
     icon = "rstudio";
104 105
     desktopName = "RStudio";

+ 2
- 1
pkgs/applications/editors/standardnotes/default.nix View File

@@ -15,7 +15,8 @@ let
15 15
 in
16 16
 
17 17
 stdenv.mkDerivation rec {
18
-  name = "standardnotes-${version}";
18
+  pname = "standardnotes";
19
+  inherit version;
19 20
 
20 21
   src = fetchurl {
21 22
     url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage";

+ 2
- 1
pkgs/applications/editors/texmacs/darwin.nix View File

@@ -15,7 +15,8 @@ let
15 15
   };
16 16
 in
17 17
 stdenv.mkDerivation {
18
-  name = "TeXmacs-${version}";
18
+  pname = "TeXmacs";
19
+  inherit version;
19 20
 
20 21
   src= fetchurl {
21 22
     url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";

+ 2
- 1
pkgs/applications/graphics/awesomebump/default.nix View File

@@ -23,7 +23,8 @@ let
23 23
     '';
24 24
   };
25 25
 in stdenv.mkDerivation rec {
26
-  name = "awesomebump-${version}";
26
+  pname = "awesomebump";
27
+  inherit version;
27 28
 
28 29
   inherit src;
29 30
 

+ 2
- 1
pkgs/applications/graphics/draftsight/default.nix View File

@@ -6,7 +6,8 @@
6 6
 
7 7
 let version = "2018SP2"; in
8 8
 stdenv.mkDerivation {
9
-  name = "draftsight-${version}";
9
+  pname = "draftsight";
10
+  inherit version;
10 11
 
11 12
   nativeBuildInputs = [ dpkg makeWrapper ];
12 13
 

+ 2
- 1
pkgs/applications/graphics/fig2dev/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "3.2.7a";
5 5
 
6 6
 in stdenv.mkDerivation {
7
-  name = "fig2dev-${version}";
7
+  pname = "fig2dev";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";

+ 2
- 1
pkgs/applications/graphics/gcolor2/default.nix View File

@@ -2,7 +2,8 @@
2 2
 
3 3
 let version = "0.4"; in
4 4
 stdenv.mkDerivation {
5
-  name = "gcolor2-${version}";
5
+  pname = "gcolor2";
6
+  inherit version;
6 7
   arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386";
7 8
 
8 9
   src = fetchurl {

+ 2
- 1
pkgs/applications/graphics/gcolor3/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let
4 4
   version = "2.3.1";
5 5
 in stdenv.mkDerivation {
6
-  name = "gcolor3-${version}";
6
+  pname = "gcolor3";
7
+  inherit version;
7 8
 
8 9
   src = fetchFromGitLab {
9 10
     domain = "gitlab.gnome.org";

+ 2
- 1
pkgs/applications/graphics/guetzli/default.nix View File

@@ -3,7 +3,8 @@ let
3 3
   version = "1.0.1";
4 4
 in
5 5
 stdenv.mkDerivation {
6
-  name = "guetzli-${version}";
6
+  pname = "guetzli";
7
+  inherit version;
7 8
   src = fetchFromGitHub {
8 9
     owner = "google";
9 10
     repo = "guetzli";

+ 4
- 2
pkgs/applications/graphics/synfigstudio/default.nix View File

@@ -22,7 +22,8 @@ let
22 22
   };
23 23
 
24 24
   synfig = stdenv.mkDerivation rec {
25
-    name = "synfig-${version}";
25
+    pname = "synfig";
26
+    inherit version;
26 27
 
27 28
     src = fetchFromGitHub {
28 29
        repo   = "synfig";
@@ -47,7 +48,8 @@ let
47 48
   };
48 49
 in
49 50
 stdenv.mkDerivation rec {
50
-  name = "synfigstudio-${version}";
51
+  pname = "synfigstudio";
52
+  inherit version;
51 53
 
52 54
   src = fetchFromGitHub {
53 55
      repo   = "synfig";

+ 2
- 1
pkgs/applications/graphics/unigine-valley/default.nix View File

@@ -27,7 +27,8 @@ let
27 27
 
28 28
 in
29 29
   stdenv.mkDerivation rec {
30
-    name = "unigine-valley-${version}";
30
+    pname = "unigine-valley";
31
+    inherit version;
31 32
 
32 33
     src = fetchurl {
33 34
       url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run";

+ 2
- 1
pkgs/applications/graphics/xfig/default.nix View File

@@ -6,7 +6,8 @@ let
6 6
   version = "3.2.7a";
7 7
 
8 8
 in stdenv.mkDerivation {
9
-  name = "xfig-${version}";
9
+  pname = "xfig";
10
+  inherit version;
10 11
 
11 12
   src = fetchurl {
12 13
     url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";

+ 2
- 1
pkgs/applications/misc/asciiquarium/default.nix View File

@@ -2,7 +2,8 @@
2 2
 
3 3
 let version = "1.1";
4 4
 in stdenv.mkDerivation {
5
-  name = "asciiquarium-${version}";
5
+  pname = "asciiquarium";
6
+  inherit version;
6 7
   src = fetchurl {
7 8
     url = "https://robobunny.com/projects/asciiquarium/asciiquarium_${version}.tar.gz";
8 9
     sha256 = "0qfkr5b7sxzi973nh0h84blz2crvmf28jkkgaj3mxrr56mhwc20v";

+ 2
- 1
pkgs/applications/misc/bashSnippets/default.nix View File

@@ -12,7 +12,8 @@ let
12 12
   ];
13 13
 in
14 14
 stdenv.mkDerivation {
15
-  name = "bashSnippets-${version}";
15
+  pname = "bashSnippets";
16
+  inherit version;
16 17
 
17 18
   src = fetchFromGitHub {
18 19
     owner = "alexanderepstein";

+ 2
- 1
pkgs/applications/misc/bitcoinarmory/default.nix View File

@@ -10,7 +10,8 @@ let
10 10
 
11 11
 in buildPythonApplication {
12 12
 
13
-  name = "bitcoinarmory-${version}";
13
+  pname = "bitcoinarmory";
14
+  inherit version;
14 15
 
15 16
   src = fetchFromGitHub {
16 17
     owner = "goatpig";

+ 2
- 1
pkgs/applications/misc/cardpeek/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "0.8.4";
5 5
 in
6 6
   stdenv.mkDerivation {
7
-    name = "cardpeek-${version}";
7
+    pname = "cardpeek";
8
+    inherit version;
8 9
 
9 10
     src = fetchFromGitHub {
10 11
       owner = "L1L1";

+ 2
- 1
pkgs/applications/misc/confclerk/default.nix View File

@@ -2,7 +2,8 @@
2 2
 
3 3
 let version = "0.6.4"; in
4 4
 stdenv.mkDerivation {
5
-  name = "confclerk-${version}";
5
+  pname = "confclerk";
6
+  inherit version;
6 7
 
7 8
   src = fetchurl {
8 9
     url = "https://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/cura/stable.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "15.04";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "cura-${version}";
7
+  pname = "cura";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "https://github.com/daid/Cura/archive/${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/curaengine/stable.nix View File

@@ -3,7 +3,8 @@ let
3 3
   version = "15.04.6";
4 4
 in
5 5
 stdenv.mkDerivation {
6
-  name = "curaengine-${version}";
6
+  pname = "curaengine";
7
+  inherit version;
7 8
 
8 9
   src = fetchurl {
9 10
     url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/dfilemanager/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "git-2016-01-10";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "dfilemanager-${version}";
7
+  pname = "dfilemanager";
8
+  inherit version;
8 9
   src = fetchgit {
9 10
     url = "git://git.code.sf.net/p/dfilemanager/code";
10 11
     rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";

+ 2
- 1
pkgs/applications/misc/fetchmail/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "6.3.26";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name="fetchmail-${version}";
7
+  pname = "fetchmail";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";

+ 3
- 2
pkgs/applications/misc/gmrun/default.nix View File

@@ -5,10 +5,11 @@ let
5 5
 in
6 6
 
7 7
 stdenv.mkDerivation rec {
8
-  name = "gmrun-${version}";
8
+  pname = "gmrun";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11
-    url = "mirror://sourceforge/gmrun/${name}.tar.gz";
12
+    url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
12 13
     sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
13 14
   };
14 15
 

+ 2
- 1
pkgs/applications/misc/gmtp/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let version = "1.3.11"; in
6 6
 
7 7
 stdenv.mkDerivation {
8
-  name = "gmtp-${version}";
8
+  pname = "gmtp";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11 12
     url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/googleearth/default.nix View File

@@ -40,7 +40,8 @@ let
40 40
   ];
41 41
 in
42 42
 stdenv.mkDerivation rec {
43
-  name = "googleearth-${version}";
43
+  pname = "googleearth";
44
+  inherit version;
44 45
   src = fetchurl {
45 46
     url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
46 47
     inherit sha256;

+ 2
- 1
pkgs/applications/misc/gpg-mdp/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "0.7.4";
4 4
 in stdenv.mkDerivation {
5 5
   # mdp renamed to gpg-mdp because there is a mdp package already.
6
-  name = "gpg-mdp-${version}";
6
+  pname = "gpg-mdp";
7
+  inherit version;
7 8
   meta = {
8 9
     homepage = https://tamentis.com/projects/mdp/;
9 10
     license = [stdenv.lib.licenses.isc];

+ 2
- 1
pkgs/applications/misc/hubstaff/default.nix View File

@@ -17,7 +17,8 @@ let
17 17
 in
18 18
 
19 19
 stdenv.mkDerivation {
20
-  name = "hubstaff-${version}";
20
+  pname = "hubstaff";
21
+  inherit version;
21 22
 
22 23
   src = fetchurl { inherit sha256 url; };
23 24
 

+ 2
- 1
pkgs/applications/misc/keepass-plugins/keeagent/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let
4 4
   version = "0.10.1";
5 5
   drv = stdenv.mkDerivation {
6
-    name = "keeagent-${version}";
6
+    pname = "keeagent";
7
+    inherit version;
7 8
 
8 9
     src = fetchzip {
9 10
       url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip";

+ 2
- 1
pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let
4 4
   version = "1.8.4.2";
5 5
   drv = stdenv.mkDerivation {
6
-    name = "keepasshttp-${version}";
6
+    pname = "keepasshttp";
7
+    inherit version;
7 8
     src = fetchFromGitHub {
8 9
       owner = "pfn";
9 10
       repo = "keepasshttp";

+ 2
- 1
pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let
4 4
   version = "1.8.0";
5 5
   drv = stdenv.mkDerivation {
6
-    name = "keepassrpc-${version}";
6
+    pname = "keepassrpc";
7
+    inherit version;
7 8
     src = fetchurl {
8 9
       url    = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
9 10
       sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";

+ 3
- 2
pkgs/applications/misc/krusader/default.nix View File

@@ -8,10 +8,11 @@ let
8 8
   pname = "krusader";
9 9
   version = "2.7.1";
10 10
 in mkDerivation rec {
11
-  name = "krusader-${version}";
11
+  pname = "krusader";
12
+  inherit version;
12 13
 
13 14
   src = fetchurl {
14
-    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
15
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
15 16
     sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
16 17
   };
17 18
 

+ 2
- 1
pkgs/applications/misc/lxterminal/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let version = "0.3.2"; in
6 6
 
7 7
 stdenv.mkDerivation rec {
8
-  name = "lxterminal-${version}";
8
+  pname = "lxterminal";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11 12
     url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/masterpdfeditor/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "5.4.10";
5 5
 
6 6
 in stdenv.mkDerivation {
7
-  name = "masterpdfeditor-${version}";
7
+  pname = "masterpdfeditor";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";

+ 2
- 1
pkgs/applications/misc/nrsc5/default.nix View File

@@ -13,7 +13,8 @@ let
13 13
   version = "1.0";
14 14
 
15 15
 in stdenv.mkDerivation {
16
-  name = "nrsc5-${version}";
16
+  pname = "nrsc5";
17
+  inherit version;
17 18
 
18 19
   src = fetchFromGitHub {
19 20
     owner = "theori-io";

+ 2
- 1
pkgs/applications/misc/opentx/default.nix View File

@@ -10,7 +10,8 @@ let
10 10
 
11 11
 in stdenv.mkDerivation {
12 12
 
13
-  name = "opentx-${version}";
13
+  pname = "opentx";
14
+  inherit version;
14 15
 
15 16
   src = fetchFromGitHub {
16 17
     owner = "opentx";

+ 2
- 1
pkgs/applications/misc/playonlinux/default.nix View File

@@ -55,7 +55,8 @@ let
55 55
   libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ];
56 56
 
57 57
 in stdenv.mkDerivation {
58
-  name = "playonlinux-${version}";
58
+  pname = "playonlinux";
59
+  inherit version;
59 60
 
60 61
   src = fetchurl {
61 62
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/qdirstat/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let
6 6
   version = "1.6";
7 7
 in mkDerivation rec {
8
-  name = "qdirstat-${version}";
8
+  pname = "qdirstat";
9
+  inherit version;
9 10
 
10 11
   src = fetchFromGitHub {
11 12
     owner = "shundhammer";

+ 2
- 1
pkgs/applications/misc/qtbitcointrader/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "1.40.41";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "qtbitcointrader-${version}";
7
+  pname = "qtbitcointrader";
8
+  inherit version;
8 9
 
9 10
   src = fetchzip {
10 11
     url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/redshift-plasma-applet/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "1.0.18"; in
4 4
 
5 5
 stdenv.mkDerivation {
6
-  name = "redshift-plasma-applet-${version}";
6
+  pname = "redshift-plasma-applet";
7
+  inherit version;
7 8
 
8 9
   src = fetchFromGitHub {
9 10
     owner = "kotelnik";

+ 3
- 2
pkgs/applications/misc/roxterm/default.nix View File

@@ -11,10 +11,11 @@
11 11
 
12 12
 let version = "3.3.2";
13 13
 in stdenv.mkDerivation rec {
14
-  name = "roxterm-${version}";
14
+  pname = "roxterm";
15
+  inherit version;
15 16
 
16 17
   src = fetchurl {
17
-    url = "mirror://sourceforge/roxterm/${name}.tar.xz";
18
+    url = "mirror://sourceforge/roxterm/${pname}-${version}.tar.xz";
18 19
     sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
19 20
   };
20 21
 

+ 4
- 2
pkgs/applications/misc/subsurface/default.nix View File

@@ -7,7 +7,8 @@ let
7 7
   version = "4.8.2";
8 8
 
9 9
   libdc = stdenv.mkDerivation rec {
10
-    name = "libdivecomputer-ssrf-${version}";
10
+    pname = "libdivecomputer-ssrf";
11
+    inherit version;
11 12
 
12 13
     src = fetchurl {
13 14
       url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
@@ -66,7 +67,8 @@ let
66 67
   };
67 68
 
68 69
 in stdenv.mkDerivation rec {
69
-  name = "subsurface-${version}";
70
+  pname = "subsurface";
71
+  inherit version;
70 72
 
71 73
   src = fetchurl {
72 74
     url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";

+ 3
- 2
pkgs/applications/misc/synapse/default.nix View File

@@ -5,10 +5,11 @@
5 5
 let
6 6
   version = "0.2.99.4";
7 7
 in stdenv.mkDerivation rec {
8
-  name = "synapse-${version}";
8
+  pname = "synapse";
9
+  inherit version;
9 10
 
10 11
   src = fetchurl {
11
-    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${name}.tar.xz";
12
+    url = "https://launchpad.net/synapse-project/0.3/${version}/+download/${pname}-${version}.tar.xz";
12 13
     sha256 = "1g6x9knb4jy1d8zgssjhzkgac583137pibisy9whjs8mckaj4k1j";
13 14
   };
14 15
 

+ 2
- 1
pkgs/applications/misc/teseq/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "1.1.1";
5 5
 in
6 6
 stdenv.mkDerivation {
7
-  name = "teseq-${version}";
7
+  pname = "teseq";
8
+  inherit version;
8 9
 
9 10
   src = fetchurl {
10 11
     url = "mirror://gnu/teseq/teseq-${version}.tar.gz";

+ 2
- 1
pkgs/applications/misc/tomboy/default.nix View File

@@ -8,7 +8,8 @@ let
8 8
 in
9 9
 
10 10
 stdenv.mkDerivation {
11
-  name = "tomboy-${version}";
11
+  pname = "tomboy";
12
+  inherit version;
12 13
 
13 14
   src = fetchurl {
14 15
     url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz";

+ 2
- 1
pkgs/applications/networking/browsers/otter/default.nix View File

@@ -4,7 +4,8 @@
4 4
 , sourceSha ? "1jw8bj3lcqngr0mqwvz1gf47qjxbwiyda7x4sm96a6ckga7pcwyb"
5 5
 }:
6 6
 stdenv.mkDerivation {
7
-  name = "otter-browser-${version}";
7
+  pname = "otter-browser";
8
+  inherit version;
8 9
 
9 10
   src = fetchFromGitHub {
10 11
     owner = "OtterBrowser";

+ 2
- 1
pkgs/applications/networking/cluster/hadoop/default.nix View File

@@ -64,7 +64,8 @@ let
64 64
       };
65 65
     in
66 66
       stdenv.mkDerivation rec {
67
-        name = "hadoop-${version}";
67
+        pname = "hadoop";
68
+        inherit version;
68 69
 
69 70
         src = binary-distributon;
70 71
 

+ 2
- 1
pkgs/applications/networking/cluster/kops/default.nix View File

@@ -6,7 +6,8 @@ let
6 6
   generic = { version, sha256, ...}@attrs:
7 7
     let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in
8 8
       buildGoPackage {
9
-        name = "kops-${version}";
9
+        pname = "kops";
10
+        inherit version;
10 11
 
11 12
         inherit goPackagePath;
12 13
 

+ 2
- 1
pkgs/applications/networking/cluster/kubecfg/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "0.12.0"; in
4 4
 
5 5
 buildGoPackage {
6
-  name = "kubecfg-${version}";
6
+  pname = "kubecfg";
7
+  inherit version;
7 8
 
8 9
   src = fetchFromGitHub {
9 10
     owner = "bitnami";

+ 4
- 3
pkgs/applications/networking/cluster/spark/default.nix View File

@@ -15,18 +15,19 @@ with stdenv.lib;
15 15
 
16 16
 stdenv.mkDerivation rec {
17 17
 
18
-  name = "spark-${version}";
18
+  pname = "spark";
19
+  inherit version;
19 20
 
20 21
   src = fetchzip {
21 22
     inherit sha256;
22
-    url    = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz";
23
+    url    = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz";
23 24
   };
24 25
 
25 26
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
26 27
     ++ optional RSupport R
27 28
     ++ optional mesosSupport mesos;
28 29
 
29
-  untarDir = "${name}-bin-without-hadoop";
30
+  untarDir = "${pname}-${version}-bin-without-hadoop";
30 31
   installPhase = ''
31 32
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
32 33
     mv * $out/lib/${untarDir}

+ 2
- 1
pkgs/applications/networking/dropbox/cli.nix View File

@@ -15,7 +15,8 @@ let
15 15
   dropboxd = "${dropbox}/bin/dropbox";
16 16
 in
17 17
 stdenv.mkDerivation {
18
-  name = "dropbox-cli-${version}";
18
+  pname = "dropbox-cli";
19
+  inherit version;
19 20
 
20 21
   outputs = [ "out" "nautilusExtension" ];
21 22
 

+ 2
- 1
pkgs/applications/networking/instant-messengers/franz/default.nix View File

@@ -5,7 +5,8 @@
5 5
 let
6 6
   version = "5.2.0";
7 7
 in stdenv.mkDerivation rec {
8
-  name = "franz-${version}";
8
+  pname = "franz";
9
+  inherit version;
9 10
   src = fetchurl {
10 11
     url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
11 12
     sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg";

+ 2
- 1
pkgs/applications/networking/instant-messengers/hipchat/default.nix View File

@@ -39,7 +39,8 @@ let
39 39
     libGL
40 40
   ] + ":${stdenv.cc.cc.lib}/lib64";
41 41
 in stdenv.mkDerivation {
42
-  name = "hipchat-${version}";
42
+  pname = "hipchat";
43
+  inherit version;
43 44
 
44 45
   src = fetchurl {
45 46
     url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix View File

@@ -3,7 +3,8 @@
3 3
 let version = "1.5.0";
4 4
 in
5 5
 stdenv.mkDerivation {
6
-  name = "pidgin-latex-${version}";
6
+  pname = "pidgin-latex";
7
+  inherit version;
7 8
 
8 9
   src = fetchurl {
9 10
     url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "54b2992";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "pidgin-mra-${version}";
7
+  pname = "pidgin-mra";
8
+  inherit version;
8 9
 
9 10
   src = fetchgit {
10 11
     url = "https://github.com/dreadatour/pidgin-mra";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "0.8";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "pidgin-xmpp-receipts-${version}";
7
+  pname = "pidgin-xmpp-receipts";
8
+  inherit version;
8 9
 
9 10
   src = fetchFromGitHub {
10 11
     owner = "noonien-d";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "2018-08-03";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "purple-matrix-unstable-${version}";
7
+  pname = "purple-matrix-unstable";
8
+  inherit version;
8 9
 
9 10
   src = fetchgit {
10 11
     url = "https://github.com/matrix-org/purple-matrix";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "40ddb6d";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "purple-vk-plugin-${version}";
7
+  pname = "purple-vk-plugin";
8
+  inherit version;
8 9
 
9 10
   src = fetchhg {
10 11
     url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";

+ 2
- 1
pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix View File

@@ -4,7 +4,8 @@ let
4 4
   version = "1.3.0";
5 5
 in
6 6
 stdenv.mkDerivation rec {
7
-  name = "telegram-purple-${version}";
7
+  pname = "telegram-purple";
8
+  inherit version;
8 9
 
9 10
   src = fetchgit {
10 11
     url = "https://github.com/majn/telegram-purple";

+ 2
- 1
pkgs/applications/networking/instant-messengers/qtox/default.nix View File

@@ -11,7 +11,8 @@ let
11 11
   rev = "v${version}";
12 12
 
13 13
 in mkDerivation rec {
14
-  name = "qtox-${version}";
14
+  pname = "qtox";
15
+  inherit version;
15 16
 
16 17
   src = fetchFromGitHub {
17 18
     owner  = "qTox";

+ 2
- 1
pkgs/applications/networking/instant-messengers/quaternion/default.nix View File

@@ -4,7 +4,8 @@
4 4
 
5 5
 let
6 6
   generic = version: sha256: prefix: library: stdenv.mkDerivation rec {
7
-    name = "quaternion-${version}";
7
+    pname = "quaternion";
8
+    inherit version;
8 9
 
9 10
     src = fetchFromGitHub {
10 11
       owner = "QMatrixClient";

+ 2
- 1
pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix View File

@@ -64,7 +64,8 @@ let
64 64
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
65 65
 
66 66
 in stdenv.mkDerivation {
67
-  name = "skypeforlinux-${version}";
67
+  pname = "skypeforlinux";
68
+  inherit version;
68 69
 
69 70
   system = "x86_64-linux";
70 71
 

+ 2
- 1
pkgs/applications/networking/instant-messengers/slack/default.nix View File

@@ -57,7 +57,8 @@ let
57 57
       throw "Slack is not supported on ${stdenv.hostPlatform.system}";
58 58
 
59 59
 in stdenv.mkDerivation {
60
-  name = "slack-${version}";
60
+  pname = "slack";
61
+  inherit version;
61 62
 
62 63
   inherit src;
63 64
 

+ 2
- 1
pkgs/applications/networking/instant-messengers/vk-messenger/default.nix View File

@@ -4,7 +4,8 @@
4 4
 let
5 5
   version = "4.0.1";
6 6
 in stdenv.mkDerivation {
7
-  name = "vk-messenger-${version}";
7
+  pname = "vk-messenger";
8
+  inherit version;
8 9
   src = {
9 10
     i686-linux = fetchurl {
10 11
       url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";

+ 2
- 1
pkgs/applications/networking/instant-messengers/wavebox/default.nix View File

@@ -22,7 +22,8 @@ let
22 22
   tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
23 23
 
24 24
 in stdenv.mkDerivation rec {
25
-  name = "wavebox-${version}";
25
+  pname = "wavebox";
26
+  inherit version;
26 27
   src = fetchurl {
27 28
     url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}";
28 29
     sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23";

+ 0
- 0
pkgs/applications/networking/instant-messengers/zoom-us/default.nix View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save