Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 6ed7100e a02cedf3

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