Merge staging-next into staging
This commit is contained in:
@@ -20443,6 +20443,12 @@
|
||||
githubId = 13489144;
|
||||
name = "Calle Rosenquist";
|
||||
};
|
||||
xbz = {
|
||||
email = "renatochavez7@gmail.com";
|
||||
github = "Xbz-24";
|
||||
githubId = 68678258;
|
||||
name = "Renato German Chavez Chicoma";
|
||||
};
|
||||
xddxdd = {
|
||||
email = "b980120@hotmail.com";
|
||||
github = "xddxdd";
|
||||
|
||||
@@ -1,40 +1,60 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, meerk40t-camera
|
||||
, python3
|
||||
, python3Packages
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "MeerK40t";
|
||||
version = "0.8.1000";
|
||||
format = "setuptools";
|
||||
version = "0.9.3010";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meerk40t";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-YCcnqaH4Npmct5IBHsnufswRz8bS7mUb1YFwTta/Dxc=";
|
||||
hash = "sha256-RlIWqxmUiL1gFMxwcdWxDiebmEzVz6kTaSlAZHr8S+I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook
|
||||
];
|
||||
] ++ (with python3Packages; [
|
||||
setuptools
|
||||
]);
|
||||
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ezdxf
|
||||
# https://github.com/meerk40t/meerk40t/blob/main/setup.py
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
meerk40t-camera
|
||||
opencv4
|
||||
pillow
|
||||
numpy
|
||||
pyserial
|
||||
pyusb
|
||||
setuptools
|
||||
wxpython
|
||||
];
|
||||
]
|
||||
++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
passthru.optional-dependencies = with python3Packages; {
|
||||
cam = [
|
||||
opencv4
|
||||
];
|
||||
camhead = [
|
||||
opencv4
|
||||
];
|
||||
dxf = [
|
||||
ezdxf
|
||||
];
|
||||
gui = [
|
||||
wxpython
|
||||
pillow
|
||||
opencv4
|
||||
ezdxf
|
||||
];
|
||||
};
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
@@ -43,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
unittestCheckHook
|
||||
];
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mozphab";
|
||||
version = "1.4.3";
|
||||
version = "1.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla-conduit";
|
||||
repo = "review";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug=";
|
||||
hash = "sha256-HxwQ+mGtjnruppPAD01QUg3aca+k5vpj814BWM+3VfQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
diff -Nurp sigal-2.3.orig/sigal/writer.py sigal-2.3/sigal/writer.py
|
||||
--- sigal-2.3.orig/sigal/writer.py 2022-08-08 19:43:10.934707194 +0200
|
||||
+++ sigal-2.3/sigal/writer.py 2022-08-08 19:44:57.542382532 +0200
|
||||
@@ -103,7 +103,11 @@ class AbstractWriter:
|
||||
os.path.join(THEMES_PATH, 'default', 'static'),
|
||||
os.path.join(self.theme, 'static'),
|
||||
):
|
||||
- shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True)
|
||||
+ # https://stackoverflow.com/a/17022146/4935114
|
||||
+ orig_copystat = shutil.copystat
|
||||
+ shutil.copystat = lambda x, y: x
|
||||
+ shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True, copy_function=shutil.copy)
|
||||
+ shutil.copystat = orig_copystat
|
||||
|
||||
if self.settings["user_css"]:
|
||||
if not os.path.exists(self.settings["user_css"]):
|
||||
@@ -7,15 +7,17 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sigal";
|
||||
version = "2.3";
|
||||
format = "setuptools";
|
||||
version = "2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-4Zsb/OBtU/jV0gThEYe8bcrb+6hW+hnzQS19q1H409Q=";
|
||||
hash = "sha256-pDTaqtqfuk7tACkyaKClTJotuVcTKli5yx1wbEM93TM=";
|
||||
};
|
||||
|
||||
patches = [ ./copytree-permissions.patch ];
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
# install_requires
|
||||
@@ -31,8 +33,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
feedgenerator
|
||||
zopfli
|
||||
cryptography
|
||||
|
||||
setuptools # needs pkg_resources
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
"-DBUILD_UPDATER=off"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
|
||||
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
|
||||
"-DMIRALL_VERSION_SUFFIX=" # remove git suffix from version
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
|
||||
@@ -17,8 +17,8 @@ libgit2.overrideAttrs (oldAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "libgit2";
|
||||
rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61";
|
||||
sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY=";
|
||||
rev = "tag-2ecf33948a4df9ef45a66c68b8ef24a5e60eaac6";
|
||||
hash = "sha256-Bm3Gj9+AhNQMvkIqdrTkK5D9vrZ1qq6CS8Wrn9kfKiw=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "picom";
|
||||
version = "11";
|
||||
version = "11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yshui";
|
||||
repo = "picom";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-KIblpEEW33ZxxTYuQ/lbUGEJcVdmSWdNOrVCvhOY/OU=";
|
||||
hash = "sha256-vdR3HzBZxtth3zJD3vMSlrnBTbopidw7FGKOk69S0R0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libopus
|
||||
, openssl
|
||||
, zlib
|
||||
, libsodium
|
||||
, pkg-config
|
||||
, autoPatchelfHook
|
||||
, lib
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpp";
|
||||
version = "10.0.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainboxdotcc";
|
||||
repo = "DPP";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-BJMg3MLSfb9x/2lPHITeI3SWwW1OZVUUMVltTWUcw9I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zlib
|
||||
libsodium
|
||||
libopus
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Discord C++ Library";
|
||||
longDescription = ''
|
||||
D++ (DPP) is a lightweight and simple library for Discord written in modern C++.
|
||||
It is designed to cover as much of the API specification as possible and to have
|
||||
an incredibly small memory footprint, even when caching large amounts of data.
|
||||
This package contains version ${finalAttrs.version} of the DPP library.
|
||||
'';
|
||||
homepage = "https://github.com/brainboxdotcc/DPP";
|
||||
changelog = "https://github.com/brainboxdotcc/DPP/releases/tag/${finalAttrs.src.rev}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ xbz ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "paper-clip";
|
||||
version = "4.0";
|
||||
version = "5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Diego-Ivan";
|
||||
repo = "Paper-Clip";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-8RZE6YzoJ98D++w7v007cdurMdfZoX3oQvN94F1d9cI=";
|
||||
hash = "sha256-lkPX8S/0e7qEAfRiq0MyacDrqSWllncd9STxR7NKUFw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,30 +2,38 @@
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, libsixel
|
||||
, testers
|
||||
, presenterm
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "presenterm";
|
||||
version = "0.4.1";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mfontanini";
|
||||
repo = "presenterm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-OHp/qbuaZ7uVydKGnSiBR5KQGdf8rWQQWRHrka+PI1M=";
|
||||
hash = "sha256-VAcK02dbtuTGn+lPu1vb/wAkroHuHqsU2KYHBiP2Org=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libsixel
|
||||
];
|
||||
|
||||
cargoHash = "sha256-ymSTloz7sPAtMZN1uDgLs89gMcU+UTsMVc6y5UHt7no=";
|
||||
cargoHash = "sha256-bufFiyqRsn4eG57bKn42p5cyX+Z7oiz/USZvg9YOvHA=";
|
||||
|
||||
buildFeatures = [ "sixel" ];
|
||||
|
||||
# Skip test that currently doesn't work
|
||||
checkFlags = [ "--skip=execute::test::shell_code_execution" ];
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = presenterm;
|
||||
command = "presenterm --version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A terminal based slideshow tool";
|
||||
changelog = "https://github.com/mfontanini/presenterm/releases/tag/v${version}";
|
||||
@@ -33,5 +41,8 @@ rustPlatform.buildRustPackage rec {
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ mikaelfangel ];
|
||||
mainProgram = "presenterm";
|
||||
# Crashes at runtime on darwin with:
|
||||
# Library not loaded: .../out/lib/libsixel.1.dylib
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,13 +14,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tigerbeetle";
|
||||
version = "0.14.175";
|
||||
version = "0.14.176";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tigerbeetle";
|
||||
repo = "tigerbeetle";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-MabY6kfK/SZ2ps8RZkI6cDhMdHasc1fk6+PKBfVMRm0=";
|
||||
hash = "sha256-prvTE6fingEIzXk++FYP0J9dA9xeophU0LLcknmS2ZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ custom_zig_hook ];
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, gtest
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
, cxxStandard ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "abseil-cpp";
|
||||
version = "20240116.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abseil";
|
||||
repo = "abseil-cpp";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-HtJh2oYGx87bNT6Ll3WLeYPPxH1f9JwVqCXGErykGnE=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
"-DABSL_BUILD_TEST_HELPERS=ON"
|
||||
"-DABSL_USE_EXTERNAL_GOOGLETEST=ON"
|
||||
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
|
||||
] ++ lib.optionals (cxxStandard != null) [
|
||||
"-DCMAKE_CXX_STANDARD=${cxxStandard}"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ gtest ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source collection of C++ code designed to augment the C++ standard library";
|
||||
homepage = "https://abseil.io/";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.GaetanLepage ];
|
||||
};
|
||||
})
|
||||
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
||||
changelog = "https://github.com/catchorg/Catch2/blob/${src.rev}/docs/release-notes.md";
|
||||
license = lib.licenses.boost;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
platforms = lib.platforms.unix;
|
||||
platforms = with lib.platforms; unix ++ windows;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://catch-lib.net";
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ edwtjo knedlsepp ];
|
||||
platforms = platforms.unix ++ [ "x86_64-windows" ];
|
||||
platforms = with platforms; unix ++ windows;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, catch2_3
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -33,6 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
catch2_3
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
/** `python3Packages.levenshtein` crucially depends on `rapidfuzz-cpp` */
|
||||
inherit (python3Packages) levenshtein;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";
|
||||
homepage = "https://github.com/maxbachmann/rapidfuzz-cpp";
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nose2";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ=";
|
||||
hash = "sha256-f48Dohyd4sMwFZM6/O9yv45KLV3+w7QAkih95uQbCTo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -45,13 +45,8 @@ buildPythonPackage rec {
|
||||
unittestCheckHook
|
||||
] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
|
||||
|
||||
preCheck = ''
|
||||
# https://github.com/nose-devs/nose2/issues/588
|
||||
substituteInPlace nose2/tests/functional/test_junitxml_plugin.py \
|
||||
--replace "test_skip_reason_in_message" "dont_test_skip_reason_in_message"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst";
|
||||
description = "Test runner for Python";
|
||||
homepage = "https://github.com/nose-devs/nose2";
|
||||
license = licenses.bsd0;
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ring-doorbell";
|
||||
version = "0.8.5";
|
||||
version = "0.8.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "ring_doorbell";
|
||||
inherit version;
|
||||
hash = "sha256-WYoElfkq0/uK3GPcIwDUP9w8l5zN9G2X/KDJbJNse9s=";
|
||||
hash = "sha256-sjGN1I/SeI5POkACYBcUA76Fyk7XJln7A6ofg11ygrw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
, click
|
||||
, ordered-set
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pillow
|
||||
, sortedcollections
|
||||
, setuptools_dso
|
||||
@@ -21,6 +22,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-uW1g3nlT6Y+1beifo/MOlGxsGL7on/jcAROxSddySHk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
ordered-set
|
||||
|
||||
@@ -70,14 +70,14 @@ let
|
||||
|
||||
package = buildPythonApplication rec {
|
||||
pname = "buildbot";
|
||||
version = "3.10.1";
|
||||
version = "3.11.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-/J4jWoIZEObSZKw04Ib6h4AvJtfNwzwozRu+gFek1Dk=";
|
||||
hash = "sha256-0TW14K0Cp3Ylk+JDNV9x7a8Ul7EC5FTTVvSGccXv6JU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -6,7 +6,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6lJW1XNwKXeTTn0jDOIsVHUrmxSWc4iK3gINvTFX2XU=";
|
||||
hash = "sha256-ImXiBIFSj0of2SFX01sXB5BI4TYA2IAGmfPofC8ERZQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-W0NRRS0z02/31eyqVRGJUZlUaI77I9WuAI3d3FlWHOQ=";
|
||||
hash = "sha256-bu22WXJ2yBGe89GL3RBxkUN/yPu2GEYURk6C+2LIpns=";
|
||||
};
|
||||
|
||||
# Remove unnecessary circular dependency on buildbot
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NfpgTZ0+sP2U8rkf+C4WTpXKVBvO8T+ijs8xIPe49tA=";
|
||||
hash = "sha256-WDtw4wSAPsmIRcoZS1PIRzQR4OJnHVyc19Q7MnU5VSs=";
|
||||
};
|
||||
|
||||
# Remove unnecessary circular dependency on buildbot
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ykzzvsxP8e0TIHnZJPSnFJoZNNZDvbZ7vZ6hCZyd0iA=";
|
||||
hash = "sha256-HGlKu9ptej35GJYBBWted/YtsH/uigckAoFAjYTh3gY=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-U0j/ovoP3A83BzQWF4dtwisJxs00mZz0yyT12mlxfGo=";
|
||||
hash = "sha256-oFbR4NvI/6oPXY8TospkHS1j/5KzXd1fguazFtDPIko=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-cu0+66DHf8Hfvfx/IvVyexwl3I0MmLjJrNDBPLxo7Bg=";
|
||||
hash = "sha256-O4scYAKpoEOXsPIodkKUrfwCGNYHlOGfvDnguaM12U0=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -128,7 +128,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vt7ea0IWIKn4i8sBUUMsoOMi1gPzzFssQ6wORDClJqs=";
|
||||
hash = "sha256-DlYqK32lVdZ8qby/1+JCo6m81/0dsxqiAfWMIZ1OAPQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -150,7 +150,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Fd8r2+jV4YSuYu6zUl0fDjEdUGkzuHckR+PTSEyoXio=";
|
||||
hash = "sha256-cK+uZU7rG423IT8xvwrpMPiUXfu1oPpGB5onmWNK4fs=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Q8gwqUfMy+D9dPBSw60BhNV12iu9mjhc7KXKYjtO23s=";
|
||||
hash = "sha256-Gbc0T1fsmke1pO/LiXCzQYrjWzYG1WhHZgypLyzhfok=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -194,7 +194,7 @@
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LzsdHTABtHJzEfkyJ6LbmLE0QmKA3DVjY8VP90O3jT4=";
|
||||
hash = "sha256-eFfOYhKw575VWlwD5dKRnqjSUV6kdPrv3UXBs/3AREo=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
@@ -210,13 +210,35 @@
|
||||
};
|
||||
};
|
||||
|
||||
react-wsgi-dashboards = buildPythonPackage rec {
|
||||
pname = "buildbot-react-wsgi-dashboards";
|
||||
inherit (buildbot-pkg) version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0CCD1Zrj1xodUITvLzTDrLgLGaEVqt8y26f+exsP4N8=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
||||
# tests fail
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://buildbot.net/";
|
||||
description = "Buildbot WSGI dashboards Plugin (React)";
|
||||
maintainers = teams.buildbot.members;
|
||||
license = licenses.gpl2;
|
||||
};
|
||||
};
|
||||
|
||||
badges = buildPythonPackage rec {
|
||||
pname = "buildbot-badges";
|
||||
inherit (buildbot-pkg) version;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tVMXGYTZlkchfeEcHh3B/wGEZb8xUemtnbFzX65tvb8=";
|
||||
hash = "sha256-FNMspluhQlGgQ4X7gJisakHTTmn/5PtQ+obK26PrXdg=";
|
||||
};
|
||||
|
||||
buildInputs = [ buildbot-pkg ];
|
||||
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage (rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jihAPEzeegUEa/BZ93De7728IXjL7BkrwfPk5G6rnUw=";
|
||||
hash = "sha256-7zpf1Xl5dYPJk8V5PQCx/v+sE9kH23UWM9QbE0fH4tA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mini-graph-card";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalkih";
|
||||
repo = "mini-graph-card";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-AC4VawRtWTeHbFqDJ6oQchvUu08b4F3ManiPPXpyGPc=";
|
||||
hash = "sha256-o87c1tqZAQDlzxsxVdPZj1ei37nx7dVIZDzoQIUkmPk=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-0ErOTkcCnMqMTsTkVL320SxZaET/izFj9GiNWC2tQtQ=";
|
||||
npmDepsHash = "sha256-4GgFlSpqGxY7TCgyovqMSoLUin46bKN8tUQTdjv1eog=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mini-media-player";
|
||||
version = "1.16.8";
|
||||
version = "1.16.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kalkih";
|
||||
repo = "mini-media-player";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M=";
|
||||
hash = "sha256-tEG8xmqsPDssXmsCobHJoNK3qdRvBRe6FcTfm16r6+g=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg=";
|
||||
npmDepsHash = "sha256-pN6Hq0ECnmSZgKPoSfdAQsqNykUakLqRCTyLGVK57KQ=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "evcc";
|
||||
version = "0.123.8";
|
||||
version = "0.123.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "evcc-io";
|
||||
repo = "evcc";
|
||||
rev = version;
|
||||
hash = "sha256-AsLprF4Szv91mShE1Ch6qOIkAIwHTw5lWm38DjQGOZM=";
|
||||
hash = "sha256-BiJo0XsEdggmAfIzl717yDarDhD6IadP9an1Xv9N3ww=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FKF6+64mjrKgzFAb+O0QCURieOoRB//QNbpMFMcNG8s=";
|
||||
vendorHash = "sha256-1A87F6S4E87Uv05Ya4mA2B1QhJ1GEUtGx98/29m0LHI=";
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
inherit src;
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "powerlevel10k";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
|
||||
hash = "sha256-ES5vJXHjAKw/VHjWs8Au/3R+/aotSbY7PWnWAMzCR8E=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
name = "sigtop";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tbvdm";
|
||||
repo = "sigtop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-goGvgn1QyWqipcrBvO27BjzFbp7cIPFWzWJaOpp2/1Q=";
|
||||
sha256 = "sha256-vFs6/b2ypwMXDgmkZDgfKPqW0GRh9A2t4QQvkUdhYQw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K33VZeyOFoLLo64FuYt9bxJvaESSlHEy/2O8kLxxL5U=";
|
||||
vendorHash = "sha256-H43XOupVicLpYfkWNjArpSxQWcFqh9h2Zb6zGZ5xtfs=";
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=\${out}"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grizzly";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Yc15mD21Ohga7Pw+iowegkI2DWbKIZOZQ2vkKOdsKUk=";
|
||||
hash = "sha256-d/DUazWBT96+dnwVXo667RHALUM2FHxXoI54fFU2HZw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8myfB2LKDPUCFV9GBSXrBo9E+WrCOCm0ZHKTQ1dEb9U=";
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pulldown-cmark";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-B+Zxs88/F5B5TpgKLmcNX8rByGVVJcbTuwLcF8Ql9eE=";
|
||||
hash = "sha256-8hqA808w7eUZgFVoEct8IAZcRUb2xGxj5lYsIvP2TUU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-cIpixyAqeZ/EeEv4ChYiRpbRVD9xqJqxZz7kemxKC30=";
|
||||
cargoHash = "sha256-GRESQh8dWdzd80ZCjiVfqNXcHloHvQ/eb9xztT7qMNo=";
|
||||
|
||||
meta = {
|
||||
description = "A pull parser for CommonMark written in Rust";
|
||||
|
||||
@@ -20443,6 +20443,12 @@ with pkgs;
|
||||
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
|
||||
else stdenv;
|
||||
};
|
||||
abseil-cpp_202401 = callPackage ../development/libraries/abseil-cpp/202401.nix {
|
||||
# If abseil-cpp doesn’t have a deployment target of 10.13+, arrow-cpp crashes in libgrpc.dylib.
|
||||
stdenv = if stdenv.isDarwin && stdenv.isx86_64
|
||||
then overrideSDK stdenv { darwinMinVersion = "10.13"; }
|
||||
else stdenv;
|
||||
};
|
||||
abseil-cpp = abseil-cpp_202301;
|
||||
|
||||
accountsservice = callPackage ../development/libraries/accountsservice { };
|
||||
|
||||
Reference in New Issue
Block a user