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
This commit is contained in:
Profpatsch
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, jdk, python2 }:
|
||||
{ lib, stdenv, fetchurl, jdk, python2 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "antlr-2.7.7";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [ jdk ];
|
||||
nativeBuildInputs = [ python2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Powerful parser generator";
|
||||
longDescription = ''
|
||||
ANTLR (ANother Tool for Language Recognition) is a powerful parser
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, jre}:
|
||||
{lib, stdenv, fetchurl, jre}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "antlr";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit jre;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Powerful parser generator";
|
||||
longDescription = ''
|
||||
ANTLR (ANother Tool for Language Recognition) is a powerful parser
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, fetchFromGitHub, jre}:
|
||||
{lib, stdenv, fetchurl, fetchFromGitHub, jre}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "antlr";
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
inherit jre;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Powerful parser generator";
|
||||
longDescription = ''
|
||||
ANTLR (ANother Tool for Language Recognition) is a powerful parser
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, jre
|
||||
{ lib, stdenv, fetchurl, jre
|
||||
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
|
||||
|
||||
let
|
||||
@@ -26,7 +26,7 @@ let
|
||||
export sourceRoot=$sourceRoot/runtime/Cpp
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "C++ target for ANTLR 4";
|
||||
homepage = "https://www.antlr.org/";
|
||||
license = licenses.bsd3;
|
||||
@@ -67,7 +67,7 @@ let
|
||||
jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Powerful parser generator";
|
||||
longDescription = ''
|
||||
ANTLR (ANother Tool for Language Recognition) is a powerful parser
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, fetchFromGitLab
|
||||
{lib, stdenv, fetchurl, fetchFromGitLab
|
||||
, yodl, icmake, flexcpp, bobcat
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
./build install x
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
inherit version;
|
||||
description = "A parser generator like bison, but it generates C++ code";
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "byacc";
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
ln -s $out/bin/byacc $out/bin/yacc
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Berkeley YACC";
|
||||
homepage = "https://invisible-island.net/byacc/byacc.html";
|
||||
license = licenses.publicDomain;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, flex, bison, texinfo, help2man, m4 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "flex-2.5.35";
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
|
||||
|
||||
doCheck = false; # fails 2 out of 46 tests
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
branch = "2.5.35";
|
||||
homepage = "http://flex.sourceforge.net/";
|
||||
description = "A fast lexical analyser generator";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, bison, m4 }:
|
||||
{ lib, stdenv, fetchurl, bison, m4 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "flex-2.6.1";
|
||||
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
|
||||
sed -i Makefile -e 's/-no-undefined//;'
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/westes/flex";
|
||||
description = "A fast lexical analyser generator";
|
||||
license = licenses.bsd2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPackages, fetchurl, bison, m4
|
||||
{ lib, stdenv, buildPackages, fetchurl, bison, m4
|
||||
, fetchpatch, autoreconfHook, help2man
|
||||
}:
|
||||
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/westes/flex";
|
||||
description = "A fast lexical analyser generator";
|
||||
license = licenses.bsd2;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
|
||||
{ lib, stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flexc++";
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
./build install x
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "C++ tool for generating lexical scanners";
|
||||
longDescription = ''
|
||||
Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, glib, pkgconfig, python, scons }:
|
||||
{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hammer";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ glib python scons ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "A bit-oriented parser combinator library";
|
||||
longDescription = ''
|
||||
Hammer is a parsing library. Like many modern parsing libraries,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl}:
|
||||
{lib, stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jikespg-1.3";
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
cp jikespg $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "http://jikes.sourceforge.net/";
|
||||
description = "The Jikes Parser Generator";
|
||||
platforms = platforms.linux;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
|
||||
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
|
||||
install -Dvm644 ${srcs.lempar} $out/bin/lempar.c
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "An LALR(1) parser generator";
|
||||
longDescription = ''
|
||||
The Lemon program is an LALR(1) parser generator that takes a
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "peg-0.1.18";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild="makeFlagsArray+=( PREFIX=$out )";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "http://piumarta.com/software/peg/";
|
||||
description = "Tools for generating recursive-descent parsers: programs that perform pattern matching on text";
|
||||
platforms = platforms.all;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, transfig, tex, ghostscript, colm
|
||||
{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm
|
||||
, build-manual ? false
|
||||
}:
|
||||
|
||||
@@ -25,7 +25,7 @@ let
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.colm.net/open-source/ragel/";
|
||||
description = "State machine compiler";
|
||||
inherit license;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re2c";
|
||||
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs run_tests.sh
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Tool for writing very fast and very flexible scanners";
|
||||
homepage = "http://re2c.org";
|
||||
license = licenses.publicDomain;
|
||||
|
||||
Reference in New Issue
Block a user