mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-05 12:08:02 +03:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
e0173a1f54
@ -328,7 +328,7 @@ in
|
||||
|
||||
createMailUser = mkEnableOption ''automatically creating the user
|
||||
given in {option}`services.dovecot.user` and the group
|
||||
given in {option}`services.dovecot.group`.'' // { default = true; };
|
||||
given in {option}`services.dovecot.group`'' // { default = true; };
|
||||
|
||||
modules = mkOption {
|
||||
type = types.listOf types.package;
|
||||
|
||||
@ -18,9 +18,9 @@ in
|
||||
meta.maintainers = with lib.maintainers; [ gador ];
|
||||
|
||||
options.services.blendfarm = with lib.types; {
|
||||
enable = lib.mkEnableOption "Blendfarm, a render farm management software for Blender.";
|
||||
enable = lib.mkEnableOption "Blendfarm, a render farm management software for Blender";
|
||||
package = lib.mkPackageOption pkgs "blendfarm" { };
|
||||
openFirewall = lib.mkEnableOption "Allow blendfarm network access through the firewall.";
|
||||
openFirewall = lib.mkEnableOption "allowing blendfarm network access through the firewall";
|
||||
|
||||
user = lib.mkOption {
|
||||
description = "User under which blendfarm runs.";
|
||||
|
||||
@ -88,7 +88,7 @@ in
|
||||
|
||||
options = {
|
||||
services.nagios = {
|
||||
enable = mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network.'';
|
||||
enable = mkEnableOption ''[Nagios](https://www.nagios.org/) to monitor your system or network'';
|
||||
|
||||
objectDefs = mkOption {
|
||||
description = ''
|
||||
|
||||
@ -23,14 +23,14 @@ let
|
||||
};
|
||||
|
||||
commonOptions = {
|
||||
enable = lib.mkEnableOption "this `wstunnel` instance." // {
|
||||
enable = lib.mkEnableOption "this `wstunnel` instance" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = lib.mkPackageOption pkgs "wstunnel" { };
|
||||
|
||||
autoStart =
|
||||
lib.mkEnableOption "starting this wstunnel instance automatically." // {
|
||||
lib.mkEnableOption "starting this wstunnel instance automatically" // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ in
|
||||
meta.maintainers = with maintainers; [ etu stunkymonkey mattchrist ];
|
||||
|
||||
options.services.freshrss = {
|
||||
enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend.";
|
||||
enable = mkEnableOption "FreshRSS RSS aggregator and reader with php-fpm backend";
|
||||
|
||||
package = mkPackageOption pkgs "freshrss" { };
|
||||
|
||||
|
||||
@ -49,6 +49,7 @@
|
||||
|
||||
let
|
||||
py = python311.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
pyqt5 = super.pyqt5.override {
|
||||
withLocation = true;
|
||||
|
||||
@ -49,6 +49,7 @@
|
||||
|
||||
let
|
||||
py = python311.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
pyqt5 = super.pyqt5.override {
|
||||
withLocation = true;
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = _: super: {
|
||||
pillow = super.pillow.overridePythonAttrs rec {
|
||||
version = "9.5.0";
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3.overridePythonAttrs (old: rec {
|
||||
version = "3.1.14";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "2.3.1";
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
python3,
|
||||
}:
|
||||
let
|
||||
python = python3.override { packageOverrides = self: super: { pydantic = super.pydantic_1; }; };
|
||||
python = python3.override { self = python; packageOverrides = self: super: { pydantic = super.pydantic_1; }; };
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "dbx";
|
||||
|
||||
@ -3,9 +3,8 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
self = py;
|
||||
|
||||
# not compatible with prompt_toolkit >=2.0
|
||||
prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec {
|
||||
name = "${oldAttrs.pname}-${version}";
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
|
||||
let
|
||||
python = python310.override {
|
||||
self = python;
|
||||
packageOverrides = (self: super: {
|
||||
matplotlib = super.matplotlib.override {
|
||||
enableGtk3 = true;
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
let
|
||||
# python-ldap-3.4.4 does not work with python3(12)
|
||||
python = python311.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
validators = super.validators.overridePythonAttrs (_: rec {
|
||||
version = "0.20.0";
|
||||
|
||||
@ -12,6 +12,7 @@ let
|
||||
nixopsContextBase = this: {
|
||||
|
||||
python = python3.override {
|
||||
self = this.python;
|
||||
packageOverrides = self: super: {
|
||||
nixops = self.callPackage ./unwrapped.nix { };
|
||||
} // (this.plugins self super);
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
|
||||
# Support for later tweepy releases is missing
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
|
||||
# Requires "urwid~=2.1.2", otherwise some tests are failing
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3;
|
||||
};
|
||||
|
||||
@ -37,6 +37,7 @@ let
|
||||
# https://github.com/NixOS/nixpkgs/issues/298719
|
||||
# https://github.com/paperless-ngx/paperless-ngx/issues/5494
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
# tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
|
||||
ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
# https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
srht = self.callPackage ./core.nix { };
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pychromecast = super.pychromecast.overridePythonAttrs (_: rec {
|
||||
version = "13.1.0";
|
||||
|
||||
@ -24,6 +24,7 @@ let
|
||||
};
|
||||
|
||||
python = python311.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic = super.pydantic_1;
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# pyCA is incompatible with SQLAlchemy 2.0
|
||||
sqlalchemy = super.sqlalchemy_1_4;
|
||||
@ -80,4 +81,3 @@ python3.pkgs.buildPythonApplication rec {
|
||||
maintainers = with maintainers; [ pmiddend ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -2,19 +2,22 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "await";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slavaGanzin";
|
||||
repo = "await";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5lKuqxrUAHfeV0hikrDbxkKAdPtODfal5byc3L7aZmw=";
|
||||
hash = "sha256-qvSRuRLZnUptXYknyRn4GgmYtj9BnI8flN6EhadbKMw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
$CC await.c -o await -l pthread
|
||||
@ -27,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
install -Dm755 await -t $out/bin
|
||||
install -Dm444 LICENSE -t $out/share/licenses/await
|
||||
install -Dm444 README.md -t $out/share/doc/await
|
||||
installShellCompletion --cmd await autocomplete.{bash,fish,zsh}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -23,6 +23,7 @@ let
|
||||
});
|
||||
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
inherit buildAzureCliPackage;
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy_1_4;
|
||||
};
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
|
||||
version = "0.11.2";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
lark = super.lark.overridePythonAttrs (old: rec {
|
||||
# gdtoolkit needs exactly this lark version
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
lark = super.lark.overridePythonAttrs (old: rec {
|
||||
# gdtoolkit needs exactly this lark version
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = final: prev: {
|
||||
# sqlalchemy 1.4.x or 2.x are not supported
|
||||
sqlalchemy = prev.sqlalchemy.overridePythonAttrs (oldAttrs: rec {
|
||||
@ -174,4 +175,3 @@ py.pkgs.buildPythonPackage rec {
|
||||
maintainers = teams.wdz.members;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
music-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
};
|
||||
|
||||
@ -26,6 +26,7 @@ let
|
||||
inherit (self.passthru) generator-out;
|
||||
};
|
||||
python3 = buildPackages.python3.override {
|
||||
self = python3;
|
||||
packageOverrides = _: _: {
|
||||
nanopb-proto = self.passthru.python-module;
|
||||
};
|
||||
@ -119,4 +120,3 @@ in
|
||||
'';
|
||||
};
|
||||
})
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
|
||||
let
|
||||
python = python310.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
# requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions
|
||||
docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec {
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
let
|
||||
python = python310.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pypdf2 = super.pypdf2.overridePythonAttrs (old: rec {
|
||||
version = "1.28.6";
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
let
|
||||
python = python310.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
flask = super.flask.overridePythonAttrs (old: rec {
|
||||
version = "2.3.3";
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: { sqlalchemy = super.sqlalchemy_1_4; };
|
||||
};
|
||||
in
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# https://github.com/domainaware/parsedmarc/issues/464
|
||||
msgraph-core = super.msgraph-core.overridePythonAttrs (old: rec {
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.0.0";
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_4;
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
craft-application = super.craft-application.overridePythonAttrs (old: rec {
|
||||
version = "1.2.1";
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic-yaml = super.pydantic-yaml.overridePythonAttrs (old: rec {
|
||||
version = "0.11.2";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wit-bindgen";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wit-bindgen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WE+a0y97aPWEUHZT/LRjZ/WRZP7QxF4DXVjJVRjuJFU=";
|
||||
hash = "sha256-mn51ussusBZGfgAj1JP1hjNsblXXGAt7W6D10yKTuZ8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Z6dBlYT4aYh92LZGH/+NAkkf80KZtId1emVaeOfpEjM=";
|
||||
cargoHash = "sha256-JSsneDsbqs4DT0oMvucPVg/Jpf10xk3TWi0pDS1oOzQ=";
|
||||
|
||||
# Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
|
||||
# However, GitHub Actions ensures a proper build.
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
fetchPypi
|
||||
}:
|
||||
let
|
||||
python3Packages =
|
||||
python3' =
|
||||
(python3.override {
|
||||
packageOverrides = final: prev: {
|
||||
wxpython = prev.wxpython.overrideAttrs rec {
|
||||
@ -17,7 +17,10 @@ let
|
||||
};
|
||||
};
|
||||
};
|
||||
}).pkgs;
|
||||
});
|
||||
|
||||
python3Packages = python3'.pkgs;
|
||||
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "yt-dlg";
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
with python3Packages; buildPythonApplication rec {
|
||||
pname = "platformio";
|
||||
version = "6.1.11";
|
||||
version = "6.1.15";
|
||||
pyproject = true;
|
||||
|
||||
# pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
|
||||
@ -19,7 +19,7 @@ with python3Packages; buildPythonApplication rec {
|
||||
owner = "platformio";
|
||||
repo = "platformio-core";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NR4UyAt8q5sUGtz1Sy6E8Of7y9WrH9xpcAWzLBeDQmo=";
|
||||
hash = "sha256-w5JUAqQRNxq8ZrX8ffny2K7xWBkGr2H3+apYqCPXw9c=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "udev" ];
|
||||
@ -132,6 +132,7 @@ with python3Packages; buildPythonApplication rec {
|
||||
# requires internet connection
|
||||
"test_api_cache"
|
||||
"test_ping_internet_ips"
|
||||
"test_metadata_dump"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py
|
||||
index 95e08108..6c2cfaed 100644
|
||||
index c1d22ab5..6c2cfaed 100644
|
||||
--- a/platformio/package/manifest/schema.py
|
||||
+++ b/platformio/package/manifest/schema.py
|
||||
@@ -276,9 +276,6 @@ class ManifestSchema(BaseSchema):
|
||||
@staticmethod
|
||||
@memoized(expire="1h")
|
||||
def load_spdx_licenses():
|
||||
- version = "3.21"
|
||||
- version = "3.23"
|
||||
- spdx_data_url = (
|
||||
- "https://raw.githubusercontent.com/spdx/license-list-data/"
|
||||
- f"v{version}/json/licenses.json"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "automx2";
|
||||
version = "2024.1";
|
||||
version = "2024.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "rseichter";
|
||||
repo = "automx2";
|
||||
rev = version;
|
||||
hash = "sha256-s/kd9A/d3SPMZC9+B4DdcXVi77WLH/SBwXIdaKHUj34=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-7SbSKSjDHTppdqfPPKvuWbdoksHa6BMIOXOq0jDggTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@ -20,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyindego";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jm-73";
|
||||
owner = "sander1988";
|
||||
repo = "pyIndego";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wPQocacWwWjEH4boMZ33aW/NPvdD6LSmMTFXGwBwwq8=";
|
||||
hash = "sha256-x8/MSbn+urmArQCyxZU1JEUyATJsPzp7bflymE+1rkk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -60,8 +60,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for Bosch API for lawnmowers";
|
||||
homepage = "https://github.com/jm-73/pyIndego";
|
||||
changelog = "https://github.com/jm-73/pyIndego/blob/${version}/CHANGELOG.md";
|
||||
homepage = "https://github.com/sander1988/pyIndego";
|
||||
changelog = "https://github.com/sander1988/pyIndego/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywaze";
|
||||
version = "1.0.2";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = "pywaze";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-fShfnfYhUtthwHSFYIFj2cWE9dZXakTrfqiR3AL2nb8=";
|
||||
hash = "sha256-XE+VdxUjq8KBSIU6rUlBweKEkZD3gqJuy9J4u9JVy7Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -104,10 +104,10 @@ writeTextFile {
|
||||
--tmpfs /home --bind /tmp /tmp --ro-bind /nix /nix --ro-bind /run /run --proc /proc --dev /dev \
|
||||
--ro-bind ${toString path} ${toString path} --bind "$MITM_CACHE_CERT_DIR" "$MITM_CACHE_CERT_DIR" \
|
||||
${builtins.concatStringsSep " " (map (x: "--setenv ${x} \"\$${x}\"") keep)} \
|
||||
--setenv NIX_BUILD_SHELL bash ${bwrapFlags} ''${BWRAP_FLAGS:-} \
|
||||
--setenv NIX_BUILD_SHELL ${runtimeShell} ${bwrapFlags} ''${BWRAP_FLAGS:-} \
|
||||
-- ${nix}/bin/nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
|
||||
else
|
||||
NIX_BUILD_SHELL=bash nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
|
||||
NIX_BUILD_SHELL=${runtimeShell} nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath}
|
||||
fi${lib.optionalString silent " >&2"}
|
||||
kill -s SIGINT "$MITM_CACHE_PID"
|
||||
for i in {0..20}; do
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
# Take packages from self first, then python.pkgs (and secondarily pkgs)
|
||||
lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
|
||||
python = python3.override {
|
||||
self = self.python;
|
||||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy_1_4;
|
||||
moto = super.moto.overridePythonAttrs (oldAttrs: {
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
}:
|
||||
|
||||
let python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# see https://github.com/devicetree-org/dt-schema/issues/108
|
||||
jsonschema = super.jsonschema.overridePythonAttrs (old: rec {
|
||||
@ -27,4 +28,3 @@ let python = python3.override {
|
||||
});
|
||||
};
|
||||
}; in python.pkgs.toPythonApplication python.pkgs.dtschema
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = pySelf: pySuper: {
|
||||
connexion = pySuper.connexion.overridePythonAttrs (o: rec {
|
||||
version = "2.14.2";
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
let
|
||||
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
antlr4-python3-runtime = super.antlr4-python3-runtime.override {
|
||||
antlr4 = antlr4_9;
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pydantic = super.pydantic_1;
|
||||
};
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
sqlalchemy = super.sqlalchemy_1_4;
|
||||
|
||||
|
||||
@ -1,24 +1,23 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildHomeAssistantComponent
|
||||
, pytz
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildHomeAssistantComponent,
|
||||
pytz,
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "presto8";
|
||||
owner = "blakeblackshear";
|
||||
domain = "frigate";
|
||||
version = "5.2.0";
|
||||
version = "5.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blakeblackshear";
|
||||
repo = "frigate-hass-integration";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OWpOYNVzowdn0iZfJwhdMrAYeqDpNJvSwHpsJX9fDk4=";
|
||||
hash = "sha256-0eTEgRDgm4+Om2uqrt24Gj7dSdA6OJs/0oi5J5SHOyI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytz
|
||||
];
|
||||
dependencies = [ pytz ];
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
|
||||
@ -6,23 +6,23 @@
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
owner = "jm-73";
|
||||
owner = "sander1988";
|
||||
domain = "indego";
|
||||
version = "5.7.2";
|
||||
version = "5.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jm-73";
|
||||
owner = "sander1988";
|
||||
repo = "Indego";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9q8aHbAMIA2xKhZl/CDXWSV1ylDCEVkpL8OUlELoG0Q=";
|
||||
hash = "sha256-SiYjducy0NP5bF3STVzhBdnJraNjHywHfD7OmAnYmr0=";
|
||||
};
|
||||
|
||||
dependencies = [ pyindego ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bosch Indego lawn mower component";
|
||||
changelog = "https://github.com/jm-73/Indego/releases/tag/${version}";
|
||||
homepage = "https://github.com/jm-73/Indego";
|
||||
changelog = "https://github.com/sander1988/Indego/releases/tag/${version}";
|
||||
homepage = "https://github.com/sander1988/Indego";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
||||
@ -4,6 +4,9 @@
|
||||
, toPythonModule
|
||||
, async-timeout
|
||||
, music-assistant
|
||||
, pytestCheckHook
|
||||
, pytest-asyncio
|
||||
, pytest-homeassistant-custom-component
|
||||
}:
|
||||
|
||||
buildHomeAssistantComponent rec {
|
||||
@ -18,6 +21,10 @@ buildHomeAssistantComponent rec {
|
||||
hash = "sha256-Wvc+vUYkUJmS4U34Sh/sDCVXmQA0AtEqIT8MNXd++3M=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i "s/--cov//" pyproject.toml
|
||||
'';
|
||||
|
||||
dependencies = [
|
||||
async-timeout
|
||||
(toPythonModule music-assistant)
|
||||
@ -25,6 +32,12 @@ buildHomeAssistantComponent rec {
|
||||
|
||||
dontCheckManifest = true; # expects music-assistant 2.0.6, we have 2.0.7
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-homeassistant-custom-component
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players";
|
||||
homepage = "https://github.com/music-assistant/hass-music-assistant";
|
||||
|
||||
@ -451,6 +451,7 @@ let
|
||||
];
|
||||
|
||||
python = python312.override {
|
||||
self = python;
|
||||
packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
|
||||
};
|
||||
|
||||
|
||||
@ -983,8 +983,8 @@ let self = {
|
||||
name = "vod";
|
||||
owner = "kaltura";
|
||||
repo = "nginx-vod-module";
|
||||
rev = "1.32";
|
||||
hash = "sha256-ZpG0oj60D3o7/7uyE8AybCiOtncVe1Jnjaz22sIFypk=";
|
||||
rev = "1.33";
|
||||
hash = "sha256-xcdbaogJV/vSzFfP55uK2+zw3zF5j9AHaJI0QItTSss=";
|
||||
postFetch = ''
|
||||
substituteInPlace $out/vod/media_set.h \
|
||||
--replace "MAX_CLIPS (128)" "MAX_CLIPS (1024)"
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ python3, fetchPypi, lib, overlay ? (_: _: {}) }:
|
||||
|
||||
python3.override {
|
||||
lib.fix (self: python3.override {
|
||||
inherit self;
|
||||
packageOverrides = lib.composeExtensions
|
||||
(self: super: {
|
||||
/*
|
||||
@ -35,4 +36,4 @@ python3.override {
|
||||
})
|
||||
|
||||
overlay;
|
||||
}
|
||||
})
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.37.0a1";
|
||||
|
||||
@ -55,6 +55,7 @@ with lib;
|
||||
let
|
||||
# samba-tool requires libxcrypt-legacy algorithms
|
||||
python = python3Packages.python.override {
|
||||
self = python;
|
||||
libxcrypt = libxcrypt-legacy;
|
||||
};
|
||||
wrapPython = python3Packages.wrapPython.override {
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = final: prev: {
|
||||
django = prev.django_5;
|
||||
};
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.9.3";
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
pyparsing = super.pyparsing.overridePythonAttrs rec {
|
||||
version = "2.4.7";
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
|
||||
click = super.click.overridePythonAttrs (oldAttrs: rec {
|
||||
|
||||
@ -3,10 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
};
|
||||
};
|
||||
python = python3;
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonPackage {
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
torch = super.torch-bin;
|
||||
torchvision = super.torchvision-bin;
|
||||
|
||||
@ -169,6 +169,7 @@ let
|
||||
|
||||
# Watch out for python <> boost compatibility
|
||||
python = python311.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: let
|
||||
cryptographyOverrideVersion = "40.0.1";
|
||||
bcryptOverrideVersion = "4.0.1";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
|
||||
|
||||
let version = "2.00";
|
||||
let version = "2.02";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "cloc";
|
||||
inherit version;
|
||||
@ -9,7 +9,7 @@ in stdenv.mkDerivation {
|
||||
owner = "AlDanial";
|
||||
repo = "cloc";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GZvrsVuPLg09yOlDmdHNZ0QLXoftgSYMFkn6PLf1/Pw=";
|
||||
sha256 = "sha256-qTrBCCC2J8Ewt6GvYlnXU8F1iB31A1xTFXdkee8L0Os=";
|
||||
};
|
||||
|
||||
setSourceRoot = ''
|
||||
|
||||
@ -78,6 +78,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
# version 4 or newer would log the followng error but tests currently don't fail because radare2 is disabled
|
||||
# ValueError: argument TNULL is not a TLSH hex string
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
|
||||
let
|
||||
python = python3Packages.python.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
esphome-dashboard = self.callPackage ./dashboard.nix { };
|
||||
};
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
mistune = super.mistune.overridePythonAttrs (old: rec {
|
||||
version = "2.0.5";
|
||||
|
||||
@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
]
|
||||
++ (with python3.pkgs; [
|
||||
autoflake
|
||||
distutils
|
||||
flake8
|
||||
isort
|
||||
jupytext
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
|
||||
let
|
||||
python = python39.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
ntfy-webpush = self.callPackage ./webpush.nix { };
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python' = python3.override {
|
||||
self = python';
|
||||
packageOverrides = final: prev: rec {
|
||||
# tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6
|
||||
requests-cache = prev.requests-cache.overridePythonAttrs (oldAttrs: rec {
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
# aiosqlite>=0.16,<0.19
|
||||
aiosqlite = prev.aiosqlite.overridePythonAttrs (old: rec {
|
||||
|
||||
@ -10,6 +10,7 @@ let
|
||||
# uses eliot in a way incompatible after version 1.14.0.
|
||||
# These versions should be unpinned, when updating Tahoe-LAFS to a more recent version.
|
||||
python = python311.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
eliot = super.eliot.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.14.0";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = final: prev: {
|
||||
markdown-it-py = prev.markdown-it-py.overridePythonAttrs (_: {
|
||||
doCheck = false;
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nix-du";
|
||||
version = "1.2.0";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symphorien";
|
||||
repo = "nix-du";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HfmMZVlsdg9hTWGUihl6OlQAp/n1XRvPLfAKJ8as8Ew=";
|
||||
sha256 = "sha256-WImnfkBU17SFQG1DzVUdsNq3hkiISNjAVZr2xGbgwHg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
|
||||
cargoHash = "sha256-gE99nCJIi6fsuxzJuU80VWXIZqVbqwBhKM2aRlhmYco=";
|
||||
|
||||
doCheck = true;
|
||||
nativeCheckInputs = [ nix graphviz ];
|
||||
|
||||
@ -22,6 +22,7 @@ let
|
||||
});
|
||||
} // (plugins self);
|
||||
python = python3.override (old: {
|
||||
self = python;
|
||||
packageOverrides = lib.composeManyExtensions
|
||||
((if old ? packageOverrides then [ old.packageOverrides ] else [ ]) ++ [ newPackageOverrides ]);
|
||||
});
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
}:
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
|
||||
cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec {
|
||||
|
||||
@ -26,9 +26,11 @@ let
|
||||
preBuild = ''
|
||||
# Set project name, otherwise defaults to directory name
|
||||
echo -e '\nrootProject.name = "${pname}"' >> settings.gradle
|
||||
${args.preBuild or ""}
|
||||
'';
|
||||
|
||||
gradleFlags = [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ];
|
||||
gradleBuildTask = args.gradleBuildTask or "buildExtension";
|
||||
gradleFlags = args.gradleFlags or [] ++ [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ];
|
||||
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
|
||||
@ -48,6 +48,7 @@ buildGhidraExtension {
|
||||
buildInputs = [
|
||||
zlib
|
||||
];
|
||||
gradleBuildTask = "assemble";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
emoji = super.emoji.overridePythonAttrs rec {
|
||||
version = "1.7.0";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
}:
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
impacket = super.impacket.overridePythonAttrs {
|
||||
version = "0.12.0.dev1-unstable-2023-11-30";
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
self = py;
|
||||
packageOverrides = self: super: {
|
||||
paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "3.3.1";
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
self = python;
|
||||
packageOverrides = self: super: {
|
||||
# https://github.com/refi64/mrkd/pull/6
|
||||
mistune = super.mistune.overridePythonAttrs (old: rec {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user