Merge pull request #333342 from pbsds/fix-deadnix-1722620675

treewide: remove nested let-in

pkgs/applications/editors/sublime/3/common.nix

@@ -27,7 +27,7 @@ let
 
   libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ];
-in let
+
   binaryPackage = stdenv.mkDerivation {
     pname = "${pname}-bin";
     version = buildVersion;

pkgs/applications/editors/sublime/4/common.nix

@@ -61,8 +61,7 @@ let
   ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [
     sqlite
   ];
-in
-let
+
   binaryPackage = stdenv.mkDerivation rec {
     pname = "${pnameBase}-bin";
     version = buildVersion;

pkgs/applications/editors/vim/macvim.nix

@@ -21,9 +21,7 @@ let
   perl = perl536;
   # Ruby 3.2
   ruby = ruby_3_2;
-in
 
-let
   # Building requires a few system tools to be in PATH.
   # Some of these we could patch into the relevant source files (such as xcodebuild and
   # qlmanage) but some are used by Xcode itself and we have no choice but to put them in PATH.

pkgs/applications/networking/dropbox/default.nix

@@ -15,9 +15,7 @@ let
   }.${stdenv.hostPlatform.system};
 
   installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz";
-in
 
-let
   desktopItem = makeDesktopItem {
     name = "dropbox";
     exec = "dropbox";

pkgs/applications/science/logic/hol/default.nix

@@ -4,16 +4,12 @@
 let
   pname = "hol4";
   vnum = "14";
-in
 
-let
   version = "k.${vnum}";
   longVersion = "kananaskis-${vnum}";
   holsubdir = "hol-${longVersion}";
   kernelFlag = if experimentalKernel then "--expk" else "--stdknl";
-in
 
-let
   polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: {
     configureFlags = [ "--enable-shared" ];
   });

pkgs/applications/version-management/sublime-merge/common.nix

@@ -60,8 +60,7 @@ let
     "/usr/bin/pkexec=${pkexecPath}"
     "/bin/true=${coreutils}/bin/true"
   ];
-in
-let
+
   binaryPackage = stdenv.mkDerivation rec {
     pname = "${pnameBase}-bin";
     version = buildVersion;

pkgs/applications/video/handbrake/default.nix

@@ -167,8 +167,7 @@ let
 
   inherit (lib) optional optionals optionalString versions;
 
-in
-let
+
   self = stdenv.mkDerivation rec {
     pname = "handbrake";
     inherit version src;

pkgs/development/julia-modules/default.nix

@@ -35,9 +35,7 @@ packageNames:
 let
   util = callPackage ./util.nix {};
 
-in
 
-let
   # Some Julia packages require access to Python. Provide a Nixpkgs version so it
   # doesn't try to install its own.
   pythonToUse = let

pkgs/tools/filesystems/irods/default.nix

@@ -5,8 +5,7 @@
 let
   avro-cpp = avro-cpp_llvm;
   nanodbc = nanodbc_llvm;
-in
-let
+
   common = import ./common.nix {
     inherit lib stdenv bzip2 zlib autoconf automake cmake
       help2man texinfo libtool cppzmq libarchive