Merge branch 'master' into development-tools-stdenv-lib

This commit is contained in:
Jörg Thalheim 2021-01-23 15:57:23 +00:00 committed by GitHub
commit 09f47ac855
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
156 changed files with 1076 additions and 1561 deletions

View file

@ -77,7 +77,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
def create_new_win():
with machine.nested("Creating a new Chromium window"):
machine.execute(
status, _ = machine.execute(
ru(
"${xdo "new-window" ''
search --onlyvisible --name "startup done"
@ -86,13 +86,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
''}"
)
)
machine.execute(
ru(
"${xdo "new-window" ''
key Ctrl+n
''}"
if status == 0:
machine.execute(
ru(
"${xdo "new-window" ''
key Ctrl+n
''}"
)
)
)
def close_win():
@ -115,7 +116,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
)
)
for _ in range(1, 20):
status, out = machine.execute(
status, _ = machine.execute(
ru(
"${xdo "wait-for-close" ''
search --onlyvisible --name "new tab"
@ -134,7 +135,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
ret = False
with machine.nested("Waiting for new Chromium window to appear"):
for _ in range(1, 20):
status, out = machine.execute(
status, _ = machine.execute(
ru(
"${xdo "wait-for-window" ''
search --onlyvisible --name "new tab"

View file

@ -7,16 +7,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "0.8.26-1";
version = "0.8.27";
src = fetchFromGitHub {
owner = "paritytech";
repo = "polkadot";
rev = "v${version}";
sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk";
sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c";
};
cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk";
cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs";
nativeBuildInputs = [ clang ];
@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec {
PROTOC = "${protobuf}/bin/protoc";
# NOTE: We don't build the WASM runtimes since this would require a more
# complicated rust environment setup. The resulting binary is still useful for
# live networks since those just use the WASM blob from the network chainspec.
BUILD_DUMMY_WASM_BINARY = 1;
# complicated rust environment setup and this is only needed for developer
# environments. The resulting binary is useful for end-users of live networks
# since those just use the WASM blob from the network chainspec.
SKIP_WASM_BUILD = 1;
# We can't run the test suite since we didn't compile the WASM runtimes.
doCheck = false;

View file

@ -38,24 +38,20 @@ let
in
stdenv.mkDerivation rec {
pname = "cudatext";
version = "1.118.2";
version = "1.122.3";
src = fetchFromGitHub {
owner = "Alexey-T";
repo = "CudaText";
rev = version;
sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b";
};
patches = [
# Don't check for update
./dont-check-update.patch
];
postPatch = ''
substituteInPlace app/proc_globdata.pas \
--replace "/usr/share/cudatext" "$out/share/cudatext" \
--replace "libpython3.so" "${python3}/lib/libpython3.so"
--replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \
--replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;"
'';
nativeBuildInputs = [ lazarus fpc ]

View file

@ -1,33 +1,33 @@
{
"EncConv": {
"owner": "Alexey-T",
"rev": "2020.06.15",
"sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3"
"rev": "2021.01.01",
"sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6"
},
"ATBinHex-Lazarus": {
"owner": "Alexey-T",
"rev": "2020.09.05",
"sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072"
"rev": "2020.11.22",
"sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7"
},
"ATFlatControls": {
"owner": "Alexey-T",
"rev": "2020.11.02",
"sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
"rev": "2021.01.12",
"sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9"
},
"ATSynEdit": {
"owner": "Alexey-T",
"rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
"sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
"rev": "2021.01.19",
"sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1"
},
"ATSynEdit_Cmp": {
"owner": "Alexey-T",
"rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
"sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
"rev": "2021.01.17",
"sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly"
},
"EControl": {
"owner": "Alexey-T",
"rev": "2020.10.04",
"sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq"
"rev": "2021.01.12",
"sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq"
},
"ATSynEdit_Ex": {
"owner": "Alexey-T",
@ -36,8 +36,8 @@
},
"Python-for-Lazarus": {
"owner": "Alexey-T",
"rev": "2020.10.23",
"sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
"rev": "2021.01.16",
"sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5"
},
"Emmet-Pascal": {
"owner": "Alexey-T",
@ -46,8 +46,8 @@
},
"CudaText-lexers": {
"owner": "Alexey-T",
"rev": "2020.08.10",
"sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6"
"rev": "2021.01.16",
"sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh"
},
"bgrabitmap": {
"owner": "bgrabitmap",

View file

@ -1,12 +0,0 @@
diff --git i/app/formmain.pas w/app/formmain.pas
index f6f37febb..cf993d75e 100644
--- i/app/formmain.pas
+++ w/app/formmain.pas
@@ -2156,6 +2156,7 @@ begin
false
{$endif};
*)
+ mnuHelpCheckUpd.Enabled:=false;
with AppPanels[cPaneSide] do
begin

View file

@ -117,7 +117,7 @@ let
base = rec {
name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) version;
inherit channel packageName buildType buildPath;
inherit packageName buildType buildPath;
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang
{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang, openssl
, nixosTests
}:
@ -6,26 +6,28 @@ with lib;
perlPackages.buildPerlPackage rec {
pname = "convos";
version = "5.00";
version = "5.11";
src = fetchFromGitHub {
owner = "Nordaaker";
repo = pname;
rev = version;
sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1";
sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
};
nativeBuildInputs = [ makeWrapper ]
++ optional stdenv.isDarwin [ shortenPerlShebang ];
buildInputs = with perlPackages; [
CryptEksblowfish FileHomeDir FileReadBackwards
CryptEksblowfish FileHomeDir FileReadBackwards HTTPAcceptLanguage
IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall
Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack
ParseIRC TextMarkdown TimePiece UnicodeUTF8
CpanelJSONXS EV
];
propagatedBuildInputs = [ openssl ];
checkInputs = with perlPackages; [ TestDeep TestMore ];
postPatch = ''
@ -43,6 +45,15 @@ perlPackages.buildPerlPackage rec {
substituteInPlace t/web-register-open-to-public.t \
--replace '!127.0.0.1!' '!localhost!'
# A webirc test fails to resolve "localhost" likely due to sandboxing, we
# remove this test.
#
rm t/irc-webirc.t
# A web-user test fails on Darwin, we remove it.
#
rm t/web-user.t
# Module::Install is a runtime dependency not covered by the tests, so we add
# a test for it.
#

View file

@ -0,0 +1,68 @@
{ lib
, buildPythonApplication
, fetchPypi
, makePythonPath
, dateutil
, matplotlib
, numpy
, pyenchant
, pyqt5
, pytest
, python
, qtsvg
, runtimeShell
, wrapQtAppsHook
}:
buildPythonApplication rec {
pname = "pyspread";
version = "1.99.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg=";
};
pythonLibs = [
dateutil
matplotlib
numpy
pyenchant
pyqt5
];
nativeBuildInputs = [ wrapQtAppsHook ];
buildInputs = pythonLibs ++ [
qtsvg
];
doCheck = false; # it fails miserably with a core dump
fixupPhase = ''
runHook preFixup
sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread
wrapProgram $out/bin/pyspread \
--prefix PYTHONPATH ':' $(toPythonPath $out):${makePythonPath pythonLibs} \
--prefix PATH ':' ${python}/bin/ \
''${qtWrapperArgs[@]}
runHook postFixup
'';
meta = with lib; {
homepage = "https://pyspread.gitlab.io/";
description = "A Python-oriented spreadsheet application";
longDescription = ''
pyspread is a non-traditional spreadsheet application that is based on and
written in the programming language Python. The goal of pyspread is to be
the most pythonic spreadsheet.
pyspread expects Python expressions in its grid cells, which makes a
spreadsheet specific language obsolete. Each cell returns a Python object
that can be accessed from other cells. These objects can represent
anything including lists or matrices.
'';
license = with licenses; gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; all;
};
}

View file

@ -9,14 +9,14 @@
buildPythonApplication rec {
pname = "glances";
version = "3.1.5";
version = "3.1.6";
disabled = isPyPy;
src = fetchFromGitHub {
owner = "nicolargo";
repo = "glances";
rev = "v${version}";
sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931";
sha256 = "sha256-uPqHXRwQQQZsttiLuqgr+dcAna+BVZtym4YEmTPLkXk=";
};
# Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

View file

@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
, sbcl, bash, which, perl, nettools
, openssl, glucose, minisat, abc-verifier, z3, python2
, certifyBooks ? true
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
# ACL2 itself only needs a Common Lisp compiler/interpreter:
sbcl
] ++ stdenv.lib.optionals certifyBooks [
] ++ lib.optionals certifyBooks [
# To build community books, we need Perl and a couple of utilities:
which perl nettools
# Some of the books require one or more of these external tools:
@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
preConfigure = ''
# When certifying books, ACL2 doesn't like $HOME not existing.
export HOME=$(pwd)/fake-home
'' + stdenv.lib.optionalString certifyBooks ''
'' + lib.optionalString certifyBooks ''
# Some books also care about $USER being nonempty.
export USER=nobody
'';
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname}
'' + stdenv.lib.optionalString certifyBooks ''
'' + lib.optionalString certifyBooks ''
ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert
ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
'';
@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
rm -rf $out/share/${pname}/books
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "An interpreter and a prover for a Lisp dialect";
longDescription = ''
ACL2 is a logic and programming language in which you can model computer

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, unzip }:
{ lib, stdenv, fetchurl, zlib, unzip }:
stdenv.mkDerivation rec {
pname = "libipasirglucose4";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
install -D libipasirglucose4.so $out/lib/libipasirglucose4.so
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Shared library providing IPASIR interface to the Glucose SAT solver";
license = licenses.mit;
platforms = platforms.unix;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre }:
{ lib, stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
pname = "alda";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A music programming language for musicians";
homepage = "https://alda.io";
license = licenses.epl10;

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip}:
{lib, stdenv, fetchurl, unzip}:
let
s = # Generated upstream information
rec {
@ -35,9 +35,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = "Light-weight scripting library";
license = stdenv.lib.licenses.zlib ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.zlib ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
badPlatforms = [ "aarch64-linux" ];
downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
homepage="http://www.angelcode.com/angelscript/";

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, unzip}:
{lib, stdenv, fetchurl, unzip}:
let
s = # Generated upstream information
rec {
@ -29,9 +29,9 @@ stdenv.mkDerivation {
meta = {
inherit (s) version;
description = "Light-weight scripting library";
license = stdenv.lib.licenses.zlib ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.zlib ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
homepage="http://www.angelcode.com/angelscript/";
};

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, mlton }:
{ lib, stdenv, fetchgit, mlton }:
stdenv.mkDerivation {
name = "ceptre-2016-11-27";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
cp ceptre $out/bin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A linear logic programming language for modeling generative interactive systems";
homepage = "https://github.com/chrisamaphone/interactive-lp";
maintainers = with maintainers; [ pSub ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
let
version = "0.9.1";
name = "chibi-scheme-${version}";
@ -9,9 +9,9 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/ashinn/chibi-scheme";
description = "Small Footprint Scheme for use as a C Extension Language";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
platforms = lib.platforms.all;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.DerGuteMoritz ];
};
src = fetchFromGitHub {

View file

@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, python
, libffi
, git
@ -50,7 +50,7 @@ let
"-DCLING_INCLUDE_TESTS=ON"
];
meta = with stdenv.lib; {
meta = with lib; {
description = "The Interactive C++ Interpreter";
homepage = "https://root.cern/cling/";
license = with licenses; [ lgpl21 ncsa ];
@ -73,7 +73,7 @@ let
flags = [
"-nostdinc"
"-nostdinc++"
"-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
"-isystem" "${lib.getDev stdenv.cc.libc}/include"
"-I" "${unwrapped}/include"
"-I" "${unwrapped}/lib/clang/5.0.2/include"
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
version = "6.30";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
installPhase = ''
install -D -t $out/bin core/clips
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A Tool for Building Expert Systems";
homepage = "http://www.clipsrules.net/";
longDescription = ''

View file

@ -3,7 +3,7 @@
# - base (default): contains readline and i18n, regexp and syscalls modules
# by default
# - full: contains base plus modules in withModules
{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
, libffi
, libffcall
@ -16,8 +16,8 @@
"pcre"
"rawsock"
]
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
++ lib.optional x11Support "clx/new-clx"
}:
assert x11Support -> (libX11 != null && libXau != null && libXt != null
@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
ffcallAvailable = stdenv.isLinux && (libffcall != null);
buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
++ lib.optional (gettext != null) gettext
++ lib.optional (ncurses != null) ncurses
++ lib.optional (pcre != null) pcre
++ lib.optional (zlib != null) zlib
++ lib.optional (readline != null) readline
++ lib.optional (ffcallAvailable && (libffi != null)) libffi
++ lib.optional ffcallAvailable libffcall
++ lib.optionals x11Support [
libX11 libXau libXt libXpm xorgproto libXext
];
@ -68,14 +68,14 @@ stdenv.mkDerivation rec {
'';
configureFlags = [ "builddir" ]
++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
++ stdenv.lib.optional (readline != null) "--with-readline"
++ lib.optional (!dllSupport) "--without-dynamic-modules"
++ lib.optional (readline != null) "--with-readline"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
++ lib.optional ffcallAvailable "--with-ffcall"
++ lib.optional (!ffcallAvailable) "--without-ffcall"
++ builtins.map (x: "--with-module=" + x) withModules
++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@ -83,11 +83,11 @@ stdenv.mkDerivation rec {
'';
postInstall =
stdenv.lib.optionalString (withModules != [])
lib.optionalString (withModules != [])
(''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+ stdenv.lib.concatMapStrings (x: " " + x) withModules);
+ lib.concatMapStrings (x: " " + x) withModules);
NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
# TODO : make mod-check fails
doCheck = false;
@ -95,10 +95,10 @@ stdenv.mkDerivation rec {
meta = {
description = "ANSI Common Lisp Implementation";
homepage = "http://clisp.cons.org";
maintainers = with stdenv.lib.maintainers; [raskin tohl];
platforms = stdenv.lib.platforms.unix;
maintainers = with lib.maintainers; [raskin tohl];
platforms = lib.platforms.unix;
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
};
}

View file

@ -3,7 +3,7 @@
# - base (default): contains readline and i18n, regexp and syscalls modules
# by default
# - full: contains base plus modules in withModules
{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
, libffi, libffcall, automake
, coreutils
@ -15,8 +15,8 @@
"pcre"
"rawsock"
]
++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
++ stdenv.lib.optional x11Support "clx/new-clx"
++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
++ lib.optional x11Support "clx/new-clx"
}:
assert x11Support -> (libX11 != null && libXau != null && libXt != null
@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ automake ]; # sometimes fails otherwise
buildInputs = [libsigsegv]
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (ncurses != null) ncurses
++ stdenv.lib.optional (pcre != null) pcre
++ stdenv.lib.optional (zlib != null) zlib
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
++ stdenv.lib.optional ffcallAvailable libffcall
++ stdenv.lib.optionals x11Support [
++ lib.optional (gettext != null) gettext
++ lib.optional (ncurses != null) ncurses
++ lib.optional (pcre != null) pcre
++ lib.optional (zlib != null) zlib
++ lib.optional (readline != null) readline
++ lib.optional (ffcallAvailable && (libffi != null)) libffi
++ lib.optional ffcallAvailable libffcall
++ lib.optionals x11Support [
libX11 libXau libXt libXpm xorgproto libXext
];
@ -63,14 +63,14 @@ stdenv.mkDerivation rec {
'';
configureFlags = [ "builddir" ]
++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
++ stdenv.lib.optional (readline != null) "--with-readline"
++ lib.optional (!dllSupport) "--without-dynamic-modules"
++ lib.optional (readline != null) "--with-readline"
# --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
++ lib.optional ffcallAvailable "--with-ffcall"
++ lib.optional (!ffcallAvailable) "--without-ffcall"
++ builtins.map (x: " --with-module=" + x) withModules
++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
preBuild = ''
sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
'';
postInstall =
stdenv.lib.optionalString (withModules != [])
lib.optionalString (withModules != [])
(''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+ stdenv.lib.concatMapStrings (x: " " + x) withModules);
+ lib.concatMapStrings (x: " " + x) withModules);
NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
# TODO : make mod-check fails
doCheck = false;
@ -91,8 +91,8 @@ stdenv.mkDerivation rec {
meta = {
description = "ANSI Common Lisp Implementation";
homepage = "http://clisp.cons.org";
maintainers = with stdenv.lib.maintainers; [raskin tohl];
maintainers = with lib.maintainers; [raskin tohl];
# problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
platforms = stdenv.lib.platforms.linux;
platforms = lib.platforms.linux;
};
}

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, graalvm11-ce, glibcLocales }:
{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "babashka";
version = "0.2.3";
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
cp bb $out/bin/bb
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A Clojure babushka for the grey areas of Bash";
longDescription = ''
The main idea behind babashka is to leverage Clojure in places where you

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre, makeWrapper }:
{ lib, stdenv, fetchurl, jre, makeWrapper }:
let version = "0.4.4"; in
@ -25,6 +25,6 @@ stdenv.mkDerivation {
meta = {
description = "A lightweight IDE for Clojure";
homepage = "https://github.com/arthuredelstein/clooj";
license = stdenv.lib.licenses.bsd3;
license = lib.licenses.bsd3;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
stdenv.mkDerivation rec {
pname = "clojure";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
# See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
installPhase =
let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
binPath = lib.makeBinPath [ rlwrap jdk ];
in
''
clojure_lib_dir=$out
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
-Sverbose \
-Scp $out/libexec/clojure-tools-${version}.jar
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A Lisp dialect for the JVM";
homepage = "https://clojure.org/";
license = licenses.epl10;

View file

@ -280,8 +280,8 @@ stdenv.mkDerivation {
making it the fastest Clojure REPL in existence.
'';
homepage = "https://github.com/anmonteiro/lumo";
license = stdenv.lib.licenses.epl10;
maintainers = [ stdenv.lib.maintainers.hlolli ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.hlolli ];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libck, darwin }:
{ lib, stdenv, fetchFromGitHub, libck, darwin }:
let
version = "0.21";
@ -15,7 +15,7 @@ let
enableParallelBuilding = true;
nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = [ libck ];
@ -36,13 +36,13 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
nativeBuildInputs = [ bootstrap ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = [ libck ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://justinethier.github.io/cyclone/";
description = "A brand-new compiler that allows practical application development using R7RS Scheme";
license = licenses.mit;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, version ? "2.7.2" }:
{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }:
let
@ -80,7 +80,7 @@ let
in
with stdenv.lib;
with lib;
stdenv.mkDerivation {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "duktape";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "An embeddable Javascript engine, with a focus on portability and compact footprint";
homepage = "https://duktape.org/";
downloadPage = "https://duktape.org/download.html";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, which, ocamlPackages }:
{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
let version = "5.0"; in
@ -25,7 +25,7 @@ stdenv.mkDerivation {
doCheck = true;
checkTarget = "test";
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.eff-lang.org";
description = "A functional programming language based on algebraic effects and their handlers";
longDescription = ''

View file

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper,
{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper,
coreutils, curl, bash, debugInfo ? false }:
{ baseName ? "elixir"
@ -10,7 +10,7 @@
} @ args:
let
inherit (stdenv.lib) getVersion versionAtLeast optional;
inherit (lib) getVersion versionAtLeast optional;
in
assert versionAtLeast (getVersion erlang) minimumOTPVersion;
@ -46,7 +46,7 @@ in
b=$(basename $f)
if [ "$b" = mix ]; then continue; fi
wrapProgram $f \
--prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
--prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
--set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
done
@ -55,7 +55,7 @@ in
'';
pos = builtins.unsafeGetAttrPos "sha256" args;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://elixir-lang.org/";
description = "A functional, meta-programming aware language built on top of the Erlang VM";

View file

@ -1,4 +1,4 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoconf
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
, openjdk8 ? null # javacSupport
@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk8 != null;
let
inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
inherit (lib) optional optionals optionalAttrs optionalString;
wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
in stdenv.mkDerivation ({
@ -106,12 +106,12 @@ in stdenv.mkDerivation ({
# Some erlang bin/ scripts run sed and awk
postFixup = ''
wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}"
'';
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; ({
meta = with lib; ({
homepage = "https://www.erlang.org/";
downloadPage = "https://www.erlang.org/download.html";
description = "Programming language used for massively scalable soft real-time systems";

View file

@ -1,4 +1,4 @@
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }:
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
rustPlatform.buildRustPackage rec {
pname = "evcxr";
@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec {
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
nativeBuildInputs = [ pkg-config makeWrapper cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = lib.optional stdenv.isDarwin Security;
postInstall = let
wrap = exe: ''
wrapProgram $out/bin/${exe} \
--prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
--prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \
--set-default RUST_SRC_PATH "$RUST_SRC_PATH"
'';
in ''
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
rm $out/bin/testing_runtime
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "An evaluation context for Rust";
homepage = "https://github.com/google/evcxr";
license = licenses.asl20;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
stdenv.mkDerivation {
pname = "falcon";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cmake pcre zlib sqlite ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Programming language with macros and syntax at once";
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline, gettext, ncurses }:
{ lib, stdenv, fetchurl, readline, gettext, ncurses }:
stdenv.mkDerivation rec {
pname = "gnu-apl";
@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
buildInputs = [ readline gettext ncurses ];
# Needed with GCC 8
NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [
NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [
"-Wno-error=int-in-bool-context"
"-Wno-error=class-memaccess"
"-Wno-error=restrict"
"-Wno-error=format-truncation"
]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
patchPhase = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
'';
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
find $out/share/doc/support-files -name 'Makefile*' -delete
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Free interpreter for the APL programming language";
homepage = "https://www.gnu.org/software/apl/";
license = licenses.gpl3Plus;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
# at runtime, need jdk
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "An agile dynamic language for the Java Platform";
homepage = "http://groovy-lang.org/";
license = licenses.asl20;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ lib, stdenv, fetchurl
, glib
, gtk3
, libffcall
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
configureOptions = [ "--with-gtk3" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "gtk-server for interpreted GUI programming";
homepage = "http://www.gtk-server.org/";
license = licenses.gpl2Plus;

View file

@ -1,4 +1,4 @@
{ stdenv, pkgsBuildBuild, buildPackages
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkg-config
, libtool, readline, gmp
}:
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-error-on-warning" ]
# Guile needs patching to preset results for the configure tests about
# pthreads, which work only in native builds.
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
"--with-threads=no";
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool ];
@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
meta = {
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.ludo ];
platforms = lib.platforms.unix;
longDescription = ''
GNU Guile is an interpreter for the Scheme programming language,

View file

@ -1,4 +1,4 @@
{ stdenv, pkgsBuildBuild, buildPackages
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@ -21,7 +21,7 @@
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
@ -46,8 +46,8 @@
})
./riscv.patch
] ++
(stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
++ stdenv.lib.optionals stdenv.isDarwin [
(lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
++ lib.optionals stdenv.isDarwin [
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
@ -59,10 +59,10 @@
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
# don't have "libgcc_s.so.1" on darwin
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
configureFlags = [ "--with-libreadline-prefix" ]
++ stdenv.lib.optionals stdenv.isSunOS [
++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@ -102,9 +102,9 @@
meta = {
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ ludo lovek323 ];
platforms = lib.platforms.all;
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with
@ -120,7 +120,7 @@
//
(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
(lib.optionalAttrs (!stdenv.isLinux) {
# Work around <https://bugs.gnu.org/14201>.
SHELL = stdenv.shell;
CONFIG_SHELL = stdenv.shell;

View file

@ -1,4 +1,4 @@
{ stdenv, pkgsBuildBuild, buildPackages
{ lib, stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
@ -23,7 +23,7 @@
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
@ -48,8 +48,8 @@
patches = [
./eai_system.patch
] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
++ lib.optional stdenv.isDarwin (fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
});
@ -58,11 +58,11 @@
# "libgcc_s.so.1 must be installed for pthread_cancel to work".
# don't have "libgcc_s.so.1" on darwin
LDFLAGS = stdenv.lib.optionalString
LDFLAGS = lib.optionalString
(!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
++ stdenv.lib.optionals stdenv.isSunOS [
++ lib.optionals stdenv.isSunOS [
# Make sure the right <gmp.h> is found, and not the incompatible
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@ -101,9 +101,9 @@
meta = {
description = "Embeddable Scheme implementation";
homepage = "https://www.gnu.org/software/guile/";
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
platforms = stdenv.lib.platforms.all;
license = lib.licenses.lgpl3Plus;
maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];
platforms = lib.platforms.all;
longDescription = ''
GNU Guile is an implementation of the Scheme programming language, with

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison }:
{ lib, stdenv, fetchurl, bison }:
stdenv.mkDerivation {
@ -39,7 +39,7 @@ stdenv.mkDerivation {
"--enable-pthreads" # build Hugs using POSIX threads C library
];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.haskell.org/hugs";
description = "Haskell interpreter";
maintainers = with maintainers; [ joachifm ];

View file

@ -1,4 +1,4 @@
{ stdenv, python3Packages }:
{ lib, stdenv, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "hy";
@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
$out/bin/hy --help > /dev/null
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A LISP dialect embedded in Python";
homepage = "http://hylang.org/";
license = licenses.mit;

View file

@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchFromGitHub
, libX11
, libXt
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2";
};
buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
buildInputs = lib.optionals withGraphics [ libX11 libXt ];
configurePhase =
let
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
mv $out/doc $out/share/doc/icon
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A very high level general-purpose programming language";
maintainers = with maintainers; [ vrthra yurrriq ];
platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
@ -37,7 +37,7 @@ stdenv.mkDerivation {
# for gcc5; c11 inline semantics breaks the build
NIX_CFLAGS_COMPILE = "-fgnu89-inline";
meta = with stdenv.lib; {
meta = with lib; {
description = "Io programming language";
homepage = "http://iolanguage.org/";
license = licenses.bsd3;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, readline, libedit, bc
{ lib, stdenv, fetchFromGitHub, readline, libedit, bc
, avxSupport ? stdenv.hostPlatform.avxSupport
}:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
doCheck = true;
# Causes build failure due to warning
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow";
hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
buildPhase = ''
export SOURCE_DIR=$(pwd)
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
cp -r $JLIB/bin "$out"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "J programming language, an ASCII-based APL successor";
maintainers = with maintainers; [ raskin synthetica ];
platforms = with platforms; linux ++ darwin;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, ninja }:
{ lib, stdenv, fetchFromGitHub, meson, ninja }:
stdenv.mkDerivation rec {
pname = "janet";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "Janet programming language";
homepage = "https://janet-lang.org/";
license = licenses.mit;

View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
let
makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
in stdenv.mkDerivation rec {
pname = "jimtcl";
@ -52,8 +52,8 @@ in stdenv.mkDerivation rec {
meta = {
description = "An open source small-footprint implementation of the Tcl programming language";
homepage = "http://jim.tcl.tk/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
license = lib.licenses.bsd2;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ dbohdan vrthra ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "joker";
@ -21,7 +21,7 @@ buildGoModule rec {
subPackages = [ "." ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/candid82/joker";
description = "A small Clojure interpreter and linter written in Go";
license = licenses.epl10;

View file

@ -1,4 +1,4 @@
{ stdenv, callPackage, fetchurl, makeWrapper, jre }:
{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }:
let
# The version number here is whatever is reported by the RUBY_VERSION string
@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec {
libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "Ruby interpreter written in Java";
homepage = "http://jruby.org/";
license = with licenses; [ cpl10 gpl2 lgpl21 ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, jre }:
{ lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
pname = "jython";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Python interpreter written in Java";
homepage = "https://jython.org/";
license = stdenv.lib.licenses.psfl;
license = lib.licenses.psfl;
platforms = jre.meta.platforms;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "kona";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
preInstall = ''mkdir -p "$out/bin"'';
meta = with stdenv.lib; {
meta = with lib; {
description = "An interpreter of K, APL-like programming language";
homepage = "https://github.com/kevinlawler/kona/";
maintainers = with maintainers; [ raskin ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
{ baseName ? "lfe"
, version
@ -10,7 +10,7 @@
}:
let
inherit (stdenv.lib)
inherit (lib)
assertMsg makeBinPath optionalString
getVersion versionAtLeast versionOlder versions;
@ -75,7 +75,7 @@ buildRebar3 {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "The best of Erlang and of Lisp; at the same time!";
longDescription = ''
LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "lolcode";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@ -34,8 +34,8 @@ stdenv.mkDerivation {
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
license = lib.licenses.zlib;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config
{ lib, stdenv, fetchurl, pkg-config
, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
license = lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config
{ lib, stdenv, fetchurl, pkg-config
, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
license = lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config
{ lib, stdenv, fetchurl, pkg-config
, SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
license = lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
broken = true;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@ -34,8 +34,8 @@ stdenv.mkDerivation {
meta = {
homepage = "http://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = stdenv.lib.licenses.zlib;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
license = lib.licenses.zlib;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};
}

View file

@ -40,7 +40,7 @@ in rec {
sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
'';
postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
postBuild = lib.optionalString (!stdenv.isDarwin) ''
( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
'';
};

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://github.com/keplerproject/luafilesystem";
hydraPlatforms = stdenv.lib.platforms.linux;
hydraPlatforms = lib.platforms.linux;
maintainers = [ ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline
{ lib, stdenv, fetchurl, readline
, compat ? false
, callPackage
, packageOverrides ? (self: super: {})
@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec {
runHook preConfigure
makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" )
makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" )
@ -107,8 +107,8 @@ self = stdenv.mkDerivation rec {
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
};
in self

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://w3.impa.br/~diego/software/luasocket/";
hydraPlatforms = stdenv.lib.platforms.linux;
hydraPlatforms = lib.platforms.linux;
maintainers = [ ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, lua, buildEnv, makeWrapper
{ lib, stdenv, lua, buildEnv, makeWrapper
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
@ -28,7 +28,7 @@ let
addToLuaPath "$out"
# take every binary from lua packages and put them into the env
for path in ${stdenv.lib.concatStringsSep " " paths}; do
for path in ${lib.concatStringsSep " " paths}; do
nix_debug "looking for binaries in path = $path"
if [ -d "$path/bin" ]; then
cd "$path/bin"
@ -37,7 +37,7 @@ let
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
nix_debug "Making wrapper $prg"
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildPackages
{ lib, stdenv, fetchFromGitHub, buildPackages
, name ? "luajit-${version}"
, isStable
, sha256
@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null;
let
luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
XCFLAGS = with stdenv.lib;
XCFLAGS = with lib;
optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
configurePhase = false;
buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
buildInputs = lib.optional enableValgrindSupport valgrind;
buildFlags = [
"amalg" # Build highly optimized version
@ -70,14 +70,14 @@ stdenv.mkDerivation rec {
"CROSS=${stdenv.cc.targetPrefix}"
# TODO: when pointer size differs, we would need e.g. -m32
"HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = XCFLAGS;
postInstall = ''
( cd "$out/include"; ln -s luajit-*/* . )
ln -s "$out"/bin/luajit-* "$out"/bin/lua
'' + stdenv.lib.optionalString (!isStable) ''
'' + lib.optionalString (!isStable) ''
ln -s "$out"/bin/luajit-* "$out"/bin/luajit
'';
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
interpreter = "${self}/bin/lua";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = "http://luajit.org";
license = licenses.mit;

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Lisp Universal SHell";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.gpl2Plus ;
maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
, libsigsegv, gmpxx, cln, yices
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation {
];
hardeningDisable = [ "stackprotector" ] ++
stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
lib.optionals stdenv.isi686 [ "pic" "fortify" ];
preConfigure = ''
configureFlagsArray=(
@ -54,7 +54,7 @@ stdenv.mkDerivation {
meta = {
homepage = "http://maude.cs.illinois.edu/";
description = "High-level specification language";
license = stdenv.lib.licenses.gpl2Plus;
license = lib.licenses.gpl2Plus;
longDescription = ''
Maude is a high-performance reflective language and system
@ -66,7 +66,7 @@ stdenv.mkDerivation {
rewriting logic computation.
'';
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.peti ];
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.peti ];
};
}

View file

@ -1,19 +1,21 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation {
let
version = "0.194";
in stdenv.mkDerivation {
pname = "metamath";
version = "0.193";
inherit version;
buildInputs = [ autoreconfHook ];
src = fetchFromGitHub {
owner = "metamath";
repo = "metamath-exe";
rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
rev = "v${version}";
sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
};
meta = with stdenv.lib; {
meta = with lib; {
description = "Interpreter for the metamath proof language";
longDescription = ''
The metamath program is an ASCII-based ANSI C program with a command-line
@ -23,7 +25,7 @@ stdenv.mkDerivation {
'';
homepage = "http://us.metamath.org";
downloadPage = "http://us.metamath.org/#downloads";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = [ maintainers.taneb ];
platforms = platforms.all;
};

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, readline }:
{ lib, stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
pname = "mujs";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://mujs.com/";
description = "A lightweight, embeddable Javascript interpreter";
platforms = platforms.unix;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkg-config, nix, git }: let
{ lib, stdenv, fetchurl, pkg-config, nix, git }: let
version = "4.1.6";
in stdenv.mkDerivation {
pname = "nix-exec";
@ -17,7 +17,7 @@ in stdenv.mkDerivation {
meta = {
description = "Run programs defined in nix expressions";
homepage = "https://github.com/shlevy/nix-exec";
license = stdenv.lib.licenses.mit;
license = lib.licenses.mit;
platforms = nix.meta.platforms;
broken = true;
};

View file

@ -1,4 +1,4 @@
{ stdenv, perl, buildEnv, makeWrapper
{ lib, stdenv, perl, buildEnv, makeWrapper
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
@ -28,7 +28,7 @@ let
mkdir -p "$out/bin"
# take every binary from perl packages and put them into the env
for path in ${stdenv.lib.concatStringsSep " " paths}; do
for path in ${lib.concatStringsSep " " paths}; do
if [ -d "$path/bin" ]; then
cd "$path/bin"
for prg in *; do

View file

@ -269,7 +269,7 @@ let
inherit ztsSupport;
};
meta = with stdenv.lib; {
meta = with lib; {
description = "An HTML-embedded scripting language";
homepage = "https://www.php.net/";
license = licenses.php301;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, readline }:
{ lib, stdenv, fetchFromGitHub, readline }:
stdenv.mkDerivation rec {
pname = "picoc";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
install -m644 *.h $out/include
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Very small C interpreter for scripting";
longDescription = ''
PicoC is a very small C interpreter for scripting. It was originally

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
with stdenv.lib;
{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
with lib;
stdenv.mkDerivation rec {
pname = "picoLisp";

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
pypy, libffi, libedit, libuv, boost, zlib,
variant ? "jit", buildWithPypy ? false }:
@ -23,11 +23,11 @@ let
sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
};
libs = [ libffi libedit libuv boost.dev boost.out zlib ];
include-path = stdenv.lib.concatStringsSep ":"
include-path = lib.concatStringsSep ":"
(map (p: "${p}/include") libs);
library-path = stdenv.lib.concatStringsSep ":"
library-path = lib.concatStringsSep ":"
(map (p: "${p}/lib") libs);
bin-path = stdenv.lib.concatStringsSep ":"
bin-path = lib.concatStringsSep ":"
(map (p: "${p}/bin") [ gcc ]);
build = {flags, target}: stdenv.mkDerivation rec {
pname = "pixie";
@ -85,9 +85,9 @@ let
meta = {
description = "A clojure-like lisp, built with the pypy vm toolkit";
homepage = "https://github.com/pixie-lang/pixie";
license = stdenv.lib.licenses.lgpl3;
license = lib.licenses.lgpl3;
platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
maintainers = with stdenv.lib.maintainers; [ bendlas ];
maintainers = with lib.maintainers; [ bendlas ];
};
};
in build (builtins.getAttr variant variants)

View file

@ -1,4 +1,4 @@
{ stdenv, pixie, fetchFromGitHub }:
{ lib, stdenv, pixie, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "dust-0-91";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
homepage = src.meta.homepage;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
license = lib.licenses.lgpl3;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
let
sexpr_wasm_prototype = stdenv.mkDerivation {
@ -51,7 +51,7 @@ stdenv.mkDerivation {
make install
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "wasm runs WebAssembly from the command line";
maintainers = with maintainers; [ proglodyte ];
platforms = platforms.linux;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages }:
{ lib, stdenv, fetchurl, python2Packages }:
let version = "0.9.5.1.1"; in
@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
meta = {
homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
description = "A language for writing Python extension modules";
license = stdenv.lib.licenses.asl20;
license = lib.licenses.asl20;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages }:
{ lib, stdenv, fetchurl, python2Packages }:
let version = "0.9.6.4"; in
@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
meta = {
homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
description = "A language for writing Python extension modules";
license = stdenv.lib.licenses.asl20;
license = lib.licenses.asl20;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch
{ lib, stdenv, fetchurl, fetchpatch
, bzip2
, expat
, libffi
@ -36,7 +36,7 @@ assert x11Support -> tcl != null
&& xlibsWrapper != null
&& libX11 != null;
with stdenv.lib;
with lib;
let
buildPackages = pkgsBuildHost;
@ -215,7 +215,7 @@ let
};
# Python 2.7 needs this
crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
{ _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };
# Build the basic Python interpreter without modules that have
@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({
inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags;
LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
@ -298,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({
hierarchical packages; exception-based error handling; and very
high level dynamic data types.
'';
license = stdenv.lib.licenses.psfl;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ fridh ];
license = lib.licenses.psfl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ fridh ];
# Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
# in case both 2 and 3 are installed.
priority = -100;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch
{ lib, stdenv, fetchurl, fetchpatch
, bzip2
, expat
, libffi
@ -54,7 +54,7 @@ assert x11Support -> tcl != null
assert bluezSupport -> bluez != null;
with stdenv.lib;
with lib;
let
buildPackages = pkgsBuildHost;
@ -369,14 +369,14 @@ in with passthru; stdenv.mkDerivation {
find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
'';
preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
# Ensure patch-shebangs uses shebangs of host interpreter.
export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH
export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH
'';
# Add CPython specific setup-hook that configures distutils.sysconfig to
# always load sysconfigdata from host Python.
postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
cat << "EOF" >> "$out/nix-support/setup-hook"
${sysconfigdataHook}
EOF
@ -385,8 +385,8 @@ in with passthru; stdenv.mkDerivation {
# Enforce that we don't have references to the OpenSSL -dev package, which we
# explicitly specify in our configure flags above.
disallowedReferences =
stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ]
++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
lib.optionals (openssl != null && !static) [ openssl.dev ]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# Ensure we don't have references to build-time packages.
# These typically end up in shebangs.
pythonForBuild buildPackages.bash

View file

@ -1,4 +1,4 @@
{ stdenv, substituteAll, fetchurl
{ lib, stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
, self, gdbm, db, lzma
@ -14,12 +14,12 @@
, pythonVersion
, sha256
, passthruFun
, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}"
, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
}:
assert zlibSupport -> zlib != null;
with stdenv.lib;
with lib;
let
isPy3k = substring 0 1 pythonVersion == "3";
@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec {
ln -s $out/${executable}-c/include $out/include/${libPrefix}
ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
${stdenv.lib.optionalString stdenv.isDarwin ''
${lib.optionalString stdenv.isDarwin ''
install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable}
''}
@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec {
inherit passthru;
enableParallelBuilding = true; # almost no parallelization without STM
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://pypy.org/";
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
license = licenses.mit;

View file

@ -22,7 +22,7 @@
# This version of PyPy is primarily added to speed-up translation of
# our PyPy source build when developing that expression.
with stdenv.lib;
with lib;
let
isPy3k = majorVersion == "3";
@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation {
pushd $out
find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
echo "Removing bytecode"
find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation {
inherit passthru;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "http://pypy.org/";
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
license = licenses.mit;

View file

@ -93,4 +93,4 @@ let
in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)

View file

@ -1,4 +1,4 @@
{ stdenv, python, buildEnv, makeWrapper
{ lib, stdenv, python, buildEnv, makeWrapper
, extraLibs ? []
, extraOutputsToInstall ? []
, postBuild ? ""
@ -30,14 +30,14 @@ let
fi
mkdir -p "$out/bin"
for path in ${stdenv.lib.concatStringsSep " " paths}; do
for path in ${lib.concatStringsSep " " paths}; do
if [ -d "$path/bin" ]; then
cd "$path/bin"
for prg in *; do
if [ -f "$prg" ]; then
rm -f "$out/bin/$prg"
if [ -x "$prg" ]; then
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${if permitUserSite then "" else ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs}
fi
fi
done

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
stdenv.mkDerivation {
pname = "qnial";
@ -33,8 +33,8 @@ stdenv.mkDerivation {
meta = {
description = "An array language from Nial Systems";
homepage = "https://github.com/vrthra/qnial";
license = stdenv.lib.licenses.artistic1;
maintainers = [ stdenv.lib.maintainers.vrthra ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.artistic1;
maintainers = [ lib.maintainers.vrthra ];
platforms = lib.platforms.linux;
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "quickjs";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A small and embeddable Javascript engine";
homepage = "https://bellard.org/quickjs/";
maintainers = with maintainers; [ stesie ];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeFontsConf
{ lib, stdenv, fetchurl, makeFontsConf
, cacert
, cairo, coreutils, fontconfig, freefont_ttf
, glib, gmp
@ -22,7 +22,7 @@ let
fontDirectories = [ freefont_ttf ];
};
libPath = stdenv.lib.makeLibraryPath [
libPath = lib.makeLibraryPath [
cairo
fontconfig
glib
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
pname = "racket";
version = "7.9"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
src = (lib.makeOverridable ({ name, sha256 }:
fetchurl {
url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
inherit sha256;
@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
FONTCONFIG_FILE = fontsConf;
LD_LIBRARY_PATH = libPath;
NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [
(stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
(stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
NIX_LDFLAGS = lib.concatStringsSep " " [
(lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
(lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
];
nativeBuildInputs = [ cacert wrapGAppsHook ];
buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
preConfigure = ''
unset AR
@ -83,15 +83,15 @@ stdenv.mkDerivation rec {
shared = if stdenv.isDarwin then "dylib" else "shared";
configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
++ lib.optional disableDocs [ "--disable-docs" ]
++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];
configureScript = "../configure";
enableParallelBuilding = false;
meta = with stdenv.lib; {
meta = with lib; {
description = "A programmable programming language";
longDescription = ''
Racket is a full-spectrum programming language. It goes beyond

View file

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
# Some tests fail on Darwin
doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
meta = with lib; {
description = "Raku implementation on top of Moar virtual machine";
homepage = "https://www.rakudo.org";
license = licenses.artistic2;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl
{ lib, stdenv, fetchurl, perl
, CoreServices, ApplicationServices }:
stdenv.mkDerivation rec {
@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
};
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
doCheck = false; # MoarVM does not come with its own test suite
configureScript = "${perl}/bin/perl ./Configure.pl";
meta = with stdenv.lib; {
meta = with lib; {
description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
homepage = "https://www.moarvm.org/";
license = licenses.artistic2;

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
homepage = "https://github.com/perl6/nqp";
license = licenses.artistic2;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rakudo, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }:
stdenv.mkDerivation rec {
pname = "zef";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Raku / Perl6 Module Management";
homepage = "https://github.com/ugexe/zef";
license = licenses.artistic2;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, jdk }:
{ lib, stdenv, fetchurl, makeWrapper, jdk }:
stdenv.mkDerivation rec {
name = "rascal-0.6.2";
@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://www.rascal-mpl.org/";
description = "Command-line REPL for the Rascal metaprogramming language";
license = stdenv.lib.licenses.epl10;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
};
}

View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
cp r3 $out/bin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Relative expression based object language, a language where code is data";
maintainers = with maintainers; [ vrthra ];
platforms = [ "x86_64-linux" ];

View file

@ -1,4 +1,4 @@
{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
stdenv.mkDerivation rec {
pname = "red";
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
meta = with lib; {
description = ''
New programming language strongly inspired by Rebol, but with a
broader field of usage thanks to its native-code compiler, from system

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses }:
{ lib, stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
pname = "Regina-REXX";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
"--libdir=$(out)/lib"
];
meta = with stdenv.lib; {
meta = with lib; {
description = "REXX interpreter";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages, pkg-config, SDL2
{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2
, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
, glib
}:
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
pname = "renpy";
version = "7.3.5";
meta = with stdenv.lib; {
meta = with lib; {
description = "Ren'Py Visual Novel Engine";
homepage = "https://renpy.org/";
license = licenses.mit;
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
pythonPath = [ pygame_sdl2 tkinter ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib
]);

View file

@ -159,7 +159,7 @@ let
export GEM_HOME="$out/${passthru.gemPath}"
'';
installFlags = stdenv.lib.optional docSupport "install-doc";
installFlags = lib.optional docSupport "install-doc";
# Bundler tries to create this directory
postInstall = ''
# Remove unnecessary groff reference from runtime closure, since it's big
@ -208,7 +208,7 @@ let
disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
meta = with stdenv.lib; {
meta = with lib; {
description = "The Ruby language";
homepage = "http://www.ruby-lang.org/en/";
license = licenses.ruby;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "scheme48-1.9.2";
@ -6,8 +6,8 @@ stdenv.mkDerivation {
meta = {
homepage = "http://s48.org/";
description = "Scheme 48";
platforms = with stdenv.lib.platforms; unix;
license = stdenv.lib.licenses.bsd3;
platforms = with lib.platforms; unix;
license = lib.licenses.bsd3;
};
src = fetchurl {

View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoreconfHook, scheme48 }:
{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
stdenv.mkDerivation {
name = "scsh-0.7pre";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ scheme48 ];
configureFlags = [ "--with-scheme48=${scheme48}" ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A Scheme shell";
homepage = "http://www.scsh.net/";
license = licenses.bsd3;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
stdenv.mkDerivation rec {
# The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
--set SELF_ROOT "$out"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
homepage = "https://selflanguage.org/";
license = licenses.bsd3;

View file

@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
, shen-sources
, sbcl
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
mkdir -p $out
install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://shenlanguage.org;
description = "Port of Shen running on Steel Bank Common Lisp";
platforms = sbcl.meta.platforms;

View file

@ -1,4 +1,4 @@
{ stdenv
{ lib, stdenv
, fetchurl
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp . $out -R
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://shenlanguage.org;
description = "Source code for the Shen Language";
platforms = platforms.all;

Some files were not shown because too many files have changed in this diff Show more