diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/applications/gis | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/applications/gis')
-rw-r--r-- | pkgs/applications/gis/gmt/dcw.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/gis/gmt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/gis/gmt/gshhg.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/gis/openorienteering-mapper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/gis/whitebox-tools/default.nix | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 58390e892903..bc253f394c7f 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "dcw-gmt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp -rv ./* $out/share/dcw-gmt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; description = "Vector basemap of the world, for use with GMT"; longDescription = '' diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index f045ec067fee..0e2b45888b48 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo +{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo , fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt , gshhg-gmt }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "-DBLAS_LIBRARY=${blas}/lib/libblas.so" ]); - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix index 0f22f87c89b5..62758c71d594 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/applications/gis/gmt/gshhg.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "gshhg-gmt"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp -rv ./* $out/share/gshhg-gmt ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; description = "High-resolution shoreline data set, for use with GMT"; longDescription = '' diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 45c38b3e5732..e4307e244ad0 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , mkDerivation , fetchFromGitHub , substituteAll @@ -75,7 +75,7 @@ mkDerivation rec { ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' OpenOrienteering Mapper is an orienteering mapmaking program and provides a free alternative to the existing proprietary solution. diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 61c2bbc542cd..c31701901ec5 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; version = "1.4.0"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; - meta = with stdenv.lib; { + meta = with lib; { description = "An advanced geospatial data analysis platform"; homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; license = licenses.mit; |