treewide: remove redundant rec

59 files changed, 60 insertions, 60 deletions

diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index f21438dfcec..8108b9e4ddb 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "antfs-cli";
   version = "unstable-2017-02-11";
 
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 791e2d0f52e..b03d2aa208b 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,6 +1,6 @@
 { stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "artha";
   version = "1.0.3";
 
diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix
index 444a8da7036..b00686fb24f 100644
--- a/pkgs/applications/misc/autospotting/default.nix
+++ b/pkgs/applications/misc/autospotting/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoPackage {
   pname = "autospotting";
   version = "unstable-2018-11-17";
   goPackagePath = "github.com/AutoSpotting/AutoSpotting";
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 4227b4155ac..165bee76b69 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,6 +1,6 @@
 { stdenv, runtimeShell, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "avrdudess-2.2.20140102";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix
index 89c32668be9..8945ffbb384 100644
--- a/pkgs/applications/misc/bemenu/default.nix
+++ b/pkgs/applications/misc/bemenu/default.nix
@@ -9,7 +9,7 @@ assert ncursesSupport -> ncurses != null;
 assert waylandSupport -> wayland != null;
 assert x11Support -> xlibs != null && xorg != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bemenu";
   version = "0.1.0";
 
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index dae6e404a9d..5f4e24f4d3c 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -10,7 +10,7 @@
 , sha256
 , rev }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   inherit version;
   pname = "cataract";
 
diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix
index 75f5ab406fe..09c36f9eb2f 100644
--- a/pkgs/applications/misc/catclock/default.nix
+++ b/pkgs/applications/misc/catclock/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, xlibsWrapper, motif }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "catclock-2015-10-04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 04f32a67b84..c05c7423d9a 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, pkgconfig, libtool, autoconf, automake
 , curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "3.7.2";
   pname = "cgminer";
 
diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
index 589111df78b..4d32328af8b 100644
--- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchgit, fetchurl, cmake, sip, protobuf, pythonOlder }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "libarcus";
   version = "3.6.18";
   format = "other";
diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
index 7a1781f62ce..f8ffbf041bd 100644
--- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
+++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchgit, cmake, sip }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "libsavitar-lulzbot";
   name = "libsavitar-lulzbot";
   version = "3.6.18";
diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix
index 43869a0edc6..1ad755cdfbd 100644
--- a/pkgs/applications/misc/cura/lulzbot/uranium.nix
+++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, fetchgit, buildPythonPackage, fetchFromGitHub, python, cmake
 , pyqt5, numpy, scipy, shapely, libarcusLulzbot, doxygen, gettext, pythonOlder }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   version = "3.6.18";
   pname = "uranium";
   name = "uraniumLulzbot";
diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix
index 283b66318ea..0016f89746d 100644
--- a/pkgs/applications/misc/diff-pdf/default.nix
+++ b/pkgs/applications/misc/diff-pdf/default.nix
@@ -7,7 +7,7 @@ let
     else
       [ wxGTK ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "diff-pdf";
   version = "2017-12-30";
 
diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix
index 20c802a1cbd..d72a5b84826 100644
--- a/pkgs/applications/misc/doing/default.nix
+++ b/pkgs/applications/misc/doing/default.nix
@@ -1,7 +1,7 @@
 { lib, bundlerEnv, ruby, bundlerUpdateScript
 }:
 
-bundlerEnv rec {
+bundlerEnv {
   pname = "doing";
   version = (import ./gemset.nix).doing.version;
 
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 8cfadd77ece..1332b265d54 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "doomseeker";
   version = "2018-03-05";
 
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 5233aaf8fcd..31697432226 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -40,7 +40,7 @@ let
   };
 in
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "electrum";
   inherit version;
 
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index d1161aa6822..984ade077a8 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -3,7 +3,7 @@
   configH ? ""
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "evilvte";
   version = "0.5.2-20140827";
 
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 3d715a1d16b..8982c41e1ca 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "evtest-1.33";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index e2cf8245ce6..7a918d961f6 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "gnome15-2016-06-10";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 6a5f4c9ce03..e917cc024d5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
 , libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
 , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-mkDerivation rec {
+mkDerivation {
 
   name = "goldendict-2019-08-01";
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 308f084bd58..d86db7adb9d 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "green-pdfviewer";
   version = "nightly-2014-04-22";
 
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 37352915cb8..97303c43fb1 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -3,7 +3,7 @@
 
 let
   version = "3.6.3";
-in python3.pkgs.buildPythonApplication rec {
+in python3.pkgs.buildPythonApplication {
   name = "guake-${version}";
   format = "other";
 
diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
index a2d2e8ad735..a5a9187ab0f 100644
--- a/pkgs/applications/misc/hello-unfree/default.nix
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -1,6 +1,6 @@
 { stdenv, runtimeShell }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "example-unfree-package";
   version = "1.0";
 
diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix
index 607dff29318..ce35e91d927 100644
--- a/pkgs/applications/misc/houdini/default.nix
+++ b/pkgs/applications/misc/houdini/default.nix
@@ -2,7 +2,7 @@
 
 let
   houdini-runtime = callPackage ./runtime.nix { };
-in buildFHSUserEnv rec {
+in buildFHSUserEnv {
   name = "houdini-${houdini-runtime.version}";
 
   extraBuildCommands = ''
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 9ae9ab254e8..4d4dd248bc5 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -21,7 +21,7 @@ let
     # Else: Don't modify the arguments:
     exec ${ruby}/bin/ruby "$@"
   '';
-in bundlerApp rec {
+in bundlerApp {
   pname = "jekyll";
   exes = [ "jekyll" ];
 
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 38078d11931..e9dba4bcf46 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -29,7 +29,7 @@ let
       };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "lilyterm";
 
   inherit (stuff) src version;
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 291e225d6c4..f84ac6d600a 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -3,7 +3,7 @@ let
   py = python27Packages;
   python = py.python;
 in
-py.buildPythonApplication rec {
+py.buildPythonApplication {
   name = "loxodo-0.20150124";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 42905fa3cb4..61151cb1550 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -1,6 +1,6 @@
 { stdenv, libusb1, pkgconfig, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "ltwheelconf";
   version = "0.2.7";
 
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix
index 8ce353e85b9..0802a32d92b 100644
--- a/pkgs/applications/misc/lxterminal/default.nix
+++ b/pkgs/applications/misc/lxterminal/default.nix
@@ -4,7 +4,7 @@
 
 let version = "0.3.2"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "lxterminal";
   inherit version;
 
diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix
index 318c7c25242..a81aec9d036 100644
--- a/pkgs/applications/misc/metamorphose2/default.nix
+++ b/pkgs/applications/misc/metamorphose2/default.nix
@@ -2,7 +2,7 @@
 , python27, python2Packages
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "metamorphose2";
   version = "0.9.0beta";
 
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 6c1dcd5e150..2eee9ad40c1 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "milu-nightly";
   version = "2016-05-09";
 
diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
index 95ceaddb4f0..eff93c8e99c 100644
--- a/pkgs/applications/misc/minergate-cli/default.nix
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, makeWrapper, openssl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "8.2";
   pname = "minergate-cli";
   src = fetchurl {
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index fdd1238d870..a8402d97593 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "8.1";
   pname = "minergate";
   src = fetchurl {
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index d3e7f9e8cd4..303b9fe5e8b 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     install -D -t $out/share/applications $desktopItem/share/applications/*
   '';
 
-  desktopItem = makeDesktopItem rec {
+  desktopItem = makeDesktopItem {
     name = "mlterm";
     exec = "mlterm %U";
     icon = "mlterm";
diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix
index fffa9595262..35de284c0ba 100644
--- a/pkgs/applications/misc/mpvc/default.nix
+++ b/pkgs/applications/misc/mpvc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, socat, fetchFromGitHub, makeWrapper }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "mpvc-unstable-2017-03-18";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix
index 411b318a392..27d7ad8730b 100644
--- a/pkgs/applications/misc/omegat.nix
+++ b/pkgs/applications/misc/omegat.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip, jdk, makeWrapper}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "4.3.0";
   pname = "omegat";
 
diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index 4cbd7cb7119..2dfbb7a2370 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -16,7 +16,7 @@ let
 
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "osmctools";
   version = "0.8.5plus1.4.0";
 
diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index bc6f5965e89..9756d9b42b0 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
 
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
   pname = "pdf-quench";
   version = "1.0.5";
 
diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix
index e8ddec91e62..6fb70f1c9a2 100644
--- a/pkgs/applications/misc/phwmon/default.nix
+++ b/pkgs/applications/misc/phwmon/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitLab, pythonPackages }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "phwmon";
   version = "2017-04-10";
 
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
index 16c49d5f946..bd3796a572b 100644
--- a/pkgs/applications/misc/pmenu/default.nix
+++ b/pkgs/applications/misc/pmenu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pmenu";
   version = "2018-01-01";
 
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 45db856dbb9..7209ee3e400 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "posterazor-1.5.1";
 
   src = fetchurl {
diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index ecc372dc674..ab15855b910 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, libeb, lzo, qtbase
 , qtmultimedia, qttools, qtwebengine }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "qolibri";
   version = "2018-11-14";
 
diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix
index 47b4641234f..702cadfdaa9 100644
--- a/pkgs/applications/misc/qt-box-editor/default.nix
+++ b/pkgs/applications/misc/qt-box-editor/default.nix
@@ -7,7 +7,7 @@
 , tesseract
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "qt-box-editor";
   version = "unstable-2019-07-12";
 
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index 053eaf6e54c..9408f8c6288 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -18,7 +18,7 @@ let
   };
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
 
   name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}";
 
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index 114404c2597..e81c0b99264 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, undmg }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "sequel-pro";
   version = "1.1.2";
 
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index cb2cd3f1e62..f2e1aa6bdb6 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -3,7 +3,7 @@
 # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of
 # adding this to services.udev.packages on NixOS
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "solaar-unstable";
   version = "2019-01-30";
 
diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix
index eb408eaf6ee..bb1655b4463 100644
--- a/pkgs/applications/misc/ssocr/default.nix
+++ b/pkgs/applications/misc/ssocr/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, imlib2, libX11 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "ssocr";
   version = "unstable-2018-08-11";
 
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
index 1fc96e551ac..e051132c4e4 100644
--- a/pkgs/applications/misc/stupidterm/default.nix
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "stupidterm";
   version = "2019-03-26";
 
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index a29dad2c444..960b7b9eeef 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -6,7 +6,7 @@
 let
   version = "4.8.2";
 
-  libdc = stdenv.mkDerivation rec {
+  libdc = stdenv.mkDerivation {
     pname = "libdivecomputer-ssrf";
     inherit version;
 
@@ -66,7 +66,7 @@ let
     };
   };
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "subsurface";
   inherit version;
 
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index ee42c1389fc..9dcdf8fd2b0 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -71,7 +71,7 @@ let
 
   d2u = stdenv.lib.replaceChars ["."] ["_"];
 
-in rec {
+in {
 
   application = mkSweetHome3D rec {
     version = "6.2";
diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix
index 9f1773b191d..847092356d2 100644
--- a/pkgs/applications/misc/taskopen/default.nix
+++ b/pkgs/applications/misc/taskopen/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, makeWrapper, which, perl, perlPackages }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "taskopen-1.1.4";
   src = fetchurl {
     url = "https://github.com/ValiValpas/taskopen/archive/v1.1.4.tar.gz";
diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix
index 15ee275c0e1..547eea4f2d2 100644
--- a/pkgs/applications/misc/tdrop/default.nix
+++ b/pkgs/applications/misc/tdrop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
 , xwininfo, xdotool, xprop }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tdrop";
   version = "unstable-2018-11-13";
 
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 095681d136d..aae17905cb7 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -19,7 +19,7 @@
 , hicolor-icon-theme
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "tilix";
   version = "unstable-2019-08-03";
 
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 413f082fb22..4ccf204357c 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -7,7 +7,7 @@
 let
   pname = "tootle";
   version = "0.2.0";
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 04c6cc3606e..2aef45748ca 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "twmn-git-2018-10-01";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index e482e7e7c02..3561135ce61 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
 , dbus-glib, autoreconfHook, wrapGAppsHook }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "volnoti-unstable";
   version = "2013-09-23";
 
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 9040bb4318d..295d721d3c5 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -3,7 +3,7 @@
 , qtSupport ? true, qt4
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "0.31";
   pname = "xautoclick";
   src = fetchurl {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 0661a625e97..f3bbbf42d5b 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
 , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
    pname = "xneur";
    version = "0.20.0";
 
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index fe65004b32a..244a2c43a15 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libX11}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "xrq-unstable-2016-01-15";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
index 06e12416baa..f2da2957bd3 100644
--- a/pkgs/applications/misc/yarssr/default.nix
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -23,7 +23,7 @@ let
     gtk2
   ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   version = "git-2017-12-01";
   pname = "yarssr";