diff --git a/pkgs/applications/anki/bin.nix b/pkgs/applications/anki/bin.nix
index bdd9d61b8c22995805497ddfce79e9dc8d889271..de4f5c5abfa878820c2eb15aac5a63ce57d90c4a 100644
--- a/pkgs/applications/anki/bin.nix
+++ b/pkgs/applications/anki/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, undmg }:
+{ lib, stdenv, fetchfromgh, undmg }:
stdenv.mkDerivation rec {
pname = "anki-bin";
@@ -23,7 +23,7 @@ mkdir -p $out/Applications/Anki.app
cp -r . $out/Applications/Anki.app
'';
homepage = "https://apps.ankiweb.net/";
description = "Spaced repetition flashcard program";
license = licenses.agpl3Plus;
diff --git a/pkgs/applications/gis/mapsoft/2.nix b/pkgs/applications/gis/mapsoft/2.nix
index 2163fc9062f9f012b6a8c27fdd40c22b1160df5b..b9d2fa028d3c1315a829e934a00698c19f7eb560 100644
--- a/pkgs/applications/gis/mapsoft/2.nix
+++ b/pkgs/applications/gis/mapsoft/2.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, substituteAll
, db
@@ -74,7 +75,7 @@ preBuild = "export SKIP_IMG_DIFFS=1";
makeFlags = [ "prefix=$(out)" ];
description = "A collection of tools and libraries for working with maps and geo-data";
homepage = "http://slazav.github.io/mapsoft2";
license = licenses.gpl3;
diff --git a/pkgs/applications/gis/mapsoft/default.nix b/pkgs/applications/gis/mapsoft/default.nix
index ccc8ba5eacf794f05456b4be4b8344fa5d709183..f825fd9582b8b6864e08815f690da263d9f8280b 100644
--- a/pkgs/applications/gis/mapsoft/default.nix
+++ b/pkgs/applications/gis/mapsoft/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, perlPackages
, python2Packages
, gimp
@@ -31,7 +32,7 @@ }:
stdenv.mkDerivation {
pname = "mapsoft-unstable";
src = sources.mapsoft;
@@ -84,7 +85,7 @@
sconsFlags = [ "minimal=1" "prefix=$(out)" ];
postInstall = ''
substituteInPlace $out/bin/mapsoft_wp_parse \
--replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
wrapProgram $out/bin/mapsoft_wp_parse --prefix PERL5LIB : "$PERL5LIB"
@@ -92,7 +93,7 @@ substituteInPlace $out/bin/map_rescale \
--replace "getopt " "${getopt}/bin/getopt "
'';
inherit (sources.mapsoft) description homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/applications/gis/openorienteering-mapper/bin.nix b/pkgs/applications/gis/openorienteering-mapper/bin.nix
index 3bffddf73162f3ffcca99189767f533288dd5949..6899407869b4c3d344a78ce47c6de7c4d09e396a 100644
--- a/pkgs/applications/gis/openorienteering-mapper/bin.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, undmg, sources }:
+{ lib, stdenv, fetchfromgh, undmg, sources }:
stdenv.mkDerivation rec {
pname = "Openorienteering-Mapper-bin";
@@ -23,7 +23,7 @@ mkdir -p $out/Applications/Mapper.app
cp -r . $out/Applications/Mapper.app
'';
inherit (sources.mapper) description homepage;
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/applications/gis/qgis/bin.nix b/pkgs/applications/gis/qgis/bin.nix
index f9b46676be701e44f6eaf65403d7f49a25fb09a0..781ceeea5f75744d1b958aa316439ba49bf95814 100644
--- a/pkgs/applications/gis/qgis/bin.nix
+++ b/pkgs/applications/gis/qgis/bin.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, undmg, releaseType ? "pr" }:
+{ lib, stdenv, fetchurl, undmg, releaseType ? "pr" }:
-assert stdenv.lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ];
+assert lib.assertOneOf "releaseType" releaseType [ "pr" "ltr" ];
stdenv.mkDerivation rec {
pname = "qgis-bin";
@@ -22,14 +22,14 @@ preferLocalBuild = true;
nativeBuildInputs = [ undmg ];
installPhase = ''
mkdir -p $out/Applications/QGIS.app
cp -r . $out/Applications/QGIS.app
'';
description = "A Free and Open Source Geographic Information System";
homepage = "https://qgis.org";
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/gis/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix
index 243ec1169f1f0fcf7d16b874cc17e849fa3d1967..282777f275b3444cba21ddf70ad03c7ff9e84c82 100644
--- a/pkgs/applications/gis/qmapshack/bin.nix
+++ b/pkgs/applications/gis/qmapshack/bin.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchfromgh, sdkVersion ? "10.13" }:
+{ lib, stdenv, fetchfromgh, sdkVersion ? "10.13" }:
-assert stdenv.lib.assertOneOf "sdkVersion" sdkVersion [ "10.13" "10.14" "10.15" "11.0.1" ];
+assert lib.assertOneOf "sdkVersion" sdkVersion [ "10.13" "10.14" "10.15" "11.0.1" ];
stdenv.mkDerivation rec {
pname = "qmapshack-bin";
@@ -29,7 +29,7 @@ mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
homepage = "https://github.com/Maproom/qmapshack";
description = "Consumer grade GIS software";
license = licenses.gpl3Plus;
diff --git a/pkgs/applications/gis/sasplanet/bin.nix b/pkgs/applications/gis/sasplanet/bin.nix
index 24d580566428bb037a7a3b7cee5e1bc93a3fab76..51dbc0046e6289deb7bb666f874ac35b086dea7a 100644
--- a/pkgs/applications/gis/sasplanet/bin.nix
+++ b/pkgs/applications/gis/sasplanet/bin.nix
@@ -1,8 +1,8 @@
-{ stdenv, unzip, wine, makeWrapper, sources }:
+{ lib, stdenv, unzip, wine, makeWrapper, sources }:
let
in
stdenv.mkDerivation {
pname = "sasplanet-bin";
@@ -23,7 +23,7 @@ '';
preferLocalBuild = true;
inherit (sources.sasplanet) description homepage;
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/applications/gis/tdh/base.nix b/pkgs/applications/gis/tdh/base.nix
index c52da38f37916df8aa93794030b337dda311c7d8..71071c46eec29b787567ccf0c5c89a13325d8d59 100644
--- a/pkgs/applications/gis/tdh/base.nix
+++ b/pkgs/applications/gis/tdh/base.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgdrive, unzip, wxGTK30
+{ lib, stdenv, fetchgdrive, unzip, wxGTK30
, makeWrapper, libredirect
, pname, version, id, sha256, description, homepage }:
@@ -26,7 +26,7 @@ install -dm755 $out/share/${pname}
cp -r *_Structure $out/share/${pname}
'';
patchelf --replace-needed "./libTdhCairo.so" libTdhCairo.so $out/bin/${pname}
patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
@@ -40,7 +40,7 @@ '';
preferLocalBuild = true;
inherit description homepage;
license = licenses.cc-by-nc-sa-40;
maintainers = with maintainers; [ sikmir ];
diff --git a/pkgs/applications/goldencheetah/bin.nix b/pkgs/applications/goldencheetah/bin.nix
index ec7c5f512f80bd6fe165999b91d992d30c9dce9d..d0d3ce346e571c5779a20428dfa4c42cc265b936 100644
--- a/pkgs/applications/goldencheetah/bin.nix
+++ b/pkgs/applications/goldencheetah/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, appimageTools, undmg }:
+{ lib, stdenv, fetchfromgh, appimageTools, undmg }:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@@ -27,7 +27,7 @@ appimageContents = appimageTools.extract {
inherit name src;
};
description = "Performance software for cyclists, runners and triathletes";
homepage = "https://www.goldencheetah.org/";
license = licenses.gpl3;
diff --git a/pkgs/applications/gpxsee/bin.nix b/pkgs/applications/gpxsee/bin.nix
index a9d8c19dee3ea5eff78203ae4fcd05127730dcbf..0a3e9aba60bb0219d6ffe7c3c09b0bbac44f1534 100644
--- a/pkgs/applications/gpxsee/bin.nix
+++ b/pkgs/applications/gpxsee/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, undmg, sources }:
+{ lib, stdenv, fetchurl, undmg, sources }:
stdenv.mkDerivation rec {
pname = "gpxsee-bin";
@@ -18,7 +18,7 @@ mkdir -p $out/Applications/GPXSee.app
cp -r . $out/Applications/GPXSee.app
'';
inherit (sources.gpxsee) description homepage changelog;
license = licenses.gpl3Only;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/applications/i18n-editor/default.nix b/pkgs/applications/i18n-editor/default.nix
index 4892cb96c21f51182605f3506112c5bd6913dd5e..d2e58d28da56724e35223e735f3aeaec086b2446 100644
--- a/pkgs/applications/i18n-editor/default.nix
+++ b/pkgs/applications/i18n-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, unzip, jre, makeWrapper }:
+{ lib, stdenv, fetchfromgh, unzip, jre, makeWrapper }:
stdenv.mkDerivation rec {
pname = "i18n-editor-bin";
@@ -26,7 +26,7 @@ makeWrapper ${jre}/bin/java $out/bin/i18n-editor \
--add-flags "-jar $out/share/java/i18n-editor.jar"
'';
description = "GUI for editing your i18n translation files";
homepage = "https://github.com/jcbvm/i18n-editor";
license = licenses.mit;
diff --git a/pkgs/applications/iterm2/bin.nix b/pkgs/applications/iterm2/bin.nix
index b5d04fdf370adab6a44a5f5db028a0a4de2679a1..39c24b7a04f4b11dbd923c57306eedd6f53f0d49 100644
--- a/pkgs/applications/iterm2/bin.nix
+++ b/pkgs/applications/iterm2/bin.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, unzip }:
+{ lib, stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
pname = "iterm2-bin";
version = "3.3.12";
src = fetchurl {
sha256 = "0rw165p9iypc11pr0mmwd1z4dvg0f3is2p8bv2sk30wyd4hba4b8";
};
@@ -19,7 +19,7 @@ '';
preferLocalBuild = true;
description = "A replacement for Terminal and the successor to iTerm";
homepage = "https://iterm2.com/";
license = licenses.gpl2;
diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix
index 3e6c50c4b8302f57d2225851cc23fb4c95a34dce..a33d4120a05603235a66fe0c14eb8c53f6cd525c 100644
--- a/pkgs/applications/macpass/bin.nix
+++ b/pkgs/applications/macpass/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, unzip }:
+{ lib, stdenv, fetchfromgh, unzip }:
stdenv.mkDerivation rec {
pname = "MacPass-bin";
@@ -23,7 +23,7 @@ '';
preferLocalBuild = true;
description = "A native OS X KeePass client";
homepage = "https://macpassapp.org/";
license = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/klogg/bin.nix b/pkgs/applications/misc/klogg/bin.nix
index 3128df08f786ac57298807f5fb5e97dcc0e4d506..fb33da47961561e9d84e666ef08d54de6ea3abfd 100644
--- a/pkgs/applications/misc/klogg/bin.nix
+++ b/pkgs/applications/misc/klogg/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, appimageTools, undmg, sources }:
+{ lib, stdenv, fetchfromgh, appimageTools, undmg, sources }:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@@ -27,7 +27,7 @@ appimageContents = appimageTools.extract {
inherit name src;
};
inherit (sources.klogg) description homepage;
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/applications/networking/librewolf/default.nix b/pkgs/applications/networking/librewolf/default.nix
index 82a4c71a2882162319cc4bd4539d29d869fc7387..4266665edd88d00393fd745af150b3a52fff14ee 100644
--- a/pkgs/applications/networking/librewolf/default.nix
+++ b/pkgs/applications/networking/librewolf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, appimageTools, undmg, lang ? "en-US" }:
+{ lib, stdenv, fetchgit, fetchurl, appimageTools, undmg, lang ? "en-US" }:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@@ -29,7 +29,7 @@ aarch64-linux = "0s7x4xm7iv9d2k018m0azk2s2gk5w2n7xg6bqba4qg2pdnx39hyp";
}.${system} or throwSystem;
};
description = "A fork of Firefox, focused on privacy, security and freedom";
homepage = "https://librewolf-community.gitlab.io/";
license = licenses.mpl20;
diff --git a/pkgs/applications/networking/qutebrowser/bin.nix b/pkgs/applications/networking/qutebrowser/bin.nix
index fa467eeacd88f9fcf8f2461b8f05d3d7028df346..3f68ee244c940fbc84dc5c672fc3b261cd472b09 100644
--- a/pkgs/applications/networking/qutebrowser/bin.nix
+++ b/pkgs/applications/networking/qutebrowser/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, undmg }:
+{ lib, stdenv, fetchfromgh, undmg }:
stdenv.mkDerivation rec {
pname = "qutebrowser-bin";
@@ -23,7 +23,7 @@ mkdir -p $out/Applications/qutebrowser.app
cp -r . $out/Applications/qutebrowser.app
'';
description = "A keyboard-driven, vim-like browser based on PyQt5";
homepage = "https://www.qutebrowser.org/";
license = licenses.gpl3Plus;
diff --git a/pkgs/applications/nnn-plugins/default.nix b/pkgs/applications/nnn-plugins/default.nix
index dad8222e1214cf02d64b636e93ba780f7851a2ec..79f353a7df073fcfc33ec8191698c389330c4f4c 100644
--- a/pkgs/applications/nnn-plugins/default.nix
+++ b/pkgs/applications/nnn-plugins/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, sources }:
+{ lib, stdenv, sources }:
stdenv.mkDerivation {
pname = "nnn-plugins";
src = sources.nnn;
@@ -15,7 +15,7 @@ install -Dm755 "$f" -t $out/share/nnn/plugins
done
'';
description = "Plugins extend the capabilities of nnn";
homepage = "https://github.com/jarun/nnn/tree/master/plugins";
license = licenses.bsd2;
diff --git a/pkgs/applications/visualgps/default.nix b/pkgs/applications/visualgps/default.nix
index 0d6e7062fc26adb287f4e4ddaa0fa4d92a38ceb8..2c3f7cc17a132a6b872f2ff81f6f9778a9c1e30b 100644
--- a/pkgs/applications/visualgps/default.nix
+++ b/pkgs/applications/visualgps/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, mkDerivation
, fetchFromGitHub
, qmake
@@ -31,7 +32,7 @@ '' else ''
install -Dm755 VisualGPSqt -t $out/bin
'';
description = "A QT application (GUI) that makes use of the VisualGPS/NMEAParser project";
homepage = "https://github.com/VisualGPS/VisualGPSqt";
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix
index 3045c6e7674b9d0bd380219300e1a22f2090cb81..bf949648090477aa03d7a6910edc5fc7f13eddec 100644
--- a/pkgs/applications/window-managers/amethyst/bin.nix
+++ b/pkgs/applications/window-managers/amethyst/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, unzip }:
+{ lib, stdenv, fetchfromgh, unzip }:
stdenv.mkDerivation rec {
pname = "Amethyst-bin";
@@ -23,7 +23,7 @@ '';
preferLocalBuild = true;
description = "Automatic tiling window manager for macOS à la xmonad";
homepage = "https://ianyh.com/amethyst/";
license = licenses.mit;
diff --git a/pkgs/applications/window-managers/yabai/default.nix b/pkgs/applications/window-managers/yabai/default.nix
index 1212905895dffe7d4bfd8530ae72b5b0aeaf8ce1..459c25053e0a31212f6b6397c441a6c36fa8f66e 100644
--- a/pkgs/applications/window-managers/yabai/default.nix
+++ b/pkgs/applications/window-managers/yabai/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }:
+{ lib, stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }:
stdenv.mkDerivation rec {
pname = "yabai";
@@ -20,7 +20,7 @@ install -Dm755 bin/yabai -t $out/bin
install -Dm644 doc/yabai.1 -t $out/share/man/man1
'';
description = "A tiling window manager for macOS based on binary space partitioning";
homepage = "https://github.com/koekeishiya/yabai";
license = licenses.mit;
diff --git a/pkgs/applications/wireguard-statusbar/default.nix b/pkgs/applications/wireguard-statusbar/default.nix
index 21f5e04f165017b6c65af8645c5f3b833c24f0ec..9f5e1e2610dd7ab2744f9a78a6a5ee4d30190af9 100644
--- a/pkgs/applications/wireguard-statusbar/default.nix
+++ b/pkgs/applications/wireguard-statusbar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, undmg }:
+{ lib, stdenv, fetchfromgh, undmg }:
stdenv.mkDerivation rec {
pname = "wireguard-statusbar-bin";
@@ -23,7 +23,7 @@ mkdir -p $out/Applications/WireGuardStatusbar.app
cp -r . $out/Applications/WireGuardStatusbar.app
'';
description = "macOS menubar icon for WireGuard/wg-quick";
homepage = "https://github.com/aequitas/macos-menubar-wireguard";
license = licenses.gpl3;
diff --git a/pkgs/data/dicts/dadako/base.nix b/pkgs/data/dicts/dadako/base.nix
index 78294cd93ff5d2657545f5de6ab6ce1a54343baf..32d602186d3c7169dfc2d00e82865f406fbc9d9b 100644
--- a/pkgs/data/dicts/dadako/base.nix
+++ b/pkgs/data/dicts/dadako/base.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, unzip, pname, version, filename, sha256, description }:
+{ lib, stdenvNoCC, fetchurl, unzip, pname, version, filename, sha256, description }:
stdenvNoCC.mkDerivation {
inherit pname version;
@@ -14,7 +14,7 @@ installPhase = "${unzip}/bin/unzip $src -d $out";
preferLocalBuild = true;
inherit description;
homepage = "http://dadako.narod.ru/paperpoe.htm";
license = licenses.free;
diff --git a/pkgs/data/dicts/freedict/base.nix b/pkgs/data/dicts/freedict/base.nix
index 692e4d04e1b23d42c07c5789dede973e168c1c0d..d87b21f2168f568d7be9479f00afc84ecafd9079 100644
--- a/pkgs/data/dicts/freedict/base.nix
+++ b/pkgs/data/dicts/freedict/base.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, lang, version, sha256 }:
+{ lib, stdenvNoCC, fetchurl, lang, version, sha256 }:
stdenvNoCC.mkDerivation {
pname = "freedict-${lang}";
@@ -15,7 +15,7 @@ '';
preferLocalBuild = true;
description = "FreeDict (${lang})";
homepage = "https://freedict.org";
license = licenses.free;
diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix
index 69d853d92900e52db85414937da777c069031a35..8a17846c2d3c11b01f0624b51267c59e38e016f4 100644
--- a/pkgs/data/dicts/huzheng/base.nix
+++ b/pkgs/data/dicts/huzheng/base.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, pname, version, filename, sha256, description }:
+{ lib, stdenvNoCC, fetchurl, pname, version, filename, sha256, description }:
stdenvNoCC.mkDerivation {
inherit pname version;
@@ -12,7 +12,7 @@ installPhase = "cp -a . $out";
preferLocalBuild = true;
inherit description;
homepage = "http://download.huzheng.org/bigdict/";
license = licenses.free;
diff --git a/pkgs/data/dicts/it-sanasto/default.nix b/pkgs/data/dicts/it-sanasto/default.nix
index 62b6b401f1b31989bb59a285703359d33dd9ff9b..3f150748452471afa366025879e0cad53aef7906 100644
--- a/pkgs/data/dicts/it-sanasto/default.nix
+++ b/pkgs/data/dicts/it-sanasto/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, dict, pandoc, stardict-tools, sources }:
+{ lib, stdenvNoCC, dict, pandoc, stardict-tools, sources }:
stdenvNoCC.mkDerivation {
pname = "it-sanasto";
diff --git a/pkgs/data/dicts/komputeko/default.nix b/pkgs/data/dicts/komputeko/default.nix
index 20349fcfdead03412aa211a951b2de1a489d342b..abd0548761cb2f55921468601c580b89c14e04d3 100644
--- a/pkgs/data/dicts/komputeko/default.nix
+++ b/pkgs/data/dicts/komputeko/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchwebarchive, dict, jq, stardict-tools }:
+{ lib, stdenvNoCC, fetchwebarchive, dict, jq, stardict-tools }:
stdenvNoCC.mkDerivation {
pname = "komputeko";
@@ -22,7 +22,7 @@ '';
installPhase = "install -Dm644 .{dict,idx,ifo} -t $out";
homepage = "https://komputeko.net/";
description = "Prikomputila terminokolekto";
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index 30f587c9a41048d958e12873cec0e60f3448fa52..64d49b8d26b2c1dd22bd920d10f1d4fef0e2948d 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchurl, dict, jq, moreutils, stardict-tools, tatoebatools }:
+{ lib, stdenvNoCC, fetchurl, dict, jq, moreutils, stardict-tools, tatoebatools }:
let
langs = [
"deu eng"
diff --git a/pkgs/data/dicts/wiktionary/base.nix b/pkgs/data/dicts/wiktionary/base.nix
index f5203093cf28d796e90a65720ed62cab0b48699f..8a2720a539950ee7424c8e5102d7ddbf2294a28d 100644
--- a/pkgs/data/dicts/wiktionary/base.nix
+++ b/pkgs/data/dicts/wiktionary/base.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, fetchurl, lang, version, sha256 }:
+{ lib, stdenvNoCC, fetchurl, lang, version, sha256 }:
stdenvNoCC.mkDerivation {
pname = "wiktionary-${lang}";
@@ -13,7 +13,7 @@ installPhase = "install -Dm644 *.{dict,idx,ifo} -t $out";
preferLocalBuild = true;
description = "Wiktionary dictionaries for StarDict (${lang})";
homepage = "http://libredict.org/en/info_${lang}.html";
license = licenses.free;
diff --git a/pkgs/data/maps/dem/default.nix b/pkgs/data/maps/dem/default.nix
index 27d1a457c31f8095ac8e72caaef1cd79ef1ce2f5..35d043ccf9f3d808bdc72df1c72eb4be8f959b88 100644
--- a/pkgs/data/maps/dem/default.nix
+++ b/pkgs/data/maps/dem/default.nix
@@ -1,5 +1,5 @@
-{ stdenvNoCC, lib, fetchurl, unzip
, withVRT ? true, gdal }:
+{ lib, stdenvNoCC, fetchurl, unzip
let
dem1 = builtins.fromJSON (builtins.readFile ./dem1.json);
in
diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix
index 80fd564e68887d8a3943c1c45f63dd0ac5a1a860..c68bbf241b034ca6acba0da459654d0b894a0226 100644
--- a/pkgs/data/maps/gpxsee-maps/default.nix
+++ b/pkgs/data/maps/gpxsee-maps/default.nix
@@ -1,5 +1,5 @@
-{ stdenvNoCC
-, lib
+{ lib
+, stdenvNoCC
, sources
, maptilerApiKey ? ""
, mapboxApiKey ? ""
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
index 66f2cd4c5f736bf03a98bb0a43f86fa9bf20ee7e..9502ad0fdf88b933787420246f48706fc98cae89 100644
--- a/pkgs/data/maps/maptourist/default.nix
+++ b/pkgs/data/maps/maptourist/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, sources, unzip }:
+{ lib, stdenvNoCC, sources, unzip }:
stdenvNoCC.mkDerivation {
pname = "maptourist";
diff --git a/pkgs/data/maps/mtk-suomi/default.nix b/pkgs/data/maps/mtk-suomi/default.nix
index 6669edb090fedb7b4a0774a91b12a6eff3758e55..62bdf6fe66715a2312717936e351cd5667201388 100644
--- a/pkgs/data/maps/mtk-suomi/default.nix
+++ b/pkgs/data/maps/mtk-suomi/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, sources }:
+{ lib, stdenvNoCC, sources }:
stdenvNoCC.mkDerivation {
pname = "mtk-suomi";
diff --git a/pkgs/data/maps/slazav/hr.nix b/pkgs/data/maps/slazav/hr.nix
index 9f3be3a0edb26ec17d6d7b6706651b676df76ed3..f2034aab927540bdc5091f027a33f37d30a74a20 100644
--- a/pkgs/data/maps/slazav/hr.nix
+++ b/pkgs/data/maps/slazav/hr.nix
@@ -1,8 +1,8 @@
-{ stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }:
+{ lib, stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }:
stdenv.mkDerivation {
src = sources.map-hr;
@@ -12,7 +12,7 @@ buildFlags = [ "directories" "reg_img" ];
installPhase = "install -Dm644 OUT/all_*.img -t $out";
inherit (sources.map-hr) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/data/maps/slazav/podm-bin.nix b/pkgs/data/maps/slazav/podm-bin.nix
index d1c849eb4bea498e043c63b75fc9238f56d730b6..cc95636d0fe00a484c4c1f96ffe69d142a3a930f 100644
--- a/pkgs/data/maps/slazav/podm-bin.nix
+++ b/pkgs/data/maps/slazav/podm-bin.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
fetchurl {
name = "slazav-podm-2020-12-03";
url = "http://slazav.xyz/maps/podm/all_podm.img";
@@ -9,7 +10,7 @@ recursiveHash = true;
postFetch = "install -Dm644 $downloadedFile $out/all_podm.img";
homepage = "http://slazav.xyz/maps/podm_txt.htm";
description = "Карты Подмосковья";
license = licenses.free;
diff --git a/pkgs/data/maps/slazav/podm.nix b/pkgs/data/maps/slazav/podm.nix
index f34beed4cd8a786816ccc6d6cd7ec69b3abddde5..4057edc3009ca1540098bd85041dd66084dfbfec 100644
--- a/pkgs/data/maps/slazav/podm.nix
+++ b/pkgs/data/maps/slazav/podm.nix
@@ -1,8 +1,8 @@
-{ stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }:
+{ lib, stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }:
stdenv.mkDerivation {
src = sources.map-podm;
@@ -12,7 +12,7 @@ buildFlags = [ "directories" "reg_img" ];
installPhase = "install -Dm644 OUT/all_*.img -t $out";
inherit (sources.map-podm) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/data/maps/usa-osm-topo-routable/default.nix b/pkgs/data/maps/usa-osm-topo-routable/default.nix
index 31d2c44e766c50a7a9cc248becc1e1d9864eb5a5..c5fc4a14c8df2c52e7cdc45622c8b7da624ad3e4 100644
--- a/pkgs/data/maps/usa-osm-topo-routable/default.nix
+++ b/pkgs/data/maps/usa-osm-topo-routable/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchurl, p7zip }:
+{ lib, stdenvNoCC, fetchurl, p7zip }:
stdenvNoCC.mkDerivation rec {
pname = "usa-osm-topo-routable";
diff --git a/pkgs/data/maps/vlasenko-maps/default.nix b/pkgs/data/maps/vlasenko-maps/default.nix
index 0f24917391178775c2eb9c50d9e067154c2d1a26..687d5a949d9657c41b5c14c11cc348b1cecffe5e 100644
--- a/pkgs/data/maps/vlasenko-maps/default.nix
+++ b/pkgs/data/maps/vlasenko-maps/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchgdrive, unzip }:
+{ lib, stdenvNoCC, fetchgdrive, unzip }:
{
hib-lov = stdenvNoCC.mkDerivation rec {
diff --git a/pkgs/data/misc/osm-extracts/default.nix b/pkgs/data/misc/osm-extracts/default.nix
index dfafa26cd085cdf04ac5ed5377f78d99c61c6db2..d2c517f22eb4bd3b543a05f350ac24befa2f79e5 100644
--- a/pkgs/data/misc/osm-extracts/default.nix
+++ b/pkgs/data/misc/osm-extracts/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, gdal, osmium-tool, sources }:
+{ lib, stdenv, gdal, osmium-tool, sources }:
let
regions = [
"RU-ARK"
@@ -38,7 +38,7 @@ regions;
installPhase = "install -Dm644 *.geojson -t $out";
description = "Administrative boundaries";
homepage = "https://wiki.openstreetmap.org/wiki/Tag:boundary%3Dadministrative";
license = licenses.free;
diff --git a/pkgs/data/misc/routinodb/default.nix b/pkgs/data/misc/routinodb/default.nix
index b10d8535e2bce3556cc90df6e1520dec1e817d39..bebdad2cbd85fce41059ef70afa13413decc6d92 100644
--- a/pkgs/data/misc/routinodb/default.nix
+++ b/pkgs/data/misc/routinodb/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, sources, routino }:
+{ lib, stdenv, sources, routino }:
let
in
stdenv.mkDerivation {
pname = "routinodb";
@@ -34,7 +34,7 @@ --tagging=${routino}/share/routino/tagging.xml \
--process-only
'';
description = "Routino Database";
homepage = "https://download.geofabrik.de/index.html";
license = licenses.free;
diff --git a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
index d850ebca3720d4208a9cfe5c8b4520dd69942854..79d8ecfefb3f268968a2c698b378070a1ab087a1 100644
--- a/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
+++ b/pkgs/data/themes/qtpbfimageplugin-styles/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, sources }:
+{ lib, stdenv, sources }:
stdenv.mkDerivation {
pname = "qtpbfimageplugin-styles";
src = sources.qtpbfimageplugin-styles;
@@ -11,7 +11,7 @@ install -dm755 $out/share/gpxsee/style
cp -r Mapbox OpenMapTiles Tilezen $out/share/gpxsee/style
'';
inherit (sources.qtpbfimageplugin-styles) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/libraries/foma/default.nix b/pkgs/development/libraries/foma/default.nix
index 958ef130a3d8869eaa085b147b2f358895e49a4f..ca87b9f2fef1e88949cd23611ec59bb3458cb96d 100644
--- a/pkgs/development/libraries/foma/default.nix
+++ b/pkgs/development/libraries/foma/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }:
+{ lib, stdenv, bison, flex, libtool, ncurses, readline, zlib, sources }:
stdenv.mkDerivation {
pname = "foma-unstable";
src = sources.foma;
@@ -20,7 +20,7 @@ '';
makeFlags = [ "prefix=$(out)" ];
inherit (sources.foma) description homepage;
license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/libraries/geographiclib/default.nix b/pkgs/development/libraries/geographiclib/default.nix
index a3a6aaf657fea734061dd0b4a9c2fab8e590acf3..b8b849f95fede103156133974487bb0539208efa 100644
--- a/pkgs/development/libraries/geographiclib/default.nix
+++ b/pkgs/development/libraries/geographiclib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "geographiclib";
@@ -9,7 +9,7 @@ url = "mirror://sourceforge/geographiclib/GeographicLib-${version}.tar.gz";
sha256 = "046k49h52n2qxclqdzjmqj6pbvqsb28hn7lnsrdi1xbxc54hjdrl";
};
description = "GeographicLib offers a C++ interfaces to a small (but important!) set of geographic transformations";
homepage = "http://geographiclib.sourceforge.io/";
license = licenses.mit;
diff --git a/pkgs/development/libraries/gpxlib/default.nix b/pkgs/development/libraries/gpxlib/default.nix
index ab6aafedb1bc93d895a3aa568d3b8f38a1567fb8..0fc8cf9f565e2141958c9b0eae3af3d12b6afdd7 100644
--- a/pkgs/development/libraries/gpxlib/default.nix
+++ b/pkgs/development/libraries/gpxlib/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, cmake, expat, sources }:
+{ lib, stdenv, cmake, expat, sources }:
stdenv.mkDerivation {
pname = "gpxlib-unstable";
src = sources.gpxlib;
@@ -22,7 +22,7 @@ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/gpx
test/gpxcheck
'';
inherit (sources.gpxlib) description homepage;
license = licenses.lgpl3Plus;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/libraries/hfst/default.nix b/pkgs/development/libraries/hfst/default.nix
index d7918174da96057e9c025e2bb401f17f0461a85e..58846da0020bd61bf8fe1d928c76ca3c00f536bd 100644
--- a/pkgs/development/libraries/hfst/default.nix
+++ b/pkgs/development/libraries/hfst/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, autoreconfHook, bison, flex, sources }:
+{ lib, stdenv, autoreconfHook, bison, flex, sources }:
stdenv.mkDerivation {
pname = "hfst-unstable";
src = sources.hfst;
nativeBuildInputs = [ autoreconfHook bison flex ];
inherit (sources.hfst) description homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/libraries/libgarmin/default.nix b/pkgs/development/libraries/libgarmin/default.nix
index e07227f581801102949ade0ec3b882fd83852ae2..6410e204c3ec3d1296e8c229598ef0aa98de47e3 100644
--- a/pkgs/development/libraries/libgarmin/default.nix
+++ b/pkgs/development/libraries/libgarmin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, autoconf, automake, libtool }:
+{ lib, stdenv, fetchsvn, autoconf, automake, libtool }:
stdenv.mkDerivation {
pname = "libgarmin";
@@ -19,7 +19,7 @@ && automake --add-missing \
&& autoreconf
'';
description = "Garmin IMG format library";
homepage = "http://libgarmin.sourceforge.net/";
license = licenses.gpl2;
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
index ff22b99e6829d0983cc401962a8df5de33c1eba8..3881a245a4d5aabe590a23300c86a716a0b4ac67 100644
--- a/pkgs/development/libraries/libshell/default.nix
+++ b/pkgs/development/libraries/libshell/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, bash
, dash
, help2man
@@ -10,7 +11,7 @@ }:
stdenv.mkDerivation {
pname = "libshell-unstable";
src = sources.libshell;
@@ -26,7 +27,7 @@ substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh"
done
'';
"DESTDIR=$(out)"
(optional withDoc "SCDOC=${scdoc}/bin/scdoc")
(optional (!withDoc) "SCDOC=")
@@ -34,7 +35,7 @@ ];
doCheck = false;
inherit (sources.libshell) description homepage;
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
index 4a51830e39107b831df01b7f296105672e7e8b96..ea0fd1fb5f31e2cca6e30ecb014bdaabd06f0fbd 100644
--- a/pkgs/development/libraries/microjson/default.nix
+++ b/pkgs/development/libraries/microjson/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, cmake, gtest, sources }:
+{ lib, stdenv, cmake, gtest, sources }:
stdenv.mkDerivation {
pname = "microjson-unstable";
src = sources.microjson;
@@ -17,7 +17,7 @@ cmakeFlags = [ "-DMICROJSON_MAKE_TESTS=ON" ];
doCheck = true;
inherit (sources.microjson) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/development/tools/gef/default.nix b/pkgs/development/tools/gef/default.nix
index 55ab99645d67fb848980a0ed40028a4c082c3b04..e1ddc4ec027e2b24c9814f3eb3de57b5191d45a4 100644
--- a/pkgs/development/tools/gef/default.nix
+++ b/pkgs/development/tools/gef/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, sources
, runtimeShell
@@ -14,7 +15,7 @@ source @out@/share/gef/gef.py
'';
gdbGef = writeScript "gdb-gef" (
#!${runtimeShell}
export PATH="${makeBinPath [ procps binutils-unwrapped python3 ]}:$PATH"
export NIX_PYTHONPATH="${pythonPath}"
@@ -29,7 +30,7 @@ ];
in
stdenv.mkDerivation {
pname = "gef-unstable";
src = sources.gef;
@@ -47,7 +48,7 @@ substituteInPlace $out/share/gef/init-gef --subst-var out
substituteInPlace $out/bin/gdb-gef --subst-var out
'';
inherit (sources.gef) description homepage;
license = licenses.mit;
platforms = platforms.all;
diff --git a/pkgs/development/tools/pvs-studio/default.nix b/pkgs/development/tools/pvs-studio/default.nix
index a2fbd25552041febd183909fa550035478e16f47..ed2e6bee68dfa7dc4a59d810c45cb9c99360289e 100644
--- a/pkgs/development/tools/pvs-studio/default.nix
+++ b/pkgs/development/tools/pvs-studio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
@@ -22,7 +22,7 @@ };
installPhase = "./install.sh $out";
description = "Static code analyzer for C, C++";
homepage = "https://www.viva64.com/en/pvs-studio/";
license = licenses.unfree;
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 8f6360d6f5373369a8f30c60f0533f544cb5b189..5d0f84e31d059f91f45b307769b73ba5201d6836 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,22 +1,22 @@
-{ stdenv, cmake, sources }:
+{ lib, stdenv, cmake, sources }:
stdenv.mkDerivation {
pname = "how-to-use-pvs-studio-free-unstable";
src = sources.how-to-use-pvs-studio-free;
nativeBuildInputs = [ cmake ];
substituteInPlace CMakeLists.txt \
--replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""
substituteInPlace CMakeLists.txt \
--replace "stdc++fs" "c++fs"
'';
inherit (sources.how-to-use-pvs-studio-free) description homepage;
license = licenses.asl20;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/dict/gdcv/default.nix b/pkgs/dict/gdcv/default.nix
index 767a1e3d416d41ed7dd1effbfcc59cef7c8d00f3..1541a5f75d8ee7198819671da9242401be19106e 100644
--- a/pkgs/dict/gdcv/default.nix
+++ b/pkgs/dict/gdcv/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, pkg-config, emacs, zlib, sources }:
+{ lib, stdenv, pkg-config, emacs, zlib, sources }:
stdenv.mkDerivation {
pname = "gdcv";
src = sources.gdcv;
@@ -17,7 +17,7 @@ install -Dm755 gdcv -t $out/bin
install -Dm644 gdcv-elisp.so gdcv.el -t $out/share/emacs/site-lisp
'';
inherit (sources.gdcv) description homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/dict/goldendict/bin.nix b/pkgs/dict/goldendict/bin.nix
index ce8d72211c690470c63aeb1cc0ca2057be682247..517ae1fc0be367437493a4ab3f5cf508216062f0 100644
--- a/pkgs/dict/goldendict/bin.nix
+++ b/pkgs/dict/goldendict/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, undmg }:
+{ lib, stdenv, fetchurl, undmg }:
stdenv.mkDerivation rec {
pname = "goldendict-bin";
@@ -19,7 +19,7 @@ mkdir -p $out/Applications/GoldenDict.app
cp -r . $out/Applications/GoldenDict.app
'';
description = "A feature-rich dictionary lookup program";
homepage = "http://goldendict.org/";
license = licenses.gpl3Plus;
diff --git a/pkgs/dict/gt-bash-client/default.nix b/pkgs/dict/gt-bash-client/default.nix
index 0bf899e97bb87bafd7fb47e5e63deb6361f32019..88b8025bf23aee3f52b82c69f2746e4c7131c81c 100644
--- a/pkgs/dict/gt-bash-client/default.nix
+++ b/pkgs/dict/gt-bash-client/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, sources }:
+{ lib, stdenv, sources }:
stdenv.mkDerivation {
pname = "gt-bash-client-unstable";
src = sources.gt-bash-client;
@@ -10,7 +10,7 @@ installPhase = ''
install -Dm755 translate.sh $out/bin/gt-bash-client
'';
inherit (sources.gt-bash-client) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/dict/stardict-tools/default.nix b/pkgs/dict/stardict-tools/default.nix
index 60f4a0361b6e8ab64c8522454bf634f3dfb08e4f..7545c8f2b5e07f9f914e9d031727a77f78586223 100644
--- a/pkgs/dict/stardict-tools/default.nix
+++ b/pkgs/dict/stardict-tools/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, autoconf
, automake
, libtool
@@ -12,7 +13,7 @@ }:
stdenv.mkDerivation {
pname = "stardict-tools";
src = sources.stardict-3;
@@ -49,7 +50,7 @@ '';
enableParallelBuilding = true;
inherit (sources.stardict-3) description homepage;
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix
index 1ea47042a6aaac71271bcfd1bf0da1ba44029e1e..f010294ebe31b1e7d381bea58a2116f4e05de3f6 100644
--- a/pkgs/embox/default.nix
+++ b/pkgs/embox/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, fetchurl
, writers
, sources
@@ -28,7 +29,7 @@ '';
in
stdenv.mkDerivation {
pname = "embox-unstable";
src = sources.embox;
@@ -61,7 +62,7 @@ install -Dm755 scripts/qemu/start_script $out/share/embox/scripts/qemu_start
install -Dm755 scripts/qemu/stop_script $out/share/embox/scripts/qemu_stop
'';
inherit (sources.embox) description homepage;
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/garmin/basecamp/default.nix b/pkgs/garmin/basecamp/default.nix
index afadc9c44fcb53e6b2ca12cb9d66025e834f8fbc..998f319b1f4dab6014f10d18bac487fd566c9d51 100644
--- a/pkgs/garmin/basecamp/default.nix
+++ b/pkgs/garmin/basecamp/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, undmg, xar, cpio }:
+{ lib, stdenv, fetchurl, undmg, xar, cpio }:
stdenv.mkDerivation rec {
pname = "basecamp";
version = "4.8.10";
src = fetchurl {
sha256 = "09jrbix42a6aqv8vd4hcrvhfnj9y7l17xm7hdyc6p1nmb859y5ri";
};
@@ -26,7 +26,7 @@ cp -r Garmin\ $p.app $out/Applications
done
'';
description = "BaseCamp lets you plan outdoor activities, organize your data and share your adventures with others";
homepage = "https://www.garmin.com/en-US/software/basecamp/";
changelog = "https://www8.garmin.com/support/download_details.jsp?id=4449";
diff --git a/pkgs/garmin/cgpsmapper/default.nix b/pkgs/garmin/cgpsmapper/default.nix
index 850c92d662da3eb085f790eb44d5d99dd6cbda2d..af5fd0363ff7facb61d72fb2f681c728214b3739 100644
--- a/pkgs/garmin/cgpsmapper/default.nix
+++ b/pkgs/garmin/cgpsmapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchwebarchive }:
+{ lib, stdenv, fetchwebarchive }:
stdenv.mkDerivation {
pname = "cgpsmapper";
@@ -20,7 +20,7 @@ installPhase = "install -Dm755 cgpsmapper-static -t $out/bin";
installCheckPhase = "$out/bin/cgpsmapper-static -h";
description = "GIS converter into GARMIN compatible format maps";
homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com";
license = licenses.free;
diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix
index 677fbe9a7eccf263a0d0f61cc251e41d85e9d801..79ec28a71a8dff5cad28691ecb8d7a0e4742a4af 100644
--- a/pkgs/garmin/gimgtools/default.nix
+++ b/pkgs/garmin/gimgtools/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, sources, libiconv }:
+{ lib, stdenv, sources, libiconv }:
stdenv.mkDerivation {
pname = "gimgtools-unstable";
src = sources.gimgtools;
substituteInPlace Makefile \
--replace "CC = gcc" ""
'';
@@ -19,7 +19,7 @@ install -Dm755 $tool -t $out/bin
done
'';
inherit (sources.gimgtools) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/garmin/gmaptool/default.nix b/pkgs/garmin/gmaptool/default.nix
index b602e60ce2b613d2022eb9755e9a6865fe542b2c..1117d41ceacd9bd3ad667b875c9f7af1ba5e24bb 100644
--- a/pkgs/garmin/gmaptool/default.nix
+++ b/pkgs/garmin/gmaptool/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchzip }:
+{ lib, stdenv, fetchzip }:
let
version = "0.8.220";
in
stdenv.mkDerivation {
pname = "gmaptool";
@@ -17,7 +17,7 @@ dontFixup = true;
installPhase = "install -Dm755 gmt -t $out/bin";
description = "Program for splitting and merging maps in Garmin format";
homepage = "https://www.gmaptool.eu";
license = licenses.cc-by-sa-30;
diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix
index 3840d559f9171afae799ee253d246360cfe5ce73..1fc008a68c3c3bdc133e34bab21e41a003e93dc8 100644
--- a/pkgs/garmin/imgdecode/default.nix
+++ b/pkgs/garmin/imgdecode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "imgdecode";
@@ -18,7 +18,7 @@ configurePhase = "./configure || true";
installPhase = "install -Dm755 imgdecode -t $out/bin";
description = "IMG Decoder";
homepage = "https://sourceforge.net/projects/garmin-img/";
license = licenses.bsd3;
diff --git a/pkgs/garmin/ocad2img/default.nix b/pkgs/garmin/ocad2img/default.nix
index 28a578cbfc72d84d76054e3fe394683b86e4b49a..08c83780fd9bfb24e39e9ed1eb644279ec142c60 100644
--- a/pkgs/garmin/ocad2img/default.nix
+++ b/pkgs/garmin/ocad2img/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPerlPackage, fetchwebarchive, unzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:
+{ lib, stdenv, buildPerlPackage, fetchwebarchive, unzip, dos2unix, cgpsmapper, ocad2mp, ModulePluggable, Tk }:
buildPerlPackage {
pname = "ocad2img";
@@ -40,7 +40,7 @@ install -dm755 $out/lib/perl5/site_perl
cp -r Convert $out/lib/perl5/site_perl
'';
description = "Converter from OCAD map format to Garmin format";
homepage = "http://news.worldofo.com/2009/10/11/howto-convert-any-orienteering-map-to-a-garmin-map/";
license = licenses.gpl3Plus;
diff --git a/pkgs/garmin/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix
index d23deb113c388a15c8bde607ba3ab1773a2ab41e..634cd9107e4f9467abb46d367bb1a14864a71afd 100644
--- a/pkgs/garmin/ocad2mp/default.nix
+++ b/pkgs/garmin/ocad2mp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn }:
+{ lib, stdenv, fetchsvn }:
stdenv.mkDerivation {
pname = "ocad2mp-unstable";
@@ -10,7 +10,7 @@ rev = "269";
sha256 = "1700apfsjd27q9jsvvr94mk7rd0x24ib3bkn4y8hak0zvknib563";
};
substituteInPlace Makefile.gcc \
--replace "CXX=g++" "" \
--replace "LINK=g++" "LINK=$CXX" \
@@ -35,7 +35,7 @@ install -Dm755 Release/ocad2mp -t $out/bin
install -Dm644 SYM.TXT $out/share/ocad2mp/sym.txt
'';
description = "Converter from OCAD map format to Polish format";
homepage = "https://sourceforge.net/projects/ocad2mp/";
license = licenses.gpl2;
diff --git a/pkgs/garmin/openmtbmap/default.nix b/pkgs/garmin/openmtbmap/default.nix
index e81fc5ab63102e94088b348d1f3718803408c1d3..d71b289418a49ede62f460ca6e47058323ee7c72 100644
--- a/pkgs/garmin/openmtbmap/default.nix
+++ b/pkgs/garmin/openmtbmap/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }:
+{ lib, stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }:
stdenv.mkDerivation {
pname = "openmtbmap";
src = sources.openmtbmap;
@@ -17,7 +17,7 @@ installPhase = ''
install -Dm755 create_omtb_garmin_img.sh $out/bin/create_omtb_garmin_img
'';
inherit (sources.openmtbmap) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix
index 82474fed59e71a746f876aab4dd1d4dea16cbd88..26f34d7155af8661608a83e1cb38f91b56d6431b 100644
--- a/pkgs/garmin/osm2mp/default.nix
+++ b/pkgs/garmin/osm2mp/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, buildPerlPackage
, shortenPerlShebang
, sources
@@ -20,13 +21,13 @@ }:
buildPerlPackage {
pname = "osm2mp";
src = sources.osm2mp;
outputs = [ "out" ];
propagatedBuildInputs = [
ConfigStd
@@ -58,13 +59,13 @@ install -dm755 $out/share/osm2mp/cfg
cp -r cfg/* $out/share/osm2mp/cfg
install -dm755 $out/lib/perl5/site_perl
cp -r lib/* $out/lib/perl5/site_perl
patchShebangs $out/bin/osm2mp
shortenPerlShebang $out/bin/osm2mp
'';
inherit (sources.osm2mp) description homepage;
license = licenses.gpl2;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/garmin/sendmap20/default.nix b/pkgs/garmin/sendmap20/default.nix
index ab51a1d9767e87019f977d5b98966301e357ce5a..f7b363a0f2b81b5b0035b3d7cb4eac028e7fcc1a 100644
--- a/pkgs/garmin/sendmap20/default.nix
+++ b/pkgs/garmin/sendmap20/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchwebarchive }:
+{ llib, stdenv, fetchwebarchive }:
stdenv.mkDerivation {
pname = "sendmap20";
@@ -20,7 +20,7 @@ installPhase = "install -Dm755 sendmap20 -t $out/bin";
installCheckPhase = "$out/bin/sendmap20 -h";
description = "Software for uploading maps to your GPS";
homepage = "https://web.archive.org/web/20160620061746if_/http://www.cgpsmapper.com";
license = licenses.free;
diff --git a/pkgs/gemini/geminid/default.nix b/pkgs/gemini/geminid/default.nix
index 7fb7de75389d2c480a4446426d9b597fdbea8ba4..663c4741e6e54ccd230594fbb1df0ffb17b3c017 100644
--- a/pkgs/gemini/geminid/default.nix
+++ b/pkgs/gemini/geminid/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, libconfig, file, openssl, flex, sources }:
+{ lib, stdenv, libconfig, file, openssl, flex, sources }:
stdenv.mkDerivation {
pname = "geminid";
src = sources.geminid;
@@ -14,7 +14,7 @@ makeFlags = [ "geminid" "CC=cc" "LEX=flex" ];
installPhase = "install -Dm755 geminid -t $out/bin";
inherit (sources.geminid) description homepage;
license = licenses.bsd3;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/gemini/gloggery/default.nix b/pkgs/gemini/gloggery/default.nix
index 0de1689acad067322ffe3b44f9071f7dce36c26c..b65f6ccbc1eff0dbb6e664c478cfbcc4ab35a8ca 100644
--- a/pkgs/gemini/gloggery/default.nix
+++ b/pkgs/gemini/gloggery/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, go, sources }:
+{ lib, stdenv, go, sources }:
stdenv.mkDerivation {
pname = "gloggery-unstable";
src = sources.gloggery;
@@ -14,7 +14,7 @@ preInstall = "install -dm755 $out/{bin,share}";
postInstall = "mv $out/.gloggery $out/share/glogger";
inherit (sources.gloggery) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/gemini/gmni/default.nix b/pkgs/gemini/gmni/default.nix
index 7a349c604f6ffdf47013be0ea1d846986c11add7..8b69fe5fa5c6852acd3bd9f943979cd10f926f01 100644
--- a/pkgs/gemini/gmni/default.nix
+++ b/pkgs/gemini/gmni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, openssl, pkg-config, scdoc }:
+{ lib, stdenv, fetchgit, openssl, pkg-config, scdoc }:
stdenv.mkDerivation {
pname = "gmni";
@@ -14,7 +14,7 @@ nativeBuildInputs = [ pkg-config scdoc ];
buildInputs = [ openssl ];
description = "Gemini client";
homepage = "https://git.sr.ht/~sircmpwn/gmni";
license = licenses.gpl3;
diff --git a/pkgs/gemini/gmnisrv/default.nix b/pkgs/gemini/gmnisrv/default.nix
index 2cc08798ca480c42fbc309ddd567679d435fb92e..48abbf018d88773c60148c360eab5d66d5b666ae 100644
--- a/pkgs/gemini/gmnisrv/default.nix
+++ b/pkgs/gemini/gmnisrv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, mailcap, openssl, pkg-config, scdoc }:
+{ lib, stdenv, fetchgit, mailcap, openssl, pkg-config, scdoc }:
stdenv.mkDerivation {
pname = "gmnisrv";
@@ -18,7 +18,7 @@ configureFlags = [
"--with-mimedb=${mailcap}/etc/mime.types"
];
description = "Simple Gemini protocol server";
homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
license = licenses.gpl3;
diff --git a/pkgs/gemini/gurl/default.nix b/pkgs/gemini/gurl/default.nix
index 8f873ca6a2f33244124c5f9d27687ccdb82c422b..23843f9e347fdafc0b64540e433e3c82d4f126ce 100644
--- a/pkgs/gemini/gurl/default.nix
+++ b/pkgs/gemini/gurl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zig }:
+{ lib, stdenv, fetchFromGitHub, zig }:
stdenv.mkDerivation {
pname = "gurl-unstable";
@@ -18,7 +18,7 @@ buildPhase = "HOME=$TMP zig build install";
installPhase = "install -Dm755 zig-cache/bin/gurl -t $out/bin";
description = "A curl-like cli application to interact with Gemini sites";
homepage = "https://github.com/MasterQ32/gurl";
license = licenses.mit;
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
index f040bd6f0972757b65af065c373e4c85b23d08b4..7a7e4a3013746eb0a7f7ad2bdda42879cde7f744 100644
--- a/pkgs/misc/ascii-dash/default.nix
+++ b/pkgs/misc/ascii-dash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, unzip, ncurses5, SDL, SDL_mixer }:
+{ lib, stdenv, fetchurl, cmake, unzip, ncurses5, SDL, SDL_mixer }:
stdenv.mkDerivation rec {
pname = "ascii-dash";
@@ -24,8 +24,8 @@ nativeBuildInputs = [ cmake unzip ];
buildInputs = [ ncurses5 SDL SDL_mixer ];
installPhase = ''
install -Dm755 main $out/bin/ascii-dash
@@ -34,7 +34,7 @@ mkdir -p $out/share/ascii-dash
cp -r ../{data,sounds} $out/share/ascii-dash
'';
description = "Remake of BOULDER DASH with NCurses";
homepage = "https://ascii-dash.sourceforge.io/";
license = licenses.mit;
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
index 7d2b9af91a2468c20b674907fc4c3dc48e3c3371..3e931e5f165fb3c16e0d2c03d14a01838abe216d 100644
--- a/pkgs/misc/cfiles/default.nix
+++ b/pkgs/misc/cfiles/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, pkg-config, ncurses, w3m, ueberzug, sources }:
+{ lib, stdenv, pkg-config, ncurses, w3m, ueberzug, sources }:
stdenv.mkDerivation {
pname = "cfiles-unstable";
src = sources.cfiles;
@@ -21,7 +21,7 @@ substituteInPlace scripts/displayimg_uberzug \
--replace "ueberzug" "${ueberzug}/bin/ueberzug"
'';
inherit (sources.cfiles) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/misc/docker-reg-tool/default.nix b/pkgs/misc/docker-reg-tool/default.nix
index f9c6ea1ccd69d4e0fc4ef72777ed631673a148db..070efb7805a6501a94d69d4d5c1fa78aa3cb4220 100644
--- a/pkgs/misc/docker-reg-tool/default.nix
+++ b/pkgs/misc/docker-reg-tool/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, sources }:
+{ lib, stdenv, sources }:
stdenv.mkDerivation {
pname = "docker-reg-tool";
src = sources.docker-reg-tool;
installPhase = "install -Dm755 docker_reg_tool -t $out/bin";
inherit (sources.docker-reg-tool) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix
index 80a9bc1bc72e42ddf2828549175a9ae38fc1deae..4405c876c0484f5c796622cff87e8bee6692d1e9 100644
--- a/pkgs/misc/ish/default.nix
+++ b/pkgs/misc/ish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "ish";
@@ -19,7 +19,7 @@ installPhase = ''
install -Dm755 ish ishd -t $out/bin
'';
description = "ICMP Shell";
homepage = "http://icmpshell.sourceforge.net";
license = licenses.free;
diff --git a/pkgs/misc/ptunnel/default.nix b/pkgs/misc/ptunnel/default.nix
index 55464f8bc5f9db647373e45e02e111f44241c6d6..6a375d36fde19f7937666acd6e7e6f507ffcf0d3 100644
--- a/pkgs/misc/ptunnel/default.nix
+++ b/pkgs/misc/ptunnel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap }:
+{ lib, stdenv, fetchurl, libpcap }:
stdenv.mkDerivation rec {
pname = "ptunnel";
@@ -13,7 +13,7 @@ buildInputs = [ libpcap ];
makeFlags = [ "prefix=$(out)" ];
description = "A tool for reliably tunneling TCP connections over ICMP echo request and reply packets";
homepage = "https://www.cs.uit.no/~daniels/PingTunnel";
license = licenses.bsd3;
diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix
index 4956456a5d440c2b35ab3a59fb309e0f3474068d..9addc9f3b856d90eb2bae9a07f2602e9e39a81ce 100644
--- a/pkgs/misc/xfractint/default.nix
+++ b/pkgs/misc/xfractint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper }:
+{ lib, stdenv, fetchurl, xlibsWrapper }:
stdenv.mkDerivation rec {
pname = "xfractint";
@@ -19,7 +19,7 @@ --replace "/usr/bin/gcc" "gcc" \
--replace "/usr/bin/install" "install"
'';
description = "Fractal generator";
homepage = "https://fractint.org/";
license = licenses.free;
diff --git a/pkgs/nakarte/nakarte/default.nix b/pkgs/nakarte/nakarte/default.nix
index 602808f31ce44de5ae2f86a84356c0633814c798..c7e8cf7fa7a5e8e39d142b37ca89390458302426 100644
--- a/pkgs/nakarte/nakarte/default.nix
+++ b/pkgs/nakarte/nakarte/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, mkYarnPackage, sources, secretsConfig ? null }:
+{ lib, stdenv, mkYarnPackage, sources, secretsConfig ? null }:
let
pname = "nakarte";
in
mkYarnPackage {
name = "${pname}-${version}";
@@ -23,7 +23,7 @@ '';
distPhase = "true";
inherit (sources.nakarte) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/osm/maperitive/bin.nix b/pkgs/osm/maperitive/bin.nix
index 0eccfe3bb90052b14cc7938ea003404c476c121c..0c212b15af10b6c5b2fe7cf606d1b3501b08ea96 100644
--- a/pkgs/osm/maperitive/bin.nix
+++ b/pkgs/osm/maperitive/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }:
+{ lib, stdenv, fetchurl, unzip, mono, gtk2, makeWrapper }:
stdenv.mkDerivation rec {
pname = "maperitive-bin";
@@ -16,12 +16,12 @@ mkdir -p $out/opt/maperitive
cp -r . $out/opt/maperitive
makeWrapper ${mono}/bin/mono $out/bin/maperitive \
--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ gtk2 ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk2 ]} \
--run "[ -d \$HOME/.maperitive ] || { cp -r $out/opt/maperitive \$HOME/.maperitive && chmod -R +w \$HOME/.maperitive; }" \
--add-flags "--desktop \$HOME/.maperitive/Maperitive.exe"
'';
description = "Desktop application for drawing maps based on OpenStreetMap and GPS data";
homepage = "http://maperitive.net/";
changelog = "http://maperitive.net/updates.xml";
diff --git a/pkgs/osm/osm-area-tools/default.nix b/pkgs/osm/osm-area-tools/default.nix
index 1ece111feaad11c9d991d7b78c6de0162818e8f1..8602ed01b9eddafe8866d769d8cd1c2c994b752c 100644
--- a/pkgs/osm/osm-area-tools/default.nix
+++ b/pkgs/osm/osm-area-tools/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, cmake
, boost
@@ -14,7 +15,7 @@ }:
stdenv.mkDerivation rec {
pname = "osm-area-tools";
src = sources.osm-area-tools;
@@ -33,7 +34,7 @@ sqlite
zlib
];
inherit (sources.osm-area-tools) description homepage;
license = licenses.gpl3Plus;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/osm/osmcoastline/default.nix b/pkgs/osm/osmcoastline/default.nix
index c0ca24ff7af9b30088378295124eef73a666bd57..2fce26bea175c119265e084d50c95cbd1b81092a 100644
--- a/pkgs/osm/osmcoastline/default.nix
+++ b/pkgs/osm/osmcoastline/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
, fetchFromGitHub
, cmake
, bzip2
@@ -14,7 +15,7 @@ }:
stdenv.mkDerivation rec {
pname = "osmcoastline";
src = sources.osmcoastline;
@@ -40,7 +41,7 @@ sqlite
zlib
];
inherit (sources.osmcoastline) description homepage;
license = licenses.boost;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/osm/sdlmap/default.nix b/pkgs/osm/sdlmap/default.nix
index fe56a68485e9c9dfd9789ae2220f656ceec58678..615240586d1e52047858d114c5e44f56f2fc9b21 100644
--- a/pkgs/osm/sdlmap/default.nix
+++ b/pkgs/osm/sdlmap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, curl, SDL2, SDL2_image }:
+{ lib, stdenv, fetchFromGitHub, curl, SDL2, SDL2_image }:
stdenv.mkDerivation {
pname = "sdlmap";
@@ -17,7 +17,7 @@ buildInputs = [ curl SDL2 SDL2_image ];
installPhase = "install -Dm755 sdlmap -t $out/bin";
description = "A SDL + libcurl OpenStreetMap viewer";
homepage = "https://github.com/jhawthorn/sdlmap";
license = licenses.free;
diff --git a/pkgs/osm/taginfo-tools/default.nix b/pkgs/osm/taginfo-tools/default.nix
index 5beeff3a941bef23bf92ac68dccb374ec6833472..9e9e48b1951bcb329dad8b4ced733f16f774e03d 100644
--- a/pkgs/osm/taginfo-tools/default.nix
+++ b/pkgs/osm/taginfo-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib, sources }:
+{ lib, stdenv, fetchFromGitHub, cmake, bzip2, expat, gd, icu, libosmium, protozero, sqlite, zlib, sources }:
stdenv.mkDerivation {
pname = "taginfo-tools";
@@ -19,7 +19,7 @@ postInstall = ''
install -Dm755 src/{osmstats,taginfo-sizes} -t $out/bin
'';
description = "C++ tools used in taginfo processing";
homepage = "https://wiki.openstreetmap.org/wiki/Taginfo";
license = licenses.gpl3Plus;
diff --git a/pkgs/perl-packages.nix b/pkgs/perl-packages.nix
index 2e3aa175a3f1f6e6a9a73b3ca566949f27fb7eac..9e158db99a3f328150e92aae256e272d3cff9de6 100644
--- a/pkgs/perl-packages.nix
+++ b/pkgs/perl-packages.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages }:
+{ lib, stdenv, fetchurl, perlPackages }:
with perlPackages;
rec {
MatchSimple = buildPerlPackage rec {
@@ -10,7 +10,7 @@ sha256 = "1jvngzqq38cdkwks9cw0q58nb4irzl3wkgcg6p1hs9209r6h3mla";
};
buildInputs = [ TestFatal ];
propagatedBuildInputs = [ ExporterTiny ScalarListUtils SubInfix ];
homepage = "https://metacpan.org/pod/match::smart";
description = "match::smart - clone of smartmatch operator";
license = licenses.free;
@@ -25,7 +25,7 @@ url = "mirror://cpan/authors/id/T/TO/TOBYINK/${pname}-${version}.tar.gz";
sha256 = "1jsyq60mhkc31br33yf1lyll61c8k7h27h2nmvyzsjmbcvdambjw";
};
buildInputs = [ TestFatal ];
homepage = "https://metacpan.org/pod/Sub::Infix";
description = "Sub::Infix - create a fake infix operator";
license = licenses.free;
@@ -39,7 +39,7 @@ src = fetchurl {
url = "mirror://cpan/authors/id/M/MA/MARKOV/${pname}-${version}.tar.gz";
sha256 = "1my2vwmv1yk5hwyr8q2p9mvyca2mjdggnk93hpj1gnpkgxp5y382";
};
homepage = "https://metacpan.org/pod/Math::Polygon";
description = "Math::Polygon - Class for maintaining polygon data";
license = licenses.free;
@@ -54,7 +54,7 @@ url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz";
sha256 = "1332sn0r1p5jpgddcx1h5jppysy5y8jkicgk1wfcvzqw5hgx344w";
};
propagatedBuildInputs = [ ListMoreUtils MathGeometryPlanarGPCPolygonXS ];
homepage = "https://metacpan.org/pod/Math::Polygon::Tree";
description = "Math::Polygon::Tree - fast check if point is inside polygon";
license = licenses.free;
@@ -68,7 +68,7 @@ src = fetchurl {
url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz";
sha256 = "0hdjxk74lpcsc51q8adnaxlfg4wsxn10jwd0l1zw8r76xgzljlgl";
};
homepage = "https://metacpan.org/pod/Math::Geometry::Planar::GPC::PolygonXS";
description = "Math::Geometry::Planar::GPC::PolygonXS - OO wrapper to gpc library (translated from Inline-based Math::Geometry::Planar::GPC::Polygon to XS)";
license = licenses.free;
@@ -82,7 +82,7 @@ src = fetchurl {
url = "mirror://cpan/authors/id/A/AJ/AJOLMA/${pname}-${version}.tar.gz";
sha256 = "0f2lvc1cgzv62xxr1zq3lxr7kzc9vs7gvcyk7dksi3cvqmyjkwgd";
};
homepage = "https://metacpan.org/pod/Tree::R";
description = "Tree::R - Perl extension for the R-tree data structure and algorithms";
license = licenses.free;
@@ -97,7 +97,7 @@ url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz";
sha256 = "14s63ymcmrxhvnxjfjfqiiqm5yj5x2if246z62w1rynsj4rjqa4b";
};
propagatedBuildInputs = [ ListMoreUtils XMLParser ];
homepage = "https://metacpan.org/pod/Geo::Openstreetmap::Parser";
description = "Geo::Openstreetmap::Parser - Openstreetmap XML dump parser";
license = licenses.free;
@@ -112,7 +112,7 @@ url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz";
sha256 = "1jlrz18xgwcbicpfyfp9mi6dlnqd9j46lmygacn6aqwbk35jiv4s";
};
propagatedBuildInputs = [ ListMoreUtils EncodeLocale ];
homepage = "https://metacpan.org/pod/Geo::Openstreetmap::Parser";
description = "Geo::Names::Russian - parse and split russian geographical names";
license = licenses.free;
@@ -127,7 +127,7 @@ url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz";
sha256 = "0caxw619l1bk7fgdqxb52sb6vlkrd9qd4cn1i24q4lani3lvfx3b";
};
propagatedBuildInputs = [ DateTimeFormatBuilder ];
homepage = "https://metacpan.org/pod/DateTime::Format::EXIF";
description = "DateTime::Format::EXIF - DateTime parser for EXIF timestamps";
license = licenses.free;
diff --git a/pkgs/suckless/blind/default.nix b/pkgs/suckless/blind/default.nix
index c38911908af5078ef87fd6370bd2471c9dd888c1..e188dc897b7eae263ccde61f8c8eb27ae00dcc6e 100644
--- a/pkgs/suckless/blind/default.nix
+++ b/pkgs/suckless/blind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "blind";
@@ -11,7 +11,7 @@ };
installFlags = [ "PREFIX=$(out)" ];
description = "Collection of command line video editing utilities";
homepage = "https://tools.suckless.org/blind/";
license = licenses.isc;
diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix
index fae3568b35da4bea74a7a61aaeed81617ec46806..e9d849c0b9da04796d3fc7379b9edad62f879cdd 100644
--- a/pkgs/suckless/farbfeld-utils/default.nix
+++ b/pkgs/suckless/farbfeld-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfossil }:
+{ lib, stdenv, fetchfossil }:
stdenv.mkDerivation {
pname = "farbfeld-utils";
@@ -14,7 +14,7 @@ buildPhase = "$CC -o gif2ff gifff.c";
installPhase = "install -Dm755 gif2ff -t $out/bin";
description = "Collection of utilities for farbfeld picture format";
homepage = "http://zzo38computer.org/fossil/farbfeld.ui/home";
license = licenses.publicDomain;
diff --git a/pkgs/suckless/hurl/default.nix b/pkgs/suckless/hurl/default.nix
index f4958d3da781bfdd1f6934322af3658ea586e324..081f024851f53c072695d8fe851a1e6f22a73bd4 100644
--- a/pkgs/suckless/hurl/default.nix
+++ b/pkgs/suckless/hurl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libressl, libbsd }:
+{ lib, stdenv, fetchgit, libressl, libbsd }:
stdenv.mkDerivation rec {
pname = "hurl";
@@ -16,7 +16,7 @@ NIX_LDFLAGS = "-lbsd";
makeFlags = [ "PREFIX=$(out)" ];
description = "Relatively simple HTTP, HTTPS and Gopher client/file grabber";
homepage = "https://git.codemadness.org/hurl/file/README.html";
license = licenses.isc;
diff --git a/pkgs/suckless/imscript/default.nix b/pkgs/suckless/imscript/default.nix
index 67970d9a234df5539bb57a15be073cc484a0ccd3..5c7167bbd1d2e720059f488bcb2af860f08bb604 100644
--- a/pkgs/suckless/imscript/default.nix
+++ b/pkgs/suckless/imscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libpng, libjpeg, libtiff, fftwFloat, libX11, gsl }:
+{ lib, stdenv, fetchgit, libpng, libjpeg, libtiff, fftwFloat, libX11, gsl }:
stdenv.mkDerivation {
pname = "imscript";
@@ -24,7 +24,7 @@ install -Dm755 bin/* -t $out/bin
install -Dm644 doc/man/* -t $out/share/man/man1
'';
description = "A collection of small and standalone utilities for image processing";
homepage = "https://git.sr.ht/~coco/imscript";
license = licenses.agpl3;
diff --git a/pkgs/suckless/lacc/default.nix b/pkgs/suckless/lacc/default.nix
index ed245a5a0c979f486c015337d5e71643cb98f87c..bde0c8d2a539b1dccb228a814ef62a8487daed6b 100644
--- a/pkgs/suckless/lacc/default.nix
+++ b/pkgs/suckless/lacc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation {
pname = "lacc";
@@ -13,7 +13,7 @@ };
installFlags = [ "PREFIX=$(out)" ];
description = "A simple, self-hosting C compiler";
homepage = "https://github.com/larmel/lacc";
license = licenses.mit;
diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix
index d7bc2e5b65dd16511db0b3da5fe1535f0a71dd6c..3bd553b651d2fdb66639beb3c2e84a7cba31d525 100644
--- a/pkgs/suckless/lel/default.nix
+++ b/pkgs/suckless/lel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libX11, farbfeld, farbfeld-utils }:
+{ lib, stdenv, fetchgit, libX11, farbfeld, farbfeld-utils }:
stdenv.mkDerivation rec {
pname = "lel";
@@ -22,7 +22,7 @@ buildInputs = [ libX11 ];
makeFlags = [ "PREFIX=$(out)" ];
description = "Farbfeld image viewer";
homepage = "https://git.codemadness.org/lel/file/README.html";
license = licenses.mit;
diff --git a/pkgs/suckless/quark/default.nix b/pkgs/suckless/quark/default.nix
index 223a137e4fcbffe3d976d5cbcd8471b2cbc09564..0f285be4e938aaa6480b8b95b94b3aebdc2b1af2 100644
--- a/pkgs/suckless/quark/default.nix
+++ b/pkgs/suckless/quark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, patches ? [] }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation {
pname = "quark";
@@ -10,11 +10,9 @@ rev = "87ae2e9212c5cc7309eefa2a3f49a758862db6c7";
sha256 = "08gwb9rmj0d6z5p15vk5r7jv0wm80143mkzkq3cmmpd96mm689yw";
};
makeFlags = [ "PREFIX=$(out)" ];
description = "Extremely small and simple HTTP GET/HEAD-only web server for static content";
homepage = "http://tools.suckless.org/quark";
license = licenses.isc;
diff --git a/pkgs/suckless/saait/default.nix b/pkgs/suckless/saait/default.nix
index 3c487746f5ed9fe7fd23e81bdf5b2737b0f2ec67..c78aa2b9be15207ad529bb4eef629507707e790f 100644
--- a/pkgs/suckless/saait/default.nix
+++ b/pkgs/suckless/saait/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation {
pname = "saait";
@@ -12,7 +12,7 @@ };
makeFlags = [ "PREFIX=$(out)" ];
description = "The most boring static page generator";
homepage = "https://git.codemadness.org/saait/file/README.html";
license = licenses.isc;
diff --git a/pkgs/suckless/sbase/default.nix b/pkgs/suckless/sbase/default.nix
index a096358cd2557343dfe9a93fa434a47c08079d78..e2581c2627b284cbfae07c4527930e46596b9164 100644
--- a/pkgs/suckless/sbase/default.nix
+++ b/pkgs/suckless/sbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "sbase";
@@ -12,7 +12,7 @@ };
makeFlags = [ "PREFIX=$(out)" ];
description = "suckless unix tools";
homepage = "https://tools.suckless.org/sbase/";
license = licenses.mit;
diff --git a/pkgs/suckless/scroll/default.nix b/pkgs/suckless/scroll/default.nix
index 9acf2664a7bb25d9bcfeb9f02dc0a3b2870580fc..04c0fa00ee9f2dabd8aeeaf350a630986e4fe95a 100644
--- a/pkgs/suckless/scroll/default.nix
+++ b/pkgs/suckless/scroll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, patches ? null }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "scroll";
@@ -10,11 +10,9 @@ rev = version;
sha256 = "13qbzpw68140zzdmfdqww23b4brviqdpqvr134gjh1kpmpa6rgbn";
};
makeFlags = [ "PREFIX=$(out)" ];
description = "Scrollbackbuffer program for st";
homepage = "https://tools.suckless.org/scroll/";
license = licenses.isc;
diff --git a/pkgs/suckless/sfeed/default.nix b/pkgs/suckless/sfeed/default.nix
index fdd933f205f506a6bdf639b6e235ffede5beab60..b94493490072e5d3de8b0bddde67b31a8e7e6d3e 100644
--- a/pkgs/suckless/sfeed/default.nix
+++ b/pkgs/suckless/sfeed/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit }:
+{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "sfeed";
@@ -12,7 +12,7 @@ };
makeFlags = [ "PREFIX=$(out)" ];
description = "RSS and Atom parser";
homepage = "https://git.codemadness.org/sfeed/";
license = licenses.isc;
diff --git a/pkgs/suckless/stagit/default.nix b/pkgs/suckless/stagit/default.nix
index da31e03e155233fbdbb80029869b457a386d6a97..8c2b753e5601855326fc5f008c318e75e94c6aa7 100644
--- a/pkgs/suckless/stagit/default.nix
+++ b/pkgs/suckless/stagit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libgit2 }:
+{ lib, stdenv, fetchgit, libgit2 }:
stdenv.mkDerivation {
pname = "stagit";
@@ -14,7 +14,7 @@ buildInputs = [ libgit2 ];
makeFlags = [ "PREFIX=$(out)" ];
description = "Static git page generator";
homepage = "https://git.codemadness.org/stagit/file/README.html";
license = licenses.mit;
diff --git a/pkgs/suckless/xprompt/default.nix b/pkgs/suckless/xprompt/default.nix
index 886b84b31fc287467dfbacc7e24ff209a626f4e6..8f51645b6e60e65730a6fccb00e11744b6fa5abe 100644
--- a/pkgs/suckless/xprompt/default.nix
+++ b/pkgs/suckless/xprompt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libX11, libXft, libXinerama }:
+{ lib, stdenv, fetchFromGitHub, libX11, libXft, libXinerama }:
stdenv.mkDerivation rec {
pname = "xprompt";
diff --git a/pkgs/tools/geo/datamaps/default.nix b/pkgs/tools/geo/datamaps/default.nix
index 52c7016160a07efc7b70df190c62e1d534d1dd17..7f3752f5e1a27bf7040a0d29393a729a773eebf2 100644
--- a/pkgs/tools/geo/datamaps/default.nix
+++ b/pkgs/tools/geo/datamaps/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, libpng, pkg-config, sources }:
+{ lib, stdenv, libpng, pkg-config, sources }:
stdenv.mkDerivation {
pname = "datamaps";
src = sources.datamaps;
@@ -18,7 +18,7 @@ install -Dm755 $tool $out/bin/datamaps-$tool
done
'';
inherit (sources.datamaps) description homepage;
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/geo/gpx-layer/default.nix b/pkgs/tools/geo/gpx-layer/default.nix
index 4619a1f264577e5c972cd5eba020b33688f11c9c..8e914ee9373b30c79f6533b6c651fe0d86088e9a 100644
--- a/pkgs/tools/geo/gpx-layer/default.nix
+++ b/pkgs/tools/geo/gpx-layer/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }:
+{ lib, stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }:
buildPerlPackage {
pname = "gpx-layer";
src = sources.gpx-layer;
outputs = [ "out" ];
propagatedBuildInputs = [ XMLParser ];
@@ -16,13 +16,13 @@ preConfigure = "touch Makefile.PL";
installPhase = ''
install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx
patchShebangs $out/bin/datamaps-parse-gpx
shortenPerlShebang $out/bin/datamaps-parse-gpx
'';
inherit (sources.gpx-layer) description homepage;
license = licenses.free;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/geo/gpxtools/default.nix b/pkgs/tools/geo/gpxtools/default.nix
index d2f766b9d862759dd8efa61dd266e6af516ca2dc..1c52c83d6b8708bd6e3cacdf3af8f6d4c4b85c09 100644
--- a/pkgs/tools/geo/gpxtools/default.nix
+++ b/pkgs/tools/geo/gpxtools/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, cmake, expat, exiv2, sources }:
+{ lib, stdenv, cmake, expat, exiv2, sources }:
stdenv.mkDerivation {
pname = "gpxtools";
src = sources.gpxtools;
@@ -16,7 +16,7 @@ '';
installPhase = "install -Dm755 gpx* -t $out/bin";
inherit (sources.gpxtools) description homepage;
license = licenses.gpl3;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/geo/tile-stitch/default.nix b/pkgs/tools/geo/tile-stitch/default.nix
index fe67afab14c59756a6ff05cee554c289597a5b51..89923b5a506f776ef459fef22d5514a3d0396c0a 100644
--- a/pkgs/tools/geo/tile-stitch/default.nix
+++ b/pkgs/tools/geo/tile-stitch/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, curl, libjpeg, libpng, libtiff, libgeotiff, pkg-config, sources }:
+{ lib, stdenv, curl, libjpeg, libpng, libtiff, libgeotiff, pkg-config, sources }:
stdenv.mkDerivation {
pname = "tile-stitch";
src = sources.tile-stitch;
@@ -12,7 +12,7 @@ buildInputs = [ curl libjpeg libpng libtiff libgeotiff ];
installPhase = "install -Dm755 stitch -t $out/bin";
inherit (sources.tile-stitch) description homepage;
license = licenses.bsd2;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/text/csvquote/default.nix b/pkgs/tools/text/csvquote/default.nix
index d3b457e63ccf26121ce56b62377c01e695c468f0..09796a4c3d0b813c0794b66b688737d9c046412c 100644
--- a/pkgs/tools/text/csvquote/default.nix
+++ b/pkgs/tools/text/csvquote/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, sources }:
+{ lib, stdenv, sources }:
stdenv.mkDerivation {
pname = "csvquote";
src = sources.csvquote;
@@ -10,7 +10,7 @@ makeFlags = [ "BINDIR=$(out)/bin" ];
preInstall = "mkdir -p $out/bin";
inherit (sources.csvquote) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/text/csvtools/default.nix b/pkgs/tools/text/csvtools/default.nix
index d8ffbcab98f6343b2697e0289a85abe23ae27341..806190be8ae14bb525a454ae8a2c120d36f76e07 100644
--- a/pkgs/tools/text/csvtools/default.nix
+++ b/pkgs/tools/text/csvtools/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, pcre, openssl, sources }:
+{ lib, stdenv, pcre, openssl, sources }:
stdenv.mkDerivation {
pname = "csvtools";
src = sources.csvtools;
@@ -18,7 +18,7 @@ preCheck = "patchShebangs .";
preInstall = "mkdir -p $out/bin";
inherit (sources.csvtools) description homepage;
license = licenses.mit;
maintainers = [ maintainers.sikmir ];
diff --git a/pkgs/tools/text/fx/bin.nix b/pkgs/tools/text/fx/bin.nix
index c93bb51b9114b4c2dbcef88da5d4de7af9710f63..6d3e27413643607818a84bd6a13f96ffc2d01d3b 100644
--- a/pkgs/tools/text/fx/bin.nix
+++ b/pkgs/tools/text/fx/bin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchfromgh, unzip }:
+{ lib, stdenv, fetchfromgh, unzip }:
let
pname = "fx";
version = "18.0.1";
@@ -33,14 +33,14 @@ unpackPhase = "${unzip}/bin/unzip $src";
installPhase = "install -Dm755 fx-${suffix} $out/bin/fx";
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \
$out/bin/fx
'';
description = "Command-line tool and terminal JSON viewer";
homepage = "https://github.com/antonmedv/fx";
license = licenses.mit;
application/octet-streamThis content has been proxied by September (3851b).