diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
67 files changed, 84 insertions, 72 deletions
diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 163f0ba3f497..716989c7b565 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost166 }: stdenv.mkDerivation rec { - name = "SkypeExport-${version}"; + pname = "SkypeExport"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 75e1791644b8..f01b8d387f83 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { version = "0.6.3"; - name = "baresip-${version}"; + pname = "baresip"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index e1e851b13bbd..5094a13119f7 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-discord-${version}"; + pname = "bitlbee-discord"; version = "0.4.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index d6c8fae2b585..84067dc5f19d 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-facebook-${version}"; + pname = "bitlbee-facebook"; version = "1.2.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index a034827c4ed4..798dab2b646d 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "1.4.2"; - name = "bitlbee-steam-${version}"; + pname = "bitlbee-steam"; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index bbdb2ae79f83..001eadbb01d8 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,7 +2,7 @@ , gnutls, libvpx, makeDesktopItem }: pythonPackages.buildPythonApplication rec { - name = "blink-${version}"; + pname = "blink"; version = "3.0.3"; src = fetchdarcs { diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index d76cebd11b01..21b21e253499 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "bluejeans-${version}"; + pname = "bluejeans"; version = "1.36.9"; src = diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index 350d09078c41..daffb539676f 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "5.0.1"; - name = "centerim5-${version}"; + pname = "centerim5"; src = fetchurl { - url = "http://centerim.org/download/cim5/${name}.tar.gz"; + url = "http://centerim.org/download/cim5/${pname}-${version}.tar.gz"; sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk"; }; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index fb47d8db8c85..3186009db582 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -2,7 +2,7 @@ cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { - name = "coyim-${version}"; + pname = "coyim"; version = "0.3.11"; goPackagePath = "github.com/coyim/coyim"; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 97a4341dc4d7..f04afb6f1f71 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -5,7 +5,8 @@ let version = "5.2.0"; in stdenv.mkDerivation rec { - name = "franz-${version}"; + pname = "franz"; + inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; sha256 = "1wlfd1ja38vbjy8y5pg95cpvf5ixkkq53m7v3c24q473jax4ynvg"; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ea793e3c0aac..e24ac2e18317 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -3,7 +3,7 @@ , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: stdenv.mkDerivation rec { - name = "freetalk-${version}"; + pname = "freetalk"; version = "4.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 6878c9a870b1..57b745057dce 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -20,7 +20,6 @@ let gitterDirectorySuffix = "opt/gitter"; in stdenv.mkDerivation rec { pname = "gitter"; version = "4.1.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 9e1b9fe9c39f..47854683e0ed 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -39,7 +39,8 @@ let libGL ] + ":${stdenv.cc.cc.lib}/lib64"; in stdenv.mkDerivation { - name = "hipchat-${version}"; + pname = "hipchat"; + inherit version; src = fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 689445d7dcb8..e97db0b53128 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { version = "2018-05-11"; - name = "jackline-${version}"; + pname = "jackline"; src = fetchFromGitHub { owner = "hannesm"; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 820a742245ed..04a31ba403a2 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "jitsi-${version}"; + pname = "jitsi"; version = "2.10.5550"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 1fb743148118..6f4e7e5b677b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -37,18 +37,18 @@ let in stdenv.mkDerivation rec { - name = "mattermost-desktop-${version}"; + pname = "mattermost-desktop"; version = "4.2.0"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-x64.tar.gz"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; sha256 = "0hka94gwpscjn61032c0grpjv5gjb0j8rkx6pgwci617n29xkyf6"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${name}-linux-ia32.tar.gz"; + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; sha256 = "1nx2sgbnr60h6kn56wv54m7cvyx27d64bfprpb94hqd5c2z21x80"; } else diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index d86d62021fbd..f41111237114 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "mcabber-${version}"; + pname = "mcabber"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index ea190db07a61..3e2718c9c573 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -18,7 +18,7 @@ # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' stdenv.mkDerivation rec { - name = "mikutter-${version}"; + pname = "mikutter"; version = "3.8.7"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index a75835b3c7e9..7b76154021ab 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitLab }: buildGoPackage rec { - name = "mm-${version}"; + pname = "mm"; version = "2016.11.04"; goPackagePath = "gitlab.com/meutraa/mm"; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index d337c62ea094..f214f7221438 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -22,7 +22,7 @@ let }; in mkDerivation rec { - name = "nheko-${version}"; + pname = "nheko"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 64443461e375..ff260c9161b8 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -2,7 +2,7 @@ fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - name = "oysttyer-${version}"; + pname = "oysttyer"; version = "2.10.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 60fd5af0a1ab..079fc7d57fb1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,7 +1,7 @@ { stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : stdenv.mkDerivation rec { - name = "pidgin-carbons-${version}"; + pname = "pidgin-carbons"; version = "0.1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 59b1d463c9d2..eb6d954eb334 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -3,7 +3,8 @@ let version = "1.5.0"; in stdenv.mkDerivation { - name = "pidgin-latex-${version}"; + pname = "pidgin-latex"; + inherit version; src = fetchurl { url = "mirror://sourceforge/pidgin-latex/pidgin-latex_${version}.tar.bz2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index 18bf89a5f2ed..9a1e46e5ac55 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -4,7 +4,8 @@ let version = "54b2992"; in stdenv.mkDerivation rec { - name = "pidgin-mra-${version}"; + pname = "pidgin-mra"; + inherit version; src = fetchgit { url = "https://github.com/dreadatour/pidgin-mra"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 7e86a390edcb..34755809e392 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } : stdenv.mkDerivation rec { - name = "pidgin-opensteamworks-${version}"; + pname = "pidgin-opensteamworks"; version = "unstable-2018-08-02"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index f407ed6cabe3..c418b2e992a8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "pidgin-skypeweb-${version}"; + pname = "pidgin-skypeweb"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index f482e12a4bc9..936974a1a880 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -4,7 +4,8 @@ let version = "0.8"; in stdenv.mkDerivation rec { - name = "pidgin-xmpp-receipts-${version}"; + pname = "pidgin-xmpp-receipts"; + inherit version; src = fetchFromGitHub { owner = "noonien-d"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index ba1d64c8b925..1e998bcc8065 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: stdenv.mkDerivation rec { - name = "purple-discord-${version}"; + pname = "purple-discord"; version = "unstable-2018-04-10"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 61e8c2b58d9d..d226490b2755 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }: stdenv.mkDerivation rec { - name = "purple-hangouts-hg-${version}"; + pname = "purple-hangouts-hg"; version = "2018-12-02"; src = fetchhg { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index bcfcbee85568..e488ae73be00 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: stdenv.mkDerivation rec { - name = "purple-lurch-${version}"; + pname = "purple-lurch"; version = "0.6.7"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 0b2cba649207..3c4169274877 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,7 +4,8 @@ let version = "2018-08-03"; in stdenv.mkDerivation rec { - name = "purple-matrix-unstable-${version}"; + pname = "purple-matrix-unstable"; + inherit version; src = fetchgit { url = "https://github.com/matrix-org/purple-matrix"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index e54af933a081..22554a4abf8b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -4,7 +4,8 @@ let version = "40ddb6d"; in stdenv.mkDerivation rec { - name = "purple-vk-plugin-${version}"; + pname = "purple-vk-plugin"; + inherit version; src = fetchhg { url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 8527593c1a20..df2665d8ce8f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -4,7 +4,8 @@ let version = "1.3.0"; in stdenv.mkDerivation rec { - name = "telegram-purple-${version}"; + pname = "telegram-purple"; + inherit version; src = fetchgit { url = "https://github.com/majn/telegram-purple"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 6d75ba40ce01..41f205514e76 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }: stdenv.mkDerivation rec { - name = "tox-prpl-${version}"; + pname = "tox-prpl"; version = "0.5.1"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index dfdc92cfd4b8..8f86256069ce 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pidgin } : stdenv.mkDerivation rec { - name = "pidgin-window-merge-${version}"; + pname = "pidgin-window-merge"; version = "0.3"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 8b6863384b3f..71168e1a692c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,12 +13,12 @@ # FIXME: clean the mess around choosing the SSL library (nss by default) let unwrapped = stdenv.mkDerivation rec { - name = "pidgin-${version}"; + pname = "pidgin"; majorVersion = "2"; version = "${majorVersion}.13.0"; src = fetchurl { - url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; + url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; }; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index e7527bafcc65..1ddc603dc62e 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -5,7 +5,7 @@ let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { - name = "pond-${version}"; + pname = "pond"; version = "20150830-${stdenv.lib.strings.substring 0 7 rev}"; rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 79a197d1a7ac..bd88962c40df 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -21,7 +21,7 @@ assert omemoSupport -> libsignal-protocol-c != null && libgcrypt != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "profanity-${version}"; + pname = "profanity"; version = "0.7.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index e1a2fb40c5ae..b77407bd0c83 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "psi-plus-${version}"; + pname = "psi-plus"; version = "1.4.504"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 4ab3c64d16d8..6a43344fbd3c 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -11,7 +11,8 @@ let rev = "v${version}"; in mkDerivation rec { - name = "qtox-${version}"; + pname = "qtox"; + inherit version; src = fetchFromGitHub { owner = "qTox"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 60a4dd39fb0e..a23dbda6cb2a 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -2,7 +2,7 @@ , auth0ClientID, auth0Domain }: stdenv.mkDerivation rec { - name = "rambox-bare-${version}"; + pname = "rambox-bare"; version = "0.6.9"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index efecebe169e9..97c722f09354 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { inherit version; - name = "sencha-bare-${version}"; + pname = "sencha-bare"; src = srcs.${stdenv.hostPlatform.system}; nativeBuildInputs = [ gzip which unzip ]; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index a6aef5e6a2fb..96ce9c32a7d6 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "ricochet-${version}"; + pname = "ricochet"; version = "1.1.4"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 168719bf0e4c..8dc053631e92 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -79,7 +79,7 @@ let }); in stdenv.mkDerivation rec { - name = "ring-daemon-${version}"; + pname = "ring-daemon"; version = "2017-07-11"; inherit src; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index 0546d2dae472..d1f1c0333616 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "restbed-${version}"; + pname = "restbed"; version = "2016-09-15"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 383952f2a893..2755d181da2b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -4,7 +4,7 @@ # Versions of `riot-web` and `riot-desktop` should be kept in sync. stdenv.mkDerivation rec { - name= "riot-web-${version}"; + pname = "riot-web"; version = "1.3.3"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 3336c05aae74..010ea1bff7c3 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - name = "signal-cli-${version}"; + pname = "signal-cli"; version = "0.6.2"; # Building from source would be preferred, but is much more involved. diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 0b4c3aade87d..c97a908d33d9 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,7 +56,7 @@ let ]; in stdenv.mkDerivation rec { - name = "signal-desktop-${version}"; + pname = "signal-desktop"; version = "1.26.2"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index cf6031aa05b5..cdc176be65b0 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { version_major = "2.1.7369"; version_minor = "1"; version = version_major + "." + version_minor; - name = "sky-${version}"; + pname = "sky"; unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; src = fetchurl { url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 96eef843d5b9..cbab67e5e1a5 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -66,7 +66,8 @@ let throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "skypeforlinux-${version}"; + pname = "skypeforlinux"; + inherit version; system = "x86_64-linux"; diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 79464f54232c..6271e338a964 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { # https://github.com/erroneousboat/slack-term - name = "slack-term-${version}"; + pname = "slack-term"; version = "0.4.1"; goPackagePath = "github.com/erroneousboat/slack-term"; diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix index c24e2c4301e0..58cc7a220b92 100644 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "e2a6a9cd9da70175881ab991220c86aa87179509"; version = "2019-07-26"; - name = "slack-theme-black-${version}"; + pname = "slack-theme-black"; src = fetchgit { inherit rev; url = "https://github.com/laCour/slack-night-mode"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 94c02ab0226a..fab9c28ec973 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -57,7 +57,8 @@ let throw "Slack is not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation { - name = "slack-${version}"; + pname = "slack"; + inherit version; inherit src; diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 17a38479f82e..7a9ab4d127c4 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { version = "1.17.82"; - name = "stride-${version}"; + pname = "stride"; src = fetchurl { url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb"; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 51e7f081d1e0..db1d0a54dce0 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "swift-im-${version}"; + pname = "swift-im"; version = "4.0.2"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 21b9510a6057..3c532fa506a5 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -29,7 +29,7 @@ let in stdenv.mkDerivation rec { - name = "teamspeak-client-${version}"; + pname = "teamspeak-client"; version = "3.3.0"; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 4607961cdf08..3368ec1124eb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -3,10 +3,9 @@ stdenv.mkDerivation rec { pname = "telepathy-idle"; version = "0.2.0"; - name = "${pname}-${version}"; src = fetchurl { - url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index c6b930fc590f..11845ecfb26c 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -4,7 +4,7 @@ # should use that stdenv.mkDerivation rec { - name = "tensor-git-${version}"; + pname = "tensor-git"; version = "2017-02-21"; src = fetchgit { diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 06bcd7a0400e..edfec97edf8a 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: stdenv.mkDerivation rec { - name = "torchat-${version}"; + pname = "torchat"; version = "0.9.9.553"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 95879fef05ad..540aa3fcea4d 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -3,7 +3,7 @@ , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { - name = "toxic-${version}"; + pname = "toxic"; version = "0.8.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 349a1363259c..5ef0d9162429 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -3,7 +3,7 @@ , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: stdenv.mkDerivation rec { - name = "utox-${version}"; + pname = "utox"; version = "0.17.0"; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 109566b5d079..cd5109320c79 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -4,7 +4,7 @@ , xz, zlib }: stdenv.mkDerivation rec { - name = "vacuum-im-${version}"; + pname = "vacuum-im"; version = "1.3.0.20160104"; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index a4bf26a0b1af..b0824c780225 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "viber-${version}"; + pname = "viber"; version = "7.0.0.1035"; src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index b992263e215b..03bf3b3bbdd2 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,7 +4,8 @@ let version = "4.0.1"; in stdenv.mkDerivation { - name = "vk-messenger-${version}"; + pname = "vk-messenger"; + inherit version; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 9f704e52721d..da4c5073000a 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -22,7 +22,8 @@ let tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation rec { - name = "wavebox-${version}"; + pname = "wavebox"; + inherit version; src = fetchurl { url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; sha256 = "1yg2lib4h5illz0ss4hvr78s4v1cjbxlczjzaw6bqigyk95smm23"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 980d21572cc0..4047eba1fbb5 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "xmpp-client-${version}"; + pname = "xmpp-client"; version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 8aa732fd6ba7..e822b023f54a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -31,7 +31,8 @@ let }; in mkDerivation { - name = "zoom-us-${version}"; + pname = "zoom-us"; + inherit version; src = srcs.${stdenv.hostPlatform.system}; |