commit 50d29a1fcad8f1ee808de60e124453f2808706b7 parent 57df03994d2433f9e60f7d0d582f789546f99b01 Author: Nikolay Korotkiy <sikmir@gmail.com> Date: Thu, 4 Feb 2021 22:16:14 +0300 stdenv.lib is deprecated Diffstat:
103 files changed, 286 insertions(+), 279 deletions(-)
diff --git 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 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/Anki.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , substituteAll , db @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , perlPackages , python2Packages , gimp @@ -31,7 +32,7 @@ stdenv.mkDerivation { pname = "mapsoft-unstable"; - version = stdenv.lib.substring 0 10 sources.mapsoft.date; + version = lib.substring 0 10 sources.mapsoft.date; src = sources.mapsoft; @@ -84,7 +85,7 @@ stdenv.mkDerivation { sconsFlags = [ "minimal=1" "prefix=$(out)" ]; postInstall = '' - wrapPythonProgramsIn $out/lib/gimp/${stdenv.lib.versions.major gimp.version}.0/plug-ins/ + wrapPythonProgramsIn $out/lib/gimp/${lib.versions.major gimp.version}.0/plug-ins/ 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 @@ stdenv.mkDerivation { --replace "getopt " "${getopt}/bin/getopt " ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, undmg, sources }: +{ lib, stdenv, fetchfromgh, undmg, sources }: stdenv.mkDerivation rec { pname = "Openorienteering-Mapper-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/Mapper.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ undmg ]; - sourceRoot = if releaseType == "pr" then "QGIS.app" else "QGIS${stdenv.lib.substring 0 4 version}.app"; + sourceRoot = if releaseType == "pr" then "QGIS.app" else "QGIS${lib.substring 0 4 version}.app"; installPhase = '' mkdir -p $out/Applications/QGIS.app cp -r . $out/Applications/QGIS.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { cp -r *.app $out/Applications ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, unzip, wine, makeWrapper, sources }: +{ lib, stdenv, unzip, wine, makeWrapper, sources }: let - year = stdenv.lib.substring 0 2 sources.sasplanet.version; - month = stdenv.lib.substring 2 2 sources.sasplanet.version; - day = stdenv.lib.substring 4 2 sources.sasplanet.version; + year = lib.substring 0 2 sources.sasplanet.version; + month = lib.substring 2 2 sources.sasplanet.version; + day = lib.substring 4 2 sources.sasplanet.version; in stdenv.mkDerivation { pname = "sasplanet-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { cp -r *_Structure $out/share/${pname} ''; - postFixup = with stdenv.lib; '' + postFixup = with lib; '' patchelf --replace-needed "./libTdhCairo.so" libTdhCairo.so $out/bin/${pname} patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ @@ -40,7 +40,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ let inherit name src; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, undmg, sources }: +{ lib, stdenv, fetchurl, undmg, sources }: stdenv.mkDerivation rec { pname = "gpxsee-bin"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/GPXSee.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/share/java/i18n-editor.jar" ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { pname = "iterm2-bin"; version = "3.3.12"; src = fetchurl { - url = "https://iterm2.com/downloads/stable/iTerm2-${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}.zip"; + url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings [ "." ] [ "_" ] version}.zip"; sha256 = "0rw165p9iypc11pr0mmwd1z4dvg0f3is2p8bv2sk30wyd4hba4b8"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, unzip }: +{ lib, stdenv, fetchfromgh, unzip }: stdenv.mkDerivation rec { pname = "MacPass-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ let inherit name src; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ let }.${system} or throwSystem; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, undmg }: +{ lib, stdenv, fetchfromgh, undmg }: stdenv.mkDerivation rec { pname = "qutebrowser-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/qutebrowser.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, sources }: +{ lib, stdenv, sources }: stdenv.mkDerivation { pname = "nnn-plugins"; - version = stdenv.lib.substring 0 10 sources.nnn.date; + version = lib.substring 0 10 sources.nnn.date; src = sources.nnn; @@ -15,7 +15,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , qmake @@ -31,7 +32,7 @@ mkDerivation { install -Dm755 VisualGPSqt -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, unzip }: +{ lib, stdenv, fetchfromgh, unzip }: stdenv.mkDerivation rec { pname = "Amethyst-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }: +{ lib, stdenv, fetchFromGitHub, Cocoa, ScriptingBridge, xxd }: stdenv.mkDerivation rec { pname = "yabai"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm644 doc/yabai.1 -t $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, undmg }: +{ lib, stdenv, fetchfromgh, undmg }: stdenv.mkDerivation rec { pname = "wireguard-statusbar-bin"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/WireGuardStatusbar.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenvNoCC.mkDerivation { preferLocalBuild = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, lang, version, sha256 }: +{ lib, stdenvNoCC, fetchurl, lang, version, sha256 }: stdenvNoCC.mkDerivation { pname = "freedict-${lang}"; @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation { preferLocalBuild = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { 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 @@ -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 @@ stdenvNoCC.mkDerivation { preferLocalBuild = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { 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 @@ -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 @@ -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 @@ stdenvNoCC.mkDerivation { installPhase = "install -Dm644 *.{dict*,idx,ifo} -t $out"; - meta = with stdenvNoCC.lib; { + meta = with lib; { 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 @@ -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 @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, lang, version, sha256 }: +{ lib, stdenvNoCC, fetchurl, lang, version, sha256 }: stdenvNoCC.mkDerivation { pname = "wiktionary-${lang}"; @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { preferLocalBuild = true; - meta = with stdenvNoCC.lib; { + meta = with lib; { 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -1,8 +1,8 @@ -{ stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }: +{ lib, stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }: stdenv.mkDerivation { - pname = "slazav-hr-unstable"; - version = stdenv.lib.substring 0 10 sources.map-hr.date; + pname = "slazav-hr"; + version = lib.substring 0 10 sources.map-hr.date; src = sources.map-hr; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "install -Dm644 OUT/all_*.img -t $out"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ fetchurl { postFetch = "install -Dm644 $downloadedFile $out/all_podm.img"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }: +{ lib, stdenv, bc, cgpsmapper, gmaptool, mapsoft2, sources }: stdenv.mkDerivation { - pname = "slazav-podm-unstable"; - version = stdenv.lib.substring 0 10 sources.map-podm.date; + pname = "slazav-podm"; + version = lib.substring 0 10 sources.map-podm.date; src = sources.map-podm; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "install -Dm644 OUT/all_*.img -t $out"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ -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 @@ -1,8 +1,8 @@ -{ stdenv, gdal, osmium-tool, sources }: +{ lib, stdenv, gdal, osmium-tool, sources }: let - year = stdenv.lib.substring 0 2 sources.geofabrik-russia-nwfd.version; - month = stdenv.lib.substring 2 2 sources.geofabrik-russia-nwfd.version; - day = stdenv.lib.substring 4 2 sources.geofabrik-russia-nwfd.version; + year = lib.substring 0 2 sources.geofabrik-russia-nwfd.version; + month = lib.substring 2 2 sources.geofabrik-russia-nwfd.version; + day = lib.substring 4 2 sources.geofabrik-russia-nwfd.version; regions = [ "RU-ARK" @@ -38,7 +38,7 @@ in installPhase = "install -Dm644 *.geojson -t $out"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, sources, routino }: +{ lib, stdenv, sources, routino }: let - year = stdenv.lib.substring 0 2 sources.geofabrik-russia-nwfd.version; - month = stdenv.lib.substring 2 2 sources.geofabrik-russia-nwfd.version; - day = stdenv.lib.substring 4 2 sources.geofabrik-russia-nwfd.version; + year = lib.substring 0 2 sources.geofabrik-russia-nwfd.version; + month = lib.substring 2 2 sources.geofabrik-russia-nwfd.version; + day = lib.substring 4 2 sources.geofabrik-russia-nwfd.version; in stdenv.mkDerivation { pname = "routinodb"; @@ -34,7 +34,7 @@ stdenv.mkDerivation { --process-only ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, sources }: +{ lib, stdenv, sources }: stdenv.mkDerivation { pname = "qtpbfimageplugin-styles"; - version = stdenv.lib.substring 0 10 sources.qtpbfimageplugin-styles.date; + version = lib.substring 0 10 sources.qtpbfimageplugin-styles.date; src = sources.qtpbfimageplugin-styles; @@ -11,7 +11,7 @@ stdenv.mkDerivation { cp -r Mapbox OpenMapTiles Tilezen $out/share/gpxsee/style ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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"; - version = stdenv.lib.substring 0 10 sources.foma.date; + version = lib.substring 0 10 sources.foma.date; src = sources.foma; @@ -20,7 +20,7 @@ stdenv.mkDerivation { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "geographiclib"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "046k49h52n2qxclqdzjmqj6pbvqsb28hn7lnsrdi1xbxc54hjdrl"; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, cmake, expat, sources }: +{ lib, stdenv, cmake, expat, sources }: stdenv.mkDerivation { pname = "gpxlib-unstable"; - version = stdenv.lib.substring 0 10 sources.gpxlib.date; + version = lib.substring 0 10 sources.gpxlib.date; src = sources.gpxlib; @@ -22,7 +22,7 @@ stdenv.mkDerivation { test/gpxcheck ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,14 +1,14 @@ -{ stdenv, autoreconfHook, bison, flex, sources }: +{ lib, stdenv, autoreconfHook, bison, flex, sources }: stdenv.mkDerivation { pname = "hfst-unstable"; - version = stdenv.lib.substring 0 10 sources.hfst.date; + version = lib.substring 0 10 sources.hfst.date; src = sources.hfst; nativeBuildInputs = [ autoreconfHook bison flex ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoconf, automake, libtool }: +{ lib, stdenv, fetchsvn, autoconf, automake, libtool }: stdenv.mkDerivation { pname = "libgarmin"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { && autoreconf ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , bash , dash , help2man @@ -10,7 +11,7 @@ stdenv.mkDerivation { pname = "libshell-unstable"; - version = stdenv.lib.substring 0 10 sources.libshell.date; + version = lib.substring 0 10 sources.libshell.date; src = sources.libshell; @@ -26,7 +27,7 @@ stdenv.mkDerivation { done ''; - makeFlags = with stdenv.lib; [ + makeFlags = with lib; [ "DESTDIR=$(out)" (optional withDoc "SCDOC=${scdoc}/bin/scdoc") (optional (!withDoc) "SCDOC=") @@ -34,7 +35,7 @@ stdenv.mkDerivation { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, cmake, gtest, sources }: +{ lib, stdenv, cmake, gtest, sources }: stdenv.mkDerivation { pname = "microjson-unstable"; - version = stdenv.lib.substring 0 10 sources.microjson.date; + version = lib.substring 0 10 sources.microjson.date; src = sources.microjson; @@ -17,7 +17,7 @@ stdenv.mkDerivation { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , sources , runtimeShell @@ -14,7 +15,7 @@ let ''; gdbGef = writeScript "gdb-gef" ( - with stdenv.lib; '' + with lib; '' #!${runtimeShell} export PATH="${makeBinPath [ procps binutils-unwrapped python3 ]}:$PATH" export NIX_PYTHONPATH="${pythonPath}" @@ -29,7 +30,7 @@ let in stdenv.mkDerivation { pname = "gef-unstable"; - version = stdenv.lib.substring 0 10 sources.gef.date; + version = lib.substring 0 10 sources.gef.date; src = sources.gef; @@ -47,7 +48,7 @@ stdenv.mkDerivation { substituteInPlace $out/bin/gdb-gef --subst-var out ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = "./install.sh $out"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,22 +1,22 @@ -{ stdenv, cmake, sources }: +{ lib, stdenv, cmake, sources }: stdenv.mkDerivation { pname = "how-to-use-pvs-studio-free-unstable"; - version = stdenv.lib.substring 0 10 sources.how-to-use-pvs-studio-free.date; + version = lib.substring 0 10 sources.how-to-use-pvs-studio-free.date; src = sources.how-to-use-pvs-studio-free; nativeBuildInputs = [ cmake ]; - postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace CMakeLists.txt \ --replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" "" - '' + stdenv.lib.optionalString stdenv.cc.isClang '' + '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace CMakeLists.txt \ --replace "stdc++fs" "c++fs" ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, pkg-config, emacs, zlib, sources }: +{ lib, stdenv, pkg-config, emacs, zlib, sources }: stdenv.mkDerivation { pname = "gdcv"; - version = stdenv.lib.substring 0 10 sources.gdcv.date; + version = lib.substring 0 10 sources.gdcv.date; src = sources.gdcv; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm644 gdcv-elisp.so gdcv.el -t $out/share/emacs/site-lisp ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, undmg }: +{ lib, stdenv, fetchurl, undmg }: stdenv.mkDerivation rec { pname = "goldendict-bin"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp -r . $out/Applications/GoldenDict.app ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, sources }: +{ lib, stdenv, sources }: stdenv.mkDerivation { pname = "gt-bash-client-unstable"; - version = stdenv.lib.substring 0 10 sources.gt-bash-client.date; + version = lib.substring 0 10 sources.gt-bash-client.date; src = sources.gt-bash-client; @@ -10,7 +10,7 @@ stdenv.mkDerivation { install -Dm755 translate.sh $out/bin/gt-bash-client ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , autoconf , automake , libtool @@ -12,7 +13,7 @@ stdenv.mkDerivation { pname = "stardict-tools"; - version = stdenv.lib.substring 0 10 sources.stardict-3.date; + version = lib.substring 0 10 sources.stardict-3.date; src = sources.stardict-3; @@ -49,7 +50,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { inherit (sources.stardict-3) description homepage; license = licenses.gpl3Plus; maintainers = [ maintainers.sikmir ]; diff --git a/pkgs/embox/default.nix b/pkgs/embox/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , writers , sources @@ -28,7 +29,7 @@ let in stdenv.mkDerivation { pname = "embox-unstable"; - version = stdenv.lib.substring 0 10 sources.embox.date; + version = lib.substring 0 10 sources.embox.date; src = sources.embox; @@ -61,7 +62,7 @@ stdenv.mkDerivation { install -Dm755 scripts/qemu/stop_script $out/share/embox/scripts/qemu_stop ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 { - url = "https://download.garmin.com/software/BaseCampforMac_${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.dmg"; + url = "https://download.garmin.com/software/BaseCampforMac_${lib.replaceStrings [ "." ] [ "" ] version}.dmg"; sha256 = "09jrbix42a6aqv8vd4hcrvhfnj9y7l17xm7hdyc6p1nmb859y5ri"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchwebarchive }: +{ lib, stdenv, fetchwebarchive }: stdenv.mkDerivation { pname = "cgpsmapper"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installCheckPhase = "$out/bin/cgpsmapper-static -h"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,14 +1,14 @@ -{ stdenv, sources, libiconv }: +{ lib, stdenv, sources, libiconv }: stdenv.mkDerivation { pname = "gimgtools-unstable"; - version = stdenv.lib.substring 0 10 sources.gimgtools.date; + version = lib.substring 0 10 sources.gimgtools.date; src = sources.gimgtools; - buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + buildInputs = lib.optional stdenv.isDarwin libiconv; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace "CC = gcc" "" ''; @@ -19,7 +19,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,7 +1,7 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "0.8.220"; - filename = "lgmt${stdenv.lib.replaceStrings [ "." ] [ "" ] version}.zip"; + filename = "lgmt${lib.replaceStrings [ "." ] [ "" ] version}.zip"; in stdenv.mkDerivation { pname = "gmaptool"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 gmt -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "imgdecode"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm755 imgdecode -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ buildPerlPackage { cp -r Convert $out/lib/perl5/site_perl ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn }: +{ lib, stdenv, fetchsvn }: stdenv.mkDerivation { pname = "ocad2mp-unstable"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1700apfsjd27q9jsvvr94mk7rd0x24ib3bkn4y8hak0zvknib563"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.gcc \ --replace "CXX=g++" "" \ --replace "LINK=g++" "LINK=$CXX" \ @@ -35,7 +35,7 @@ stdenv.mkDerivation { install -Dm644 SYM.TXT $out/share/ocad2mp/sym.txt ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }: +{ lib, stdenv, gmaptool, mkgmap, p7zip, zsh, sources, substituteAll }: stdenv.mkDerivation { pname = "openmtbmap"; - version = stdenv.lib.substring 0 10 sources.openmtbmap.date; + version = lib.substring 0 10 sources.openmtbmap.date; src = sources.openmtbmap; @@ -17,7 +17,7 @@ stdenv.mkDerivation { install -Dm755 create_omtb_garmin_img.sh $out/bin/create_omtb_garmin_img ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , buildPerlPackage , shortenPerlShebang , sources @@ -20,13 +21,13 @@ buildPerlPackage { pname = "osm2mp"; - version = stdenv.lib.substring 0 10 sources.osm2mp.date; + version = lib.substring 0 10 sources.osm2mp.date; src = sources.osm2mp; outputs = [ "out" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ ConfigStd @@ -58,13 +59,13 @@ buildPerlPackage { cp -r cfg/* $out/share/osm2mp/cfg install -dm755 $out/lib/perl5/site_perl cp -r lib/* $out/lib/perl5/site_perl - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchShebangs $out/bin/osm2mp - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/osm2mp ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchwebarchive }: +{ llib, stdenv, fetchwebarchive }: stdenv.mkDerivation { pname = "sendmap20"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installCheckPhase = "$out/bin/sendmap20 -h"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, libconfig, file, openssl, flex, sources }: +{ lib, stdenv, libconfig, file, openssl, flex, sources }: stdenv.mkDerivation { pname = "geminid"; - version = stdenv.lib.substring 0 10 sources.geminid.date; + version = lib.substring 0 10 sources.geminid.date; src = sources.geminid; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 geminid -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, go, sources }: +{ lib, stdenv, go, sources }: stdenv.mkDerivation { pname = "gloggery-unstable"; - version = stdenv.lib.substring 0 10 sources.gloggery.date; + version = lib.substring 0 10 sources.gloggery.date; src = sources.gloggery; @@ -14,7 +14,7 @@ stdenv.mkDerivation { postInstall = "mv $out/.gloggery $out/share/glogger"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { "--with-mimedb=${mailcap}/etc/mime.types" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zig }: +{ lib, stdenv, fetchFromGitHub, zig }: stdenv.mkDerivation { pname = "gurl-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 zig-cache/bin/gurl -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses5 SDL SDL_mixer ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation" - ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=mismatched-new-delete"; + NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isGNU "-Wno-error=stringop-truncation" + ++ lib.optional stdenv.cc.isClang "-Wno-error=mismatched-new-delete"; installPhase = '' install -Dm755 main $out/bin/ascii-dash @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cp -r ../{data,sounds} $out/share/ascii-dash ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, pkg-config, ncurses, w3m, ueberzug, sources }: +{ lib, stdenv, pkg-config, ncurses, w3m, ueberzug, sources }: stdenv.mkDerivation { pname = "cfiles-unstable"; - version = stdenv.lib.substring 0 10 sources.cfiles.date; + version = lib.substring 0 10 sources.cfiles.date; src = sources.cfiles; @@ -21,7 +21,7 @@ stdenv.mkDerivation { --replace "ueberzug" "${ueberzug}/bin/ueberzug" ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,14 +1,14 @@ -{ stdenv, sources }: +{ lib, stdenv, sources }: stdenv.mkDerivation { pname = "docker-reg-tool"; - version = stdenv.lib.substring 0 10 sources.docker-reg-tool.date; + version = lib.substring 0 10 sources.docker-reg-tool.date; src = sources.docker-reg-tool; installPhase = "install -Dm755 docker_reg_tool -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "ish"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 ish ishd -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap }: +{ lib, stdenv, fetchurl, libpcap }: stdenv.mkDerivation rec { pname = "ptunnel"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper }: +{ lib, stdenv, fetchurl, xlibsWrapper }: stdenv.mkDerivation rec { pname = "xfractint"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fractal generator"; homepage = "https://fractint.org/"; license = licenses.free; diff --git 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"; - version = stdenv.lib.substring 0 10 sources.nakarte.date; + version = lib.substring 0 10 sources.nakarte.date; in mkYarnPackage { name = "${pname}-${version}"; @@ -23,7 +23,7 @@ mkYarnPackage { distPhase = "true"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { 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" ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , boost @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { pname = "osm-area-tools"; - version = stdenv.lib.substring 0 10 sources.osm-area-tools.date; + version = lib.substring 0 10 sources.osm-area-tools.date; src = sources.osm-area-tools; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , bzip2 @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { pname = "osmcoastline"; - version = stdenv.lib.substring 0 10 sources.osmcoastline.date; + version = lib.substring 0 10 sources.osmcoastline.date; src = sources.osmcoastline; @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { zlib ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { installPhase = "install -Dm755 sdlmap -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { install -Dm755 src/{osmstats,taginfo-sizes} -t $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages }: +{ lib, stdenv, fetchurl, perlPackages }: with perlPackages; rec { MatchSimple = buildPerlPackage rec { @@ -10,7 +10,7 @@ rec { }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ExporterTiny ScalarListUtils SubInfix ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://metacpan.org/pod/match::smart"; description = "match::smart - clone of smartmatch operator"; license = licenses.free; @@ -25,7 +25,7 @@ rec { sha256 = "1jsyq60mhkc31br33yf1lyll61c8k7h27h2nmvyzsjmbcvdambjw"; }; buildInputs = [ TestFatal ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://metacpan.org/pod/Sub::Infix"; description = "Sub::Infix - create a fake infix operator"; license = licenses.free; @@ -39,7 +39,7 @@ rec { url = "mirror://cpan/authors/id/M/MA/MARKOV/${pname}-${version}.tar.gz"; sha256 = "1my2vwmv1yk5hwyr8q2p9mvyca2mjdggnk93hpj1gnpkgxp5y382"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://metacpan.org/pod/Math::Polygon"; description = "Math::Polygon - Class for maintaining polygon data"; license = licenses.free; @@ -54,7 +54,7 @@ rec { sha256 = "1332sn0r1p5jpgddcx1h5jppysy5y8jkicgk1wfcvzqw5hgx344w"; }; propagatedBuildInputs = [ ListMoreUtils MathGeometryPlanarGPCPolygonXS ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ rec { url = "mirror://cpan/authors/id/L/LI/LIOSHA/${pname}-${version}.tar.gz"; sha256 = "0hdjxk74lpcsc51q8adnaxlfg4wsxn10jwd0l1zw8r76xgzljlgl"; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ rec { url = "mirror://cpan/authors/id/A/AJ/AJOLMA/${pname}-${version}.tar.gz"; sha256 = "0f2lvc1cgzv62xxr1zq3lxr7kzc9vs7gvcyk7dksi3cvqmyjkwgd"; }; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ rec { sha256 = "14s63ymcmrxhvnxjfjfqiiqm5yj5x2if246z62w1rynsj4rjqa4b"; }; propagatedBuildInputs = [ ListMoreUtils XMLParser ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://metacpan.org/pod/Geo::Openstreetmap::Parser"; description = "Geo::Openstreetmap::Parser - Openstreetmap XML dump parser"; license = licenses.free; @@ -112,7 +112,7 @@ rec { sha256 = "1jlrz18xgwcbicpfyfp9mi6dlnqd9j46lmygacn6aqwbk35jiv4s"; }; propagatedBuildInputs = [ ListMoreUtils EncodeLocale ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ rec { sha256 = "0caxw619l1bk7fgdqxb52sb6vlkrd9qd4cn1i24q4lani3lvfx3b"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "blind"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfossil }: +{ lib, stdenv, fetchfossil }: stdenv.mkDerivation { pname = "farbfeld-utils"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 gif2ff -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libressl, libbsd }: +{ lib, stdenv, fetchgit, libressl, libbsd }: stdenv.mkDerivation rec { pname = "hurl"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation { install -Dm644 doc/man/* -t $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "lacc"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, patches ? [] }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "quark"; @@ -10,11 +10,9 @@ stdenv.mkDerivation { sha256 = "08gwb9rmj0d6z5p15vk5r7jv0wm80143mkzkq3cmmpd96mm689yw"; }; - inherit patches; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "saait"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "sbase"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, patches ? null }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "scroll"; @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { sha256 = "13qbzpw68140zzdmfdqww23b4brviqdpqvr134gjh1kpmpa6rgbn"; }; - inherit patches; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "sfeed"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libgit2 }: +{ lib, stdenv, fetchgit, libgit2 }: stdenv.mkDerivation { pname = "stagit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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 @@ -1,8 +1,8 @@ -{ stdenv, libpng, pkg-config, sources }: +{ lib, stdenv, libpng, pkg-config, sources }: stdenv.mkDerivation { pname = "datamaps"; - version = stdenv.lib.substring 0 10 sources.datamaps.date; + version = lib.substring 0 10 sources.datamaps.date; src = sources.datamaps; @@ -18,7 +18,7 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,14 +1,14 @@ -{ stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }: +{ lib, stdenv, buildPerlPackage, shortenPerlShebang, XMLParser, sources }: buildPerlPackage { pname = "gpx-layer"; - version = stdenv.lib.substring 0 10 sources.gpx-layer.date; + version = lib.substring 0 10 sources.gpx-layer.date; src = sources.gpx-layer; outputs = [ "out" ]; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ XMLParser ]; @@ -16,13 +16,13 @@ buildPerlPackage { installPhase = '' install -Dm755 parse-gpx $out/bin/datamaps-parse-gpx - '' + stdenv.lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' patchShebangs $out/bin/datamaps-parse-gpx - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/datamaps-parse-gpx ''; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, cmake, expat, exiv2, sources }: +{ lib, stdenv, cmake, expat, exiv2, sources }: stdenv.mkDerivation { pname = "gpxtools"; - version = stdenv.lib.substring 0 10 sources.gpxtools.date; + version = lib.substring 0 10 sources.gpxtools.date; src = sources.gpxtools; @@ -16,7 +16,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 gpx* -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -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"; - version = stdenv.lib.substring 0 10 sources.tile-stitch.date; + version = lib.substring 0 10 sources.tile-stitch.date; src = sources.tile-stitch; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "install -Dm755 stitch -t $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, sources }: +{ lib, stdenv, sources }: stdenv.mkDerivation { pname = "csvquote"; - version = stdenv.lib.substring 0 10 sources.csvquote.date; + version = lib.substring 0 10 sources.csvquote.date; src = sources.csvquote; @@ -10,7 +10,7 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,8 +1,8 @@ -{ stdenv, pcre, openssl, sources }: +{ lib, stdenv, pcre, openssl, sources }: stdenv.mkDerivation { pname = "csvtools"; - version = stdenv.lib.substring 0 10 sources.csvtools.date; + version = lib.substring 0 10 sources.csvtools.date; src = sources.csvtools; @@ -18,7 +18,7 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin"; - meta = with stdenv.lib; { + meta = with lib; { 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 @@ -1,4 +1,4 @@ -{ stdenv, fetchfromgh, unzip }: +{ lib, stdenv, fetchfromgh, unzip }: let pname = "fx"; version = "18.0.1"; @@ -33,14 +33,14 @@ stdenv.mkDerivation { installPhase = "install -Dm755 fx-${suffix} $out/bin/fx"; - postFixup = stdenv.lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' 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 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line tool and terminal JSON viewer"; homepage = "https://github.com/antonmedv/fx"; license = licenses.mit;