Merge staging-next into staging
This commit is contained in:
commit
c187010832
|
@ -11,7 +11,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "4.4.5";
|
||||
version = "4.4.6";
|
||||
|
||||
libsecp256k1_name =
|
||||
if stdenv.isLinux then "libsecp256k1.so.{v}"
|
||||
|
@ -28,7 +28,7 @@ let
|
|||
owner = "spesmilo";
|
||||
repo = "electrum";
|
||||
rev = version;
|
||||
sha256 = "sha256-R5jFxqaKnqQ+WNp4l0u34wMFxlbIsQ+9qDQxiQEu6kM=";
|
||||
sha256 = "sha256-nd435CgF0a6JOni/OXcxkciVCR1aQqzfGfDSg1gPQ8Q=";
|
||||
|
||||
postFetch = ''
|
||||
mv $out ./all
|
||||
|
@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
|
||||
sha256 = "sha256-rTQcnEfHaFrLvPnI1IZl9uk2D0NFLn0PSaGsI9KyLr4=";
|
||||
sha256 = "sha256-BxxC1xVKToUjgBo4mEeK9Tdhbd/+doHcTTJsXDtaELg=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
@ -7,20 +7,20 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.9.23";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-opq6XurS3hWI7U3fukTy2VdxxVJAO16mCjd6CZyAJ1w=";
|
||||
hash = "sha256-difvEmFfwH7+d2qAcNwTcydP0WHDvHkOSXilaWLrHoM=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-cI/Q6eeLw3oJtEHNcFvl5nq+x4dSJUDI/BdLkMzkncs=";
|
||||
vendorHash = "sha256-bWiBY3Bo/FpipUHhbsbPNLKxvJF7L0tpuPi0Cb0firU=";
|
||||
|
||||
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
|
||||
subPackages = [
|
||||
|
@ -52,6 +52,6 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/alexellis/arkade";
|
||||
description = "Open Source Kubernetes Marketplace";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ welteki techknowlogick ];
|
||||
maintainers = with maintainers; [ welteki techknowlogick qjoly ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A GTK-based news feed aggregator";
|
||||
homepage = "http://lzone.de/liferea/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
maintainers = with maintainers; [ romildo yayayayaka ];
|
||||
platforms = platforms.linux;
|
||||
|
||||
longDescription = ''
|
||||
|
|
|
@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://ziglang.org/";
|
||||
changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.andrewrk ] ++ lib.teams.zig.members;
|
||||
maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
} // removeAttrs args [ "hash" ])
|
||||
|
|
|
@ -11,12 +11,13 @@ makeSetupHook {
|
|||
substitutions = {
|
||||
zig_default_flags =
|
||||
let
|
||||
cpu = "-Dcpu=baseline";
|
||||
releaseType = if lib.versionAtLeast zig.version "0.11"
|
||||
then "-Doptimize=ReleaseSafe"
|
||||
else "-Drelease-safe=true";
|
||||
releaseType =
|
||||
if lib.versionAtLeast zig.version "0.11" then
|
||||
"-Doptimize=ReleaseSafe"
|
||||
else
|
||||
"-Drelease-safe=true";
|
||||
in
|
||||
lib.concatStringsSep " " [ cpu releaseType ];
|
||||
[ "-Dcpu=baseline" releaseType ];
|
||||
};
|
||||
|
||||
passthru = { inherit zig; };
|
||||
|
|
|
@ -14,13 +14,13 @@ assert !blas.isILP64 && !lapack.isILP64;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dftd4";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dftd4";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZCoFbjTNQD7slq5sKwPRPkrHSHofsxU9C9h/bF5jmZI=";
|
||||
hash = "sha256-VIV9953hx0MZupOARdH+P1h7JtZeJmTlqtO8si+lwdU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gfortran ];
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
buildDunePackage rec {
|
||||
pname = "hack_parallel";
|
||||
version = "1.0.1";
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
@ -15,6 +14,23 @@ buildDunePackage rec {
|
|||
|
||||
patches = [ ./hack_parallel.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/third-party/hack_core/hack_caml.ml --replace 'include Pervasives' ""
|
||||
substituteInPlace \
|
||||
src/interface/hack_parallel_intf.mli \
|
||||
src/procs/worker.ml \
|
||||
src/third-party/hack_core/hack_core_list.ml \
|
||||
src/third-party/hack_core/hack_result.ml* \
|
||||
src/utils/collections/myMap.ml \
|
||||
src/utils/daemon.ml* \
|
||||
src/utils/exit_status.ml \
|
||||
src/utils/hack_path.ml \
|
||||
src/utils/measure.ml \
|
||||
src/utils/timeout.ml \
|
||||
--replace Pervasives. Stdlib.
|
||||
substituteInPlace src/utils/sys_utils.ml --replace String.create Bytes.create
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
propagatedBuildInputs = [ core core_unix sqlite ];
|
||||
|
|
51
pkgs/development/python-modules/aiobafi6/default.nix
Normal file
51
pkgs/development/python-modules/aiobafi6/default.nix
Normal file
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, protobuf
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, zeroconf
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobafi6";
|
||||
version = "0.8.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jfroy";
|
||||
repo = "aiobafi6";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ng+WpLhAfsouFA9biomc0V+L9XQHDthJeJLv8ttnYBc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
protobuf
|
||||
zeroconf
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aiobafi6"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for communication with the Big Ass Fans i6 firmware";
|
||||
homepage = "https://github.com/jfroy/aiobafi6";
|
||||
changelog = "https://github.com/jfroy/aiobafi6/releases/tag/0.8.2";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -1,10 +1,16 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python3
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
, types-colorama
|
||||
, types-setuptools
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "beautysh";
|
||||
version = "6.2.1";
|
||||
format = "pyproject";
|
||||
|
@ -25,26 +31,26 @@ python3.pkgs.buildPythonApplication rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
colorama
|
||||
setuptools
|
||||
types-colorama
|
||||
types-setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"beautysh"
|
||||
];
|
|
@ -1,5 +1,6 @@
|
|||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, callPackage
|
||||
, lib
|
||||
, jmp
|
||||
|
@ -18,6 +19,21 @@ buildPythonPackage rec {
|
|||
hash = "sha256-EZx3o6PgTeFjTwI9Ko9H39EqPSE0yLWWpsdqX6ALlo4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/deepmind/dm-haiku/issues/717
|
||||
(fetchpatch {
|
||||
name = "remove-typing-extensions.patch";
|
||||
url = "https://github.com/deepmind/dm-haiku/commit/c22867db1a3314a382bd2ce36511e2b756dc32a8.patch";
|
||||
hash = "sha256-SxJc8FrImwMqTJ5OuJ1f4T+HfHgW/sGqXeIqlxEatlE=";
|
||||
})
|
||||
# https://github.com/deepmind/dm-haiku/pull/672
|
||||
(fetchpatch {
|
||||
name = "fix-find-namespace-packages.patch";
|
||||
url = "https://github.com/deepmind/dm-haiku/commit/728031721f77d9aaa260bba0eddd9200d107ba5d.patch";
|
||||
hash = "sha256-qV94TdJnphlnpbq+B0G3KTx5CFGPno+8FvHyu/aZeQE=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"testsout"
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.14.0";
|
||||
version = "2.15.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-aFES2+ZpbrVoMbIOW73ec1HD/tKhKTiZ0tAIV5vx/OQ=";
|
||||
hash = "sha256-Z1e6CrpVjQoR/OIqqxbbC75SZtOqi4Rrbld2doenOMA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
@ -1,28 +1,30 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, bitbox02
|
||||
, buildPythonPackage
|
||||
, cbor
|
||||
, ecdsa
|
||||
, fetchFromGitHub
|
||||
, hidapi
|
||||
, libusb1
|
||||
, mnemonic
|
||||
, pyaes
|
||||
, pyserial
|
||||
, typing-extensions
|
||||
, pythonOlder
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hwi";
|
||||
version = "2.2.1";
|
||||
version = "2.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitcoin-core";
|
||||
repo = "HWI";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vQJN2YXWGvYSVV9lemZyu61inc9iBFxf5nIlpIiRe+s=";
|
||||
hash = "sha256-V4BWB4mCONQ8kjAy6ySonAbCUTaKpBTvhSnHmoH8TQM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -37,16 +39,7 @@ buildPythonPackage rec {
|
|||
typing-extensions
|
||||
];
|
||||
|
||||
# relax required dependencies:
|
||||
# libusb1 - https://github.com/bitcoin-core/HWI/issues/579
|
||||
# typing-extensions - https://github.com/bitcoin-core/HWI/issues/572
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace 'libusb1>=1.7,<3' 'libusb1>=1.7,<4' \
|
||||
--replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7,<5.0'
|
||||
'';
|
||||
|
||||
# tests require to clone quite a few firmwares
|
||||
# Tests require to clone quite a few firmwares
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
@ -56,6 +49,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Bitcoin Hardware Wallet Interface";
|
||||
homepage = "https://github.com/bitcoin-core/hwi";
|
||||
changelog = "https://github.com/bitcoin-core/HWI/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ prusnak ];
|
||||
};
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.26";
|
||||
version = "2.5.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gpvfj9XwhErMPXWygZb5QMHDwCK7ZhGw6L86ttRoP/Y=";
|
||||
hash = "sha256-qhYSKmHV2OGGUqfFbUiZkmUQrjSQ4I+ZX5C+D8sKj0g=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
@ -14,7 +14,9 @@
|
|||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, setuptools
|
||||
, toml
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -31,9 +33,23 @@ buildPythonPackage rec {
|
|||
hash = "sha256-M4BoST18sf1C1lwhFkp4a0B3fc0VKerwuVEIfwkD7i0=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
# Follow https://github.com/mwouts/jupytext/pull/1119 to see if the patch
|
||||
# relaxing jupyter_packaging version can be cleaned up.
|
||||
#
|
||||
# Follow https://github.com/mwouts/jupytext/pull/1077 to see when the patch
|
||||
# relaxing jupyterlab version can be cleaned up.
|
||||
#
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'jupyter_packaging~=' 'jupyter_packaging>=' \
|
||||
--replace 'jupyterlab>=3,<=4' 'jupyterlab>=3'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
jupyter-packaging
|
||||
jupyterlab
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = "meshtastic";
|
||||
repo = "Meshtastic-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6oxKaMFXZTrz7gZpSAtXI5Jit7z5NWQgUkd1yB3EtA8=";
|
||||
hash = "sha256-szeY3+84xAihGK9nLgMQf9oLRDlKlaPg6+I42TJkfVY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -110,6 +110,7 @@ buildPythonPackage rec {
|
|||
"test_MeshInterface"
|
||||
"test_getNode_not_local"
|
||||
"test_getNode_not_local_timeout"
|
||||
"test_main_onConnected_exception"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "odp-amsterdam";
|
||||
version = "5.2.0";
|
||||
version = "5.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "klaasnicolaas";
|
||||
repo = "python-odp-amsterdam";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iJjwxvlxzRpKy2P0A3mS2i05bues5YasP72HuZiuFyE=";
|
||||
hash = "sha256-HesAg6hJ8Al/ZZRBTXZM0EVv1kjYmmA66W+crwtWhf4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.8.2";
|
||||
version = "23.8.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gcxhSVrOeUUHIQTIR3klaiF64H4wofgLB+PV47TYfiw=";
|
||||
hash = "sha256-SXCqptEADWtp295DHWeWvhsmYWAtsxfckIVbPs4ACXc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydrive2";
|
||||
version = "1.16.1";
|
||||
version = "1.17.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "PyDrive2";
|
||||
inherit version;
|
||||
hash = "sha256-chBTXoNyiWpEcCxCQKop1GELAyWyX5TN0H1P7A/ScFM=";
|
||||
hash = "sha256-aP6pNDR7thK3qEiBHUgUnbhAvPtfpNeothYbLSrf7HA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
42
pkgs/development/python-modules/pyduotecno/default.nix
Normal file
42
pkgs/development/python-modules/pyduotecno/default.nix
Normal file
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyduotecno";
|
||||
version = "2023.8.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Cereal2nd";
|
||||
repo = "pyDuotecno";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zqaW6iQe982BgxaxeeRFTJ/a2nySGoSW4sxKmNxbKQc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"duotecno"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to interact with Duotecno IP interfaces";
|
||||
homepage = "https://github.com/Cereal2nd/pyDuotecno";
|
||||
changelog = "https://github.com/Cereal2nd/pyDuotecno/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
|
@ -31,8 +31,12 @@ buildPythonPackage rec {
|
|||
timeout-decorator
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
# Test is broken on darwin. Fix in master from https://github.com/buriy/python-readability/pull/178
|
||||
"test_many_repeated_spaces"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Fast python port of arc90's readability tool";
|
||||
homepage = "https://github.com/buriy/python-readability";
|
||||
license = licenses.asl20;
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9xSuBh3y6vYvbwn7uslM+R7yhZKP/+Sjbae1a+QMoOA=";
|
||||
hash = "sha256-/ZELaJrGgNKzAXi1SXAMgxi84R0UvZBD9AUVO7PTEbA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
27
pkgs/development/tools/misc/rhai-doc/default.nix
Normal file
27
pkgs/development/tools/misc/rhai-doc/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rhai-doc";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhaiscript";
|
||||
repo = "rhai-doc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GZq5C8Q95OHKftEkps4Y6X6sAc4pzSfSq3ELUW/kPWI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-dJMqaDQVSrvZPwjPFixgqRRzxPJW/f1nO+81kHwGmYU=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to auto-generate documentation for Rhai source code";
|
||||
homepage = "https://github.com/rhaiscript/rhai-doc";
|
||||
changelog = "https://github.com/rhaiscript/rhai-doc/releases/tag/${src.rev}";
|
||||
license = with licenses; [ asl20 mit ];
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "rhai-doc";
|
||||
};
|
||||
}
|
|
@ -328,7 +328,8 @@
|
|||
sqlalchemy
|
||||
];
|
||||
"baf" = ps: with ps; [
|
||||
]; # missing inputs: aiobafi6
|
||||
aiobafi6
|
||||
];
|
||||
"baidu" = ps: with ps; [
|
||||
]; # missing inputs: baidu-aip
|
||||
"balboa" = ps: with ps; [
|
||||
|
@ -915,7 +916,8 @@
|
|||
pdunehd
|
||||
];
|
||||
"duotecno" = ps: with ps; [
|
||||
]; # missing inputs: pyduotecno
|
||||
pyduotecno
|
||||
];
|
||||
"dwd_weather_warnings" = ps: with ps; [
|
||||
dwdwfsapi
|
||||
];
|
||||
|
@ -4887,6 +4889,7 @@
|
|||
"azure_devops"
|
||||
"azure_event_hub"
|
||||
"backup"
|
||||
"baf"
|
||||
"balboa"
|
||||
"bayesian"
|
||||
"binary_sensor"
|
||||
|
@ -4967,6 +4970,7 @@
|
|||
"dte_energy_bridge"
|
||||
"duckdns"
|
||||
"dunehd"
|
||||
"duotecno"
|
||||
"dwd_weather_warnings"
|
||||
"eafm"
|
||||
"easyenergy"
|
||||
|
|
|
@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91"
|
||||
substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91"
|
||||
patchShebangs bin/rebar
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# LTO with Clang produces LLVM bitcode, which causes linking to fail quietly.
|
||||
# (There are warnings, but no hard errors, and it produces an empty dylib.)
|
||||
substituteInPlace src/jiffy/rebar.config.script --replace '"-flto"' '""'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klipper";
|
||||
version = "unstable-2023-08-15";
|
||||
version = "unstable-2023-08-21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KevinOConnor";
|
||||
repo = "klipper";
|
||||
rev = "01ed8096d8b53fd58f760b413533f1ef15f1b667";
|
||||
sha256 = "sha256-vP1EmvUmxYRlBcxY7MKnBpLaSTEi5bZGaP42TsJhfjw=";
|
||||
rev = "5f990f93d533247d3a675e8c423280f4333ad8ce";
|
||||
sha256 = "sha256-jICOEzLvy2wBInW4qIbFZbhRuHjsio6UM13K9UlZi1U=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/klippy";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plpgsql_check";
|
||||
version = "2.3.4";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "okbob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kXci/4o7rK1CiLp8alkAGMhxjiQBIPpavS/1/7BBWI8=";
|
||||
hash = "sha256-flRkPyHLc/cf+JQK04/Vl0I6ILx1GxWYMy9FnT9M//Q=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Linter tool for language PL/pgSQL";
|
||||
homepage = "https://github.com/okbob/plpgsql_check";
|
||||
changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${version}";
|
||||
platforms = postgresql.meta.platforms;
|
||||
license = licenses.mit;
|
||||
broken = versionOlder postgresql.version "12";
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, openssl
|
||||
# Many Salt modules require various Python modules to be installed,
|
||||
|
@ -10,29 +11,21 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "salt";
|
||||
version = "3006.1";
|
||||
version = "3006.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-lVh71hHepq/7aQjQ7CaGy37bhMFBRLSFF3bxJ6YOxbk=";
|
||||
hash = "sha256-+I0aJeIw2co9/eE9rdRmB6KxdQq1WoY1nFpCUedx8Wc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
distro
|
||||
jinja2
|
||||
jmespath
|
||||
looseversion
|
||||
markupsafe
|
||||
msgpack
|
||||
packaging
|
||||
psutil
|
||||
pycryptodomex
|
||||
pyyaml
|
||||
pyzmq
|
||||
requests
|
||||
] ++ extraInputs;
|
||||
|
||||
patches = [
|
||||
# https://github.com/saltstack/salt/pull/63795
|
||||
(fetchpatch {
|
||||
name = "remove-duplicate-scripts.patch";
|
||||
url = "https://github.com/saltstack/salt/commit/6b9463836e70e40409dbf653f01aa94ef869dfe7.patch";
|
||||
hash = "sha256-VcVdKC8EH4qoWHtq6eEPl8OviR4eA2k/S2lWNQbubJw=";
|
||||
})
|
||||
./fix-libcrypto-loading.patch
|
||||
];
|
||||
|
||||
|
@ -51,6 +44,21 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--replace 'pyzmq==25.0.2 ; sys_platform == "win32"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
distro
|
||||
jinja2
|
||||
jmespath
|
||||
looseversion
|
||||
markupsafe
|
||||
msgpack
|
||||
packaging
|
||||
psutil
|
||||
pycryptodomex
|
||||
pyyaml
|
||||
pyzmq
|
||||
requests
|
||||
] ++ extraInputs;
|
||||
|
||||
# Don't use fixed dependencies on Darwin
|
||||
USE_STATIC_REQUIREMENTS = "0";
|
||||
|
||||
|
|
24
pkgs/tools/graphics/csv2svg/default.nix
Normal file
24
pkgs/tools/graphics/csv2svg/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "csv2svg";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-3VebLFkeJLK97jqoPXt4Wt6QTR0Zyu+eQV9oaLBSeHE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EIsKb9BzM+H3BO7OpoTmvIvGd578gYSq5vU18BejT0s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Take a csv as input and outputs svg";
|
||||
homepage = "https://github.com/Canop/csv2svg";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "csv2svg";
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "directx-shader-compiler";
|
||||
version = "1.7.2212.1";
|
||||
version = "1.7.2308";
|
||||
|
||||
# Put headers in dev, there are lot of them which aren't necessary for
|
||||
# using the compiler binary.
|
||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "microsoft";
|
||||
repo = "DirectXShaderCompiler";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-old/vGNoj0mimuvd/RkwNeynBp+gBrkwQ7ah2oUZll0=";
|
||||
hash = "sha256-pfdAD+kRpmqW29Y8jn6+X5Ujy/9cIvisYr0tH1PuxsY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.37.0";
|
||||
version = "2.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AXn2D4vWiFYlmAN2egqKdi5vOYU88FopEGYyDGgy0ig=";
|
||||
hash = "sha256-s8E+Nva/lsZ/jPzDuGRN0P8JOeJPUK6Xj6bHqiozwNA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-OU1ChDJiIeRjBBKVcxah/cEXScepW0VY9tkNDALT4fI=";
|
||||
vendorHash = "sha256-UFEpP5I++8+F8OTMqm5G6/2Kn31Q2U3+8g0deeLMWDc=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
35
pkgs/tools/misc/zotero-translation-server/default.nix
Normal file
35
pkgs/tools/misc/zotero-translation-server/default.nix
Normal file
|
@ -0,0 +1,35 @@
|
|||
{ lib, buildNpmPackage, fetchFromGitHub, nodejs }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zotero-translation-server";
|
||||
version = "unstable-2023-07-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zotero";
|
||||
repo = "translation-server";
|
||||
rev = "cf96d57f4e2af66fee7df9bad00681b3f4ac7d77";
|
||||
hash = "sha256-GJn7UAl0raVGzplvFzo4A0RUjNbyGt/YI2mt1UZIJv0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-JHoBxUybs1GGRxEVG5GgX2mOCplTgR5dcPjnR42SEbY=";
|
||||
|
||||
makeCacheWritable = true;
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/bin/ $out/share/zotero-translation-server/
|
||||
makeWrapper ${nodejs}/bin/node $out/bin/translation-server \
|
||||
--add-flags "$out/lib/node_modules/translation-server/src/server.js"
|
||||
ln -s $out/lib/node_modules/translation-server/config $out/share/zotero-translation-server/config
|
||||
ln -s $out/lib/node_modules/translation-server/modules $out/share/zotero-translation-server/modules
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Node.js-based server to run Zotero translators";
|
||||
homepage = "https://github.com/zotero/translation-server";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = [ maintainers.marsam ];
|
||||
};
|
||||
}
|
|
@ -4214,7 +4214,7 @@ with pkgs;
|
|||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
beautysh = callPackage ../development/tools/beautysh { };
|
||||
beautysh = with python3.pkgs; toPythonApplication beautysh;
|
||||
|
||||
bc = callPackage ../tools/misc/bc { };
|
||||
|
||||
|
@ -7761,6 +7761,8 @@ with pkgs;
|
|||
|
||||
zonemaster-cli = perlPackages.ZonemasterCLI;
|
||||
|
||||
zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { };
|
||||
|
||||
zoxide = callPackage ../tools/misc/zoxide { };
|
||||
|
||||
zzuf = callPackage ../tools/security/zzuf { };
|
||||
|
@ -12486,6 +12488,8 @@ with pkgs;
|
|||
rekor-cli
|
||||
rekor-server;
|
||||
|
||||
rhai-doc = callPackage ../development/tools/misc/rhai-doc { };
|
||||
|
||||
rich-cli = callPackage ../misc/rich-cli { };
|
||||
|
||||
richgo = callPackage ../development/tools/richgo { };
|
||||
|
@ -31029,6 +31033,8 @@ with pkgs;
|
|||
|
||||
csdp = callPackage ../applications/science/math/csdp { };
|
||||
|
||||
csv2svg = callPackage ../tools/graphics/csv2svg { };
|
||||
|
||||
ctop = callPackage ../tools/system/ctop { };
|
||||
|
||||
cubicsdr = callPackage ../applications/radio/cubicsdr {
|
||||
|
|
|
@ -162,6 +162,8 @@ self: super: with self; {
|
|||
|
||||
aioazuredevops = callPackage ../development/python-modules/aioazuredevops { };
|
||||
|
||||
aiobafi6 = callPackage ../development/python-modules/aiobafi6 { };
|
||||
|
||||
aioblescan = callPackage ../development/python-modules/aioblescan { };
|
||||
|
||||
aiocache = callPackage ../development/python-modules/aiocache { };
|
||||
|
@ -1322,6 +1324,8 @@ self: super: with self; {
|
|||
|
||||
beautifultable = callPackage ../development/python-modules/beautifultable { };
|
||||
|
||||
beautysh = callPackage ../development/python-modules/beautysh { };
|
||||
|
||||
bech32 = callPackage ../development/python-modules/bech32 { };
|
||||
|
||||
behave = callPackage ../development/python-modules/behave { };
|
||||
|
@ -8934,6 +8938,8 @@ self: super: with self; {
|
|||
|
||||
pyduke-energy = callPackage ../development/python-modules/pyduke-energy { };
|
||||
|
||||
pyduotecno = callPackage ../development/python-modules/pyduotecno { };
|
||||
|
||||
pydy = callPackage ../development/python-modules/pydy { };
|
||||
|
||||
pydyf = callPackage ../development/python-modules/pydyf { };
|
||||
|
|
Loading…
Reference in a new issue