Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2025-03-16 12:05:32 +00:00
committed by GitHub
50 changed files with 844 additions and 272 deletions
+5
View File
@@ -220,6 +220,11 @@ lib.mapAttrs mkLicense ({
fullName = "Lawrence Berkeley National Labs BSD variant license";
};
bsdAxisNoDisclaimerUnmodified = {
fullName = "BSD-Axis without Warranty Disclaimer with Unmodified requirement";
url = "https://scancode-licensedb.aboutcode.org/bsd-no-disclaimer-unmodified.html";
};
bsdOriginal = {
spdxId = "BSD-4-Clause";
fullName = ''BSD 4-clause "Original" or "Old" License'';
@@ -196,6 +196,10 @@ in
}
];
systemd.services."phpfpm-flarum" = {
restartTriggers = [ cfg.package ];
};
systemd.services.flarum-install = {
description = "Flarum installation";
requiredBy = [ "phpfpm-flarum.service" ];
+35
View File
@@ -159,6 +159,34 @@ in
which the prune will occur.
'';
};
randomizedDelaySec = mkOption {
default = "0";
type = types.singleLineStr;
example = "45min";
description = ''
Add a randomized delay before each auto prune.
The delay will be chosen between zero and this value.
This value must be a time span in the format specified by
{manpage}`systemd.time(7)`
'';
};
persistent = mkOption {
default = true;
type = types.bool;
example = false;
description = ''
Takes a boolean argument. If true, the time when the service
unit was last triggered is stored on disk. When the timer is
activated, the service unit is triggered immediately if it
would have been triggered at least once during the time when
the timer was inactive. Such triggering is nonetheless
subject to the delay imposed by RandomizedDelaySec=. This is
useful to catch up on missed runs of the service when the
system was powered down.
'';
};
};
package = mkPackageOption pkgs "docker" { };
@@ -254,6 +282,13 @@ in
requires = [ "docker.service" ];
};
systemd.timers.docker-prune = mkIf cfg.autoPrune.enable {
timerConfig = {
RandomizedDelaySec = cfg.autoPrune.randomizedDelaySec;
Persistent = cfg.autoPrune.persistent;
};
};
assertions = [
{ assertion = cfg.enableNvidia && pkgs.stdenv.hostPlatform.isx86_64 -> config.hardware.graphics.enable32Bit or false;
message = "Option enableNvidia on x86_64 requires 32-bit support libraries";
@@ -158,7 +158,6 @@ python3.pkgs.buildPythonApplication rec {
joachifm
np
prusnak
chewblacka
];
mainProgram = "electrum";
};
@@ -78,7 +78,6 @@ callPackage ./generic.nix {
maintainers = with maintainers; [
herberteuler
rafaelrc
chewblacka
];
platforms = [ "x86_64-linux" ];
};
@@ -63,6 +63,7 @@ lib.extendMkDerivation {
patches
postPatch
patchFlags
nativeBuildInputs
;
name = "${name}-npm-deps";
hash = npmDepsHash;
@@ -152,6 +152,7 @@
, hash ? ""
, forceGitDeps ? false
, forceEmptyCache ? false
, nativeBuildInputs ? [ ]
, ...
} @ args:
let
@@ -169,7 +170,7 @@
stdenvNoCC.mkDerivation (args // {
inherit name;
nativeBuildInputs = [ prefetch-npm-deps ];
nativeBuildInputs = nativeBuildInputs ++ [ prefetch-npm-deps ];
buildPhase = ''
runHook preBuild
+118 -54
View File
@@ -1,57 +1,24 @@
{ lib
, fetchFromGitHub
, nixosTests
, nix-update-script
, python3
{
lib,
stdenv,
fetchFromGitHub,
nix-update-script,
nixosTests,
python3Packages,
}:
let
python = python3.override {
self = python;
packageOverrides = self: super: {
sqlalchemy = super.sqlalchemy_1_4;
};
};
in
python.pkgs.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "calibre-web";
version = "0.6.22";
version = "0.6.24";
pyproject = true;
src = fetchFromGitHub {
owner = "janeczku";
repo = "calibre-web";
rev = version;
hash = "sha256-nWZmDasBH+DW/+Cvw510mOv11CXorRnoBwNFpoKPErY=";
tag = version;
hash = "sha256-DYhlD3ly6U/e5cDlsubDyW1uKeCtB+HrpagJlNDJhyI=";
};
propagatedBuildInputs = with python.pkgs; [
advocate
apscheduler
babel
bleach
chardet
flask
flask-babel
flask-limiter
flask-login
flask-principal
flask-simpleldap
flask-wtf
iso-639
jsonschema
lxml
pypdf
python-magic
pytz
regex
requests
sqlalchemy
tornado
unidecode
wand
werkzeug
];
patches = [
# default-logger.patch switches default logger to /dev/stdout. Otherwise calibre-web tries to open a file relative
# to its location, which can't be done as the store is read-only. Log file location can later be configured using UI
@@ -69,24 +36,121 @@ python.pkgs.buildPythonApplication rec {
mv cps.py src/calibreweb/__init__.py
mv cps src/calibreweb
substituteInPlace setup.cfg \
--replace-fail "cps = calibreweb:main" "calibre-web = calibreweb:main"
substituteInPlace pyproject.toml \
--replace-fail 'cps = "calibreweb:main"' 'calibre-web = "calibreweb:main"'
'';
# Upstream repo doesn't provide any tests.
doCheck = false;
build-system = [ python3Packages.setuptools ];
dependencies = with python3Packages; [
apscheduler
babel
bleach
chardet
cryptography
flask
flask-babel
flask-httpauth
flask-limiter
flask-principal
flask-wtf
iso-639
lxml
netifaces-plus
pycountry
pypdf
python-magic
pytz
regex
requests
sqlalchemy
tornado
unidecode
urllib3
wand
];
optional-dependencies = {
comics = with python3Packages; [
comicapi
natsort
];
gdrive = with python3Packages; [
gevent
google-api-python-client
greenlet
httplib2
oauth2client
pyasn1-modules
# https://github.com/NixOS/nixpkgs/commit/bf28e24140352e2e8cb952097febff0e94ea6a1e
# pydrive2
pyyaml
rsa
uritemplate
];
gmail = with python3Packages; [
google-api-python-client
google-auth-oauthlib
];
# We don't support the goodreads feature, as the `goodreads` package is
# archived and depends on other long unmaintained packages (rauth & nose)
# goodreads = [ ];
kobo = with python3Packages; [ jsonschema ];
ldap = with python3Packages; [
flask-simpleldap
python-ldap
];
metadata = with python3Packages; [
faust-cchardet
html2text
markdown2
mutagen
py7zr
pycountry
python-dateutil
rarfile
scholarly
];
oauth = with python3Packages; [
flask-dance
sqlalchemy-utils
];
};
pythonRelaxDeps = [
"apscheduler"
"bleach"
"cryptography"
"flask"
"flask-limiter"
"lxml"
"pypdf"
"regex"
];
nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "calibreweb" ];
passthru = {
tests.calibre-web = nixosTests.calibre-web;
tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) calibre-web; };
updateScript = nix-update-script { };
};
meta = with lib; {
meta = {
description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
homepage = "https://github.com/janeczku/calibre-web";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ pborzenkov ];
platforms = platforms.all;
changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ pborzenkov ];
mainProgram = "calibre-web";
platforms = lib.platforms.all;
};
}
-1
View File
@@ -90,7 +90,6 @@ perlPackages.buildPerlPackage rec {
homepage = "https://github.com/dave-theunsub/clamtk";
platforms = platforms.linux;
maintainers = with maintainers; [
chewblacka
ShamrockLee
];
};
+3 -3
View File
@@ -20,17 +20,17 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "2.2.3";
version = "2.2.4";
src = fetchFromGitHub {
owner = "denoland";
repo = "deno";
tag = "v${version}";
hash = "sha256-eYzDCQVjilm6Olc9Ko+EYlSCNN7UVl/YXuK55xeoOOg=";
hash = "sha256-gcUd4N2rTVYprBxx5T2RjG+0uZ090KjXPswYzGU5+14=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-Hmxz4bryk6wMbccaXcKg8XuD9H9BF+nuvMkiCNeYMXY=";
cargoHash = "sha256-V2dKiiTYAsUhq6Pr+z/ga3qtKI43mfzqgBDSAhcBVKo=";
postPatch = ''
# Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "3.2.0";
version = "3.2.1";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = "v${version}";
hash = "sha256-JEpmCpFLj7LO/Vojw7MoAu8E5bZKT1cU4Zk4Nw6IEmM=";
hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew=";
};
vendorHash = "sha256-GNUkU/cmu8j6naFAHIEZ56opJnj8p2Sb8M7TduTbJcU=";
vendorHash = "sha256-3mcz7tstVfIb1ATuCwDdQ5IyCtjSGaDWNw2qCmY/ObE=";
doCheck = false;
+1 -1
View File
@@ -68,7 +68,7 @@ RELEASE_TYPES = [
needs_auth=True,
hash_filename_format=["factorio_linux_{version}.tar.xz"],
),
ReleaseType("demo", hash_filename_format=["factorio_demo_x64_{version}.tar.xz"]),
ReleaseType("demo", hash_filename_format=["factorio-demo_linux_{version}.tar.xz"]),
ReleaseType(
"headless",
hash_filename_format=[
+42 -41
View File
@@ -3,98 +3,99 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
"factorio_linux_2.0.32.tar.xz"
"factorio_linux_2.0.41.tar.xz"
],
"name": "factorio_alpha_x64-2.0.32.tar.xz",
"name": "factorio_alpha_x64-2.0.41.tar.xz",
"needsAuth": true,
"sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f",
"sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/alpha/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
"version": "2.0.41"
},
"stable": {
"candidateHashFilenames": [
"factorio_linux_2.0.32.tar.xz"
"factorio_linux_2.0.41.tar.xz"
],
"name": "factorio_alpha_x64-2.0.32.tar.xz",
"name": "factorio_alpha_x64-2.0.41.tar.xz",
"needsAuth": true,
"sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f",
"sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/alpha/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
"version": "2.0.41"
}
},
"demo": {
"experimental": {
"candidateHashFilenames": [
"factorio_demo_x64_2.0.27.tar.xz"
"factorio-demo_linux_2.0.40.tar.xz"
],
"name": "factorio_demo_x64-2.0.27.tar.xz",
"name": "factorio_demo_x64-2.0.40.tar.xz",
"needsAuth": false,
"sha256": "91ab921f8599c575f6090f5539090fb2eb42eb0d8bc83f366da078d995c639e6",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.27/demo/linux64",
"version": "2.0.27"
"url": "https://factorio.com/get-download/2.0.40/demo/linux64",
"version": "2.0.40"
},
"stable": {
"candidateHashFilenames": [
"factorio_demo_x64_1.1.110.tar.xz"
"factorio-demo_linux_2.0.27.tar.xz"
],
"name": "factorio_demo_x64-1.1.110.tar.xz",
"name": "factorio_demo_x64-2.0.27.tar.xz",
"needsAuth": false,
"sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35",
"sha256": "75938e76d0e730273616e2441ae3c3bc238bb3cfa38d34a43e5fb25a3d1f2323",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.110/demo/linux64",
"version": "1.1.110"
"url": "https://factorio.com/get-download/2.0.27/demo/linux64",
"version": "2.0.27"
}
},
"expansion": {
"experimental": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.32.tar.xz"
"factorio-space-age_linux_2.0.41.tar.xz"
],
"name": "factorio_expansion_x64-2.0.32.tar.xz",
"name": "factorio_expansion_x64-2.0.41.tar.xz",
"needsAuth": true,
"sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77",
"sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/expansion/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
"version": "2.0.41"
},
"stable": {
"candidateHashFilenames": [
"factorio-space-age_linux_2.0.32.tar.xz"
"factorio-space-age_linux_2.0.41.tar.xz"
],
"name": "factorio_expansion_x64-2.0.32.tar.xz",
"name": "factorio_expansion_x64-2.0.41.tar.xz",
"needsAuth": true,
"sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77",
"sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/expansion/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
"version": "2.0.41"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.32.tar.xz",
"factorio_headless_x64_2.0.32.tar.xz"
"factorio-headless_linux_2.0.41.tar.xz",
"factorio_headless_x64_2.0.41.tar.xz"
],
"name": "factorio_headless_x64-2.0.32.tar.xz",
"name": "factorio_headless_x64-2.0.41.tar.xz",
"needsAuth": false,
"sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417",
"sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/headless/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/headless/linux64",
"version": "2.0.41"
},
"stable": {
"candidateHashFilenames": [
"factorio-headless_linux_2.0.32.tar.xz",
"factorio_headless_x64_2.0.32.tar.xz"
"factorio-headless_linux_2.0.41.tar.xz",
"factorio_headless_x64_2.0.41.tar.xz"
],
"name": "factorio_headless_x64-2.0.32.tar.xz",
"name": "factorio_headless_x64-2.0.41.tar.xz",
"needsAuth": false,
"sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417",
"sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/2.0.32/headless/linux64",
"version": "2.0.32"
"url": "https://factorio.com/get-download/2.0.41/headless/linux64",
"version": "2.0.41"
}
}
}
+69
View File
@@ -0,0 +1,69 @@
{
lib,
stdenv,
buildPackages,
fetchFromGitHub,
pciutils,
fwupd-efi,
ipxe,
refind,
syslinux,
}:
assert lib.assertMsg stdenv.hostPlatform.isEfi "gnu-efi may only be built for EFI platforms";
stdenv.mkDerivation (finalAttrs: {
pname = "gnu-efi";
version = "4.0.0";
src = fetchFromGitHub {
owner = "ncroxon";
repo = "gnu-efi";
tag = finalAttrs.version;
hash = "sha256-vVtJkAPe5tPDLAFZibnJRC7G7WtOg11JT5QipdO+FIk=";
};
buildInputs = [ pciutils ];
hardeningDisable = [ "stackprotector" ];
makeFlags = [
"PREFIX=\${out}"
"HOSTCC=${buildPackages.stdenv.cc.targetPrefix}cc"
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
postPatch = ''
substituteInPlace Make.defaults \
--replace "-Werror" ""
'';
passthru.tests = {
inherit
fwupd-efi
ipxe
syslinux
;
};
meta = {
description = "GNU EFI development toolchain";
homepage = "https://github.com/ncroxon/gnu-efi";
license = with lib.licenses; [
# This is a mess, upstream is aware.
# The source for these is Fedora's SPDX identifier for this package.
# Fedora also has gpl2Only here, but 4.0.0 doesn't have gpl2Only code.
# However, both upstream and Fedora seems to have missed
# bsdAxisNoDisclaimerUnmodified and MIT.
bsd2
bsd2Patent
bsd3
bsdAxisNoDisclaimerUnmodified
bsdOriginal
gpl2Plus
mit
];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ lzcunt ];
};
})
+20
View File
@@ -0,0 +1,20 @@
{
fetchFromGitHub,
gnu-efi,
refind,
}:
gnu-efi.overrideAttrs (
finalAttrs: prevAttrs: {
version = "3.0.19";
src = fetchFromGitHub {
owner = "ncroxon";
repo = "gnu-efi";
rev = finalAttrs.version;
hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";
};
passthru.tests = {
inherit refind;
};
}
)
+4 -4
View File
@@ -16,18 +16,18 @@
rustPlatform.buildRustPackage {
pname = "htb-toolkit";
version = "0-unstable-2024-04-22";
version = "0-unstable-2025-03-15";
src = fetchFromGitHub {
owner = "D3vil0p3r";
repo = "htb-toolkit";
# https://github.com/D3vil0p3r/htb-toolkit/issues/3
rev = "921e4b352a9dd8b3bc8ac8774e13509abd179aef";
hash = "sha256-o91p/m06pm9qoYZZVh+qHulqHO2G7xVJQPpEvRsq+8Q=";
rev = "dd193c2974cd5fd1bbc6f7f616ebd597e28539ec";
hash = "sha256-NTZv0BPyIB32CNXbINYTy4n8tNVJ3pRLr1QDhI/tg2Y=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-TQsqZhgmbHqNFgUddtRRKYkob0L40dJiSq8FxKnpPEE=";
cargoHash = "sha256-ReEe8pyW66GXIPwAy6IKsFEAUjxHmzw5mj21i/h4quQ=";
# Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature
patches = [
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "mihomo";
version = "1.19.2";
version = "1.19.3";
src = fetchFromGitHub {
owner = "MetaCubeX";
repo = "mihomo";
rev = "v${version}";
hash = "sha256-lTrUM4/t7GP8IhuyMqit7Iv4AX2I8tlMJWvgx2tDbgE=";
hash = "sha256-NzxH6rgr85oHmkMxh3rLbYXJoQKOsngeTazAV3SvRCg=";
};
vendorHash = "sha256-/YW3IRdDHcOrwUkXt/ORhN3OrwwV5H63WP6ioTFDR+c=";
vendorHash = "sha256-dQNdOTFcfk53Snu01XLGB3PTiU1Ex/QQvykfopIdk2M=";
excludedPackages = [ "./test" ];
+1 -1
View File
@@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec {
description = "Simple GUI for Linux OneDrive Client, with multi-account support";
mainProgram = "onedrivegui";
license = licenses.gpl3Only;
maintainers = with maintainers; [ chewblacka ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
+32 -25
View File
@@ -17,15 +17,15 @@
darwin,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "opensubdiv";
version = "3.6.0";
src = fetchFromGitHub {
owner = "PixarAnimationStudios";
repo = "OpenSubdiv";
rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
sha256 = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE=";
tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
hash = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE=";
};
outputs = [
@@ -38,15 +38,15 @@ stdenv.mkDerivation rec {
[
cmake
pkg-config
python3
]
++ lib.optional cudaSupport [
++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc
];
buildInputs =
[
lib.optionals stdenv.hostPlatform.isUnix [
libGLU
libGL
python3
# FIXME: these are not actually needed, but the configure script wants them.
glew
xorg.libX11
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
xorg.libXinerama
xorg.libXi
]
++ lib.optionals (openclSupport && !stdenv.hostPlatform.isDarwin) [ ocl-icd ]
++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ]
++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
[
@@ -84,20 +84,21 @@ stdenv.mkDerivation rec {
cmakeFlags =
[
"-DNO_TUTORIALS=1"
"-DNO_REGRESSION=1"
"-DNO_EXAMPLES=1"
(lib.cmakeBool "NO_METAL" (!stdenv.hostPlatform.isDarwin))
(lib.cmakeBool "NO_OPENCL" (!openclSupport))
(lib.cmakeBool "NO_CUDA" (!cudaSupport))
(lib.mapAttrsToList lib.cmakeBool {
NO_TUTORIALS = true;
NO_REGRESSION = true;
NO_EXAMPLES = true;
NO_DX = stdenv.hostPlatform.isWindows;
NO_METAL = !stdenv.hostPlatform.isDarwin;
NO_OPENCL = !openclSupport;
NO_CUDA = !cudaSupport;
})
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
"-DGLEW_INCLUDE_DIR=${glew.dev}/include"
"-DGLEW_LIBRARY=${glew.dev}/lib"
]
++ lib.optionals cudaSupport [
]
++ lib.optionals (!openclSupport) [
++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [
(lib.mapAttrsToList lib.cmakeFeature {
GLEW_INCLUDE_DIR = "${glew.dev}/include";
GLEW_LIBRARY = "${glew.dev}/lib";
})
];
preBuild =
@@ -109,16 +110,22 @@ stdenv.mkDerivation rec {
NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
'';
postInstall = ''
moveToOutput "lib/*.a" $static
'';
postInstall =
if stdenv.hostPlatform.isWindows then
''
ln -s $out $static
''
else
''
moveToOutput "lib/*.a" $static
'';
meta = {
description = "Open-Source subdivision surface library";
homepage = "http://graphics.pixar.com/opensubdiv";
broken = openclSupport && cudaSupport;
platforms = lib.platforms.unix;
platforms = lib.platforms.unix ++ lib.platforms.windows;
maintainers = [ ];
license = lib.licenses.asl20;
};
}
})
+4 -4
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.306.0";
version = "2025.316.0";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-VbzHD7LQstBXmSIkDpue6kPGHEzFO+Fy22eLYj+rNcw=";
hash = "sha256-u5d8MjBRWd4Y/6avRyBIzgR9J+GJANjGYhkXhu7imbI=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-1KC0PnTMgN0GFhNYmlqfqWSVEpo8i+gb4nVHEwBMSS8=";
hash = "sha256-isgYm4+GXAC6A9P1UjNLcohNr1Zi4C/94V2jtLixGVI=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-A9CWoTvByyNkULQ2abeVgiwAmSmyHx9IZqtHGS+bW6Y=";
hash = "sha256-348B6gtYLRTGlyCNsWiOrqg98bF/cPIsPBroisApzfc=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
+6 -6
View File
@@ -651,8 +651,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2025.225.0",
"hash": "sha256-XXqNC/nzUb/mEKy7SzVBQnE2VsOwQiCFhH700/LDblc="
"version": "2025.313.0",
"hash": "sha256-daN3BmGYAyh+I0l5l7fFMaMoksYR3mhb9sPMg70GZxo="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2025.303.0",
"hash": "sha256-+Lnin+oEo67ARp9RFWOe00JcOL73O9gh/XJFIF151Yg="
"version": "2025.313.0",
"hash": "sha256-DbPR7XwlhC9wDkgUCRUt2QrYRoscqJaRGvtUZ9LGyvM="
},
{
"pname": "ppy.osuTK.NS20",
@@ -1016,8 +1016,8 @@
},
{
"pname": "SixLabors.ImageSharp",
"version": "3.1.5",
"hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
"version": "3.1.7",
"hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
},
{
"pname": "SQLitePCLRaw.bundle_e_sqlite3",
+2 -2
View File
@@ -21,13 +21,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.306.0";
version = "2025.316.0";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-SqPwVQGmtkaF/Mkcp4WnKRYNXSQD3+56XbNVw9ZMr+A=";
hash = "sha256-EbuJ3LrfW+JtNqFx9HSR5xWDZdXP72NXvKC05ek7zhc=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
+24
View File
@@ -0,0 +1,24 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "plan-exporter";
version = "0.0.6";
src = fetchFromGitHub {
owner = "agneum";
repo = "plan-exporter";
tag = "v${version}";
hash = "sha256-Csp57wmkDA8b05hmKbk1+bGtORFgNls7I01A0irTKao=";
};
vendorHash = null;
meta = {
description = "Query plan exporter for psql";
homepage = "https://github.com/agneum/plan-exporter";
changelog = "https://github.com/agneum/plan-exporter/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ autra ];
};
}
+12 -18
View File
@@ -1997,7 +1997,7 @@ dependencies = [
"log",
"lsp-server",
"reqwest",
"tower-lsp",
"tower-lsp-server",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-streams",
@@ -2014,7 +2014,7 @@ dependencies = [
"miette",
"miette_util",
"printer",
"tower-lsp",
"tower-lsp-server",
"url",
]
@@ -2509,11 +2509,12 @@ dependencies = [
"log",
"lsp-server",
"miette",
"parser",
"printer",
"termsize",
"thiserror",
"tokio",
"tower-lsp",
"tower-lsp-server",
]
[[package]]
@@ -2823,15 +2824,14 @@ dependencies = [
[[package]]
name = "ring"
version = "0.17.8"
version = "0.17.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
dependencies = [
"cc",
"cfg-if",
"getrandom 0.2.15",
"libc",
"spin",
"untrusted",
"windows-sys 0.52.0",
]
@@ -3090,12 +3090,6 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@@ -3595,9 +3589,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
[[package]]
name = "tower-lsp"
version = "0.20.0"
source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc394e438450bd9c74365#19f5a87810ff4b643d2bc394e438450bd9c74365"
name = "tower-lsp-server"
version = "0.21.0"
source = "git+https://github.com/tower-lsp-community/tower-lsp-server?rev=ae955f1d1c2a86bf675cc9bd0638e4c684864a6d#ae955f1d1c2a86bf675cc9bd0638e4c684864a6d"
dependencies = [
"async-codec-lite",
"async-trait",
@@ -3611,14 +3605,14 @@ dependencies = [
"serde",
"serde_json",
"tower",
"tower-lsp-macros",
"tower-lsp-server-macros",
"tracing",
]
[[package]]
name = "tower-lsp-macros"
name = "tower-lsp-server-macros"
version = "0.9.0"
source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc394e438450bd9c74365#19f5a87810ff4b643d2bc394e438450bd9c74365"
source = "git+https://github.com/tower-lsp-community/tower-lsp-server?rev=ae955f1d1c2a86bf675cc9bd0638e4c684864a6d#ae955f1d1c2a86bf675cc9bd0638e4c684864a6d"
dependencies = [
"proc-macro2",
"quote",
+4 -4
View File
@@ -7,19 +7,19 @@
rustPlatform.buildRustPackage rec {
pname = "polarity";
version = "latest-unstable-2025-02-28";
version = "latest-unstable-2025-03-14";
src = fetchFromGitHub {
owner = "polarity-lang";
repo = "polarity";
rev = "627a0d0ebfca2a586279e284921e05313514d374";
hash = "sha256-Q/lx4/cFpttbGRvyPnMC6YBHn/7kyKZAP5Y2mtBeGQ8=";
rev = "ab9fda44fb490da445dcaee7ad9f8bf08b9e9e10";
hash = "sha256-ufWHDqvAaQiqwlezm95BCTLMdQEK5NTmMQgeq3oKR1o=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k=";
"tower-lsp-server-0.21.0" = "sha256-aeCc8m7zf3Kww1EBmMJFhQTYJ9lP6+R+9WzQ8yaj3Jo=";
};
};
+2 -2
View File
@@ -19,13 +19,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "proftpd";
version = "1.3.8c";
version = "1.3.9";
src = fetchFromGitHub {
owner = "proftpd";
repo = "proftpd";
tag = "v${finalAttrs.version}";
hash = "sha256-wHcJJiGY8ULVIMo6RVEE7ne6YZM7gECt2IygPhX+3cU=";
hash = "sha256-4Iyzk0OctTvDDkYXPDSrvaWQOjkbBXHY7ELyhkUx/X0=";
};
patches = [ ./no-install-user.patch ];
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "rabbitmqadmin-ng";
version = "0.24.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "rabbitmq";
repo = "rabbitmqadmin-ng";
tag = "v${version}";
hash = "sha256-P6/M90LvvK4NQ7jiT84rROrzgQukJ8V+24naRBehhHQ";
hash = "sha256-PSG//vyhNFUVDf9XfIuqm0mGcDo0B02+x0Sesj3ggAA=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-SODm95UOvsRIMI4WgV0Nk5UBtQU0lmcENoOcyhuGU9s=";
cargoHash = "sha256-hMFawT1m8VNRWENvJtoi5Ysw7k3iNRB7y5wgNAJCxX8=";
buildInputs = [ openssl ];
nativeBuildInputs = [ pkg-config ];
+7 -7
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
fetchurl,
gnu-efi,
gnu-efi_3,
nixosTests,
efibootmgr,
openssl,
@@ -54,17 +54,17 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gnu-efi ];
buildInputs = [ gnu-efi_3 ];
hardeningDisable = [ "stackprotector" ];
makeFlags =
[
"prefix="
"EFIINC=${gnu-efi}/include/efi"
"EFILIB=${gnu-efi}/lib"
"GNUEFILIB=${gnu-efi}/lib"
"EFICRT0=${gnu-efi}/lib"
"EFIINC=${gnu-efi_3}/include/efi"
"EFILIB=${gnu-efi_3}/lib"
"GNUEFILIB=${gnu-efi_3}/lib"
"EFICRT0=${gnu-efi_3}/lib"
"HOSTARCH=${hostarch}"
"ARCH=${hostarch}"
]
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
Linux kernels that provide EFI stub support.
'';
homepage = "http://refind.sourceforge.net/";
maintainers = with maintainers; [ chewblacka ];
maintainers = with maintainers; [ johnrtitor ];
platforms = [
"i686-linux"
"x86_64-linux"
+3 -3
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "retroarch-assets";
version = "1.20.0-unstable-2025-01-30";
version = "1.20.0-unstable-2025-03-09";
src = fetchFromGitHub {
owner = "libretro";
repo = "retroarch-assets";
rev = "9afd2b8a9d16fc25c5a046122bc0d2b3c965980e";
hash = "sha256-PWwq9aNj0u+Dc9Q7lSRivER1Fd42H6u2auU/XLlg61k=";
rev = "fb39cdde6dfaea2c98218d28c71b14afc632fa03";
hash = "sha256-2ytGtoci0xd10KrYGwMsGbXoT402DiokSVlCek8nhyI=";
};
makeFlags = [
+2 -2
View File
@@ -13,7 +13,7 @@
python3Packages.buildPythonApplication rec {
pname = "snapcraft";
version = "8.7.1";
version = "8.7.2";
pyproject = true;
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
owner = "canonical";
repo = "snapcraft";
tag = version;
hash = "sha256-QKnlnFvQjpNYaZ42vcSNGS5HRSz+hHDzxBpE5lRYfWw=";
hash = "sha256-RlaAvLU0UE8u6y2xCHLxbOFLQF9jRa+8e2mgrRgTIjw=";
};
patches = [
+4 -4
View File
@@ -10,7 +10,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tideways-daemon";
version = "1.9.34";
version = "1.9.36";
src =
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sources = {
"x86_64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
hash = "sha256-duJmsFX6KNgO6G8VrhVIVv9H9jccQGtGuaBOw2A7p1c=";
hash = "sha256-+EnXHjFAD23jmG8IucnppjWeGNKX6yzWJypICECy3do=";
};
"aarch64-linux" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
hash = "sha256-1rw6s8E0jCr2vyx1eoejt/wNm0FQx2UVoj4EpLBbkgI=";
hash = "sha256-p5/wzvr7EyvELADfA1X/mo8VdAT47SbAXZlIWdGZVb4=";
};
"aarch64-darwin" = fetchurl {
url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
hash = "sha256-A4+IE/bzvc6SSd/V3MqLB9Y7ruFe5edZ/HNY07JJ7fc=";
hash = "sha256-uI7qOO7nj32BXrNFMmQlX32omT4Kxruf/J7A63QQ62w=";
};
};
updateScript = "${
+1 -1
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
pciutils
]
+ ":"
+ lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+ lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
desktopItem = makeDesktopItem {
name = "zotero";
+1 -1
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
pciutils
]
+ ":"
+ lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+ lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
desktopItem = makeDesktopItem {
name = "zotero";
@@ -1,47 +0,0 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, pciutils
, gitUpdater, fwupd-efi, ipxe, refind, syslinux }:
stdenv.mkDerivation rec {
pname = "gnu-efi";
version = "3.0.18";
src = fetchFromGitHub {
owner = "ncroxon";
repo = "gnu-efi";
rev = version;
hash = "sha256-WTXUIBiyWEVCKfhUUWK5vrK6XmcvsAMl4CuhEw5oYWI=";
};
buildInputs = [ pciutils ];
hardeningDisable = [ "stackprotector" ];
makeFlags = [
"PREFIX=\${out}"
"HOSTCC=${buildPackages.stdenv.cc.targetPrefix}cc"
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];
postPatch = ''
substituteInPlace Make.defaults \
--replace "-Werror" ""
'';
passthru = {
updateScript = gitUpdater {
# No nicer place to find latest release.
url = "https://git.code.sf.net/p/gnu-efi/code";
};
tests = {
inherit fwupd-efi ipxe refind syslinux;
};
};
meta = with lib; {
description = "GNU EFI development toolchain";
homepage = "https://sourceforge.net/projects/gnu-efi/";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ ];
};
}
@@ -359,7 +359,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.37.12";
version = "1.37.13";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-PHl0o8itRkM01+b1oJK5MIy4LyNoPS4lnB2Kfa0nHBc=";
hash = "sha256-vZIxrbBXis/GLIIW9j4jqdQJzSpUtl8xJo4JRw+78FM=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.37.12";
version = "1.37.13";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-24NObF8AQ6fcs58sXxLHQ0qDXEd9kaogvCzn+sWI2ts=";
hash = "sha256-6h6aOA5BGcVwzAd6lMc3cn2MgeC4Z6PXXdlL6xe7F7c=";
};
nativeBuildInputs = [ setuptools ];
@@ -0,0 +1,83 @@
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
importlib-metadata,
natsort,
pillow,
py7zr,
pycountry,
pyicu,
pytestCheckHook,
pythonOlder,
rapidfuzz,
rarfile,
setuptools,
setuptools-scm,
text2digits,
wheel,
wordninja,
}:
buildPythonPackage rec {
pname = "comicapi";
version = "3.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "comictagger";
repo = "comicapi";
rev = "2bf8332114e49add0bbc0fd3d85bdbba02de3d1a";
hash = "sha256-Cd3ILy/4PqWUj1Uu9of9gCpdVp2R6CXjPOuSXgrB894=";
};
build-system = [
setuptools
setuptools-scm
wheel
];
dependencies = [
importlib-metadata
natsort
pillow
pycountry
rapidfuzz
text2digits
wordninja
];
optional-dependencies = {
_7z = [ py7zr ];
all = [
py7zr
rarfile
] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
cbr = [ rarfile ];
icu = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
};
nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
pythonRelaxDeps = [ "pycountry" ];
disabledTests = [
# AssertionError
"test_copy_from_archive"
];
pythonImportsCheck = [ "comicapi" ];
meta = {
description = "Comic archive (cbr/cbz/cbt) and metadata utilities";
homepage = "https://github.com/comictagger/comicapi";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -0,0 +1,95 @@
{
lib,
betamax,
blinker,
buildPythonPackage,
coverage,
fetchFromGitHub,
flask,
flask-caching,
flask-login,
flask-sqlalchemy,
flit,
freezegun,
oauthlib,
pallets-sphinx-themes,
pillow,
pytest,
pytest-mock,
pytestCheckHook,
requests,
requests-oauthlib,
responses,
sphinx,
sphinxcontrib-seqdiag,
sphinxcontrib-spelling,
sqlalchemy,
urlobject,
werkzeug,
}:
buildPythonPackage rec {
pname = "flask-dance";
version = "7.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "singingwolfboy";
repo = "flask-dance";
tag = "v${version}";
hash = "sha256-rKHC0G5S7l52QSrbbweMii68AZuBAgf6tYsJdPKIeUk=";
};
build-system = [ flit ];
dependencies = [
flask
oauthlib
requests
requests-oauthlib
urlobject
werkzeug
];
optional-dependencies = {
docs = [
betamax
pallets-sphinx-themes
pillow
sphinx
sphinxcontrib-seqdiag
sphinxcontrib-spelling
sqlalchemy
];
signals = [ blinker ];
sqla = [ sqlalchemy ];
test = [
betamax
coverage
flask-caching
flask-login
flask-sqlalchemy
freezegun
oauthlib
pytest
pytest-mock
responses
sqlalchemy
];
};
nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "flask_dance" ];
meta = {
description = "Doing the OAuth dance with style using Flask, requests, and oauthlib";
homepage = "https://github.com/singingwolfboy/flask-dance";
changelog = "https://github.com/singingwolfboy/flask-dance/releases/tag/${src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -39,7 +39,7 @@
buildPythonPackage rec {
pname = "litellm";
version = "1.59.8";
version = "1.63.11";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -47,14 +47,12 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "BerriAI";
repo = "litellm";
tag = "v${version}";
hash = "sha256-2OkREmgs+r+vco1oEVgp5nq7cfwIAlMAh0FL2ceO88Y=";
tag = "v${version}-stable";
hash = "sha256-j2RfuVffmWoeAAVcT579S9pU06haKEYYa7FcpMzu9uA=";
};
build-system = [ poetry-core ];
pythonRelaxDeps = [ "httpx" ];
dependencies = [
aiohttp
click
@@ -310,12 +310,12 @@ rec {
"sha256-++3ixApRniFY/gYZDA2ae6dtAVyxE2ujciTyLT2/vbk=";
mypy-boto3-cognito-identity =
buildMypyBoto3Package "cognito-identity" "1.37.0"
"sha256-MK11RuIgZfoy8vvZWHFEJjkSsJSzqKjXvm9GCjt3QH4=";
buildMypyBoto3Package "cognito-identity" "1.37.13"
"sha256-6w2v795pNhcKZlWayROdYe5bzQvSmkITxErl2M0F5o4=";
mypy-boto3-cognito-idp =
buildMypyBoto3Package "cognito-idp" "1.37.5"
"sha256-FAMF7HEM+StH7vkhPomIxh2GRSIhNxQaCZx0o6/EoYc=";
buildMypyBoto3Package "cognito-idp" "1.37.13"
"sha256-L9F74KW7z+Q+7hUoGIQR67TQyNiJF8nW4XHWBppFO4Q=";
mypy-boto3-cognito-sync =
buildMypyBoto3Package "cognito-sync" "1.37.0"
@@ -574,8 +574,8 @@ rec {
"sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA=";
mypy-boto3-glue =
buildMypyBoto3Package "glue" "1.37.0"
"sha256-Xi0qA0cq98YeOAoJCGuXUk5cIEAkkhOR3KDaQD7qbic=";
buildMypyBoto3Package "glue" "1.37.13"
"sha256-FrJfuU55fUM3pxt4ey/KLmgXD3wTs6PlksCOBCQ1ibA=";
mypy-boto3-grafana =
buildMypyBoto3Package "grafana" "1.37.0"
@@ -766,8 +766,8 @@ rec {
"sha256-5wgeRfBkLbX35PGmGBciTx8gVS8Uqsh5WG8NeQwmEJs=";
mypy-boto3-lakeformation =
buildMypyBoto3Package "lakeformation" "1.37.0"
"sha256-6HsfUV066CiTERS87hsLDqaCnj917ZTyBxdcLH9nvfQ=";
buildMypyBoto3Package "lakeformation" "1.37.13"
"sha256-E5A6wS8kwjG1rWo1RFT7kwpqmWKGZ7UAmcR4KUvUrzg=";
mypy-boto3-lambda =
buildMypyBoto3Package "lambda" "1.37.0"
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
setuptools,
wheel,
}:
buildPythonPackage rec {
pname = "netifaces-plus";
version = "0.12.4";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tsukumijima";
repo = "netifaces-plus";
tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-3CYAe0doWMagcUIN9+ikH9gEST9AqglSQDlZsKOMnC8=";
};
build-system = [
setuptools
wheel
];
pythonImportsCheck = [ "netifaces" ];
meta = {
description = "Portable network interface information";
homepage = "https://github.com/tsukumijima/netifaces-plus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -0,0 +1,69 @@
{
lib,
arrow,
beautifulsoup4,
bibtexparser,
buildPythonPackage,
deprecated,
fake-useragent,
fetchFromGitHub,
free-proxy,
httpx,
python-dotenv,
requests,
selenium,
setuptools,
sphinx-rtd-theme,
stem,
typing-extensions,
wheel,
}:
buildPythonPackage rec {
pname = "scholarly";
version = "1.7.11";
pyproject = true;
src = fetchFromGitHub {
owner = "scholarly-python-package";
repo = "scholarly";
tag = "v${version}";
hash = "sha256-yvew63tGwSjwseHK7wDqm26xiyCztUzxMqBpwwLD798=";
};
build-system = [
setuptools
wheel
];
dependencies = [
arrow
beautifulsoup4
bibtexparser
deprecated
fake-useragent
free-proxy
httpx
python-dotenv
requests
selenium
sphinx-rtd-theme
typing-extensions
];
optional-dependencies = {
tor = [ stem ];
};
nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
pythonImportsCheck = [ "scholarly" ];
meta = {
description = "Retrieve author and publication information from Google Scholar";
homepage = "https://scholarly.readthedocs.io/";
changelog = "https://github.com/scholarly-python-package/scholarly/releases/tag/${src.tag}";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -0,0 +1,32 @@
{
lib,
buildPythonPackage,
fetchPypi,
pypaInstallHook,
setuptoolsBuildHook,
}:
buildPythonPackage rec {
pname = "text2digits";
version = "0.1.0";
pyproject = false;
src = fetchPypi {
inherit pname version;
hash = "sha256-oB2NyNVxediIulid9A4Ccw878t2JKrIsN1OOR5lyi7I=";
};
nativeBuildInputs = [
pypaInstallHook
setuptoolsBuildHook
];
pythonImportsCheck = [ "text2digits" ];
meta = {
description = "Converts text such as 'twenty three' to number/digit '23' in any sentence";
homepage = "https://github.com/ShailChoksi/text2digits";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pypaInstallHook,
setuptoolsBuildHook,
}:
buildPythonPackage rec {
pname = "urlobject";
version = "2.4.3";
pyproject = false;
src = fetchFromGitHub {
owner = "zacharyvoase";
repo = "urlobject";
tag = "v${version}";
hash = "sha256-4UuQZTkVre8jXlchW7/TjeaADYvLnGMpGbJR/sdeKv4=";
};
nativeBuildInputs = [
pypaInstallHook
setuptoolsBuildHook
];
# Tests use `nose`
doInstallCheck = false;
pythonImportsCheck = [ "urlobject" ];
meta = {
description = "Python library for manipulating URLs (and some URIs) in a more natural way";
homepage = "http://zacharyvoase.github.com/urlobject";
license = lib.licenses.unlicense;
maintainers = with lib.maintainers; [ getchoo ];
};
}
@@ -0,0 +1,34 @@
{
lib,
buildPythonPackage,
fetchPypi,
setuptools,
setuptools-scm,
wheel,
}:
buildPythonPackage rec {
pname = "wordninja";
version = "2.0.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-GhzH7BRq0Z1vcZQe6CrvPTEiFwDw2L+EQTbPjfedKBo=";
};
build-system = [
setuptools
setuptools-scm
wheel
];
pythonImportsCheck = [ "wordninja" ];
meta = {
description = "Probabilistically split concatenated words using NLP based on English Wikipedia unigram frequencies";
homepage = "https://github.com/keredson/wordninja";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ getchoo ];
};
}
+3 -3
View File
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "klipper";
version = "0.12.0-unstable-2025-02-28";
version = "0.12.0-unstable-2025-03-12";
src = fetchFromGitHub {
owner = "KevinOConnor";
repo = "klipper";
rev = "730e5951bc453d7c08b9b2a066479f2c0cd25842";
sha256 = "sha256-u1M4vvm5fBLseHU+rLD0aoDMjpbFsZM1G1MLIUxwlho=";
rev = "d886c1761bbdfd23833996489afba6b75f312a4a";
sha256 = "sha256-I8Epwh0NcWtz2T2qAuKOv6iXBO8GmNdCR86HOgUPKCU=";
};
sourceRoot = "${src.name}/klippy";
+2 -2
View File
@@ -19,14 +19,14 @@
beamPackages.mixRelease rec {
pname = "pleroma";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitLab {
domain = "git.pleroma.social";
owner = "pleroma";
repo = "pleroma";
rev = "v${version}";
sha256 = "sha256-P+BcPC5TRxJppOFu3hXrse/10ZOU9Yph/GmPTY44CaE=";
sha256 = "sha256-mZcr+LlRQFDZVU5yAm0XkFdFHCDp4DZNLoVUlWxknMI=";
};
patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ];
+3 -3
View File
@@ -14,7 +14,7 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.41.4.9463-630c9f557";
version = "1.41.5.9522-a96edc606";
pname = "plexmediaserver";
# Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1viflfwjnskmf5iq4jb22rcxjf3nx2bl3vikypy93lvdlafkyrjs";
sha256 = "sha256-ugN1y3V1HE/IBhnvzlOYIL/5LyEa33IRPuj6903vPaA=";
}
else
fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "104imla4kkhniqxf5q0rawq73ypz8cgc2lqnk0ir3w76y0gz055a";
sha256 = "sha256-3bGmsa2OLBt587YnZDNpSjWHdQ1ubwSNocLPW6A6kQU=";
};
outputs = [
+2 -4
View File
@@ -8999,10 +8999,6 @@ with pkgs;
qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { };
gnu-efi = if stdenv.hostPlatform.isEfi
then callPackage ../development/libraries/gnu-efi { }
else null;
gnutls = callPackage ../development/libraries/gnutls {
inherit (darwin.apple_sdk.frameworks) Security;
util-linux = util-linuxMinimal; # break the cyclic dependency
@@ -16114,6 +16110,8 @@ with pkgs;
factorio-demo = factorio.override { releaseType = "demo"; };
factorio-demo-experimental = factorio.override { releaseType = "demo"; experimental = true; };
factorio-space-age = factorio.override { releaseType = "expansion"; };
factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; };
+14
View File
@@ -2196,6 +2196,8 @@ self: super: with self; {
inherit (pkgs) secp256k1;
};
comicapi = callPackage ../development/python-modules/comicapi { };
comicon = callPackage ../development/python-modules/comicon { };
command-runner = callPackage ../development/python-modules/command-runner { };
@@ -4798,6 +4800,8 @@ self: super: with self; {
flask-cors = callPackage ../development/python-modules/flask-cors { };
flask-dance = callPackage ../development/python-modules/flask-dance { };
flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { };
flask-elastic = callPackage ../development/python-modules/flask-elastic { };
@@ -9422,6 +9426,8 @@ self: super: with self; {
netifaces2 = callPackage ../development/python-modules/netifaces2 { };
netifaces-plus = callPackage ../development/python-modules/netifaces-plus { };
netmiko = callPackage ../development/python-modules/netmiko { };
netio = callPackage ../development/python-modules/netio { };
@@ -14844,6 +14850,8 @@ self: super: with self; {
schiene = callPackage ../development/python-modules/schiene { };
scholarly = callPackage ../development/python-modules/scholarly { };
schwifty = callPackage ../development/python-modules/schwifty { };
scienceplots = callPackage ../development/python-modules/scienceplots { };
@@ -16474,6 +16482,8 @@ self: super: with self; {
texsoup = callPackage ../development/python-modules/texsoup { };
text2digits = callPackage ../development/python-modules/text2digits { };
textblob = callPackage ../development/python-modules/textblob { };
textfsm = callPackage ../development/python-modules/textfsm { };
@@ -18116,6 +18126,8 @@ self: super: with self; {
urlmatch = callPackage ../development/python-modules/urlmatch { };
urlobject = callPackage ../development/python-modules/urlobject { };
urlpy = callPackage ../development/python-modules/urlpy { };
urwid = callPackage ../development/python-modules/urwid { };
@@ -18612,6 +18624,8 @@ self: super: with self; {
wordfreq = callPackage ../development/python-modules/wordfreq { };
wordninja = callPackage ../development/python-modules/wordninja { };
world-bank-data = callPackage ../development/python-modules/world-bank-data { };
worldengine = callPackage ../development/python-modules/worldengine { };