diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a03d2e4b9318..1a950838ab0c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2812,6 +2812,12 @@ email = "d4delta@outlook.fr"; name = "Delta"; }; + deltadelta = { + email = "contact@libellules.eu"; + name = "Dara Ly"; + github = "tournemire"; + githubId = 20159432; + }; deltaevo = { email = "deltaduartedavid@gmail.com"; github = "DeltaEvo"; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 70152c5d6624..7d8fc08b60e3 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -67,15 +67,11 @@ let (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); - pull = dir: - if isStorePath pkgs.path - then "${builtins.storePath pkgs.path}/${dir}" - else filter "${toString pkgs.path}/${dir}"; in pkgs.runCommand "lazy-options.json" { - libPath = pull "lib"; - pkgsLibPath = pull "pkgs/pkgs-lib"; - nixosPath = pull "nixos"; + libPath = filter "${toString pkgs.path}/lib"; + pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; + nixosPath = filter "${toString pkgs.path}/nixos"; modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; } '' export NIX_STORE_DIR=$TMPDIR/store diff --git a/pkgs/applications/blockchains/bitcoin-classic/default.nix b/pkgs/applications/blockchains/bitcoin-classic/default.nix index 533e3c7dca6e..8aacb50a1b54 100644 --- a/pkgs/applications/blockchains/bitcoin-classic/default.nix +++ b/pkgs/applications/blockchains/bitcoin-classic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk="; + sha256 = "sha256-fVmFD1B4kKoejd2cmPPF5TJJQTAA6AVsGlVY8IIUNK4="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 384ca820d505..72941e3f23e5 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -5,8 +5,8 @@ let description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; }; - latest = { version = "2.3.57.8"; sha256 = "sha256-k1G9sFukYyCqVeJIbYgjJX9T8zqmFTmjmj9OXZ78+LY="; }; + stable = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; + latest = { version = "2.3.57.9"; sha256 = "sha256-JWZ6PdzKwxdyp7StYuW69XGbTPoxaIJ2R4Ynmc65hvE="; }; }; override = { version, sha256 }: super: { diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix new file mode 100644 index 000000000000..4c8f356cdf47 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: + +let + configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); +in stdenv.mkDerivation rec { + pname = "cinny"; + version = "1.6.1"; + + src = fetchurl { + url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; + sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -R . $out/ + ${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + + meta = with lib; { + description = "Yet another Matrix client for the web"; + homepage = "https://cinny.in/"; + maintainers = with maintainers; [ abbe ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 03659e0ba40f..ac3beb54f6ec 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.56"; + version = "1.0.0-alpha.57"; src = fetchCrate { inherit version pname; - sha256 = "zV4F4dbjJ58yGiupUwj5Z0HrKR78Mzch8Zs98YfxSTQ="; + sha256 = "sha256-HhGUoO8UHJkfQ5QQ/H+PT8mqvdPb8Ok4D3j7QArLBeA="; }; - cargoSha256 = "JQGBTCNu9U2Kq6tc7VT07LEbzLW+jdVWrK5e2qjzGRA="; + cargoSha256 = "sha256-SyyJqUC7bCUJf53/+GJ/7+huab8hycNABwAFaHHmJtY="; doCheck = false; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 13c611ca8cc6..4b2907ed3078 100644 --- a/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index e30db5fcd954..10b89b91b96f 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 5874a91e03c8..019148039d17 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_XRAY=OFF" "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix index 3e0a63b5e28c..9583be923939 100644 --- a/pkgs/development/interpreters/clojure/obb.nix +++ b/pkgs/development/interpreters/clojure/obb.nix @@ -6,7 +6,8 @@ , clojure , git , jdk -, callPackage +, obb +, fetchFromGitHub , makeWrapper , runCommand }: @@ -14,9 +15,11 @@ stdenv.mkDerivation rec { pname = "obb"; version = "0.0.1"; - src = fetchurl { - url = "https://github.com/babashka/${pname}/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-ZVd3VCJ7vdQGQ7iY5v2b+gRX/Ni0/03hzqBElqpPvpI="; + src = fetchFromGitHub { + owner = "babashka"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc="; }; nativeBuildInputs = [ makeWrapper ]; @@ -61,11 +64,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; - doInstallCheck = true; - installCheckPhase = '' - [ $($out/bin/obb -e '(+ 1 2)') = '3' ] - ''; - + passthru.tests = { + simple = runCommand "${pname}-test" {} '' + [ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ] + touch $out + ''; + }; meta = with lib; { description = "Ad-hoc ClojureScript scripting of Mac applications via Apple's Open Scripting Architecture"; diff --git a/pkgs/development/ocaml-modules/dbf/default.nix b/pkgs/development/ocaml-modules/dbf/default.nix new file mode 100644 index 000000000000..d2dad611bf46 --- /dev/null +++ b/pkgs/development/ocaml-modules/dbf/default.nix @@ -0,0 +1,28 @@ +{ lib, buildDunePackage, fetchFromGitHub, ppx_cstruct, rresult, cstruct-unix +, core_kernel }: + +buildDunePackage rec { + pname = "dbf"; + version = "0.1.1"; + + minimalOCamlVersion = "4.08"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "pveber"; + repo = "dbf"; + rev = "${version}"; + sha256 = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g="; + }; + + buildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ rresult cstruct-unix core_kernel ]; + + meta = with lib; { + description = "DBF format parsing"; + homepage = "https://github.com/pveber/dbf"; + license = licenses.isc; + maintainers = [ maintainers.deltadelta ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index f4ec1c184627..92d377d0886c 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -1,30 +1,40 @@ { lib -, buildPythonPackage -, fetchPypi -, psutil -, pexpect -, python-daemon -, pyyaml -, six , stdenv , ansible +, buildPythonPackage +, fetchPypi , mock , openssh +, pexpect +, psutil , pytest-mock , pytest-timeout , pytest-xdist , pytestCheckHook +, python-daemon +, pyyaml +, six }: buildPythonPackage rec { pname = "ansible-runner"; version = "2.1.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "7684612f7543c5f07f3e8135667eeb22a9dbd98f625cc69901ba9924329ef24f"; + hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8="; }; + propagatedBuildInputs = [ + ansible + psutil + pexpect + python-daemon + pyyaml + six + ]; + checkInputs = [ ansible # required to place ansible CLI onto the PATH in tests pytestCheckHook @@ -35,44 +45,45 @@ buildPythonPackage rec { openssh ]; - propagatedBuildInputs = [ - ansible - psutil - pexpect - python-daemon - pyyaml - six - ]; - preCheck = '' export HOME=$(mktemp -d) + export PATH="$PATH:$out/bin"; ''; disabledTests = [ - "test_callback_plugin_task_args_leak" # requires internet + # Requires network access + "test_callback_plugin_task_args_leak" "test_env_accuracy" - "test_large_stdout_blob" # times out on slower hardware - ] + # Times out on slower hardware + "test_large_stdout_blob" + # Failed: DID NOT RAISE + "test_validate_pattern" + ] ++ lib.optional stdenv.isDarwin [ # test_process_isolation_settings is currently broken on Darwin Catalina # https://github.com/ansible/ansible-runner/issues/413 - ++ lib.optional stdenv.isDarwin "process_isolation_settings"; + "process_isolation_settings" + ]; disabledTestPaths = [ - # these tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918) + # These tests unset PATH and then run executables like `bash` (see https://github.com/ansible/ansible-runner/pull/918) "test/integration/test_runner.py" "test/unit/test_runner.py" ] ++ lib.optionals stdenv.isDarwin [ - # integration tests on Darwin are not regularly passing in ansible-runner's own CI + # Integration tests on Darwin are not regularly passing in ansible-runner's own CI "test/integration" - # these tests write to `/tmp` which is not writable on Darwin + # These tests write to `/tmp` which is not writable on Darwin "test/unit/config/test__base.py" ]; + pythonImportsCheck = [ + "ansible_runner" + ]; + meta = with lib; { description = "Helps when interfacing with Ansible"; homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 38653306eefb..4262efb1a317 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.9"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-qh3Z8Gza8J3OEM94GguJ+oEdVle01Gx1m/7+LCOErKY="; + sha256 = "sha256-zQoG7clqDAxwJIt0AQcj8kKGODL61ODc4inP2Ll+Jt8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index 1085f4030c1e..c0863a5b3945 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -3,24 +3,36 @@ , cffi , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.6.0"; + version = "0.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ec2bf8d5799c4b5bbfbae30a4a1dfcb06512f2e17e9ee60ba7e1d390318582fc"; + sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk="; }; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "cmarkgfm" ]; + pythonImportsCheck = [ + "cmarkgfm" + ]; meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; diff --git a/pkgs/development/python-modules/deemix/default.nix b/pkgs/development/python-modules/deemix/default.nix index cf54f6facf82..e9bbb8a63773 100644 --- a/pkgs/development/python-modules/deemix/default.nix +++ b/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.6.4"; + version = "3.6.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "268617b3ff9346ae51a063cbdb820c1f591cbadc1cf2fafd201dc671e721c1dd"; + sha256 = "c56245b2a2142dafb0658d60919ccf34e04e5d87720d5909e0e030521349a65a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 04bb5dda00ea..a0a4fb88e0cd 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.3.5"; + version = "9.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-4jyqdA/xoIEsfouIneGs3A9++sNG2kRUhDzteN0Td6w="; + sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index ebe281630930..a5a87f908d4f 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ephem"; - version = "4.1.2"; + version = "4.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "d65bf7c85d96ca830de82729d9ce54ba854a9625916d8765c1954c1f29680b76"; + sha256 = "sha256-f6GGhZgbpSjt1QQFKp1SEqCapb8VwRpzTtxqhuiotWo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index a898520f5992..bb271807a7b3 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.27.36"; + version = "0.27.40"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-Q84hDb7YnYU5L2IyL3aZ/16yRxViGlt8VX4vlMcykDA="; + sha256 = "sha256-imfdLomMjeGAyVBSygx+TV0DA9OrMreeSlzzrJ2B9cc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index c6e0dc18356b..66d05f2a355b 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "dask"; + owner = "fsspec"; repo = pname; rev = version; - sha256 = "sha256-BME40kyxZHx9+XrMCqWYp8+q6tjeYwAw/zISMNpQxDU="; + sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M="; }; propagatedBuildInputs = [ @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenient Filesystem interface over GCS"; - homepage = "https://github.com/dask/gcsfs"; + homepage = "https://github.com/fsspec/gcsfs"; license = licenses.bsd3; maintainers = with maintainers; [ nbren12 ]; }; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 9cb116a9a7a2..bf8bed9dd262 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.12.0"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-A7fuTSrXMTK0oz87htylWKb868+YR7FXYYEC3hSgG7o="; + sha256 = "sha256-9dR0qYoHVovD4fwJz6v+/RItMuqr2vA9YHn0nMGHUX0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index 02980956bb28..9083953009ad 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "parsy"; version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchFromGitHub { repo = "parsy"; @@ -11,13 +19,13 @@ buildPythonPackage rec { sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM="; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test tests - ''; - - disabled = pythonOlder "3.4"; + pythonImportsCheck = [ + "parsy" + ]; meta = with lib; { homepage = "https://github.com/python-parsy/parsy"; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index c039ff16b80e..d35a574029a4 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "6.2.0"; + version = "6.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "sha256-VBc2avJiIFQW1LYXQEvIZ/wZKMFJsCF9DDrxwL8dDnk="; + sha256 = "1cd6g5vix8k45ndx4aq4pvyyisqdp38gd2466jrlg8z9byandj0i"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 9e3b711718c3..878e36e5c07a 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -1,28 +1,55 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, matplotlib, numpy, pytestCheckHook, seaborn }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pytestCheckHook +, pythonOlder +, seaborn +}: buildPythonPackage rec { pname = "pycm"; version = "3.3"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { - owner = "sepandhaghighi"; - repo = pname; - rev = "v${version}"; + owner = "sepandhaghighi"; + repo = pname; + rev = "v${version}"; sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; }; - # remove a trivial dependency on the author's `art` Python ASCII art library + propagatedBuildInputs = [ + matplotlib + numpy + seaborn + ]; + + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' + # Remove a trivial dependency on the author's `art` Python ASCII art library rm pycm/__main__.py - rm Otherfiles/notebook_check.py # also depends on python3Packages.notebook - substituteInPlace setup.py --replace '=get_requires()' '=[]' + # Also depends on python3Packages.notebook + rm Otherfiles/notebook_check.py + substituteInPlace setup.py \ + --replace '=get_requires()' '=[]' ''; - checkInputs = [ pytestCheckHook ]; - disabledTests = [ "pycm.pycm_compare.Compare" ]; # output formatting error - propagatedBuildInputs = [ matplotlib numpy seaborn ]; + disabledTests = [ + # Output formatting error + "pycm.pycm_compare.Compare" + "plot_test" + ]; + + pythonImportsCheck = [ + "pycm" + ]; meta = with lib; { description = "Multiclass confusion matrix library"; diff --git a/pkgs/development/python-modules/pyebus/default.nix b/pkgs/development/python-modules/pyebus/default.nix index d4c8658673a0..5506c1fbf36e 100644 --- a/pkgs/development/python-modules/pyebus/default.nix +++ b/pkgs/development/python-modules/pyebus/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyebus"; - version = "1.2.4"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "i+p40s9SXey1lfXWW+PiXsA1kUF4o6Rk7QLmQ2ljN6g="; + sha256 = "sha256-6ooOSJAIi8vYmCjDHnbMGQJfPqPmzA5thDSg+iM7T+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 43d1494a58b0..ee2599a8fb75 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,13 +12,16 @@ }: buildPythonPackage rec { - pname = "readme_renderer"; - version = "30.0"; + pname = "readme-renderer"; + version = "32.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-gplwDXqRDDBAcqdgHq+tpnEqWwEaIBOUF+Gx6fBGRdg="; + pname = "readme_renderer"; + inherit version; + sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U="; }; propagatedBuildInputs = [ @@ -34,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "readme_renderer" ]; + pythonImportsCheck = [ + "readme_renderer" + ]; meta = with lib; { description = "Python library for rendering readme descriptions"; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 396dcf9b87d6..6517d15df579 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.15.2"; + version = "10.16.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0439fnzcqm2ixigica1fn5g6d3sdji9r699dsh3npwr4z44p2jkk"; + sha256 = "sha256-smeRZTMIDbK9pZRRj42BGj8ifQw9bTTE90rGaV/Up/4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index c645a850f497..817ba2dfc706 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -9,17 +9,35 @@ }: buildPythonPackage rec { - pname = "SQLObject"; + pname = "sqlobject"; version = "3.9.1"; + format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "SQLObject"; + inherit version; sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921"; }; - propagatedBuildInputs = [ FormEncode pastedeploy paste pydispatcher ]; + propagatedBuildInputs = [ + FormEncode + paste + pastedeploy + pydispatcher + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/sqlobject/sqlobject/issues/179 + "test_fail" + ]; + + pythonImportsCheck = [ + "sqlobject" + ]; meta = with lib; { description = "Object Relational Manager for providing an object interface to your database"; diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 204bb80e5870..299d8446cfb7 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , pythonOlder , h5py , matplotlib @@ -15,10 +17,10 @@ buildPythonPackage rec { pname = "sumo"; version = "2.2.5"; + format = "setuptools"; disabled = pythonOlder "3.6"; - # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; @@ -38,7 +40,18 @@ buildPythonPackage rec { castepxbin ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "castepxbin==0.1.0" "castepxbin>=0.1.0" + ''; + + pythonImportsCheck = [ + "sumo" + ]; meta = with lib; { description = "Toolkit for plotting and analysis of ab initio solid-state calculation data"; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index a142d9a9d9bf..706d8e428ff9 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ]; postInstall = '' - for shell in bash zsh; do + for shell in bash zsh fish; do HOME=$TMPDIR $out/bin/golangci-lint completion $shell > golangci-lint.$shell installShellCompletion golangci-lint.$shell done diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 61e7ca2812aa..a861d38ac662 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -473,7 +473,7 @@ let # Detect buffer overflows on the stack CC_STACKPROTECTOR_REGULAR = {optional = true; tristate = whenOlder "4.18" "y";}; - } // optionalAttrs stdenv.hostPlatform.isx86 { + } // optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; # Allow KVM guests to load SGX enclaves diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 5a975205a245..7924f6e6ab4a 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -75,7 +75,7 @@ let base = { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-a4ex19FMfiJsUEhWUYd2YXKgJ24Jnpoab2t6x9sUuyQ="; + sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 2fb985c79162..6a09ba4e0ec5 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-DJ7FGtcsWGk4caS22aXo+8chCcvEdRlVrSRmIHsETD4="; + sha256 = "sha256-GYbRu2ZEFswyOBUbg6jdAZQRogIDT/YolEElZT8h744="; }; - cargoSha256 ="sha256-dWdFBSZwTEvxrPiXtTWcYLtC+4XFb5R7Wu4r1YpHQRk="; + cargoSha256 = "sha256-ogWFAO3xMH4vho9SRjyeHCDxRtAx6exGkMpNhz2VOLA"; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/security/uddup/default.nix b/pkgs/tools/security/uddup/default.nix index 60c3609738d9..5cde218bacfe 100644 --- a/pkgs/tools/security/uddup/default.nix +++ b/pkgs/tools/security/uddup/default.nix @@ -1,13 +1,12 @@ { lib -, buildPythonApplication -, colorama , fetchFromGitHub -, pytestCheckHook +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "uddup"; version = "0.9.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "rotemreiss"; @@ -16,15 +15,17 @@ buildPythonApplication rec { sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ colorama ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ pytestCheckHook ]; - pythonImportsCheck = [ "uddup" ]; + pythonImportsCheck = [ + "uddup" + ]; meta = with lib; { description = "Tool for de-duplication URLs"; diff --git a/pkgs/tools/security/wafw00f/default.nix b/pkgs/tools/security/wafw00f/default.nix index dae4f5a5ad0c..0e363b608fd4 100644 --- a/pkgs/tools/security/wafw00f/default.nix +++ b/pkgs/tools/security/wafw00f/default.nix @@ -1,13 +1,12 @@ { lib -, buildPythonApplication , fetchFromGitHub -, pluginbase -, requests +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; version = "2.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; @@ -16,14 +15,17 @@ buildPythonApplication rec { sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ requests pluginbase ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "wafw00f" ]; + + pythonImportsCheck = [ + "wafw00f" + ]; meta = with lib; { description = "Tool to identify and fingerprint Web Application Firewalls (WAF)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dba10553bcb..4ee42f9cc0de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2504,6 +2504,8 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; + cinny = callPackage ../applications/networking/instant-messengers/cinny {}; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; @@ -15601,7 +15603,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - uddup = python3Packages.callPackage ../tools/security/uddup { }; + uddup = callPackage ../tools/security/uddup { }; udis86 = callPackage ../development/tools/udis86 { }; @@ -29392,7 +29394,7 @@ with pkgs; wad = callPackage ../tools/security/wad { }; - wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; + wafw00f = callPackage ../tools/security/wafw00f { }; whispers = callPackage ../tools/security/whispers { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index aed626868651..ab1c8704fbb0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -254,6 +254,8 @@ let data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; + dbf = callPackage ../development/ocaml-modules/dbf { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; diet = callPackage ../development/ocaml-modules/diet { };