diff --git a/lib/modules.nix b/lib/modules.nix index 04b65d791b5..6b3faa447be 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -23,6 +23,7 @@ let isAttrs isBool isFunction + isList isString length mapAttrs @@ -188,6 +189,9 @@ rec { loadModule = args: fallbackFile: fallbackKey: m: if isFunction m || isAttrs m then unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) + else if isList m then + let defs = [{ file = fallbackFile; value = m; }]; in + throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); /* @@ -515,20 +519,11 @@ rec { # yield a value computed from the definitions value = if opt ? apply then opt.apply res.mergedValue else res.mergedValue; - # Issue deprecation warnings recursively over all nested types of the - # given type. But don't recurse if a type with the same name was already - # visited before in order to prevent infinite recursion. So this only - # warns once per type name. - # Returns the new set of visited type names - recursiveWarn = visited: type: - let - maybeWarn = warnIf (type.deprecationMessage != null) - "The type `types.${type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${type.deprecationMessage}"; - in - if visited ? ${type.name} then visited - else lib.foldl' recursiveWarn (maybeWarn visited // { ${type.name} = null; }) (lib.attrValues type.nestedTypes); + warnDeprecation = + warnIf (opt.type.deprecationMessage != null) + "The type `types.${opt.type.name}' of option `${showOption loc}' defined in ${showFiles opt.declarations} is deprecated. ${opt.type.deprecationMessage}"; - in builtins.seq (recursiveWarn {} opt.type) opt // + in warnDeprecation opt // { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value; inherit (res.defsFinal') highestPrio; definitions = map (def: def.value) res.defsFinal; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 4259c538bb4..2e57c2f8e2a 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -272,12 +272,6 @@ checkConfigError 'A definition for option .fun.\[function body\]. is not of type checkConfigOutput "b a" config.result ./functionTo/list-order.nix checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix -## Type deprecation -checkConfigError 'The type `types.simple'\'' of option `simple'\'' defined in .* is deprecated. simple shall not be used' config.simple ./type-deprecation.nix -checkConfigError 'The type `types.infinite'\'' of option `infinite'\'' defined in .* is deprecated. infinite shall not be used' config.infinite ./type-deprecation.nix -checkConfigError 'The type `types.left'\'' of option `nested'\'' defined in .* is deprecated. left shall not be used' config.nested ./type-deprecation.nix -checkConfigError 'The type `types.right'\'' of option `nested'\'' defined in .* is deprecated. right shall not be used' config.nested ./type-deprecation.nix - cat <=0.12.0 + "test__query_rmv_api_fail" + ]; + meta = with lib; { homepage = "https://github.com/cgtobi/PyRMVtransport"; description = "Get transport information from opendata.rmv.de"; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index f75a0d6bb60..1ebf66a2597 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.2.2"; + version = "1.3.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; + sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1"; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. - preConfigure = '' - substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore' + postPatch = '' + substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore' ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiobotocore" ]; meta = with lib; { - description = "Async client for amazon services using botocore and aiohttp/asyncio."; + description = "Python client for amazon services"; license = licenses.asl20; homepage = "https://github.com/aio-libs/aiobotocore"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index f28668a8912..9cc3fb82775 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,22 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi -, dateutil, mock, isPy3k }: +{ lib +, buildPythonPackage +, dateutil +, fetchPypi +, isPy3k +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "aniso8601"; version = "9.0.1"; - meta = with lib; { - description = "Parses ISO 8601 strings."; - homepage = "https://bitbucket.org/nielsenb/aniso8601"; - license = licenses.bsd3; - }; - - propagatedBuildInputs = [ dateutil ]; - - checkInputs = lib.optional (!isPy3k) mock; - src = fetchPypi { inherit pname version; - sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; + sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM="; + }; + + propagatedBuildInputs = [ + dateutil + ]; + + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (!isPy3k) mock; + + pythonImportsCheck = [ "aniso8601" ]; + + meta = with lib; { + description = "Python Parser for ISO 8601 strings"; + homepage = "https://bitbucket.org/nielsenb/aniso8601"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index e82faba9758..80ef403b2cc 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -3,25 +3,42 @@ , fetchPypi , numpy , astropy -, astropy-helpers +, astropy-extension-helpers +, setuptools-scm +, pytestCheckHook +, pytest-doctestplus +, hypothesis }: buildPythonPackage rec { pname = "astropy-healpix"; version = "0.6"; - doCheck = false; # tests require pytest-astropy - src = fetchPypi { - inherit pname version; + inherit version; + pname = lib.replaceStrings ["-"] ["_"] pname; sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; }; - propagatedBuildInputs = [ numpy astropy astropy-helpers ]; + nativeBuildInputs = [ + astropy-extension-helpers + setuptools-scm + ]; - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" + propagatedBuildInputs = [ + numpy + astropy + ]; + + checkInputs = [ + pytestCheckHook + pytest-doctestplus + hypothesis + ]; + + # tests must be run in the build directory + preCheck = '' + cd build/lib* ''; meta = with lib; { diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 21d0b6d9f30..dcd6caaffa2 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "breezy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; + sha256 = "sha256-lwKPk+UxKAhfIgUb1xPLJ/za53VdHenmBrr85RTpEps="; }; propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index beb5ba9c46b..37717f76f33 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1dgjbbhy228w2zbfq5pf0hkai7742zw8mmybnzjdc9l6pw7360rq"; + hash = "sha256-YGzc9mMIzPTmUgIXuZROLdYKjUm69x9SR+JtYRVpn24="; }; patches = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { inherit gdb; }) + # Use nixpkgs version instead of versioneer (substituteAll { src = ./hardcode-version.patch; inherit version; @@ -87,6 +88,8 @@ buildPythonPackage rec { "gevent" ]; + pythonImportsCheck = [ "debugpy" ]; + meta = with lib; { description = "An implementation of the Debug Adapter Protocol for Python"; homepage = "https://github.com/microsoft/debugpy"; diff --git a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 751351e03cd..f74b53a831b 100644 --- a/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 2b39106..6d45a10 100644 +index 101492f..4ee7cfb 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -625,6 +625,7 @@ class Session(object): +@@ -630,6 +630,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index d4f742d97f5..3fb5e7ae55e 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -5,25 +5,23 @@ , libopus , pynacl , pythonOlder -, websockets , withVoice ? true }: buildPythonPackage rec { pname = "discord.py"; - version = "1.7.1"; + version = "1.7.2"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dpASIqe6rJEyiWJyPbQhq9M54lX1ilfp4UuGnbJcFLo="; + sha256 = "sha256-NY1/RKp8w9gAqGYXnCNhNZqR/inGMvUvxjJ1MMs62B8="; }; propagatedBuildInputs = [ aiohttp - websockets ] ++ lib.optionalString withVoice [ libopus pynacl diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix index 7ec3b8d1c11..775050acb0c 100644 --- a/pkgs/development/python-modules/elmax/default.nix +++ b/pkgs/development/python-modules/elmax/default.nix @@ -4,12 +4,15 @@ , httpx , poetry-core , pythonOlder +, pytest-asyncio +, pytest-httpx +, pytestCheckHook , yarl }: buildPythonPackage rec { pname = "elmax"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY="; + sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; }; nativeBuildInputs = [ poetry-core ]; @@ -27,8 +30,12 @@ buildPythonPackage rec { yarl ]; - # Project has no tests - doCheck = false; + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + pythonImportsCheck = [ "elmax" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 9a0b1b09db6..f14245865f5 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub , numpy -, python , scikitimage , openjpeg , procps +, pytestCheckHook , contextlib2 , mock , importlib-resources @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "glymur"; - version = "0.8.18"; + version = "0.9.3"; src = fetchFromGitHub { owner = "quintusdias"; repo = pname; rev = "v${version}"; - sha256 = "1zbghzw1q4fljb019lsrhka9xrnn4425qnxrjbmbv7dssgkkywd7"; + sha256 = "1xlpax56qg5qqh0s19xidgvv2483sc684zj7rh6zw1m1z9m37drr"; }; propagatedBuildInputs = [ @@ -30,16 +30,21 @@ buildPythonPackage rec { checkInputs = [ scikitimage procps + pytestCheckHook ]; postConfigure = '' substituteInPlace glymur/config.py \ - --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" + --replace "path = read_config_file(libname)" "path = '${openjpeg}/lib/lib' + libname + ${if stdenv.isDarwin then "'.dylib'" else "'.so'"}" ''; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; + disabledTestPaths = [ + # this test involves glymur's different ways of finding the openjpeg path on + # fsh systems by reading an .rc file and such, and is obviated by the patch + # in postConfigure + "tests/test_config.py" + ]; + meta = with lib; { description = "Tools for accessing JPEG2000 files"; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index dbbdf0bb38c..079b5e71a10 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -5,24 +5,25 @@ , h11 , h2 , pproxy +, pytest-asyncio +, pytest-trio , pytestCheckHook , pytestcov , sniffio -, uvicorn , trustme -, trio +, uvicorn }: buildPythonPackage rec { pname = "httpcore"; - version = "0.12.3"; + version = "0.13.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109"; + sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8="; }; propagatedBuildInputs = [ @@ -33,18 +34,19 @@ buildPythonPackage rec { checkInputs = [ pproxy + pytest-asyncio + pytest-trio pytestCheckHook pytestcov - uvicorn trustme - trio + uvicorn ]; - pytestFlagsArray = [ + disabledTestPaths = [ # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known - "--ignore=tests/test_threadsafety.py" - "--ignore=tests/sync_tests/test_interfaces.py" - "--ignore=tests/sync_tests/test_retries.py" + "tests/test_threadsafety.py" + "tests/sync_tests/test_interfaces.py" + "tests/sync_tests/test_retries.py" ]; pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 2aba203ea01..b45c3e85f50 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.17.1"; + version = "0.18.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U="; + sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykmtronic/default.nix b/pkgs/development/python-modules/pykmtronic/default.nix index 7a055c1ed3f..29a3f04e32c 100644 --- a/pkgs/development/python-modules/pykmtronic/default.nix +++ b/pkgs/development/python-modules/pykmtronic/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pykmtronic"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; + sha256 = "sha256-8qLyBJp7C93x0PWbgDAtNEDJ5VLNfwZ3DRZfudRCBgo="; }; propagatedBuildInputs = [ aiohttp lxml ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 335846fc342..2b1ab664a13 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -4,7 +4,9 @@ , isPy27 , six , pytest +, pytestCheckHook , numpy +, setuptools_scm }: buildPythonPackage rec { @@ -17,7 +19,12 @@ buildPythonPackage rec { sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools_scm + ]; + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six @@ -25,14 +32,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # check_distribution incorrectly pulls pytest version - checkPhase = '' - pytest -k 'not check_distribution' - ''; - meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index d6f30486f9b..1773a4b5792 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi"; + sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index f1f3200bb7b..58137e3adbd 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -2,9 +2,8 @@ , fetchPypi , buildPythonPackage , astropy -, pytest -, pytest-astropy -, astropy-helpers +, pytestCheckHook +, pytest-doctestplus , scipy }: @@ -13,25 +12,18 @@ buildPythonPackage rec { version = "0.3.3"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "radio-beam"; sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; }; propagatedBuildInputs = [ astropy ]; - nativeBuildInputs = [ astropy-helpers ]; - - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" - ''; - - checkInputs = [ pytest pytest-astropy scipy ]; + checkInputs = [ pytestCheckHook pytest-doctestplus scipy ]; # Tests must be run in the build directory - checkPhase = '' + preCheck = '' cd build/lib - pytest ''; meta = { diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index 68da058194b..0a3fa27a808 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd"; + sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4="; }; # Coverage is under 100 % due to the excluded tests diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index fa1dfc6870b..e5194e36bd2 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -20,6 +20,12 @@ buildPythonPackage rec { hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'httpx>=0.16, <0.18' 'httpx' \ + --replace 'httpcore==0.12.*' 'httpcore' + ''; + propagatedBuildInputs = [ httpx sanic websockets httpcore ]; # `sanic` is explicitly set to null when building `sanic` itself diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index d2f79c18348..329b225b576 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,11 +1,12 @@ { lib , fetchPypi +, fetchpatch , buildPythonPackage , aplpy , joblib , astropy , radio_beam -, pytest +, pytestCheckHook , pytest-astropy , astropy-helpers }: @@ -20,13 +21,18 @@ buildPythonPackage rec { sha256 = "17zisr26syfb8kn89xj17lrdycm0hsmy5yp5zrn236wgd8rjriki"; }; + patches = [ + # Fix compatibility with radio_beam >= 0.3.3. Will be included + # in the next release of spectral cube > 0.5.0 + (fetchpatch { + url = "https://github.com/radio-astro-tools/spectral-cube/commit/bbe4295ebef7dfa6fe4474275a29acd6cb0cb544.patch"; + sha256 = "1qddfm3364kc34yf6wd9nd6rxh4qc2v5pqilvz9adwb4a50z28bf"; + }) + ]; + nativeBuildInputs = [ astropy-helpers ]; propagatedBuildInputs = [ astropy radio_beam joblib ]; - checkInputs = [ aplpy pytest pytest-astropy ]; - - checkPhase = '' - pytest spectral_cube - ''; + checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 65eb6abb046..2de1e3fd5ff 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -11,6 +11,7 @@ , beautifulsoup4 , drms , glymur +, h5netcdf , hypothesis , matplotlib , numpy @@ -50,6 +51,7 @@ buildPythonPackage rec { pandas astropy astropy-helpers + h5netcdf parfive sqlalchemy scikitimage diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index e76b62d45cb..c8339fe6d85 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.3"; + version = "3.14.4"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zns2XcydY4xxgF8FB6eje0pAt0DZnFOIAqXaSX0xoMg="; + sha256 = "sha256-RFVn5aL5MqsB7heDPVUci3Eyq6F/qo3RmdEaZbsC+Ng="; }; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index e5883501f81..833f87e4a02 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-nlNft9jOp8V8ks32LOb4wUTkRrXJ5K49gbHuRmCKz/0="; + sha256 = "sha256-u2roJsZZ5oG2dHo4kmSsoySjm1HRQJ659+D2M+LezCc="; }; vendorSha256 = "sha256-tS8YCGVOsfQp02vY6brmE3pxi70GG9DYcp1JDkcVG9Y="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index 43f13b2e995..b59e5a4d33d 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "7.6.1"; + version = "7.7.2"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjX8xfwv/DOogji+OQCB9l5ebGBNoLW722TGpZ5Wg80="; + sha256 = "sha256-ocibNgH2xw0BrJRmHCAahO6hPLmlDmwjjzo7mMWp9FU="; }; - cargoSha256 = "sha256-ku+tI0DIofV0EZ413sPjbJDUSqwTxiT8NWBeURrJW1k="; + cargoSha256 = "sha256-6ztMEfVOlsyUtIeH+Qd/l7khC7XOHKc4bWsDd27RNu8="; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 9e63dcf9145..d13481804c4 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, SystemConfiguration, CoreFoundation, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration CoreFoundation Security libiconv ]; meta = with lib; { description = diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index ce0e1e7c3f4..c5774aeb21a 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.10.1"; + version = "2.10.2"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "1galibrk4fx4qwa6q17mmwlikx78nmhgv1h98haiyak666cinzcq"; + sha256 = "0fkkjkybjshgzbkc933jscxyxqwmqnhq3718pnw9hsac8qv0grrz"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8d0333e8fd6..c279edee2f1 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.16"; + version = "5.11.18"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b"; + sha256 = "0fz0s6bdcvbzy1149acqkq3aqg481dwiq85wh7ii1hx6p1gbsx71"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 1f5cf028a28..bad7622771a 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.8"; + version = "4.0.9"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "16qbmysiyrvb1inbbdr8qwqa0c6h9mwyrbx4ry18x0kvrhmqamdc"; + sha256 = "0az56xpvhqiwmf9wfxzaz89s5idrgd9ynd13psscw3hlx480dkqz"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 8d89352b90e..791de67e52d 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl # native deps. , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "9d4d6b7bcdf114acc948e5ee68c83fcbb3944f48a13b9751dbbbc190cdd729c9"; + sha256 = "8b6f447d5fe93422d4c129a2d4004a977369c3aa6e55258ead1cbd488bc01436"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 0cbfc89bd5d..c143c44704b 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-nzY+pCkj0/m7cWPq5+xvQ1b1/PqdI6QuxNdTRT030tY="; + sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58="; }; - cargoSha256 = "sha256-L2ohowt5+F3XJSzoihtJ2prW2bzZiNMUL9vqHIZBy1M="; + cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 83f62a2f1c1..ecfa1675a4e 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.46.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-fPs9xB27fxUnsXndqpcifmMPGA8hEyeYC7tq+W9eBKI="; + sha256 = "sha256-fJL6Fs2rt3Q26cUww0Ca/FZnRN7/KHtp9mHUrpwTLuY="; }; - vendorSha256 = "sha256-ZC5Rk5HcnxU9X5o/t+oz8qx36WjOVYVEXxxa875UrZk="; + vendorSha256 = "sha256-SeO5RNpGrA28xOKr7EoRtMtyOlAPFYEAFtodhIbe1Zk="; doCheck = false; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index e1c2844813d..f0c1e35885b 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.03.30"; + version = "2021.04.26"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-eOQbvs/mtFn7AmvSezO/jRm8+cO5tF7ggcF9DwwfqVc="; + sha256 = "sha256-L6SfPRVIclAVloYfZ+kKfZaGHYnYNAgToRN2e5ZfJZ4="; }; meta = with lib; { diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 4cab99d69fa..071538d1703 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210430"; + version = "1.1.0-dev-20210504"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk="; + sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 2227ff40299..454352986ed 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that compares two images using a perceptually based image metric"; homepage = "https://github.com/myint/perceptualdiff"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.x86; }; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 55bd5910054..41007207299 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -2,12 +2,15 @@ stdenv.mkDerivation rec { pname = "burpsuite"; - version = "2020.12.1"; + version = "2021.4.2"; src = fetchurl { name = "burpsuite.jar"; - url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0="; + urls = [ + "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + ]; + sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa"; }; dontUnpack = true; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index a6e767c6bf6..9b715f4bb14 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.2"; + version = "0.37.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; + sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI="; }; vendorSha256 = null; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index ba3c51822e9..8a4d5d44b8d 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.10"; + name = "DisnixWebService-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; - sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10.1/DisnixWebService-0.10.1.tar.gz"; + sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = "\${env.out}"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 14be0924f27..c7b3b72e2ea 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, dysnomia, libintl, libiconv }: stdenv.mkDerivation { - name = "disnix-0.10"; + name = "disnix-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; - sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10.1/disnix-0.10.1.tar.gz"; + sha256 = "13rjw1va7l8w7ir73xqxq4zb3ig2iwhiwxhp5dbfv0z3gnqizghq"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; + buildInputs = [ glib libxml2 libxslt getopt libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 1b9d2eaefcd..f9a8221e5f0 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: stdenv.mkDerivation { - name = "disnixos-0.9"; + name = "disnixos-0.9.1"; src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; - sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9.1/disnixos-0.9.1.tar.gz"; + sha256 = "1n2psq1b8bg340i2i0yf5xy2rf78fwqd3wj342wcmq09cv2v8d1b"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index b4c3851a50f..653def89027 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix }: stdenv.mkDerivation rec { - version="2020-07-04"; + version="2020-11-02"; name = "dydisnix-${version}"; src = fetchFromGitHub { owner = "svanderburg"; repo = "dydisnix"; - rev = "e99091f1c2329d562097e35faedee80622d387f0"; - sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + rev = "12ca1516bc1e5d161ac68f5d8252a0a2f353c8cf"; + sha256 = "00f341274hwwil8mlgcgq331vfca9sscvpdbgkxsjvbhcqd8qa52"; }; nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; preConfigure = '' ./bootstrap ''; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 56ba16afb47..0475e04cb69 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null, nginx ? null, s6-rc ? null, xinetd ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -10,7 +10,10 @@ , enableMongoDatabase ? false , enableInfluxDatabase ? false , enableSupervisordProgram ? false -, enableDockerContainer ? true +, enableDockerContainer ? false +, enableNginxWebApplication ? false +, enableXinetdService ? false +, enableS6RCService ? false , enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" @@ -25,16 +28,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; assert enableSupervisordProgram -> supervisor != null; assert enableDockerContainer -> docker != null; +assert enableNginxWebApplication -> nginx != null; +assert enableS6RCService -> s6-rc != null; +assert enableXinetdService -> xinetd != null; stdenv.mkDerivation { - name = "dysnomia-0.10"; + name = "dysnomia-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; + sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; }; - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = [ (if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableAxis2WebService then "--with-axis2" else "--without-axis2") @@ -47,6 +51,10 @@ stdenv.mkDerivation { (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableDockerContainer then "--with-docker" else "--without-docker") + (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") + (if enableXinetdService then "--with-xinetd" else "--without-xinetd") + (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") + (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; @@ -56,11 +64,13 @@ stdenv.mkDerivation { ++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion - ++ lib.optional enableMongoDatabase mongodb - ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] ++ lib.optional enableInfluxDatabase influxdb ++ lib.optional enableSupervisordProgram supervisor - ++ lib.optional enableDockerContainer docker; + ++ lib.optional enableDockerContainer docker + ++ lib.optional enableNginxWebApplication nginx + ++ lib.optional enableS6RCService s6-rc + ++ lib.optional enableXinetdService xinetd; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 4e9b24818b4..54c9bfa1f4b 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles, python3, libxcb, AppKit, libiconv }: rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PtXTC0VufUR5kle9C5KhCHHEQtQZvTTU1Q/cRMCB1g0="; + sha256 = "sha256-Mh56VjFHwjiZ0fvOF3fFw+1IU5HwkRdMlFrt3tZjcZY="; }; - cargoSha256 = "sha256-S2czYglyHRkRN3Dq5reXFOaB1i/oIHXTY8Ile+Twvzo="; + cargoSha256 = "sha256-hjUDLA5vNCCIEFQsAhv3hDur1LIGQKYO2rR6AoEb+wA="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ ] ++ lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ++ lib.optionals stdenv.isDarwin [ AppKit libiconv ]; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d896cd76b50..9b6bd671fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20801,7 +20801,7 @@ in prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); - qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; }); + qemu_full = lowPrio (qemu.override { smbdSupport = true; cephSupport = true; glusterfsSupport = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. @@ -27568,7 +27568,7 @@ in zcash = callPackage ../applications/blockchains/zcash { stdenv = llvmPackages_11.stdenv; }; - openethereum = callPackage ../applications/blockchains/openethereum { }; + openethereum = callPackage ../applications/blockchains/openethereum { stdenv = llvmPackages_12.stdenv; }; parity-ui = callPackage ../applications/blockchains/parity-ui { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3bbcb453a3c..6aa23a22713 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -31,6 +31,8 @@ lib.makeScope pkgs.newScope (self: with self; { composer1 = callPackage ../development/php-packages/composer/1.x.nix { }; + deployer = callPackage ../development/php-packages/deployer { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };