Merge branch 'master' into staging-next
This commit is contained in:
commit
aeb7c79ee4
|
@ -11,16 +11,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "spotify-player";
|
pname = "spotify-player";
|
||||||
version = "0.12.0";
|
version = "0.12.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "aome510";
|
owner = "aome510";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-nWXXaRHTzCXmu4eKw88pKuWXgdG9n7azPeBbXYz+Fio=";
|
hash = "sha256-KHbeCnsdHP7Zsj9KeVLuumcVOW6m7Tz1GgBBQ25Rbyo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-y/qHiwZes4nVtjbFN/jL2LFugGpRKnYij7+XXZbqguQ=";
|
cargoHash = "sha256-51xKCiGdvJ8k9ArWBCazJGgRljqHxZiyTdes4i7JZH8=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A command driven spotify player";
|
description = "A command driven spotify player";
|
||||||
homepage = "https://github.com/aome510/spotify-player";
|
homepage = "https://github.com/aome510/spotify-player";
|
||||||
|
changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}";
|
||||||
mainProgram = "spotify_player";
|
mainProgram = "spotify_player";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ dit7ya ];
|
maintainers = with maintainers; [ dit7ya ];
|
||||||
|
|
|
@ -6,18 +6,20 @@
|
||||||
, enableSwftools ? false
|
, enableSwftools ? false
|
||||||
, swftools
|
, swftools
|
||||||
, python3Packages
|
, python3Packages
|
||||||
|
, qtbase
|
||||||
|
, qtcharts
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
python3Packages.buildPythonPackage rec {
|
||||||
pname = "hydrus";
|
pname = "hydrus";
|
||||||
version = "503";
|
version = "519";
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hydrusnetwork";
|
owner = "hydrusnetwork";
|
||||||
repo = "hydrus";
|
repo = "hydrus";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-nJn5EphbmVYAAOisV3fym/nHlJl/aPZ2Iyp+Z2/N3Jc=";
|
hash = "sha256-q5pPRMBuB6hqDGuOl0kMyXjMKze5dw+3kdmA2FPJTPU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -25,6 +27,11 @@ python3Packages.buildPythonPackage rec {
|
||||||
python3Packages.mkdocs-material
|
python3Packages.mkdocs-material
|
||||||
];
|
];
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
qtbase
|
||||||
|
qtcharts
|
||||||
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
beautifulsoup4
|
beautifulsoup4
|
||||||
cbor2
|
cbor2
|
||||||
|
@ -37,8 +44,10 @@ python3Packages.buildPythonPackage rec {
|
||||||
opencv4
|
opencv4
|
||||||
pillow
|
pillow
|
||||||
psutil
|
psutil
|
||||||
|
pympler
|
||||||
pyopenssl
|
pyopenssl
|
||||||
pyside2
|
pyqt6
|
||||||
|
pyqt6-charts
|
||||||
pysocks
|
pysocks
|
||||||
python-dateutil
|
python-dateutil
|
||||||
python3Packages.mpv
|
python3Packages.mpv
|
||||||
|
@ -82,6 +91,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
-e TestHydrusServer \
|
-e TestHydrusServer \
|
||||||
-e TestHydrusSessions \
|
-e TestHydrusSessions \
|
||||||
-e TestServer \
|
-e TestServer \
|
||||||
|
-e TestClientMetadataMigration \
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputs = [ "out" "doc" ];
|
outputs = [ "out" "doc" ];
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||||
signal-desktop = {
|
signal-desktop = {
|
||||||
dir = "Signal";
|
dir = "Signal";
|
||||||
version = "6.7.0";
|
version = "6.9.0";
|
||||||
hash = "sha256-njiVPTkzYdt7QZcpohXUI3hj/o+fO4/O0ZlQrq2oP6Y=";
|
hash = "sha256-VgEGFt8LvVpIWiqFyYiTXUavYY0YmnJ+CxrNhPP0hCg=";
|
||||||
};
|
};
|
||||||
signal-desktop-beta = {
|
signal-desktop-beta = {
|
||||||
dir = "Signal Beta";
|
dir = "Signal Beta";
|
||||||
version = "6.8.0-beta.1";
|
version = "6.10.0-beta.1";
|
||||||
hash = "sha256-akQmGxDW6SBQCRLU6TgfODP8ZjEPsvaBvrkdd+6DqKs=";
|
hash = "sha256-A8jpYDWiCCBadRDzmNVxzucKPomgXlqdyeGiYp+1Byo=";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,10 @@ mkCoqDerivation rec {
|
||||||
owner = "DeepSpec";
|
owner = "DeepSpec";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||||
|
{ case = range "8.13" "8.17"; out = "5.1.0"; }
|
||||||
{ case = range "8.10" "8.16"; out = "4.0.0"; }
|
{ case = range "8.10" "8.16"; out = "4.0.0"; }
|
||||||
] null;
|
] null;
|
||||||
|
release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo=";
|
||||||
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
|
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
|
||||||
releaseRev = v: "${v}";
|
releaseRev = v: "${v}";
|
||||||
propagatedBuildInputs = [ coq-ext-lib paco ];
|
propagatedBuildInputs = [ coq-ext-lib paco ];
|
||||||
|
|
|
@ -5,7 +5,7 @@ mkCoqDerivation rec {
|
||||||
owner = "coq-ext-lib";
|
owner = "coq-ext-lib";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
{ case = range "8.11" "8.16"; out = "0.11.7"; }
|
{ case = range "8.11" "8.17"; out = "0.11.7"; }
|
||||||
{ case = range "8.8" "8.16"; out = "0.11.6"; }
|
{ case = range "8.8" "8.16"; out = "0.11.6"; }
|
||||||
{ case = range "8.8" "8.14"; out = "0.11.4"; }
|
{ case = range "8.8" "8.14"; out = "0.11.4"; }
|
||||||
{ case = range "8.8" "8.13"; out = "0.11.3"; }
|
{ case = range "8.8" "8.13"; out = "0.11.3"; }
|
||||||
|
|
|
@ -5,7 +5,7 @@ mkCoqDerivation {
|
||||||
owner = "snu-sf";
|
owner = "snu-sf";
|
||||||
inherit version;
|
inherit version;
|
||||||
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
defaultVersion = with lib.versions; lib.switch coq.coq-version [
|
||||||
{ case = range "8.12" "8.16"; out = "4.1.2"; }
|
{ case = range "8.12" "8.17"; out = "4.1.2"; }
|
||||||
{ case = range "8.9" "8.13"; out = "4.1.1"; }
|
{ case = range "8.9" "8.13"; out = "4.1.1"; }
|
||||||
{ case = range "8.6" "8.13"; out = "4.0.2"; }
|
{ case = range "8.6" "8.13"; out = "4.0.2"; }
|
||||||
{ case = isEq "8.5"; out = "1.2.8"; }
|
{ case = isEq "8.5"; out = "1.2.8"; }
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ailment";
|
pname = "ailment";
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-KXbHD0CsQotHjc/Pbo4/y/uhCvGkbPDGn1BF8A68xBY=";
|
hash = "sha256-45wEnYx2/XvyVlew8rwPFSHZtj6NdZWPEEomkqBLNIw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "angr";
|
pname = "angr";
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-HikfqU2k7w/IO51vOKNzCLWd+MphG1hXkJal5usQZOA=";
|
hash = "sha256-EbOGAY7aqpWngy8ImdDt8dmJhc1UEiX0I8KY8TSump0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "archinfo";
|
pname = "archinfo";
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-O2Tj5rwev5tWnaHq/GJV5/9fAlk5np7S3Yw+ehmofks=";
|
hash = "sha256-jDC4nmHg7OCo7mQ7iLeG7OFB1xAQxkKw1WZTyY2FBoY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "claripy";
|
pname = "claripy";
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-FX73LF8T6FaQNqN7EB1SCRAGZsChkEduNL2i8ATQuOE=";
|
hash = "sha256-94FEyPL9zjHBFC8L/Aij8OcS5GiBBEY1Tnm4N7zNW0g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
# The binaries are following the argr projects release cycle
|
# The binaries are following the argr projects release cycle
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
|
|
||||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||||
binaries = fetchFromGitHub {
|
binaries = fetchFromGitHub {
|
||||||
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
||||||
owner = "angr";
|
owner = "angr";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-v87ma0svBpVfx2SVLw8dx7HdOLQpNzjRwVj9yQs0bR8=";
|
hash = "sha256-NZPXpL4bnPXJHIPf+Jwt6vE7G43JAjhZhW2xeNSw3R8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -12,14 +12,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "devolo-home-control-api";
|
pname = "devolo-home-control-api";
|
||||||
version = "0.18.2";
|
version = "0.18.3";
|
||||||
disabled = pythonOlder "3.6";
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "2Fake";
|
owner = "2Fake";
|
||||||
repo = "devolo_home_control_api";
|
repo = "devolo_home_control_api";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8=";
|
hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "flask-security-too";
|
pname = "flask-security-too";
|
||||||
version = "5.1.1";
|
version = "5.1.2";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
pname = "Flask-Security-Too";
|
pname = "Flask-Security-Too";
|
||||||
inherit version;
|
inherit version;
|
||||||
hash = "sha256-CgtlPP0cXSUplL2HsfESQxzsLVys7fpJs24XQNohw30=";
|
hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "jupyter-book";
|
pname = "jupyter-book";
|
||||||
version = "0.15.0";
|
version = "0.15.1";
|
||||||
|
|
||||||
format = "flit";
|
format = "flit";
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-eUw3zC+6kx/OQvMhzkG6R3b2ricX0kvC+fCBD4mkEuo=";
|
hash = "sha256-ihY07Bb37t7g0Rbx5ft8SCAyia2S2kLglRnccdlWwBA=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "plexapi";
|
pname = "plexapi";
|
||||||
version = "4.13.2";
|
version = "4.13.4";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
disabled = pythonOlder "3.7";
|
disabled = pythonOlder "3.7";
|
||||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||||
owner = "pkkid";
|
owner = "pkkid";
|
||||||
repo = "python-plexapi";
|
repo = "python-plexapi";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-5YwINPgQ4efZBvu5McsLYicW/7keKSi011lthJUR9zw=";
|
hash = "sha256-yq1tQ6xJn+IxrKXwUVeLhki6sdkwzu9hHSILsLJdPPY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|
77
pkgs/development/python-modules/pyqt6-charts.nix
Normal file
77
pkgs/development/python-modules/pyqt6-charts.nix
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchPypi
|
||||||
|
, sip
|
||||||
|
, pyqt-builder
|
||||||
|
, qt6Packages
|
||||||
|
, pythonOlder
|
||||||
|
, pyqt6
|
||||||
|
, python
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildPythonPackage rec {
|
||||||
|
pname = "PyQt6_Charts";
|
||||||
|
version = "6.4.0";
|
||||||
|
format = "pyproject";
|
||||||
|
|
||||||
|
disabled = pythonOlder "3.6";
|
||||||
|
|
||||||
|
src = fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "sha256-tG6xKEBRagOcNvcLs/hCMzf5j94ma1gs6tQEm3e0P2Q=";
|
||||||
|
};
|
||||||
|
|
||||||
|
# fix include path and increase verbosity
|
||||||
|
postPatch = ''
|
||||||
|
sed -i \
|
||||||
|
'/\[tool.sip.project\]/a\
|
||||||
|
verbose = true\
|
||||||
|
sip-include-dirs = [\"${pyqt6}/${python.sitePackages}/PyQt6/bindings\"]' \
|
||||||
|
pyproject.toml
|
||||||
|
'';
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
# HACK: paralellize compilation of make calls within pyqt's setup.py
|
||||||
|
# pkgs/stdenv/generic/setup.sh doesn't set this for us because
|
||||||
|
# make gets called by python code and not its build phase
|
||||||
|
# format=pyproject means the pip-build-hook hook gets used to build this project
|
||||||
|
# pkgs/development/interpreters/python/hooks/pip-build-hook.sh
|
||||||
|
# does not use the enableParallelBuilding flag
|
||||||
|
preBuild = ''
|
||||||
|
export MAKEFLAGS+="''${enableParallelBuilding:+-j$NIX_BUILD_CORES}"
|
||||||
|
'';
|
||||||
|
|
||||||
|
dontWrapQtApps = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = with qt6Packages; [
|
||||||
|
qtcharts
|
||||||
|
sip
|
||||||
|
qmake
|
||||||
|
pyqt-builder
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = with qt6Packages; [
|
||||||
|
qtcharts
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
pyqt6
|
||||||
|
];
|
||||||
|
|
||||||
|
dontConfigure = true;
|
||||||
|
|
||||||
|
# has no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
pythonImportsCheck = [
|
||||||
|
"PyQt6.QtCharts"
|
||||||
|
];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Python bindings for Qt6 QtCharts";
|
||||||
|
homepage = "https://riverbankcomputing.com/";
|
||||||
|
license = licenses.gpl3Only;
|
||||||
|
platforms = platforms.mesaPlatforms;
|
||||||
|
maintainers = with maintainers; [ dandellion ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -13,14 +13,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "pyvex";
|
pname = "pyvex";
|
||||||
version = "9.2.41";
|
version = "9.2.42";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-NYNxuWvAvx5IW1gdWv+EF321yzUPaqFBRNKVwu4ogug=";
|
hash = "sha256-5pp66sI15sdavyZD+xrTFqhAgjT89KswBE0MQ09Fdl4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -23,14 +23,14 @@ with py.pkgs;
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "checkov";
|
pname = "checkov";
|
||||||
version = "2.3.85";
|
version = "2.3.92";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bridgecrewio";
|
owner = "bridgecrewio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-j//r9ykMCzmpPBAPmfZCMlvcv7jrFaT+fFsLZoOeQF4=";
|
hash = "sha256-7Mr9mWnUuxfGJZVx845JHtIbWZeWStY/xbWUVjOcksM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -114,6 +114,8 @@ buildPythonApplication rec {
|
||||||
# Tests are comparing console output
|
# Tests are comparing console output
|
||||||
"cli"
|
"cli"
|
||||||
"console"
|
"console"
|
||||||
|
# Starting to fail after 2.3.92
|
||||||
|
"test_runner_verify_secrets_skip"
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "go-task";
|
pname = "go-task";
|
||||||
version = "3.21.0";
|
version = "3.22.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = "task";
|
repo = "task";
|
||||||
rev = "v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
sha256 = "sha256-w46fCcUKMtmiFVSMSzgsegWBZUcTaMgOkhu9HnfYHf4=";
|
hash = "sha256-SmO59VXuQZISDNJy2d6qhQv1QCxm0WodqPx2qHhCs80=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-YC2C0/ayl0Rp8brzLLcdLB98BmhH7sP7EzLVdOIGAvQ=";
|
vendorHash = "sha256-TsFPpN/X5pO4KALbqsHCa6YxYtaXMVqB5ENaIEfTWRo=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
@ -32,6 +32,7 @@ buildGoModule rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://taskfile.dev/";
|
homepage = "https://taskfile.dev/";
|
||||||
description = "A task runner / simpler Make alternative written in Go";
|
description = "A task runner / simpler Make alternative written in Go";
|
||||||
|
changelog = "https://github.com/go-task/task/blob/v${version}/CHANGELOG.md";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ parasrah ];
|
maintainers = with maintainers; [ parasrah ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "terracognita";
|
pname = "terracognita";
|
||||||
version = "0.8.2";
|
version = "0.8.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "cycloidio";
|
owner = "cycloidio";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-OzqIUnvWVxaUAWRIKDWaxtmTeFGqvVYAgdbG4jrph7w=";
|
hash = "sha256-ipPJMh88R9Ddo1QzN+No9H2bBsLSPARUI2HRaYvK6jc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-LzkxVxqBJ3pRk3EI+/Lc6XSNyxhPUg61GKwI1Kmadsc=";
|
vendorHash = "sha256-7fGqChud9dcgA9BXyJysUgvvG7zI+ByA0oFlSMd+rps=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,8 @@ let
|
||||||
in
|
in
|
||||||
buildNodejs {
|
buildNodejs {
|
||||||
inherit enableNpm;
|
inherit enableNpm;
|
||||||
version = "19.7.0";
|
version = "19.8.0";
|
||||||
sha256 = "sha256-URhH9yTqQF+F4lgDy8+LExsUzQay1wRmmL0nYMQEv8M=";
|
sha256 = "sha256-O3wH4ngJIHGMGsfSS2czXwSN2cPdaVaR9B2oD06jSaY=";
|
||||||
patches = [
|
patches = [
|
||||||
./revert-arm64-pointer-auth.patch
|
./revert-arm64-pointer-auth.patch
|
||||||
./disable-darwin-v8-system-instrumentation-node19.patch
|
./disable-darwin-v8-system-instrumentation-node19.patch
|
||||||
|
|
|
@ -6,16 +6,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "chezmoi";
|
pname = "chezmoi";
|
||||||
version = "2.31.1";
|
version = "2.32.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "twpayne";
|
owner = "twpayne";
|
||||||
repo = "chezmoi";
|
repo = "chezmoi";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-zSr4lvrrGM+BgPWtq/J7vnB1lWHI8PmqP/N5csFL9kU=";
|
hash = "sha256-ljzcB48AeYMbo3GjsegJS7eyIRnd+prHBtK4dAICOCY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-/CGdz6wIpEZrhZe6IYa43Z3bpN1byeSi9h4dTxCMxog=";
|
vendorHash = "sha256-Ugp3jvtV12Ss7HdhLkBSdENyOTSb573iho1u2UX5Img=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,20 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "shadowsocks-v2ray-plugin";
|
pname = "shadowsocks-v2ray-plugin";
|
||||||
version = "1.3.2";
|
version = "1.3.1";
|
||||||
|
# Version 1.3.2 has runtime failures with Go 1.19
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/219343
|
||||||
|
# https://github.com/shadowsocks/v2ray-plugin/issues/292
|
||||||
|
# nixpkgs-update: no auto update
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "shadowsocks";
|
owner = "shadowsocks";
|
||||||
repo = "v2ray-plugin";
|
repo = "v2ray-plugin";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-sGsGdJp20mXvJ6Ov1QjztbJxNpDaDEERcRAAyGgenVk=";
|
sha256 = "0aq445gnqk9dxs1hkw7rvk86wg0iyiy0h740lvyh6d9zsqhf61wb";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = "sha256-vW8790Z4BacbdqANWO41l5bH5ac/TSZIdVNvOFVTsZ8=";
|
vendorSha256 = "0vzd9v33p4a32f5ic9ir4g5ckis06wpdf07a649h9qalimxnvzfz";
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Yet another SIP003 plugin for shadowsocks, based on v2ray";
|
description = "Yet another SIP003 plugin for shadowsocks, based on v2ray";
|
||||||
|
|
|
@ -30170,7 +30170,7 @@ with pkgs;
|
||||||
|
|
||||||
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
hydrus = python3Packages.callPackage ../applications/graphics/hydrus {
|
||||||
inherit miniupnpc swftools;
|
inherit miniupnpc swftools;
|
||||||
inherit (qt5) wrapQtAppsHook;
|
inherit (qt6) wrapQtAppsHook qtbase qtcharts;
|
||||||
};
|
};
|
||||||
|
|
||||||
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
||||||
|
|
|
@ -8771,6 +8771,8 @@ self: super: with self; {
|
||||||
|
|
||||||
pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { };
|
pyqt6 = callPackage ../development/python-modules/pyqt/6.x.nix { };
|
||||||
|
|
||||||
|
pyqt6-charts = callPackage ../development/python-modules/pyqt6-charts.nix { };
|
||||||
|
|
||||||
pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { };
|
pyqt6-sip = callPackage ../development/python-modules/pyqt/pyqt6-sip.nix { };
|
||||||
|
|
||||||
pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { };
|
pyqt6-webengine = callPackage ../development/python-modules/pyqt6-webengine.nix { };
|
||||||
|
|
Loading…
Reference in a new issue