diff --git a/pkgs/applications/anki/bin.nix b/pkgs/applications/anki/bin.nix
index 7d37073e4fe06087c7964277b400332d6c44006f..256a3019694678db99707c1d824b5c8d26d9b85f 100644
--- a/pkgs/applications/anki/bin.nix
+++ b/pkgs/applications/anki/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, undmg }:
-let
+stdenv.mkDerivation rec {
pname = "anki";
version = "2.1.35";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "ankitects";
diff --git a/pkgs/applications/gis/basecamp/default.nix b/pkgs/applications/gis/basecamp/default.nix
index f4ae2ee04b09a594c97925a32ebb63ffddbf73cd..afadc9c44fcb53e6b2ca12cb9d66025e834f8fbc 100644
--- a/pkgs/applications/gis/basecamp/default.nix
+++ b/pkgs/applications/gis/basecamp/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, undmg, xar, cpio }:
-let
+stdenv.mkDerivation rec {
pname = "basecamp";
version = "4.8.10";
-in
-stdenv.mkDerivation {
src = fetchurl {
url = "https://download.garmin.com/software/BaseCampforMac_${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.dmg";
diff --git a/pkgs/applications/gis/mapsoft/default.nix b/pkgs/applications/gis/mapsoft/default.nix
index 940029631c1f407bce8ae756b777b88d678da029..3bab037f1bf6c8b777c0f794a31b8ca2d248c6aa 100644
--- a/pkgs/applications/gis/mapsoft/default.nix
+++ b/pkgs/applications/gis/mapsoft/default.nix
@@ -28,13 +28,11 @@ , shapelib
, zlib
, getopt
}:
-let
-in
stdenv.mkDerivation {
src = sources.mapsoft;
patches = [ ./0001-fix-build.patch ];
diff --git a/pkgs/applications/gis/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix
index 6dbc23c0da970590a24d994af839b2a68572c562..e019d4758b244e80a7655aa5aa1714a430be9ae8 100644
--- a/pkgs/applications/gis/qgis/bin.nix
+++ b/pkgs/applications/gis/qgis/bin.nix
@@ -1,15 +1,13 @@
{ stdenv, fetchurl, undmg, releaseType ? "pr" }:
-assert releaseType == "pr" || releaseType == "ltr";
-let
+assert stdenv.lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ];
+stdenv.mkDerivation rec {
pname = "qgis";
version = {
pr = "3.14.16";
ltr = "3.10.10";
}.${releaseType};
-in
-stdenv.mkDerivation {
src = fetchurl {
url = "https://qgis.org/downloads/macos/qgis-macos-${releaseType}.dmg";
diff --git a/pkgs/applications/gis/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix
index 358de026a4bbfc6aaa56cb05c9ef97c9bdd0e7f1..0bb56d752bea46c62f0039c397fcfc13a0251eb9 100644
--- a/pkgs/applications/gis/qmapshack/bin.nix
+++ b/pkgs/applications/gis/qmapshack/bin.nix
@@ -1,18 +1,15 @@
{ stdenv, fetchfromgh, unzip }:
-let
+stdenv.mkDerivation rec {
pname = "qmapshack";
version = "1.15.0";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "Maproom";
repo = pname;
version = "V_${version}";
name = "QMapShack_OSX.${stdenv.appleSdkVersion}_${version}.zip";
};
sourceRoot = ".";
diff --git a/pkgs/applications/goldendict/bin.nix b/pkgs/applications/goldendict/bin.nix
index 9721e82c3d537de1b3f7402c881e9c68757fa6bf..f8150ac8d2a82dd1038601fca7120bd862af7778 100644
--- a/pkgs/applications/goldendict/bin.nix
+++ b/pkgs/applications/goldendict/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, undmg }:
-let
+stdenv.mkDerivation rec {
pname = "goldendict";
version = "1.5.0-RC2-372-gc3ff15f";
-in
-stdenv.mkDerivation {
src = fetchurl {
url = "https://downloads.sourceforge.net/project/goldendict/early%20access%20builds/MacOS/GoldenDict-${version}%28Qt_5121%29.dmg";
diff --git a/pkgs/applications/gpxlab/default.nix b/pkgs/applications/gpxlab/default.nix
index 8d79f8b0470fa3c220034ada56b2204e8e8c7e61..c406a4a84e5e34c838669cdf5dceac30103f239f 100644
--- a/pkgs/applications/gpxlab/default.nix
+++ b/pkgs/applications/gpxlab/default.nix
@@ -9,13 +9,11 @@ , sources
, substituteAll
, withI18n ? true
}:
-let
-in
-mkDerivation {
+mkDerivation rec {
src = sources.gpxlab;
patches = (substituteAll {
@@ -29,7 +27,6 @@ sed -i "s/(VERSION = ).*/\1${version}/" GPXLab/GPXLab.pro
'';
nativeBuildInputs = [ qmake ] ++ (lib.optional withI18n qttools);
preConfigure = lib.optionalString withI18n ''
lrelease GPXLab/locale/*.ts
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
index bb904131c9f733fc7c2d785fed0c25b9daecc412..d72b319bff25cf72b0a71b5724858f1a5ac2a570 100644
--- a/pkgs/applications/gpxsee/bin.nix
+++ b/pkgs/applications/gpxsee/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, undmg, sources }:
-let
+stdenv.mkDerivation rec {
pname = "gpxsee";
version = "7.36";
-in
-stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/gpxsee/GPXSee-${version}.dmg";
diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix
index 138c48f060fe4dea9faeae110e23383912de2d15..7845ea62487520f3d2d235a092e7690dfc2b1a23 100644
--- a/pkgs/applications/gpxsee/default.nix
+++ b/pkgs/applications/gpxsee/default.nix
@@ -9,13 +9,11 @@ , sources
, substituteAll
, withI18n ? true
}:
-let
-in
-mkDerivation {
+mkDerivation rec {
src = sources.gpxsee;
patches = (substituteAll {
diff --git a/pkgs/applications/iterm2/bin.nix b/pkgs/applications/iterm2/bin.nix
index 4289c2b3c815ac9fe8e153d70210c082ef59790f..141529a1d8374815ffebc43f85e640e152a8d37a 100644
--- a/pkgs/applications/iterm2/bin.nix
+++ b/pkgs/applications/iterm2/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchurl, unzip }:
-let
+stdenv.mkDerivation rec {
pname = "iterm2";
version = "3.3.12";
-in
-stdenv.mkDerivation {
src = fetchurl {
url = "https://iterm2.com/downloads/stable/iTerm2-${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}.zip";
diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix
index 9635f5fd255cf06770b542c511f0f25f5a0547c6..0babfb3eff2dee52ed34c3fc3446e761326da546 100644
--- a/pkgs/applications/macpass/bin.nix
+++ b/pkgs/applications/macpass/bin.nix
@@ -1,17 +1,15 @@
{ stdenv, fetchfromgh, unzip }:
-let
+stdenv.mkDerivation rec {
pname = "MacPass";
version = "0.7.12";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "MacPass";
repo = pname;
name = "MacPass-${version}.zip";
};
sourceRoot = ".";
diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix
index 827a3e1ef75ccdf1bf260ce70d0575f01c35925d..451f649078dd3e3185d05edb5d6743d1330a9be7 100644
--- a/pkgs/applications/misc/klogg/bin.nix
+++ b/pkgs/applications/misc/klogg/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, undmg, sources }:
-let
+stdenv.mkDerivation rec {
pname = "klogg";
version = "20.4";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "variar";
diff --git a/pkgs/applications/misc/klogg/default.nix b/pkgs/applications/misc/klogg/default.nix
index c17c5531c79120a9f7715db88bd72cd54d7d5022..7d129f14a70d76793bb3279d1e404f7b96d740be 100644
--- a/pkgs/applications/misc/klogg/default.nix
+++ b/pkgs/applications/misc/klogg/default.nix
@@ -6,13 +6,11 @@ , ninja
, sources
, useSentry ? stdenv.isLinux
}:
-let
-in
-mkDerivation {
+mkDerivation rec {
src = sources.klogg;
nativeBuildInputs = [ cmake ninja ];
diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix
index 995ff752f14c065d238fb39bfd1d5132ea356741..f7eae838a938b918515fd3c0cb1fed8be6c64238 100644
--- a/pkgs/applications/networking/qutebrowser/bin.nix
+++ b/pkgs/applications/networking/qutebrowser/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, undmg }:
-let
+stdenv.mkDerivation rec {
pname = "qutebrowser";
version = "1.14.0";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "qutebrowser";
diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix
index 838af3efbe6403c616c9a2ac6ab9f8fecdc74145..dad8222e1214cf02d64b636e93ba780f7851a2ec 100644
--- a/pkgs/applications/nnn-plugins/default.nix
+++ b/pkgs/applications/nnn-plugins/default.nix
@@ -1,11 +1,9 @@
{ stdenv, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.nnn;
phases = [ "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/openorienteering-mapper/bin.nix b/pkgs/applications/openorienteering-mapper/bin.nix
index 5717eaada713bb03acfcc19d2751c93f2ce3dafd..794ab13afdbf1617e3998cf5b92d882e46e7ba50 100644
--- a/pkgs/applications/openorienteering-mapper/bin.nix
+++ b/pkgs/applications/openorienteering-mapper/bin.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchfromgh, undmg, sources }:
-let
+stdenv.mkDerivation rec {
pname = "Openorienteering-Mapper";
version = "20201026.1";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "OpenOrienteering";
diff --git a/pkgs/applications/openorienteering-mapper/default.nix b/pkgs/applications/openorienteering-mapper/default.nix
index 2fb38b854e0d1f9bffdb64095399bc6a26a29cfa..3f26216ca5ef5c28b9301c63f4fdb10073337cbc 100644
--- a/pkgs/applications/openorienteering-mapper/default.nix
+++ b/pkgs/applications/openorienteering-mapper/default.nix
@@ -18,13 +18,11 @@ , qtimageformats
, sources
, substituteAll
}:
-let
-in
-mkDerivation {
+mkDerivation rec {
src = sources.mapper;
patches = [
diff --git a/pkgs/applications/redict/default.nix b/pkgs/applications/redict/default.nix
index 3aec3694ad1500c006044b60ca8cd78f53a09e03..7ca8737f9c64953a54326064104250949f3e7e39 100644
--- a/pkgs/applications/redict/default.nix
+++ b/pkgs/applications/redict/default.nix
@@ -14,18 +14,17 @@ , libXtst
, sources
, withI18n ? true
}:
-let
-in
mkDerivation {
src = sources.redict;
postPatch = ''
substituteInPlace redict.pro \
diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix
index a576081b47bb3093197d2111e6726575a0989a92..0d6e7062fc26adb287f4e4ddaa0fa4d92a38ceb8 100644
--- a/pkgs/applications/visualgps/default.nix
+++ b/pkgs/applications/visualgps/default.nix
@@ -6,8 +6,8 @@ , qtserialport
}:
mkDerivation {
src = fetchFromGitHub {
owner = "VisualGPS";
diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix
index ac9ce7db38b7cf0bbeba7d2c460330f3c6b18d12..bb7b09030abe5a995a7ca9fc0fdb422b8b04fbb0 100644
--- a/pkgs/applications/window-managers/amethyst/bin.nix
+++ b/pkgs/applications/window-managers/amethyst/bin.nix
@@ -1,18 +1,15 @@
{ stdenv, fetchfromgh, unzip }:
-let
+stdenv.mkDerivation rec {
pname = "Amethyst";
version = "0.15.4";
-in
-stdenv.mkDerivation {
src = fetchfromgh {
owner = "ianyh";
repo = pname;
version = "v${version}";
name = "Amethyst.zip";
};
sourceRoot = ".";
diff --git a/pkgs/applications/window-managers/yabai/default.nix b/pkgs/applications/window-managers/yabai/default.nix
index 2593a2dab86764ea9575e5c7c2de4ee3b83b3a6b..849b0cf922b0915648463c330871e1ff3d2bfc7a 100644
--- a/pkgs/applications/window-managers/yabai/default.nix
+++ b/pkgs/applications/window-managers/yabai/default.nix
@@ -1,10 +1,8 @@
{ stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }:
-let
+stdenv.mkDerivation rec {
pname = "yabai";
version = "3.3.0";
-in
-stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "koekeishiya";
diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix
index ca69437b7d484cc39b35a4dc433f4ddb4f9c5451..21f65c9cde3e00e97e8ebf4f993876b816a5adbf 100644
--- a/pkgs/data/dicts/it-sanasto/default.nix
+++ b/pkgs/data/dicts/it-sanasto/default.nix
@@ -1,10 +1,9 @@
{ stdenvNoCC, lib, pandoc, stardict-tools, sources }:
-let
+stdenvNoCC.mkDerivation {
pname = "it-sanasto";
version = lib.substring 0 10 sources.it-sanasto.date;
-in
-stdenvNoCC.mkDerivation {
src = sources.it-sanasto;
nativeBuildInputs = [ pandoc stardict-tools ];
@@ -12,13 +11,13 @@
buildPhase = ''
for i in *.md; do
pandoc -f markdown -t html -s $i | awk -F "</*td>" '/<\/*td>.*/ {print $2}'
'';
installPhase = ''
'';
meta = with lib; {
diff --git a/pkgs/data/firmwares/gpsmap64/default.nix b/pkgs/data/firmwares/gpsmap64/default.nix
index a3992d7552af82a4220681186af9708a9f805a06..43c686f6408f46d067bd3fd1b712bf0ed972d5d7 100644
--- a/pkgs/data/firmwares/gpsmap64/default.nix
+++ b/pkgs/data/firmwares/gpsmap64/default.nix
@@ -11,9 +11,7 @@ sha256 = "1pb4clvwfc7cnsl4n9nbgf5fq8ni7dysrkv48l2286c6knxa3rwd";
downloadToTemp = true;
recursiveHash = true;
preferLocalBuild = true;
meta = with lib; {
homepage = "https://www8.garmin.com/support/download_details.jsp?id=6805";
diff --git a/pkgs/data/maps/dem/default.nix b/pkgs/data/maps/dem/default.nix
index 2c9467ff59953e31f4c961d0f85a9f4f6f83e002..27d1a457c31f8095ac8e72caaef1cd79ef1ce2f5 100644
--- a/pkgs/data/maps/dem/default.nix
+++ b/pkgs/data/maps/dem/default.nix
@@ -1,4 +1,5 @@
-{ stdenvNoCC, lib, fetchurl, unzip, gdal }:
+{ stdenvNoCC, lib, fetchurl, unzip
+, withVRT ? true, gdal }:
let
dem1 = builtins.fromJSON (builtins.readFile ./dem1.json);
in
@@ -10,6 +11,8 @@ srcs = lib.mapAttrsToList (name: spec: fetchurl spec) dem1;
unpackPhase = "for src in $srcs; do ${unzip}/bin/unzip $src; done";
dontConfigure = true;
dontBuild = true;
dontFixup = true;
@@ -18,7 +21,8 @@ preferLocalBuild = true;
installPhase = ''
install -Dm644 **/*.hgt -t $out
'';
meta = with lib; {
diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix
index 9d384c902c60b2bf37c46ce8fca973c32ed69c35..80fd564e68887d8a3943c1c45f63dd0ac5a1a860 100644
--- a/pkgs/data/maps/gpxsee-maps/default.nix
+++ b/pkgs/data/maps/gpxsee-maps/default.nix
@@ -19,13 +19,11 @@ "World/here-*.xml"
"World/marshruty.ru.xml"
]
}:
-let
-in
stdenvNoCC.mkDerivation {
src = sources.gpxsee-maps;
postPatch = ''
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
index f5add149e4245d70058b7bf497bd0bb68907b338..142920d9da1a7aecc05c83247c6267aa999e1443 100644
--- a/pkgs/data/maps/slazav/hr.nix
+++ b/pkgs/data/maps/slazav/hr.nix
@@ -1,11 +1,9 @@
{ stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.map-hr;
patches = [ ./0001-fix-hr.patch ];
diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
index 55bc6943323af7419eb06227e21043041a8e80a5..57bb98c6fd21f235c4ff216e5eaa1a07c0b3cb37 100644
--- a/pkgs/data/maps/slazav/podm.nix
+++ b/pkgs/data/maps/slazav/podm.nix
@@ -1,11 +1,9 @@
{ stdenv, cgpsmapper, gmaptool, imagemagick, mapsoft, netpbm, zip, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.map-podm;
patches = [ ./0001-fix-podm.patch ];
@@ -32,9 +30,7 @@ preBuild = "mkdir -p OUT";
buildFlags = [ "out" "img" ];
meta = with stdenv.lib; {
inherit (sources.map-podm) description homepage;
diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
index 8bcfaf9fa5788b4343c0e8a2496fd14cfc0b57b4..89b8119c91bb1788a9a86c9c4e520b9641188492 100644
--- a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
+++ b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -1,11 +1,9 @@
{ stdenv, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.qtpbfimageplugin-styles;
dontBuild = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index a6b71ebf0e814d8e7912c34067031d143cae7018..dae3683deecf4491ad5a064dccd71b33a040583a 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -138,6 +138,7 @@ click = click-6-7;
};
fx-bin = callPackage ./tools/text/fx/bin.nix { };
garmin-uploader = callPackage ./tools/misc/garmin-uploader { };
gimgtools = callPackage ./tools/geo/gimgtools { };
gloggery = callPackage ./tools/misc/gloggery { };
gmaptool = callPackage ./tools/geo/gmaptool { };
diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix
index 0fed21d6dc743039e52a82ac7b930cdd1c6ae4e6..1ba6949ad9db83dc3eea83d8c40f2cfd6b70287c 100644
--- a/pkgs/development/libraries/foma/default.nix
+++ b/pkgs/development/libraries/foma/default.nix
@@ -1,11 +1,9 @@
{ stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.foma;
sourceRoot = "source/foma";
diff --git a/pkgs/development/libraries/gpxlib/default.nix b/pkgs/development/libraries/gpxlib/default.nix
index 1b36922df68bc5d7a6445fe3bf95e68c99f03d38..ab6aafedb1bc93d895a3aa568d3b8f38a1567fb8 100644
--- a/pkgs/development/libraries/gpxlib/default.nix
+++ b/pkgs/development/libraries/gpxlib/default.nix
@@ -1,11 +1,9 @@
{ stdenv, cmake, expat, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.gpxlib;
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix
index 75b80661fba8b684cb9c61c3226b684710f90a22..d7918174da96057e9c025e2bb401f17f0461a85e 100644
--- a/pkgs/development/libraries/hfst/default.nix
+++ b/pkgs/development/libraries/hfst/default.nix
@@ -1,11 +1,9 @@
{ stdenv, autoreconfHook, bison, flex, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.hfst;
nativeBuildInputs = [ autoreconfHook bison flex ];
diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix
index 0d3c8aff089480213a1713b5ba7718fdfc420c60..e07227f581801102949ade0ec3b882fd83852ae2 100644
--- a/pkgs/development/libraries/libgarmin/default.nix
+++ b/pkgs/development/libraries/libgarmin/default.nix
@@ -2,7 +2,7 @@ { stdenv, fetchsvn, autoconf, automake, libtool }:
stdenv.mkDerivation {
pname = "libgarmin";
src = fetchsvn {
url = "https://svn.code.sf.net/p/libgarmin/svn/libgarmin/dev";
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
index 510c9bf28013632c217de760ad5a683f5ad41430..ff22b99e6829d0983cc401962a8df5de33c1eba8 100644
--- a/pkgs/development/libraries/libshell/default.nix
+++ b/pkgs/development/libraries/libshell/default.nix
@@ -7,13 +7,11 @@ , sources
, withDoc ? false
, scdoc
}:
-let
-in
stdenv.mkDerivation {
src = sources.libshell;
nativeBuildInputs = [ help2man ];
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
index 1faa59636dce5a5f00f087e27646cef43cea2602..81ae64215e8347ff725fa0390a0509b5162ce2ef 100644
--- a/pkgs/development/libraries/microjson/default.nix
+++ b/pkgs/development/libraries/microjson/default.nix
@@ -1,11 +1,9 @@
{ stdenv, cmake, gtest, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.microjson;
postPatch = ''
diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix
index 90518bf924e3f2e93dc9283968707e8a8d5c483e..288a8664b8995e136dc94025d640bd500f990648 100644
--- a/pkgs/development/python-modules/cheetah3/default.nix
+++ b/pkgs/development/python-modules/cheetah3/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.cheetah3;
checkInputs = with python3Packages; [ pygments markdown ];
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index b2f7831a8a5f63cc32a211a58729b53efdec7785..87f3dece8f4e01df321ab1f7cb9190c24111c760 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -1,10 +1,8 @@
{ lib, python3Packages, substituteAll, locale }:
-let
+python3Packages.buildPythonPackage rec {
pname = "click";
version = "6.7";
-in
-python3Packages.buildPythonPackage {
src = python3Packages.fetchPypi {
inherit pname version;
diff --git a/pkgs/development/python-modules/gpxelevations/default.nix b/pkgs/development/python-modules/gpxelevations/default.nix
index f73e38ec79772551158e0b75201bd3a312915fdf..6df9013033d79812bc68dfefbd33a4c0d5c7e5dd 100644
--- a/pkgs/development/python-modules/gpxelevations/default.nix
+++ b/pkgs/development/python-modules/gpxelevations/default.nix
@@ -1,13 +1,11 @@
{ lib, python3Packages, fetchurl, sources }:
let
testdata = import ./testdata.nix { inherit fetchurl; };
in
python3Packages.buildPythonApplication {
src = sources.gpxelevations;
propagatedBuildInputs = with python3Packages; [ requests gpxpy ];
diff --git a/pkgs/development/python-modules/jsonseq/default.nix b/pkgs/development/python-modules/jsonseq/default.nix
index 70b19c368fa3ffed3b3d62ade015dcd4496d7e25..1f41d3fec11f5f3188fc9c8c0409e43381391662 100644
--- a/pkgs/development/python-modules/jsonseq/default.nix
+++ b/pkgs/development/python-modules/jsonseq/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.jsonseq;
checkInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 2c7d4fad130e2a8283885ee327d46fd872925a4b..6d702497dffbeb8fd9455857f4fc57f2d351f649 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.mercantile;
propagatedBuildInputs = with python3Packages; [ click ];
diff --git a/pkgs/development/python-modules/mikatools/default.nix b/pkgs/development/python-modules/mikatools/default.nix
index 9150abea80dd3843e83934bf767d59d9070ae148..fc299d7eb1e8b13a98136df03a7d6dd3947d86d9 100644
--- a/pkgs/development/python-modules/mikatools/default.nix
+++ b/pkgs/development/python-modules/mikatools/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.mikatools;
propagatedBuildInputs = with python3Packages; [ requests clint ];
diff --git a/pkgs/development/python-modules/pyephem/default.nix b/pkgs/development/python-modules/pyephem/default.nix
index 9a1ca911e3a22ad89418d96e4bec7cd86589618e..16bb458d8ad22ec4454b397a839ffa0a52673c58 100644
--- a/pkgs/development/python-modules/pyephem/default.nix
+++ b/pkgs/development/python-modules/pyephem/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.pyephem;
meta = with lib; {
diff --git a/pkgs/development/python-modules/pymbtiles/default.nix b/pkgs/development/python-modules/pymbtiles/default.nix
index 99cbd80e89e2c154f08991c0825bf40932f04563..1d6f58211ad5f5fd2bb1ef1fe97917cfd379970b 100644
--- a/pkgs/development/python-modules/pymbtiles/default.nix
+++ b/pkgs/development/python-modules/pymbtiles/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.pymbtiles;
checkInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/s2sphere/default.nix b/pkgs/development/python-modules/s2sphere/default.nix
index 7a77856685833c308c84b6210267d225fe9a831f..d7a77879c61ac628bf6a6cda024bb100fbded865 100644
--- a/pkgs/development/python-modules/s2sphere/default.nix
+++ b/pkgs/development/python-modules/s2sphere/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonPackage {
src = sources.s2sphere;
propagatedBuildInputs = with python3Packages; [ future ];
diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix
index 109328013ee190f3ec8d4ad7a4709a1632ea20da..d533dac926466d2b3fce3d6f9bbfac0de47a97b2 100644
--- a/pkgs/development/tools/gef/default.nix
+++ b/pkgs/development/tools/gef/default.nix
@@ -8,10 +8,6 @@ , binutils-unwrapped
, gdb
}:
let
initGef = writeScript "init-gef" ''
source @out@/share/gef/gef.py
'';
@@ -25,7 +21,9 @@ ''
);
in
stdenv.mkDerivation {
src = sources.gef;
dontBuild = true;
diff --git a/pkgs/development/tools/kiln/default.nix b/pkgs/development/tools/kiln/default.nix
index aaf1c26928753c6fb5845bef528c2b3a32b0f328..69d4c258f89694be79403cdd613e1d61bb9ed437 100644
--- a/pkgs/development/tools/kiln/default.nix
+++ b/pkgs/development/tools/kiln/default.nix
@@ -2,15 +2,15 @@ { lib, buildGoModule, fetchgit, sources }:
buildGoModule {
pname = "kiln";
src = fetchgit {
url = "https://git.sr.ht/~adnano/kiln";
};
meta = with lib; {
description = "A simple static site generator for Gemini";
diff --git a/pkgs/development/tools/pvs-studio/default.nix b/pkgs/development/tools/pvs-studio/default.nix
index 700739d31730d01c318f918762fb5db8cd65d63b..47c806ffc89a0258fecc1fd0628ae73b67909b8f 100644
--- a/pkgs/development/tools/pvs-studio/default.nix
+++ b/pkgs/development/tools/pvs-studio/default.nix
@@ -3,16 +3,14 @@ let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
suffix = {
x86_64-linux = "x86_64";
x86_64-darwin = "macos";
}.${system} or throwSystem;
in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
src = fetchurl {
url = "https://files.viva64.com/pvs-studio-${version}-${suffix}.tgz";
diff --git a/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix
index ce1ae91f6beddd05b90f78158461d1b8beb1e9fb..8f6360d6f5373369a8f30c60f0533f544cb5b189 100644
--- a/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix
+++ b/pkgs/development/tools/pvs-studio/how-to-use-pvs-studio-free.nix
@@ -1,11 +1,9 @@
{ stdenv, cmake, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.how-to-use-pvs-studio-free;
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/tools/xtr/default.nix b/pkgs/development/tools/xtr/default.nix
index 9103a142dfd67767e9543d6b1d54e2c8c2c25a63..2cb54f828b2b3702146e2cafa3655b322151654e 100644
--- a/pkgs/development/tools/xtr/default.nix
+++ b/pkgs/development/tools/xtr/default.nix
@@ -1,11 +1,9 @@
{ lib, rustPlatform, sources }:
-let
-in
rustPlatform.buildRustPackage {
src = sources.xtr;
cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix
index 04bc7269e32282c1eb6b99d9ec831ba834a5ea71..1ea47042a6aaac71271bcfd1bf0da1ba44029e1e 100644
--- a/pkgs/embox/default.nix
+++ b/pkgs/embox/default.nix
@@ -8,13 +8,9 @@ , python
, qemu
, unzip
, which
+, template ? "arm/qemu"
}:
let
cjson = fetchurl {
url = "mirror://sourceforge/cjson/cJSONFiles.zip";
sha256 = "19qdsfq4r7gjr39lkjplz418gkl2xg5j5fpdz9phlxlbggnklqhd";
@@ -31,7 +27,9 @@ -nographic
'';
in
stdenv.mkDerivation {
src = sources.embox;
patches = [ ./0001-fix-build.patch ];
diff --git a/pkgs/servers/dict2rest/default.nix b/pkgs/servers/dict2rest/default.nix
index 4d8cd58cbaa98484c265628a62cc08da74b58913..a911706d618289405a3f8a33c21299fa93a871ba 100644
--- a/pkgs/servers/dict2rest/default.nix
+++ b/pkgs/servers/dict2rest/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoPackage, sources }:
-let
-in
buildGoPackage {
src = sources.dict2rest;
goPackagePath = "github.com/felix/go-dict2rest";
diff --git a/pkgs/servers/elevation_server/default.nix b/pkgs/servers/elevation_server/default.nix
index 8658eb1e942690d9b1084974ba70d567ea07464b..ccd55bbad0f702aad78403f63bb60a75edb7df30 100644
--- a/pkgs/servers/elevation_server/default.nix
+++ b/pkgs/servers/elevation_server/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoPackage, lz4, sources }:
-let
-in
buildGoPackage rec {
src = sources.elevation-server;
goPackagePath = "github.com/wladich/elevation_server";
diff --git a/pkgs/servers/geminid/default.nix b/pkgs/servers/geminid/default.nix
index d8279dba5cd33215e76408efb967da59b7ff98a5..7fb7de75389d2c480a4446426d9b597fdbea8ba4 100644
--- a/pkgs/servers/geminid/default.nix
+++ b/pkgs/servers/geminid/default.nix
@@ -1,11 +1,9 @@
{ stdenv, libconfig, file, openssl, flex, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.geminid;
nativeBuildInputs = [ flex ];
@@ -14,9 +12,7 @@ buildInputs = [ libconfig file openssl.dev ];
makeFlags = [ "geminid" "CC=cc" "LEX=flex" ];
meta = with stdenv.lib; {
inherit (sources.geminid) description homepage;
diff --git a/pkgs/servers/glauth/default.nix b/pkgs/servers/glauth/default.nix
index 2660ba57a7c00e6b16610d62272b76f76f16ed11..c7911f1bebe0a086d696fbf081bd0ca0c1c9cc68 100644
--- a/pkgs/servers/glauth/default.nix
+++ b/pkgs/servers/glauth/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoModule, go-bindata, sources }:
-let
-in
buildGoModule {
src = sources.glauth;
vendorSha256 = "18inm0s9mww7c19z9alnvy0g80d3laxh4lwbgzkcc8kf9zg25149";
diff --git a/pkgs/servers/nakarte/default.nix b/pkgs/servers/nakarte/default.nix
index 31218307ea19272b9833f36cce7a3a4679c03cbb..d755822066c7d231bf50c33a37959569db090fff 100644
--- a/pkgs/servers/nakarte/default.nix
+++ b/pkgs/servers/nakarte/default.nix
@@ -1,8 +1,7 @@
{ stdenv, mkYarnPackage, sources, secretsConfig ? null }:
let
pname = "nakarte";
in
mkYarnPackage {
name = "${pname}-${version}";
diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix
index e2b72098728cde925e80d38652b120d726f6f1f9..6d673f419f5780292ffb1e50e56c8128f8d31b7b 100644
--- a/pkgs/servers/pg_featureserv/default.nix
+++ b/pkgs/servers/pg_featureserv/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoModule, sources }:
-let
-in
buildGoModule {
src = sources.pg-featureserv;
vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r";
diff --git a/pkgs/servers/quark/default.nix b/pkgs/servers/quark/default.nix
index 938ef64884ce74e47153e9f6c8f276e520c5076d..c17eef9bdf419acd2730919f5c4d66f28e955c68 100644
--- a/pkgs/servers/quark/default.nix
+++ b/pkgs/servers/quark/default.nix
@@ -2,12 +2,12 @@ { stdenv, fetchgit }:
stdenv.mkDerivation {
pname = "quark";
src = fetchgit {
url = "git://git.suckless.org/quark";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/servers/shavit/default.nix b/pkgs/servers/shavit/default.nix
index 665ee198897c5a1449c949197fa538ecb6fd4909..74646641043a4c126cfd76c7512f6c77f6230a7c 100644
--- a/pkgs/servers/shavit/default.nix
+++ b/pkgs/servers/shavit/default.nix
@@ -2,7 +2,7 @@ { lib, buildGoModule, fetchgit, sources }:
buildGoModule {
pname = "shavit";
src = fetchgit {
url = "https://git.sr.ht/~yotam/shavit";
diff --git a/pkgs/tools/audio/musig/default.nix b/pkgs/tools/audio/musig/default.nix
index 5331d46798583a9389eb95e0eda81197edd8b7e1..e2d2d0ddb6ca743af0fce649bf07550695d00080 100644
--- a/pkgs/tools/audio/musig/default.nix
+++ b/pkgs/tools/audio/musig/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoModule, pkgconfig, portaudio, sources }:
-let
-in
-buildGoModule {
+buildGoModule rec {
src = sources.musig;
vendorSha256 = "0ha1xjdwibm8543b4bx0xrbigngiiakksdc6mnp0mz5y6ai56pg5";
diff --git a/pkgs/tools/cfiles/default.nix b/pkgs/tools/cfiles/default.nix
index df951376b360b3abc247de1f0b96351dc4e1d896..7d2b9af91a2468c20b674907fc4c3dc48e3c3371 100644
--- a/pkgs/tools/cfiles/default.nix
+++ b/pkgs/tools/cfiles/default.nix
@@ -1,11 +1,9 @@
{ stdenv, pkg-config, ncurses, w3m, ueberzug, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.cfiles;
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/dict/gdcv/default.nix b/pkgs/tools/dict/gdcv/default.nix
index a44f5084a91a031c051c644c0232877ceca03674..9ad5f5fa0dda86719e7ee6672d1bc567bed5c478 100644
--- a/pkgs/tools/dict/gdcv/default.nix
+++ b/pkgs/tools/dict/gdcv/default.nix
@@ -1,11 +1,9 @@
{ stdenv, pkgconfig, emacs, zlib, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.gdcv;
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/dict/gt-bash-client/default.nix b/pkgs/tools/dict/gt-bash-client/default.nix
index 6ad64429fd7580828240fd6508c2f8fefe612592..0bf899e97bb87bafd7fb47e5e63deb6361f32019 100644
--- a/pkgs/tools/dict/gt-bash-client/default.nix
+++ b/pkgs/tools/dict/gt-bash-client/default.nix
@@ -1,11 +1,9 @@
{ stdenv, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.gt-bash-client;
installPhase = ''
diff --git a/pkgs/tools/dict/gt4gd/default.nix b/pkgs/tools/dict/gt4gd/default.nix
index a4fc8ee3890ac00b60a8d444cce18be15c6e2607..7c4b0667035ea372ce7f18cceba899fb9f3a5cc2 100644
--- a/pkgs/tools/dict/gt4gd/default.nix
+++ b/pkgs/tools/dict/gt4gd/default.nix
@@ -1,14 +1,13 @@
{ lib, python3Packages, sources, withUI ? true }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.gt4gd;
postInstall = lib.optionalString withUI ''
install -Dm755 googletranslateui.py $out/bin/googletranslateui
diff --git a/pkgs/tools/dict/lsdreader/default.nix b/pkgs/tools/dict/lsdreader/default.nix
index 3461c317e8e4fcbe397498696c08ff31b0abf903..20e6e79bea02e0e7019921765a417cf86b61b96e 100644
--- a/pkgs/tools/dict/lsdreader/default.nix
+++ b/pkgs/tools/dict/lsdreader/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.lsdreader;
doCheck = false;
diff --git a/pkgs/tools/dict/odict/default.nix b/pkgs/tools/dict/odict/default.nix
index 8cdcef26cbcc7506f5366666b668ee6109cbffe2..5260e7f6f6e1a5fcc48b2c4feb678bf5ef434245 100644
--- a/pkgs/tools/dict/odict/default.nix
+++ b/pkgs/tools/dict/odict/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoModule, sources }:
-let
-in
buildGoModule {
src = sources.odict;
vendorSha256 = "083mvrgpv9hyfmi26sankv940qp0bmyr55jm33dx1ivhd2xhkg78";
diff --git a/pkgs/tools/dict/stardict-tools/default.nix b/pkgs/tools/dict/stardict-tools/default.nix
index 4280bb3adedc6f69363845bc256af9a99327bb08..03f0773b0e4251b8776bd1e6c632d28d9dc4e558 100644
--- a/pkgs/tools/dict/stardict-tools/default.nix
+++ b/pkgs/tools/dict/stardict-tools/default.nix
@@ -9,13 +9,11 @@ , libxml2
, pcre
, sources
}:
-let
-in
stdenv.mkDerivation {
src = sources.stardict-3;
nativeBuildInputs = [
@@ -53,7 +51,7 @@ enableParallelBuilding = true;
meta = with stdenv.lib; {
inherit (sources.stardict-3) description homepage;
maintainers = [ maintainers.sikmir ];
platforms = platforms.unix;
broken = stdenv.isDarwin;
diff --git a/pkgs/tools/dict/tatoebatools/default.nix b/pkgs/tools/dict/tatoebatools/default.nix
index ca515de72ef8ee27971ce8097ae7cca10d61a158..842bd11c40ccbab15f849b6f556388cd30047df1 100644
--- a/pkgs/tools/dict/tatoebatools/default.nix
+++ b/pkgs/tools/dict/tatoebatools/default.nix
@@ -1,11 +1,9 @@
-{ lib, python3Packages, sources }:
-let
-in
+{ lib, python3Packages, sources, withCli ? true }:
python3Packages.buildPythonApplication {
src = sources.tatoebatools;
propagatedBuildInputs = with python3Packages; [ beautifulsoup4 pandas requests tqdm ];
diff --git a/pkgs/tools/dict/zdict/default.nix b/pkgs/tools/dict/zdict/default.nix
index 6bd2e0b5f5f6cc8b351f7d1ada1db3d04e39b90b..96e28e9d2efab51f20fd2a55f6cd2f8deabf20d4 100644
--- a/pkgs/tools/dict/zdict/default.nix
+++ b/pkgs/tools/dict/zdict/default.nix
@@ -1,11 +1,9 @@
{ lib, python37Packages, sources }:
-let
-in
python37Packages.buildPythonApplication {
src = sources.zdict;
propagatedBuildInputs = with python37Packages; [
diff --git a/pkgs/tools/docker-reg-tool/default.nix b/pkgs/tools/docker-reg-tool/default.nix
index fd183ac92ae919b0b2d7bc4a5e7f2f91b40669bd..f9c6ea1ccd69d4e0fc4ef72777ed631673a148db 100644
--- a/pkgs/tools/docker-reg-tool/default.nix
+++ b/pkgs/tools/docker-reg-tool/default.nix
@@ -1,16 +1,12 @@
{ stdenv, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.docker-reg-tool;
meta = with stdenv.lib; {
inherit (sources.docker-reg-tool) description homepage;
diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix
index b9131c4ff856061d3136f817cf35a089bf402e6d..52c7016160a07efc7b70df190c62e1d534d1dd17 100644
--- a/pkgs/tools/geo/datamaps/default.nix
+++ b/pkgs/tools/geo/datamaps/default.nix
@@ -1,11 +1,9 @@
{ stdenv, libpng, pkg-config, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.datamaps;
nativeBuildInputs = [ pkg-config ];
@@ -16,7 +14,7 @@ enableParallelBuilding = true;
installPhase = ''
for tool in encode enumerate merge render; do
install -Dm755 $tool $out/bin/$pname-$tool
install -Dm755 $tool $out/bin/datamaps-$tool
done
'';
diff --git a/pkgs/tools/geo/elevation/default.nix b/pkgs/tools/geo/elevation/default.nix
index cdc49d019e27e862efd4bdcef9809c1a7cb7c6a2..40900303e6d118c7cf7cb7089c3f9e16db4b0b58 100644
--- a/pkgs/tools/geo/elevation/default.nix
+++ b/pkgs/tools/geo/elevation/default.nix
@@ -8,13 +8,11 @@ , gzip
, gdal
, sources
}:
-let
-in
python3Packages.buildPythonApplication {
src = sources.elevation;
propagatedBuildInputs = with python3Packages; [ fasteners appdirs click setuptools ];
diff --git a/pkgs/tools/geo/gimgtools/default.nix b/pkgs/tools/geo/gimgtools/default.nix
index 98e0485535e2de6e70da504a77fa01f9084b3970..677fbe9a7eccf263a0d0f61cc251e41d85e9d801 100644
--- a/pkgs/tools/geo/gimgtools/default.nix
+++ b/pkgs/tools/geo/gimgtools/default.nix
@@ -1,11 +1,9 @@
{ stdenv, sources, libiconv }:
-let
-in
stdenv.mkDerivation {
src = sources.gimgtools;
buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
diff --git a/pkgs/tools/geo/go-staticmaps/default.nix b/pkgs/tools/geo/go-staticmaps/default.nix
index 42b21dd2f78ed9c2dd062759d464d6a815901d0f..bf0b92d20a0dda640807950240fd607d807ce38c 100644
--- a/pkgs/tools/geo/go-staticmaps/default.nix
+++ b/pkgs/tools/geo/go-staticmaps/default.nix
@@ -1,11 +1,9 @@
{ lib, buildGoModule, sources }:
-let
-in
buildGoModule {
src = sources.go-staticmaps;
vendorSha256 = "13zp6fxjmaxnn2ald8n9gjlx225w9bvq1xwibns1bdsq2c6gyffz";
diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix
index 98ce07fa4f3c1df1968e470c85af771ddb1757b6..4619a1f264577e5c972cd5eba020b33688f11c9c 100644
--- a/pkgs/tools/geo/gpx-layer/default.nix
+++ b/pkgs/tools/geo/gpx-layer/default.nix
@@ -1,11 +1,9 @@
{ stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }:
-let
-in
buildPerlPackage {
src = sources.gpx-layer;
outputs = [ "out" ];
diff --git a/pkgs/tools/geo/gpxtrackposter/default.nix b/pkgs/tools/geo/gpxtrackposter/default.nix
index ac5bb3e276c7bdcf4cac6d1080d26e99e1db7c6b..6ef898217625aa2c3c49be8e31fe898346e6ea8f 100644
--- a/pkgs/tools/geo/gpxtrackposter/default.nix
+++ b/pkgs/tools/geo/gpxtrackposter/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, s2sphere, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.gpxtrackposter;
patches = [ ./fix-localedir.patch ];
diff --git a/pkgs/tools/geo/ocad2img/default.nix b/pkgs/tools/geo/ocad2img/default.nix
index 837ecb63ac0662beb142877d6326c084759985b1..28a578cbfc72d84d76054e3fe394683b86e4b49a 100644
--- a/pkgs/tools/geo/ocad2img/default.nix
+++ b/pkgs/tools/geo/ocad2img/default.nix
@@ -2,7 +2,7 @@ { stdenv, buildPerlPackage, fetchwebarchive, unzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:
buildPerlPackage {
pname = "ocad2img";
src = fetchwebarchive {
url = "http://worldofo.com/div/ocad2img.zip";
diff --git a/pkgs/tools/geo/ocad2mp/default.nix b/pkgs/tools/geo/ocad2mp/default.nix
index 902b8938b9d1f8dbe9f7ba304d88f36523c9c85a..d23deb113c388a15c8bde607ba3ab1773a2ab41e 100644
--- a/pkgs/tools/geo/ocad2mp/default.nix
+++ b/pkgs/tools/geo/ocad2mp/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchsvn }:
stdenv.mkDerivation {
src = fetchsvn {
url = "svn://svn.code.sf.net/p/ocad2mp/code/trunk/ocad2mp";
diff --git a/pkgs/tools/geo/openmtbmap/default.nix b/pkgs/tools/geo/openmtbmap/default.nix
index 906b95802a38290de0b956c45254ebaf29b979cb..e81fc5ab63102e94088b348d1f3718803408c1d3 100644
--- a/pkgs/tools/geo/openmtbmap/default.nix
+++ b/pkgs/tools/geo/openmtbmap/default.nix
@@ -1,11 +1,9 @@
{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }:
-let
-in
stdenv.mkDerivation {
src = sources.openmtbmap;
patches = (substituteAll {
diff --git a/pkgs/tools/geo/osm2mp/default.nix b/pkgs/tools/geo/osm2mp/default.nix
index 4400d28d782b65746533a19b5b2e5b6670bcdfd4..82474fed59e71a746f876aab4dd1d4dea16cbd88 100644
--- a/pkgs/tools/geo/osm2mp/default.nix
+++ b/pkgs/tools/geo/osm2mp/default.nix
@@ -17,13 +17,11 @@ , TextUnidecode
, TreeR
, YAML
}:
-let
-in
buildPerlPackage {
src = sources.osm2mp;
outputs = [ "out" ];
diff --git a/pkgs/tools/geo/supermercado/default.nix b/pkgs/tools/geo/supermercado/default.nix
index 39c79b3a6e095ad8a985d2a1829709c1e13ea3cc..2e805c30f1c0d73847c138d5dfe0bd0baac5348f 100644
--- a/pkgs/tools/geo/supermercado/default.nix
+++ b/pkgs/tools/geo/supermercado/default.nix
@@ -3,13 +3,11 @@ , python3Packages
, mercantile
, sources
}:
-let
-in
python3Packages.buildPythonApplication {
src = sources.supermercado;
propagatedBuildInputs = with python3Packages; [ click-plugins rasterio mercantile numpy ];
diff --git a/pkgs/tools/geo/taginfo-tools/default.nix b/pkgs/tools/geo/taginfo-tools/default.nix
index 5519a03d3bcbd7b087388b6d63786820227abac3..5beeff3a941bef23bf92ac68dccb374ec6833472 100644
--- a/pkgs/tools/geo/taginfo-tools/default.nix
+++ b/pkgs/tools/geo/taginfo-tools/default.nix
@@ -2,13 +2,13 @@ { stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib, sources }:
stdenv.mkDerivation {
pname = "taginfo-tools";
src = fetchFromGitHub {
owner = "taginfo";
repo = "taginfo-tools";
fetchSubmodules = true;
};
diff --git a/pkgs/tools/geo/tilesets-cli/default.nix b/pkgs/tools/geo/tilesets-cli/default.nix
index ef303b5c1d36396dda067ce30c3ace741a11353f..21c5bb015a9bfd6d48aceac0cfe4325cac9f4388 100644
--- a/pkgs/tools/geo/tilesets-cli/default.nix
+++ b/pkgs/tools/geo/tilesets-cli/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, jsonseq, mercantile, supermercado, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.tilesets-cli;
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/geo/tpkutils/default.nix b/pkgs/tools/geo/tpkutils/default.nix
index 4e08b4a375ce2b2acd2e34d89f2ce436ea7f127d..38205822fd59048328a7b9f1006a7f8d260d448b 100644
--- a/pkgs/tools/geo/tpkutils/default.nix
+++ b/pkgs/tools/geo/tpkutils/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, mercantile, pymbtiles, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.tpkutils;
propagatedBuildInputs = with python3Packages; [ mercantile pymbtiles setuptools six ];
diff --git a/pkgs/tools/misc/garmin-uploader/default.nix b/pkgs/tools/misc/garmin-uploader/default.nix
index 186b7cccc79dab611fc4f3d7480fc7b9747aaf44..ac65cb20c6cddda8305e262c2e98c11f710ced57 100644
--- a/pkgs/tools/misc/garmin-uploader/default.nix
+++ b/pkgs/tools/misc/garmin-uploader/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, mercantile, pymbtiles, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.gupload;
propagatedBuildInputs = with python3Packages; [ requests ];
diff --git a/pkgs/tools/misc/gloggery/default.nix b/pkgs/tools/misc/gloggery/default.nix
index d806919da6d597321253951b4a8562e440ddf9c3..0de1689acad067322ffe3b44f9071f7dce36c26c 100644
--- a/pkgs/tools/misc/gloggery/default.nix
+++ b/pkgs/tools/misc/gloggery/default.nix
@@ -1,11 +1,9 @@
{ stdenv, go, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.gloggery;
nativeBuildInputs = [ go ];
diff --git a/pkgs/tools/misc/supload/default.nix b/pkgs/tools/misc/supload/default.nix
index c8976aaaa40863a05dcad14e8fb6a84bb662a9a3..66d45f1c1628a145435211c0a50c25a0183db819 100644
--- a/pkgs/tools/misc/supload/default.nix
+++ b/pkgs/tools/misc/supload/default.nix
@@ -1,11 +1,9 @@
{ stdenv, curl, file, coreutils, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.supload;
buildInputs = [ curl file ];
@@ -20,9 +18,7 @@ --replace 'which file' '${file}/bin/file' \
--replace '`which md5sum`' '${coreutils}/bin/md5sum'
'';
meta = with stdenv.lib; {
inherit (sources.supload) description homepage;
diff --git a/pkgs/tools/morse-talk/default.nix b/pkgs/tools/morse-talk/default.nix
index 82b3e00d02f2a0b07c05ae45614435b90672a953..d7567a7ca6354c5533b34351252c0e77d7461112 100644
--- a/pkgs/tools/morse-talk/default.nix
+++ b/pkgs/tools/morse-talk/default.nix
@@ -1,11 +1,9 @@
{ lib, python3Packages, sources }:
-let
-in
python3Packages.buildPythonApplication {
src = sources.morse-talk;
propagatedBuildInputs = with python3Packages; [ matplotlib sounddevice tkinter ];
diff --git a/pkgs/tools/networking/gurl/default.nix b/pkgs/tools/networking/gurl/default.nix
index c8389160d851828050ca22b4ad54c1cfb50ccc0c..50f8edb72bfce1c83f99f1b070d5fb7673200027 100644
--- a/pkgs/tools/networking/gurl/default.nix
+++ b/pkgs/tools/networking/gurl/default.nix
@@ -1,14 +1,12 @@
{ stdenv, fetchFromGitHub, zig }:
-let
-in
stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "MasterQ32";
rev = "e5a61b2db685a53cdbdfb1c6ac160e938683d4ec";
sha256 = "1y738ip0b6ck0ibybibqw8dlx37mrqamygvm81jv9wqp1sxsi7gb";
fetchSubmodules = true;
diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix
index 4976aa962ea44fbf7a0ad4d13131a01264571a5d..d3b457e63ccf26121ce56b62377c01e695c468f0 100644
--- a/pkgs/tools/text/csvquote/default.nix
+++ b/pkgs/tools/text/csvquote/default.nix
@@ -1,11 +1,9 @@
{ stdenv, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.csvquote;
makeFlags = [ "BINDIR=$(out)/bin" ];
diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix
index 2d6bf5ef51e51aac6863a9a8817e8022caca48f3..d8ffbcab98f6343b2697e0289a85abe23ae27341 100644
--- a/pkgs/tools/text/csvtools/default.nix
+++ b/pkgs/tools/text/csvtools/default.nix
@@ -1,11 +1,9 @@
{ stdenv, pcre, openssl, sources }:
-let
-in
stdenv.mkDerivation {
src = sources.csvtools;
buildInputs = [ pcre ];
application/octet-streamThis content has been proxied by September (3851b).