Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -5,7 +5,6 @@
|
||||
buildNpmPackage,
|
||||
nix-update-script,
|
||||
electron,
|
||||
writeShellScriptBin,
|
||||
makeWrapper,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
@@ -19,25 +18,24 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "bruno";
|
||||
version = "1.34.0";
|
||||
version = "1.34.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "usebruno";
|
||||
repo = "bruno";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA=";
|
||||
hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc=";
|
||||
|
||||
postFetch = ''
|
||||
${lib.getExe npm-lockfile-fix} $out/package-lock.json
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw=";
|
||||
npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI=";
|
||||
npmFlags = [ "--legacy-peer-deps" ];
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
(writeShellScriptBin "phantomjs" "echo 2.1.1")
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
@@ -80,8 +78,17 @@ buildNpmPackage rec {
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
|
||||
dontNpmBuild = true;
|
||||
postBuild = ''
|
||||
# remove giflib dependency
|
||||
npmRebuildFlags = [ "--ignore-scripts" ];
|
||||
preBuild = ''
|
||||
substituteInPlace node_modules/canvas/binding.gyp \
|
||||
--replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'"
|
||||
npm rebuild
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
npm run build --workspace=packages/bruno-common
|
||||
npm run build --workspace=packages/bruno-graphql-docs
|
||||
npm run build --workspace=packages/bruno-app
|
||||
@@ -121,6 +128,8 @@ buildNpmPackage rec {
|
||||
}
|
||||
|
||||
popd
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
npmPackFlags = [ "--ignore-scripts" ];
|
||||
@@ -160,19 +169,19 @@ buildNpmPackage rec {
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Open-source IDE For exploring and testing APIs";
|
||||
homepage = "https://www.usebruno.com";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "bruno";
|
||||
maintainers = with lib.maintainers; [
|
||||
gepbird
|
||||
kashw2
|
||||
lucasew
|
||||
mattpolzin
|
||||
water-sucks
|
||||
redyf
|
||||
water-sucks
|
||||
];
|
||||
mainProgram = "bruno";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "duckstation-bin";
|
||||
version = "0.1-7294";
|
||||
version = "0.1-7371";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip";
|
||||
hash = "sha256-33aipZjYJOquQBbe8Ve9KRfLGW29v9xoztUsaY8LAjw=";
|
||||
hash = "sha256-ukORbTG0lZIsUInkEnyPB9+PwFxxK5hbgj9D6tjOEAY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@@ -1,17 +1,23 @@
|
||||
{ lib, buildGo123Module, fetchFromGitLab, installShellFiles, stdenv }:
|
||||
{
|
||||
lib,
|
||||
buildGo123Module,
|
||||
fetchFromGitLab,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "glab";
|
||||
version = "1.47.0";
|
||||
version = "1.48.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mAM11nQ6YJJWNFOR9xQbgma7Plvo4MdcW2Syniw7o60=";
|
||||
hash = "sha256-cddXgjJR8SD/mggDzbyxp/hdffE5ZqmT9oEPaEd8ZCo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uwSVdebZtIpSol553gJC0ItkEqa6qXXOAVFvzjsHSSI=";
|
||||
vendorHash = "sha256-quQqQRXMByUgXlnPpR2mCPhxw5AbFdHN5sBsawuHc18=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -37,12 +43,15 @@ buildGo123Module rec {
|
||||
--zsh <($out/bin/glab completion -s zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "GitLab CLI tool bringing GitLab to your command line";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://gitlab.com/gitlab-org/cli";
|
||||
changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
maintainers = with lib.maintainers; [
|
||||
freezeboy
|
||||
luftmensch-luftmensch
|
||||
];
|
||||
mainProgram = "glab";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -28,16 +28,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "kanidm";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cL1XV9UeoRxl7RPZzeeLtgyNjXxeFwpzapnuS292yc4=";
|
||||
hash = "sha256-vKllSbJ44cO3FFIaf8rkhvKAVa2NG1Ps06VTzpi9xj0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-c6HeE0971mBIN9NR7knu8SN0Z2W/u1rvIsE6ZCiHBEs=";
|
||||
cargoHash = "sha256-1mZm39l11eUjAGe0Oi9Mz94cb7DurfvUjCH5+GnA2Z0=";
|
||||
|
||||
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
|
||||
|
||||
|
||||
@@ -2,18 +2,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ludtwig";
|
||||
version = "0.8.3";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MalteJanz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg=";
|
||||
hash = "sha256-J5UTVXUExVApA8VVTyhkO2JhpVCK45li9VBN+oM9TBI=";
|
||||
};
|
||||
|
||||
checkType = "debug";
|
||||
|
||||
cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A=";
|
||||
cargoHash = "sha256-czofgV5a9aQoLn4JaBUbytY/aHfgJv3Q8RU2j+fbXo8=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linter / Formatter for Twig template files which respects HTML and your time";
|
||||
|
||||
+17
-13
@@ -1,32 +1,36 @@
|
||||
{ lib, appimageTools, fetchurl }:
|
||||
{
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
pname = "lunatask";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
|
||||
sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o=";
|
||||
hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
in
|
||||
appimageTools.wrapType2 rec {
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
|
||||
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop
|
||||
install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png
|
||||
substituteInPlace $out/share/applications/lunatask.desktop \
|
||||
--replace-fail 'Exec=AppRun' 'Exec=lunatask'
|
||||
'';
|
||||
|
||||
passthru.updateScript = ./update.py;
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app";
|
||||
longDescription = ''
|
||||
Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health.
|
||||
@@ -34,9 +38,9 @@ appimageTools.wrapType2 rec {
|
||||
homepage = "https://lunatask.app";
|
||||
downloadPage = "https://lunatask.app/download";
|
||||
changelog = "https://lunatask.app/releases/${version}";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ henkery ];
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ zi3m5f ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "lunatask";
|
||||
};
|
||||
@@ -0,0 +1,63 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
gtk4,
|
||||
pkg-config,
|
||||
pango,
|
||||
wrapGAppsHook4,
|
||||
apple-sdk_11,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "packetry";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greatscottgadgets";
|
||||
repo = "packetry";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xz9PdVVB1u6s/anPBRonWS1kMN+4kfkK/gaOlF9Z3yk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
gtk4
|
||||
pango
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
apple-sdk_11
|
||||
];
|
||||
|
||||
# Disable test_replay tests as they need a gui
|
||||
preCheck = ''
|
||||
sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs
|
||||
'';
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
# packetry-cli is only necessary on windows https://github.com/greatscottgadgets/packetry/pull/154
|
||||
postInstall = ''
|
||||
rm $out/bin/packetry-cli
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "USB 2.0 protocol analysis application for use with Cynthion";
|
||||
homepage = "https://github.com/greatscottgadgets/packetry";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ carlossless ];
|
||||
mainProgram = "packetry";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,104 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
# Build depends
|
||||
docutils,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
python3Packages,
|
||||
opusfile,
|
||||
openssl,
|
||||
gamemode,
|
||||
shaderc,
|
||||
ensureNewerSourcesForZipFilesHook,
|
||||
# Runtime depends
|
||||
glfw,
|
||||
SDL2,
|
||||
SDL2_mixer,
|
||||
cglm,
|
||||
freetype,
|
||||
libpng,
|
||||
libwebp,
|
||||
libzip,
|
||||
zlib,
|
||||
zstd,
|
||||
spirv-cross,
|
||||
|
||||
gamemodeSupport ? stdenv.hostPlatform.isLinux,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "taisei";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taisei-project";
|
||||
repo = "taisei";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rThLz8o6IYhIBUc0b1sAQi2aF28btajcM1ScTv+qn6c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
docutils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3Packages.python
|
||||
python3Packages.zstandard
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
shaderc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glfw
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
cglm
|
||||
freetype
|
||||
libpng
|
||||
libwebp
|
||||
libzip
|
||||
zlib
|
||||
zstd
|
||||
opusfile
|
||||
openssl
|
||||
spirv-cross
|
||||
] ++ lib.optional gamemodeSupport gamemode;
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mesonBool "b_lto" false)
|
||||
(lib.mesonEnable "install_macos_bundle" false)
|
||||
(lib.mesonEnable "install_relocatable" false)
|
||||
(lib.mesonEnable "shader_transpiler" false)
|
||||
(lib.mesonEnable "gamemode" gamemodeSupport)
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
description = "Free and open-source Touhou Project clone and fangame";
|
||||
mainProgram = "taisei";
|
||||
longDescription = ''
|
||||
Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man
|
||||
project of shoot-em-up games set in an isolated world full of Japanese
|
||||
folklore.
|
||||
'';
|
||||
homepage = "https://taisei-project.org/";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
cc-by-40
|
||||
];
|
||||
maintainers = with lib.maintainers; [
|
||||
lambda-11235
|
||||
Gliczy
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -1,33 +1,33 @@
|
||||
{
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
isPy3k,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
python,
|
||||
requests,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "agent-py";
|
||||
version = "0.0.23";
|
||||
format = "setuptools";
|
||||
version = "0.0.24";
|
||||
pyproject = true;
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hx88m8b8kfb2gm6hii5ldjv7hlvqf99cz0w2vj0d0grrxcbn5cz";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ispysoftware";
|
||||
repo = "agent-py";
|
||||
rev = "refs/tags/agent-py.${version}";
|
||||
hash = "sha256-PP4gQ3AFYLJPUt9jhhiV9HkfBhIzd+JIsGpgK6FNmaE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
aiohttp
|
||||
];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/test_agent.py
|
||||
'';
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
doCheck = false; # only test is outdated
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "agent" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper around the Agent REST API";
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-nest-sdm";
|
||||
version = "6.1.3";
|
||||
version = "6.1.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "allenporter";
|
||||
repo = "python-google-nest-sdm";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-X/jiers05zNAEUau6SVKGyyIx9HCs7yI0HsuZ7/tXfo=";
|
||||
hash = "sha256-F/vpyg3EYgKCsq/0yL3uP+1azu8bbHOMsf85Yabl0KQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-ffmpeg";
|
||||
version = "3.2.1";
|
||||
version = "3.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "ha-ffmpeg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Yu23kRChPbq/9sKvu9uY4qtKXX7CVNagZX9Z6ZzDqcw=";
|
||||
hash = "sha256-TbSoKoOiLx3O7iykiTri5GBHGj7WoB8iSCpFIrV4ZgU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -84,6 +84,21 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# AttributeError: 'DataFrame' object has no attribute 'frame_equal'
|
||||
"test_resultset_polars_dataframe"
|
||||
# all of these are broken with later versions of duckdb; see
|
||||
# https://github.com/ploomber/jupysql/issues/1030
|
||||
"test_resultset_getitem"
|
||||
"test_resultset_dict"
|
||||
"test_resultset_len"
|
||||
"test_resultset_dicts"
|
||||
"test_resultset_dataframe"
|
||||
"test_resultset_csv"
|
||||
"test_resultset_str"
|
||||
"test_resultset_repr_html_when_feedback_is_2"
|
||||
"test_resultset_repr_html_with_reduced_feedback"
|
||||
"test_invalid_operation_error"
|
||||
"test_resultset_config_autolimit_dict"
|
||||
# fails due to strict warnings
|
||||
"test_calling_legacy_plotting_functions_displays_warning"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "2.6.1";
|
||||
version = "2.7.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0gzbPa19UIt8Vs0Vnqs9j0tFJAkRTupU7DxT+7rwouI=";
|
||||
hash = "sha256-sPG3AqVrv+BiB+copgaghWDT/Rb/WU0R+Y8Z2J6l+7E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sense-energy";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "scottbonline";
|
||||
repo = "sense";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HE0bMcxfzfaMLDepjwDwV8AXQ3Q/bQt6SqHt7m/UY9I=";
|
||||
hash = "sha256-k1W84c0odpYv0vI2u2zqfWGJXSpYJRSwfFyXACMto7s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
|
||||
setuptools,
|
||||
marisa-trie,
|
||||
platformdirs,
|
||||
pytest,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplemma";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "adbar";
|
||||
@@ -21,14 +22,28 @@ buildPythonPackage rec {
|
||||
hash = "sha256-X0mqFPdCo0/sTexv4bi4bND7LFHOJvlOPH6tB39ybZY=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
marisa-trie = [
|
||||
marisa-trie
|
||||
platformdirs
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "simplemma" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Simple multilingual lemmatizer for Python, especially useful for speed and efficiency";
|
||||
homepage = "https://github.com/adbar/simplemma";
|
||||
license = licenses.mit;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spotifyaio";
|
||||
version = "0.8.5";
|
||||
version = "0.8.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "joostlek";
|
||||
repo = "python-spotify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6OX9awRmy2DT8SHvoVsLcsZ6LxTek/HgXNG9b2wSfGU=";
|
||||
hash = "sha256-8CvXh3lU6CWOIFyfKQv4TX4R9O9BzwEu/Cua0MRdma4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -2,6 +2,8 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
numpy,
|
||||
scipy,
|
||||
numba,
|
||||
@@ -15,7 +17,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "stumpy";
|
||||
version = "1.13.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@@ -26,7 +28,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
numba
|
||||
@@ -47,10 +54,11 @@ buildPythonPackage rec {
|
||||
"tests/test_core.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Library that can be used for a variety of time series data mining tasks";
|
||||
changelog = "https://github.com/TDAmeritrade/stumpy/blob/${src.rev}/CHANGELOG.md";
|
||||
homepage = "https://github.com/TDAmeritrade/stumpy";
|
||||
license = licenses.bsd3;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 80aa58d..c7e9d0a 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -17,7 +17,7 @@ project('taisei', 'c',
|
||||
# You may want to change these for a debug build dir
|
||||
'buildtype=release',
|
||||
'strip=true',
|
||||
- 'b_lto=true',
|
||||
+ 'b_lto=false',
|
||||
'b_ndebug=if-release',
|
||||
]
|
||||
)
|
||||
@@ -1,47 +0,0 @@
|
||||
{ lib, stdenv, fetchurl
|
||||
# Build depends
|
||||
, docutils, meson, ninja, pkg-config, python3
|
||||
# Runtime depends
|
||||
, glfw, SDL2, SDL2_mixer
|
||||
, cglm, freetype, libpng, libwebp, libzip, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taisei";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/taisei-project/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz";
|
||||
sha256 = "1g53fcyrlzmvlsb40pw90gaglysv6n1w42hk263iv61ibhdmzh6v";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
docutils meson ninja pkg-config python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glfw SDL2 SDL2_mixer
|
||||
cglm freetype libpng libwebp libzip zlib
|
||||
];
|
||||
|
||||
patches = [ ./0001-lto-fix.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "Free and open-source Touhou Project clone and fangame";
|
||||
mainProgram = "taisei";
|
||||
longDescription = ''
|
||||
Taisei is an open clone of the Tōhō Project series. Tōhō is a one-man
|
||||
project of shoot-em-up games set in an isolated world full of Japanese
|
||||
folklore.
|
||||
'';
|
||||
homepage = "https://taisei-project.org/";
|
||||
license = [ licenses.mit licenses.cc-by-40 ];
|
||||
maintainers = [ maintainers.lambda-11235 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2024.11.0";
|
||||
version = "2024.11.1";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
||||
@@ -439,7 +439,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2024.11.0";
|
||||
hassVersion = "2024.11.1";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@@ -457,13 +457,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9wFF0tDy3IAnmjjP1juQsU2G6qmQiBnBX1imNrbib7Y=";
|
||||
hash = "sha256-t8f0em5EaWPLZlr+fi/Kn3AE0dFEAyy0FpwdjJOYBCI=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9DtxrMhozse672aa1pHvk/wOpr7GdWUZtz0u7GNGBVw=";
|
||||
hash = "sha256-e9RF1oer4FyDEYof7qLTFUkmSxDh71qi+ResNXO6G5o=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -4,7 +4,7 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20241106.0";
|
||||
version = "20241106.2";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-EqF3fgT7pMjYTMVFcoXXnbeGjT7ZevmmTCqG8q3Qqt4=";
|
||||
hash = "sha256-9Il9/lHKIaymw7H8fL1gpp80+VzSqVJ1IyHGEa3OoO8=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "home-assistant-intents";
|
||||
version = "2024.11.4";
|
||||
version = "2024.11.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
repo = "intents-package";
|
||||
rev = "refs/tags/${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6SgvRaiPOfXM5OxrBQ/w600k7E+AKZEB8vukic6M4lA=";
|
||||
hash = "sha256-C2q0mUdA6VGKPHtG2g9Zi0nPvwWP1LAdepJCRkF4ky8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2024.11.0";
|
||||
version = "2024.11.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ktKmYr5wzrmZoedK2FB1qFcqt3NGKzXcL7f1j2/K6vc=";
|
||||
hash = "sha256-6Av1LSzmgjJonXlRFMrzdvGDm6latErBxCmgYlCDZ28=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "netbox2netshot";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scaleway";
|
||||
repo = "netbox2netshot";
|
||||
rev = version;
|
||||
hash = "sha256-PT/eQBe0CX1l6tcC5QBiXKGWgIQ8s4h6IApeWyb8ysc=";
|
||||
hash = "sha256-zi/on31uYSW3XhIZzKMkxIj0QZxUzoOcpRR8w5LFH90=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/T+6cjWG8u/Mr8gtBOXbEEZOO0pDykEpNIVTgooAmuw=";
|
||||
cargoHash = "sha256-qMIGCE3YsV+ZihqBpayrxddsSkmFPldgYNHnAK5semA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, buildPackages
|
||||
, coreutils
|
||||
@@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
substituteInPlace src/Makefile.in --replace 04755 0755
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# Fix for https://github.com/NixOS/nixpkgs/issues/354544
|
||||
(fetchpatch {
|
||||
url = "https://www.sudo.ws/repos/sudo/raw-rev/71e3f5a288e1ac21151b1b9577f0fe3745671cf7";
|
||||
hash = "sha256-L4AF1ee+qW9QKLrUzL5+hC5EznNC9k7sNeVGNBAJ6S4=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-env-editor"
|
||||
"--with-editor=/run/current-system/sw/bin/nano"
|
||||
|
||||
@@ -9089,8 +9089,6 @@ with pkgs;
|
||||
|
||||
ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
|
||||
|
||||
lunatask = callPackage ../applications/misc/lunatask { };
|
||||
|
||||
lvmsync = callPackage ../tools/backup/lvmsync { };
|
||||
|
||||
kapp = callPackage ../tools/networking/kapp { };
|
||||
@@ -34885,8 +34883,6 @@ with pkgs;
|
||||
|
||||
t4kcommon = callPackage ../games/t4kcommon { };
|
||||
|
||||
taisei = callPackage ../games/taisei { };
|
||||
|
||||
tcl2048 = callPackage ../games/tcl2048 { };
|
||||
|
||||
the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
|
||||
|
||||
Reference in New Issue
Block a user