mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

treewide: remove nested let-in

Browse Source
This commit is contained in:
Peder Bergebakken Sundt 2024-08-09 03:58:35 +02:00
parent 9307b49d29
commit dfbc165dc7
9 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/sublime/3/common.nix
View File

@ -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;

3
pkgs/applications/editors/sublime/4/common.nix
View File

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

2
pkgs/applications/editors/vim/macvim.nix
View File

@ -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.

2
pkgs/applications/networking/dropbox/default.nix
View File

@ -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";

4
pkgs/applications/science/logic/hol/default.nix
View File

@ -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" ];
});

3
pkgs/applications/version-management/sublime-merge/common.nix
View File

@ -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;

3
pkgs/applications/video/handbrake/default.nix
View File

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

2
pkgs/development/julia-modules/default.nix
View File

@ -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

3
pkgs/tools/filesystems/irods/default.nix
View File

@ -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