Unverified Commit 6a591294 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

treewide: remove nested let-in
parents 20d3d501 dfbc165d

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −4
Original line number Diff line number Diff line
@@ -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" ];

  });