diff options
Diffstat (limited to 'pkgs/development')
16 files changed, 96 insertions, 85 deletions
diff --git a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix index 1663b8c7291da..0bb76f916285b 100644 --- a/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version +, fetchpatch , standalone ? stdenv.hostPlatform.useLLVM or false , withLibunwind ? !stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm # on musl the shared objects don't build @@ -21,6 +22,13 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + '' + lib.optionalString (!stdenv.cc.isClang) '' + pushd libcxx-* + patch -p2 < ${fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/76ccec07b4fa0cc68dfd07d557e7fb661804a468.patch"; + sha256 = "1lgzkfkp7qinfc6gd8x5di1iq1gqdv81249c6f02chn9q122sbq1"; + }} + popd ''; patches = [ diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index e57062642ba40..dada4dfe9e81d 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , perl, ncurses, zlib, sqlite, libffi , autoreconfHook, mcpp, bison, flex, doxygen, graphviz , makeWrapper @@ -19,6 +19,16 @@ stdenv.mkDerivation rec { sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; }; + patches = [ + # Pull pending unstream inclusion fix for ncurses-6.3: + # https://github.com/souffle-lang/souffle/pull/2134 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; + sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; buildInputs = [ ncurses zlib sqlite libffi ]; @@ -29,7 +39,7 @@ stdenv.mkDerivation rec { # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for # Wno-error fixes - patchPhase = '' + postPatch = '' substituteInPlace ./src/Makefile.am \ --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 0d8d2498ae737..50417dab1feb2 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; }; + configureFlags = lib.optional stdenv.isAarch64 "--with-atomictype=pthread"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 45c566b0d6016..9738d16353d4b 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -309,18 +309,18 @@ let prisma = super.prisma.override rec { nativeBuildInputs = [ pkgs.makeWrapper ]; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-W0AFjVxPOLW5SEnf0ZwbOu4k8ElX98ioFC1E8Gb9Q/nuO2brEwxFJebXglfG+N6zphGbu2bG1I3VAu7aYzR3VA=="; + sha512 = "sha512-WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg=="; }; dependencies = [ rec { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.4.0-27.1c9fdaa9e2319b814822d6dbfd0a69e1fcc13a85"; + version = "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e"; src = fetchurl { url = "https://registry.npmjs.org/@prisma/engines/-/engines-${version}.tgz"; - sha512 = "sha512-jyCjXhX1ZUbzA7+6Hm0iEdeY+qFfpD/RB7iSwMrMoIhkVYvnncSdCLBgbK0yqxTJR2nglevkDY2ve3QDxFciMA=="; + sha512 = "sha512-MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g=="; }; }]; postInstall = with pkgs; '' diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 488831e80080e..c85c5d6bd6396 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -30,14 +30,15 @@ let # Only the pinned release in setup.py works properly unicorn' = unicorn.overridePythonAttrs (old: rec { - pname = "unicorn"; - version = "1.0.2-rc4"; - src = fetchFromGitHub { - owner = "unicorn-engine"; - repo = pname; - rev = version; - sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; + pname = "unicorn"; + version = "1.0.2-rc4"; + src = fetchFromGitHub { + owner = "unicorn-engine"; + repo = pname; + rev = version; + sha256 = "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy"; }; + doCheck = false; }); in diff --git a/pkgs/development/python-modules/dogpile-core/default.nix b/pkgs/development/python-modules/dogpile-core/default.nix deleted file mode 100644 index 32a1f59e92704..0000000000000 --- a/pkgs/development/python-modules/dogpile-core/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "dogpile-core"; - version = "0.4.1"; - - src = fetchPypi { - pname = "dogpile.core"; - inherit version; - sha256 = "0xpdvg4kr1isfkrh1rfsh7za4q5a5s6l2kf9wpvndbwf3aqjyrdy"; - }; - - doCheck = false; - - pythonImportsCheck = [ "dogpile.core" ]; - - meta = with lib; { - description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = "https://bitbucket.org/zzzeek/dogpile.core"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/gistyc/default.nix b/pkgs/development/python-modules/gistyc/default.nix index 2f49552df2369..51003101abde3 100644 --- a/pkgs/development/python-modules/gistyc/default.nix +++ b/pkgs/development/python-modules/gistyc/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { requests ]; + pythonImportsCheck = [ + "gistyc" + ]; + meta = with lib; { homepage = "https://github.com/ThomasAlbin/gistyc"; description = "A Python based GitHub GIST management tool"; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index eb81678ae4f10..dcee12d68c3a3 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.49.1"; + version = "0.50.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "071bri1h6j8saqqlb50zibdrk5hgkpwp4ysiskl1zin18794bq82"; + sha256 = "sha256-4OMWLWvNRg7z4KAAkB1l5YaWILFwIepZOWhBd64SGWI="; }; checkInputs = [ @@ -29,9 +29,6 @@ buildPythonPackage rec { "test_connectio" "test_attributes" "test_live" - # logic operator tests broken in 0.49.0 - # https://github.com/ikvk/imap_tools/issues/143 - "test_logic_operators" ]; pythonImportsCheck = [ "imap_tools" ]; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index e87146f6fbc3c..0045f4b3e0fa4 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k , chardet , dnspython , html5-parser @@ -15,15 +14,16 @@ buildPythonPackage rec { pname = "ludios_wpull"; - version = "3.0.7"; + version = "3.0.9"; - disabled = (!isPy3k) || (pythonAtLeast "3.8"); + # https://github.com/ArchiveTeam/ludios_wpull/issues/20 + disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { rev = version; - owner = "ludios"; - repo = "wpull"; - sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; + owner = "ArchiveTeam"; + repo = "ludios_wpull"; + sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c"; }; propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "Web crawler; fork of wpull used by grab-site"; - homepage = "https://github.com/ludios/wpull"; + homepage = "https://github.com/ArchiveTeam/ludios_wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; broken = lib.versions.major tornado.version != "4"; diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index d2fc8470d4874..271d193ce019f 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytomlpp"; - version = "0.3.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "bobfang1992"; repo = pname; - rev = version; + rev = "v${version}"; fetchSubmodules = true; - sha256 = "1h06a2r0f5q4mml485113mn7a7585zmhqsk2p1apcybyydllcqda"; + sha256 = "sha256-QyjIJCSgiSKjqMBvCbOlWYx6rBbKIoDvXez2YnYaPUo="; }; buildInputs = [ pybind11 ]; diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index ab7a8777a2432..a35132ade3f66 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.14.9"; + version = "0.14.11"; src = fetchPypi { inherit pname version; - sha256 = "jzHh5ubonn6pCaOp+Dnr7tA9n5DdZ28hBM+03jZZlvc="; + sha256 = "Ey1B3tx6UufxZs8I64vaoPSNC+4LGdcPuyKrLBHxZa8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index d7005e1545046..6e782b1bd336a 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -1,34 +1,34 @@ { lib , buildPythonPackage , fetchPypi - -# Test dependencies -, pytest, pytest-mock +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { - pname = "RestrictedPython"; - version = "5.1"; + pname = "restrictedpython"; + version = "5.2"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "9ae16e500782b41bd1abefd8554ccb26330817bba9ce090d385aa226f1ca83e8"; + pname = "RestrictedPython"; + inherit version; + sha256 = "sha256-Y02h9sXBIqJi9DOwg+49F6mgOfjxs3eFl++0dGHNNhs="; }; - #propagatedBuildInputs = [ xmltodict requests ifaddr ]; - checkInputs = [ - pytest pytest-mock + pytestCheckHook + pytest-mock ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "RestrictedPython" + ]; - meta = { + meta = with lib; { + description = "Restricted execution environment for Python to run untrusted code"; homepage = "https://github.com/zopefoundation/RestrictedPython"; - description = "A restricted execution environment for Python to run untrusted code"; - license = lib.licenses.zpl21; - maintainers = with lib.maintainers; [ juaningan ]; + license = licenses.zpl21; + maintainers = with maintainers; [ juaningan ]; }; } diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 1f7775c1d84f8..6161f5c5eb022 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -85,19 +85,14 @@ buildPythonPackage rec { "test_auto_reload" "test_no_exceptions_when_cancel_pending_request" "test_ipv6_address_is_not_wrapped" - ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/sanic-org/sanic/issues/2298 - "test_no_exceptions_when_cancel_pending_request" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # These appear to be very sensitive to output of commands - # Output is different on aarch64 - "test_server_run" + "test_access_logs" + "test_auto_reload" "test_host_port" + "test_no_exceptions_when_cancel_pending_request" "test_num_workers" - "test_access_logs" + "test_server_run" "test_version" - # Failing for a different reason than Darwin - "test_no_exceptions_when_cancel_pending_request" ]; # avoid usage of nixpkgs-review in darwin since tests will compete usage diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index c9043afa85d9d..1f2876bdc693f 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -19,12 +19,22 @@ buildPythonPackage rec { ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ ''; + # needed on non-x86 linux + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ setuptools ]; - # No tests present - doCheck = false; + checkPhase = '' + runHook preCheck + + mv unicorn unicorn.hidden + patchShebangs sample_*.py shellcode.py + sh -e sample_all.sh + + runHook postCheck + ''; pythonImportsCheck = [ "unicorn" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 91681a5a9a0bc..b05b0c2e47f1e 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-EuGGGTHBXm6crnoh5h0DYZZHUtzY4W0wlNgMAxbEb5w="; + sha256 = "sha256-c4t7r9Os0nmQEBpNeZ+XdTPc/5X6Dyw0dd7J4pw5s88="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-CwNe4Qsswh+jMFMpg7DEM9Hq2YeEMcN4UTFMd8AEekw="; + cargoSha256 = "sha256-rjqFEY7GXXWzlw5E6Wg4KPz25BbvQPuLW5m8+3CbcRw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 18b432df7b4dd..33e9fca441fb5 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -3,10 +3,12 @@ , fetchFromGitHub , nix-update-script , pkg-config +, rustup , openssl , stdenv , libiconv , Security +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -35,7 +37,12 @@ rustPlatform.buildRustPackage rec { then [ libiconv Security ] else [ openssl ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + + # Depends at run-time on having rustup in PATH + postInstall = '' + wrapProgram $out/bin/cargo-msrv --prefix PATH : ${lib.makeBinPath [ rustup ]}; + ''; meta = with lib; { description = "Cargo subcommand \"msrv\": assists with finding your minimum supported Rust version (MSRV)"; |