gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-03-10 06:04:53 +00:00
committed by GitHub
parent 996f219f1e d3ea0717ca
commit 60563d6f2c
34 changed files with 511 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+6
View File
@@ -5185,6 +5185,12 @@
githubId = 245394;
name = "Hannu Hartikainen";
};
dandedotdev = {
email = "contact@dande.dev";
github = "dandedotdev";
githubId = 106054083;
name = "Dandelion Huang";
};
dandellion = {
email = "daniel@dodsorf.as";
matrix = "@dandellion:dodsorf.as";
pkgs/applications/editors/vim/plugins/generated.nix
+26
View File
@@ -15479,6 +15479,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
vim-characterize = buildVimPlugin {
pname = "vim-characterize";
version = "2024-11-14";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-characterize";
rev = "a8bffac6cead6b2869d939ecad06312b187a4c79";
sha256 = "0v00jq0wx2zvcyh3k8rscvq1lgp4hyb1fkjwsygyynnbcaimms8z";
};
meta.homepage = "https://github.com/tpope/vim-characterize/";
meta.hydraPlatforms = [ ];
};
vim-choosewin = buildVimPlugin {
pname = "vim-choosewin";
version = "2021-04-22";
@@ -15505,6 +15518,19 @@ final: prev:
meta.hydraPlatforms = [ ];
};
vim-classpath = buildVimPlugin {
pname = "vim-classpath";
version = "2020-04-07";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-classpath";
rev = "88a7e8a62d4603e79787cb381fc5cac562c29bb0";
sha256 = "0k67r76djvhqsc76af72s11hrxschsj1rx2rb3xsi3q5rm0ff5mg";
};
meta.homepage = "https://github.com/tpope/vim-classpath/";
meta.hydraPlatforms = [ ];
};
vim-clojure-highlight = buildVimPlugin {
pname = "vim-clojure-highlight";
version = "2015-07-05";
pkgs/applications/editors/vim/plugins/vim-plugin-names
+2
View File
@@ -1187,8 +1187,10 @@ https://github.com/isobit/vim-caddyfile/,HEAD,
https://github.com/tpope/vim-capslock/,,
https://github.com/kristijanhusak/vim-carbon-now-sh/,,
https://github.com/m-pilia/vim-ccls/,,
https://github.com/tpope/vim-characterize/,HEAD,
https://github.com/t9md/vim-choosewin/,,
https://github.com/rhysd/vim-clang-format/,,
https://github.com/tpope/vim-classpath/,HEAD,
https://github.com/guns/vim-clojure-highlight/,,
https://github.com/guns/vim-clojure-static/,,
https://github.com/rstacruz/vim-closer/,,
pkgs/build-support/compress-drv/default.nix
+2
View File
@@ -80,6 +80,8 @@ runCommand "${drv.name}-compressed"
(
(lib.optionalAttrs (drv ? pname) { inherit (drv) pname; })
// (lib.optionalAttrs (drv ? version) { inherit (drv) version; })
// (lib.optionalAttrs (drv ? passthru) { inherit (drv) passthru; })
// (lib.optionalAttrs (drv ? meta) { inherit (drv) meta; })
)
''
mkdir $out
pkgs/by-name/ac/actual-server/package.nix
+13 -12
View File
@@ -12,12 +12,12 @@
nix-update-script,
}:
let
version = "25.1.0";
version = "25.3.1";
src = fetchFromGitHub {
owner = "actualbudget";
repo = "actual-server";
repo = "actual";
tag = "v${version}";
hash = "sha256-zpZNITXd9QOJNRz8RbAuHH1hrrWPEGsrROGWJuYXqrc=";
hash = "sha256-UZ2Z1tkMbGJwka//cIC0aG1KCcTSxUPLzctEaOhnKQA=";
};
yarn_20 = yarn.override { nodejs = nodejs_20; };
@@ -58,7 +58,8 @@ let
yarn config set enableTelemetry 0
yarn config set cacheFolder $out
yarn config set --json supportedArchitectures "$SUPPORTED_ARCHITECTURES"
yarn
yarn workspaces focus @actual-app/sync-server --production
runHook postBuild
'';
@@ -77,10 +78,10 @@ let
outputHashMode = "recursive";
outputHash =
{
x86_64-linux = "sha256-N31aAAkznncKlygyeH5A3TrnOinXVz7CTQ8/G4QX6hY=";
aarch64-linux = "sha256-j7BFAKXi+TKIlmHBjbx6rwaKuAo6gnOlv6FV8rnlld0=";
aarch64-darwin = "sha256-YpUQYOLJHYxWuE6ToLFkXWEloAau9bLBvdbpNh8jRZQ=";
x86_64-darwin = "sha256-AioO82Y6mK0blSQRhhZZtWmduUcYwyVAewcXEVClJUg=";
aarch64-darwin = "sha256-IJBfBA71PZeE/Zlu2kzQw8l/D4lVAV5I5loRyRfncKA=";
aarch64-linux = "sha256-djE2lt/o/7kd7ci2TW3mhjSptD3etChbvtdbiWqp/wo=";
x86_64-darwin = "sha256-AShd87VFwqDbJZoFJPg6HsdhTx7XMVdZ5sRWLXU8ldM=";
x86_64-linux = "sha256-me0v+RuoleOKFRyJ7iyLTKRnV2Cz2Q1MLc/SE2sSSH8=";
}
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
@@ -97,13 +98,13 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib,lib/actual}
mkdir -p $out/{bin,lib,lib/actual/packages/sync-server}
cp -r ${offlineCache}/node_modules/ $out/lib/actual
cp -r ./ $out/lib/actual
cp -r ./packages/sync-server/{app.js,src,migrations,package.json} $out/lib/actual/packages/sync-server
makeWrapper ${lib.getExe nodejs_20} "$out/bin/actual-server" \
--add-flags "$out/lib/actual/app.js" \
--set NODE_PATH "$out/node_modules"
--add-flags "$out/lib/actual/packages/sync-server/app.js" \
--set NODE_PATH "$out/actual/lib/node_modules"
runHook postInstall
'';
pkgs/by-name/an/anytype/anytype-heart/default.nix
+2 -2
View File
@@ -12,12 +12,12 @@
let
tantivy-go = callPackage ../tantivy-go { };
pname = "anytype-heart";
version = "0.39.10";
version = "0.39.11";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-heart";
tag = "v${version}";
hash = "sha256-w7l/J3UwLiyM1vFhIW2WEdCxxXER+x9xMPH+LfyCQWM=";
hash = "sha256-+H63bc4aJPERfclzKh4E3uYEEwNycLfe0BCPSlilqCc=";
};
arch =
pkgs/by-name/an/anytype/package.nix
+5 -5
View File
@@ -16,21 +16,21 @@
let
anytype-heart = callPackage ./anytype-heart { };
pname = "anytype";
version = "0.45.2";
version = "0.45.3";
src = fetchFromGitHub {
owner = "anyproto";
repo = "anytype-ts";
tag = "v${version}";
hash = "sha256-0jyC4TVbJBIWGUG1YJ642v17XUBnhntaqS4yxz2l8k0=";
hash = "sha256-fwfxmNca75xAAHKeT2nddz+XZexDomzHbw188LXxZqA=";
};
description = "P2P note-taking tool";
locales = fetchFromGitHub {
owner = "anyproto";
repo = "l10n-anytype-ts";
rev = "822f8ea833a94fb48cd8e304ef8dc557b67a9f7b";
hash = "sha256-fum8zLRXb8xW8TwNyelIZVZR6XXsdPHSt1WDo+TX4CU=";
rev = "687106c4e37297f86fab79f77ef83599b61ab65c";
hash = "sha256-Y0irD0jzqYobnjtD2M1+hTDRUUYnuygUx9+tE1gUoTw=";
};
electron-headers = runCommand "electron-headers" { } ''
@@ -42,7 +42,7 @@ in
buildNpmPackage {
inherit pname version src;
npmDepsHash = "sha256-aYxTEy6lO2NLI8fEYUJVXTxCEyx9Hi8nABe7oo/PD9I=";
npmDepsHash = "sha256-9BI+rXzTYonlMhcH8uiWyyF18JGv8GL1U9hZ9Z6X3As=";
env = {
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
pkgs/by-name/cs/csfml/package.nix
+23 -10
View File
@@ -6,20 +6,33 @@
sfml,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "csfml";
version = "2.5.2";
version = "2.6.1";
src = fetchFromGitHub {
owner = "SFML";
repo = "CSFML";
rev = version;
sha256 = "sha256-A5C/4SnxUX7mW1wkPWJWX3dwMhrJ79DkBuZ7UYzTOqE=";
tag = finalAttrs.version;
hash = "sha256-ECt0ySDpYWF0zuDBSnQzDwUm4Xj4z1+XSC55D6yivac=";
};
# Fix incorrect path joining in cmake
# https://github.com/NixOS/nixpkgs/issues/144170
postPatch = ''
substituteInPlace tools/pkg-config/csfml-*.pc.in \
--replace-fail \
'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' \
"libdir=@CMAKE_INSTALL_FULL_LIBDIR@"
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ sfml ];
cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
cmakeFlags = [
(lib.cmakeFeature "CMAKE_MODULE_PATH" "${sfml}/share/SFML/cmake/Modules/")
];
meta = with lib; {
meta = {
homepage = "https://www.sfml-dev.org/";
description = "Simple and fast multimedia library";
longDescription = ''
@@ -27,8 +40,8 @@ stdenv.mkDerivation rec {
It provides access to windowing, graphics, audio and network.
It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
'';
license = licenses.zlib;
maintainers = [ maintainers.jpdoyle ];
platforms = platforms.linux;
license = lib.licenses.zlib;
maintainers = [ lib.maintainers.jpdoyle ];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/ff/fflogs/package.nix
+3 -3
View File
@@ -6,10 +6,10 @@
let
pname = "fflogs";
version = "8.15.13";
version = "8.16.2";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
hash = "sha256-bd3UtmRNbHmF7P46GNpNTsF5k0DiowPmN7Ul3cM0xkA=";
hash = "sha256-DR1RsjW8sQ4P1VRrDDnSQPPVCHv4C/QnqoK1D4iQW/s=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
@@ -20,7 +20,7 @@ appimageTools.wrapType2 {
mkdir -p $out/share/applications
cp -r ${extracted}/usr/share/icons $out/share/
chmod -R +w $out/share/
mv $out/share/icons/hicolor/0x0 $out/share/icons/hicolor/512x512 # https://github.com/electron-userland/electron-builder/issues/5294
test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294
cp ${extracted}/fflogs.desktop $out/share/applications/
sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop
'';
pkgs/by-name/ga/gat/package.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gat";
version = "0.21.1";
version = "0.21.2";
src = fetchFromGitHub {
owner = "koki-develop";
repo = "gat";
tag = "v${version}";
hash = "sha256-lqMK/lHnHipX5COpY0rVPhDL196lomT09w9cAzPCwA8=";
hash = "sha256-l5VkcUm1Cy1R0gTOS9Yt4HPILYrnUpjZCM4x78QS2WU=";
};
vendorHash = "sha256-gePgJZdPuV6VTgyLKTjRohxoIdvBr7/J98FCp9dzjV0=";
pkgs/by-name/gd/gdevelop/package.nix
+2 -2
View File
@@ -5,14 +5,14 @@
appimageTools,
}:
let
version = "5.5.224";
version = "5.5.225";
pname = "gdevelop";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
sha256 = "sha256-/o7Yyu5BjRfpg4Tl0ZwN6/KD9Kg4LcEmUqlO7NE/dew=";
sha256 = "sha256-ACNmO5hYfLEaJV6wntH4PZoHcB2T/+WFe2E5Ir/5c4U=";
}
else
throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
pkgs/by-name/gp/gpt-cli/package.nix
+59
View File
@@ -0,0 +1,59 @@
{
lib,
python3Packages,
fetchFromGitHub,
stdenv,
python3,
}:
python3Packages.buildPythonApplication rec {
pname = "gpt-cli";
version = "0.3.2";
format = "pyproject";
SHELL = "${stdenv.shell}";
src = fetchFromGitHub {
owner = "kharvd";
repo = "gpt-cli";
tag = "v${version}";
hash = "sha256-Zmqhdh+XMvJ3bhW+qkQOJT3nf+8luv7aJGW6xJSPuns=";
};
pythonRelaxDeps = [
"anthropic"
"black"
"google-generativeai"
"openai"
"pydantic"
"attrs"
];
build-system = with python3.pkgs; [
pip
setuptools
wheel
];
dependencies = with python3.pkgs; [
anthropic
attrs
black
cohere
google-generativeai
openai
prompt-toolkit
pytest
pyyaml
rich
typing-extensions
pydantic
];
meta = {
description = "Command-line interface for ChatGPT, Claude and Bard";
homepage = "https://github.com/kharvd/gpt-cli";
changelog = "https://github.com/kharvd/gpt-cli/releases/tag/v${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ _404wolf ];
};
}
pkgs/by-name/hx/hxtools/package.nix
+5
View File
@@ -5,6 +5,8 @@
pkg-config,
zstd,
libHX,
perl,
bash,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -22,6 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
# Perl and Bash are pulled to make patchShebangs work.
perl
bash
libHX
];
pkgs/by-name/li/lightdm-mobile-greeter/package.nix
+1 -1
View File
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Simple log in screen for use on touch screens";
homepage = "https://git.raatty.club/raatty/lightdm-mobile-greeter";
maintainers = with maintainers; [ colinsane ];
maintainers = [ ];
platforms = platforms.linux;
license = licenses.mit;
mainProgram = "lightdm-mobile-greeter";
pkgs/by-name/ob/obsidian/package.nix
+2 -4
View File
@@ -7,8 +7,7 @@
makeDesktopItem,
imagemagick,
writeScript,
undmg,
unzip,
_7zz,
commandLineArgs ? "",
}:
let
@@ -118,8 +117,7 @@ let
sourceRoot = "${appname}.app";
nativeBuildInputs = [
makeWrapper
undmg
unzip
_7zz
];
installPhase = ''
runHook preInstall
pkgs/by-name/sf/sfml/package.nix
+77
View File
@@ -0,0 +1,77 @@
{
lib,
stdenv,
fetchFromGitHub,
# nativeBuildInputs
cmake,
# buildInputs
flac,
freetype,
glew,
libjpeg,
libvorbis,
openal,
udev,
libX11,
libXcursor,
libXrandr,
libXrender,
xcbutilimage,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sfml";
version = "2.6.2";
src = fetchFromGitHub {
owner = "SFML";
repo = "SFML";
tag = finalAttrs.version;
hash = "sha256-m8FVXM56qjuRKRmkcEcRI8v6IpaJxskoUQ+sNsR1EhM=";
};
nativeBuildInputs = [ cmake ];
buildInputs =
[
flac
freetype
glew
libjpeg
libvorbis
openal
]
++ lib.optional stdenv.hostPlatform.isLinux udev
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libX11
libXcursor
libXrandr
libXrender
xcbutilimage
];
cmakeFlags = [
(lib.cmakeBool "SFML_INSTALL_PKGCONFIG_FILES" true)
(lib.cmakeFeature "SFML_MISC_INSTALL_PREFIX" "share/SFML")
(lib.cmakeBool "SFML_BUILD_FRAMEWORKS" false)
(lib.cmakeBool "SFML_USE_SYSTEM_DEPS" true)
];
meta = {
description = "Simple and fast multimedia library";
homepage = "https://www.sfml-dev.org/";
changelog = "https://github.com/SFML/SFML/blob/${finalAttrs.version}/changelog.md";
longDescription = ''
SFML is a simple, fast, cross-platform and object-oriented multimedia API.
It provides access to windowing, graphics, audio and network.
It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
'';
license = lib.licenses.zlib;
maintainers = [ lib.maintainers.astsmtl ];
platforms = lib.platforms.unix;
badPlatforms = [
# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>'
lib.systems.inspect.patterns.isDarwin
];
};
})
pkgs/by-name/st/storj-uplink/package.nix
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.122.2";
version = "1.123.4";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-PO5if8fBbWkLSEFuRues/B4+yWo6I4TNH25SybGU1Rg=";
hash = "sha256-H62QB/lS3rDUPDJMckRVhChgevyXfQzPBT+XI4/uDNE=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-mISSkuBU0E/ss5hLq5S4luStqJ/r9Vy1VVe5hMLehSc=";
vendorHash = "sha256-s6UrM7Kj/w09EXLHeyzcE6YLzucUz/qEpXsghFETRig=";
ldflags = [
"-s"
pkgs/applications/video/stremio/default.nix → pkgs/by-name/st/stremio/package.nix
+28 -24
View File
@@ -3,39 +3,41 @@
stdenv,
fetchFromGitHub,
fetchurl,
libsForQt5,
ffmpeg,
mpv,
nodejs,
qmake,
qtwebengine,
wrapQtAppsHook,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "stremio-shell";
version = "4.4.168";
src = fetchFromGitHub {
owner = "Stremio";
repo = pname;
rev = "v${version}";
fetchSubmodules = true;
repo = "stremio-shell";
tag = "v${finalAttrs.version}";
hash = "sha256-pz1mie0kJov06GcyitvZu5Gg0Vz3YnigjDqFujGKqZM=";
fetchSubmodules = true;
meta.license = lib.licenses.gpl3Only;
};
server = fetchurl {
url = "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v${version}/server.js";
hash = "sha256-aD3niQpgq1EiZLacnEFgmqUV+bc4rvGN9IA+9T4XF10=";
# check server-url.txt
server = fetchurl rec {
pname = "stremio-server";
version = "4.20.8";
url = "https://dl.strem.io/server/v${version}/desktop/server.js";
hash = "sha256-cRMgD1d1yVj9FBvFAqgIqwDr+7U3maE8OrCsqExftHY=";
meta.license = lib.licenses.unfree;
};
buildInputs = [
qtwebengine
libsForQt5.qt5.qtwebengine
mpv
];
nativeBuildInputs = [
qmake
wrapQtAppsHook
libsForQt5.qmake
libsForQt5.qt5.wrapQtAppsHook
];
postInstall = ''
@@ -49,18 +51,20 @@ stdenv.mkDerivation rec {
--suffix PATH ":" ${lib.makeBinPath [ ffmpeg ]}
'';
meta = with lib; {
meta = {
mainProgram = "stremio";
description = "Modern media center that gives you the freedom to watch everything you want";
homepage = "https://www.stremio.com/";
# (Server-side) web UI is closed source now, apparently they work on open-sourcing it.
# server.js appears to be MIT-licensed, but I can't find how they actually build it.
# https://www.reddit.com/r/StremioAddons/comments/n2ob04/a_summary_of_how_stremio_works_internally_and/
license = with licenses; [
gpl3
mit
# (Server-side) 4.x versions of the web UI are closed-source
license = with lib.licenses; [
gpl3Only
# server.js is unfree
unfree
];
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
maintainers = with lib.maintainers; [
abbradar
griffi-gh
];
platforms = lib.platforms.linux;
};
}
})
pkgs/by-name/te/teams-for-linux/package.nix
+7 -7
View File
@@ -5,7 +5,7 @@
fetchFromGitHub,
alsa-utils,
copyDesktopItems,
electron_33,
electron_34,
makeDesktopItem,
makeWrapper,
nix-update-script,
@@ -15,16 +15,16 @@
buildNpmPackage rec {
pname = "teams-for-linux";
version = "1.12.8";
version = "1.13.0";
src = fetchFromGitHub {
owner = "IsmaelMartinez";
repo = "teams-for-linux";
tag = "v${version}";
hash = "sha256-OXrkv5xEjwiC/fzLY+KFD48VAnJ5fXgGfOTPV+LuF5g=";
hash = "sha256-m2zJoJBjbeTU+WlZeH8R84mYKsxpUxN93SKOIVCjoj4=";
};
npmDepsHash = "sha256-AjljadHGDOI358mO5iCV8yXOvRn6XlwN4IPiussJWRU=";
npmDepsHash = "sha256-TNX6QikNs/TI/Wt+eHIMwwORjjFIVAa1J/vHiOkHQXU=";
nativeBuildInputs = [
makeWrapper
@@ -42,7 +42,7 @@ buildNpmPackage rec {
buildPhase = ''
runHook preBuild
cp -r ${electron_33.dist} electron-dist
cp -r ${electron_34.dist} electron-dist
chmod -R u+w electron-dist
npm exec electron-builder -- \
@@ -50,7 +50,7 @@ buildNpmPackage rec {
-c.npmRebuild=true \
-c.asarUnpack="**/*.node" \
-c.electronDist=electron-dist \
-c.electronVersion=${electron_33.version}
-c.electronVersion=${electron_34.version}
runHook postBuild
'';
@@ -72,7 +72,7 @@ buildNpmPackage rec {
popd
# Linux needs 'aplay' for notification sounds
makeWrapper '${lib.getExe electron_33}' "$out/bin/teams-for-linux" \
makeWrapper '${lib.getExe electron_34}' "$out/bin/teams-for-linux" \
--prefix PATH : ${
lib.makeBinPath [
alsa-utils
pkgs/by-name/te/textlsp/package.nix
+40
View File
@@ -0,0 +1,40 @@
{
python3,
fetchFromGitHub,
lib,
}:
python3.pkgs.buildPythonApplication rec {
pname = "textlsp";
version = "0.3.2";
src = fetchFromGitHub {
owner = "hangyav";
repo = "textLSP";
tag = "v${version}";
hash = "sha256-Z1ozkS6zo/h0j0AU5K+Ri/ml8KqCjdEcQKpFtNER4Hk=";
};
build-system = [ python3.pkgs.setuptools ];
dependencies = with python3.pkgs; [
pygls
lsprotocol
language-tool-python
tree-sitter_0_21
gitpython
appdirs
openai
sortedcontainers
langdetect
ollama
];
meta = {
description = "Language server for text spell and grammar check with various tools";
homepage = "https://github.com/hangyav/textLSP/tree/main";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ justdeeevin ];
mainProgram = "textlsp";
changelog = "https://github.com/hangyav/textLSP/releases/tag/v${version}";
platforms = lib.platforms.all;
};
}
pkgs/by-name/ts/ts_query_ls/package.nix
+3 -3
View File
@@ -6,7 +6,7 @@
}:
let
pname = "ts_query_ls";
version = "1.8.0";
version = "1.9.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@@ -15,13 +15,13 @@ rustPlatform.buildRustPackage {
owner = "ribru17";
repo = "ts_query_ls";
rev = "v${version}";
hash = "sha256-HSYPYiYoU8bcMJkq27gSDELLxL8uCU9bHvf1JQq9tVI=";
hash = "sha256-pjV5WRHcBZUFGr06YKlkZST0E47SNt5bxOM7my3TiF8=";
};
nativeBuildInputs = [ cmake ];
useFetchCargoVendor = true;
cargoHash = "sha256-h1Qm4DSknSmeo7KKrdC8b7VNw/dzQ6fEgX4MWQcrAnk=";
cargoHash = "sha256-Tyw8IqaqHmxN//MNtrSuS0xLwh+xDjemquKouLIlsHQ=";
meta = {
description = "LSP implementation for Tree-sitter's query files";
pkgs/by-name/wa/waytrogen/package.nix
+5 -3
View File
@@ -13,24 +13,25 @@
rustc,
sqlite,
openssl,
desktop-file-utils,
}:
stdenv.mkDerivation rec {
pname = "waytrogen";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "nikolaizombie1";
repo = "waytrogen";
tag = version;
hash = "sha256-Y83l6GKuaH+976MTOo03saVBh6gDegxyo3WRsRA+iQI=";
hash = "sha256-OO7HHmTa5qH0lFl+ZnsJMo4MxQCRnKn7kkO2BOGt8PA=";
};
useFetchCargoVendor = true;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit src;
name = "${pname}-${version}";
hash = "sha256-t3bDgY1Jtc/lE3WOnmti12shwsmSX3HhGBtYjesQ7hk=";
hash = "sha256-S+JW6OvmB9vj9cR9/qnw5EIECjpD8JPhxfgwDEEtlC0=";
};
nativeBuildInputs = [
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook
cargo
rustc
desktop-file-utils
];
buildInputs = [
pkgs/by-name/ya/yabai/package.nix
+3 -3
View File
@@ -14,7 +14,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "yabai";
version = "7.1.10";
version = "7.1.11";
src =
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -66,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
"aarch64-darwin" = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
hash = "sha256-mWN59BfexCmaahADzUP+B1xGQK8TNyrKOBKKJ00D7tg=";
hash = "sha256-WyoVGuCotiGpSxpq9hXSTnto4k945FeL+4+DlBp6MhA=";
};
"x86_64-darwin" = fetchFromGitHub {
owner = "koekeishiya";
repo = "yabai";
rev = "v${finalAttrs.version}";
hash = "sha256-4OYB+RlAUD8LcRcUNIEXWfFFedTmQFzcTgqd1g/tdWc=";
hash = "sha256-r2uPzozDPH97k3IiweU7Hefhnzm9/TJfC+5p/GiJ+T0=";
};
};
pkgs/by-name/ye/yew-fmt/package.nix
+33
View File
@@ -0,0 +1,33 @@
{
lib,
rustfmt,
rustPlatform,
fetchFromGitHub,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "yew-fmt";
version = "0.5.3";
src = fetchFromGitHub {
owner = "its-the-shrimp";
repo = "yew-fmt";
tag = "v${version}";
hash = "sha256-Ck6WA6ROm8APTsgoxbVGUqoblc5awW+hmmzcy4ZFoBM=";
};
cargoHash = "sha256-Fp8MT1LJ1EpqwEZ+SpOomqZ7we47w2S5ExkB966Z3r0=";
nativeCheckInputs = [ rustfmt ];
passthru.updateScript = nix-update-script { };
useFetchCargoVendor = true;
meta = {
description = "Code formatter for the Yew framework";
mainProgram = "yew-fmt";
homepage = "https://github.com/its-the-shrimp/yew-fmt";
changelog = "https://github.com/its-the-shrimp/yew-fmt/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.dandedotdev ];
};
}
pkgs/by-name/ze/zecwallet-lite/package.nix
+1 -1
View File
@@ -28,7 +28,7 @@ appimageTools.wrapType2 rec {
description = "Fully featured shielded wallet for Zcash";
homepage = "https://www.zecwallet.co/";
license = licenses.mit;
maintainers = with maintainers; [ colinsane ];
maintainers = [ ];
platforms = [ "x86_64-linux" ];
mainProgram = "zecwallet-lite";
};
pkgs/development/libraries/sfml/default.nix
-90
View File
@@ -1,90 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
cmake,
libX11,
freetype,
libjpeg,
openal,
flac,
libvorbis,
glew,
libXrandr,
libXrender,
udev,
xcbutilimage,
IOKit,
Foundation,
AppKit,
OpenAL,
}:
stdenv.mkDerivation rec {
pname = "sfml";
version = "2.5.1";
src = fetchFromGitHub {
owner = "SFML";
repo = "SFML";
rev = version;
sha256 = "sha256-Xt2Ct4vV459AsSvJxQfwMsNs6iA5y3epT95pLWJGeSk=";
};
patches = [
(fetchpatch {
url = "https://github.com/macports/macports-ports/raw/4df1fc235a708ff28200ffc0a39120974ed4b6e1/multimedia/sfml/files/patch-apple-silicon.diff";
extraPrefix = "";
sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0=";
})
(fetchpatch {
url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch";
hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA=";
})
];
nativeBuildInputs = [ cmake ];
buildInputs =
[
freetype
libjpeg
openal
flac
libvorbis
glew
]
++ lib.optional stdenv.hostPlatform.isLinux udev
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libX11
libXrandr
libXrender
xcbutilimage
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
IOKit
Foundation
AppKit
OpenAL
];
cmakeFlags = [
"-DSFML_INSTALL_PKGCONFIG_FILES=yes"
"-DSFML_MISC_INSTALL_PREFIX=share/SFML"
"-DSFML_BUILD_FRAMEWORKS=no"
"-DSFML_USE_SYSTEM_DEPS=yes"
];
meta = with lib; {
homepage = "https://www.sfml-dev.org/";
description = "Simple and fast multimedia library";
longDescription = ''
SFML is a simple, fast, cross-platform and object-oriented multimedia API.
It provides access to windowing, graphics, audio and network.
It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
'';
license = licenses.zlib;
maintainers = [ maintainers.astsmtl ];
platforms = platforms.unix;
};
}
pkgs/development/lua-modules/generated-packages.nix
+5 -5
View File
@@ -2590,14 +2590,14 @@ buildLuarocksPackage {
lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lze";
version = "0.8.0-1";
version = "0.8.1-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/lze-0.8.0-1.rockspec";
sha256 = "05fjfmvnfpfbd1vbjvdadp4vzkz005la9gvqcgm7k3q9nkbp1hvg";
url = "mirror://luarocks/lze-0.8.1-1.rockspec";
sha256 = "01pxnkijnsj7n66pni850m4x7i1jblrp7w1lw243ikl1di3dgggs";
}).outPath;
src = fetchzip {
url = "https://github.com/BirdeeHub/lze/archive/v0.8.0.zip";
sha256 = "1hwar3ag52w6mm7dv0s8ymr8kp3qw8kl05w1vz3jvivyxbxc77l3";
url = "https://github.com/BirdeeHub/lze/archive/v0.8.1.zip";
sha256 = "179djx0d5l6390x7pdim5bs0qg4jdgjnc4bnsks3yyl3sdscwa2l";
};
disabled = luaOlder "5.1";
pkgs/development/python-modules/cvxpy/default.nix
+2 -2
View File
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "cvxpy";
version = "1.6.2";
version = "1.6.3";
pyproject = true;
src = fetchFromGitHub {
owner = "cvxpy";
repo = "cvxpy";
tag = "v${version}";
hash = "sha256-8O6Cw0PkIyCtEIZjutZAUpKpiQnhUWSone27PNKSVlU=";
hash = "sha256-fQz9tPxSNKRSJdtyeEAE1qwK//x1U3kKozclav1G+nc=";
};
# we need to patch out numpy version caps from upstream
pkgs/development/python-modules/detectron2/default.nix
+100 -79
View File
@@ -3,45 +3,107 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# nativeBuildInputs
ninja,
which,
# build inputs
pillow,
matplotlib,
pycocotools,
termcolor,
yacs,
tabulate,
cloudpickle,
tqdm,
tensorboard,
fvcore,
iopath,
omegaconf,
hydra-core,
packaging,
torch,
pydot,
# buildInputs
pybind11,
# dependencies
black,
# optional dependencies
cloudpickle,
fvcore,
hydra-core,
iopath,
matplotlib,
omegaconf,
packaging,
pillow,
pycocotools,
pydot,
tabulate,
tensorboard,
termcolor,
torch,
tqdm,
yacs,
# optional-dependencies
fairscale,
timm,
psutil,
pygments,
scipy,
shapely,
pygments,
psutil,
# check inputs
pytestCheckHook,
torchvision,
timm,
# tests
av,
opencv4,
pytest-mock,
pybind11,
pytestCheckHook,
torchvision,
}:
let
pname = "detectron2";
version = "0.6";
in
buildPythonPackage {
inherit pname version;
pyproject = true;
src = fetchFromGitHub {
owner = "facebookresearch";
repo = "detectron2";
tag = "v${version}";
hash = "sha256-TosuUZ1hJrXF3VGzsGO2hmQJitGUxe7FyZyKjNh+zPA=";
};
postPatch =
# https://github.com/facebookresearch/detectron2/issues/5010
''
substituteInPlace detectron2/data/transforms/transform.py \
--replace-fail "interp=Image.LINEAR" "interp=Image.BILINEAR"
'';
nativeBuildInputs = [
ninja
which
];
buildInputs = [ pybind11 ];
pythonRelaxDeps = [
"black"
"iopath"
];
pythonRemoveDeps = [
"future"
];
dependencies = [
black
cloudpickle
fvcore
hydra-core
iopath
matplotlib
omegaconf
packaging
pillow
pycocotools
pydot # no idea why this is not in their setup.py
tabulate
tensorboard
termcolor
torch # not explicitly declared in setup.py because they expect you to install it yourself
tqdm
yacs
];
optional-dependencies = {
all = [
fairscale
@@ -52,54 +114,6 @@ let
psutil
];
};
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
src = fetchFromGitHub {
owner = "facebookresearch";
repo = "detectron2";
tag = "v${version}";
sha256 = "1w6cgvc8r2lwr72yxicls650jr46nriv1csivp2va9k1km8jx2sf";
};
postPatch = ''
# https://github.com/facebookresearch/detectron2/issues/5010
substituteInPlace detectron2/data/transforms/transform.py \
--replace "interp=Image.LINEAR" "interp=Image.BILINEAR"
'';
nativeBuildInputs = [
ninja
which
];
buildInputs = [ pybind11 ];
pythonRelaxDeps = [ "black" ];
propagatedBuildInputs = [
pillow
matplotlib
pycocotools
termcolor
yacs
tabulate
cloudpickle
tqdm
tensorboard
fvcore
iopath
omegaconf
hydra-core
packaging
black
torch # not explicitly declared in setup.py because they expect you to install it yourself
pydot # no idea why this is not in their setup.py
];
optional-dependencies = optional-dependencies;
nativeCheckInputs = [
av
@@ -109,10 +123,11 @@ buildPythonPackage {
torchvision
];
preCheck = ''
preCheck =
# prevent import errors for C extension modules
rm -r detectron2
'';
''
rm -r detectron2
'';
pytestFlagsArray = [
# prevent include $sourceRoot/projects/*/tests
@@ -168,14 +183,20 @@ buildPythonPackage {
"test_build_dataloader_inference"
"test_build_iterable_dataloader_inference"
"test_to_iterable"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# RuntimeError: required keyword attribute 'value' has the wrong type
"test_apply_deltas_tracing"
"test_imagelist_padding_tracing"
"test_roi_pooler_tracing"
];
pythonImportsCheck = [ "detectron2" ];
meta = with lib; {
meta = {
description = "Facebooks's next-generation platform for object detection, segmentation and other visual recognition tasks";
homepage = "https://github.com/facebookresearch/detectron2";
license = licenses.asl20;
maintainers = with maintainers; [ happysalada ];
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ happysalada ];
};
}
pkgs/development/python-modules/language-tool-python/default.nix
+37
View File
@@ -0,0 +1,37 @@
{
python3,
fetchFromGitHub,
buildPythonPackage,
lib,
}:
buildPythonPackage rec {
pname = "language-tool-python";
version = "2.8.0";
pyproject = true;
src = fetchFromGitHub {
owner = "jxmorris12";
repo = "language_tool_python";
tag = "${version}";
hash = "sha256-v82RCg2lE0/ETJTiMogrI09fZ28tq1jhzFhbC89kbTU=";
};
build-system = [ python3.pkgs.setuptools ];
dependencies = with python3.pkgs; [
requests
tqdm
psutil
toml
pip
];
meta = {
description = "Free python grammar checker";
homepage = "https://github.com/jxmorris12/language_tool_python";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ justdeeevin ];
platforms = lib.platforms.all;
changelog = "https://github.com/jxmorris12/language_tool_python/releases/tag/${version}";
};
}
pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/allow-wrapping.patch
+2 -4
View File
@@ -1,13 +1,11 @@
diff --git a/uniemoji.xml.in b/uniemoji.xml.in
index 5fbfd0f..6fb8ad3 100644
--- a/uniemoji.xml.in
+++ b/uniemoji.xml.in
@@ -7,7 +7,7 @@
<license>GPL</license>
<author>Lalo Martins &lt;lalo.martins@gmail.com&gt;</author>
<homepage>https://github.com/salty-horse/ibus-uniemoji</homepage>
- <exec>@PYTHON@ @DATADIR@/ibus-uniemoji/uniemoji.py --ibus</exec>
+ <exec>@DATADIR@/ibus-uniemoji/uniemoji.py --ibus</exec>
- <exec>@PYTHON@ @DATADIR@/ibus-uniemoji/ibus.py --ibus</exec>
+ <exec>@DATADIR@/ibus-uniemoji/ibus.py --ibus</exec>
<textdomain>uniemoji</textdomain>
<engines>
<engine>
pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix
+10 -8
View File
@@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ibus-uniemoji";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "salty-horse";
repo = "ibus-uniemoji";
rev = "v${version}";
sha256 = "121zh3q0li1k537fcvbd4ns4jgl9bbb9gm9ihy8cfxgirv38lcfa";
tag = "v${version}";
hash = "sha256-iP72lExXnLFeWNJQfaDI/T4tRlXjHbRy+1X8+cAT+Zo=";
};
patches = [
@@ -52,18 +52,20 @@ stdenv.mkDerivation rec {
];
postFixup = ''
wrapGApp $out/share/ibus-uniemoji/uniemoji.py
chmod +x "$out/share/ibus-uniemoji/ibus.py"
patchShebangs "$out/share/ibus-uniemoji/ibus.py"
wrapGApp "$out/share/ibus-uniemoji/ibus.py"
'';
meta = with lib; {
meta = {
isIbusEngine = true;
description = "Input method (ibus) for entering unicode symbols and emoji by name";
homepage = "https://github.com/salty-horse/ibus-uniemoji";
license = with licenses; [
license = with lib.licenses; [
gpl3
mit
];
platforms = platforms.linux;
maintainers = with maintainers; [ aske ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ aske ];
};
}
pkgs/top-level/all-packages.nix
-5
View File
@@ -5004,8 +5004,6 @@ with pkgs;
stm32loader = with python3Packages; toPythonApplication stm32loader;
stremio = qt5.callPackage ../applications/video/stremio { };
solanum = callPackage ../servers/irc/solanum {
autoreconfHook = buildPackages.autoreconfHook269;
};
@@ -10443,9 +10441,6 @@ with pkgs;
simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
sfml = callPackage ../development/libraries/sfml {
inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
};
skawarePackages = recurseIntoAttrs (callPackage ../development/skaware-packages { });
inherit (skawarePackages)
pkgs/top-level/python-packages.nix
+2
View File
@@ -7287,6 +7287,8 @@ self: super: with self; {
language-tags = callPackage ../development/python-modules/language-tags { };
language-tool-python = callPackage ../development/python-modules/language-tool-python { };
lanms-neo = callPackage ../development/python-modules/lanms-neo { };
lark = callPackage ../development/python-modules/lark { };