treewide: remove redundant rec

63 files changed, 66 insertions, 66 deletions

diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix
index 2334dc6a71e4..6dff17c69ddb 100644
--- a/pkgs/applications/networking/browsers/chromium/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/update.nix
@@ -35,7 +35,7 @@ let
     "http://repo.fdzh.org/chrome/deb/pool/main/g"
   ];
 
-in rec {
+in {
   getChannel = channel: let
     chanAttrs = builtins.getAttr channel sources;
   in {
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 4f4741ce0bdf..da6a7bc47155 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -10,7 +10,7 @@
 assert enableGuile -> guile != null;
 assert enablePython -> python != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "elinks-0.12pre6";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 20509439d2fb..c74ac2f8dab6 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -159,7 +159,7 @@ rec {
     };
   });
 
-in rec {
+in {
 
   icecat = iccommon rec {
     ffversion = "60.3.0";
@@ -249,7 +249,7 @@ in rec {
 
 in rec {
 
-  tor-browser-7-5 = (tbcommon rec {
+  tor-browser-7-5 = (tbcommon {
     ffversion = "52.9.0esr";
     tbversion = "7.5.6";
 
@@ -265,7 +265,7 @@ in rec {
     gtk3Support = false;
   };
 
-  tor-browser-8-5 = tbcommon rec {
+  tor-browser-8-5 = tbcommon {
     ffversion = "60.8.0esr";
     tbversion = "8.5.4";
 
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 977b40e4a7e3..9f49925b2672 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -64,7 +64,7 @@ let
 
   suffix = if channel != "stable" then "-" + channel else "";
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   inherit version;
 
   name = "google-chrome${suffix}-${version}";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 2d2d2a691006..c603dc6cf9f0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -48,7 +48,7 @@
 , debug ? false
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "flashplayer-standalone";
   version = "32.0.0.238";
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index fa455eb0b7a4..10ae0eb1da60 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -9,7 +9,7 @@ let
     url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   inherit (srcData) name version;
 
   src = fetchurl{
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index f15bf165e826..7ff099853e29 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -71,7 +71,7 @@ let
     ffmpeg
   ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tor-browser-bundle";
   version = tor-browser-unwrapped.version;
 
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 136c14d34d48..373fa43c72c3 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null;
 with stdenv.lib;
 
 let
-  mktable = buildPackages.stdenv.mkDerivation rec {
+  mktable = buildPackages.stdenv.mkDerivation {
     name = "w3m-mktable";
     inherit (w3m) src;
     nativeBuildInputs = [ pkgconfig boehmgc ];
diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix
index 09be379b2409..4c1f7ea77492 100644
--- a/pkgs/applications/networking/charles/default.nix
+++ b/pkgs/applications/networking/charles/default.nix
@@ -20,7 +20,7 @@ let
       startupNotify = "true";
     };
 
-  in stdenv.mkDerivation rec {
+  in stdenv.mkDerivation {
       pname = "charles";
       inherit version;
 
@@ -54,7 +54,7 @@ let
       };
     };
 
-in rec {
+in {
   charles4 = (generic {
     version = "4.2.8";
     sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080";
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 438fdfb2ebac..5fc35e6a0af1 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -65,7 +65,7 @@ let
         installPhase = "mv hadoop-dist/target/hadoop-${version} $out";
       };
     in
-      stdenv.mkDerivation rec {
+      stdenv.mkDerivation {
         pname = "hadoop";
         inherit version;
 
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 982f36def691..89d06474509f 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -4,7 +4,7 @@ let
 
   # Cache schema as a package so network calls are not
   # necessary at runtime, allowing use in package builds
-  schema = stdenv.mkDerivation rec {
+  schema = stdenv.mkDerivation {
     name = "kubeval-schema";
     src = fetchFromGitHub {
       owner = "garethr";
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 256bce9b6ec2..8c0265d14914 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoModule }:
 
-buildGoModule rec {
+buildGoModule {
   pname = "linkerd-unstablle";
   version = "2019-07-26";
 
diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
index c74f5789d84f..d71b863f881f 100644
--- a/pkgs/applications/networking/droopy/default.nix
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -2,7 +2,7 @@
 
 with lib;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "droopy";
   version = "20160830";
 
diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix
index bb3ab98d1a4c..59b48df1cd03 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "3.3.2";
   pname = "enhanced-ctorrent-dhn";
 
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 708d3c1ed800..2535d0dc31db 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "esniper-2.35.0-15-g91d2665";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index c0a6185309ae..3e7909c91c05 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "rsstail";
   version = "2.1";
 
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix
index 63c18d6e0929..2bebf4b09601 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/applications/networking/flent/http-getter.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake
 , curl, pkgconfig }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "http-getter";
   version = "unstable-2018-06-06";
 
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 2158409471f9..c147b08cff52 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -14,7 +14,7 @@
 , icu
  }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "dino-unstable-2019-03-07";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index f04afb6f1f71..2db13e1586ba 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -4,7 +4,7 @@
 
 let
   version = "5.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "franz";
   inherit version;
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index e97db0b53128..a84d4aefa02f 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "2018-05-11";
   pname = "jackline";
 
diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix
index 7b76154021ab..7122a509215d 100644
--- a/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitLab }:
 
-buildGoPackage rec {
+buildGoPackage {
   pname = "mm";
   version = "2016.11.04";
 
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 9a1e46e5ac55..bb51adfbfee0 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
@@ -3,7 +3,7 @@
 let
   version = "54b2992";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pidgin-mra";
   inherit version;
 
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 34755809e392..057e447eb1c8 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,6 +1,6 @@
 { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pidgin-opensteamworks";
   version = "unstable-2018-08-02";
 
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 936974a1a880..7302ba89a715 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
@@ -3,7 +3,7 @@
 let
   version = "0.8";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pidgin-xmpp-receipts";
   inherit version;
 
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 1e998bcc8065..6695f8cb69b8 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,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "purple-discord";
   version = "unstable-2018-04-10";
 
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 d226490b2755..5d2292b50ad0 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,6 +1,6 @@
 { stdenv, fetchhg, pidgin, glib, json-glib, protobuf, protobufc }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "purple-hangouts-hg";
   version = "2018-12-02";
 
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 3c4169274877..310d419718fe 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
@@ -3,7 +3,7 @@
 let
   version = "2018-08-03";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "purple-matrix-unstable";
   inherit version;
 
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 22554a4abf8b..9f73dba2d99d 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
@@ -3,7 +3,7 @@
 let
   version = "40ddb6d";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "purple-vk-plugin";
   inherit version;
 
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
index 8990aeee8ec0..83904531753b 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pidgin, glib, libxml2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "purple-xmpp-upload-2017-12-31";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 6a43344fbd3c..a78e5d1c2d12 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -10,7 +10,7 @@ let
   version = "1.16.3";
   rev = "v${version}";
 
-in mkDerivation rec {
+in mkDerivation {
   pname = "qtox";
   inherit version;
 
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 655628308971..569c7b68edc6 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -3,7 +3,7 @@
 , libqmatrixclient_0_5 }:
 
 let
-  generic = version: sha256: prefix: library: mkDerivation rec {
+  generic = version: sha256: prefix: library: mkDerivation {
     pname = "quaternion";
     inherit version;
 
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
index 97c722f09354..30b12963b337 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
@@ -14,7 +14,7 @@ let
   };
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   inherit version;
 
   pname = "sencha-bare";
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index add337d3f085..3768ecd137fb 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 let
   configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   name = "ratox-0.4.20180303";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index 8dc053631e92..97c00924d6cf 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -78,7 +78,7 @@ let
     CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000";
   });
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "ring-daemon";
   version = "2017-07-11";
 
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
index d1f1c0333616..d4298a3d32f3 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix
@@ -6,7 +6,7 @@
 , patches
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "restbed";
   version = "2016-09-15";
 
diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix
index 72069ec81c1a..29b314417c76 100644
--- a/pkgs/applications/networking/instant-messengers/spectral/default.nix
+++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix
@@ -18,7 +18,7 @@ let
     qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia
   ];
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "spectral";
   version = "2019-03-03";
 
diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
index cd5109320c79..923ce3737532 100644
--- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix
@@ -3,7 +3,7 @@
   , xorgproto, libX11, libXScrnSaver
   , xz, zlib
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "vacuum-im";
   version = "1.3.0.20160104";
 
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index b0824c780225..1b3e1c8ad81a 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -3,7 +3,7 @@
  libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "viber";
   version = "7.0.0.1035";
 
diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index da4c5073000a..9dbff13aca6c 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -21,7 +21,7 @@ let
 
   tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz";
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "wavebox";
   inherit version;
   src = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 77f86e10a493..fdd450f78a79 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -102,7 +102,7 @@ let
     '';
   };
 
-  darwin = stdenv.mkDerivation rec {
+  darwin = stdenv.mkDerivation {
     inherit pname version meta;
 
     src = fetchurl {
diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix
index 39631bfc5c87..dc646f9471e1 100644
--- a/pkgs/applications/networking/ipfs-migrator/default.nix
+++ b/pkgs/applications/networking/ipfs-migrator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoPackage {
   pname = "ipfs-migrator";
   version = "7";
 
diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix
index d1a0b2d4b029..d2d9a67fb4d9 100644
--- a/pkgs/applications/networking/iptraf/default.nix
+++ b/pkgs/applications/networking/iptraf/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, ncurses}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "iptraf-3.0.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix
index 5648d027d9e2..93ab9f828f64 100644
--- a/pkgs/applications/networking/irc/irccloud/default.nix
+++ b/pkgs/applications/networking/irc/irccloud/default.nix
@@ -14,7 +14,7 @@ let
     inherit name src;
   };
 
-in appimageTools.wrapType2 rec {
+in appimageTools.wrapType2 {
   inherit name src;
 
   extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
index 88e573f6cf42..fc8c167e9849 100644
--- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix
+++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix
@@ -5,7 +5,7 @@ let
   name = "msgviewer-${version}";
   uname = "MSGViewer-${version}";
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix
index b87728dd2cd1..fcf1464ba239 100644
--- a/pkgs/applications/networking/mailreaders/notbit/default.nix
+++ b/pkgs/applications/networking/mailreaders/notbit/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "notbit";
   version = "2018-01-09";
 
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
index 67c673bc913c..86aef5011342 100644
--- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -3,7 +3,7 @@
 let
   version = "9";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "notmuch-addrlookup";
   inherit version;
 
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index b3001c960574..c2a84971bc29 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,6 +1,6 @@
 { libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "netperf";
   version = "20180613";
 
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
index 58e1fffdbdad..96bdc0b1dfa4 100644
--- a/pkgs/applications/networking/nntp-proxy/default.nix
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "nntp-proxy";
   version = "2014-01-06";
 
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index 9428b2764585..c9e2f8f67140 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -7,7 +7,7 @@
 let
   rev = 	"ce2864cfaa27e55096b480bf35db5f8cee2a5e7e";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "gnunet-git-${rev}";
 
   src = fetchgit {
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix
index 629e748fcacf..0ead4b7e3ec4 100644
--- a/pkgs/applications/networking/p2p/mldonkey/default.nix
+++ b/pkgs/applications/networking/p2p/mldonkey/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
   name = "mldonkey-3.1.6";
 
   src = fetchurl {
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
index 305aceec62b5..7fdb062ef805 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonApplication, fetchFromGitHub }:
 
-buildPythonApplication rec {
+buildPythonApplication {
   pname = "protocol";
   version = "20171226";
 
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index bf8e7a16a4f3..60ea01ae4512 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -21,7 +21,7 @@ let
     categories = "Utility;Security;Network;Email";
   };
 
-in mkDerivation rec {
+in mkDerivation {
   pname = "protonmail-bridge";
   inherit version;
 
diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix
index be4cc5830d54..d75f92cb25c7 100644
--- a/pkgs/applications/networking/ps2client/default.nix
+++ b/pkgs/applications/networking/ps2client/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "unstable-2018-10-18";
   pname = "ps2client";
 
diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix
index 571df924e1f8..66470bf8f314 100644
--- a/pkgs/applications/networking/pyload/beautifulsoup.nix
+++ b/pkgs/applications/networking/pyload/beautifulsoup.nix
@@ -1,6 +1,6 @@
 { pythonPackages, isPy3k, pkgs }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
   name = "beautifulsoup-3.2.1";
   disabled = isPy3k;
 
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index cc2bf534fd94..30130f60028c 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -15,7 +15,7 @@ let
 
   description = "Desktop sharing application, providing remote support and online meetings";
 
-  desktopItem = makeDesktopItem rec {
+  desktopItem = makeDesktopItem {
     name = "anydesk";
     exec = "@out@/bin/anydesk";
     icon = "anydesk";
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 2cfbfb1b201e..13bcbf9b57e1 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh
 , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "x2goclient";
   version = "unstable-2019-07-24";
 
diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
index a38a9140b490..158e6c5dad15 100644
--- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -2,7 +2,7 @@
 
 with stdenv.lib;
 
-python27Packages.buildPythonApplication rec {
+python27Packages.buildPythonApplication {
   pname = "nicotine-plus";
   version = "1.4.1";
 
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index c70723284fd8..74a02f47c3bf 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -5,7 +5,7 @@
   glibc, systemd
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
 
   version = "2.12.0";
 
diff --git a/pkgs/applications/networking/sync/backintime/qt4.nix b/pkgs/applications/networking/sync/backintime/qt4.nix
index fb47d9bc5101..b72ddc8bae63 100644
--- a/pkgs/applications/networking/sync/backintime/qt4.nix
+++ b/pkgs/applications/networking/sync/backintime/qt4.nix
@@ -1,6 +1,6 @@
 {stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   inherit (backintime-common) version src installFlags;
 
   pname = "backintime-qt4";
diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix
index 1eb5e44ba24f..cdec695d90f2 100644
--- a/pkgs/applications/networking/sync/casync/default.nix
+++ b/pkgs/applications/networking/sync/casync/default.nix
@@ -7,7 +7,7 @@
 , glibcLocales, rsync
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "casync";
   version = "2-152-ge4a3c5e";
 
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 12f992d44a5a..19e2eaa5fa23 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -3,7 +3,7 @@
 let
   base = import ./base.nix { inherit stdenv fetchurl; };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "rrsync-${base.version}";
 
   src = base.src;
diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
index 46649c069111..a3cde14f34c0 100644
--- a/pkgs/applications/networking/transporter/default.nix
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -18,7 +18,7 @@
 let
   pname = "Transporter";
   version = "1.3.3";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index fce885a25941..54e148f0833e 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -15,7 +15,7 @@ let
     passthru.module_name = module_name;
   });
 
-in rec {
+in {
 
   backlog = zncDerivation rec {
     name = "znc-backlog-${version}";