diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 65bbd6516328..ad89c80fc8e4 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/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; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 952194e0260c..730f9c10b8f5 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/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; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index bf2fb1fb02f7..0cca3d97538f 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/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. diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index fd48bc86a9b8..e785bdccd2bc 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/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"; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index de47df098da1..f23dce326dd5 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/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" ]; }); diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 43a14907633c..a978ff16357d 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/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; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 4a45138aa555..610f5af8046e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/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; diff --git a/pkgs/development/julia-modules/default.nix b/pkgs/development/julia-modules/default.nix index 10db44717864..9c5c8b8eda5d 100644 --- a/pkgs/development/julia-modules/default.nix +++ b/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 diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index ccae722059e9..5db0ed453eab 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/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