Merge master into staging-next

Changed files
+265 -58
maintainers
pkgs
applications
blockchains
networking
mailreaders
thunderbird
p2p
video
ccextractor
window-managers
ion-3
development
python-modules
chiapos
clvm-rs
dnspythonchia
git-filter-repo
identify
ledgerwallet
librouteros
motioneye-client
oocsi
pylitterbot
pywizlight
velbus-aio
tools
analysis
checkov
earthly
os-specific
linux
ddcci
tools
admin
aliyun-cli
misc
topicctl
networking
ookla-speedtest
security
top-level
+6
maintainers/maintainer-list.nix
···
githubId = 101514;
name = "Orivej Desh";
};
oro = {
email = "marco@orovecchia.at";
github = "oro";
···
githubId = 101514;
name = "Orivej Desh";
};
+
ornxka = {
+
email = "ornxka@littledevil.sh";
+
github = "ornxka";
+
githubId = 52086525;
+
name = "ornxka";
+
};
oro = {
email = "marco@orovecchia.at";
github = "oro";
+3 -3
pkgs/applications/blockchains/chia/default.nix
···
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
-
version = "1.2.10";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
-
sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE=";
};
postPatch = ''
···
colorlog
concurrent-log-handler
cryptography
-
dnspython
fasteners
keyrings-cryptfile
pyyaml
···
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
+
version = "1.2.11";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
+
sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8=";
};
postPatch = ''
···
colorlog
concurrent-log-handler
cryptography
+
dnspythonchia
fasteners
keyrings-cryptfile
pyyaml
+2 -2
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
···
rec {
thunderbird = common rec {
pname = "thunderbird";
-
version = "91.3.0";
application = "comm/mail";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-
sha512 = "938de817ed2cad90f665559da1dfc266f34b6ca2e688ee364112edfdb1167183a8225132ed50b672ceb14402be933be82fd1ef8b46f103cdf1534a403fb472d9";
};
patches = [
];
···
rec {
thunderbird = common rec {
pname = "thunderbird";
+
version = "91.3.1";
application = "comm/mail";
binaryName = pname;
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
+
sha512 = "4938f676ddeeba37da1f2086d76a2ef2c870738169f7e10b35b83e4ed772df634825ee25c28232df1ac1e3a18a9466e97dc7ee318abbf43f1f4ce6479a13975b";
};
patches = [
];
+10 -1
pkgs/applications/networking/p2p/ncdc/default.nix
···
-
{ lib, stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }:
stdenv.mkDerivation rec {
pname = "ncdc";
···
url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
sha256 = "1bdgqd07f026qk6vpbxqsin536znd33931m3b4z44prlm9wd6pyi";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
···
+
{ lib, stdenv, fetchurl, fetchpatch, ncurses, zlib, bzip2, sqlite, pkg-config, glib, gnutls }:
stdenv.mkDerivation rec {
pname = "ncdc";
···
url = "https://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
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 ];
+6 -1
pkgs/applications/video/ccextractor/default.nix
···
sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc=";
};
-
sourceRoot = "source/src";
nativeBuildInputs = [ pkg-config cmake makeWrapper ];
···
sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc=";
};
+
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 ];
+6 -1
pkgs/applications/window-managers/ion-3/default.nix
···
version = "3-20090110";
src = fetchurl {
-
url = "http://tuomov.iki.fi/software/dl/ion-${version}.tar.gz";
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ xlibsWrapper lua gettext groff ];
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ];
installFlags = [ "PREFIX=\${out}" ];
···
version = "3-20090110";
src = fetchurl {
+
url = "https://tuomov.iki.fi/software/ion/dl/ion-${version}.tar.gz";
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
};
buildInputs = [ xlibsWrapper lua gettext groff ];
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}" ];
+8 -3
pkgs/development/python-modules/chiapos/default.nix
···
, cxxopts
, ghc_filesystem
, pybind11
, pythonOlder
, psutil
, setuptools-scm
···
buildPythonPackage rec {
pname = "chiapos";
-
version = "1.0.4";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
-
sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w=";
};
patches = [
···
buildInputs = [ pybind11 ];
-
checkInputs = [ psutil ];
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
···
, cxxopts
, ghc_filesystem
, pybind11
+
, pytestCheckHook
, pythonOlder
, psutil
, setuptools-scm
···
buildPythonPackage rec {
pname = "chiapos";
+
version = "1.0.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
+
sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA=";
};
patches = [
···
buildInputs = [ pybind11 ];
+
checkInputs = [
+
psutil
+
pytestCheckHook
+
];
+
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
+4 -5
pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch
···
diff --git a/CMakeLists.txt b/CMakeLists.txt
-
index 9b4a2f5..86f849c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-
@@ -18,22 +18,19 @@ include(FetchContent)
-
else()
FetchContent_Declare(
pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
-
- GIT_TAG v2.6.2
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11-src)
···
)
FetchContent_MakeAvailable(gulrak)
-
···
diff --git a/CMakeLists.txt b/CMakeLists.txt
+
index b757b70..fcce055 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+
@@ -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.7.1
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11-src)
···
)
FetchContent_MakeAvailable(gulrak)
+11
pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch
···
···
+
--- 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",
+9 -4
pkgs/development/python-modules/clvm-rs/default.nix
···
buildPythonPackage rec {
pname = "clvm_rs";
-
version = "0.1.14";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_rs";
rev = version;
-
sha256 = "sha256-sQ+jzBiIZYVQj2rb170wLFEx2NzOj7kEL0k0gx/JOAc=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
-
inherit src;
name = "${pname}-${version}";
-
sha256 = "sha256-ZSu3bu0MfxZEFqBwdHH/RM4WTF/yx9ju1IqSVfu+Upo=";
};
format = "pyproject";
···
buildPythonPackage rec {
pname = "clvm_rs";
+
version = "0.1.15";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_rs";
rev = version;
+
sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI=";
};
+
patches = [
+
# upstream forgot to refresh the lock file
+
./bump-cargo-lock.patch
+
];
+
cargoDeps = rustPlatform.fetchCargoTarball {
+
inherit src patches;
name = "${pname}-${version}";
+
sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk=";
};
format = "pyproject";
+30
pkgs/development/python-modules/dnspythonchia/default.nix
···
···
+
{ 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;
+
};
+
}
+2 -2
pkgs/development/python-modules/git-filter-repo/default.nix
···
buildPythonPackage rec {
pname = "git-filter-repo";
-
version = "2.33.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
-
sha256 = "1nxfd5yv8ri7w5pzxclxs0yd317nsdcwvw87ancmdkh69xvx1f2f";
};
nativeBuildInputs = [
···
buildPythonPackage rec {
pname = "git-filter-repo";
+
version = "2.34.0";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
+
sha256 = "sha256-taCfODhl3goWSwa6F0Rh5V2RZ8xvuwbPKh5i2/DNumM=";
};
nativeBuildInputs = [
+8 -3
pkgs/development/python-modules/identify/default.nix
···
, fetchFromGitHub
, pytestCheckHook
, editdistance-s
}:
buildPythonPackage rec {
pname = "identify";
-
version = "2.3.5";
src = fetchFromGitHub {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-XEwZ6OUEocE4dSDLCLagKqmJruvb9beC0u93SScrOho=";
};
checkInputs = [
···
pytestCheckHook
];
-
pythonImportsCheck = [ "identify" ];
meta = with lib; {
description = "File identification library for Python";
···
, fetchFromGitHub
, pytestCheckHook
, editdistance-s
+
, pythonOlder
}:
buildPythonPackage rec {
pname = "identify";
+
version = "2.3.6";
+
format = "setuptools";
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
+
sha256 = "sha256-1+ILyqb0Ve+YmP9K+tin4iYIWUoRpi/+fbuyUFZOzBE=";
};
checkInputs = [
···
pytestCheckHook
];
+
pythonImportsCheck = [
+
"identify"
+
];
meta = with lib; {
description = "File identification library for Python";
+7
pkgs/development/python-modules/ledgerwallet/default.nix
···
sha256 = "0fb93h2wxm9as9rsywlgz2ng4wrlbjphn6mgbhj6nls2i86rrdxk";
};
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
propagatedBuildInputs = [
cryptography click construct ecdsa hidapi intelhex pillow protobuf requests tabulate
···
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
+19
pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch
···
···
+
--- 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
+
+7 -3
pkgs/development/python-modules/librouteros/default.nix
···
buildPythonPackage rec {
pname = "librouteros";
-
version = "3.1.0";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "luqasz";
repo = pname;
rev = version;
-
sha256 = "1skjwnqa3vcpq9gzgpw93wdmisq15fp0q07kzyq3fgx4yg7b6sql";
};
checkInputs = [
···
"test_generator_ditch"
];
-
pythonImportsCheck = [ "librouteros" ];
meta = with lib; {
description = "Python implementation of the MikroTik RouterOS API";
···
buildPythonPackage rec {
pname = "librouteros";
+
version = "3.2.0";
+
format = "setuptools";
+
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "luqasz";
repo = pname;
rev = version;
+
sha256 = "sha256-Zo9HCjYe9cCkqXhikAjDQKQXGkrMni3f+9KoqhZskNk=";
};
checkInputs = [
···
"test_generator_ditch"
];
+
pythonImportsCheck = [
+
"librouteros"
+
];
meta = with lib; {
description = "Python implementation of the MikroTik RouterOS API";
+6 -3
pkgs/development/python-modules/motioneye-client/default.nix
···
buildPythonPackage rec {
pname = "motioneye-client";
-
version = "0.3.11";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
-
sha256 = "0f34ig8njyn7dzy8272m0b1nlnnhir58ar3vx4zps10i0dc32hb2";
};
nativeBuildInputs = [
···
--replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" ""
'';
-
pythonImportsCheck = [ "motioneye_client" ];
meta = with lib; {
description = "Python library for motionEye";
···
buildPythonPackage rec {
pname = "motioneye-client";
+
version = "0.3.12";
format = "pyproject";
+
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "dermotduffy";
repo = pname;
rev = "v${version}";
+
sha256 = "sha256-vEB9ztz0RTGoolFUVQcMV7DUthCEAx1kpwkAS2186OU=";
};
nativeBuildInputs = [
···
--replace " --cov-report=html:htmlcov --cov-report=xml:coverage.xml --cov-report=term-missing --cov=motioneye_client --cov-fail-under=100" ""
'';
+
pythonImportsCheck = [
+
"motioneye_client"
+
];
meta = with lib; {
description = "Python library for motionEye";
+32
pkgs/development/python-modules/oocsi/default.nix
···
···
+
{ 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 ];
+
};
+
}
+7 -3
pkgs/development/python-modules/pylitterbot/default.nix
···
buildPythonPackage rec {
pname = "pylitterbot";
-
version = "2021.10.1";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = version;
-
sha256 = "sha256-xE+H23AZR1OXfuLMvSuI7IeYKX7k2iEATHq5VheMLn4=";
};
propagatedBuildInputs = [
···
pytestCheckHook
];
-
pythonImportsCheck = [ "pylitterbot" ];
meta = with lib; {
description = "Python package for controlling a Litter-Robot";
···
buildPythonPackage rec {
pname = "pylitterbot";
+
version = "2021.11.0";
+
format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "natekspencer";
repo = pname;
rev = version;
+
sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to=";
};
propagatedBuildInputs = [
···
pytestCheckHook
];
+
pythonImportsCheck = [
+
"pylitterbot"
+
];
meta = with lib; {
description = "Python package for controlling a Litter-Robot";
+10 -4
pkgs/development/python-modules/pywizlight/default.nix
···
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pywizlight";
-
version = "0.4.10";
src = fetchFromGitHub {
owner = "sbidy";
repo = pname;
-
rev = "v${version}";
sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8=";
};
···
pytestCheckHook
];
-
# Tests requires network features (e. g., discovery testing)
disabledTests = [
"test_Bulb_Discovery"
"test_timeout"
"test_timeout_PilotBuilder"
];
-
pythonImportsCheck = [ "pywizlight" ];
meta = with lib; {
description = "Python connector for WiZ light bulbs";
···
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
+
, pythonOlder
}:
buildPythonPackage rec {
pname = "pywizlight";
+
version = "0.4.13";
+
format = "setuptools";
+
+
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "sbidy";
repo = pname;
+
rev = version;
sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8=";
};
···
pytestCheckHook
];
disabledTests = [
+
# Tests requires network features (e. g., discovery testing)
"test_Bulb_Discovery"
"test_timeout"
"test_timeout_PilotBuilder"
];
+
pythonImportsCheck = [
+
"pywizlight"
+
];
meta = with lib; {
description = "Python connector for WiZ light bulbs";
+5 -2
pkgs/development/python-modules/velbus-aio/default.nix
···
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pyserial-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "velbus-aio";
-
version = "2021.11.6";
disabled = pythonOlder "3.7";
···
owner = "Cereal2nd";
repo = pname;
rev = version;
-
sha256 = "sha256-Vm/CgrSSCU76CzAxCtpMsE8/GtPE9SlfqDyzYp4Gc8E=";
};
propagatedBuildInputs = [
backoff
pyserial-asyncio
];
···
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
+
, pyserial
, pyserial-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "velbus-aio";
+
version = "2021.11.7";
+
format = "setuptools";
disabled = pythonOlder "3.7";
···
owner = "Cereal2nd";
repo = pname;
rev = version;
+
sha256 = "sha256-itaYSfZm+/vF/tKRO2BW4qXrDXP0YfBrKiq9bMGFj0M=";
};
propagatedBuildInputs = [
backoff
+
pyserial
pyserial-asyncio
];
+2 -2
pkgs/development/tools/analysis/checkov/default.nix
···
buildPythonApplication rec {
pname = "checkov";
-
version = "2.0.580";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
-
sha256 = "sha256-GnEXGXJCI9VIOKJbGjTppum6j/uwX4m4ytaZqvpfl7Q=";
};
nativeBuildInputs = with py.pkgs; [
···
buildPythonApplication rec {
pname = "checkov";
+
version = "2.0.582";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
+
sha256 = "sha256-25RT70HyOyfdg2jWLKMnEVgvNdlZuJ0e6eajlU486IQ=";
};
nativeBuildInputs = with py.pkgs; [
+6 -3
pkgs/development/tools/earthly/default.nix
···
buildGoModule rec {
pname = "earthly";
-
version = "0.5.22";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
-
sha256 = "sha256-mwyL0o+f7hPvVhWBE7k5a56kzDpeM4rw8h5oLkgsqgc=";
};
-
vendorSha256 = "sha256-pITTp9BqGfUFSF15pl5AM0npJuylJ+FcGw4xGaOi0/o=";
ldflags = [
"-s" "-w"
···
preBuild = ''
makeFlagsArray+=(BUILD_TAGS="${BUILDTAGS}")
'';
postInstall = ''
mv $out/bin/debugger $out/bin/earthly-debugger
···
buildGoModule rec {
pname = "earthly";
+
version = "0.5.24";
src = fetchFromGitHub {
owner = "earthly";
repo = "earthly";
rev = "v${version}";
+
sha256 = "sha256-d4TCuFj7nbQDxTLCStrGj698iUYTH0mCqoCZeeOGNIE=";
};
+
vendorSha256 = "sha256-3o+jizVVHcPZ6nNT2nCF8fLDynnFccI2Y50kbXp2qAI=";
ldflags = [
"-s" "-w"
···
preBuild = ''
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
+14 -4
pkgs/os-specific/linux/ddcci/default.nix
···
-
{ lib, stdenv, fetchFromGitLab, kernel }:
stdenv.mkDerivation rec {
pname = "ddcci-driver";
-
version = "0.4.1";
name = "${pname}-${kernel.version}-${version}";
src = fetchFromGitLab {
owner = "${pname}-linux";
repo = "${pname}-linux";
-
rev = "v${version}";
sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg";
};
···
--replace depmod \#
'';
makeFlags = kernel.makeFlags ++ [
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"KVER=${kernel.modDirVersion}"
···
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
-
broken = kernel.kernelOlder "5.1" || kernel.kernelAtLeast "5.15";
};
}
···
+
{ lib, stdenv, fetchpatch, fetchFromGitLab, kernel }:
stdenv.mkDerivation rec {
pname = "ddcci-driver";
+
# 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 = "v0.4.1";
sha256 = "1qhsm0ccwfmwn0r6sbc6ms4lf4a3iqfcgqmbs6afr6hhxkqll3fg";
};
···
--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}"
···
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
platforms = platforms.linux;
+
broken = kernel.kernelOlder "5.1";
};
}
+30
pkgs/tools/admin/aliyun-cli/default.nix
···
···
+
{ 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 ];
+
};
+
}
+3 -3
pkgs/tools/misc/topicctl/default.nix
···
buildGoModule rec {
pname = "topicctl";
-
version = "1.1.1";
src = fetchFromGitHub {
owner = "segmentio";
repo = "topicctl";
rev = "v${version}";
-
sha256 = "sha256-LsMt2BHfO0I5N2C247fmoOgQ5EXMgk/3Kj/lI+vTRV0=";
};
-
vendorSha256 = "sha256-ur7qMm7l1CocQwX58fTL1PpdgIEJyRAzSlNJM1WTvM0=";
ldflags = [
"-X main.BuildVersion=${version}"
···
buildGoModule rec {
pname = "topicctl";
+
version = "1.2.0";
src = fetchFromGitHub {
owner = "segmentio";
repo = "topicctl";
rev = "v${version}";
+
sha256 = "sha256-bCTlKhYmMe89dYuLiZ58CPpYZiXSGqbddxugsZS5/Cs=";
};
+
vendorSha256 = "sha256-1VRK8tmsbOuP5t5uJ1h+KPcS4K9D+y6UQKeUP2HPXrQ=";
ldflags = [
"-X main.BuildVersion=${version}"
+3 -3
pkgs/tools/networking/ookla-speedtest/default.nix
···
let
pname = "ookla-speedtest";
-
version = "1.0.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=";
};
aarch64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz";
-
sha256 = "sha256-BzaE3DSQUIygGwTFhV4Ez9eX/tM/bqam7cJt+8b2qp4=";
};
};
in
···
let
pname = "ookla-speedtest";
+
version = "1.1.0";
srcs = {
x86_64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-x86_64-linux.tgz";
+
sha256 = "sha256-/NWN8G6uqokjchSnNcC3FU1qDsOjt4Jh2kCnZc5B9H8=";
};
aarch64-linux = fetchurl {
url = "https://install.speedtest.net/app/cli/${pname}-${version}-aarch64-linux.tgz";
+
sha256 = "sha256-kyOrChC3S8kn4ArO5IylFIstS/N3pXxBVx4ZWI600oU=";
};
};
in
+3 -3
pkgs/tools/security/gau/default.nix
···
buildGoModule rec {
pname = "gau";
-
version = "1.2.0";
src = fetchFromGitHub {
owner = "lc";
repo = pname;
rev = "v${version}";
-
sha256 = "sha256-hUIUDDP9NtMmJXj5GCD/ISUUcx5prKCVVFztff9txoU=";
};
-
vendorSha256 = "sha256-WMoFbqtBMcjTWX51mEMzpgDEAndCElldNqjG27yXd2w=";
meta = with lib; {
description = "Tool to fetch known URLs";
···
buildGoModule rec {
pname = "gau";
+
version = "2.0.6";
src = fetchFromGitHub {
owner = "lc";
repo = pname;
rev = "v${version}";
+
sha256 = "sha256-d9Cfd2KD+ymGnzOjlVQkSm3XBamoJIUKQLnRZzSDBtk=";
};
+
vendorSha256 = "sha256-u5ketxHPwZN2mV0uTgwJbY+ImusGZ9GTTmFAGvdH5yA=";
meta = with lib; {
description = "Tool to fetch known URLs";
+2
pkgs/top-level/all-packages.nix
···
avfs = callPackage ../tools/filesystems/avfs { };
aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {};
awscli = callPackage ../tools/admin/awscli { };
···
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 { };
+4
pkgs/top-level/python-packages.nix
···
dnspython = callPackage ../development/python-modules/dnspython { };
doc8 = callPackage ../development/python-modules/doc8 { };
docker = callPackage ../development/python-modules/docker { };
···
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
onnx = callPackage ../development/python-modules/onnx { };
open-garage = callPackage ../development/python-modules/open-garage { };
···
dnspython = callPackage ../development/python-modules/dnspython { };
+
dnspythonchia = callPackage ../development/python-modules/dnspythonchia { };
+
doc8 = callPackage ../development/python-modules/doc8 { };
docker = callPackage ../development/python-modules/docker { };
···
onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { };
onnx = callPackage ../development/python-modules/onnx { };
+
+
oocsi = callPackage ../development/python-modules/oocsi { };
open-garage = callPackage ../development/python-modules/open-garage { };