Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-06-05 06:01:06 +00:00 committed by GitHub
commit 1b7a9e695e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
47 changed files with 4406 additions and 402 deletions

View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "parlatype";
version = "4.1";
version = "4.2";
src = fetchFromGitHub {
owner = "gkarsay";
repo = pname;
rev = "v${version}";
sha256 = "0546rl5sm7xmgl54cqps3a7bhfs7xdvz98jgdcf4sgiz1k2vh9xq";
sha256 = "1wi9f23zgvsa98xcxgghm53jlafnr3pan1zl4gkn0yd8b2d6avhk";
};
nativeBuildInputs = [
@ -58,9 +58,6 @@ stdenv.mkDerivation rec {
];
postPatch = ''
substituteInPlace data/meson_post_install.py \
--replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache'
patchShebangs data/meson_post_install.py
patchShebangs libparlatype/tests/data/generate_config_data
'';
@ -76,8 +73,7 @@ stdenv.mkDerivation rec {
useful for journalists, students, scientists and whoever needs to
transcribe audio files.
'';
# maintainer lost control of parlatype.org
homepage = "https://github.com/gkarsay/parlatype";
homepage = "https://www.parlatype.xyz/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ alexshpilkin melchips ];
platforms = platforms.linux;

View File

@ -70,7 +70,7 @@ let
in
# Package with cups in FHS sandbox, because JAVA bin expects "/usr/bin/lpr" for printing.
buildFHSEnv {
name = pname;
inherit pname version;
targetPkgs = pkgs: [
cups
thisPackage

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-buildx";
version = "0.14.0";
version = "0.14.1";
src = fetchFromGitHub {
owner = "docker";
repo = "buildx";
rev = "v${version}";
hash = "sha256-pfDGKxIy9ZXueYv0u1zPWWYCAeSRBaOGDfIt1Hsubkk=";
hash = "sha256-IseiGF+tQWv7Z2jlCINuWH2Gzcdow2qazvYVFBGyQPU=";
};
doCheck = false;

View File

@ -20,17 +20,17 @@
buildGoModule rec {
pname = "aaaaxy";
version = "1.5.129";
version = "1.5.139";
src = fetchFromGitHub {
owner = "divVerent";
repo = pname;
rev = "v${version}";
hash = "sha256-kH2eFFxohvuuEP2p7bt8zOYbk3gF86X9y3sNdLYl/Qo=";
hash = "sha256-j8BpLN0PhMqUQXhF1L7uEW2KLaVq5cfckXnWrkltCgM=";
fetchSubmodules = true;
};
vendorHash = "sha256-VEayNWztJYeQoJHVJfAlmHD65PEho1TCttTfT0cbgUQ=";
vendorHash = "sha256-a6nfGP6Lwjwr4wXXRUrCyV9+BCyHOSKczk5rjZdFnlA=";
buildInputs = [
alsa-lib

View File

@ -8,13 +8,13 @@
}:
let
version = "1.12.3";
version = "1.12.4";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "v${version}";
hash = "sha256-n4jiKxkXGCKJkuXSsUktsiJQuCcZ+D/RJH/ippnOVw8=";
hash = "sha256-ZcFCK6KKX10w5KgsUQIDMMBIzU+8pw0t9/pn1tzCnMg=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@ -44,7 +44,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
npmDepsHash = "sha256-ba7GzkKrXps4W1ptv+j9fMMXwpi30ymbqgIJ64PaZ1g=";
npmDepsHash = "sha256-90IGWvXvUpvIQdpukm8njwcNj7La6rWwoENh4kiBayI=";
dontNpmBuild = true;
# FIXME: Remove this flag when TypeScript 5.5 is released
npmFlags = [ "--legacy-peer-deps" ];
@ -60,7 +60,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
npmDepsHash = "sha256-9V1T6w1G1SZi19dgRaFmv+Vy71hmQR+L6cDjQZJrGy8=";
npmDepsHash = "sha256-HI3ehtJ29kFSv0XyrXcp5JGs9HGYb9ub2oOSQ6uEn8Q=";
postPatch = ''
chmod +w ../../

View File

@ -1,27 +1,33 @@
{ stdenv
, lib
, fetchFromGitHub
, rustPlatform
, installShellFiles
, pkg-config
, libwebp
{
stdenv,
lib,
fetchFromGitHub,
rustPlatform,
installShellFiles,
pkg-config,
libwebp,
}:
let
version = "1.3.1";
in
rustPlatform.buildRustPackage {
pname = "catppuccin-catwalk";
version = "0.1.0";
inherit version;
src = fetchFromGitHub {
owner = "catppuccin";
repo = "toolbox";
rev = "b38153e94622bab574224bb24a6ae953b3a849da";
hash = "sha256-zZRl6Xem41pBQmEoK24YR4TKiQ84nU5phBih2TF8G8g=";
rev = "refs/tags/catwalk-v${version}";
hash = "sha256-Mk4Kv1EfaDiqLUa+aOPeoM4jFlKoUau+VuqmnazRgGI=";
};
buildAndTestSubdir = "catwalk";
cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg=";
cargoHash = "sha256-qxY8CUOl7fF4afJyFjGeOVk7GX/cewC/hAaJf6m5tfA=";
nativeBuildInputs = [ installShellFiles pkg-config ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [ libwebp ];
postInstall = ''
@ -38,11 +44,11 @@ rustPlatform.buildRustPackage {
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk";
description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once";
license = licenses.mit;
maintainers = with maintainers; [ ryanccn ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ryanccn ];
mainProgram = "catwalk";
};
}

View File

@ -15,6 +15,8 @@
, pkg-config
, python3
, wrapGAppsHook4
, yt-dlp
, youtubeSupport ? true
}:
stdenv.mkDerivation (finalAttrs: {
@ -51,6 +53,12 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs meson-post-install.py src/generate-authors.py
'';
preFixup = lib.optionalString youtubeSupport ''
gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ yt-dlp ]}"
)
'';
strictDeps = true;
doCheck = true;

View File

@ -0,0 +1,42 @@
{ lib
, autoreconfHook
, fetchFromGitHub
, stdenv
, wxGTK31
, darwin
, withGui ? true
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gambit-project";
version = "16.1.1";
src = fetchFromGitHub {
owner = "gambitproject";
repo = "gambit";
rev = "v${finalAttrs.version}";
hash = "sha256-ElPzJDQ1q+i1OyliychSUA9pT6yGSwjn/sKV0JX5wrQ=";
};
nativeBuildInputs =
[ autoreconfHook ]
++ lib.optional withGui wxGTK31;
buildInputs =
lib.optional withGui wxGTK31
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
strictDeps = true;
configureFlags = [
(lib.enableFeature withGui "gui")
];
meta = {
description = "An open-source collection of tools for doing computation in game theory";
homepage = "http://www.gambit-project.org";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ t4ccer ];
platforms = with lib.platforms; unix ++ windows;
};
})

View File

@ -0,0 +1,27 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "horcrux";
version = "0.3-unstable-2023-09-19";
src = fetchFromGitHub {
owner = "jesseduffield";
repo = "horcrux";
rev = "5e848abcca49a7ad359f5a24ef4ca7e0eda80889";
hash = "sha256-YOu3qJadfyA6MKW8OFLr0pFjGMOgCGie2f8VbG79IY0=";
};
vendorHash = null;
meta = {
description = "Split your file into encrypted fragments so that you don't need to remember a passcode";
homepage = "https://github.com/jesseduffield/horcrux";
license = lib.licenses.mit;
mainProgram = "horcrux";
maintainers = with lib.maintainers; [ mh ];
};
}

3811
pkgs/by-name/hy/hyperspeedcube/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,131 @@
{ cmake
, alsa-lib
, atk
, cairo
, directx-shader-compiler
, expat
, fetchFromGitHub
, fontconfig
, freetype
, gdk-pixbuf
, glib
, gtk3
, harfbuzz
, lib
, libGL
, libX11
, libxcb
, libXcursor
, libXi
, libxkbcommon
, libXrandr
, makeWrapper
, mold
, pango
, pkg-config
, python3
, rustPlatform
, shaderc
, stdenv
, vulkan-extension-layer
, vulkan-headers
, vulkan-loader
, vulkan-tools
, vulkan-tools-lunarg
, vulkan-validation-layers
, wayland
, wrapGAppsHook3
, yq
, zlib
}:
rustPlatform.buildRustPackage rec {
pname = "hyperspeedcube";
version = "1.0.6";
src = fetchFromGitHub {
owner = "HactarCE";
repo = "Hyperspeedcube";
rev = "v${version}";
hash = "sha256-FcQuXxVxiyI4hOKS70m62BtZMfN5FzGTLagS+2B3WdY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"key-names-1.5.1" = "sha256-ZO3mlCoUHCaMnxD2vQno6GNx0+JmwZ8OiqpyveiVfvc=";
};
};
nativeBuildInputs = [
cmake
pkg-config
(lib.getDev libxcb)
python3
makeWrapper
wrapGAppsHook3
];
buildInputs = [
alsa-lib
atk
cairo
directx-shader-compiler
expat
fontconfig
freetype
gdk-pixbuf
glib
gtk3
harfbuzz
mold
pango
shaderc
zlib
# for execution errors (see https://github.com/emilk/egui/discussions/1587)
libxkbcommon
libGL
# WINIT_UNIX_BACKEND=wayland
wayland
# WINIT_UNIX_BACKEND=x11
libXcursor
libXrandr
libXi
libX11
vulkan-headers
vulkan-loader
vulkan-tools
vulkan-tools-lunarg
vulkan-extension-layer
vulkan-validation-layers
yq
];
postInstall = ''
patchelf \
--add-needed ${vulkan-loader}/lib/libvulkan.so.1 \
--add-needed ${libGL}/lib/libEGL.so.1 \
$out/bin/hyperspeedcube
wrapProgram $out/bin/hyperspeedcube --set WAYLAND_DISPLAY "" --set XDG_SESSION_TYPE ""
touch $out/bin/nonportable
'';
meta = {
description = "Hyperspeedcube is a 3D and 4D Rubik's cube simulator";
longDescription = ''
Hyperspeedcube is a modern, beginner-friendly 3D and 4D Rubik's cube
simulator with customizable mouse and keyboard controls and advanced
features for speedsolving. It's been used to break numerous speedsolving
records and runs on all major operating systems plus the web.
'';
homepage = "https://ajfarkas.dev/hyperspeedcube/";
license = lib.licenses.cc-by-nc-sa-40;
maintainers = [ lib.maintainers.omnipotententity ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -5,7 +5,7 @@
...
}:
let
version = "0.0.6";
version = "0.1.0";
in
buildGoModule {
pname = "izrss";
@ -15,7 +15,7 @@ buildGoModule {
owner = "isabelroses";
repo = "izrss";
rev = "refs/tags/v${version}";
hash = "sha256-tO/m39FMtvxZzNgnVY84k4J2v8vQVdzR3IKofJWCf9U=";
hash = "sha256-Op9aiCQrBH8TuhMTt+3Wthd8UY3lU2g9yJ110v7TtXA=";
};
ldflags = [
@ -24,7 +24,7 @@ buildGoModule {
"-X main.version=${version}"
];
vendorHash = "sha256-/gD82wT4jWNMQsGPb2nYQiFQsUdKICyO6eiRPHrLsy8=";
vendorHash = "sha256-/TRCD6akZV2qDqJz62p7UzFIGuTAKLnUtYqqvdw3rCI=";
meta = {
description = "An RSS feed reader for the terminal written in Go";

View File

@ -6,15 +6,15 @@
}:
let
timestamp = "202401111522";
timestamp = "202405301306";
in
stdenv.mkDerivation (finalAttrs: {
pname = "jdt-language-server";
version = "1.31.0";
version = "1.36.0";
src = fetchurl {
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
hash = "sha256-bCX2LQt00d2SqxmvuvvlBB6wbCuFPqtX9/Qv5v6wH3w=";
hash = "sha256-Ao4nTQb0phytT/1W+J70FKj2VhPG0F2UZ2Ubf7A9rns=";
};
sourceRoot = ".";

2
pkgs/by-name/jd/jdt-language-server/update.sh Normal file → Executable file
View File

@ -15,7 +15,7 @@ filename=$(curl -s "$prefix/latest.txt")
newtimestamp=$(echo $filename | sed "s|^.*-$newver-||;s|\.tar\.gz$||")
newhash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url "$prefix/$filename"))";
sed -i default.nix \
sed -i package.nix \
-e "/^ version =/ s|\".*\"|\"$newver\"|" \
-e "/^ timestamp =/ s|\".*\"|\"$newtimestamp\"|" \
-e "/^ hash =/ s|\".*\"|\"$newhash\"|" \

View File

@ -20,16 +20,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "kanidm";
version = "1.2.1";
version = "1.2.3";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-nDAHlpQefCbmz4jw/1cDGQWkfvn/vIqpsOCPjn6yQ6s=";
hash = "sha256-J02IbAY5lyoMaq6wJiHizqeFBd5hB6id2YMPxlPsASM=";
};
cargoHash = "sha256-+lKWpBz9e4DFVg+A2wH17hHg9HPZNKmM4pM7KMndQ8U=";
cargoHash = "sha256-JuTKHXpEhWga2vAZhCpyPFy4w6+9UaasD70oBcrr0Rw=";
KANIDM_BUILD_PROFILE = "release_nixos_${arch}";

View File

@ -13,24 +13,24 @@
let
pname = "lx-music-desktop";
version = "2.7.0";
version = "2.8.0";
buildUrl = version: arch: "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb";
srcs = {
x86_64-linux = fetchurl {
url = buildUrl version "amd64";
hash = "sha256-+mCAFfiJwa+RQ/9vnSPDrC1LoLIoZyFUEJAF6sXdqRM=";
hash = "sha256-Kt/foI7NrXV+Ex2DxLRyP3bVFw0Bx4TLuMyBMZD0bDw=";
};
aarch64-linux = fetchurl {
url = buildUrl version "arm64";
hash = "sha256-fDlgHJqoZLGnUuZeZGdocYLbsE02QBrWPKS31fbGThk=";
hash = "sha256-4X4fXb2V/FigArcIgpgkNBa2+mOemPOx/HkxPlx//gw=";
};
armv7l-linux = fetchurl {
url = buildUrl version "armv7l";
hash = "sha256-X6EXsBvTbPGXCJ+ektMCMGDG2zqGKBvWT/TwjGFL3ug=";
hash = "sha256-uWEQYOT4wxg6HWoL18mEpWF8pONl5Bwf/bnoN4X+A7c=";
};
};

View File

@ -0,0 +1,61 @@
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
pname = "mokuro";
version = "0.1.8";
pyproject = true;
src = fetchFromGitHub {
owner = "kha-white";
repo = "mokuro";
rev = "v${version}";
hash = "sha256-w+hhUt2fTl9zrca4xotK5eNhbfragYNC0u5WDwNGb7k=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail 'opencv-python' 'opencv'
'';
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "torchvision" ];
build-system = with python3Packages; [ setuptools ];
dependencies = with python3Packages; [
fire
loguru
manga-ocr
natsort
numpy
opencv4
pillow
pyclipper
requests
scipy
shapely
torch
torchsummary
torchvision
transformers
tqdm
yattag
];
# tests try to use the network
doCheck = false;
meta = {
description = "Read Japanese manga inside browser with selectable text";
homepage = "https://github.com/kha-white/mokuro";
license = lib.licenses.gpl3Only;
mainProgram = "mokuro";
maintainers = with lib.maintainers; [ tomasajt ];
};
}

View File

@ -0,0 +1,33 @@
{ lib
, fetchFromGitHub
, stdenvNoCC
}:
stdenvNoCC.mkDerivation {
pname = "payloadsallthethings";
version = "3.0-unstable-2024-01-21";
src = fetchFromGitHub {
owner = "swisskyrepo";
repo = "PayloadsAllTheThings";
rev = "97cfeee270395a838802fa1fcb8a4d5ffc6d6b48";
hash = "sha256-LRS60v0o5nPSLfGFH6P0Y5roN8Mk5/KyRF4SWTv/7Hw=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/share/payloadsallthethings
rm CONTRIBUTING.md mkdocs.yml custom.css
cp -a * $out/share/payloadsallthethings
runHook postInstall
'';
meta = {
homepage = "https://github.com/swisskyrepo/PayloadsAllTheThings";
description = "A list of useful payloads and bypass for Web Application Security and Pentest/CTF";
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ shard7 ];
platforms = lib.platforms.all;
sourceProvenance = with lib.sourceTypes; [ fromSource ];
};
}

View File

@ -0,0 +1,41 @@
{
lib,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
stdenv,
darwin,
}:
rustPlatform.buildRustPackage {
pname = "ringfairy";
version = "0.1.2-unstable-2024-05-11";
src = fetchFromGitHub {
owner = "k3rs3d";
repo = "ringfairy";
rev = "966fe129c72a7ff09f55f22273c1c291780d40cd";
hash = "sha256-1soTvSjoBSIQBUK21COSmw8EKYcMUBjNs+FNs3jzy/E=";
};
cargoHash = "sha256-cmW+y57AAK1NNBJ6xE2EvHsSoKddLWgdtnAmSjzAN0k=";
nativeBuildInputs = [pkg-config];
buildInputs =
[openssl]
++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
Security
SystemConfiguration
]
);
meta = {
description = "Static webring generator in Rust";
homepage = "https://github.com/k3rs3d/ringfairy";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [uncenter];
mainProgram = "ringfairy";
};
}

View File

@ -0,0 +1,38 @@
{
lib,
cmake,
fetchFromGitHub,
nix-update-script,
stdenv,
violet,
testers,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "violet";
version = "0.4.6";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = "violet";
rev = "v${finalAttrs.version}";
hash = "sha256-a/WRFr6C6MWQBAG0PIDdSRVd4wnQgchPeTMoxUa2Qus=";
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
passthru = {
updateScript = nix-update-script { };
tests = testers.testVersion { package = violet; };
};
meta = {
description = "Lightweight STUN/TURN server";
homepage = "https://github.com/paullouisageneau/violet";
license = lib.licenses.gpl2Only;
mainProgram = "violet";
maintainers = with lib.maintainers; [ oluceps ];
platforms = lib.platforms.all;
};
})

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alglib3";
version = "3.18.0";
version = "4.01.0";
src = fetchurl {
url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq";
sha256 = "sha256-lejqQbMskjRvSaaUdZ54bF86EIe0AaklnvWSwO6kvvs=";
};
nativeBuildInputs = [

View File

@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
setuptools,
cython,
click,
@ -15,25 +14,16 @@
buildPythonPackage rec {
pname = "biom-format";
version = "2.1.15";
version = "2.1.16";
pyproject = true;
src = fetchFromGitHub {
owner = "biocore";
repo = "biom-format";
rev = "refs/tags/${version}";
hash = "sha256-WRBc+C/UWme7wYogy4gH4KTIdIqU3KmBm2jWzGNxGQg=";
hash = "sha256-E/6dIN8tdsu6cBVBW/BOeAQwJB9XRRL3flQZSKqIZlc=";
};
patches = [
# fixes a test, can be removed in next version after 2.1.15
(fetchpatch {
name = "fix-dataframe-comparison.patch";
url = "https://github.com/biocore/biom-format/commit/5d1c921ca2cde5d7332508503ce990a7209d1fdc.patch";
hash = "sha256-nyHi469ivjJSQ01yIk/6ZMXFdoo9wVuazJHnFdy2nBg=";
})
];
build-system = [
setuptools
cython

View File

@ -2,45 +2,26 @@
lib,
buildPythonPackage,
fetchPypi,
python,
mock,
blessings,
nose,
pillow,
setuptools,
pytestCheckHook,
args,
pkgs,
}:
buildPythonPackage rec {
pname = "clint";
version = "0.5.1";
format = "setuptools";
pyproject = true;
src = fetchPypi {
inherit pname version;
sha256 = "1an5lkkqk1zha47198p42ji3m94xmzx1a03dn7866m87n4r4q8h5";
hash = "sha256-BSJMMrEHVWPQsW0AFfqvnaQ6ohTkohQOUfCHieekxao=";
};
LC_ALL = "en_US.UTF-8";
build-system = [ setuptools ];
propagatedBuildInputs = [
pillow
blessings
args
];
dependencies = [ args ];
# nose-progressive and clint are not actively maintained
# no longer compatible as behavior demand 2to3, which was removed
# in setuptools>=58
doCheck = false;
nativeCheckInputs = [
mock
nose
pkgs.glibcLocales
];
checkPhase = ''
${python.interpreter} test_clint.py
'';
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "clint" ];

View File

@ -0,0 +1,28 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
}:
buildPythonPackage rec {
pname = "csv2md";
version = "1.3.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "lzakharov";
repo = "csv2md";
rev = "v${version}";
hash = "sha256-INwZRbyJmyDd5SV7PBdqUc/3FO91upTgaxBfP/Giaw4=";
};
pythonImportsCheck = [ "csv2md" ];
meta = {
description = "Command line tool for converting CSV files into Markdown tables";
homepage = "https://github.com/lzakharov/csv2md";
changelog = "https://github.com/lzakharov/csv2md/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ t4ccer ];
mainProgram = "csv2md";
};
}

View File

@ -1,30 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
django,
nose,
}:
buildPythonPackage rec {
pname = "django-sr";
version = "0.0.4";
format = "setuptools";
meta = {
description = "Django settings resolver";
homepage = "https://github.com/jespino/django-sr";
license = lib.licenses.bsd3;
};
src = fetchPypi {
inherit pname version;
sha256 = "0d3yqppi1q3crcn9nxx58wzm4yw61d5m7435g6rb9wcamr9bi1im";
};
buildInputs = [
django
nose
];
propagatedBuildInputs = [ django ];
}

View File

@ -3,6 +3,7 @@
buildPythonPackage,
fetchFromGitHub,
huggingface-hub,
loguru,
pythonOlder,
pythonRelaxDepsHook,
poetry-core,
@ -16,7 +17,7 @@
buildPythonPackage rec {
pname = "fastembed";
version = "0.2.2";
version = "0.2.7";
pyproject = true;
disabled = pythonOlder "3.8";
@ -25,16 +26,16 @@ buildPythonPackage rec {
owner = "qdrant";
repo = "fastembed";
rev = "refs/tags/v${version}";
hash = "sha256-ufgco5wPBG19GM99rZV7LKQqEzzCv24I8026SMz0CH4=";
hash = "sha256-ArLilvixzpHIGGAom4smX0jZ6lJSZe6tSGreeD+Pzmk=";
};
nativeBuildInputs = [
poetry-core
pythonRelaxDepsHook
];
build-system = [ poetry-core ];
propagatedBuildInputs = [
nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [
huggingface-hub
loguru
onnx
onnxruntime
requests
@ -44,7 +45,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "fastembed" ];
pythonRelaxDeps = [ "huggingface-hub" ];
pythonRelaxDeps = [
"huggingface-hub"
"onnxruntime"
"tokenizers"
];
nativeCheckInputs = [ pytestCheckHook ];

View File

@ -1,41 +1,40 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
blinker,
flit-core,
flask,
mock,
nose,
speaklater,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "flask-mail";
version = "0.9.1";
format = "setuptools";
version = "0.10.0";
pyproject = true;
meta = {
description = "Flask-Mail is a Flask extension providing simple email sending capabilities.";
homepage = "https://pypi.python.org/pypi/Flask-Mail";
license = lib.licenses.bsd3;
src = fetchFromGitHub {
owner = "pallets-eco";
repo = "flask-mail";
rev = "refs/tags/${version}";
hash = "sha256-G2Z8dj1/IuLsZoNJVrL6LYu0XjTEHtWB9Z058aqG9Ic=";
};
src = fetchPypi {
pname = "Flask-Mail";
inherit version;
hash = "sha256-IuXrmpQL9Ae88wQQ7MNwjzxWzESynDThcm/oUAaTX0E=";
};
build-system = [ flit-core ];
propagatedBuildInputs = [
dependencies = [
blinker
flask
];
buildInputs = [
blinker
mock
nose
speaklater
];
doCheck = false;
pythonImportsCheck = [ "flask_mail" ];
nativeCheckInputs = [ pytestCheckHook ];
meta = {
description = "Flask extension providing simple email sending capabilities";
homepage = "https://github.com/pallets-eco/flask-mail";
changelog = "https://github.com/pallets-eco/flask-mail/blob/${src.rev}/CHANGES.md";
license = lib.licenses.bsd3;
};
}

View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "gspread";
version = "6.1.0";
version = "6.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "burnash";
repo = "gspread";
rev = "refs/tags/v${version}";
hash = "sha256-kuXPX+VY0qz4fldGYPbzZMFx+blzsmueews1W+AjQb0=";
hash = "sha256-hvT4e1l3MTT3WMDSfKvZ7BU8dzkzgPROHrnx5mKyCR4=";
};
nativeBuildInputs = [ flit-core ];

View File

@ -1,33 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
pythonAtLeast,
coverage,
nose,
}:
buildPythonPackage rec {
pname = "nosexcover";
version = "1.0.11";
format = "setuptools";
# requires the imp module
disabled = pythonAtLeast "3.12";
src = fetchPypi {
inherit pname version;
sha256 = "298c3c655da587f6cab8a666e9f4b150320032431062dea91353988d45c8b883";
};
propagatedBuildInputs = [
coverage
nose
];
meta = with lib; {
description = "Extends nose.plugins.cover to add Cobertura-style XML reports";
homepage = "https://github.com/cmheisel/nose-xcover/";
license = licenses.bsd3;
};
}

View File

@ -4,6 +4,7 @@
pythonOlder,
hatchling,
opentelemetry-api,
opentelemetry-instrumentation,
opentelemetry-sdk,
opentelemetry-test-utils,
prometheus-client,
@ -13,7 +14,9 @@
buildPythonPackage {
inherit (opentelemetry-api) src;
pname = "opentelemetry-exporter-prometheus";
version = "0.44b0";
# This package is in the same repository as `opentelemetry-api`,
# but its version is synchronized with `opentelemetry-instrumentation` in another repository.
version = opentelemetry-instrumentation.version;
pyproject = true;
disabled = pythonOlder "3.8";

View File

@ -4,13 +4,16 @@
pythonOlder,
hatchling,
opentelemetry-api,
opentelemetry-instrumentation,
pytestCheckHook,
}:
buildPythonPackage {
inherit (opentelemetry-api) src;
pname = "opentelemetry-semantic-conventions";
version = "0.44b0";
# This package is in the same repository as `opentelemetry-api`,
# but its version is synchronized with `opentelemetry-instrumentation` in another repository.
version = opentelemetry-instrumentation.version;
pyproject = true;
disabled = pythonOlder "3.8";

View File

@ -5,13 +5,16 @@
asgiref,
hatchling,
opentelemetry-api,
opentelemetry-instrumentation,
opentelemetry-sdk,
}:
buildPythonPackage {
inherit (opentelemetry-api) src;
pname = "opentelemetry-test-utils";
version = "0.44b0";
# This package is in the same repository as `opentelemetry-api`,
# but its version is synchronized with `opentelemetry-instrumentation` in another repository.
version = opentelemetry-instrumentation.version;
pyproject = true;
disabled = pythonOlder "3.8";

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pep8-naming";
version = "0.13.3";
version = "0.14.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "PyCQA";
repo = pname;
rev = version;
hash = "sha256-l7zZUOMWyTxnTbkFkzfABY/eVMKnv0kNJ0UPzJo0W1Y=";
rev = "refs/tags/${version}";
hash = "sha256-uIVk8+5rVEIBZLz70WUi0O6/Q9ERptJ3b7314gLPeHk=";
};
propagatedBuildInputs = [ flake8 ];

View File

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "pypugjs";
version = "5.9.12";
version = "5.10.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "kakulukia";
repo = "pypugjs";
rev = "v${version}";
hash = "sha256-6tIhKCa8wg01gNFygCS6GdUHfbWBu7wOZeMkCExRR34=";
rev = "refs/tags/v${version}";
hash = "sha256-W+EVNxT2OimNENHe4lJDn6Wm1EbBysGuCD3/Wkdew/U=";
};
propagatedBuildInputs = [

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "python-crontab";
version = "3.0.0";
version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k=";
hash = "sha256-9OoWBdJFM7Z/p6Y07ybLWaXy55VPbmd9LXoiKZWaL8g=";
};
nativeBuildInputs = [ setuptools ];

View File

@ -3,8 +3,7 @@
fetchPypi,
buildPythonPackage,
setuptools,
nosexcover,
pythonOlder,
pytestCheckHook,
}:
buildPythonPackage rec {
@ -17,11 +16,11 @@ buildPythonPackage rec {
hash = "sha256-jXkCjqbMEx2l6rCZpdlamY1DxneZVv/+O0VQQJEQdto=";
};
nativeBuildInputs = [ setuptools ];
build-system = [ setuptools ];
doCheck = pythonOlder "3.12";
pythonImportsCheck = [ "smmap" ];
nativeCheckInputs = [ nosexcover ];
nativeCheckInputs = [ pytestCheckHook ];
meta = {
description = "A pure python implementation of a sliding window memory map manager";

View File

@ -1,51 +0,0 @@
{
lib,
fetchPypi,
buildPythonPackage,
pythonOlder,
pandas,
numpy,
scipy,
filelock,
pytest,
nose,
parameterized,
}:
buildPythonPackage rec {
pname = "theano-pymc";
version = "1.1.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "Theano-PyMC";
inherit version;
sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc";
};
# No need for coverage stats in Nix builds
postPatch = ''
substituteInPlace setup.py --replace ", 'pytest-cov'" ""
'';
propagatedBuildInputs = [
pandas
numpy
scipy
filelock
];
# The test suite is computationally intensive and test failures are not
# indicative for package usability hence tests are disabled by default.
doCheck = false;
pythonImportsCheck = [ "theano" ];
meta = {
description = "PyMC theano fork";
homepage = "https://github.com/majidaldo/Theano-PyMC";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ nidabdella ];
broken = true;
};
}

View File

@ -1,117 +0,0 @@
{
lib,
stdenv,
runCommandCC,
fetchPypi,
buildPythonPackage,
isPyPy,
pythonOlder,
isPy3k,
nose,
numpy,
scipy,
setuptools,
six,
libgpuarray,
config,
cudaSupport ? config.cudaSupport,
cudaPackages ? { },
cudnnSupport ? cudaSupport,
}:
let
inherit (cudaPackages) cudatoolkit cudnn;
in
assert cudnnSupport -> cudaSupport;
let
wrapped =
command: buildTop: buildInputs:
runCommandCC "${command}-wrapped" { inherit buildInputs; } ''
type -P '${command}' || { echo '${command}: not found'; exit 1; }
cat > "$out" <<EOF
#!$(type -P bash)
$(declare -xp | sed -e '/^[^=]\+="\('"''${NIX_STORE//\//\\/}"'\|[^\/]\)/!d')
declare -x NIX_BUILD_TOP="${buildTop}"
$(type -P '${command}') "\$@"
EOF
chmod +x "$out"
'';
# Theano spews warnings and disabled flags if the compiler isn't named g++
cxx_compiler_name =
if stdenv.cc.isGNU then
"g++"
else if stdenv.cc.isClang then
"clang++"
else
throw "Unknown C++ compiler";
cxx_compiler = wrapped cxx_compiler_name "\\$HOME/.theano" (
lib.optional cudaSupport libgpuarray_ ++ lib.optional cudnnSupport cudnn
);
# We need to be careful with overriding Python packages within the package set
# as this can lead to collisions!
libgpuarray_ = libgpuarray.override { inherit cudaSupport cudaPackages; };
in
buildPythonPackage rec {
pname = "theano";
version = "1.0.5";
format = "setuptools";
disabled = isPyPy || pythonOlder "2.6";
src = fetchPypi {
inherit pname version;
sha256 = "129f43ww2a6badfdr6b88kzjzz2b0wk0dwkvwb55z6dsagfkk53f";
};
postPatch =
''
substituteInPlace theano/configdefaults.py \
--replace 'StrParam(param, is_valid=warn_cxx)' 'StrParam('\'''${cxx_compiler}'\''', is_valid=warn_cxx)' \
--replace 'rc == 0 and config.cxx != ""' 'config.cxx != ""'
''
+ lib.optionalString cudaSupport ''
substituteInPlace theano/configdefaults.py \
--replace 'StrParam(get_cuda_root)' 'StrParam('\'''${cudatoolkit}'\''')'
''
+ lib.optionalString cudnnSupport ''
substituteInPlace theano/configdefaults.py \
--replace 'StrParam(default_dnn_base_path)' 'StrParam('\'''${cudnn}'\''')'
'';
# needs to be postFixup so it runs before pythonImportsCheck even when
# doCheck = false (meaning preCheck would be disabled)
postFixup = ''
mkdir -p check-phase
export HOME=$(pwd)/check-phase
'';
doCheck = false;
# takes far too long, also throws "TypeError: sort() missing 1 required positional argument: 'a'"
# when run from the installer, and testing with Python 3.5 hits github.com/Theano/Theano/issues/4276,
# the fix for which hasn't been merged yet.
# keep Nose around since running the tests by hand is possible from Python or bash
nativeCheckInputs = [ nose ];
# setuptools needed for cuda support
propagatedBuildInputs = [
libgpuarray_
numpy
numpy.blas
scipy
setuptools
six
];
pythonImportsCheck = [ "theano" ];
meta = with lib; {
homepage = "https://github.com/Theano/Theano";
description = "A Python library for large-scale array computation";
license = licenses.bsd3;
maintainers = [ ];
broken = true;
};
}

View File

@ -0,0 +1,34 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
torch,
}:
buildPythonPackage rec {
pname = "torchsummary";
version = "1.5.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-mBv2ieIuDPf5XHRgAvIKJK0mqmudhhE0oUvGzpIjBZA=";
};
build-system = [ setuptools ];
dependencies = [ torch ];
# no tests in pypi tarball
doCheck = false;
pythonImportsCheck = [ "torchsummary" ];
meta = {
description = "Model summary in PyTorch similar to `model.summary()` in Keras";
homepage = "https://github.com/sksq96/pytorch-summary";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ tomasajt ];
};
}

View File

@ -1,11 +1,15 @@
{ lib, buildGoModule, fetchFromGitHub }:
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "air";
version = "1.52.1";
src = fetchFromGitHub {
owner = "cosmtrek";
owner = "air-verse";
repo = "air";
rev = "v${version}";
hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08=";
@ -13,14 +17,18 @@ buildGoModule rec {
vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw=";
ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ];
ldflags = [
"-s"
"-w"
"-X=main.airVersion=${version}"
];
subPackages = [ "." ];
meta = with lib; {
description = "Live reload for Go apps";
mainProgram = "air";
homepage = "https://github.com/cosmtrek/air";
homepage = "https://github.com/air-verse/air";
license = licenses.gpl3Only;
maintainers = with maintainers; [ Gonzih ];
};

View File

@ -85,7 +85,7 @@ let
in
buildFHSEnv rec {
name = pname;
inherit pname version;
targetPkgs = pkgs: [
binutils
dejavu_fonts

View File

@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "3.15.2";
version = "3.15.3";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
hash = "sha256-+VmYBULKhZCbPz+Om+ZcK4o3XzpOO9g8etegfy4HeTM=";
hash = "sha256-PCfHZ2QUBW8DaKcf3GcNKwpZiYCQx4obaCMJhOW+txM=";
};
nativeBuildInputs = [ ocaml findlib ];

View File

@ -68,8 +68,7 @@ let
};
# /usr/bin/pkcheck is hardcoded in binary - we need FHS
in buildFHSEnv {
inherit meta;
name = pname;
inherit pname version meta;
targetPkgs = pkgs: [
beyond-identity

View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "shikane";
version = "0.2.0";
version = "1.0.1";
src = fetchFromGitLab {
owner = "w0lff";
repo = "shikane";
rev = "v${version}";
hash = "sha256-S55elFZQT234fKlISFi21QJtnf2yB0O2u2vSNFhzgBg=";
hash = "sha256-Chc1+JUHXzuLl26NuBGVxSiXiaE4Ns1FXb0dBs6STVk=";
};
cargoHash = "sha256-4wisXVaZa2GBFKywl48beQgg4c+lawL3L/837ZU1Y94=";
cargoHash = "sha256-uuQBTAyWczzc4Ez2Tq4Ps6NPonXqHrXAP2AZFzgsvo4=";
nativeBuildInputs = [
installShellFiles

View File

@ -419,8 +419,6 @@ with pkgs;
catatonit = callPackage ../applications/virtualization/catatonit { };
catppuccin-catwalk = callPackage ../development/tools/misc/catppuccin-catwalk { };
catppuccin-gtk = callPackage ../data/themes/catppuccin-gtk { };
catppuccin-kde = callPackage ../data/themes/catppuccin-kde { };
@ -4797,6 +4795,8 @@ with pkgs;
crudini = callPackage ../tools/misc/crudini { };
csv2md = with python3Packages; toPythonApplication csv2md;
csv2odf = callPackage ../applications/office/csv2odf { };
csv2parquet = callPackage ../tools/misc/csv2parquet { };

View File

@ -136,6 +136,7 @@ mapAliases ({
django_polymorphic = django-polymorphic; # added 2022-05-24
django_redis = django-redis; # added 2021-10-11
django_silk = django-silk; # added 2023-07-25
django-sr = throw "django-sr has been removed since it has been unmaintained for 10 years"; # added 2024-05-26
django_tagging = django-tagging; # added 2023-07-25
django_taggit = django-taggit; # added 2021-10-11
django_treebeard = django-treebeard; # added 2023-07-25
@ -307,6 +308,7 @@ mapAliases ({
ninja-python = ninja; # add 2022-08-03
nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
nosexcover = throw "nosexcover has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21
@ -532,6 +534,10 @@ mapAliases ({
Theano = theano; # added 2023-02-19
TheanoWithCuda = theanoWithCuda; # added 2023-02-19
TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
theano = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
theanoWithCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20
thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07
torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18
torrent_parser = torrent-parser; # added 2023-11-04

View File

@ -2621,6 +2621,8 @@ self: super: with self; {
cstruct = callPackage ../development/python-modules/cstruct { };
csv2md = callPackage ../development/python-modules/csv2md { };
csvw = callPackage ../development/python-modules/csvw { };
ctap-keyring-device = callPackage ../development/python-modules/ctap-keyring-device { };
@ -3368,8 +3370,6 @@ self: super: with self; {
django-sites = callPackage ../development/python-modules/django-sites { };
django-sr = callPackage ../development/python-modules/django-sr { };
django-statici18n = callPackage ../development/python-modules/django-statici18n { };
django-storages = callPackage ../development/python-modules/django-storages { };
@ -8896,8 +8896,6 @@ self: super: with self; {
nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { };
nosexcover = callPackage ../development/python-modules/nosexcover { };
notebook = callPackage ../development/python-modules/notebook { };
notebook-shim = callPackage ../development/python-modules/notebook-shim { };
@ -15101,23 +15099,6 @@ self: super: with self; {
tgcrypto = callPackage ../development/python-modules/tgcrypto { };
theano-pymc = callPackage ../development/python-modules/theano-pymc { };
theano = callPackage ../development/python-modules/theano rec {
inherit (pkgs.config) cudaSupport;
cudnnSupport = cudaSupport;
};
theanoWithCuda = self.theano.override {
cudaSupport = true;
cudnnSupport = true;
};
theanoWithoutCuda = self.theano.override {
cudaSupport = false;
cudnnSupport = false;
};
thefuzz = callPackage ../development/python-modules/thefuzz { };
thelogrus = callPackage ../development/python-modules/thelogrus { };
@ -15343,6 +15324,8 @@ self: super: with self; {
torchsde = callPackage ../development/python-modules/torchsde { };
torchsummary = callPackage ../development/python-modules/torchsummary { };
torchvision = callPackage ../development/python-modules/torchvision { };
torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix {