git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into development-tools-stdenv-lib
commit09f47ac855ac8356b8b467f3c4870c20ba77d8b0 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 23 Jan 2021, 15:57 (6 years ago) parentc522fec9d6fd2b
156 files changed+1060−1545
nixos/tests/chromium.nix+10−9 pkgs/applications/blockchains/polkadot/default.nix+7−6 pkgs/applications/editors/cudatext/default.nix+4−8 pkgs/applications/editors/cudatext/deps.json+16−16 pkgs/applications/editors/cudatext/dont-check-update.patch−12 pkgs/applications/networking/browsers/chromium/common.nix+1−1 pkgs/applications/networking/irc/convos/default.nix+15−4 pkgs/applications/office/pyspread/default.nix+68 pkgs/applications/system/glances/default.nix+2−2 pkgs/development/interpreters/acl2/default.nix+5−5 pkgs/development/interpreters/acl2/libipasirglucose4/default.nix+2−2 pkgs/development/interpreters/alda/default.nix+2−2 pkgs/development/interpreters/angelscript/2.22.nix+4−4 pkgs/development/interpreters/angelscript/default.nix+4−4 pkgs/development/interpreters/ceptre/default.nix+2−2 pkgs/development/interpreters/chibi/default.nix+4−4 pkgs/development/interpreters/cling/default.nix+3−3 pkgs/development/interpreters/clips/default.nix+2−2 pkgs/development/interpreters/clisp/default.nix+23−23 pkgs/development/interpreters/clisp/hg.nix+22−22 pkgs/development/interpreters/clojure/babashka.nix+3−3 pkgs/development/interpreters/clojure/clooj.nix+2−2 pkgs/development/interpreters/clojure/default.nix+3−3 pkgs/development/interpreters/clojurescript/lumo/default.nix+3−3 pkgs/development/interpreters/cyclone/default.nix+4−4 pkgs/development/interpreters/dart/default.nix+2−2 pkgs/development/interpreters/duktape/default.nix+2−2 pkgs/development/interpreters/eff/default.nix+2−2 pkgs/development/interpreters/elixir/generic-builder.nix+4−4 pkgs/development/interpreters/erlang/generic-builder.nix+4−4 pkgs/development/interpreters/evcxr/default.nix+4−4 pkgs/development/interpreters/falcon/default.nix+2−2 pkgs/development/interpreters/gnu-apl/default.nix+4−4 pkgs/development/interpreters/groovy/default.nix+2−2 pkgs/development/interpreters/gtk-server/default.nix+2−2 pkgs/development/interpreters/guile/1.8.nix+6−6 pkgs/development/interpreters/guile/2.0.nix+10−10 pkgs/development/interpreters/guile/default.nix+9−9 pkgs/development/interpreters/hugs/default.nix+2−2 pkgs/development/interpreters/hy/default.nix+2−2 pkgs/development/interpreters/icon-lang/default.nix+3−3 pkgs/development/interpreters/io/default.nix+2−2 pkgs/development/interpreters/j/default.nix+3−3 pkgs/development/interpreters/janet/default.nix+2−2 pkgs/development/interpreters/jimtcl/default.nix+5−5 pkgs/development/interpreters/joker/default.nix+2−2 pkgs/development/interpreters/jruby/default.nix+2−2 pkgs/development/interpreters/jython/default.nix+2−2 pkgs/development/interpreters/kona/default.nix+2−2 pkgs/development/interpreters/lfe/generic-builder.nix+3−3 pkgs/development/interpreters/lolcode/default.nix+3−3 pkgs/development/interpreters/love/0.10.nix+4−4 pkgs/development/interpreters/love/0.7.nix+4−4 pkgs/development/interpreters/love/0.8.nix+4−4 pkgs/development/interpreters/love/0.9.nix+4−4 pkgs/development/interpreters/love/11.1.nix+4−4 pkgs/development/interpreters/lua-5/default.nix+1−1 pkgs/development/interpreters/lua-5/filesystem.nix+1−1 pkgs/development/interpreters/lua-5/interpreter.nix+4−4 pkgs/development/interpreters/lua-5/sockets.nix+1−1 pkgs/development/interpreters/lua-5/wrapper.nix+3−3 pkgs/development/interpreters/luajit/default.nix+6−6 pkgs/development/interpreters/lush/default.nix+4−4 pkgs/development/interpreters/maude/default.nix+5−5 pkgs/development/interpreters/metamath/default.nix+9−7 pkgs/development/interpreters/mujs/default.nix+2−2 pkgs/development/interpreters/nix-exec/default.nix+2−2 pkgs/development/interpreters/perl/wrapper.nix+2−2 pkgs/development/interpreters/php/generic.nix+1−1 pkgs/development/interpreters/picoc/default.nix+2−2 pkgs/development/interpreters/picolisp/default.nix+2−2 pkgs/development/interpreters/pixie/default.nix+6−6 pkgs/development/interpreters/pixie/dust.nix+3−3 pkgs/development/interpreters/proglodyte-wasm/default.nix+2−2 pkgs/development/interpreters/pyrex/0.9.5.nix+2−2 pkgs/development/interpreters/pyrex/0.9.6.nix+2−2 pkgs/development/interpreters/python/cpython/2.7/default.nix+7−7 pkgs/development/interpreters/python/cpython/default.nix+7−7 pkgs/development/interpreters/python/pypy/default.nix+5−5 pkgs/development/interpreters/python/pypy/prebuilt.nix+3−3 pkgs/development/interpreters/python/tests.nix+1−1 pkgs/development/interpreters/python/wrapper.nix+3−3 pkgs/development/interpreters/qnial/default.nix+4−4 pkgs/development/interpreters/quickjs/default.nix+2−2 pkgs/development/interpreters/racket/default.nix+10−10 pkgs/development/interpreters/rakudo/default.nix+1−1 pkgs/development/interpreters/rakudo/moarvm.nix+3−3 pkgs/development/interpreters/rakudo/nqp.nix+1−1 pkgs/development/interpreters/rakudo/zef.nix+2−2 pkgs/development/interpreters/rascal/default.nix+4−4 pkgs/development/interpreters/rebol/default.nix+1−1 pkgs/development/interpreters/red/default.nix+2−2 pkgs/development/interpreters/regina/default.nix+2−2 pkgs/development/interpreters/renpy/default.nix+3−3 pkgs/development/interpreters/ruby/default.nix+2−2 pkgs/development/interpreters/scheme48/default.nix+3−3 pkgs/development/interpreters/scsh/default.nix+2−2 pkgs/development/interpreters/self/default.nix+2−2 pkgs/development/interpreters/shen-sbcl/default.nix+2−2 pkgs/development/interpreters/shen-sources/default.nix+2−2 pkgs/development/interpreters/spidermonkey/1.8.5.nix+3−3 pkgs/development/interpreters/spidermonkey/38.nix+4−4 pkgs/development/interpreters/spidermonkey/60.nix+3−3 pkgs/development/interpreters/spidermonkey/68.nix+3−3 pkgs/development/interpreters/spidermonkey/78.nix+3−3 pkgs/development/interpreters/supercollider/default.nix+3−3 pkgs/development/interpreters/tcl/generic.nix+3−3 pkgs/development/interpreters/tclreadline/default.nix+3−3 pkgs/development/interpreters/tinyscheme/default.nix+2−2 pkgs/development/interpreters/unicon-lang/default.nix+2−2 pkgs/development/libraries/gtk/3.x.nix+56−50 pkgs/development/libraries/intel-gmmlib/default.nix+8−2 pkgs/development/libraries/intel-media-driver/default.nix+2−2 pkgs/development/libraries/mtxclient/default.nix+1−5 pkgs/development/libraries/nsss/default.nix+2−2 pkgs/development/libraries/phonetisaurus/default.nix+2−2 pkgs/development/libraries/skalibs/default.nix+2−2 pkgs/development/libraries/utmps/default.nix+2−2 pkgs/development/mobile/abootimg/default.nix+2−2 pkgs/development/mobile/adb-sync/default.nix+1−1 pkgs/development/mobile/flashtool/default.nix+5−5 pkgs/development/mobile/genymotion/default.nix+5−5 pkgs/development/mobile/titaniumenv/build-app.nix+7−7 pkgs/development/mobile/titaniumenv/default.nix+2−2 pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix+2−2 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix+2−2 pkgs/development/mobile/xcodeenv/build-app.nix+10−10 pkgs/development/mobile/xcodeenv/default.nix+3−3 pkgs/development/mobile/xcodeenv/simulate-app.nix+3−3 pkgs/development/python-modules/aioeafm/default.nix+44 pkgs/development/python-modules/amcrest/default.nix+43 pkgs/development/tools/kind/default.nix+3−3 pkgs/development/tools/ocaml/dune/2.nix+3−3 pkgs/games/crawl/crawl_purify.patch+3−17 pkgs/games/crawl/default.nix+3−2 pkgs/os-specific/linux/s6-linux-init/default.nix+39 pkgs/os-specific/linux/s6-linux-utils/default.nix+2−2 pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c+13−9 pkgs/servers/home-assistant/component-packages.nix+2−2 pkgs/servers/http/lighttpd/default.nix+2−2 pkgs/servers/monitoring/alertmanager-bot/default.nix+13−7 pkgs/servers/monitoring/alertmanager-bot/deps.nix−948 pkgs/tools/backup/stenc/default.nix+16−3 pkgs/tools/misc/execline/default.nix+2−2 pkgs/tools/misc/execline/execlineb-wrapper.c+3−2 pkgs/tools/misc/fdtools/default.nix+1 pkgs/tools/misc/fdtools/new-skalibs.patch+223 pkgs/tools/misc/grub/2.0x.nix+1−1 pkgs/tools/misc/s6-portable-utils/default.nix+2−2 pkgs/tools/networking/s6-dns/default.nix+2−2 pkgs/tools/networking/s6-networking/default.nix+3−3 pkgs/tools/system/s6-rc/default.nix+2−2 pkgs/tools/system/s6/default.nix+2−2 pkgs/top-level/all-packages.nix+7 pkgs/top-level/perl-packages.nix+25−9 pkgs/top-level/python-packages.nix+4
nixos/tests/chromium.nix+10−9
@@ -77,7 +77,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
7777
7878 def create_new_win():
7979 with machine.nested("Creating a new Chromium window"):
80− machine.execute(
80+ status, _ = machine.execute(
8181 ru(
8282 "${xdo "new-window" ''
8383 search --onlyvisible --name "startup done"
@@ -86,13 +86,14 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
8686 ''}"
8787 )
8888 )
89− machine.execute(
90− ru(
91− "${xdo "new-window" ''
92− key Ctrl+n
93− ''}"
89+ if status == 0:
90+ machine.execute(
91+ ru(
92+ "${xdo "new-window" ''
93+ key Ctrl+n
94+ ''}"
95+ )
9496 )
95− )
9697
9798
9899 def close_win():
@@ -115,7 +116,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
115116 )
116117 )
117118 for _ in range(1, 20):
118− status, out = machine.execute(
119+ status, _ = machine.execute(
119120 ru(
120121 "${xdo "wait-for-close" ''
121122 search --onlyvisible --name "new tab"
@@ -134,7 +135,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
134135 ret = False
135136 with machine.nested("Waiting for new Chromium window to appear"):
136137 for _ in range(1, 20):
137− status, out = machine.execute(
138+ status, _ = machine.execute(
138139 ru(
139140 "${xdo "wait-for-window" ''
140141 search --onlyvisible --name "new tab"
pkgs/applications/blockchains/polkadot/default.nix+7−6
@@ -7,16 +7,16 @@
77}:
88rustPlatform.buildRustPackage rec {
99 pname = "polkadot";
10− version = "0.8.26-1";
10+ version = "0.8.27";
1111
1212 src = fetchFromGitHub {
1313 owner = "paritytech";
1414 repo = "polkadot";
1515 rev = "v${version}";
16− sha256 = "17ji1gjrx3gzw4msaz9kgvm132y14wgh8z183l3mfw1cj44a6kqk";
16+ sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c";
1717 };
1818
19− cargoSha256 = "07zwlwx02xw1y20br2c4grwv7bprhynqy7gav4qh3vw117ijpiqk";
19+ cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs";
2020
2121 nativeBuildInputs = [ clang ];
2222
@@ -24,9 +24,10 @@ rustPlatform.buildRustPackage rec {
2424 PROTOC = "${protobuf}/bin/protoc";
2525
2626 # NOTE: We don't build the WASM runtimes since this would require a more
27− # complicated rust environment setup. The resulting binary is still useful for
28− # live networks since those just use the WASM blob from the network chainspec.
29− BUILD_DUMMY_WASM_BINARY = 1;
27+ # complicated rust environment setup and this is only needed for developer
28+ # environments. The resulting binary is useful for end-users of live networks
29+ # since those just use the WASM blob from the network chainspec.
30+ SKIP_WASM_BUILD = 1;
3031
3132 # We can't run the test suite since we didn't compile the WASM runtimes.
3233 doCheck = false;
pkgs/applications/editors/cudatext/default.nix+4−8
@@ -38,24 +38,20 @@ let
3838in
3939stdenv.mkDerivation rec {
4040 pname = "cudatext";
41− version = "1.118.2";
41+ version = "1.122.3";
4242
4343 src = fetchFromGitHub {
4444 owner = "Alexey-T";
4545 repo = "CudaText";
4646 rev = version;
47− sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm";
47+ sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b";
4848 };
4949
50− patches = [
51− # Don't check for update
52− ./dont-check-update.patch
53− ];
54−
5550 postPatch = ''
5651 substituteInPlace app/proc_globdata.pas \
5752 --replace "/usr/share/cudatext" "$out/share/cudatext" \
58− --replace "libpython3.so" "${python3}/lib/libpython3.so"
53+ --replace "libpython3.so" "${python3}/lib/libpython${python3.pythonVersion}.so" \
54+ --replace "AllowProgramUpdates:= true;" "AllowProgramUpdates:= false;"
5955 '';
6056
6157 nativeBuildInputs = [ lazarus fpc ]
pkgs/applications/editors/cudatext/deps.json+16−16
@@ -1,33 +1,33 @@
11{
22 "EncConv": {
33 "owner": "Alexey-T",
4− "rev": "2020.06.15",
5− "sha256": "07dpvq3ppfq3b70i1smkf7vwdlzq8qnxs3fk94hi9h1z36bz2rw3"
4+ "rev": "2021.01.01",
5+ "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6"
66 },
77 "ATBinHex-Lazarus": {
88 "owner": "Alexey-T",
9− "rev": "2020.09.05",
10− "sha256": "022yx5vic4hnc9lz53wvr4h7hf0h71801dzlilj55x5mf8p59072"
9+ "rev": "2020.11.22",
10+ "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7"
1111 },
1212 "ATFlatControls": {
1313 "owner": "Alexey-T",
14− "rev": "2020.11.02",
15− "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy"
14+ "rev": "2021.01.12",
15+ "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9"
1616 },
1717 "ATSynEdit": {
1818 "owner": "Alexey-T",
19− "rev": "6560bc35a2cf31399be8713ac189216afabf9f01",
20− "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x"
19+ "rev": "2021.01.19",
20+ "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1"
2121 },
2222 "ATSynEdit_Cmp": {
2323 "owner": "Alexey-T",
24− "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433",
25− "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr"
24+ "rev": "2021.01.17",
25+ "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly"
2626 },
2727 "EControl": {
2828 "owner": "Alexey-T",
29− "rev": "2020.10.04",
30− "sha256": "0ypbaca3y5biw2207yh3x5p28gm8g51qf7glm5622w3cgbrf9mdq"
29+ "rev": "2021.01.12",
30+ "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq"
3131 },
3232 "ATSynEdit_Ex": {
3333 "owner": "Alexey-T",
@@ -36,8 +36,8 @@
3636 },
3737 "Python-for-Lazarus": {
3838 "owner": "Alexey-T",
39− "rev": "2020.10.23",
40− "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn"
39+ "rev": "2021.01.16",
40+ "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5"
4141 },
4242 "Emmet-Pascal": {
4343 "owner": "Alexey-T",
@@ -46,8 +46,8 @@
4646 },
4747 "CudaText-lexers": {
4848 "owner": "Alexey-T",
49− "rev": "2020.08.10",
50− "sha256": "1gzs2psyfhb9si1qyacxzfjb3dz2v255hv7y4jlkbxdxv0kckqr6"
49+ "rev": "2021.01.16",
50+ "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh"
5151 },
5252 "bgrabitmap": {
5353 "owner": "bgrabitmap",
pkgs/applications/editors/cudatext/dont-check-update.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff --git i/app/formmain.pas w/app/formmain.pas
2−index f6f37febb..cf993d75e 100644
3−--- i/app/formmain.pas
4−+++ w/app/formmain.pas
5−@@ -2156,6 +2156,7 @@ begin
6− false
7− {$endif};
8− *)
9−+ mnuHelpCheckUpd.Enabled:=false;
10−
11− with AppPanels[cPaneSide] do
12− begin
pkgs/applications/networking/browsers/chromium/common.nix+1−1
@@ -117,7 +117,7 @@ let
117117 base = rec {
118118 name = "${packageName}-unwrapped-${version}";
119119 inherit (upstream-info) version;
120− inherit channel packageName buildType buildPath;
120+ inherit packageName buildType buildPath;
121121
122122 src = fetchurl {
123123 url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
pkgs/applications/networking/irc/convos/default.nix+15−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang
1+{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang, openssl
22, nixosTests
33}:
44
@@ -6,26 +6,28 @@ with lib;
66
77perlPackages.buildPerlPackage rec {
88 pname = "convos";
9− version = "5.00";
9+ version = "5.11";
1010
1111 src = fetchFromGitHub {
1212 owner = "Nordaaker";
1313 repo = pname;
1414 rev = version;
15− sha256 = "0mdbh9q1vclwgnjwvb3z637s7v804h65zxazbhmd7qi3zislnhg1";
15+ sha256 = "08k8dqdgz2b3p8g1zfg9i74r5nm1w0sqdm759d1f3jcyp737r47x";
1616 };
1717
1818 nativeBuildInputs = [ makeWrapper ]
1919 ++ optional stdenv.isDarwin [ shortenPerlShebang ];
2020
2121 buildInputs = with perlPackages; [
22− CryptEksblowfish FileHomeDir FileReadBackwards
22+ CryptEksblowfish FileHomeDir FileReadBackwards HTTPAcceptLanguage
2323 IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall
2424 Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack
2525 ParseIRC TextMarkdown TimePiece UnicodeUTF8
2626 CpanelJSONXS EV
2727 ];
2828
29+ propagatedBuildInputs = [ openssl ];
30+
2931 checkInputs = with perlPackages; [ TestDeep TestMore ];
3032
3133 postPatch = ''
@@ -43,6 +45,15 @@ perlPackages.buildPerlPackage rec {
4345 substituteInPlace t/web-register-open-to-public.t \
4446 --replace '!127.0.0.1!' '!localhost!'
4547
48+ # A webirc test fails to resolve "localhost" likely due to sandboxing, we
49+ # remove this test.
50+ #
51+ rm t/irc-webirc.t
52+
53+ # A web-user test fails on Darwin, we remove it.
54+ #
55+ rm t/web-user.t
56+
4657 # Module::Install is a runtime dependency not covered by the tests, so we add
4758 # a test for it.
4859 #
pkgs/applications/office/pyspread/default.nixnew file+68
@@ -0,0 +1,68 @@
1+{ lib
2+, buildPythonApplication
3+, fetchPypi
4+, makePythonPath
5+, dateutil
6+, matplotlib
7+, numpy
8+, pyenchant
9+, pyqt5
10+, pytest
11+, python
12+, qtsvg
13+, runtimeShell
14+, wrapQtAppsHook
15+}:
16+
17+buildPythonApplication rec {
18+ pname = "pyspread";
19+ version = "1.99.5";
20+
21+ src = fetchPypi {
22+ inherit pname version;
23+ sha256 = "sha256-05bC+Uvx72FAh3qxkgXm8jdb/gHRv1D/M7tjOEdE3Xg=";
24+ };
25+
26+ pythonLibs = [
27+ dateutil
28+ matplotlib
29+ numpy
30+ pyenchant
31+ pyqt5
32+ ];
33+
34+ nativeBuildInputs = [ wrapQtAppsHook ];
35+ buildInputs = pythonLibs ++ [
36+ qtsvg
37+ ];
38+
39+ doCheck = false; # it fails miserably with a core dump
40+
41+ fixupPhase = ''
42+ runHook preFixup
43+ sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" $out/bin/pyspread
44+ wrapProgram $out/bin/pyspread \
45+ --prefix PYTHONPATH ':' $(toPythonPath $out):${makePythonPath pythonLibs} \
46+ --prefix PATH ':' ${python}/bin/ \
47+ ''${qtWrapperArgs[@]}
48+ runHook postFixup
49+ '';
50+
51+ meta = with lib; {
52+ homepage = "https://pyspread.gitlab.io/";
53+ description = "A Python-oriented spreadsheet application";
54+ longDescription = ''
55+ pyspread is a non-traditional spreadsheet application that is based on and
56+ written in the programming language Python. The goal of pyspread is to be
57+ the most pythonic spreadsheet.
58+
59+ pyspread expects Python expressions in its grid cells, which makes a
60+ spreadsheet specific language obsolete. Each cell returns a Python object
61+ that can be accessed from other cells. These objects can represent
62+ anything including lists or matrices.
63+ '';
64+ license = with licenses; gpl3Plus;
65+ maintainers = with maintainers; [ AndersonTorres ];
66+ platforms = with platforms; all;
67+ };
68+}
pkgs/applications/system/glances/default.nix+2−2
@@ -9,14 +9,14 @@
99
1010buildPythonApplication rec {
1111 pname = "glances";
12− version = "3.1.5";
12+ version = "3.1.6";
1313 disabled = isPyPy;
1414
1515 src = fetchFromGitHub {
1616 owner = "nicolargo";
1717 repo = "glances";
1818 rev = "v${version}";
19− sha256 = "0l91nvlwyabxlsy5p533dqnc68mmvykfsrcsnxylcpjjl1nzy931";
19+ sha256 = "sha256-uPqHXRwQQQZsttiLuqgr+dcAna+BVZtym4YEmTPLkXk=";
2020 };
2121
2222 # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
pkgs/development/interpreters/acl2/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
1+{ lib, stdenv, callPackage, fetchFromGitHub, writeShellScriptBin, substituteAll
22, sbcl, bash, which, perl, nettools
33, openssl, glucose, minisat, abc-verifier, z3, python2
44, certifyBooks ? true
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
3939 buildInputs = [
4040 # ACL2 itself only needs a Common Lisp compiler/interpreter:
4141 sbcl
42− ] ++ stdenv.lib.optionals certifyBooks [
42+ ] ++ lib.optionals certifyBooks [
4343 # To build community books, we need Perl and a couple of utilities:
4444 which perl nettools
4545 # Some of the books require one or more of these external tools:
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
5555 preConfigure = ''
5656 # When certifying books, ACL2 doesn't like $HOME not existing.
5757 export HOME=$(pwd)/fake-home
58− '' + stdenv.lib.optionalString certifyBooks ''
58+ '' + lib.optionalString certifyBooks ''
5959 # Some books also care about $USER being nonempty.
6060 export USER=nobody
6161 '';
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
7979 installPhase = ''
8080 mkdir -p $out/bin
8181 ln -s $out/share/${pname}/saved_acl2 $out/bin/${pname}
82− '' + stdenv.lib.optionalString certifyBooks ''
82+ '' + lib.optionalString certifyBooks ''
8383 ln -s $out/share/${pname}/books/build/cert.pl $out/bin/${pname}-cert
8484 ln -s $out/share/${pname}/books/build/clean.pl $out/bin/${pname}-clean
8585 '';
@@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
100100 rm -rf $out/share/${pname}/books
101101 '';
102102
103− meta = with stdenv.lib; {
103+ meta = with lib; {
104104 description = "An interpreter and a prover for a Lisp dialect";
105105 longDescription = ''
106106 ACL2 is a logic and programming language in which you can model computer
pkgs/development/interpreters/acl2/libipasirglucose4/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, zlib, unzip }:
1+{ lib, stdenv, fetchurl, zlib, unzip }:
22
33stdenv.mkDerivation rec {
44 pname = "libipasirglucose4";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 install -D libipasirglucose4.so $out/lib/libipasirglucose4.so
2828 '';
2929
30− meta = with stdenv.lib; {
30+ meta = with lib; {
3131 description = "Shared library providing IPASIR interface to the Glucose SAT solver";
3232 license = licenses.mit;
3333 platforms = platforms.unix;
pkgs/development/interpreters/alda/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, jre }:
1+{ lib, stdenv, fetchurl, jre }:
22
33stdenv.mkDerivation rec {
44 pname = "alda";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/alda
1717 '';
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 description = "A music programming language for musicians";
2121 homepage = "https://alda.io";
2222 license = licenses.epl10;
pkgs/development/interpreters/angelscript/2.22.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, unzip}:
1+{lib, stdenv, fetchurl, unzip}:
22let
33 s = # Generated upstream information
44 rec {
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
3535 meta = {
3636 inherit (s) version;
3737 description = "Light-weight scripting library";
38− license = stdenv.lib.licenses.zlib ;
39− maintainers = [stdenv.lib.maintainers.raskin];
40− platforms = stdenv.lib.platforms.linux;
38+ license = lib.licenses.zlib ;
39+ maintainers = [lib.maintainers.raskin];
40+ platforms = lib.platforms.linux;
4141 badPlatforms = [ "aarch64-linux" ];
4242 downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
4343 homepage="http://www.angelcode.com/angelscript/";
pkgs/development/interpreters/angelscript/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, unzip}:
1+{lib, stdenv, fetchurl, unzip}:
22let
33 s = # Generated upstream information
44 rec {
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
2929 meta = {
3030 inherit (s) version;
3131 description = "Light-weight scripting library";
32− license = stdenv.lib.licenses.zlib ;
33− maintainers = [stdenv.lib.maintainers.raskin];
34− platforms = stdenv.lib.platforms.linux;
32+ license = lib.licenses.zlib ;
33+ maintainers = [lib.maintainers.raskin];
34+ platforms = lib.platforms.linux;
3535 downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
3636 homepage="http://www.angelcode.com/angelscript/";
3737 };
pkgs/development/interpreters/ceptre/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, mlton }:
1+{ lib, stdenv, fetchgit, mlton }:
22
33stdenv.mkDerivation {
44 name = "ceptre-2016-11-27";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 cp ceptre $out/bin
1717 '';
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 description = "A linear logic programming language for modeling generative interactive systems";
2121 homepage = "https://github.com/chrisamaphone/interactive-lp";
2222 maintainers = with maintainers; [ pSub ];
pkgs/development/interpreters/chibi/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, makeWrapper }:
1+{ lib, stdenv, fetchFromGitHub, makeWrapper }:
22let
33 version = "0.9.1";
44 name = "chibi-scheme-${version}";
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
99 meta = {
1010 homepage = "https://github.com/ashinn/chibi-scheme";
1111 description = "Small Footprint Scheme for use as a C Extension Language";
12− platforms = stdenv.lib.platforms.all;
13− license = stdenv.lib.licenses.bsd3;
14− maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ];
12+ platforms = lib.platforms.all;
13+ license = lib.licenses.bsd3;
14+ maintainers = [ lib.maintainers.DerGuteMoritz ];
1515 };
1616
1717 src = fetchFromGitHub {
pkgs/development/interpreters/cling/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, python
33, libffi
44, git
@@ -50,7 +50,7 @@ let
5050 "-DCLING_INCLUDE_TESTS=ON"
5151 ];
5252
53− meta = with stdenv.lib; {
53+ meta = with lib; {
5454 description = "The Interactive C++ Interpreter";
5555 homepage = "https://root.cern/cling/";
5656 license = with licenses; [ lgpl21 ncsa ];
@@ -73,7 +73,7 @@ let
7373 flags = [
7474 "-nostdinc"
7575 "-nostdinc++"
76− "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include"
76+ "-isystem" "${lib.getDev stdenv.cc.libc}/include"
7777 "-I" "${unwrapped}/include"
7878 "-I" "${unwrapped}/lib/clang/5.0.2/include"
7979 ];
pkgs/development/interpreters/clips/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 version = "6.30";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 installPhase = ''
1414 install -D -t $out/bin core/clips
1515 '';
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 description = "A Tool for Building Expert Systems";
1818 homepage = "http://www.clipsrules.net/";
1919 longDescription = ''
pkgs/development/interpreters/clisp/default.nix+23−23
@@ -3,7 +3,7 @@
33# - base (default): contains readline and i18n, regexp and syscalls modules
44# by default
55# - full: contains base plus modules in withModules
6−{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
6+{ lib, stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
77, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
88, libffi
99, libffcall
@@ -16,8 +16,8 @@
1616 "pcre"
1717 "rawsock"
1818 ]
19− ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
20− ++ stdenv.lib.optional x11Support "clx/new-clx"
19+ ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" "wildcard" ]
20+ ++ lib.optional x11Support "clx/new-clx"
2121}:
2222
2323assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -37,14 +37,14 @@ stdenv.mkDerivation rec {
3737 ffcallAvailable = stdenv.isLinux && (libffcall != null);
3838
3939 buildInputs = [libsigsegv]
40− ++ stdenv.lib.optional (gettext != null) gettext
41− ++ stdenv.lib.optional (ncurses != null) ncurses
42− ++ stdenv.lib.optional (pcre != null) pcre
43− ++ stdenv.lib.optional (zlib != null) zlib
44− ++ stdenv.lib.optional (readline != null) readline
45− ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
46− ++ stdenv.lib.optional ffcallAvailable libffcall
47− ++ stdenv.lib.optionals x11Support [
40+ ++ lib.optional (gettext != null) gettext
41+ ++ lib.optional (ncurses != null) ncurses
42+ ++ lib.optional (pcre != null) pcre
43+ ++ lib.optional (zlib != null) zlib
44+ ++ lib.optional (readline != null) readline
45+ ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
46+ ++ lib.optional ffcallAvailable libffcall
47+ ++ lib.optionals x11Support [
4848 libX11 libXau libXt libXpm xorgproto libXext
4949 ];
5050
@@ -68,14 +68,14 @@ stdenv.mkDerivation rec {
6868 '';
6969
7070 configureFlags = [ "builddir" ]
71− ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
72− ++ stdenv.lib.optional (readline != null) "--with-readline"
71+ ++ lib.optional (!dllSupport) "--without-dynamic-modules"
72+ ++ lib.optional (readline != null) "--with-readline"
7373 # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
74− ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
75− ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
76− ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
74+ ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
75+ ++ lib.optional ffcallAvailable "--with-ffcall"
76+ ++ lib.optional (!ffcallAvailable) "--without-ffcall"
7777 ++ builtins.map (x: "--with-module=" + x) withModules
78− ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
78+ ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
7979
8080 preBuild = ''
8181 sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -83,11 +83,11 @@ stdenv.mkDerivation rec {
8383 '';
8484
8585 postInstall =
86− stdenv.lib.optionalString (withModules != [])
86+ lib.optionalString (withModules != [])
8787 (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
88− + stdenv.lib.concatMapStrings (x: " " + x) withModules);
88+ + lib.concatMapStrings (x: " " + x) withModules);
8989
90− NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
90+ NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
9191
9292 # TODO : make mod-check fails
9393 doCheck = false;
@@ -95,10 +95,10 @@ stdenv.mkDerivation rec {
9595 meta = {
9696 description = "ANSI Common Lisp Implementation";
9797 homepage = "http://clisp.cons.org";
98− maintainers = with stdenv.lib.maintainers; [raskin tohl];
99− platforms = stdenv.lib.platforms.unix;
98+ maintainers = with lib.maintainers; [raskin tohl];
99+ platforms = lib.platforms.unix;
100100 # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
101101 broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
102− license = stdenv.lib.licenses.gpl2;
102+ license = lib.licenses.gpl2;
103103 };
104104}
pkgs/development/interpreters/clisp/hg.nix+22−22
@@ -3,7 +3,7 @@
33# - base (default): contains readline and i18n, regexp and syscalls modules
44# by default
55# - full: contains base plus modules in withModules
6−{ stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
6+{ lib, stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
77, libXau, libXt, pcre, zlib, libXpm, xorgproto, libXext
88, libffi, libffcall, automake
99, coreutils
@@ -15,8 +15,8 @@
1515 "pcre"
1616 "rawsock"
1717 ]
18− ++ stdenv.lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
19− ++ stdenv.lib.optional x11Support "clx/new-clx"
18+ ++ lib.optionals stdenv.isLinux [ "bindings/glibc" "zlib" ]
19+ ++ lib.optional x11Support "clx/new-clx"
2020}:
2121
2222assert x11Support -> (libX11 != null && libXau != null && libXt != null
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
3838
3939 nativeBuildInputs = [ automake ]; # sometimes fails otherwise
4040 buildInputs = [libsigsegv]
41− ++ stdenv.lib.optional (gettext != null) gettext
42− ++ stdenv.lib.optional (ncurses != null) ncurses
43− ++ stdenv.lib.optional (pcre != null) pcre
44− ++ stdenv.lib.optional (zlib != null) zlib
45− ++ stdenv.lib.optional (readline != null) readline
46− ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) libffi
47− ++ stdenv.lib.optional ffcallAvailable libffcall
48− ++ stdenv.lib.optionals x11Support [
41+ ++ lib.optional (gettext != null) gettext
42+ ++ lib.optional (ncurses != null) ncurses
43+ ++ lib.optional (pcre != null) pcre
44+ ++ lib.optional (zlib != null) zlib
45+ ++ lib.optional (readline != null) readline
46+ ++ lib.optional (ffcallAvailable && (libffi != null)) libffi
47+ ++ lib.optional ffcallAvailable libffcall
48+ ++ lib.optionals x11Support [
4949 libX11 libXau libXt libXpm xorgproto libXext
5050 ];
5151
@@ -63,14 +63,14 @@ stdenv.mkDerivation rec {
6363 '';
6464
6565 configureFlags = [ "builddir" ]
66− ++ stdenv.lib.optional (!dllSupport) "--without-dynamic-modules"
67− ++ stdenv.lib.optional (readline != null) "--with-readline"
66+ ++ lib.optional (!dllSupport) "--without-dynamic-modules"
67+ ++ lib.optional (readline != null) "--with-readline"
6868 # --with-dynamic-ffi can only exist with --with-ffcall - foreign.d does not compile otherwise
69− ++ stdenv.lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
70− ++ stdenv.lib.optional ffcallAvailable "--with-ffcall"
71− ++ stdenv.lib.optional (!ffcallAvailable) "--without-ffcall"
69+ ++ lib.optional (ffcallAvailable && (libffi != null)) "--with-dynamic-ffi"
70+ ++ lib.optional ffcallAvailable "--with-ffcall"
71+ ++ lib.optional (!ffcallAvailable) "--without-ffcall"
7272 ++ builtins.map (x: " --with-module=" + x) withModules
73− ++ stdenv.lib.optional threadSupport "--with-threads=POSIX_THREADS";
73+ ++ lib.optional threadSupport "--with-threads=POSIX_THREADS";
7474
7575 preBuild = ''
7676 sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
@@ -79,11 +79,11 @@ stdenv.mkDerivation rec {
7979 '';
8080
8181 postInstall =
82− stdenv.lib.optionalString (withModules != [])
82+ lib.optionalString (withModules != [])
8383 (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
84− + stdenv.lib.concatMapStrings (x: " " + x) withModules);
84+ + lib.concatMapStrings (x: " " + x) withModules);
8585
86− NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
86+ NIX_CFLAGS_COMPILE = "-O0 ${lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
8787
8888 # TODO : make mod-check fails
8989 doCheck = false;
@@ -91,8 +91,8 @@ stdenv.mkDerivation rec {
9191 meta = {
9292 description = "ANSI Common Lisp Implementation";
9393 homepage = "http://clisp.cons.org";
94− maintainers = with stdenv.lib.maintainers; [raskin tohl];
94+ maintainers = with lib.maintainers; [raskin tohl];
9595 # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
96− platforms = stdenv.lib.platforms.linux;
96+ platforms = lib.platforms.linux;
9797 };
9898}
pkgs/development/interpreters/clojure/babashka.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, graalvm11-ce, glibcLocales }:
1+{ lib, stdenv, fetchurl, graalvm11-ce, glibcLocales }:
22
3−with stdenv.lib;
3+with lib;
44stdenv.mkDerivation rec {
55 pname = "babashka";
66 version = "0.2.3";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
5050 cp bb $out/bin/bb
5151 '';
5252
53− meta = with stdenv.lib; {
53+ meta = with lib; {
5454 description = "A Clojure babushka for the grey areas of Bash";
5555 longDescription = ''
5656 The main idea behind babashka is to leverage Clojure in places where you
pkgs/development/interpreters/clojure/clooj.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, jre, makeWrapper }:
1+{ lib, stdenv, fetchurl, jre, makeWrapper }:
22
33let version = "0.4.4"; in
44
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
2525 meta = {
2626 description = "A lightweight IDE for Clojure";
2727 homepage = "https://github.com/arthuredelstein/clooj";
28− license = stdenv.lib.licenses.bsd3;
28+ license = lib.licenses.bsd3;
2929 };
3030}
pkgs/development/interpreters/clojure/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
1+{ lib, stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "clojure";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 # See https://github.com/clojure/brew-install/blob/1.10.1/src/main/resources/clojure/install/linux-install.sh
1818 installPhase =
1919 let
20− binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
20+ binPath = lib.makeBinPath [ rlwrap jdk ];
2121 in
2222 ''
2323 clojure_lib_dir=$out
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 -Sverbose \
4848 -Scp $out/libexec/clojure-tools-${version}.jar
4949 '';
50− meta = with stdenv.lib; {
50+ meta = with lib; {
5151 description = "A Lisp dialect for the JVM";
5252 homepage = "https://clojure.org/";
5353 license = licenses.epl10;
pkgs/development/interpreters/clojurescript/lumo/default.nix+3−3
@@ -280,8 +280,8 @@ stdenv.mkDerivation {
280280 making it the fastest Clojure REPL in existence.
281281 '';
282282 homepage = "https://github.com/anmonteiro/lumo";
283− license = stdenv.lib.licenses.epl10;
284− maintainers = [ stdenv.lib.maintainers.hlolli ];
285− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
283+ license = lib.licenses.epl10;
284+ maintainers = [ lib.maintainers.hlolli ];
285+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
286286 };
287287}
pkgs/development/interpreters/cyclone/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libck, darwin }:
1+{ lib, stdenv, fetchFromGitHub, libck, darwin }:
22
33let
44 version = "0.21";
@@ -15,7 +15,7 @@ let
1515
1616 enableParallelBuilding = true;
1717
18− nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
18+ nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
1919
2020 buildInputs = [ libck ];
2121
@@ -36,13 +36,13 @@ stdenv.mkDerivation {
3636 enableParallelBuilding = true;
3737
3838 nativeBuildInputs = [ bootstrap ]
39− ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
39+ ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
4040
4141 buildInputs = [ libck ];
4242
4343 makeFlags = [ "PREFIX=${placeholder "out"}" ];
4444
45− meta = with stdenv.lib; {
45+ meta = with lib; {
4646 homepage = "https://justinethier.github.io/cyclone/";
4747 description = "A brand-new compiler that allows practical application development using R7RS Scheme";
4848 license = licenses.mit;
pkgs/development/interpreters/dart/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, version ? "2.7.2" }:
1+{ lib, stdenv, fetchurl, unzip, version ? "2.7.2" }:
22
33let
44
@@ -80,7 +80,7 @@ let
8080
8181in
8282
83−with stdenv.lib;
83+with lib;
8484
8585stdenv.mkDerivation {
8686
pkgs/development/interpreters/duktape/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "duktape";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
2121 '';
2222 enableParallelBuilding = true;
2323
24− meta = with stdenv.lib; {
24+ meta = with lib; {
2525 description = "An embeddable Javascript engine, with a focus on portability and compact footprint";
2626 homepage = "https://duktape.org/";
2727 downloadPage = "https://duktape.org/download.html";
pkgs/development/interpreters/eff/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, which, ocamlPackages }:
1+{ lib, stdenv, fetchFromGitHub, which, ocamlPackages }:
22
33let version = "5.0"; in
44
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
2525 doCheck = true;
2626 checkTarget = "test";
2727
28− meta = with stdenv.lib; {
28+ meta = with lib; {
2929 homepage = "https://www.eff-lang.org";
3030 description = "A functional programming language based on algebraic effects and their handlers";
3131 longDescription = ''
pkgs/development/interpreters/elixir/generic-builder.nix+4−4
@@ -1,4 +1,4 @@
1−{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper,
1+{ pkgs, lib, stdenv, fetchFromGitHub, erlang, makeWrapper,
22 coreutils, curl, bash, debugInfo ? false }:
33
44{ baseName ? "elixir"
@@ -10,7 +10,7 @@
1010} @ args:
1111
1212let
13− inherit (stdenv.lib) getVersion versionAtLeast optional;
13+ inherit (lib) getVersion versionAtLeast optional;
1414
1515in
1616 assert versionAtLeast (getVersion erlang) minimumOTPVersion;
@@ -46,7 +46,7 @@ in
4646 b=$(basename $f)
4747 if [ "$b" = mix ]; then continue; fi
4848 wrapProgram $f \
49− --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \
49+ --prefix PATH ":" "${lib.makeBinPath [ erlang coreutils curl bash ]}" \
5050 --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
5151 done
5252
@@ -55,7 +55,7 @@ in
5555 '';
5656
5757 pos = builtins.unsafeGetAttrPos "sha256" args;
58− meta = with stdenv.lib; {
58+ meta = with lib; {
5959 homepage = "https://elixir-lang.org/";
6060 description = "A functional, meta-programming aware language built on top of the Erlang VM";
6161
pkgs/development/interpreters/erlang/generic-builder.nix+4−4
@@ -1,4 +1,4 @@
1−{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
1+{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
22, libxml2, libxslt, ncurses, openssl, perl, autoconf
33# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
44, openjdk8 ? null # javacSupport
@@ -41,7 +41,7 @@ assert odbcSupport -> unixODBC != null;
4141assert javacSupport -> openjdk8 != null;
4242
4343let
44− inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
44+ inherit (lib) optional optionals optionalAttrs optionalString;
4545 wxPackages2 = if stdenv.isDarwin then [ wxmac ] else wxPackages;
4646
4747in stdenv.mkDerivation ({
@@ -106,12 +106,12 @@ in stdenv.mkDerivation ({
106106 # Some erlang bin/ scripts run sed and awk
107107 postFixup = ''
108108 wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
109− wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}"
109+ wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${lib.makeBinPath [ gnused gawk ]}"
110110 '';
111111
112112 setupHook = ./setup-hook.sh;
113113
114− meta = with stdenv.lib; ({
114+ meta = with lib; ({
115115 homepage = "https://www.erlang.org/";
116116 downloadPage = "https://www.erlang.org/download.html";
117117 description = "Programming language used for massively scalable soft real-time systems";
pkgs/development/interpreters/evcxr/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }:
1+{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "evcxr";
@@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec {
1616 RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
1717
1818 nativeBuildInputs = [ pkg-config makeWrapper cmake ];
19− buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
19+ buildInputs = lib.optional stdenv.isDarwin Security;
2020 postInstall = let
2121 wrap = exe: ''
2222 wrapProgram $out/bin/${exe} \
23− --prefix PATH : ${stdenv.lib.makeBinPath [ cargo gcc ]} \
23+ --prefix PATH : ${lib.makeBinPath [ cargo gcc ]} \
2424 --set-default RUST_SRC_PATH "$RUST_SRC_PATH"
2525 '';
2626 in ''
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
2929 rm $out/bin/testing_runtime
3030 '';
3131
32− meta = with stdenv.lib; {
32+ meta = with lib; {
3333 description = "An evaluation context for Rust";
3434 homepage = "https://github.com/google/evcxr";
3535 license = licenses.asl20;
pkgs/development/interpreters/falcon/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
22
33stdenv.mkDerivation {
44 pname = "falcon";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 nativeBuildInputs = [ pkg-config ];
1515 buildInputs = [ cmake pcre zlib sqlite ];
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "Programming language with macros and syntax at once";
1919 license = licenses.gpl2;
2020 maintainers = with maintainers; [ pSub ];
pkgs/development/interpreters/gnu-apl/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline, gettext, ncurses }:
1+{ lib, stdenv, fetchurl, readline, gettext, ncurses }:
22
33stdenv.mkDerivation rec {
44 pname = "gnu-apl";
@@ -12,14 +12,14 @@ stdenv.mkDerivation rec {
1212 buildInputs = [ readline gettext ncurses ];
1313
1414 # Needed with GCC 8
15− NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [
15+ NIX_CFLAGS_COMPILE = with lib; toString ((optionals stdenv.cc.isGNU [
1616 "-Wno-error=int-in-bool-context"
1717 "-Wno-error=class-memaccess"
1818 "-Wno-error=restrict"
1919 "-Wno-error=format-truncation"
2020 ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference");
2121
22− patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
22+ patchPhase = lib.optionalString stdenv.isDarwin ''
2323 substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h"
2424 '';
2525
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 find $out/share/doc/support-files -name 'Makefile*' -delete
2929 '';
3030
31− meta = with stdenv.lib; {
31+ meta = with lib; {
3232 description = "Free interpreter for the APL programming language";
3333 homepage = "https://www.gnu.org/software/apl/";
3434 license = licenses.gpl3Plus;
pkgs/development/interpreters/groovy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
1+{ lib, stdenv, fetchurl, unzip, which, makeWrapper, jdk }:
22
33# at runtime, need jdk
44
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 done
3030 '';
3131
32− meta = with stdenv.lib; {
32+ meta = with lib; {
3333 description = "An agile dynamic language for the Java Platform";
3434 homepage = "http://groovy-lang.org/";
3535 license = licenses.asl20;
pkgs/development/interpreters/gtk-server/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl
1+{ lib, stdenv, fetchurl
22, glib
33, gtk3
44, libffcall
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424
2525 configureOptions = [ "--with-gtk3" ];
2626
27− meta = with stdenv.lib; {
27+ meta = with lib; {
2828 description = "gtk-server for interpreted GUI programming";
2929 homepage = "http://www.gtk-server.org/";
3030 license = licenses.gpl2Plus;
pkgs/development/interpreters/guile/1.8.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, pkgsBuildBuild, buildPackages
1+{ lib, stdenv, pkgsBuildBuild, buildPackages
22, fetchurl, makeWrapper, gawk, pkg-config
33, libtool, readline, gmp
44}:
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
1818 configureFlags = [ "--disable-error-on-warning" ]
1919 # Guile needs patching to preset results for the configure tests about
2020 # pthreads, which work only in native builds.
21− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
21+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2222 "--with-threads=no";
2323
2424 depsBuildBuild = [ buildPackages.stdenv.cc ]
25− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
25+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2626 pkgsBuildBuild.guile_1_8;
2727 nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2828 buildInputs = [ readline libtool ];
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
6767 meta = {
6868 description = "Embeddable Scheme implementation";
6969 homepage = "https://www.gnu.org/software/guile/";
70− license = stdenv.lib.licenses.lgpl2Plus;
71− maintainers = [ stdenv.lib.maintainers.ludo ];
72− platforms = stdenv.lib.platforms.unix;
70+ license = lib.licenses.lgpl2Plus;
71+ maintainers = [ lib.maintainers.ludo ];
72+ platforms = lib.platforms.unix;
7373
7474 longDescription = ''
7575 GNU Guile is an interpreter for the Scheme programming language,
pkgs/development/interpreters/guile/2.0.nix+10−10
@@ -1,4 +1,4 @@
1−{ stdenv, pkgsBuildBuild, buildPackages
1+{ lib, stdenv, pkgsBuildBuild, buildPackages
22, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
33, libffi, libtool, readline, gmp, boehmgc, libunistring
44, coverageAnalysis ? null
@@ -21,7 +21,7 @@
2121 setOutputFlags = false; # $dev gets into the library otherwise
2222
2323 depsBuildBuild = [ buildPackages.stdenv.cc ]
24− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
24+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2525 pkgsBuildBuild.guile_2_0;
2626 nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2727 buildInputs = [ readline libtool libunistring libffi ];
@@ -46,8 +46,8 @@
4646 })
4747 ./riscv.patch
4848 ] ++
49− (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
50− ++ stdenv.lib.optionals stdenv.isDarwin [
49+ (lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
50+ ++ lib.optionals stdenv.isDarwin [
5151 (fetchpatch {
5252 url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
5353 sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
@@ -59,10 +59,10 @@
5959 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
6060
6161 # don't have "libgcc_s.so.1" on darwin
62− LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
62+ LDFLAGS = lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s";
6363
6464 configureFlags = [ "--with-libreadline-prefix" ]
65− ++ stdenv.lib.optionals stdenv.isSunOS [
65+ ++ lib.optionals stdenv.isSunOS [
6666 # Make sure the right <gmp.h> is found, and not the incompatible
6767 # /usr/include/mp.h from OpenSolaris. See
6868 # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -102,9 +102,9 @@
102102 meta = {
103103 description = "Embeddable Scheme implementation";
104104 homepage = "https://www.gnu.org/software/guile/";
105− license = stdenv.lib.licenses.lgpl3Plus;
106− maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
107− platforms = stdenv.lib.platforms.all;
105+ license = lib.licenses.lgpl3Plus;
106+ maintainers = with lib.maintainers; [ ludo lovek323 ];
107+ platforms = lib.platforms.all;
108108
109109 longDescription = ''
110110 GNU Guile is an implementation of the Scheme programming language, with
@@ -120,7 +120,7 @@
120120
121121//
122122
123−(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
123+(lib.optionalAttrs (!stdenv.isLinux) {
124124 # Work around <https://bugs.gnu.org/14201>.
125125 SHELL = stdenv.shell;
126126 CONFIG_SHELL = stdenv.shell;
pkgs/development/interpreters/guile/default.nix+9−9
@@ -1,4 +1,4 @@
1−{ stdenv, pkgsBuildBuild, buildPackages
1+{ lib, stdenv, pkgsBuildBuild, buildPackages
22, fetchurl, makeWrapper, gawk, pkg-config
33, libffi, libtool, readline, gmp, boehmgc, libunistring
44, coverageAnalysis ? null
@@ -23,7 +23,7 @@
2323 setOutputFlags = false; # $dev gets into the library otherwise
2424
2525 depsBuildBuild = [ buildPackages.stdenv.cc ]
26− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
26+ ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
2727 pkgsBuildBuild.guile;
2828 nativeBuildInputs = [ makeWrapper gawk pkg-config ];
2929 buildInputs = [ readline libtool libunistring libffi ];
@@ -48,8 +48,8 @@
4848
4949 patches = [
5050 ./eai_system.patch
51− ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
52− ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
51+ ] ++ lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
52+ ++ lib.optional stdenv.isDarwin (fetchpatch {
5353 url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
5454 sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
5555 });
@@ -58,11 +58,11 @@
5858 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
5959
6060 # don't have "libgcc_s.so.1" on darwin
61− LDFLAGS = stdenv.lib.optionalString
61+ LDFLAGS = lib.optionalString
6262 (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s";
6363
6464 configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
65− ++ stdenv.lib.optionals stdenv.isSunOS [
65+ ++ lib.optionals stdenv.isSunOS [
6666 # Make sure the right <gmp.h> is found, and not the incompatible
6767 # /usr/include/mp.h from OpenSolaris. See
6868 # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
@@ -101,9 +101,9 @@
101101 meta = {
102102 description = "Embeddable Scheme implementation";
103103 homepage = "https://www.gnu.org/software/guile/";
104− license = stdenv.lib.licenses.lgpl3Plus;
105− maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
106− platforms = stdenv.lib.platforms.all;
104+ license = lib.licenses.lgpl3Plus;
105+ maintainers = with lib.maintainers; [ ludo lovek323 vrthra ];
106+ platforms = lib.platforms.all;
107107
108108 longDescription = ''
109109 GNU Guile is an implementation of the Scheme programming language, with
pkgs/development/interpreters/hugs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, bison }:
1+{ lib, stdenv, fetchurl, bison }:
22
33stdenv.mkDerivation {
44
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
3939 "--enable-pthreads" # build Hugs using POSIX threads C library
4040 ];
4141
42− meta = with stdenv.lib; {
42+ meta = with lib; {
4343 homepage = "https://www.haskell.org/hugs";
4444 description = "Haskell interpreter";
4545 maintainers = with maintainers; [ joachifm ];
pkgs/development/interpreters/hy/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, python3Packages }:
1+{ lib, stdenv, python3Packages }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "hy";
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
2727 $out/bin/hy --help > /dev/null
2828 '';
2929
30− meta = with stdenv.lib; {
30+ meta = with lib; {
3131 description = "A LISP dialect embedded in Python";
3232 homepage = "http://hylang.org/";
3333 license = licenses.mit;
pkgs/development/interpreters/icon-lang/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, libX11
44, libXt
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 sha256 = "1lj2f13pbaajcy4v3744bz46rghhw5sv4dwwfnzhsllbj5gnjsv2";
1616 };
1717
18− buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
18+ buildInputs = lib.optionals withGraphics [ libX11 libXt ];
1919
2020 configurePhase =
2121 let
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737 mv $out/doc $out/share/doc/icon
3838 '';
3939
40− meta = with stdenv.lib; {
40+ meta = with lib; {
4141 description = "A very high level general-purpose programming language";
4242 maintainers = with maintainers; [ vrthra yurrriq ];
4343 platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos;
pkgs/development/interpreters/io/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
1+{ lib, stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
22 ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
33 libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
44 python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
3737 # for gcc5; c11 inline semantics breaks the build
3838 NIX_CFLAGS_COMPILE = "-fgnu89-inline";
3939
40− meta = with stdenv.lib; {
40+ meta = with lib; {
4141 description = "Io programming language";
4242 homepage = "http://iolanguage.org/";
4343 license = licenses.bsd3;
pkgs/development/interpreters/j/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, readline, libedit, bc
1+{ lib, stdenv, fetchFromGitHub, readline, libedit, bc
22, avxSupport ? stdenv.hostPlatform.avxSupport
33}:
44
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 doCheck = true;
2929
3030 # Causes build failure due to warning
31− hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "strictoverflow";
31+ hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
3232
3333 buildPhase = ''
3434 export SOURCE_DIR=$(pwd)
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868 cp -r $JLIB/bin "$out"
6969 '';
7070
71− meta = with stdenv.lib; {
71+ meta = with lib; {
7272 description = "J programming language, an ASCII-based APL successor";
7373 maintainers = with maintainers; [ raskin synthetica ];
7474 platforms = with platforms; linux ++ darwin;
pkgs/development/interpreters/janet/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, meson, ninja }:
1+{ lib, stdenv, fetchFromGitHub, meson, ninja }:
22
33stdenv.mkDerivation rec {
44 pname = "janet";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616
1717 doCheck = true;
1818
19− meta = with stdenv.lib; {
19+ meta = with lib; {
2020 description = "Janet programming language";
2121 homepage = "https://janet-lang.org/";
2222 license = licenses.mit;
pkgs/development/interpreters/jimtcl/default.nix+5−5
@@ -1,7 +1,7 @@
1−{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
1+{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
22
33let
4− makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
4+ makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
55
66in stdenv.mkDerivation rec {
77 pname = "jimtcl";
@@ -52,8 +52,8 @@ in stdenv.mkDerivation rec {
5252 meta = {
5353 description = "An open source small-footprint implementation of the Tcl programming language";
5454 homepage = "http://jim.tcl.tk/";
55− license = stdenv.lib.licenses.bsd2;
56− platforms = stdenv.lib.platforms.all;
57− maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
55+ license = lib.licenses.bsd2;
56+ platforms = lib.platforms.all;
57+ maintainers = with lib.maintainers; [ dbohdan vrthra ];
5858 };
5959}
pkgs/development/interpreters/joker/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, buildGoModule, fetchFromGitHub }:
1+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
22
33buildGoModule rec {
44 pname = "joker";
@@ -21,7 +21,7 @@ buildGoModule rec {
2121
2222 subPackages = [ "." ];
2323
24− meta = with stdenv.lib; {
24+ meta = with lib; {
2525 homepage = "https://github.com/candid82/joker";
2626 description = "A small Clojure interpreter and linter written in Go";
2727 license = licenses.epl10;
pkgs/development/interpreters/jruby/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, callPackage, fetchurl, makeWrapper, jre }:
1+{ lib, stdenv, callPackage, fetchurl, makeWrapper, jre }:
22
33let
44# The version number here is whatever is reported by the RUBY_VERSION string
@@ -50,7 +50,7 @@ jruby = stdenv.mkDerivation rec {
5050 libPath = "lib/${rubyEngine}/${rubyVersion.libDir}";
5151 };
5252
53− meta = with stdenv.lib; {
53+ meta = with lib; {
5454 description = "Ruby interpreter written in Java";
5555 homepage = "http://jruby.org/";
5656 license = with licenses; [ cpl10 gpl2 lgpl21 ];
pkgs/development/interpreters/jython/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeWrapper, jre }:
1+{ lib, stdenv, fetchurl, makeWrapper, jre }:
22
33stdenv.mkDerivation rec {
44 pname = "jython";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 meta = {
2424 description = "Python interpreter written in Java";
2525 homepage = "https://jython.org/";
26− license = stdenv.lib.licenses.psfl;
26+ license = lib.licenses.psfl;
2727 platforms = jre.meta.platforms;
2828 };
2929}
pkgs/development/interpreters/kona/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "kona";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111 makeFlags = [ "PREFIX=$(out)" ];
1212 preInstall = ''mkdir -p "$out/bin"'';
1313
14− meta = with stdenv.lib; {
14+ meta = with lib; {
1515 description = "An interpreter of K, APL-like programming language";
1616 homepage = "https://github.com/kevinlawler/kona/";
1717 maintainers = with maintainers; [ raskin ];
pkgs/development/interpreters/lfe/generic-builder.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
1+{ lib, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
22
33{ baseName ? "lfe"
44, version
@@ -10,7 +10,7 @@
1010}:
1111
1212let
13− inherit (stdenv.lib)
13+ inherit (lib)
1414 assertMsg makeBinPath optionalString
1515 getVersion versionAtLeast versionOlder versions;
1616
@@ -75,7 +75,7 @@ buildRebar3 {
7575 done
7676 '';
7777
78− meta = with stdenv.lib; {
78+ meta = with lib; {
7979 description = "The best of Erlang and of Lisp; at the same time!";
8080 longDescription = ''
8181 LFE, Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
pkgs/development/interpreters/lolcode/default.nix+3−3
@@ -1,6 +1,6 @@
1−{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
1+{ lib, stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
22
3−with stdenv.lib;
3+with lib;
44stdenv.mkDerivation rec {
55
66 pname = "lolcode";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 '';
2727 license = licenses.gpl3;
2828 maintainers = [ maintainers.AndersonTorres ];
29− platforms = stdenv.lib.platforms.unix;
29+ platforms = lib.platforms.unix;
3030 };
3131
3232}
pkgs/development/interpreters/love/0.10.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
1+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
22 libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
33 libtheora, which, autoconf, automake, libtool
44}:
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
3434 meta = {
3535 homepage = "http://love2d.org";
3636 description = "A Lua-based 2D game engine/scripting language";
37− license = stdenv.lib.licenses.zlib;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = [ stdenv.lib.maintainers.raskin ];
37+ license = lib.licenses.zlib;
38+ platforms = lib.platforms.linux;
39+ maintainers = [ lib.maintainers.raskin ];
4040 };
4141}
pkgs/development/interpreters/love/0.7.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config
1+{ lib, stdenv, fetchurl, pkg-config
22, SDL, libGLU, libGL, openal, lua
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -48,9 +48,9 @@ stdenv.mkDerivation rec {
4848 meta = {
4949 homepage = "http://love2d.org";
5050 description = "A Lua-based 2D game engine/scripting language";
51− license = stdenv.lib.licenses.zlib;
51+ license = lib.licenses.zlib;
5252
53− platforms = stdenv.lib.platforms.linux;
54− maintainers = [ stdenv.lib.maintainers.raskin ];
53+ platforms = lib.platforms.linux;
54+ maintainers = [ lib.maintainers.raskin ];
5555 };
5656}
pkgs/development/interpreters/love/0.8.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config
1+{ lib, stdenv, fetchurl, pkg-config
22, SDL, libGLU, libGL, openal, lua
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
4747 meta = {
4848 homepage = "http://love2d.org";
4949 description = "A Lua-based 2D game engine/scripting language";
50− license = stdenv.lib.licenses.zlib;
50+ license = lib.licenses.zlib;
5151
52− platforms = stdenv.lib.platforms.linux;
53− maintainers = [ stdenv.lib.maintainers.raskin ];
52+ platforms = lib.platforms.linux;
53+ maintainers = [ lib.maintainers.raskin ];
5454 };
5555}
pkgs/development/interpreters/love/0.9.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config
1+{ lib, stdenv, fetchurl, pkg-config
22, SDL2, libGLU, libGL, openal, luajit
33, libdevil, freetype, physfs
44, libmodplug, mpg123, libvorbis, libogg
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
2626 meta = {
2727 homepage = "http://love2d.org";
2828 description = "A Lua-based 2D game engine/scripting language";
29− license = stdenv.lib.licenses.zlib;
29+ license = lib.licenses.zlib;
3030
31− platforms = stdenv.lib.platforms.linux;
32− maintainers = [ stdenv.lib.maintainers.raskin ];
31+ platforms = lib.platforms.linux;
32+ maintainers = [ lib.maintainers.raskin ];
3333 broken = true;
3434 };
3535}
pkgs/development/interpreters/love/11.1.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
1+{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
22 libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
33 libtheora, which, autoconf, automake, libtool
44}:
@@ -34,8 +34,8 @@ stdenv.mkDerivation {
3434 meta = {
3535 homepage = "http://love2d.org";
3636 description = "A Lua-based 2D game engine/scripting language";
37− license = stdenv.lib.licenses.zlib;
38− platforms = stdenv.lib.platforms.linux;
39− maintainers = [ stdenv.lib.maintainers.raskin ];
37+ license = lib.licenses.zlib;
38+ platforms = lib.platforms.linux;
39+ maintainers = [ lib.maintainers.raskin ];
4040 };
4141}
pkgs/development/interpreters/lua-5/default.nix+1−1
@@ -40,7 +40,7 @@ in rec {
4040 sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
4141 '';
4242
43− postBuild = stdenv.lib.optionalString (!stdenv.isDarwin) ''
43+ postBuild = lib.optionalString (!stdenv.isDarwin) ''
4444 ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so )
4545 '';
4646 };
pkgs/development/interpreters/lua-5/filesystem.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020
2121 meta = {
2222 homepage = "https://github.com/keplerproject/luafilesystem";
23− hydraPlatforms = stdenv.lib.platforms.linux;
23+ hydraPlatforms = lib.platforms.linux;
2424 maintainers = [ ];
2525 };
2626}
pkgs/development/interpreters/lua-5/interpreter.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline
1+{ lib, stdenv, fetchurl, readline
22, compat ? false
33, callPackage
44, packageOverrides ? (self: super: {})
@@ -50,7 +50,7 @@ self = stdenv.mkDerivation rec {
5050 runHook preConfigure
5151
5252 makeFlagsArray+=(CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" )
53− makeFlagsArray+=(${stdenv.lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
53+ makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.hostPlatform.config}-ar rcu'"})
5454
5555 installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \
5656 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 {
107107 management with incremental garbage collection, making it ideal
108108 for configuration, scripting, and rapid prototyping.
109109 '';
110− license = stdenv.lib.licenses.mit;
111− platforms = stdenv.lib.platforms.unix;
110+ license = lib.licenses.mit;
111+ platforms = lib.platforms.unix;
112112 };
113113};
114114in self
pkgs/development/interpreters/lua-5/sockets.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 meta = {
2121 homepage = "http://w3.impa.br/~diego/software/luasocket/";
22− hydraPlatforms = stdenv.lib.platforms.linux;
22+ hydraPlatforms = lib.platforms.linux;
2323 maintainers = [ ];
2424 };
2525}
pkgs/development/interpreters/lua-5/wrapper.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, lua, buildEnv, makeWrapper
1+{ lib, stdenv, lua, buildEnv, makeWrapper
22, extraLibs ? []
33, extraOutputsToInstall ? []
44, postBuild ? ""
@@ -28,7 +28,7 @@ let
2828 addToLuaPath "$out"
2929
3030 # take every binary from lua packages and put them into the env
31− for path in ${stdenv.lib.concatStringsSep " " paths}; do
31+ for path in ${lib.concatStringsSep " " paths}; do
3232 nix_debug "looking for binaries in path = $path"
3333 if [ -d "$path/bin" ]; then
3434 cd "$path/bin"
@@ -37,7 +37,7 @@ let
3737 rm -f "$out/bin/$prg"
3838 if [ -x "$prg" ]; then
3939 nix_debug "Making wrapper $prg"
40− makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${stdenv.lib.concatStringsSep " " makeWrapperArgs}
40+ makeWrapper "$path/bin/$prg" "$out/bin/$prg" --suffix LUA_PATH ';' "$LUA_PATH" --suffix LUA_CPATH ';' "$LUA_CPATH" ${lib.concatStringsSep " " makeWrapperArgs}
4141 fi
4242 fi
4343 done
pkgs/development/interpreters/luajit/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, buildPackages
1+{ lib, stdenv, fetchFromGitHub, buildPackages
22, name ? "luajit-${version}"
33, isStable
44, sha256
@@ -26,7 +26,7 @@ assert enableValgrindSupport -> valgrind != null;
2626let
2727 luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
2828
29− XCFLAGS = with stdenv.lib;
29+ XCFLAGS = with lib;
3030 optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
3131 ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
3232 ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
5959
6060 configurePhase = false;
6161
62− buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
62+ buildInputs = lib.optional enableValgrindSupport valgrind;
6363
6464 buildFlags = [
6565 "amalg" # Build highly optimized version
@@ -70,14 +70,14 @@ stdenv.mkDerivation rec {
7070 "CROSS=${stdenv.cc.targetPrefix}"
7171 # TODO: when pointer size differs, we would need e.g. -m32
7272 "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
73− ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
73+ ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
7474 enableParallelBuilding = true;
7575 NIX_CFLAGS_COMPILE = XCFLAGS;
7676
7777 postInstall = ''
7878 ( cd "$out/include"; ln -s luajit-*/* . )
7979 ln -s "$out"/bin/luajit-* "$out"/bin/lua
80− '' + stdenv.lib.optionalString (!isStable) ''
80+ '' + lib.optionalString (!isStable) ''
8181 ln -s "$out"/bin/luajit-* "$out"/bin/luajit
8282 '';
8383
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999 interpreter = "${self}/bin/lua";
100100 };
101101
102− meta = with stdenv.lib; {
102+ meta = with lib; {
103103 description = "High-performance JIT compiler for Lua 5.1";
104104 homepage = "http://luajit.org";
105105 license = licenses.mit;
pkgs/development/interpreters/lush/default.nix+4−4
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
1+{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
22, blas, libbfd, intltool, gettext, zlib, libSM}:
33
44stdenv.mkDerivation rec {
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222
2323 meta = {
2424 description = "Lisp Universal SHell";
25− license = stdenv.lib.licenses.gpl2Plus ;
26− maintainers = [ stdenv.lib.maintainers.raskin ];
27− platforms = stdenv.lib.platforms.linux;
25+ license = lib.licenses.gpl2Plus ;
26+ maintainers = [ lib.maintainers.raskin ];
27+ platforms = lib.platforms.linux;
2828 };
2929}
pkgs/development/interpreters/maude/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
1+{ lib, stdenv, fetchurl, unzip, makeWrapper, flex, bison, ncurses, buddy, tecla
22, libsigsegv, gmpxx, cln, yices
33}:
44
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 ];
2828
2929 hardeningDisable = [ "stackprotector" ] ++
30− stdenv.lib.optionals stdenv.isi686 [ "pic" "fortify" ];
30+ lib.optionals stdenv.isi686 [ "pic" "fortify" ];
3131
3232 preConfigure = ''
3333 configureFlagsArray=(
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
5454 meta = {
5555 homepage = "http://maude.cs.illinois.edu/";
5656 description = "High-level specification language";
57− license = stdenv.lib.licenses.gpl2Plus;
57+ license = lib.licenses.gpl2Plus;
5858
5959 longDescription = ''
6060 Maude is a high-performance reflective language and system
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
6666 rewriting logic computation.
6767 '';
6868
69− platforms = stdenv.lib.platforms.unix;
70− maintainers = [ stdenv.lib.maintainers.peti ];
69+ platforms = lib.platforms.unix;
70+ maintainers = [ lib.maintainers.peti ];
7171 };
7272}
pkgs/development/interpreters/metamath/default.nix+9−7
@@ -1,19 +1,21 @@
1−{ stdenv, fetchFromGitHub, autoreconfHook }:
1+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
22
3−stdenv.mkDerivation {
3+let
4+ version = "0.194";
5+in stdenv.mkDerivation {
46 pname = "metamath";
5− version = "0.193";
7+ inherit version;
68
79 buildInputs = [ autoreconfHook ];
810
911 src = fetchFromGitHub {
1012 owner = "metamath";
1113 repo = "metamath-exe";
12− rev = "f973c81222ebe36580a24f0fa7bbb600990af7d6";
13− sha256 = "1s9hyknfvhj86g3giayyf3dxzg23iij0rs7bdvj075v9qbyhqn9b";
14+ rev = "v${version}";
15+ sha256 = "1bc5h2jdqbgna8zbhqyphlqcldz4vddg72r2rnjjjzxnxb2skvj7";
1416 };
1517
16− meta = with stdenv.lib; {
18+ meta = with lib; {
1719 description = "Interpreter for the metamath proof language";
1820 longDescription = ''
1921 The metamath program is an ASCII-based ANSI C program with a command-line
@@ -23,7 +25,7 @@ stdenv.mkDerivation {
2325 '';
2426 homepage = "http://us.metamath.org";
2527 downloadPage = "http://us.metamath.org/#downloads";
26− license = licenses.gpl2;
28+ license = licenses.gpl2Only;
2729 maintainers = [ maintainers.taneb ];
2830 platforms = platforms.all;
2931 };
pkgs/development/interpreters/mujs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, readline }:
1+{ lib, stdenv, fetchurl, readline }:
22
33stdenv.mkDerivation rec {
44 pname = "mujs";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 makeFlags = [ "prefix=$(out)" ];
1515
16− meta = with stdenv.lib; {
16+ meta = with lib; {
1717 homepage = "https://mujs.com/";
1818 description = "A lightweight, embeddable Javascript interpreter";
1919 platforms = platforms.unix;
pkgs/development/interpreters/nix-exec/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkg-config, nix, git }: let
1+{ lib, stdenv, fetchurl, pkg-config, nix, git }: let
22 version = "4.1.6";
33in stdenv.mkDerivation {
44 pname = "nix-exec";
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
1717 meta = {
1818 description = "Run programs defined in nix expressions";
1919 homepage = "https://github.com/shlevy/nix-exec";
20− license = stdenv.lib.licenses.mit;
20+ license = lib.licenses.mit;
2121 platforms = nix.meta.platforms;
2222 broken = true;
2323 };
pkgs/development/interpreters/perl/wrapper.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, perl, buildEnv, makeWrapper
1+{ lib, stdenv, perl, buildEnv, makeWrapper
22, extraLibs ? []
33, extraOutputsToInstall ? []
44, postBuild ? ""
@@ -28,7 +28,7 @@ let
2828 mkdir -p "$out/bin"
2929
3030 # take every binary from perl packages and put them into the env
31− for path in ${stdenv.lib.concatStringsSep " " paths}; do
31+ for path in ${lib.concatStringsSep " " paths}; do
3232 if [ -d "$path/bin" ]; then
3333 cd "$path/bin"
3434 for prg in *; do
pkgs/development/interpreters/php/generic.nix+1−1
@@ -269,7 +269,7 @@ let
269269 inherit ztsSupport;
270270 };
271271
272− meta = with stdenv.lib; {
272+ meta = with lib; {
273273 description = "An HTML-embedded scripting language";
274274 homepage = "https://www.php.net/";
275275 license = licenses.php301;
pkgs/development/interpreters/picoc/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, readline }:
1+{ lib, stdenv, fetchFromGitHub, readline }:
22
33stdenv.mkDerivation rec {
44 pname = "picoc";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 install -m644 *.h $out/include
3232 '';
3333
34− meta = with stdenv.lib; {
34+ meta = with lib; {
3535 description = "Very small C interpreter for scripting";
3636 longDescription = ''
3737 PicoC is a very small C interpreter for scripting. It was originally
pkgs/development/interpreters/picolisp/default.nix+2−2
@@ -1,5 +1,5 @@
1−{ stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
2−with stdenv.lib;
1+{ lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }:
2+with lib;
33
44stdenv.mkDerivation rec {
55 pname = "picoLisp";
pkgs/development/interpreters/pixie/default.nix+6−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
1+{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
22 pypy, libffi, libedit, libuv, boost, zlib,
33 variant ? "jit", buildWithPypy ? false }:
44
@@ -23,11 +23,11 @@ let
2323 sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";
2424 };
2525 libs = [ libffi libedit libuv boost.dev boost.out zlib ];
26− include-path = stdenv.lib.concatStringsSep ":"
26+ include-path = lib.concatStringsSep ":"
2727 (map (p: "${p}/include") libs);
28− library-path = stdenv.lib.concatStringsSep ":"
28+ library-path = lib.concatStringsSep ":"
2929 (map (p: "${p}/lib") libs);
30− bin-path = stdenv.lib.concatStringsSep ":"
30+ bin-path = lib.concatStringsSep ":"
3131 (map (p: "${p}/bin") [ gcc ]);
3232 build = {flags, target}: stdenv.mkDerivation rec {
3333 pname = "pixie";
@@ -85,9 +85,9 @@ let
8585 meta = {
8686 description = "A clojure-like lisp, built with the pypy vm toolkit";
8787 homepage = "https://github.com/pixie-lang/pixie";
88− license = stdenv.lib.licenses.lgpl3;
88+ license = lib.licenses.lgpl3;
8989 platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
90− maintainers = with stdenv.lib.maintainers; [ bendlas ];
90+ maintainers = with lib.maintainers; [ bendlas ];
9191 };
9292 };
9393in build (builtins.getAttr variant variants)
pkgs/development/interpreters/pixie/dust.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, pixie, fetchFromGitHub }:
1+{ lib, stdenv, pixie, fetchFromGitHub }:
22
33stdenv.mkDerivation rec {
44 name = "dust-0-91";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
2929 meta = {
3030 description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
3131 homepage = src.meta.homepage;
32− license = stdenv.lib.licenses.lgpl3;
33− platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
32+ license = lib.licenses.lgpl3;
33+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
3434 };
3535}
pkgs/development/interpreters/proglodyte-wasm/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
1+{ lib, stdenv, fetchFromGitHub, cmake, clang, python, v8, coreutils }:
22
33let
44 sexpr_wasm_prototype = stdenv.mkDerivation {
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
5151 make install
5252 '';
5353
54− meta = with stdenv.lib; {
54+ meta = with lib; {
5555 description = "wasm runs WebAssembly from the command line";
5656 maintainers = with maintainers; [ proglodyte ];
5757 platforms = platforms.linux;
pkgs/development/interpreters/pyrex/0.9.5.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2Packages }:
1+{ lib, stdenv, fetchurl, python2Packages }:
22
33let version = "0.9.5.1.1"; in
44
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
1616 meta = {
1717 homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
1818 description = "A language for writing Python extension modules";
19− license = stdenv.lib.licenses.asl20;
19+ license = lib.licenses.asl20;
2020 };
2121}
pkgs/development/interpreters/pyrex/0.9.6.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2Packages }:
1+{ lib, stdenv, fetchurl, python2Packages }:
22
33let version = "0.9.6.4"; in
44
@@ -16,6 +16,6 @@ python2Packages.buildPythonPackage {
1616 meta = {
1717 homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/";
1818 description = "A language for writing Python extension modules";
19− license = stdenv.lib.licenses.asl20;
19+ license = lib.licenses.asl20;
2020 };
2121}
pkgs/development/interpreters/python/cpython/2.7/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch
1+{ lib, stdenv, fetchurl, fetchpatch
22, bzip2
33, expat
44, libffi
@@ -36,7 +36,7 @@ assert x11Support -> tcl != null
3636 && xlibsWrapper != null
3737 && libX11 != null;
3838
39−with stdenv.lib;
39+with lib;
4040
4141let
4242 buildPackages = pkgsBuildHost;
@@ -215,7 +215,7 @@ let
215215 };
216216
217217 # Python 2.7 needs this
218− crossCompileEnv = stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
218+ crossCompileEnv = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform)
219219 { _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; };
220220
221221 # Build the basic Python interpreter without modules that have
@@ -227,7 +227,7 @@ in with passthru; stdenv.mkDerivation ({
227227
228228 inherit src patches buildInputs nativeBuildInputs preConfigure configureFlags;
229229
230− LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
230+ LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
231231 inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
232232
233233 NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
@@ -298,9 +298,9 @@ in with passthru; stdenv.mkDerivation ({
298298 hierarchical packages; exception-based error handling; and very
299299 high level dynamic data types.
300300 '';
301− license = stdenv.lib.licenses.psfl;
302− platforms = stdenv.lib.platforms.all;
303− maintainers = with stdenv.lib.maintainers; [ fridh ];
301+ license = lib.licenses.psfl;
302+ platforms = lib.platforms.all;
303+ maintainers = with lib.maintainers; [ fridh ];
304304 # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
305305 # in case both 2 and 3 are installed.
306306 priority = -100;
pkgs/development/interpreters/python/cpython/default.nix+7−7
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch
1+{ lib, stdenv, fetchurl, fetchpatch
22, bzip2
33, expat
44, libffi
@@ -54,7 +54,7 @@ assert x11Support -> tcl != null
5454
5555assert bluezSupport -> bluez != null;
5656
57−with stdenv.lib;
57+with lib;
5858
5959let
6060 buildPackages = pkgsBuildHost;
@@ -369,14 +369,14 @@ in with passthru; stdenv.mkDerivation {
369369 find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}"
370370 '';
371371
372− preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
372+ preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
373373 # Ensure patch-shebangs uses shebangs of host interpreter.
374− export PATH=${stdenv.lib.makeBinPath [ "$out" bash ]}:$PATH
374+ export PATH=${lib.makeBinPath [ "$out" bash ]}:$PATH
375375 '';
376376
377377 # Add CPython specific setup-hook that configures distutils.sysconfig to
378378 # always load sysconfigdata from host Python.
379− postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
379+ postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
380380 cat << "EOF" >> "$out/nix-support/setup-hook"
381381 ${sysconfigdataHook}
382382 EOF
@@ -385,8 +385,8 @@ in with passthru; stdenv.mkDerivation {
385385 # Enforce that we don't have references to the OpenSSL -dev package, which we
386386 # explicitly specify in our configure flags above.
387387 disallowedReferences =
388− stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ]
389− ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
388+ lib.optionals (openssl != null && !static) [ openssl.dev ]
389+ ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
390390 # Ensure we don't have references to build-time packages.
391391 # These typically end up in shebangs.
392392 pythonForBuild buildPackages.bash
pkgs/development/interpreters/python/pypy/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, substituteAll, fetchurl
1+{ lib, stdenv, substituteAll, fetchurl
22, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
33, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
44, self, gdbm, db, lzma
@@ -14,12 +14,12 @@
1414, pythonVersion
1515, sha256
1616, passthruFun
17−, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}"
17+, pythonAttr ? "pypy${lib.substring 0 1 pythonVersion}${lib.substring 2 3 pythonVersion}"
1818}:
1919
2020assert zlibSupport -> zlib != null;
2121
22−with stdenv.lib;
22+with lib;
2323
2424let
2525 isPy3k = substring 0 1 pythonVersion == "3";
@@ -144,7 +144,7 @@ in with passthru; stdenv.mkDerivation rec {
144144 ln -s $out/${executable}-c/include $out/include/${libPrefix}
145145 ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix}
146146
147− ${stdenv.lib.optionalString stdenv.isDarwin ''
147+ ${lib.optionalString stdenv.isDarwin ''
148148 install_name_tool -change @rpath/libpypy${optionalString isPy3k "3"}-c.dylib $out/lib/libpypy${optionalString isPy3k "3"}-c.dylib $out/bin/${executable}
149149 ''}
150150
@@ -158,7 +158,7 @@ in with passthru; stdenv.mkDerivation rec {
158158 inherit passthru;
159159 enableParallelBuilding = true; # almost no parallelization without STM
160160
161− meta = with stdenv.lib; {
161+ meta = with lib; {
162162 homepage = "http://pypy.org/";
163163 description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
164164 license = licenses.mit;
pkgs/development/interpreters/python/pypy/prebuilt.nix+3−3
@@ -22,7 +22,7 @@
2222# This version of PyPy is primarily added to speed-up translation of
2323# our PyPy source build when developing that expression.
2424
25−with stdenv.lib;
25+with lib;
2626
2727let
2828 isPy3k = majorVersion == "3";
@@ -78,7 +78,7 @@ in with passthru; stdenv.mkDerivation {
7878
7979 pushd $out
8080 find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
81− find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \;
81+ find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
8282
8383 echo "Removing bytecode"
8484 find . -name "__pycache__" -type d -depth -exec rm -rf {} \;
@@ -115,7 +115,7 @@ in with passthru; stdenv.mkDerivation {
115115
116116 inherit passthru;
117117
118− meta = with stdenv.lib; {
118+ meta = with lib; {
119119 homepage = "http://pypy.org/";
120120 description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
121121 license = licenses.mit;
pkgs/development/interpreters/python/tests.nix+1−1
@@ -93,4 +93,4 @@ let
9393
9494
9595
96−in stdenv.lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
96+in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests)
pkgs/development/interpreters/python/wrapper.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, python, buildEnv, makeWrapper
1+{ lib, stdenv, python, buildEnv, makeWrapper
22, extraLibs ? []
33, extraOutputsToInstall ? []
44, postBuild ? ""
@@ -30,14 +30,14 @@ let
3030 fi
3131 mkdir -p "$out/bin"
3232
33− for path in ${stdenv.lib.concatStringsSep " " paths}; do
33+ for path in ${lib.concatStringsSep " " paths}; do
3434 if [ -d "$path/bin" ]; then
3535 cd "$path/bin"
3636 for prg in *; do
3737 if [ -f "$prg" ]; then
3838 rm -f "$out/bin/$prg"
3939 if [ -x "$prg" ]; then
40− 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}
40+ 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}
4141 fi
4242 fi
4343 done
pkgs/development/interpreters/qnial/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
1+{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
22
33stdenv.mkDerivation {
44 pname = "qnial";
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
3333 meta = {
3434 description = "An array language from Nial Systems";
3535 homepage = "https://github.com/vrthra/qnial";
36− license = stdenv.lib.licenses.artistic1;
37− maintainers = [ stdenv.lib.maintainers.vrthra ];
38− platforms = stdenv.lib.platforms.linux;
36+ license = lib.licenses.artistic1;
37+ maintainers = [ lib.maintainers.vrthra ];
38+ platforms = lib.platforms.linux;
3939 };
4040}
pkgs/development/interpreters/quickjs/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "quickjs";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
3333 '';
3434
35− meta = with stdenv.lib; {
35+ meta = with lib; {
3636 description = "A small and embeddable Javascript engine";
3737 homepage = "https://bellard.org/quickjs/";
3838 maintainers = with maintainers; [ stesie ];
pkgs/development/interpreters/racket/default.nix+10−10
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeFontsConf
1+{ lib, stdenv, fetchurl, makeFontsConf
22, cacert
33, cairo, coreutils, fontconfig, freefont_ttf
44, glib, gmp
@@ -22,7 +22,7 @@ let
2222 fontDirectories = [ freefont_ttf ];
2323 };
2424
25− libPath = stdenv.lib.makeLibraryPath [
25+ libPath = lib.makeLibraryPath [
2626 cairo
2727 fontconfig
2828 glib
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 pname = "racket";
4949 version = "7.9"; # always change at once with ./minimal.nix
5050
51− src = (stdenv.lib.makeOverridable ({ name, sha256 }:
51+ src = (lib.makeOverridable ({ name, sha256 }:
5252 fetchurl {
5353 url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
5454 inherit sha256;
@@ -60,15 +60,15 @@ stdenv.mkDerivation rec {
6060
6161 FONTCONFIG_FILE = fontsConf;
6262 LD_LIBRARY_PATH = libPath;
63− NIX_LDFLAGS = stdenv.lib.concatStringsSep " " [
64− (stdenv.lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
65− (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
63+ NIX_LDFLAGS = lib.concatStringsSep " " [
64+ (lib.optionalString (stdenv.cc.isGNU && ! stdenv.isDarwin) "-lgcc_s")
65+ (lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
6666 ];
6767
6868 nativeBuildInputs = [ cacert wrapGAppsHook ];
6969
7070 buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ]
71− ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
71+ ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ];
7272
7373 preConfigure = ''
7474 unset AR
@@ -83,15 +83,15 @@ stdenv.mkDerivation rec {
8383
8484 shared = if stdenv.isDarwin then "dylib" else "shared";
8585 configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
86− ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
87− ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
86+ ++ lib.optional disableDocs [ "--disable-docs" ]
87+ ++ lib.optional stdenv.isDarwin [ "--enable-xonx" ];
8888
8989 configureScript = "../configure";
9090
9191 enableParallelBuilding = false;
9292
9393
94− meta = with stdenv.lib; {
94+ meta = with lib; {
9595 description = "A programmable programming language";
9696 longDescription = ''
9797 Racket is a full-spectrum programming language. It goes beyond
pkgs/development/interpreters/rakudo/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 # Some tests fail on Darwin
2323 doCheck = !stdenv.isDarwin;
2424
25− meta = with stdenv.lib; {
25+ meta = with lib; {
2626 description = "Raku implementation on top of Moar virtual machine";
2727 homepage = "https://www.rakudo.org";
2828 license = licenses.artistic2;
pkgs/development/interpreters/rakudo/moarvm.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perl
1+{ lib, stdenv, fetchurl, perl
22, CoreServices, ApplicationServices }:
33
44stdenv.mkDerivation rec {
@@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
1010 sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488";
1111 };
1212
13− buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
13+ buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
1414 doCheck = false; # MoarVM does not come with its own test suite
1515
1616 configureScript = "${perl}/bin/perl ./Configure.pl";
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
2020 homepage = "https://www.moarvm.org/";
2121 license = licenses.artistic2;
pkgs/development/interpreters/rakudo/nqp.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 doCheck = true;
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
2424 homepage = "https://github.com/perl6/nqp";
2525 license = licenses.artistic2;
pkgs/development/interpreters/rakudo/zef.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, rakudo, makeWrapper }:
1+{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }:
22
33stdenv.mkDerivation rec {
44 pname = "zef";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out"
2525 '';
2626
27− meta = with stdenv.lib; {
27+ meta = with lib; {
2828 description = "Raku / Perl6 Module Management";
2929 homepage = "https://github.com/ugexe/zef";
3030 license = licenses.artistic2;
pkgs/development/interpreters/rascal/default.nix+4−4
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeWrapper, jdk }:
1+{ lib, stdenv, fetchurl, makeWrapper, jdk }:
22
33stdenv.mkDerivation rec {
44 name = "rascal-0.6.2";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
2222 meta = {
2323 homepage = "https://www.rascal-mpl.org/";
2424 description = "Command-line REPL for the Rascal metaprogramming language";
25− license = stdenv.lib.licenses.epl10;
26− maintainers = [ stdenv.lib.maintainers.eelco ];
27− platforms = stdenv.lib.platforms.unix;
25+ license = lib.licenses.epl10;
26+ maintainers = [ lib.maintainers.eelco ];
27+ platforms = lib.platforms.unix;
2828 };
2929}
pkgs/development/interpreters/rebol/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 cp r3 $out/bin
3434 '';
3535
36− meta = with stdenv.lib; {
36+ meta = with lib; {
3737 description = "Relative expression based object language, a language where code is data";
3838 maintainers = with maintainers; [ vrthra ];
3939 platforms = [ "x86_64-linux" ];
pkgs/development/interpreters/red/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
1+{ lib, stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "red";
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
7777
7878 '';
7979
80− meta = with stdenv.lib; {
80+ meta = with lib; {
8181 description = ''
8282 New programming language strongly inspired by Rebol, but with a
8383 broader field of usage thanks to its native-code compiler, from system
pkgs/development/interpreters/regina/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, ncurses }:
1+{ lib, stdenv, fetchurl, ncurses }:
22
33stdenv.mkDerivation rec {
44 pname = "Regina-REXX";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 "--libdir=$(out)/lib"
1616 ];
1717
18− meta = with stdenv.lib; {
18+ meta = with lib; {
1919 description = "REXX interpreter";
2020 maintainers = [ maintainers.raskin ];
2121 platforms = platforms.linux;
pkgs/development/interpreters/renpy/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, python2Packages, pkg-config, SDL2
1+{ lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2
22, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
33, glib
44}:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 pname = "renpy";
1010 version = "7.3.5";
1111
12− meta = with stdenv.lib; {
12+ meta = with lib; {
1313 description = "Ren'Py Visual Novel Engine";
1414 homepage = "https://renpy.org/";
1515 license = licenses.mit;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
3737
3838 pythonPath = [ pygame_sdl2 tkinter ];
3939
40− RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
40+ RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [
4141 SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib
4242 ]);
4343
pkgs/development/interpreters/ruby/default.nix+2−2
@@ -159,7 +159,7 @@ let
159159 export GEM_HOME="$out/${passthru.gemPath}"
160160 '';
161161
162− installFlags = stdenv.lib.optional docSupport "install-doc";
162+ installFlags = lib.optional docSupport "install-doc";
163163 # Bundler tries to create this directory
164164 postInstall = ''
165165 # Remove unnecessary groff reference from runtime closure, since it's big
@@ -208,7 +208,7 @@ let
208208
209209 disallowedRequisites = op (!jitSupport) stdenv.cc.cc;
210210
211− meta = with stdenv.lib; {
211+ meta = with lib; {
212212 description = "The Ruby language";
213213 homepage = "http://www.ruby-lang.org/en/";
214214 license = licenses.ruby;
pkgs/development/interpreters/scheme48/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation {
44 name = "scheme48-1.9.2";
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
66 meta = {
77 homepage = "http://s48.org/";
88 description = "Scheme 48";
9− platforms = with stdenv.lib.platforms; unix;
10− license = stdenv.lib.licenses.bsd3;
9+ platforms = with lib.platforms; unix;
10+ license = lib.licenses.bsd3;
1111 };
1212
1313 src = fetchurl {
pkgs/development/interpreters/scsh/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, autoreconfHook, scheme48 }:
1+{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }:
22
33stdenv.mkDerivation {
44 name = "scsh-0.7pre";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414 buildInputs = [ scheme48 ];
1515 configureFlags = [ "--with-scheme48=${scheme48}" ];
1616
17− meta = with stdenv.lib; {
17+ meta = with lib; {
1818 description = "A Scheme shell";
1919 homepage = "http://www.scsh.net/";
2020 license = licenses.bsd3;
pkgs/development/interpreters/self/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
1+{ lib, stdenv, fetchFromGitHub, libX11, libXext, makeWrapper, ncurses, cmake }:
22
33stdenv.mkDerivation rec {
44 # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535 --set SELF_ROOT "$out"
3636 '';
3737
38− meta = with stdenv.lib; {
38+ meta = with lib; {
3939 description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine";
4040 homepage = "https://selflanguage.org/";
4141 license = licenses.bsd3;
pkgs/development/interpreters/shen-sbcl/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, shen-sources
44, sbcl
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 mkdir -p $out
2323 install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
2424 '';
25− meta = with stdenv.lib; {
25+ meta = with lib; {
2626 homepage = https://shenlanguage.org;
2727 description = "Port of Shen running on Steel Bank Common Lisp";
2828 platforms = sbcl.meta.platforms;
pkgs/development/interpreters/shen-sources/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33}:
44
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 cp . $out -R
1919 '';
2020
21− meta = with stdenv.lib; {
21+ meta = with lib; {
2222 homepage = https://shenlanguage.org;
2323 description = "Source code for the Shen Language";
2424 platforms = platforms.all;
pkgs/development/interpreters/spidermonkey/1.8.5.nix+3−3
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
2828 url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
2929 sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
3030 })
31− ] ++ stdenv.lib.optionals stdenv.isAarch32 [
31+ ] ++ lib.optionals stdenv.isAarch32 [
3232 # Explained below in configureFlags for ARM
3333 ./1.8.5-findvanilla.patch
3434 # Fix for hard float flags.
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
4949 # of polkit, which is what matters most, it does not override the allocator
5050 # so the failure of that test does not matter much.
5151 configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++
52− stdenv.lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
52+ lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
5353 "--with-cpu-arch=armv5t"
5454 "--disable-tracejit" ];
5555
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
6767 rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522
6868 '';
6969
70− meta = with stdenv.lib; {
70+ meta = with lib; {
7171 description = "Mozilla's JavaScript engine written in C/C++";
7272 homepage = "https://developer.mozilla.org/en/SpiderMonkey";
7373 # TODO: MPL/GPL/LGPL tri-license.
pkgs/development/interpreters/spidermonkey/38.nix+4−4
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
1+{ lib, stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
22, libobjc }:
33
4−with stdenv.lib;
4+with lib;
55
66stdenv.mkDerivation rec {
77 version = "38.8.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 };
1414
1515 buildInputs = [ libffi readline icu zlib ]
16− ++ stdenv.lib.optional stdenv.isDarwin libobjc;
16+ ++ lib.optional stdenv.isDarwin libobjc;
1717 nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
1818
1919 postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
6060 done
6161 '';
6262
63− meta = with stdenv.lib; {
63+ meta = with lib; {
6464 description = "Mozilla's JavaScript engine written in C/C++";
6565 homepage = "https://developer.mozilla.org/en/SpiderMonkey";
6666 # TODO: MPL/GPL/LGPL tri-license.
pkgs/development/interpreters/spidermonkey/60.nix+3−3
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
1+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
22, which, readline, zlib, icu }:
33
4−with stdenv.lib;
4+with lib;
55
66let
77 version = "60.9.0";
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
7373
7474 enableParallelBuilding = true;
7575
76− meta = with stdenv.lib; {
76+ meta = with lib; {
7777 description = "Mozilla's JavaScript engine written in C/C++";
7878 homepage = "https://developer.mozilla.org/en/SpiderMonkey";
7979 license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
pkgs/development/interpreters/spidermonkey/68.nix+3−3
@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
1+{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
22, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
33
4−with stdenv.lib;
4+with lib;
55
66let
77 python3Env = buildPackages.python3.withPackages (p: [p.six]);
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
8585
8686 enableParallelBuilding = true;
8787
88− meta = with stdenv.lib; {
88+ meta = with lib; {
8989 description = "Mozilla's JavaScript engine written in C/C++";
9090 homepage = "https://developer.mozilla.org/en/SpiderMonkey";
9191 license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
pkgs/development/interpreters/spidermonkey/78.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchurl
33, fetchpatch
44, autoconf213
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
7676 # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
7777 "--enable-optimize"
7878 "--enable-release"
79− ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
79+ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
8080 # Spidermonkey seems to use different host/build terminology for cross
8181 # compilation here.
8282 "--host=${stdenv.buildPlatform.config}"
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
9696
9797 enableParallelBuilding = true;
9898
99− meta = with stdenv.lib; {
99+ meta = with lib; {
100100 description = "Mozilla's JavaScript engine written in C/C++";
101101 homepage = "https://developer.mozilla.org/en/SpiderMonkey";
102102 license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
pkgs/development/interpreters/supercollider/default.nix+3−3
@@ -1,10 +1,10 @@
1−{ stdenv, fetchurl, cmake, pkg-config, alsaLib
1+{ lib, stdenv, fetchurl, cmake, pkg-config, alsaLib
22, libjack2, libsndfile, fftw, curl, gcc
33, libXt, qtbase, qttools, qtwebengine
44, readline, qtwebsockets, useSCEL ? false, emacs
55}:
66
7−let optional = stdenv.lib.optional;
7+let optional = lib.optional;
88in
99
1010stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
3131 ++ optional (!stdenv.isDarwin) alsaLib
3232 ++ optional useSCEL emacs;
3333
34− meta = with stdenv.lib; {
34+ meta = with lib; {
3535 description = "Programming language for real time audio synthesis";
3636 homepage = "https://supercollider.github.io";
3737 maintainers = with maintainers; [ mrmebelman ];
pkgs/development/interpreters/tcl/generic.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22
33# Version specific stuff
44, release, version, src
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
2727 # Don't install tzdata because NixOS already has a more up-to-date copy.
2828 "--with-tzdata=no"
2929 "tcl_cv_strtod_unbroken=ok"
30− ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
30+ ] ++ lib.optional stdenv.is64bit "--enable-64bit";
3131
3232 enableParallelBuilding = true;
3333
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
3939 ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension}
4040 '';
4141
42− meta = with stdenv.lib; {
42+ meta = with lib; {
4343 description = "The Tcl scripting language";
4444 homepage = "https://www.tcl.tk/";
4545 license = licenses.tcltk;
pkgs/development/interpreters/tclreadline/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ stdenv
1+{ lib, stdenv
22, fetchFromGitHub
33, automake
44, autoconf
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
4343
4444 # The provided makefile leaves a wrong reference to /build/ in RPATH,
4545 # so we fix it after checking that everything is also present in $out
46− preFixup = stdenv.lib.optionalString stdenv.isLinux ''
46+ preFixup = lib.optionalString stdenv.isLinux ''
4747 needed_libraries=$(ls .libs | grep '\.\(so\|la\)$')
4848 for lib in $needed_libraries; do
4949 if ! ls $out/lib | grep "$lib"; then
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
5858 done
5959 '';
6060
61− meta = with stdenv.lib; {
61+ meta = with lib; {
6262 description = "GNU readline for interactive tcl shells";
6363 homepage = "https://github.com/flightaware/tclreadline";
6464 license = licenses.bsd3;
pkgs/development/interpreters/tinyscheme/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl }:
22
33stdenv.mkDerivation rec {
44 pname = "tinyscheme";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 cp scheme $out/bin/tinyscheme
2020 '';
2121
22− meta = with stdenv.lib; {
22+ meta = with lib; {
2323 description = "Lightweight Scheme implementation";
2424 longDescription = ''
2525 TinyScheme is a lightweight Scheme interpreter that implements as large a
pkgs/development/interpreters/unicon-lang/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
1+{ lib, stdenv, fetchurl, unzip, libX11, libXt, libnsl }:
22
33stdenv.mkDerivation {
44 pname = "unicon-lang";
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
3333 cp -r bin $out/
3434 '';
3535
36− meta = with stdenv.lib; {
36+ meta = with lib; {
3737 description = "A very high level, goal-directed, object-oriented, general purpose applications language";
3838 maintainers = with maintainers; [ vrthra ];
3939 platforms = platforms.linux;
pkgs/development/libraries/gtk/3.x.nix+56−50
@@ -3,7 +3,7 @@
33, fetchpatch
44, pkg-config
55, gettext
6−, docbook_xsl
6+, docbook-xsl-nons
77, docbook_xml_dtd_43
88, gtk-doc
99, meson
@@ -48,13 +48,11 @@
4848
4949assert cupsSupport -> cups != null;
5050
51−with lib;
52−
5351stdenv.mkDerivation rec {
5452 pname = "gtk+3";
5553 version = "3.24.24";
5654
57− outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
55+ outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
5856 outputBin = "dev";
5957
6058 setupHooks = [
@@ -69,12 +67,13 @@ stdenv.mkDerivation rec {
6967
7068 patches = [
7169 ./patches/3.0-immodules.cache.patch
70+
7271 (fetchpatch {
7372 name = "Xft-setting-fallback-compute-DPI-properly.patch";
7473 url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
7574 sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
7675 })
77− ] ++ optionals stdenv.isDarwin [
76+ ] ++ lib.optionals stdenv.isDarwin [
7877 # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
7978 # let’s drop that dependency in similar way to how other parts of the library do it
8079 # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
@@ -82,35 +81,6 @@ stdenv.mkDerivation rec {
8281 ./patches/3.0-darwin-x11.patch
8382 ];
8483
85− separateDebugInfo = stdenv.isLinux;
86−
87− mesonFlags = [
88− "-Dgtk_doc=${boolToString withGtkDoc}"
89− "-Dtests=false"
90− "-Dtracker3=${boolToString trackerSupport}"
91− "-Dbroadway_backend=${boolToString broadwaySupport}"
92− ];
93−
94− # These are the defines that'd you'd get with --enable-debug=minimum (default).
95− # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
96− NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
97−
98− postPatch = ''
99− files=(
100− build-aux/meson/post-install.py
101− demos/gtk-demo/geninclude.py
102− gdk/broadway/gen-c-array.py
103− gdk/gen-gdk-gresources-xml.py
104− gtk/cursor/dnd-copy.png
105− gtk/gen-gtk-gresources-xml.py
106− gtk/gen-rc.py
107− gtk/gentypefuncs.py
108− )
109−
110− chmod +x ''${files[@]}
111− patchShebangs ''${files[@]}
112− '';
113−
11484 nativeBuildInputs = [
11585 gettext
11686 gobject-introspection
@@ -120,9 +90,9 @@ stdenv.mkDerivation rec {
12090 pkg-config
12191 python3
12292 sassc
123− ] ++ setupHooks ++ optionals withGtkDoc [
93+ ] ++ setupHooks ++ lib.optionals withGtkDoc [
12494 docbook_xml_dtd_43
125− docbook_xsl
95+ docbook-xsl-nons
12696 gtk-doc
12797 # For xmllint
12898 libxml2
@@ -133,10 +103,12 @@ stdenv.mkDerivation rec {
133103 epoxy
134104 json-glib
135105 isocodes
136− ]
137− ++ optional stdenv.isDarwin AppKit
138− ++ optional trackerSupport tracker
139− ;
106+ ] ++ lib.optionals stdenv.isDarwin [
107+ AppKit
108+ ] ++ lib.optionals trackerSupport [
109+ tracker
110+ ];
111+ #TODO: colord?
140112
141113 propagatedBuildInputs = with xorg; [
142114 at-spi2-atk
@@ -155,17 +127,51 @@ stdenv.mkDerivation rec {
155127 libXrandr
156128 libXrender
157129 pango
158− ]
159− ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
160− ++ optionals waylandSupport [ mesa wayland wayland-protocols ]
161− ++ optional xineramaSupport libXinerama
162− ++ optional cupsSupport cups
163− ;
164− #TODO: colord?
130+ ] ++ lib.optionals stdenv.isDarwin [
131+ # explicitly propagated, always needed
132+ Cocoa
133+ ] ++ lib.optionals waylandSupport [
134+ mesa
135+ wayland
136+ wayland-protocols
137+ ] ++ lib.optionals xineramaSupport [
138+ libXinerama
139+ ] ++ lib.optionals cupsSupport [
140+ cups
141+ ];
142+
143+ mesonFlags = [
144+ "-Dgtk_doc=${lib.boolToString withGtkDoc}"
145+ "-Dtests=false"
146+ "-Dtracker3=${lib.boolToString trackerSupport}"
147+ "-Dbroadway_backend=${lib.boolToString broadwaySupport}"
148+ ];
165149
166150 doCheck = false; # needs X11
167151
168− postInstall = optionalString (!stdenv.isDarwin) ''
152+ separateDebugInfo = stdenv.isLinux;
153+
154+ # These are the defines that'd you'd get with --enable-debug=minimum (default).
155+ # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
156+ NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
157+
158+ postPatch = ''
159+ files=(
160+ build-aux/meson/post-install.py
161+ demos/gtk-demo/geninclude.py
162+ gdk/broadway/gen-c-array.py
163+ gdk/gen-gdk-gresources-xml.py
164+ gtk/cursor/dnd-copy.png
165+ gtk/gen-gtk-gresources-xml.py
166+ gtk/gen-rc.py
167+ gtk/gentypefuncs.py
168+ )
169+
170+ chmod +x ''${files[@]}
171+ patchShebangs ''${files[@]}
172+ '';
173+
174+ postInstall = lib.optionalString (!stdenv.isDarwin) ''
169175 # The updater is needed for nixos env and it's tiny.
170176 moveToOutput bin/gtk-update-icon-cache "$out"
171177 # Launcher
@@ -178,7 +184,7 @@ stdenv.mkDerivation rec {
178184 '';
179185
180186 # Wrap demos
181− postFixup = optionalString (!stdenv.isDarwin) ''
187+ postFixup = lib.optionalString (!stdenv.isDarwin) ''
182188 demos=(gtk3-demo gtk3-demo-application gtk3-icon-browser gtk3-widget-factory)
183189
184190 for program in ''${demos[@]}; do
@@ -194,7 +200,7 @@ stdenv.mkDerivation rec {
194200 };
195201 };
196202
197− meta = {
203+ meta = with lib; {
198204 description = "A multi-platform toolkit for creating graphical user interfaces";
199205 longDescription = ''
200206 GTK is a highly usable, feature rich toolkit for creating
pkgs/development/libraries/intel-gmmlib/default.nix+8−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "intel-gmmlib";
7− version = "20.3.3";
7+ version = "20.4.1";
88
99 src = fetchFromGitHub {
1010 owner = "intel";
1111 repo = "gmmlib";
1212 rev = "${pname}-${version}";
13− sha256 = "1diq1gqpfv5bawvag6bzwnd3ilhacwmwx3bl67abjvbb0m3jw4lk";
13+ sha256 = "0qb0wpinfv8lg1pq1pxkl6v0kd8ax86m8zxzm6zjx91alsch1mi6";
1414 };
1515
1616 nativeBuildInputs = [ cmake ];
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
1919 homepage = "https://github.com/intel/gmmlib";
2020 license = licenses.mit;
2121 description = "Intel Graphics Memory Management Library";
22+ longDescription = ''
23+ The Intel(R) Graphics Memory Management Library provides device specific
24+ and buffer management for the Intel(R) Graphics Compute Runtime for
25+ OpenCL(TM) and the Intel(R) Media Driver for VAAPI.
26+ '';
2227 platforms = [ "x86_64-linux" ];
28+ maintainers = with maintainers; [ primeos ];
2329 };
2430}
pkgs/development/libraries/intel-media-driver/default.nix+2−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "intel-media-driver";
9− version = "20.4.5";
9+ version = "21.1.0";
1010
1111 src = fetchFromGitHub {
1212 owner = "intel";
1313 repo = "media-driver";
1414 rev = "intel-media-${version}";
15− sha256 = "149xkhhp8q06c1jzxjs24lnbfrlvf19m0hcwld593vv4arfpbpmf";
15+ sha256 = "17cgs52f42jdvfb6q3wpkxaz2b41z59jdribpgb9qmcvizsnglxc";
1616 };
1717
1818 cmakeFlags = [
pkgs/development/libraries/mtxclient/default.nix+1−5
@@ -5,8 +5,6 @@
55, pkg-config
66, boost17x
77, openssl
8−, zlib
9−, libsodium
108, olm
119, spdlog
1210, nlohmann_json
@@ -42,8 +40,6 @@ stdenv.mkDerivation rec {
4240 spdlog
4341 boost17x
4442 openssl
45− zlib
46− libsodium
4743 olm
4844 ];
4945
@@ -51,7 +47,7 @@ stdenv.mkDerivation rec {
5147 description = "Client API library for Matrix, built on top of Boost.Asio";
5248 homepage = "https://github.com/Nheko-Reborn/mtxclient";
5349 license = licenses.mit;
54− maintainers = with maintainers; [ fpletz ];
50+ maintainers = with maintainers; [ fpletz pstn ];
5551 platforms = platforms.all;
5652 # Should be fixable if a higher clang version is used, see:
5753 # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
pkgs/development/libraries/nsss/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "nsss";
7− version = "0.0.2.2";
8− sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k";
7+ version = "0.1.0.0";
8+ sha256 = "15rxbwf16wm1la079yr2xn4bccjgd7m8dh6r7bpr6s57cj93i2mq";
99
1010 description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
1111
pkgs/development/libraries/phonetisaurus/default.nix+2−2
@@ -7,12 +7,12 @@
77
88stdenv.mkDerivation rec {
99 pname = "phonetisaurus";
10− version = "2020-07-31";
10+ version = "0.9.1";
1111
1212 src = fetchFromGitHub {
1313 owner = "AdolfVonKleist";
1414 repo = pname;
15− rev = "2831870697de5b4fbcb56a6e1b975e0e1ea10deb";
15+ rev = version;
1616 sha256 = "1b18s5zz0l0fhqh9n9jnmgjz2hzprwzf6hx5a12zibmmam3qyriv";
1717 };
1818
pkgs/development/libraries/skalibs/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "skalibs";
7− version = "2.9.3.0";
8− sha256 = "0i1vg3bh0w3bpj7cv0kzs6q9v2dd8wa2by8h8j39fh1qkl20f6ph";
7+ version = "2.10.0.1";
8+ sha256 = "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg";
99
1010 description = "A set of general-purpose C programming libraries";
1111
pkgs/development/libraries/utmps/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "utmps";
7− version = "0.0.3.2";
8− sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh";
7+ version = "0.1.0.0";
8+ sha256 = "09p0k2sgxr7jlsbrn66fzvzf9zxvpjp85y79xk10hxjglypszyml";
99
1010 description = "A secure utmpx and wtmp implementation";
1111
pkgs/development/mobile/abootimg/default.nix+2−2
@@ -28,10 +28,10 @@ stdenv.mkDerivation {
2828 install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1;
2929
3030 install -D -m 755 abootimg-pack-initrd $out/bin
31− wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]}
31+ wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${lib.makeBinPath [ coreutils cpio findutils gzip ]}
3232
3333 install -D -m 755 abootimg-unpack-initrd $out/bin
34− wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]}
34+ wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${lib.makeBinPath [ cpio gzip ]}
3535 '';
3636
3737 meta = with lib; {
pkgs/development/mobile/adb-sync/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
1919 dontBuild = true;
2020
2121 installPhase = let
22− dependencies = stdenv.lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
22+ dependencies = lib.makeBinPath [ platform-tools socat go-mtpfs adbfs-rootless ];
2323 in ''
2424 runHook preInstall
2525
pkgs/development/mobile/flashtool/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
1+{ stdenv, lib, requireFile, p7zip, jre, libusb1, platform-tools, gtk2, glib, libXtst }:
22
33# TODO:
44#
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 sed -i \
4343 -e 's|$(uname -m)|i686|' \
4444 -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
45− -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
45+ -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
4646 FlashTool FlashToolConsole
4747 '';
4848
@@ -51,12 +51,12 @@ stdenv.mkDerivation rec {
5151 mv * $out/
5252 '';
5353
54− meta = {
54+ meta = with lib; {
5555 homepage = "http://www.flashtool.net/";
5656 description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
57− license = stdenv.lib.licenses.unfreeRedistributableFirmware;
57+ license = licenses.unfreeRedistributableFirmware;
5858 platforms = [ "i686-linux" ];
59− hydraPlatforms = stdenv.lib.platforms.none;
59+ hydraPlatforms = platforms.none;
6060 broken = true;
6161 };
6262}
pkgs/development/mobile/genymotion/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
1+{ stdenv, lib, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon
22, xdg_utils
33# For glewinfo
44, libXmu, libXi, libXext }:
@@ -7,7 +7,7 @@ let
77 packages = [
88 stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext libGL
99 ];
10− libPath = stdenv.lib.makeLibraryPath packages;
10+ libPath = lib.makeLibraryPath packages;
1111in
1212stdenv.mkDerivation rec {
1313 pname = "genymotion";
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
6666 rm $out/libexec/genymotion/libxkbcommon*
6767 '';
6868
69− meta = {
69+ meta = with lib; {
7070 description = "Fast and easy Android emulation";
7171 longDescription = ''
7272 Genymotion is a relatively fast Android emulator which comes with
@@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
7474 suitable for application testing.
7575 '';
7676 homepage = "https://www.genymotion.com/";
77− license = stdenv.lib.licenses.unfree;
77+ license = licenses.unfree;
7878 platforms = ["x86_64-linux"];
79− maintainers = [ stdenv.lib.maintainers.puffnfresh ];
79+ maintainers = [ maintainers.puffnfresh ];
8080 };
8181}
pkgs/development/mobile/titaniumenv/build-app.nix+7−7
@@ -1,4 +1,4 @@
1−{stdenv, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
1+{stdenv, lib, composeAndroidPackages, composeXcodeWrapper, titaniumsdk, titanium, alloy, jdk, python, nodejs, which, file}:
22{ name, src, preBuild ? "", target, tiVersion ? null
33, release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
44, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "12.1", iosBuildStore ? false
@@ -34,14 +34,14 @@ let
3434 extraArgs = removeAttrs args [ "name" "preRebuild" "androidsdkArgs" "xcodewrapperArgs" ];
3535in
3636stdenv.mkDerivation ({
37− name = stdenv.lib.replaceChars [" "] [""] name;
37+ name = lib.replaceChars [" "] [""] name;
3838
3939 buildInputs = [ nodejs titanium alloy python which file jdk ];
4040
4141 buildPhase = ''
4242 ${preBuild}
4343
44− ${stdenv.lib.optionalString stdenv.isDarwin ''
44+ ${lib.optionalString stdenv.isDarwin ''
4545 # Hack that provides a writable alloy package on macOS. Without it the build fails because of a file permission error.
4646 alloy=$(dirname $(type -p alloy))/..
4747 cp -rv $alloy/* alloy
@@ -51,7 +51,7 @@ stdenv.mkDerivation ({
5151
5252 export HOME=${if target == "iphone" then "/Users/$(whoami)" else "$TMPDIR"}
5353
54− ${stdenv.lib.optionalString (tiVersion != null) ''
54+ ${lib.optionalString (tiVersion != null) ''
5555 # Replace titanium version by the provided one
5656 sed -i -e "s|<sdk-version>[0-9a-zA-Z\.]*</sdk-version>|<sdk-version>${tiVersion}</sdk-version>|" tiapp.xml
5757 ''}
@@ -76,7 +76,7 @@ stdenv.mkDerivation ({
7676 export GRADLE_USER_HOME=$TMPDIR/gradle
7777
7878 ${if release then ''
79− ${stdenv.lib.optionalString stdenv.isDarwin ''
79+ ${lib.optionalString stdenv.isDarwin ''
8080 # Signing the app does not work with OpenJDK on macOS, use host SDK instead
8181 export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
8282 ''}
@@ -171,7 +171,7 @@ stdenv.mkDerivation ({
171171 mkdir -p $out/nix-support
172172 echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
173173
174− ${stdenv.lib.optionalString enableWirelessDistribution ''
174+ ${lib.optionalString enableWirelessDistribution ''
175175 appname="$(basename $out/*.ipa .ipa)"
176176 bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
177177 version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
@@ -184,5 +184,5 @@ stdenv.mkDerivation ({
184184 else throw "Target: ${target} is not supported!"}
185185 '';
186186
187− failureHook = stdenv.lib.optionalString (release && target == "iphone") deleteKeychain;
187+ failureHook = lib.optionalString (release && target == "iphone") deleteKeychain;
188188} // extraArgs)
pkgs/development/mobile/titaniumenv/default.nix+2−2
@@ -8,11 +8,11 @@ rec {
88 else throw "Titanium version not supported: "+tiVersion;
99 in
1010 import titaniumSdkFile {
11− inherit (pkgs) stdenv fetchurl unzip makeWrapper;
11+ inherit (pkgs) stdenv lib fetchurl unzip makeWrapper;
1212 };
1313
1414 buildApp = import ./build-app.nix {
15− inherit (pkgs) stdenv python which file jdk nodejs;
15+ inherit (pkgs) stdenv lib python which file jdk nodejs;
1616 inherit (pkgs.nodePackages) alloy titanium;
1717 inherit (androidenv) composeAndroidPackages;
1818 inherit (xcodeenv) composeXcodeWrapper;
pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, unzip, makeWrapper}:
1+{stdenv, lib, fetchurl, unzip, makeWrapper}:
22
33let
44 # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
8787 # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
8888 sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
8989
90− ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
90+ ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
9191 # Patch the strip frameworks script in the iPhone build template to not let
9292 # it skip the strip phase. This is caused by an assumption on the file
9393 # permissions in which Nix deviates from the standard.
pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix+2−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, unzip, makeWrapper}:
1+{stdenv, lib, fetchurl, unzip, makeWrapper}:
22
33let
44 # Gradle is a build system that bootstraps itself. This is what it actually
@@ -87,7 +87,7 @@ stdenv.mkDerivation {
8787 # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
8888 sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
8989
90− ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
90+ ${lib.optionalString (stdenv.system == "x86_64-darwin") ''
9191 # Patch the strip frameworks script in the iPhone build template to not let
9292 # it skip the strip phase. This is caused by an assumption on the file
9393 # permissions in which Nix deviates from the standard.
pkgs/development/mobile/xcodeenv/build-app.nix+10−10
@@ -1,4 +1,4 @@
1−{stdenv, composeXcodeWrapper}:
1+{stdenv, lib, composeXcodeWrapper}:
22{ name
33, src
44, sdkVersion ? "13.1"
@@ -53,13 +53,13 @@ let
5353 extraArgs = removeAttrs args ([ "name" "scheme" "xcodeFlags" "release" "certificateFile" "certificatePassword" "provisioningProfile" "signMethod" "generateIPA" "generateXCArchive" "enableWirelessDistribution" "installURL" "bundleId" "version" ] ++ builtins.attrNames xcodewrapperFormalArgs);
5454in
5555stdenv.mkDerivation ({
56− name = stdenv.lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
56+ name = lib.replaceChars [" "] [""] name; # iOS app names can contain spaces, but in the Nix store this is not allowed
5757 buildPhase = ''
5858 # Be sure that the Xcode wrapper has priority over everything else.
5959 # When using buildInputs this does not seem to be the case.
6060 export PATH=${xcodewrapper}/bin:$PATH
6161
62− ${stdenv.lib.optionalString release ''
62+ ${lib.optionalString release ''
6363 export HOME=/Users/$(whoami)
6464 keychainName="$(basename $out)"
6565
@@ -91,10 +91,10 @@ stdenv.mkDerivation ({
9191 # Do the building
9292 export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works
9393
94− xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
94+ xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateIPA || generateXCArchive then "-archivePath \"${name}.xcarchive\" archive" else ""} ${if release then '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"'' else ""} ${xcodeFlags}
9595
96− ${stdenv.lib.optionalString release ''
97− ${stdenv.lib.optionalString generateIPA ''
96+ ${lib.optionalString release ''
97+ ${lib.optionalString generateIPA ''
9898 # Create export plist file
9999 cat > "${name}.plist" <<EOF
100100 <?xml version="1.0" encoding="UTF-8"?>
@@ -112,7 +112,7 @@ stdenv.mkDerivation ({
112112 <string>manual</string>
113113 <key>method</key>
114114 <string>${signMethod}</string>
115− ${stdenv.lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
115+ ${lib.optionalString (signMethod == "enterprise" || signMethod == "ad-hoc") ''
116116 <key>compileBitcode</key>
117117 <false/>
118118 ''}
@@ -127,14 +127,14 @@ stdenv.mkDerivation ({
127127 mkdir -p $out/nix-support
128128 echo "file binary-dist \"$(echo $out/*.ipa)\"" > $out/nix-support/hydra-build-products
129129
130− ${stdenv.lib.optionalString enableWirelessDistribution ''
130+ ${lib.optionalString enableWirelessDistribution ''
131131 # Add another hacky build product that enables wireless adhoc installations
132132 appname="$(basename "$(echo $out/*.ipa)" .ipa)"
133133 sed -e "s|@INSTALL_URL@|${installURL}?bundleId=${bundleId}\&amp;version=${appVersion}\&amp;title=$appname|" ${./install.html.template} > $out/''${appname}.html
134134 echo "doc install \"$out/''${appname}.html\"" >> $out/nix-support/hydra-build-products
135135 ''}
136136 ''}
137− ${stdenv.lib.optionalString generateXCArchive ''
137+ ${lib.optionalString generateXCArchive ''
138138 mkdir -p $out
139139 mv "${name}.xcarchive" $out
140140 ''}
@@ -144,7 +144,7 @@ stdenv.mkDerivation ({
144144 ''}
145145 '';
146146
147− failureHook = stdenv.lib.optionalString release deleteKeychain;
147+ failureHook = lib.optionalString release deleteKeychain;
148148
149149 installPhase = "true";
150150} // extraArgs)
pkgs/development/mobile/xcodeenv/default.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv}:
1+{ stdenv, lib }:
22
33rec {
44 composeXcodeWrapper = import ./compose-xcodewrapper.nix {
@@ -6,10 +6,10 @@ rec {
66 };
77
88 buildApp = import ./build-app.nix {
9− inherit stdenv composeXcodeWrapper;
9+ inherit stdenv lib composeXcodeWrapper;
1010 };
1111
1212 simulateApp = import ./simulate-app.nix {
13− inherit stdenv composeXcodeWrapper;
13+ inherit stdenv lib composeXcodeWrapper;
1414 };
1515}
pkgs/development/mobile/xcodeenv/simulate-app.nix+3−3
@@ -1,4 +1,4 @@
1−{stdenv, composeXcodeWrapper}:
1+{stdenv, lib, composeXcodeWrapper}:
22{name, app ? null, bundleId ? null, ...}@args:
33
44assert app != null -> bundleId != null;
@@ -9,7 +9,7 @@ let
99 xcodewrapper = composeXcodeWrapper xcodewrapperArgs;
1010in
1111stdenv.mkDerivation {
12− name = stdenv.lib.replaceChars [" "] [""] name;
12+ name = lib.replaceChars [" "] [""] name;
1313 buildCommand = ''
1414 mkdir -p $out/bin
1515 cat > $out/bin/run-test-simulator << "EOF"
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
3030 # Open the simulator instance
3131 open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
3232
33− ${stdenv.lib.optionalString (app != null) ''
33+ ${lib.optionalString (app != null) ''
3434 # Copy the app and restore the write permissions
3535 appTmpDir=$(mktemp -d -t appTmpDir)
3636 cp -r "$(echo ${app}/*.app)" "$appTmpDir"
pkgs/development/python-modules/aioeafm/default.nixnew file+44
@@ -0,0 +1,44 @@
1+{ lib
2+, aiohttp
3+, async-timeout
4+, buildPythonPackage
5+, fetchFromGitHub
6+, poetry
7+, pytest-aiohttp
8+, pytest-asyncio
9+, pytest-cov
10+, pytestCheckHook
11+}:
12+
13+buildPythonPackage rec {
14+ pname = "aioeafm";
15+ version = "1.0.0";
16+ format = "pyproject";
17+
18+ src = fetchFromGitHub {
19+ owner = "Jc2k";
20+ repo = pname;
21+ rev = version;
22+ sha256 = "048cxn3fw2hynp27zlizq7k8ps67qq9sib1ddgirnxy5zc87vgkc";
23+ };
24+
25+ nativeBuildInputs = [ poetry ];
26+
27+ propagatedBuildInputs = [ aiohttp ];
28+
29+ checkInputs = [
30+ pytest-aiohttp
31+ pytest-asyncio
32+ pytest-cov
33+ pytestCheckHook
34+ ];
35+
36+ pythonImportsCheck = [ "aioeafm" ];
37+
38+ meta = with lib; {
39+ description = "Python client for access the Real Time flood monitoring API";
40+ homepage = "https://github.com/Jc2k/aioeafm";
41+ license = with licenses; [ asl20 ];
42+ maintainers = with maintainers; [ fab ];
43+ };
44+}
pkgs/development/python-modules/amcrest/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ lib
2+, argcomplete
3+, buildPythonPackage
4+, fetchFromGitHub
5+, mock
6+, pytestCheckHook
7+, requests
8+, responses
9+, urllib3
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "amcrest";
14+ version = "1.7.2";
15+
16+ src = fetchFromGitHub {
17+ owner = "tchellomello";
18+ repo = "python-amcrest";
19+ rev = version;
20+ sha256 = "06gbrshf6vqvq3k813d1w37k2kmps0g6msa4lp2f9xvzw3iczshy";
21+ };
22+
23+ propagatedBuildInputs = [
24+ argcomplete
25+ requests
26+ urllib3
27+ ];
28+
29+ checkInputs = [
30+ mock
31+ pytestCheckHook
32+ responses
33+ ];
34+
35+ pythonImportsCheck = [ "amcrest" ];
36+
37+ meta = with lib; {
38+ description = "Python module for Amcrest and Dahua Cameras";
39+ homepage = "https://github.com/tchellomello/python-amcrest";
40+ license = with licenses; [ gpl2Only ];
41+ maintainers = with maintainers; [ fab ];
42+ };
43+}
pkgs/development/tools/kind/default.nix+3−3
@@ -4,16 +4,16 @@ with lib;
44
55buildGoModule rec {
66 pname = "kind";
7− version = "0.9.0";
7+ version = "0.10.0";
88
99 src = fetchFromGitHub {
1010 rev = "v${version}";
1111 owner = "kubernetes-sigs";
1212 repo = "kind";
13− sha256 = "1kyjmlp1kmr3lwylnya6w392j1qpqgbvcacwpnz3ifyh3pbv32qr";
13+ sha256 = "1pp2x4bfqsd15siahyv9xkdyswsipmp9n86iwavrd0xhliqxlsa7";
1414 };
1515
16− vendorSha256 = "04fmqh6lhvvzpvf1l2xk1r8687k5jx2lb5199rgmjbfnjgsa0q2d";
16+ vendorSha256 = "0c0j4s8kfzk2b3hy0d2g5bp1zr60l6vnwnpynsg6ksv8spwnpl5m";
1717
1818 doCheck = false;
1919
pkgs/development/tools/ocaml/dune/2.nix+3−3
@@ -6,11 +6,11 @@ else
66
77stdenv.mkDerivation rec {
88 pname = "dune";
9− version = "2.8.0";
9+ version = "2.8.2";
1010
1111 src = fetchurl {
1212 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
13− sha256 = "12yly2lp93ijhy7b72p6y2q3cr3yy3hk7rlmrh072py8a6d4s407";
13+ sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72";
1414 };
1515
1616 buildInputs = [ ocaml findlib ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 meta = {
2525 homepage = "https://dune.build/";
2626 description = "A composable build system";
27− changelog = "https://github.com/ocaml/dune/releases/tag/${version}";
27+ changelog = "https://github.com/ocaml/dune/blob/${version}/CHANGES.md";
2828 maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ];
2929 license = lib.licenses.mit;
3030 inherit (ocaml.meta) platforms;
pkgs/games/crawl/crawl_purify.patch+3−17
@@ -1,20 +1,5 @@
1−diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
2−--- a/crawl-ref/source/Makefile
3−+++ b/crawl-ref/source/Makefile
4−@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin)
5− STRIP := strip -x
6− NEED_APPKIT = YesPlease
7− LIBNCURSES_IS_UNICODE = Yes
8−- NO_PKGCONFIG = Yes
9−- BUILD_SQLITE = YesPlease
10−- BUILD_ZLIB = YesPlease
11−+ #NO_PKGCONFIG = Yes
12−+ #BUILD_SQLITE = YesPlease
13−+ #BUILD_ZLIB = YesPlease
14− ifdef TILES
15− EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a
16− BUILD_FREETYPE = YesPlease
171diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
2+index f8b576fd63..b95c21c0a1 100755
183--- a/crawl-ref/source/util/find_font
194+++ b/crawl-ref/source/util/find_font
205@@ -1,6 +1,6 @@
@@ -25,7 +10,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
2510
2611 name=$1
2712 [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
28−@@ -11,6 +11,6 @@
13+@@ -11,6 +11,6 @@ name=$1
2914 for dir in $FONTDIRS; do
3015 [ -d "$dir" ] && echo "$dir"
3116 done
@@ -34,6 +19,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
3419 | head -n1
3520 } 2>/dev/null
3621diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
22+index e29ccff507..9bf01e040a 100644
3723--- a/crawl-ref/source/windowmanager-sdl.cc
3824+++ b/crawl-ref/source/windowmanager-sdl.cc
3925@@ -20,7 +20,7 @@
pkgs/games/crawl/default.nix+3−2
@@ -8,13 +8,13 @@
88
99stdenv.mkDerivation rec {
1010 name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
11− version = "0.25.1";
11+ version = "0.26.0";
1212
1313 src = fetchFromGitHub {
1414 owner = "crawl";
1515 repo = "crawl";
1616 rev = version;
17− sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b";
17+ sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi";
1818 };
1919
2020 # Patch hard-coded paths and remove force library builds
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
4545 fontsPath = lib.optionalString tileMode dejavu_fonts;
4646
4747 makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
48+ "FORCE_PKGCONFIG=y"
4849 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
4950 "DATADIR=${placeholder "out"}"
5051 ] ++ lib.optional tileMode "TILES=y"
pkgs/os-specific/linux/s6-linux-init/default.nixnew file+39
@@ -0,0 +1,39 @@
1+{ lib, stdenv, skawarePackages }:
2+
3+with skawarePackages;
4+
5+buildPackage {
6+ pname = "s6-linux-init";
7+ version = "1.0.6.0";
8+ sha256 = "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w";
9+
10+ description = "A set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
11+ platforms = lib.platforms.linux;
12+
13+ outputs = [ "bin" "dev" "doc" "out" ];
14+
15+ configureFlags = [
16+ "--bindir=\${bin}/bin"
17+ "--includedir=\${dev}/include"
18+ "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps"
19+ "--with-include=${skalibs.dev}/include"
20+ "--with-include=${execline.dev}/include"
21+ "--with-include=${s6.dev}/include"
22+ "--with-lib=${skalibs.lib}/lib"
23+ "--with-lib=${s6.out}/lib"
24+ "--with-lib=${execline.lib}/lib"
25+ "--with-dynlib=${skalibs.lib}/lib"
26+ "--with-dynlib=${execline.lib}/lib"
27+ "--with-dynlib=${s6.out}/lib"
28+ ];
29+
30+ postInstall = ''
31+ # remove all s6 executables from build directory
32+ rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
33+ rm libs6_linux_init.* libhpr.*
34+ rm -rf skel
35+
36+ mv doc $doc/share/doc/s6-linux-init/html
37+ '';
38+
39+}
pkgs/os-specific/linux/s6-linux-utils/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "s6-linux-utils";
7− version = "2.5.1.3";
8− sha256 = "0wbv02zxaami88xbj2zg63kspz05bbplswg0c6ncb5g9khf52wa4";
7+ version = "2.5.1.4";
8+ sha256 = "02gxzc9igid2kf2rvm3v6kc9806mpjmdq7cpanv4cml0ip68vbfq";
99
1010 description = "A set of minimalistic Linux-specific system utilities";
1111 platforms = lib.platforms.linux;
pkgs/os-specific/linux/sdnotify-wrapper/sdnotify-wrapper.c+13−9
@@ -1,5 +1,5 @@
11/*
2− Copyright: (C)2015-2017 Laurent Bercot. http://skarnet.org/
2+ Copyright: (C)2015-2020 Laurent Bercot. http://skarnet.org/
33 ISC license. See http://opensource.org/licenses/ISC
44
55 Build-time requirements: skalibs. http://skarnet.org/software/skalibs/
@@ -53,20 +53,24 @@
5353#include <sys/types.h>
5454#include <string.h>
5555#include <unistd.h>
56+#include <stdlib.h>
5657#include <errno.h>
5758#include <sys/socket.h>
5859#include <sys/un.h>
60+
5961#include <skalibs/uint64.h>
6062#include <skalibs/types.h>
6163#include <skalibs/bytestr.h>
6264#include <skalibs/sgetopt.h>
6365#include <skalibs/strerr2.h>
64−#include <skalibs/env.h>
6566#include <skalibs/allreadwrite.h>
6667#include <skalibs/tai.h>
6768#include <skalibs/iopause.h>
6869#include <skalibs/djbunix.h>
69−#include <skalibs/webipc.h>
70+//#include <skalibs/webipc.h>
71+// svanderburg: This header no longer exists, but socket.h provides the functions this module needs
72+#include <skalibs/socket.h>
73+#include <skalibs/exec.h>
7074
7175#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
7276#define dieusage() strerr_dieusage(100, USAGE)
@@ -123,9 +127,9 @@ static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const
123127 return 0 ;
124128}
125129
126−int main (int argc, char const *const *argv, char const *const *envp)
130+int main (int argc, char const *const *argv)
127131{
128− char const *s = env_get2(envp, VAR) ;
132+ char const *s = getenv(VAR) ;
129133 unsigned int fd = 1 ;
130134 unsigned int timeout = 0 ;
131135 int df = 1, keep = 0 ;
@@ -134,7 +138,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
134138 subgetopt_t l = SUBGETOPT_ZERO ;
135139 for (;;)
136140 {
137− register int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
141+ int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
138142 if (opt == -1) break ;
139143 switch (opt)
140144 {
@@ -149,7 +153,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
149153 }
150154 if (!argc) dieusage() ;
151155
152− if (!s) xpathexec_run(argv[0], argv, envp) ;
156+ if (!s) xexec(argv) ;
153157 else
154158 {
155159 pid_t parent = getpid() ;
@@ -166,7 +170,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
166170 }
167171 close(p[0]) ;
168172 if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
169− if (keep) xpathexec_run(argv[0], argv, envp) ;
170− else xpathexec_r(argv, envp, env_len(envp), VAR, sizeof(VAR)) ;
173+ if (keep) xexec(argv) ;
174+ else xmexec_m(argv, VAR, sizeof(VAR)) ;
171175 }
172176}
pkgs/servers/home-assistant/component-packages.nix+2−2
@@ -27,7 +27,7 @@
2727 "amazon_polly" = ps: with ps; [ boto3 ];
2828 "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ];
2929 "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient
30− "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest
30+ "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ];
3131 "ampio" = ps: with ps; [ ]; # missing inputs: asmog
3232 "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
3333 "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ];
@@ -194,7 +194,7 @@
194194 "dweet" = ps: with ps; [ ]; # missing inputs: dweepy
195195 "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
196196 "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool
197− "eafm" = ps: with ps; [ ]; # missing inputs: aioeafm
197+ "eafm" = ps: with ps; [ aioeafm ];
198198 "ebox" = ps: with ps; [ ]; # missing inputs: pyebox
199199 "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
200200 "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface
pkgs/servers/http/lighttpd/default.nix+2−2
@@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null;
1515assert enableExtendedAttrs -> attr != null;
1616
1717stdenv.mkDerivation rec {
18− name = "lighttpd-1.4.56";
18+ name = "lighttpd-1.4.58";
1919
2020 src = fetchurl {
2121 url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
22− sha256 = "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4";
22+ sha256 = "sha256-Jn/v/aE6GQ69znsVFy2L4W2pgAhFfzD93s1ygy0SbQ4=";
2323 };
2424
2525 postPatch = ''
pkgs/servers/monitoring/alertmanager-bot/default.nix+13−7
@@ -1,19 +1,25 @@
1−{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
1+{ lib, stdenv, buildGoModule, fetchFromGitHub }:
22
3−buildGoPackage rec {
3+buildGoModule rec {
44 pname = "alertmanager-bot";
5− version = "0.4.0";
6−
7− goPackagePath = "github.com/metalmatze/alertmanager-bot";
5+ version = "0.4.3";
86
97 src = fetchFromGitHub {
108 owner = "metalmatze";
119 repo = pname;
1210 rev = version;
13− sha256 = "10v0fxxcs5s6zmqindr30plyw7p2yg0a64rdw1b2cj2mc1m3byx3";
11+ sha256 = "1hjfkksqb675gabzjc221b33h2m4s6qsanmkm382d3fyzqj71dh9";
1412 };
1513
16− goDeps = ./deps.nix;
14+ vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj";
15+
16+ postPatch = ''
17+ sed "s;/templates/default.tmpl;$out/share&;" -i cmd/alertmanager-bot/main.go
18+ '';
19+
20+ postInstall = ''
21+ install -Dm644 -t $out/share/templates $src/default.tmpl
22+ '';
1723
1824 meta = with lib; {
1925 description = "Bot for Prometheus' Alertmanager";
pkgs/servers/monitoring/alertmanager-bot/deps.nixdeleted−948
@@ -1,948 +0,0 @@
1−# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
2−[
3− {
4− goPackagePath = "github.com/DataDog/datadog-go";
5− fetch = {
6− type = "git";
7− url = "https://github.com/DataDog/datadog-go";
8− rev = "0ddda6bee211";
9− sha256 = "07ap1qhz8vwdypmlny5gxnc191c0qbm6acacs30m1d4p22x6wxip";
10− };
11− }
12− {
13− goPackagePath = "github.com/OneOfOne/xxhash";
14− fetch = {
15− type = "git";
16− url = "https://github.com/OneOfOne/xxhash";
17− rev = "v1.2.5";
18− sha256 = "15ai4nzm8cv8nqs4xm5h6ghnms19c2sp8z0zpkc46rld6y7k0xky";
19− };
20− }
21− {
22− goPackagePath = "github.com/alecthomas/template";
23− fetch = {
24− type = "git";
25− url = "https://github.com/alecthomas/template";
26− rev = "a0175ee3bccc";
27− sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
28− };
29− }
30− {
31− goPackagePath = "github.com/alecthomas/units";
32− fetch = {
33− type = "git";
34− url = "https://github.com/alecthomas/units";
35− rev = "2efee857e7cf";
36− sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
37− };
38− }
39− {
40− goPackagePath = "github.com/armon/circbuf";
41− fetch = {
42− type = "git";
43− url = "https://github.com/armon/circbuf";
44− rev = "bbbad097214e";
45− sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3";
46− };
47− }
48− {
49− goPackagePath = "github.com/armon/go-metrics";
50− fetch = {
51− type = "git";
52− url = "https://github.com/armon/go-metrics";
53− rev = "f0300d1749da";
54− sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv";
55− };
56− }
57− {
58− goPackagePath = "github.com/armon/go-radix";
59− fetch = {
60− type = "git";
61− url = "https://github.com/armon/go-radix";
62− rev = "7fddfc383310";
63− sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
64− };
65− }
66− {
67− goPackagePath = "github.com/beorn7/perks";
68− fetch = {
69− type = "git";
70− url = "https://github.com/beorn7/perks";
71− rev = "v1.0.1";
72− sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
73− };
74− }
75− {
76− goPackagePath = "github.com/bgentry/speakeasy";
77− fetch = {
78− type = "git";
79− url = "https://github.com/bgentry/speakeasy";
80− rev = "v0.1.0";
81− sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
82− };
83− }
84− {
85− goPackagePath = "github.com/boltdb/bolt";
86− fetch = {
87− type = "git";
88− url = "https://github.com/boltdb/bolt";
89− rev = "v1.3.1";
90− sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
91− };
92− }
93− {
94− goPackagePath = "github.com/cenkalti/backoff";
95− fetch = {
96− type = "git";
97− url = "https://github.com/cenkalti/backoff";
98− rev = "v2.1.1";
99− sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
100− };
101− }
102− {
103− goPackagePath = "github.com/cespare/xxhash";
104− fetch = {
105− type = "git";
106− url = "https://github.com/cespare/xxhash";
107− rev = "v1.0.0";
108− sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1";
109− };
110− }
111− {
112− goPackagePath = "github.com/circonus-labs/circonus-gometrics";
113− fetch = {
114− type = "git";
115− url = "https://github.com/circonus-labs/circonus-gometrics";
116− rev = "v2.0.0";
117− sha256 = "0d6cnswq28mjak7092vf89f9l0ga2ziwyamq9kdgfc7aavpwr6l9";
118− };
119− }
120− {
121− goPackagePath = "github.com/circonus-labs/circonusllhist";
122− fetch = {
123− type = "git";
124− url = "https://github.com/circonus-labs/circonusllhist";
125− rev = "6e85b9352cf0";
126− sha256 = "182gry1clk12m34574qif7bx74qpxib2zv0mr5kv2j9hfq7f9m01";
127− };
128− }
129− {
130− goPackagePath = "github.com/creack/pty";
131− fetch = {
132− type = "git";
133− url = "https://github.com/creack/pty";
134− rev = "v1.1.7";
135− sha256 = "1plwwlk1i9b80zv8zdplvv81shfyc9gf0flydnydsh5sr3ib5vrc";
136− };
137− }
138− {
139− goPackagePath = "github.com/davecgh/go-spew";
140− fetch = {
141− type = "git";
142− url = "https://github.com/davecgh/go-spew";
143− rev = "v1.1.1";
144− sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
145− };
146− }
147− {
148− goPackagePath = "github.com/docker/libkv";
149− fetch = {
150− type = "git";
151− url = "https://github.com/docker/libkv";
152− rev = "v0.2.1";
153− sha256 = "0blq7kxjy1bvm3j5q4i6csnc4i88c1wvj4gjvxbqfk3sny73gjkr";
154− };
155− }
156− {
157− goPackagePath = "github.com/fatih/color";
158− fetch = {
159− type = "git";
160− url = "https://github.com/fatih/color";
161− rev = "v1.7.0";
162− sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
163− };
164− }
165− {
166− goPackagePath = "github.com/fsnotify/fsnotify";
167− fetch = {
168− type = "git";
169− url = "https://github.com/fsnotify/fsnotify";
170− rev = "v1.4.7";
171− sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
172− };
173− }
174− {
175− goPackagePath = "github.com/go-kit/kit";
176− fetch = {
177− type = "git";
178− url = "https://github.com/go-kit/kit";
179− rev = "v0.8.0";
180− sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
181− };
182− }
183− {
184− goPackagePath = "github.com/go-logfmt/logfmt";
185− fetch = {
186− type = "git";
187− url = "https://github.com/go-logfmt/logfmt";
188− rev = "v0.3.0";
189− sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
190− };
191− }
192− {
193− goPackagePath = "github.com/go-stack/stack";
194− fetch = {
195− type = "git";
196− url = "https://github.com/go-stack/stack";
197− rev = "v1.8.0";
198− sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
199− };
200− }
201− {
202− goPackagePath = "github.com/gogo/protobuf";
203− fetch = {
204− type = "git";
205− url = "https://github.com/gogo/protobuf";
206− rev = "v1.1.1";
207− sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
208− };
209− }
210− {
211− goPackagePath = "github.com/golang/protobuf";
212− fetch = {
213− type = "git";
214− url = "https://github.com/golang/protobuf";
215− rev = "v1.3.2";
216− sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
217− };
218− }
219− {
220− goPackagePath = "github.com/google/btree";
221− fetch = {
222− type = "git";
223− url = "https://github.com/google/btree";
224− rev = "4030bb1f1f0c";
225− sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
226− };
227− }
228− {
229− goPackagePath = "github.com/google/go-cmp";
230− fetch = {
231− type = "git";
232− url = "https://github.com/google/go-cmp";
233− rev = "v0.3.1";
234− sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1";
235− };
236− }
237− {
238− goPackagePath = "github.com/google/gofuzz";
239− fetch = {
240− type = "git";
241− url = "https://github.com/google/gofuzz";
242− rev = "v1.0.0";
243− sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36";
244− };
245− }
246− {
247− goPackagePath = "github.com/hako/durafmt";
248− fetch = {
249− type = "git";
250− url = "https://github.com/hako/durafmt";
251− rev = "ea3ab126a649";
252− sha256 = "1niq0v6av5vsn4rizfda4zq922jvavig5b0qg9g0gyz6cj62rjzs";
253− };
254− }
255− {
256− goPackagePath = "github.com/hashicorp/consul";
257− fetch = {
258− type = "git";
259− url = "https://github.com/hashicorp/consul";
260− rev = "v1.4.5";
261− sha256 = "0gpg3cbpsmzcaab3scqhpzz57892s95hwq5z0l9bq7qqm6iqfr9d";
262− };
263− }
264− {
265− goPackagePath = "github.com/hashicorp/errwrap";
266− fetch = {
267− type = "git";
268− url = "https://github.com/hashicorp/errwrap";
269− rev = "v1.0.0";
270− sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
271− };
272− }
273− {
274− goPackagePath = "github.com/hashicorp/go-cleanhttp";
275− fetch = {
276− type = "git";
277− url = "https://github.com/hashicorp/go-cleanhttp";
278− rev = "3573b8b52aa7";
279− sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr";
280− };
281− }
282− {
283− goPackagePath = "github.com/hashicorp/go-immutable-radix";
284− fetch = {
285− type = "git";
286− url = "https://github.com/hashicorp/go-immutable-radix";
287− rev = "v1.0.0";
288− sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
289− };
290− }
291− {
292− goPackagePath = "github.com/hashicorp/go-msgpack";
293− fetch = {
294− type = "git";
295− url = "https://github.com/hashicorp/go-msgpack";
296− rev = "v0.5.5";
297− sha256 = "0fqmfx3dxnvb0d23cpn2xpd067pibwlchdc58ln8w6lznzrbzaan";
298− };
299− }
300− {
301− goPackagePath = "github.com/hashicorp/go-multierror";
302− fetch = {
303− type = "git";
304− url = "https://github.com/hashicorp/go-multierror";
305− rev = "v1.0.0";
306− sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
307− };
308− }
309− {
310− goPackagePath = "github.com/hashicorp/go-retryablehttp";
311− fetch = {
312− type = "git";
313− url = "https://github.com/hashicorp/go-retryablehttp";
314− rev = "794af36148bf";
315− sha256 = "1686d4qav0ayj3f5881w3kd9pz4fxsmknfqwccbj9yklxm3khvp4";
316− };
317− }
318− {
319− goPackagePath = "github.com/hashicorp/go-rootcerts";
320− fetch = {
321− type = "git";
322− url = "https://github.com/hashicorp/go-rootcerts";
323− rev = "v1.0.1";
324− sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y";
325− };
326− }
327− {
328− goPackagePath = "github.com/hashicorp/go-sockaddr";
329− fetch = {
330− type = "git";
331− url = "https://github.com/hashicorp/go-sockaddr";
332− rev = "v1.0.2";
333− sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is";
334− };
335− }
336− {
337− goPackagePath = "github.com/hashicorp/go-syslog";
338− fetch = {
339− type = "git";
340− url = "https://github.com/hashicorp/go-syslog";
341− rev = "v1.0.0";
342− sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1";
343− };
344− }
345− {
346− goPackagePath = "github.com/hashicorp/go-uuid";
347− fetch = {
348− type = "git";
349− url = "https://github.com/hashicorp/go-uuid";
350− rev = "v1.0.1";
351− sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
352− };
353− }
354− {
355− goPackagePath = "github.com/hashicorp/golang-lru";
356− fetch = {
357− type = "git";
358− url = "https://github.com/hashicorp/golang-lru";
359− rev = "v0.5.3";
360− sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
361− };
362− }
363− {
364− goPackagePath = "github.com/hashicorp/logutils";
365− fetch = {
366− type = "git";
367− url = "https://github.com/hashicorp/logutils";
368− rev = "v1.0.0";
369− sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv";
370− };
371− }
372− {
373− goPackagePath = "github.com/hashicorp/mdns";
374− fetch = {
375− type = "git";
376− url = "https://github.com/hashicorp/mdns";
377− rev = "v1.0.1";
378− sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j";
379− };
380− }
381− {
382− goPackagePath = "github.com/hashicorp/memberlist";
383− fetch = {
384− type = "git";
385− url = "https://github.com/hashicorp/memberlist";
386− rev = "v0.1.4";
387− sha256 = "0l9qx8j7mm00ia6m41zbn39z7p77jjf95zph2nw8j2vihm56q9ql";
388− };
389− }
390− {
391− goPackagePath = "github.com/hashicorp/serf";
392− fetch = {
393− type = "git";
394− url = "https://github.com/hashicorp/serf";
395− rev = "v0.8.3";
396− sha256 = "0isaq2m08rpwvlzd72gvy3caapkrzgr9cwizl99ainsjgj2nkds9";
397− };
398− }
399− {
400− goPackagePath = "github.com/hashicorp/uuid";
401− fetch = {
402− type = "git";
403− url = "https://github.com/hashicorp/uuid";
404− rev = "ebb0a03e909c";
405− sha256 = "0bzqr8y81h96cw299lhc5nxi9203a7xpd7csjsm6rh4k1bx4hdlf";
406− };
407− }
408− {
409− goPackagePath = "github.com/hashicorp/yamux";
410− fetch = {
411− type = "git";
412− url = "https://github.com/hashicorp/yamux";
413− rev = "f5742cb6b856";
414− sha256 = "1k9b399ljsp443s1v69c1m5jqdiw1998ryz4b4lh86nkz775ws5s";
415− };
416− }
417− {
418− goPackagePath = "github.com/hpcloud/tail";
419− fetch = {
420− type = "git";
421− url = "https://github.com/hpcloud/tail";
422− rev = "v1.0.0";
423− sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
424− };
425− }
426− {
427− goPackagePath = "github.com/joho/godotenv";
428− fetch = {
429− type = "git";
430− url = "https://github.com/joho/godotenv";
431− rev = "v1.3.0";
432− sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm";
433− };
434− }
435− {
436− goPackagePath = "github.com/json-iterator/go";
437− fetch = {
438− type = "git";
439− url = "https://github.com/json-iterator/go";
440− rev = "v1.1.7";
441− sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz";
442− };
443− }
444− {
445− goPackagePath = "github.com/julienschmidt/httprouter";
446− fetch = {
447− type = "git";
448− url = "https://github.com/julienschmidt/httprouter";
449− rev = "v1.2.0";
450− sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
451− };
452− }
453− {
454− goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
455− fetch = {
456− type = "git";
457− url = "https://github.com/konsorten/go-windows-terminal-sequences";
458− rev = "v1.0.2";
459− sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
460− };
461− }
462− {
463− goPackagePath = "github.com/kr/logfmt";
464− fetch = {
465− type = "git";
466− url = "https://github.com/kr/logfmt";
467− rev = "b84e30acd515";
468− sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
469− };
470− }
471− {
472− goPackagePath = "github.com/kr/pretty";
473− fetch = {
474− type = "git";
475− url = "https://github.com/kr/pretty";
476− rev = "v0.1.0";
477− sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
478− };
479− }
480− {
481− goPackagePath = "github.com/kr/pty";
482− fetch = {
483− type = "git";
484− url = "https://github.com/kr/pty";
485− rev = "v1.1.8";
486− sha256 = "1vcl6f90n0f8s8b4fyh0832ilybjqcypqyj233lqj1hx62fvgdbk";
487− };
488− }
489− {
490− goPackagePath = "github.com/kr/text";
491− fetch = {
492− type = "git";
493− url = "https://github.com/kr/text";
494− rev = "v0.1.0";
495− sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
496− };
497− }
498− {
499− goPackagePath = "github.com/kylelemons/godebug";
500− fetch = {
501− type = "git";
502− url = "https://github.com/kylelemons/godebug";
503− rev = "v1.1.0";
504− sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c";
505− };
506− }
507− {
508− goPackagePath = "github.com/mattn/go-colorable";
509− fetch = {
510− type = "git";
511− url = "https://github.com/mattn/go-colorable";
512− rev = "v0.0.9";
513− sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
514− };
515− }
516− {
517− goPackagePath = "github.com/mattn/go-isatty";
518− fetch = {
519− type = "git";
520− url = "https://github.com/mattn/go-isatty";
521− rev = "v0.0.9";
522− sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
523− };
524− }
525− {
526− goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
527− fetch = {
528− type = "git";
529− url = "https://github.com/matttproud/golang_protobuf_extensions";
530− rev = "v1.0.1";
531− sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
532− };
533− }
534− {
535− goPackagePath = "github.com/miekg/dns";
536− fetch = {
537− type = "git";
538− url = "https://github.com/miekg/dns";
539− rev = "v1.0.15";
540− sha256 = "051f51fyrsnj69j9ni9j72acqnrvvzqda4l831ijffy5h5jdl8f2";
541− };
542− }
543− {
544− goPackagePath = "github.com/mitchellh/cli";
545− fetch = {
546− type = "git";
547− url = "https://github.com/mitchellh/cli";
548− rev = "v1.0.0";
549− sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
550− };
551− }
552− {
553− goPackagePath = "github.com/mitchellh/go-homedir";
554− fetch = {
555− type = "git";
556− url = "https://github.com/mitchellh/go-homedir";
557− rev = "v1.1.0";
558− sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
559− };
560− }
561− {
562− goPackagePath = "github.com/mitchellh/go-testing-interface";
563− fetch = {
564− type = "git";
565− url = "https://github.com/mitchellh/go-testing-interface";
566− rev = "v1.0.0";
567− sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
568− };
569− }
570− {
571− goPackagePath = "github.com/mitchellh/go-wordwrap";
572− fetch = {
573− type = "git";
574− url = "https://github.com/mitchellh/go-wordwrap";
575− rev = "v1.0.0";
576− sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
577− };
578− }
579− {
580− goPackagePath = "github.com/mitchellh/hashstructure";
581− fetch = {
582− type = "git";
583− url = "https://github.com/mitchellh/hashstructure";
584− rev = "2bca23e0e452";
585− sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1";
586− };
587− }
588− {
589− goPackagePath = "github.com/mitchellh/mapstructure";
590− fetch = {
591− type = "git";
592− url = "https://github.com/mitchellh/mapstructure";
593− rev = "d0303fe80992";
594− sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
595− };
596− }
597− {
598− goPackagePath = "github.com/modern-go/concurrent";
599− fetch = {
600− type = "git";
601− url = "https://github.com/modern-go/concurrent";
602− rev = "bacd9c7ef1dd";
603− sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
604− };
605− }
606− {
607− goPackagePath = "github.com/modern-go/reflect2";
608− fetch = {
609− type = "git";
610− url = "https://github.com/modern-go/reflect2";
611− rev = "v1.0.1";
612− sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
613− };
614− }
615− {
616− goPackagePath = "github.com/mwitkow/go-conntrack";
617− fetch = {
618− type = "git";
619− url = "https://github.com/mwitkow/go-conntrack";
620− rev = "cc309e4a2223";
621− sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
622− };
623− }
624− {
625− goPackagePath = "github.com/oklog/run";
626− fetch = {
627− type = "git";
628− url = "https://github.com/oklog/run";
629− rev = "v1.0.0";
630− sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw";
631− };
632− }
633− {
634− goPackagePath = "github.com/onsi/ginkgo";
635− fetch = {
636− type = "git";
637− url = "https://github.com/onsi/ginkgo";
638− rev = "v1.6.0";
639− sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25";
640− };
641− }
642− {
643− goPackagePath = "github.com/onsi/gomega";
644− fetch = {
645− type = "git";
646− url = "https://github.com/onsi/gomega";
647− rev = "v1.4.3";
648− sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
649− };
650− }
651− {
652− goPackagePath = "github.com/pascaldekloe/goe";
653− fetch = {
654− type = "git";
655− url = "https://github.com/pascaldekloe/goe";
656− rev = "v0.1.0";
657− sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq";
658− };
659− }
660− {
661− goPackagePath = "github.com/pkg/errors";
662− fetch = {
663− type = "git";
664− url = "https://github.com/pkg/errors";
665− rev = "v0.8.1";
666− sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
667− };
668− }
669− {
670− goPackagePath = "github.com/pmezard/go-difflib";
671− fetch = {
672− type = "git";
673− url = "https://github.com/pmezard/go-difflib";
674− rev = "v1.0.0";
675− sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
676− };
677− }
678− {
679− goPackagePath = "github.com/posener/complete";
680− fetch = {
681− type = "git";
682− url = "https://github.com/posener/complete";
683− rev = "v1.1.2";
684− sha256 = "02xrnfkk9r2jarna8jqfkksrn469jdap716037zq84waq3d5xk3l";
685− };
686− }
687− {
688− goPackagePath = "github.com/prometheus/alertmanager";
689− fetch = {
690− type = "git";
691− url = "https://github.com/prometheus/alertmanager";
692− rev = "v0.9.1";
693− sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj";
694− };
695− }
696− {
697− goPackagePath = "github.com/prometheus/client_golang";
698− fetch = {
699− type = "git";
700− url = "https://github.com/prometheus/client_golang";
701− rev = "v0.9.4";
702− sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p";
703− };
704− }
705− {
706− goPackagePath = "github.com/prometheus/client_model";
707− fetch = {
708− type = "git";
709− url = "https://github.com/prometheus/client_model";
710− rev = "fd36f4220a90";
711− sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
712− };
713− }
714− {
715− goPackagePath = "github.com/prometheus/common";
716− fetch = {
717− type = "git";
718− url = "https://github.com/prometheus/common";
719− rev = "v0.4.1";
720− sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s";
721− };
722− }
723− {
724− goPackagePath = "github.com/prometheus/procfs";
725− fetch = {
726− type = "git";
727− url = "https://github.com/prometheus/procfs";
728− rev = "v0.0.3";
729− sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y";
730− };
731− }
732− {
733− goPackagePath = "github.com/ryanuber/columnize";
734− fetch = {
735− type = "git";
736− url = "https://github.com/ryanuber/columnize";
737− rev = "v2.1.0";
738− sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
739− };
740− }
741− {
742− goPackagePath = "github.com/satori/go.uuid";
743− fetch = {
744− type = "git";
745− url = "https://github.com/satori/go.uuid";
746− rev = "v1.1.0";
747− sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp";
748− };
749− }
750− {
751− goPackagePath = "github.com/sean-/seed";
752− fetch = {
753− type = "git";
754− url = "https://github.com/sean-/seed";
755− rev = "e2103e2c3529";
756− sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125";
757− };
758− }
759− {
760− goPackagePath = "github.com/sirupsen/logrus";
761− fetch = {
762− type = "git";
763− url = "https://github.com/sirupsen/logrus";
764− rev = "v1.2.0";
765− sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
766− };
767− }
768− {
769− goPackagePath = "github.com/spaolacci/murmur3";
770− fetch = {
771− type = "git";
772− url = "https://github.com/spaolacci/murmur3";
773− rev = "v1.1.0";
774− sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
775− };
776− }
777− {
778− goPackagePath = "github.com/stretchr/objx";
779− fetch = {
780− type = "git";
781− url = "https://github.com/stretchr/objx";
782− rev = "v0.1.1";
783− sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
784− };
785− }
786− {
787− goPackagePath = "github.com/stretchr/testify";
788− fetch = {
789− type = "git";
790− url = "https://github.com/stretchr/testify";
791− rev = "v1.3.0";
792− sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
793− };
794− }
795− {
796− goPackagePath = "github.com/tucnak/telebot";
797− fetch = {
798− type = "git";
799− url = "https://github.com/tucnak/telebot";
800− rev = "00cebf376d79";
801− sha256 = "0yay3h7gp6yag8jbapbq10vhmszad7svn68nnq5yp6pl1hmykzd6";
802− };
803− }
804− {
805− goPackagePath = "github.com/weaveworks/mesh";
806− fetch = {
807− type = "git";
808− url = "https://github.com/weaveworks/mesh";
809− rev = "f74318fb713b";
810− sha256 = "093j5i7wrkq1g92xaprd0rlfv9i74381wns4941bhbp6x6ahdcz7";
811− };
812− }
813− {
814− goPackagePath = "golang.org/x/crypto";
815− fetch = {
816− type = "git";
817− url = "https://go.googlesource.com/crypto";
818− rev = "45a5f77698d3";
819− sha256 = "0636jjj89wkzqchajwwzgcn4aafc334p70nawh9jzavg2mkx0ch4";
820− };
821− }
822− {
823− goPackagePath = "golang.org/x/net";
824− fetch = {
825− type = "git";
826− url = "https://go.googlesource.com/net";
827− rev = "891ebc4b82d6";
828− sha256 = "1rgw5gl2lc6bkmsx0fak84s6zdc1bhzfxgqg4mg4yh5hlnhpwrki";
829− };
830− }
831− {
832− goPackagePath = "golang.org/x/sync";
833− fetch = {
834− type = "git";
835− url = "https://go.googlesource.com/sync";
836− rev = "37e7f081c4d4";
837− sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
838− };
839− }
840− {
841− goPackagePath = "golang.org/x/sys";
842− fetch = {
843− type = "git";
844− url = "https://go.googlesource.com/sys";
845− rev = "fde4db37ae7a";
846− sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
847− };
848− }
849− {
850− goPackagePath = "golang.org/x/text";
851− fetch = {
852− type = "git";
853− url = "https://go.googlesource.com/text";
854− rev = "v0.3.2";
855− sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
856− };
857− }
858− {
859− goPackagePath = "golang.org/x/tools";
860− fetch = {
861− type = "git";
862− url = "https://go.googlesource.com/tools";
863− rev = "90fa682c2a6e";
864− sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
865− };
866− }
867− {
868− goPackagePath = "google.golang.org/appengine";
869− fetch = {
870− type = "git";
871− url = "https://github.com/golang/appengine";
872− rev = "v1.1.0";
873− sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
874− };
875− }
876− {
877− goPackagePath = "gopkg.in/airbrake/gobrake.v2";
878− fetch = {
879− type = "git";
880− url = "https://gopkg.in/airbrake/gobrake.v2";
881− rev = "v2.0.9";
882− sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw";
883− };
884− }
885− {
886− goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
887− fetch = {
888− type = "git";
889− url = "https://gopkg.in/alecthomas/kingpin.v2";
890− rev = "v2.2.6";
891− sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
892− };
893− }
894− {
895− goPackagePath = "gopkg.in/check.v1";
896− fetch = {
897− type = "git";
898− url = "https://gopkg.in/check.v1";
899− rev = "788fd7840127";
900− sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
901− };
902− }
903− {
904− goPackagePath = "gopkg.in/fsnotify.v1";
905− fetch = {
906− type = "git";
907− url = "https://gopkg.in/fsnotify.v1";
908− rev = "v1.4.7";
909− sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
910− };
911− }
912− {
913− goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2";
914− fetch = {
915− type = "git";
916− url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2";
917− rev = "v2.1.2";
918− sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5";
919− };
920− }
921− {
922− goPackagePath = "gopkg.in/tomb.v1";
923− fetch = {
924− type = "git";
925− url = "https://gopkg.in/tomb.v1";
926− rev = "dd632973f1e7";
927− sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
928− };
929− }
930− {
931− goPackagePath = "gopkg.in/vmihailenco/msgpack.v2";
932− fetch = {
933− type = "git";
934− url = "https://gopkg.in/vmihailenco/msgpack.v2";
935− rev = "v2.9.1";
936− sha256 = "0ah9j7i97ifyqhiscq8d43gcrhksb3bx83s2p1nyfi1bxw78jwfi";
937− };
938− }
939− {
940− goPackagePath = "gopkg.in/yaml.v2";
941− fetch = {
942− type = "git";
943− url = "https://gopkg.in/yaml.v2";
944− rev = "v2.2.2";
945− sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
946− };
947− }
948−]
pkgs/tools/backup/stenc/default.nix+16−3
@@ -1,14 +1,27 @@
1−{ lib, stdenv, fetchFromGitHub }:
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, genericUpdater
5+, common-updater-scripts
6+, autoreconfHook
7+}:
28
39stdenv.mkDerivation rec {
4− version = "1.0.7";
510 pname = "stenc";
11+ version = "1.0.8";
612
713 src = fetchFromGitHub {
814 owner = "scsitape";
915 repo = "stenc";
1016 rev = version;
11− sha256 = "1778m1zcyzyf42k5m496yqh0gv6kqhb0sq5983dhky1fccjl905k";
17+ sha256 = "0dsmvr1xpwkcd9yawv4c4vna67yag7jb8jcgn2amywz7nkpzmyxd";
18+ };
19+
20+ nativeBuildInputs = [ autoreconfHook ];
21+
22+ passthru.updateScript = genericUpdater {
23+ inherit pname version;
24+ versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}";
1225 };
1326
1427 meta = {
pkgs/tools/misc/execline/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "execline";
7− version = "2.6.1.1";
8− sha256 = "0mmsnai3bkyhng0cxdz6bf7d6b7kbsxs4p39m63215lz6kq0hhrr";
7+ version = "2.7.0.0";
8+ sha256 = "0kl74yix60msgw8k3shhp9ymm80n91yxxqckixj5qbbhmylpnpqd";
99
1010 description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
1111
pkgs/tools/misc/execline/execlineb-wrapper.c+3−2
@@ -12,6 +12,7 @@
1212#include <skalibs/djbunix.h>
1313#include <skalibs/strerr2.h>
1414#include <skalibs/env.h>
15+#include <skalibs/exec.h>
1516
1617#define dienomem() strerr_diefu1sys(111, "stralloc_catb")
1718
@@ -41,10 +42,10 @@ int main(int argc, char const* argv[], char const *const *envp)
4142 }
4243
4344 // exec into execlineb and append path_modif to the environment
44− xpathexec_r_name(
45+ xmexec_aem(
4546 EXECLINEB_PATH(),
4647 argv,
47− envp, env_len(envp),
48+ envp,
4849 path_modif.s, path_modif.len
4950 );
5051}
pkgs/tools/misc/fdtools/default.nix+1
@@ -13,6 +13,7 @@ in stdenv.mkDerivation {
1313 inherit sha256;
1414 };
1515
16+ patches = [ ./new-skalibs.patch ];
1617 outputs = [ "bin" "lib" "dev" "doc" "out" ];
1718
1819 buildInputs = [ skawarePackages.skalibs ];
pkgs/tools/misc/fdtools/new-skalibs.patchnew file+223
@@ -0,0 +1,223 @@
1+diff -Naur misc/fdtools-2020.05.04/src/check_exit_exec.c misc-new/fdtools-2020.05.04/src/check_exit_exec.c
2+--- misc/fdtools-2020.05.04/src/check_exit_exec.c 2015-03-16 04:55:56.000000000 +0100
3++++ misc-new/fdtools-2020.05.04/src/check_exit_exec.c 2021-01-22 10:50:25.529955213 +0100
4+@@ -2,6 +2,7 @@
5+ #include <unistd.h>
6+ #include <errno.h>
7+
8++#include <skalibs/exec.h>
9+ #include <skalibs/stddjb.h>
10+ #include "prjlibs-c/constants.h"
11+ #include "prjlibs-c/diewarn.h"
12+@@ -14,7 +15,7 @@
13+
14+ if (str_equal(arg, ":")) {
15+ ++argv;
16+- pathexec0((char const**)argv);
17++ mexec0((char const**)argv);
18+ DIE1(exec, argv[0]);
19+ }
20+ }
21+diff -Naur misc/fdtools-2020.05.04/src/grabconsole.c misc-new/fdtools-2020.05.04/src/grabconsole.c
22+--- misc/fdtools-2020.05.04/src/grabconsole.c 2020-04-24 06:01:22.000000000 +0200
23++++ misc-new/fdtools-2020.05.04/src/grabconsole.c 2021-01-22 10:43:27.887754936 +0100
24+@@ -4,6 +4,7 @@
25+ #include <errno.h>
26+
27+ #include <skalibs/stddjb.h>
28++#include <skalibs/exec.h>
29+ #include "prjlibs-c/constants.h"
30+ #include "prjlibs-c/diewarn.h"
31+ #include "prjlibs-c/types.h"
32+@@ -26,6 +27,6 @@
33+ if (fd_grabconsole(fd)!=0) DIE0(tioccons);
34+
35+ argv+=2;
36+- pathexec0((char const**)argv);
37++ mexec0((char const**)argv);
38+ DIE1(exec, argv[0]);
39+ }
40+diff -Naur misc/fdtools-2020.05.04/src/pipecycle.c misc-new/fdtools-2020.05.04/src/pipecycle.c
41+--- misc/fdtools-2020.05.04/src/pipecycle.c 2015-03-16 04:55:56.000000000 +0100
42++++ misc-new/fdtools-2020.05.04/src/pipecycle.c 2021-01-22 10:47:58.033220790 +0100
43+@@ -4,6 +4,7 @@
44+ #include <unistd.h>
45+ #include <signal.h>
46+
47++#include <skalibs/exec.h>
48+ #include <skalibs/stddjb.h>
49+ #include "prjlibs-c/diewarn.h"
50+ #include "prjlibs-c/types.h"
51+@@ -56,7 +57,7 @@
52+ if (fd_shuffle(2, current, wanted)!=0) DIE0(dup);
53+ }
54+ read(start[0], &j, 1);
55+- pathexec(args);
56++ mexec(args);
57+ DIE1(exec, args[0]);
58+ }
59+
60+diff -Naur misc/fdtools-2020.05.04/src/recvfd.c misc-new/fdtools-2020.05.04/src/recvfd.c
61+--- misc/fdtools-2020.05.04/src/recvfd.c 2020-04-28 09:35:05.000000000 +0200
62++++ misc-new/fdtools-2020.05.04/src/recvfd.c 2021-01-22 10:47:14.180994779 +0100
63+@@ -7,6 +7,7 @@
64+ #include <limits.h>
65+
66+ #include <skalibs/stddjb.h>
67++#include <skalibs/exec.h>
68+ #include "prjlibs-c/diewarn.h"
69+ #include "prjlibs-c/types.h"
70+ #include "fdtools.h"
71+@@ -69,9 +70,9 @@
72+ named_fd=duped;
73+ }
74+ buf[int_fmt(buf, named_fd)]='\0';
75+- if (pathexec_env(argv[i]+1, buf)==0) DIE0(alloc);
76++ if (env_mexec(argv[i]+1, buf)==0) DIE0(alloc);
77+ }
78+ argv+=nfds+1;
79+- pathexec0((char const**)argv);
80++ mexec0((char const**)argv);
81+ DIE1(exec, argv[0]);
82+ }
83+diff -Naur misc/fdtools-2020.05.04/src/sendfd.c misc-new/fdtools-2020.05.04/src/sendfd.c
84+--- misc/fdtools-2020.05.04/src/sendfd.c 2015-03-16 06:48:39.000000000 +0100
85++++ misc-new/fdtools-2020.05.04/src/sendfd.c 2021-01-22 10:43:07.207634214 +0100
86+@@ -7,6 +7,7 @@
87+ #include <limits.h>
88+
89+ #include <skalibs/stddjb.h>
90++#include <skalibs/exec.h>
91+ #include "prjlibs-c/diewarn.h"
92+ #include "prjlibs-c/types.h"
93+ #include "fdtools.h"
94+@@ -40,6 +41,6 @@
95+ argv+=nfds;
96+ if (*argv==NULL) _exit(0);
97+ ++argv;
98+- pathexec0((char const**)argv);
99++ mexec0((char const**)argv);
100+ DIE1(exec, argv[0]);
101+ }
102+diff -Naur misc/fdtools-2020.05.04/src/setstate.c misc-new/fdtools-2020.05.04/src/setstate.c
103+--- misc/fdtools-2020.05.04/src/setstate.c 2020-05-04 10:04:21.000000000 +0200
104++++ misc-new/fdtools-2020.05.04/src/setstate.c 2021-01-22 10:45:05.084304318 +0100
105+@@ -8,6 +8,7 @@
106+ #include <errno.h>
107+
108+ #include <skalibs/stddjb.h>
109++#include <skalibs/exec.h>
110+ #include "prjlibs-c/constants.h"
111+ #include "prjlibs-c/intattr.h"
112+ #include "prjlibs-c/diewarn.h"
113+@@ -167,6 +168,6 @@
114+ }
115+
116+ argv+=2;
117+- pathexec_run(argv[0], (char const**)argv, (char const**)environ);
118++ mexec_ae(argv[0], (char const**)argv, (char const**)environ);
119+ DIE1(exec, argv[0]);
120+ }
121+diff -Naur misc/fdtools-2020.05.04/src/statfile.c misc-new/fdtools-2020.05.04/src/statfile.c
122+--- misc/fdtools-2020.05.04/src/statfile.c 2015-03-22 00:33:44.000000000 +0100
123++++ misc-new/fdtools-2020.05.04/src/statfile.c 2021-01-22 10:48:23.673351183 +0100
124+@@ -6,6 +6,7 @@
125+ #include <errno.h>
126+
127+ #include <skalibs/stddjb.h>
128++#include <skalibs/exec.h>
129+ #include "prjlibs-c/constants.h"
130+ #include "prjlibs-c/diewarn.h"
131+ #include "prjlibs-c/warn.h"
132+@@ -15,7 +16,7 @@
133+ char const* PROG="statfile";
134+
135+ static void set(char const* const var, char const* const val) {
136+- if (pathexec_env(var, val)==0) DIE0(alloc);
137++ if (env_mexec(var, val)==0) DIE0(alloc);
138+ }
139+
140+ static void set64n(char const* const var, time_t t, unsigned int nsec) {
141+@@ -178,6 +179,6 @@
142+ }
143+
144+ argv+=3;
145+- pathexec((char const**)argv);
146++ mexec((char const**)argv);
147+ DIE1(exec, argv[0]);
148+ }
149+diff -Naur misc/fdtools-2020.05.04/src/vc-get-linux.c misc-new/fdtools-2020.05.04/src/vc-get-linux.c
150+--- misc/fdtools-2020.05.04/src/vc-get-linux.c 2020-04-28 07:04:49.000000000 +0200
151++++ misc-new/fdtools-2020.05.04/src/vc-get-linux.c 2021-01-22 10:47:34.649100757 +0100
152+@@ -10,6 +10,7 @@
153+ #include <sys/sysmacros.h>
154+
155+ #include <skalibs/stddjb.h>
156++#include <skalibs/exec.h>
157+ #include "prjlibs-c/constants.h"
158+ #include "prjlibs-c/diewarn.h"
159+ #include "prjlibs-c/types.h"
160+@@ -38,7 +39,7 @@
161+ errno=0;
162+ if (ioctl(fd, VT_OPENQRY, &vtnum)<0 || vtnum==-1) DIE0(vt_qry);
163+ bufnum[ulong_fmt(bufnum, vtnum)]='\0';
164+- if (pathexec_env("TTY", buf)==0) DIE0(alloc);
165++ if (env_mexec("TTY", buf)==0) DIE0(alloc);
166+ }
167+ fd_close(fd);
168+
169+@@ -50,12 +51,12 @@
170+ if (fstat(fd, &statbuf)!=0) DIE1(stat, buf);
171+ buf[ulong_fmt(buf, minor(statbuf.st_rdev))]='\0';
172+ }
173+- if (pathexec_env("VCNUM", buf)==0) DIE0(alloc);
174++ if (env_mexec("VCNUM", buf)==0) DIE0(alloc);
175+
176+ buf[ulong_fmt(buf, fd)]='\0';
177+- if (pathexec_env("VCFD", buf)==0) DIE0(alloc);
178++ if (env_mexec("VCFD", buf)==0) DIE0(alloc);
179+ }
180+
181+- pathexec((char const**)argv+2);
182++ mexec((char const**)argv+2);
183+ DIE1(exec, argv[2]);
184+ }
185+diff -Naur misc/fdtools-2020.05.04/src/vc-lock-linux.c misc-new/fdtools-2020.05.04/src/vc-lock-linux.c
186+--- misc/fdtools-2020.05.04/src/vc-lock-linux.c 2015-03-20 05:59:42.000000000 +0100
187++++ misc-new/fdtools-2020.05.04/src/vc-lock-linux.c 2021-01-22 10:48:36.857417751 +0100
188+@@ -8,6 +8,7 @@
189+ #include <sys/ioctl.h>
190+ #include <sys/vt.h>
191+
192++#include <skalibs/exec.h>
193+ #include <skalibs/stddjb.h>
194+ #include "prjlibs-c/constants.h"
195+ #include "prjlibs-c/diewarn.h"
196+@@ -79,7 +80,7 @@
197+ WARN0(fork);
198+ } else if (pid==0) {
199+ sigprocmask(SIG_SETMASK, &old_set, NULLP);
200+- pathexec((char const**)argv);
201++ mexec((char const**)argv);
202+ DIE1(exec, *argv);
203+ } else {
204+ int status;
205+diff -Naur misc/fdtools-2020.05.04/src/vc-switch-linux.c misc-new/fdtools-2020.05.04/src/vc-switch-linux.c
206+--- misc/fdtools-2020.05.04/src/vc-switch-linux.c 2020-04-28 07:14:04.000000000 +0200
207++++ misc-new/fdtools-2020.05.04/src/vc-switch-linux.c 2021-01-22 10:42:41.259480648 +0100
208+@@ -10,6 +10,7 @@
209+ #include <sys/sysmacros.h>
210+
211+ #include <skalibs/stddjb.h>
212++#include <skalibs/exec.h>
213+ #include "prjlibs-c/constants.h"
214+ #include "prjlibs-c/diewarn.h"
215+ #include "prjlibs-c/types.h"
216+@@ -36,6 +37,6 @@
217+ if (ioctl(fd, VT_ACTIVATE, ttyno)<0) DIE0(vt_act);
218+ if (!scan) fd_close(fd);
219+
220+- pathexec0((char const**)argv+3);
221++ mexec0((char const**)argv+3);
222+ DIE1(exec, argv[3]);
223+ }
pkgs/tools/misc/grub/2.0x.nix+1−1
@@ -3,7 +3,7 @@
33, fuse # only needed for grub-mount
44, zfs ? null
55, efiSupport ? false
6−, zfsSupport ? true
6+, zfsSupport ? false
77, xenSupport ? false
88}:
99
pkgs/tools/misc/s6-portable-utils/default.nix+2−2
@@ -7,8 +7,8 @@ let
77
88in buildPackage {
99 pname = pname;
10− version = "2.2.3.0";
11− sha256 = "063zwifigg2b3wsixdcz4h9yvr6fkqssvx0iyfsprjfmm1yapfi9";
10+ version = "2.2.3.1";
11+ sha256 = "1ks1ch5v3p2z8y8wp5fmzzgjrqn2l5sj1sgfp8vv6wy8psd8mrj3";
1212
1313 description = "A set of tiny general Unix utilities optimized for simplicity and small size";
1414
pkgs/tools/networking/s6-dns/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "s6-dns";
7− version = "2.3.2.0";
8− sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7";
7+ version = "2.3.5.0";
8+ sha256 = "0h5p5dbkkdadahrp4pqhc3x9ds758i6djy49k5zrn7mm5k4722wz";
99
1010 description = "A suite of DNS client programs and libraries for Unix systems";
1111
pkgs/tools/networking/s6-networking/default.nix+3−3
@@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
2020
2121buildPackage {
2222 pname = "s6-networking";
23− version = "2.3.1.2";
24− sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr";
23+ version = "2.4.0.0";
24+ sha256 = "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq";
2525
2626 description = "A suite of small networking utilities for Unix systems";
2727
@@ -59,7 +59,7 @@ buildPackage {
5959 # remove all s6 executables from build directory
6060 rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable)
6161 rm minidentd
62− rm libs6net.* libstls.*
62+ rm libs6net.* libstls.* libs6tls.*
6363
6464 mv doc $doc/share/doc/s6-networking/html
6565 '';
pkgs/tools/system/s6-rc/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "s6-rc";
7− version = "0.5.2.0";
8− sha256 = "1qpygkajalaziszhwfv5rr6hc27q05z8dayyv7im06z6vndimchs";
7+ version = "0.5.2.1";
8+ sha256 = "02pszbi440wagx2qp8aqj9mv5wm2qisw9lkq7mbnbnxxw9azlhi8";
99
1010 description = "A service manager for s6-based systems";
1111 platforms = lib.platforms.linux;
pkgs/tools/system/s6/default.nix+2−2
@@ -4,8 +4,8 @@ with skawarePackages;
44
55buildPackage {
66 pname = "s6";
7− version = "2.9.2.0";
8− sha256 = "1pfxx50shncg2s47ic4kp02jh1cxfjq75j3mnxjagyzzz0mbfg9n";
7+ version = "2.10.0.0";
8+ sha256 = "0xzqrd0m3wjklmw1w3gjw5dcdxnhgvxv2r5wd6m2ismw2jprr9k0";
99
1010 description = "skarnet.org's small & secure supervision software suite";
1111
pkgs/top-level/all-packages.nix+7
@@ -7184,6 +7184,10 @@ in
71847184
71857185 pympress = callPackage ../applications/office/pympress { };
71867186
7187+ pyspread = python3Packages.callPackage ../applications/office/pyspread {
7188+ inherit (qt5) qtsvg wrapQtAppsHook;
7189+ };
7190+
71877191 pythonIRClib = pythonPackages.pythonIRClib;
71887192
71897193 pyditz = callPackage ../applications/misc/pyditz {
@@ -7542,6 +7546,8 @@ in
75427546
75437547 s6-dns = skawarePackages.s6-dns;
75447548
7549+ s6-linux-init = skawarePackages.s6-linux-init;
7550+
75457551 s6-linux-utils = skawarePackages.s6-linux-utils;
75467552
75477553 s6-networking = skawarePackages.s6-networking;
@@ -16463,6 +16469,7 @@ in
1646316469
1646416470 s6 = callPackage ../tools/system/s6 { };
1646516471 s6-dns = callPackage ../tools/networking/s6-dns { };
16472+ s6-linux-init = callPackage ../os-specific/linux/s6-linux-init { };
1646616473 s6-linux-utils = callPackage ../os-specific/linux/s6-linux-utils { };
1646716474 s6-networking = callPackage ../tools/networking/s6-networking { };
1646816475 s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { };
pkgs/top-level/perl-packages.nix+25−9
@@ -9641,6 +9641,21 @@ let
96419641 buildInputs = [ TestNoWarnings ];
96429642 };
96439643
9644+ HTTPAcceptLanguage = buildPerlModule {
9645+ pname = "HTTP-AcceptLanguage";
9646+ version = "0.02";
9647+ src = fetchurl {
9648+ url = "mirror://cpan/authors/id/Y/YA/YAPPO/HTTP-AcceptLanguage-0.02.tar.gz";
9649+ sha256 = "1bs29r72ibp0kmr3l1ypzszflpcw7z4yxxcgaijspsy99rb5yq1f";
9650+ };
9651+ buildInputs = [ ModuleBuildTiny ];
9652+ meta = {
9653+ homepage = "https://github.com/yappo/p5-HTTP-AcceptLanguage";
9654+ description = "Accept-Language header parser and find available language";
9655+ license = with lib.licenses; [ artistic1 gpl1Plus ];
9656+ };
9657+ };
9658+
96449659 HTTPBody = buildPerlPackage {
96459660 pname = "HTTP-Body";
96469661 version = "1.22";
@@ -11137,10 +11152,10 @@ let
1113711152
1113811153 LinkEmbedder = buildPerlPackage {
1113911154 pname = "LinkEmbedder";
11140− version = "1.15";
11155+ version = "1.16";
1114111156 src = fetchurl {
11142− url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.15.tar.gz";
11143− sha256 = "0ij2jvsiqnqz3qlzw8k3q37ys05wfh1ks2n692hs3bpg7ds3n8bc";
11157+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.16.tar.gz";
11158+ sha256 = "0pm5h5rlfparfvsi3ygj53mwjg8lwhql5mj0macfvsvfnfvnnp6j";
1114411159 };
1114511160 buildInputs = [ TestDeep ];
1114611161 propagatedBuildInputs = [ Mojolicious ];
@@ -13388,10 +13403,10 @@ let
1338813403
1338913404 Mojolicious = buildPerlPackage {
1339013405 pname = "Mojolicious";
13391− version = "8.67";
13406+ version = "8.71";
1339213407 src = fetchurl {
13393− url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.67.tar.gz";
13394− sha256 = "0b1ajsfvpzcmy7qp1rjr2n1z263yk5bkzmal0kx72ajg1l1dd85v";
13408+ url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.71.tar.gz";
13409+ sha256 = "03bfxzq11v6k47axdwqhp2d3p1z17nwyxj0yww5z3x293p6zsnqm";
1339513410 };
1339613411 meta = {
1339713412 homepage = "https://mojolicious.org";
@@ -13498,10 +13513,10 @@ let
1349813513
1349913514 MojoliciousPluginWebpack = buildPerlPackage {
1350013515 pname = "Mojolicious-Plugin-Webpack";
13501− version = "0.13";
13516+ version = "0.14";
1350213517 src = fetchurl {
13503− url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.13.tar.gz";
13504− sha256 = "7848c0698e1b52909c71add638f7523f5affdfb8133b4ddb6f23a3bca485e761";
13518+ url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.14.tar.gz";
13519+ sha256 = "0b1a9rm5rlpqj6skgic4qzy4b1p35r2dhkh3rwaaypf9ha70i9gc";
1350513520 };
1350613521 propagatedBuildInputs = [ Mojolicious ];
1350713522 meta = {
@@ -14876,6 +14891,7 @@ let
1487614891 };
1487714892 propagatedBuildInputs = [ IOAsync Moo NetFrameLayerIPv6 namespaceclean ];
1487814893 buildInputs = [ TestFatal ];
14894+ preCheck = "rm t/icmp_ps.t t/icmpv6_ps.t"; # ping socket tests fail
1487914895 meta = {
1488014896 description = "asyncronously check remote host for reachability";
1488114897 license = with lib.licenses; [ artistic1 gpl1Plus ];
pkgs/top-level/python-packages.nix+4
@@ -206,6 +206,8 @@ in {
206206
207207 aiodns = callPackage ../development/python-modules/aiodns { };
208208
209+ aioeafm = callPackage ../development/python-modules/aioeafm { };
210+
209211 aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { };
210212
211213 aioeventlet = callPackage ../development/python-modules/aioeventlet { };
@@ -318,6 +320,8 @@ in {
318320
319321 ambiclimate = callPackage ../development/python-modules/ambiclimate { };
320322
323+ amcrest = callPackage ../development/python-modules/amcrest { };
324+
321325 amply = callPackage ../development/python-modules/amply { };
322326
323327 amqp = callPackage ../development/python-modules/amqp { };