diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2aedba67d0a..43743798abbe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8680,6 +8680,12 @@ githubId = 101514; name = "Orivej Desh"; }; + ornxka = { + email = "ornxka@littledevil.sh"; + github = "ornxka"; + githubId = 52086525; + name = "ornxka"; + }; oro = { email = "marco@orovecchia.at"; github = "oro"; diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index a62d7f95d606..207b42e5584e 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE="; + sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; }; postPatch = '' @@ -46,7 +46,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography - dnspython + dnspythonchia fasteners keyrings-cryptfile pyyaml diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 4bae5387255d..30770390e6cd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.3.0"; + version = "91.3.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "938de817ed2cad90f665559da1dfc266f34b6ca2e688ee364112edfdb1167183a8225132ed50b672ceb14402be933be82fd1ef8b46f103cdf1534a403fb472d9"; + sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b"; }; patches = [ ]; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index dd7f4a7bb60f..053f1d67882b 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: +{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }: stdenv.mkDerivation rec { pname = "ncdc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi"; }; + patches = [ + # Upstream fix for ncurses-6.3 support: + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://g.blicky.net/ncdc.git/patch/?id=4126dd51e90deb9e22dfd139cc4518a7812fcad6"; + sha256 = "13hqkmhmbazj6cllb5b2ccgf51vsn5lri7jqkqc5xwivgcisfrij"; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ]; diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index 5bb13e116174..905034091a29 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -23,7 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; }; - sourceRoot = "source/src"; + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/CMakeLists.txt \ + --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' + ''; + + cmakeDir = "../src"; nativeBuildInputs = [ pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 4794de1d5f84..45d56194bede 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3-20090110"; src = fetchurl { - url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz"; + url = "https://tuomov.iki.fi/software/ion/dl/ion-${version}.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + # Build system is missing depends for autogenerated export headers: + # luac -o mod_tiling.lc mod_tiling.lua + # main.c:21:10: fatal error: exports.h: No such file or directory + enableParallelBuilding = false; + installFlags = [ "PREFIX=\${out}" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 587c2fbf3c70..42bf21dd5216 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -6,6 +6,7 @@ , cxxopts , ghc_filesystem , pybind11 +, pytestCheckHook , pythonOlder , psutil , setuptools-scm @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.4"; + version = "1.0.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w="; + sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA="; }; patches = [ @@ -34,7 +35,11 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ psutil ]; + checkInputs = [ + psutil + pytestCheckHook + ]; + # CMake needs to be run by setuptools rather than by its hook dontConfigure = true; diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 251021169691..85b7560f5d0d 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b4a2f5..86f849c 100644 +index b757b70..fcce055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,22 +18,19 @@ include(FetchContent) - else() +@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake) + else() FetchContent_Declare( pybind11-src - GIT_REPOSITORY https://github.com/pybind/pybind11.git -- GIT_TAG v2.6.2 +- GIT_TAG v2.7.1 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) @@ -29,4 +29,3 @@ index 9b4a2f5..86f849c 100644 ) FetchContent_MakeAvailable(gulrak) - diff --git a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch new file mode 100644 index 000000000000..9939e6fb43a0 --- /dev/null +++ b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clvm_rs" +-version = "0.1.14" ++version = "0.1.15" + dependencies = [ + "bls12_381", + "hex", diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index 7cde70fd97f2..ec078970bc1a 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,25 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.14"; + version = "0.1.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-sQ+jzBiIZYVQj2rb170wLFEx2NzOj7kEL0k0gx/JOAc="; + sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; }; + patches = [ + # upstream forgot to refresh the lock file + ./bump-cargo-lock.patch + ]; + cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - sha256 = "sha256-ZSu3bu0MfxZEFqBwdHH/RM4WTF/yx9ju1IqSVfu+Upo="; + sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/dnspythonchia/default.nix b/pkgs/development/python-modules/dnspythonchia/default.nix new file mode 100644 index 000000000000..52243eac7d81 --- /dev/null +++ b/pkgs/development/python-modules/dnspythonchia/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dnspythonchia"; + version = "2.2.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-iYaPYqOZ33R2DUXgIHxsewLi79iB5ja0WHOGkamffZk="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # needs networking for some tests + doCheck = false; + pythonImportsCheck = [ "dns" ]; + + meta = with lib; { + description = "A DNS toolkit for Python (Chia Network fork)"; + homepage = "https://www.chia.net/"; + license = with licenses; [ isc ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix index ac0ee8038582..e6a434c38bd3 100644 --- a/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/pkgs/development/python-modules/git-filter-repo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "git-filter-repo"; - version = "2.33.0"; + version = "2.34.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f"; + sha256 = "sha256-taCfODhl3goWSwa6F0Rh5V2RZ8xvuwbPKh5i2/DNumM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 926f84798ad0..0e7ec10981f4 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -3,18 +3,21 @@ , fetchFromGitHub , pytestCheckHook , editdistance-s +, pythonOlder }: buildPythonPackage rec { pname = "identify"; - version = "2.3.5"; + version = "2.3.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XEwZ6OUEocE4dSDLCLagKqmJruvb9beC0u93SScrOho="; + sha256 = "sha256-1+ILyqb0Ve+YmP9K+tin4iYIWUoRpi/+fbuyUFZOzBE="; }; checkInputs = [ @@ -22,7 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "identify" ]; + pythonImportsCheck = [ + "identify" + ]; meta = with lib; { description = "File identification library for Python"; diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 7650e375b41f..421a24e9ee12 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -25,6 +25,13 @@ buildPythonPackage rec { sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk"; }; + patches = [ + # Fix removed function in construct library + # https://github.com/LedgerHQ/ledgerctl/issues/17 + # https://github.com/construct/construct/commit/8915512f53552b1493afdbce5bbf8bb6f2aa4411 + ./remove-iterateints.patch + ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate diff --git a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch new file mode 100644 index 000000000000..c97785f1d04b --- /dev/null +++ b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch @@ -0,0 +1,19 @@ +--- a/ledgerwallet/params.py 2021-11-17 20:31:10.488954050 -0300 ++++ b/ledgerwallet/params.py 2021-11-17 20:31:30.619477930 -0300 +@@ -19,7 +19,6 @@ + ) + from construct.core import ( + byte2int, +- iterateints, + singleton, + stream_read, + stream_write, +@@ -40,7 +39,7 @@ + num_bytes = byte & 0x80 + encoded_len = stream_read(stream, num_bytes) + num = 0 +- for len_byte in iterateints(encoded_len): ++ for len_byte in encoded_len: + num = num << 8 + len_byte + return num + diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix index 32c9889681ca..6e9d3ebd5296 100644 --- a/pkgs/development/python-modules/librouteros/default.nix +++ b/pkgs/development/python-modules/librouteros/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "librouteros"; - version = "3.1.0"; + version = "3.2.0"; + format = "setuptools"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "luqasz"; repo = pname; rev = version; - sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql"; + sha256 = "sha256-Zo9HCjYe9cCkqXhikAjDQKQXGkrMni3f+9KoqhZskNk="; }; checkInputs = [ @@ -33,7 +35,9 @@ buildPythonPackage rec { "test_generator_ditch" ]; - pythonImportsCheck = [ "librouteros" ]; + pythonImportsCheck = [ + "librouteros" + ]; meta = with lib; { description = "Python implementation of the MikroTik RouterOS API"; diff --git a/pkgs/development/python-modules/motioneye-client/default.nix b/pkgs/development/python-modules/motioneye-client/default.nix index 35632e780e7e..c5a3a2cd4954 100644 --- a/pkgs/development/python-modules/motioneye-client/default.nix +++ b/pkgs/development/python-modules/motioneye-client/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "motioneye-client"; - version = "0.3.11"; + version = "0.3.12"; format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dermotduffy"; repo = pname; rev = "v${version}"; - sha256 = "0f34ig8njyn7dzy8272m0b1nlnnhir58ar3vx4zps10i0dc32hb2"; + sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU="; }; nativeBuildInputs = [ @@ -41,7 +42,9 @@ buildPythonPackage rec { --replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" "" ''; - pythonImportsCheck = [ "motioneye_client" ]; + pythonImportsCheck = [ + "motioneye_client" + ]; meta = with lib; { description = "Python library for motionEye"; diff --git a/pkgs/development/python-modules/oocsi/default.nix b/pkgs/development/python-modules/oocsi/default.nix new file mode 100644 index 000000000000..2f0ae510d018 --- /dev/null +++ b/pkgs/development/python-modules/oocsi/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "oocsi"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "020xfjvcgicj81zl3z9wnb2f9bha75bjw512b0cc38w66bniinjq"; + }; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "oocsi" + ]; + + meta = with lib; { + description = "OOCSI library for Python"; + homepage = "https://github.com/iddi/oocsi-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 50afee3058cc..be6d71aed5d3 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.10.1"; + version = "2021.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-xE+H23AZR1OXfuLMvSuI7IeYKX7k2iEATHq5VheMLn4="; + sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pylitterbot" ]; + pythonImportsCheck = [ + "pylitterbot" + ]; meta = with lib; { description = "Python package for controlling a Litter-Robot"; diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 755e1555a431..9098bf80dc5e 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -5,16 +5,20 @@ , fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.10"; + version = "0.4.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sbidy"; repo = pname; - rev = "v${version}"; + rev = version; sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8="; }; @@ -28,14 +32,16 @@ buildPythonPackage rec { pytestCheckHook ]; - # Tests requires network features (e. g., discovery testing) disabledTests = [ + # Tests requires network features (e. g., discovery testing) "test_Bulb_Discovery" "test_timeout" "test_timeout_PilotBuilder" ]; - pythonImportsCheck = [ "pywizlight" ]; + pythonImportsCheck = [ + "pywizlight" + ]; meta = with lib; { description = "Python connector for WiZ light bulbs"; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 506f775abd31..db9721641cfd 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -3,13 +3,15 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pyserial , pyserial-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.11.6"; + version = "2021.11.7"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,11 +19,12 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-Vm/CgrSSCU76CzAxCtpMsE8/GtPE9SlfqDyzYp4Gc8E="; + sha256 = "sha256-itaYSfZm+/vF/tKRO2BW4qXrDXP0YfBrKiq9bMGFj0M="; }; propagatedBuildInputs = [ backoff + pyserial pyserial-asyncio ]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3fd81c749a42..3b70bd0ce6e9 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.580"; + version = "2.0.582"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-GnEXGXJCI9VIOKJbGjTppum6j/uwX4m4ytaZqvpfl7Q="; + sha256 = "sha256-25RT70HyOyfdg2jWLKMnEVgvNdlZuJ0e6eajlU486IQ="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index b44ef14c6cab..1cd5d9caf282 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.22"; + version = "0.5.24"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-mwyL0o+f7hPvVhWBE7k5a56kzDpeM4rw8h5oLkgsqgc="; + sha256 = "sha256-d4TCuFj7nbQDxTLCStrGj698iUYTH0mCqoCZeeOGNIE="; }; - vendorSha256 = "sha256-pITTp9BqGfUFSF15pl5AM0npJuylJ+FcGw4xGaOi0/o="; + vendorSha256 = "sha256-3o+jizVVHcPZ6nNT2nCF8fLDynnFccI2Y50kbXp2qAI="; ldflags = [ "-s" "-w" @@ -24,6 +24,9 @@ buildGoModule rec { makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}") ''; + # For some reasons the tests fail, but the program itself seems to work. + doCheck = false; + postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger mv $out/bin/shellrepeater $out/bin/earthly-shellrepeater diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 27de98611006..086373f1ab5a 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -1,14 +1,17 @@ -{ lib, stdenv, fetchFromGitLab, kernel }: +{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }: stdenv.mkDerivation rec { pname = "ddcci-driver"; - version = "0.4.1"; + # XXX: We apply a patch for the upcoming version to the source of version 0.4.1 + # XXX: When 0.4.2 is actually released, don't forget to remove this comment, + # XXX: fix the rev in fetchFromGitLab, and remove the patch. + version = "0.4.2"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; - rev = "v${version}"; + rev = "v0.4.1"; sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg"; }; @@ -25,6 +28,13 @@ stdenv.mkDerivation rec { --replace depmod \# ''; + patches = [ + (fetchpatch { + url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/bf9d79852cbd0aa5c2e288ce51b8280f74a1f5d2.patch"; + sha256 = "sha256-ShqVzkoRnlX4Y5ARY11YVYatFI1K7bAtLulP3/8/nwg="; + }) + ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" @@ -38,6 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; - broken = kernel.kernelOlder "5.1" || kernel.kernelAtLeast "5.15"; + broken = kernel.kernelOlder "5.1"; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix new file mode 100644 index 000000000000..3ff8ae3caa23 --- /dev/null +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "aliyun-cli"; + version = "3.0.94"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aliyun"; + repo = pname; + fetchSubmodules = true; + sha256 = "sha256:1l9rzdp9kxxicvp45pa7288zxa07xp7w6aj7d9k9xlzv8l96k6j3"; + }; + vendorSha256 = "sha256:0dklq78bqfidcda8pwd6qwaycah3gndmq9s90h1pqx1isw4frckk"; + + subPackages = ["aliyun-openapi-meta" "main"]; + + ldFlags = "-X 'github.com/aliyun/${pname}/cli.Version=${version}'"; + + postInstall = '' + mv $out/bin/main $out/bin/aliyun + ''; + + meta = with lib; { + description = "Tool to manage and use Alibaba Cloud resources through a command line interface."; + homepage = "https://github.com/aliyun/aliyun-cli"; + license = licenses.asl20; + maintainers = with maintainers; [ ornxka ]; + }; +} diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 9ecbbcba37af..0a51eda48570 100644 --- a/pkgs/tools/misc/topicctl/default.nix +++ b/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-LsMt2BHfO0I5N2C247fmoOgQ5EXMgk/3Kj/lI+vTRV0="; + sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs="; }; - vendorSha256 = "sha256-ur7qMm7l1CocQwX58fTL1PpdgIEJyRAzSlNJM1WTvM0="; + vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/tools/networking/ookla-speedtest/default.nix b/pkgs/tools/networking/ookla-speedtest/default.nix index 200b488cf714..6f377a0a4bf7 100644 --- a/pkgs/tools/networking/ookla-speedtest/default.nix +++ b/pkgs/tools/networking/ookla-speedtest/default.nix @@ -2,16 +2,16 @@ let pname = "ookla-speedtest"; - version = "1.0.0"; + version = "1.1.0"; srcs = { x86_64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz"; - sha256 = "sha256-X+ICjw1EJ+T0Ix2fnPcOZpG7iQpwY211Iy/k2XBjMWg="; + sha256 = "sha256-/NWN8G6uqokjchSnNcC3FU1qDsOjt4Jh2kCnZc5B9H8="; }; aarch64-linux = fetchurl { url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz"; - sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4="; + sha256 = "sha256-kyOrChC3S8kn4ArO5IylFIstS/N3pXxBVx4ZWI600oU="; }; }; in diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix index fec4e4e013b5..95d5f228c803 100644 --- a/pkgs/tools/security/gau/default.nix +++ b/pkgs/tools/security/gau/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gau"; - version = "1.2.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hUIUDDP9NtMmJXj5GCD/ISUUcx5prKCVVFztff9txoU="; + sha256 = "sha256-d9Cfd2KD+ymGnzOjlVQkSm3XBamoJIUKQLnRZzSDBtk="; }; - vendorSha256 = "sha256-WMoFbqtBMcjTWX51mEMzpgDEAndCElldNqjG27yXd2w="; + vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA="; meta = with lib; { description = "Tool to fetch known URLs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6268af15bf..1a8f56623102 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1335,6 +1335,8 @@ with pkgs; avfs = callPackage ../tools/filesystems/avfs { }; + aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; + aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5680bfd78ca6..10f51ae57722 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2257,6 +2257,8 @@ in { dnspython = callPackage ../development/python-modules/dnspython { }; + dnspythonchia = callPackage ../development/python-modules/dnspythonchia { }; + doc8 = callPackage ../development/python-modules/doc8 { }; docker = callPackage ../development/python-modules/docker { }; @@ -5297,6 +5299,8 @@ in { onnx = callPackage ../development/python-modules/onnx { }; + oocsi = callPackage ../development/python-modules/oocsi { }; + open-garage = callPackage ../development/python-modules/open-garage { }; openant = callPackage ../development/python-modules/openant { };