diff --git a/flake.nix b/flake.nix
index d4ee4ad717c6433d2e6e40d62c47dacf90ac5b5d..889163a8d3465429d13c4d9eb8a2342fa552b340 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,23 @@ flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }: {
overlays.default = final: prev: import ./pkgs { pkgs = prev; };
nixosModules = import ./modules;
pkgs = nixpkgs.legacyPackages.${system};
inherit (pkgs) lib;
packages = flake-utils.lib.filterPackages system (import ./default.nix {
pkgs = nixpkgs.legacyPackages.${system};
inherit pkgs;
});
inherit packages;
legacyPackages = import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
crossOverlays = [ self.overlays.default ];
};
formatter = pkgs.nixpkgs-fmt;
});
}
diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix
index e6039f43cdfbbc50cbd0f16e96461f0aebd2a9f3..28b2649da1f4b9fde8b7a8a60aed84b4152bf485 100644
--- a/pkgs/data/maps/gpxsee-maps/default.nix
+++ b/pkgs/data/maps/gpxsee-maps/default.nix
@@ -35,28 +35,29 @@ rev = "87ae3ae6e2ee74066cee7ba8f78968b77191fc51";
hash = "sha256-JT9/sNFP8jGBBxRZZgjlJ4OFvP9HxjFp7ehj2HVVrGs=";
};
substitute ${map}.{tpl,xml} \
--replace "insert-your-apikey-here" "${key}"
insertApiKey = map: key: ''
substitute ${map}.{tpl,xml} \
--replace "insert-your-apikey-here" "${key}"
'';
${insertApiKey "World/Europe/FI/Ilmakuva" mmlApiKey}
${insertApiKey "World/Europe/FI/Maastokartta" mmlApiKey}
${insertApiKey "World/Europe/FI/Selkokartta" mmlApiKey}
${insertApiKey "World/Europe/FI/Taustakartta" mmlApiKey}
${insertApiKey "World/here-base" hereApiKey}
${insertApiKey "World/here-vector" hereApiKey}
${insertApiKey "World/heidelberg" openrouteserviceApiKey}
${insertApiKey "World/MapTiler" maptilerApiKey}
${insertApiKey "World/Mapbox" mapboxApiKey}
${insertApiKey "World/Thunderforest-Landscape" thunderforestApiKey}
${insertApiKey "World/Thunderforest-Neighbourhood" thunderforestApiKey}
${insertApiKey "World/Thunderforest-OpenCycleMap" thunderforestApiKey}
${insertApiKey "World/Thunderforest-Outdoors" thunderforestApiKey}
${insertApiKey "World/Thunderforest-Transport" thunderforestApiKey}
'';
installPhase = ''
install -dm755 $out
diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix
index 5b96e4b5b73131ad68402a8fb203161843beea9a..8d2215c24b987c66c136fb20c9ea0a30f78dc093 100644
--- a/pkgs/embedded/chdk/default.nix
+++ b/pkgs/embedded/chdk/default.nix
@@ -1,6 +1,12 @@
-{ lib, stdenv, fetchzip, gcc-arm-embedded, zip
-, platform ? null, platformsub ? null
-, fi2key ? null, fi2iv ? null
+{ lib
+, stdenv
+, fetchzip
+, gcc-arm-embedded
+, zip
+, platform ? null
+, platformsub ? null
+, fi2key ? null
+, fi2iv ? null
}:
let
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
index 55946883942b8a77f6369c6b5359b7e4ec95abbf..3a2a86c34a59e5a57983d14d1ca56e52d87e7ce1 100644
--- a/pkgs/embedded/embox/default.nix
+++ b/pkgs/embedded/embox/default.nix
@@ -49,7 +49,7 @@ unzip
which
makeWrapper
] ++ lib.optional (arch != "x86" && arch != "arm") pkgsCross."${arch}-embedded".stdenv.cc
configurePhase = "make confload-${arch}/qemu";
diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix
index 882d7158730b12ca1c6eb49c70a4585f24b0fb81..1ebeede78326166308216e5b2837c048a40b733c 100644
--- a/pkgs/gemini/tom/default.nix
+++ b/pkgs/gemini/tom/default.nix
@@ -1,5 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
-, lua5_3, memstreamHook, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, makeWrapper
+, lua5_3
+, memstreamHook
+, zlib
}:
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/geospatial/geojson-pydantic/default.nix b/pkgs/geospatial/geojson-pydantic/default.nix
index ec668bb39ae0388c703d8705399008cc0063df7d..c480049d82d99e67a163d7c93163eab08c5349b6 100644
--- a/pkgs/geospatial/geojson-pydantic/default.nix
+++ b/pkgs/geospatial/geojson-pydantic/default.nix
@@ -15,7 +15,8 @@
nativeBuildInputs = with python3Packages; [ flit ];
propagatedBuildInputs = with python3Packages; [
];
doCheck = false;
diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix
index a3cb41f92c5905c122157f99fd862e3500740262..edab043662375cdad99a7b35e284cbb0ef132e1d 100644
--- a/pkgs/geospatial/qlandkartegt/default.nix
+++ b/pkgs/geospatial/qlandkartegt/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, lib, fetchurl, fetchpatch, cmake
-, qtmultimedia, qtserialport, qtscript, qtwebkit, wrapQtAppsHook
-, garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }:
+{ stdenv
+, lib
+, fetchurl
+, fetchpatch
+, cmake
+, qtmultimedia
+, qtserialport
+, qtscript
+, qtwebkit
+, wrapQtAppsHook
+, garmindev
+, gdal
+, gpsd
+, libdmtx
+, libexif
+, libGLU
+, proj
+}:
stdenv.mkDerivation rec {
pname = "qlandkartegt";
@@ -53,8 +68,17 @@
nativeBuildInputs = [ cmake wrapQtAppsHook ];
buildInputs = [
];
cmakeFlags = [
diff --git a/pkgs/geospatial/tilesets-cli/default.nix b/pkgs/geospatial/tilesets-cli/default.nix
index d4ae78637123a1580da8f9060e5428a725120c86..75ba6e63b28662427bb5005520f5d04cc1d7856e 100644
--- a/pkgs/geospatial/tilesets-cli/default.nix
+++ b/pkgs/geospatial/tilesets-cli/default.nix
@@ -1,5 +1,10 @@
-{ lib, fetchFromGitHub, python3Packages, jsonseq, supermercado
-, testers, tilesets-cli
+{ lib
+, fetchFromGitHub
+, python3Packages
+, jsonseq
+, supermercado
+, testers
+, tilesets-cli
}:
python3Packages.buildPythonApplication rec {
diff --git a/pkgs/geospatial/titiler/default.nix b/pkgs/geospatial/titiler/default.nix
index 7007a7846b672fd53855bf2bb34153c4778c84a2..065809da9057cf4b9ebeaf8467e4585ba8ec9357 100644
--- a/pkgs/geospatial/titiler/default.nix
+++ b/pkgs/geospatial/titiler/default.nix
@@ -1,5 +1,13 @@
-{ lib, fetchFromGitHub, python3Packages
-, rio-stac, rio-tiler, geojson-pydantic, rio-cogeo, starlette-cramjam, cogeo-mosaic }:
+{ lib
+, fetchFromGitHub
+, python3Packages
+, rio-stac
+, rio-tiler
+, geojson-pydantic
+, rio-cogeo
+, starlette-cramjam
+, cogeo-mosaic
+}:
let
pname = "titiler";
version = "0.15.0";
diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix
index 3535c89edc7b732fc226fd1aa3b07d6308ed4af2..5144055d373576a9398ab6a83902b30c4be24ea3 100644
--- a/pkgs/gpx/garta/default.nix
+++ b/pkgs/gpx/garta/default.nix
@@ -1,5 +1,18 @@
-{ lib, stdenv, rustPlatform, rust, fetchFromGitLab, pkg-config
-, atk, cairo, gdk-pixbuf, glib, gtk3, harfbuzz, openssl, pango, zlib
+{ lib
+, stdenv
+, rustPlatform
+, rust
+, fetchFromGitLab
+, pkg-config
+, atk
+, cairo
+, gdk-pixbuf
+, glib
+, gtk3
+, harfbuzz
+, openssl
+, pango
+, zlib
}:
rustPlatform.buildRustPackage rec {
diff --git a/pkgs/gpx/gps-whatsnew/default.nix b/pkgs/gpx/gps-whatsnew/default.nix
index 5539e04d6c46fd1adcce80ce62844bdd861969d1..6376c86c800d0a350f298f396ebb59c83809a034 100644
--- a/pkgs/gpx/gps-whatsnew/default.nix
+++ b/pkgs/gpx/gps-whatsnew/default.nix
@@ -12,7 +12,7 @@ hash = "sha256-lZSjFdaQizXYi0OTChOKrSwllgzOCy6gTbBohcegJxk=";
};
postPatch = ''
sed -i '1 i #include <iostream>' gps_analyze.cpp
'';
nativeBuildInputs = [ qt5.qmake ];
diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix
index 0fce5794fe4c9f0f794e04ef9e16276b6878d34d..1e83954983eef2deca06a44382b728540aee153d 100644
--- a/pkgs/misc/capture2text/default.nix
+++ b/pkgs/misc/capture2text/default.nix
@@ -43,14 +43,15 @@ "INCLUDEPATH+=${leptonica}/include/leptonica"
"INCLUDEPATH+=${tesseract4}/include/tesseract"
];
mkdir -p $out/Applications $out/bin
mv Capture2Text_CLI.app $out/Applications
ln -s $out/Applications/Capture2Text_CLI.app/Contents/MacOS/Capture2Text_CLI $out/bin/capture2text
install -Dm755 Capture2Text_CLI -t $out/bin
ln -s $out/bin/Capture2Text_CLI $out/bin/capture2text
meta = with lib; {
description = "Capture2Text enables users to quickly OCR a portion of the screen using a keyboard shortcut";
diff --git a/pkgs/misc/gaiagpsclient/default.nix b/pkgs/misc/gaiagpsclient/default.nix
index 02eddec718af176755fd1035dc22c0aa2321cc44..de70875082f42db0fc6eb4087a1501e1a6f3d06d 100644
--- a/pkgs/misc/gaiagpsclient/default.nix
+++ b/pkgs/misc/gaiagpsclient/default.nix
@@ -12,7 +12,12 @@ hash = "sha256-yA3reda+ik3koHdb4OXDERfI01D7iEqgem8+XFn4YOM=";
};
propagatedBuildInputs = with python3Packages; [
];
nativeCheckInputs = with python3Packages; [ mock pytestCheckHook ];
diff --git a/pkgs/misc/graphene/default.nix b/pkgs/misc/graphene/default.nix
index 1b352d10820d2f4f205fb13073cfe30d521a89b3..825ed8577a5de18f160462abcaf02ce6a755007a 100644
--- a/pkgs/misc/graphene/default.nix
+++ b/pkgs/misc/graphene/default.nix
@@ -1,5 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, perl, pkg-config, wget
-, db, libmicrohttpd, jansson, tcl
+{ lib
+, stdenv
+, fetchFromGitHub
+, perl
+, pkg-config
+, wget
+, db
+, libmicrohttpd
+, jansson
+, tcl
}:
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/misc/musig/default.nix b/pkgs/misc/musig/default.nix
index f2279fee5a99b1994f7b2cc633fc160c6251e8c7..c3d6d78b77d349f1a31d207e4beaeccca759c7a6 100644
--- a/pkgs/misc/musig/default.nix
+++ b/pkgs/misc/musig/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, pkg-config, portaudio
-, testers, musig
+{ stdenv
+, lib
+, fetchFromGitHub
+, buildGoModule
+, pkg-config
+, portaudio
+, testers
+, musig
}:
buildGoModule rec {
diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix
index f94d139854e457c37375828d6bba996b837ac210..b02e5a4d2836c4f22fab7d527af02d2faf26768e 100644
--- a/pkgs/misc/plotjuggler/default.nix
+++ b/pkgs/misc/plotjuggler/default.nix
@@ -1,5 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, cmake, desktopToDarwinBundle, wrapQtAppsHook
-, qtsvg, qtwebsockets, qtx11extras, mosquitto, libdwarf, protobuf, zeromq, zstd }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, desktopToDarwinBundle
+, wrapQtAppsHook
+, qtsvg
+, qtwebsockets
+, qtx11extras
+, mosquitto
+, libdwarf
+, protobuf
+, zeromq
+, zstd
+}:
stdenv.mkDerivation rec {
pname = "plotjuggler";
diff --git a/pkgs/osm/gcgn-converter/default.nix b/pkgs/osm/gcgn-converter/default.nix
index 0038dd774e33cf929d10fdaf4b6f2d32ba9f9fa4..12c47a6e21d5e2a2604c864300ad1fe1af6f666e 100644
--- a/pkgs/osm/gcgn-converter/default.nix
+++ b/pkgs/osm/gcgn-converter/default.nix
@@ -18,7 +18,11 @@
installPhase =
let
pythonEnv = python3Packages.python.withPackages (p: with p; [
camelot pypdf geojson beautifulsoup4 tqdm
camelot
pypdf
geojson
beautifulsoup4
tqdm
]);
in
''
diff --git a/pkgs/osm/memphis/default.nix b/pkgs/osm/memphis/default.nix
index 280ad5dcf9d2e0e0f8b0f3e3d147aaa821edb1e6..1bf33c6c8d9318b99f28d3f07f67c822745309e2 100644
--- a/pkgs/osm/memphis/default.nix
+++ b/pkgs/osm/memphis/default.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk-doc, pkg-config
-, cairo, expat, glib
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, gtk-doc
+, pkg-config
+, cairo
+, expat
+, glib
}:
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/osm/osm-tags-transform/default.nix b/pkgs/osm/osm-tags-transform/default.nix
index c00c4d157f80f85fb7cf467650576f958e4076e8..a447abc671eca50543febe147b8ae351f6f4539e 100644
--- a/pkgs/osm/osm-tags-transform/default.nix
+++ b/pkgs/osm/osm-tags-transform/default.nix
@@ -1,5 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, cmake
-, bzip2, expat, libosmium, lua, protozero, zlib
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, bzip2
+, expat
+, libosmium
+, lua
+, protozero
+, zlib
}:
stdenv.mkDerivation (finalAttrs: {
@@ -16,7 +24,12 @@
nativeBuildInputs = [ cmake ];
buildInputs = [
];
cmakeFlags = [
diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix
index 3111c9918c2754f7b51b5961b10e5b49311bb077..ccd3d7f8a321b5d2d154d3edccbbad8b8bac47f4 100644
--- a/pkgs/osm/smrender/default.nix
+++ b/pkgs/osm/smrender/default.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, cairo, librsvg
-, Foundation, memstreamHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkg-config
+, cairo
+, librsvg
+, Foundation
+, memstreamHook
, testers
}:
diff --git a/pkgs/perl-packages.nix b/pkgs/perl-packages.nix
index aff293489e3b89c4c688de0c9f9d4a832ad1e248..a39af4e92cc9039977b759dbbfba0ce2ebeeb156 100644
--- a/pkgs/perl-packages.nix
+++ b/pkgs/perl-packages.nix
@@ -141,7 +141,7 @@ src = fetchurl {
url = "mirror://cpan/authors/id/A/AN/ANDYA/${pname}-${version}.tar.gz";
hash = "sha256-FNQGuR2pbWUh0NGoLSKjBidHZSJrhrClbn/93Plq578=";
};
meta = with lib; {
homepage = "https://metacpan.org/pod/IPC::ShareLite";
description = "IPC::ShareLite - Lightweight interface to shared memory";
diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix
index ad920f272444a5622f419f4ae3a5cf3bdeec88f1..721a16e020458c3b56631e86863578cbe354a331 100644
--- a/pkgs/radio/fmreceiver/default.nix
+++ b/pkgs/radio/fmreceiver/default.nix
@@ -1,5 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, fftwFloat, libsamplerate, libsndfile, libusb1
-, portaudio, rtl-sdr, qmake, qwt, wrapQtAppsHook
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, fftwFloat
+, libsamplerate
+, libsndfile
+, libusb1
+, portaudio
+, rtl-sdr
+, qmake
+, qwt
+, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
@@ -41,13 +52,14 @@ qtWrapperArgs = [
"--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ rtl-sdr ]}"
];
mkdir -p $out/Applications
mv linux-bin/fmreceiver-2.0.app $out/Applications/fmreceiver.app
install_name_tool -change {,${qwt}/lib/}libqwt.6.dylib "$out/Applications/fmreceiver.app/Contents/MacOS/fmreceiver-2.0"
install -Dm755 linux-bin/fmreceiver-2.0 $out/bin/fmreceiver
meta = with lib; {
description = "A simple FM receiver";
diff --git a/pkgs/radio/rtlsdr-airband/default.nix b/pkgs/radio/rtlsdr-airband/default.nix
index e531f92624e358de2aac9854b944c18fa4b56172..ec490d4a9c21c7ed1a524ed02b5fca824c642b09 100644
--- a/pkgs/radio/rtlsdr-airband/default.nix
+++ b/pkgs/radio/rtlsdr-airband/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, fftwFloat, lame, libconfig, libshout, pulseaudio, rtl-sdr, soapysdr
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, fftwFloat
+, lame
+, libconfig
+, libshout
+, pulseaudio
+, rtl-sdr
+, soapysdr
}:
stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
index 4db84ead97686e7a510409fa6694c4285c96cb54..f0ff9ca20715997e3a160ef23b158f1af1024d30 100644
--- a/pkgs/suckless/imscript/default.nix
+++ b/pkgs/suckless/imscript/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchFromSourcehut, installShellFiles
-, libpng, libjpeg, libtiff, libwebp, fftwFloat, libX11, gsl }:
+{ lib
+, stdenv
+, fetchFromSourcehut
+, installShellFiles
+, libpng
+, libjpeg
+, libtiff
+, libwebp
+, fftwFloat
+, libX11
+, gsl
+}:
stdenv.mkDerivation (finalAttrs: {
pname = "imscript";
diff --git a/pkgs/suckless/mage/default.nix b/pkgs/suckless/mage/default.nix
index bda5131218b09169c801014cd495d5c73fa6ca38..c5501eab88eb09f75ad2fcad04a6929de2cca5e9 100644
--- a/pkgs/suckless/mage/default.nix
+++ b/pkgs/suckless/mage/default.nix
@@ -11,8 +11,8 @@ rev = "6632e9080af56a2c045fc9b008cabc06782e4e04";
hash = "sha256-7lCuwVB2MS9PkLRQc9XcunQGkOab46PYiSVQvJGMSng=";
};
buildInputs = [ fontconfig imlib2 libXft ];
application/octet-streamThis content has been proxied by September (3851b).