diff options
Diffstat (limited to 'pkgs/development')
23 files changed, 232 insertions, 137 deletions
diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch new file mode 100644 index 000000000000..79257fd6be50 --- /dev/null +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -0,0 +1,15 @@ +diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c +index 6e23d9f2..8c621ec4 100644 +--- a/icon-validator/validate-icon.c ++++ b/icon-validator/validate-icon.c +@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, + "--unshare-ipc", + "--unshare-net", + "--unshare-pid", +- "--ro-bind", "/usr", "/usr", +- "--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache", ++ "--ro-bind", "@storeDir@", "@storeDir@", ++ "--ro-bind", "/run/current-system", "/run/current-system", + "--ro-bind", validate_icon, validate_icon, + NULL); + diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 1c4b6ea8c722..65c876320b5a 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; p11 = p11-kit; }) + (substituteAll { + src = ./bubblewrap-paths.patch; + inherit (builtins) storeDir; + }) # patch taken from gtk_doc ./respect-xml-catalog-files-var.patch ./use-flatpak-from-path.patch diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 0986dee0ca0d..a699ad48a8a4 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, openssl, zlib, windows }: stdenv.mkDerivation rec { - name = "libssh2-1.8.0"; + pname = "libssh2"; + version = "1.8.1"; src = fetchurl { - url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"; + url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; + sha256 = "0ngif3ynk6xqzy5nlfjs7bsmfm81g9f145av0z86kf0vbgrigda0"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix new file mode 100644 index 000000000000..e8eabcf43b30 --- /dev/null +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03.0"; + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-syslog"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "rixed"; + repo = "ocaml-syslog"; + rev = "v${version}"; + sha256 = "1kqpc55ppzv9n555qgqpda49n7nvkqimzisyjx2a7338r7q4r5bw"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://github.com/rixed/ocaml-syslog; + description = "Simple wrapper to access the system logger from OCaml"; + license = licenses.lgpl21Plus; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.rixed ]; + }; +} diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index d7cd453c93d5..8488278c934b 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -1,5 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy33, pythonOlder, - asyncio +{ lib, buildPythonPackage, fetchPypi, pythonOlder, }: buildPythonPackage rec { @@ -17,7 +16,5 @@ buildPythonPackage rec { sha256 = "17vrl6jajr81bql7kjgq0zkxy225px97z4g9wmbhbbnvzn1p92c0"; }; - buildInputs = lib.optionals isPy33 [ asyncio ]; - disabled = pythonOlder "3.3"; } diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index f7ac236a520d..a8287df10f62 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi -, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder +, isPy27, isPyPy, python, pycares, typing, trollius }: buildPythonPackage rec { pname = "aiodns"; - version = "1.2.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449"; + sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d"; }; - propagatedBuildInputs = with stdenv.lib; [ pycares typing ] + propagatedBuildInputs = with stdenv.lib; [ pycares ] + ++ optional (pythonOlder "3.7") typing ++ optional (isPy27 || isPyPy) trollius; checkPhase = '' diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index f137484a8247..ccac3e6f0773 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -3,21 +3,21 @@ , fetchPypi , eventlet , trollius -, asyncio , mock , python }: buildPythonPackage rec { pname = "aioeventlet"; - version = "0.5.1"; + # version is called 0.5.1 on PyPI, but the filename is aioeventlet-0.5.2.tar.gz + version = "0.5.2"; src = fetchPypi { inherit pname version; sha256 = "cecb51ea220209e33b53cfb95124d90e4fcbee3ff8ba8a179a57120b8624b16a"; }; - propagatedBuildInputs = [ eventlet trollius asyncio ]; + propagatedBuildInputs = [ eventlet trollius ]; buildInputs = [ mock ]; # 2 tests error out diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 55d68f93f2c7..4728d819f05a 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, isPy33 , pythonOlder -, asyncio -, singledispatch }: buildPythonPackage rec { @@ -18,8 +15,6 @@ buildPythonPackage rec { disabled = pythonOlder "3.3"; - propagatedBuildInputs = lib.optionals isPy33 [ asyncio singledispatch ]; - # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/asyncio/default.nix b/pkgs/development/python-modules/asyncio/default.nix deleted file mode 100644 index 5a6dbe798148..000000000000 --- a/pkgs/development/python-modules/asyncio/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy34 }: - -buildPythonPackage rec { - pname = "asyncio"; - version = "3.4.3"; - disabled = !isPy34; - - src = fetchPypi { - inherit pname version; - sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; - }; - - meta = with stdenv.lib; { - description = "Reference implementation of PEP 3156"; - homepage = http://www.python.org/dev/peps/pep-3156; - license = licenses.free; - }; -} diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index d2d1e48b4c62..0ccf3da7bec9 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,5 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy33, - six, txaio, twisted, zope_interface, cffi, asyncio, trollius, futures, +{ lib, buildPythonPackage, fetchPypi, isPy3k, + six, txaio, twisted, zope_interface, cffi, trollius, futures, mock, pytest }: buildPythonPackage rec { @@ -12,7 +12,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++ - (lib.optional isPy33 asyncio) ++ (lib.optionals (!isPy3k) [ trollius futures ]); checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix new file mode 100644 index 000000000000..19a469dad262 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -0,0 +1,26 @@ +# FIXME: make gdk_pixbuf dependency optional +{ stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, lib +, substituteAll +, makeFontsConf +, freefont_ttf +, pytest +, pytestrunner +, glibcLocales +, cairo +, cffi +, withXcffib ? false, xcffib +, python +, glib +, gdk_pixbuf +}@args: + +import ./generic.nix ({ + version = "0.9.0"; + sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; + dlopen_patch = ./dlopen-paths-0.9.patch; + inherit withXcffib; +} // args) diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 863e181f991a..528c845c07ea 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -15,64 +15,13 @@ , withXcffib ? false, xcffib , python , glib -, gdk_pixbuf }: - -let - generic = { version, sha256, dlopen_patch, disabled ? false }: - buildPythonPackage rec { - pname = "cairocffi"; - inherit version disabled; - - src = fetchPypi { - inherit pname version sha256; - }; - - LC_ALL = "en_US.UTF-8"; - - # checkPhase require at least one 'normal' font and one 'monospace', - # otherwise glyph tests fails - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - checkInputs = [ pytest pytestrunner glibcLocales ]; - propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; - - checkPhase = '' - py.test $out/${python.sitePackages} - ''; - - patches = [ - # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 - (substituteAll { - src = dlopen_patch; - ext = stdenv.hostPlatform.extensions.sharedLibrary; - cairo = cairo.out; - glib = glib.out; - gdk_pixbuf = gdk_pixbuf.out; - }) - ./fix_test_scaled_font.patch - ]; - - meta = with lib; { - homepage = https://github.com/SimonSapin/cairocffi; - license = licenses.bsd3; - maintainers = with maintainers; []; - description = "cffi-based cairo bindings for Python"; - }; - }; -in - { - cairocffi_1_0 = generic { - version = "1.0.2"; - sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; - dlopen_patch = ./dlopen-paths.patch; - disabled = pythonOlder "3.5"; - }; - - cairocffi_0_9 = generic { - version = "0.9.0"; - sha256 = "15386c3a9e08823d6826c4491eaccc7b7254b1dc587a3b9ce60c350c3f990337"; - dlopen_patch = ./dlopen-paths-0.9.patch; - }; - } +, gdk_pixbuf +}@args: + +import ./generic.nix ({ + version = "1.0.2"; + sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff"; + dlopen_patch = ./dlopen-paths.patch; + disabled = pythonOlder "3.5"; + inherit withXcffib; +} // args) diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix new file mode 100644 index 000000000000..4fa5cc466c31 --- /dev/null +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -0,0 +1,51 @@ +{ version +, sha256 +, dlopen_patch +, disabled ? false +, ... +}@args: + +with args; + +buildPythonPackage rec { + pname = "cairocffi"; + inherit version disabled; + + src = fetchPypi { + inherit pname version sha256; + }; + + LC_ALL = "en_US.UTF-8"; + + # checkPhase require at least one 'normal' font and one 'monospace', + # otherwise glyph tests fails + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }; + + checkInputs = [ pytest pytestrunner glibcLocales ]; + propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; + + checkPhase = '' + py.test $out/${python.sitePackages} + ''; + + patches = [ + # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0 + (substituteAll { + src = dlopen_patch; + ext = stdenv.hostPlatform.extensions.sharedLibrary; + cairo = cairo.out; + glib = glib.out; + gdk_pixbuf = gdk_pixbuf.out; + }) + ./fix_test_scaled_font.patch + ]; + + meta = with lib; { + homepage = https://github.com/SimonSapin/cairocffi; + license = licenses.bsd3; + maintainers = with maintainers; []; + description = "cffi-based cairo bindings for Python"; + }; +} diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e548781fde62..41188a0de6e5 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , pythonOlder , withVoice ? true, libopus -, asyncio , aiohttp , websockets , pynacl @@ -18,7 +17,7 @@ buildPythonPackage rec { sha256 = "17fb8814100fbaf7a79468baa432184db6cef3bbea4ad194fe297c7407d50108"; }; - propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ]; + propagatedBuildInputs = [ aiohttp websockets pynacl ]; patchPhase = '' substituteInPlace "requirements.txt" \ --replace "aiohttp>=1.0.0,<1.1.0" "aiohttp" diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 0438a035501b..d2839d32b0a9 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -1,4 +1,5 @@ { lib +, bash , buildPythonPackage , fetchPypi }: @@ -12,6 +13,10 @@ buildPythonPackage rec { sha256 = "1dr1a5qbb9z5hyns4zk086zm0iqbms33zv0s1296wx502y7jyjfw"; }; + patchPhase = '' + sed -e 's|/bin/bash|${bash}/bin/bash|g' -i invoke/config.py + ''; + # errors with vendored libs doCheck = false; diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index d57eb1cd1a0f..bb7f8a9c62dd 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -1,25 +1,46 @@ -{ pkgs +{ lib , buildPythonPackage -, fetchPypi -, python -, certifi +, fetchFromGitHub +, pythonAtLeast +, requests , requests_oauthlib -, typing , isodate +, certifi +, aiohttp +, aiodns +, pytest +, httpretty +, trio }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.4"; pname = "msrest"; - src = fetchPypi { - inherit pname version; - sha256 = "0icklfjaagk0j9iwq897avmqhwwmgs7c5yy5jw3ppdqz6h0sm38v"; + # no tests in PyPI tarball + # see https://github.com/Azure/msrest-for-python/pull/152 + src = fetchFromGitHub { + owner = "Azure"; + repo = "msrest-for-python"; + rev = "v${version}"; + sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi"; }; - propagatedBuildInputs = [ certifi requests_oauthlib typing isodate ]; + propagatedBuildInputs = [ + requests requests_oauthlib isodate certifi + # optional + aiohttp aiodns + ]; + + checkInputs = [ pytest httpretty ] + ++ lib.optional (pythonAtLeast "3.5") trio; + + # Deselected tests require network access + checkPhase = '' + pytest tests/ -k "not test_conf_async_trio_requests" + ''; - meta = with pkgs.lib; { + meta = with lib; { description = "The runtime library 'msrest' for AutoRest generated Python clients."; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 1d4564e9f17a..7602caf24cf1 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -1,23 +1,36 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k +, matplotlib , numpy -, scipy +, python-dateutil , pytz +, requests +, retrying +, scipy +, six +, tornado +, tweepy +, ws4py }: buildPythonPackage rec { pname = "pyalgotrade"; version = "0.20"; - disabled = isPy3k; src = fetchPypi { - inherit pname version; + pname = "PyAlgoTrade"; + inherit version; sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd"; }; - propagatedBuildInputs = [ numpy scipy pytz ]; + propagatedBuildInputs = [ + matplotlib numpy python-dateutil pytz requests + retrying scipy six tornado tweepy ws4py + ]; + + # no tests in PyPI tarball + doCheck = false; meta = with stdenv.lib; { description = "Python Algorithmic Trading"; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 341e9519d80c..f68a10d6186e 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -1,21 +1,29 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs +, python +, c-ares +, cffi }: buildPythonPackage rec { pname = "pycares"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "15pwsxsj1nr33n6x2918bfbzdnqv1qkwd2d5jgvxsm81zxnvgk0f"; + sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd"; }; - propagatedBuildInputs = [ pkgs.c-ares ]; + buildInputs = [ c-ares ]; - # No tests included + propagatedBuildInputs = [ cffi ]; + + checkPhase = '' + ${python.interpreter} tests/tests.py + ''; + + # requires network access doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index f1d6874dfbd1..339f6d1debd7 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -11,7 +11,8 @@ buildPythonPackage rec { disabled = isPy3k || isPyPy; src = fetchPypi { - inherit pname version; + pname = "SimpleParse"; + inherit version; sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d"; }; diff --git a/pkgs/development/python-modules/ws4py/default.nix b/pkgs/development/python-modules/ws4py/default.nix index 3d81fe532aba..60f0f3cc9696 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git, asyncio +{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, git , cherrypy, gevent, tornado }: buildPythonPackage rec { @@ -11,15 +11,16 @@ buildPythonPackage rec { }; checkInputs = [ pytest mock git ]; - propagatedBuildInputs = [ asyncio cherrypy gevent tornado ]; + propagatedBuildInputs = [ cherrypy gevent tornado ]; checkPhase = '' - pytest -k 'not test_timeout_when_no_registered_fds and not test_mainloop_can_be_stopped_when_no_websocket_were_registered' + pytest ''; meta = with stdenv.lib; { homepage = https://ws4py.readthedocs.org; description = "A WebSocket package for Python"; maintainers = with maintainers; [ rickynils ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 85fa76bb28e4..be7a488e96e8 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.6.2"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1k675mfywmsj4v4z2f5a4vqinl1jbzzb7v5k6rzyfgvxzd7gil40"; + sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 6b14f49716f2..20105f362cf0 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; - version = "0.6.7"; + version = "0.8.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0sgkgvkqrc6l46fvk6d9hsy0xrjpl2ix47f3cv5bi74dv8i4y2b4"; + sha256 = "07cizbhr02x3rh07xhs10hzzs3lmmpf61g08sa62b98cgadvs9fq"; }; - cargoSha256 = "137dqj1sp02dh0dz9psf8i8q57gmz3rfgmwk073k7x5zzkgvj21c"; + cargoSha256 = "00j5nm491zil6kpjns31qyd6z7iqd77b5qp4h7149s70qjwfq2cb"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; license = licenses.mpl20; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar andir ]; }; } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 1c49f99d6190..0358f7b8b76e 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "13.1.2"; + version = "14.0.3"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "0hgbmvhzxkr84ilrzjxnj3p5pkibam739cckpvwalq5q1ddy2cn4"; + sha256 = "0nnwaj3iik8anx7xd5mzbrgq5g5ng8gqmhxyyfgkmawsg34bk6nj"; }; sourceRoot = "."; |