Merge master into staging-next
This commit is contained in:
@@ -392,6 +392,9 @@
|
||||
- `forgejo` and `forgejo-lts` have been updated to v11.
|
||||
See upstreams [release blog post](https://forgejo.org/2025-04-release-v11-0/) for more information.
|
||||
|
||||
- `unifi` has been updated to v9.1.
|
||||
This version should be backward compatible with v8.x, however as a result, `unifi8` package has been removed.
|
||||
|
||||
- The behavior of `services.hostapd.radios.<name>.networks.<name>.authentication.enableRecommendedPairwiseCiphers` was changed to not include `CCMP-256` anymore.
|
||||
Since all configured pairwise ciphers have to be supported by the radio, this caused startup failures on many devices which is hard to debug in hostapd.
|
||||
|
||||
|
||||
@@ -47,9 +47,7 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" {
|
||||
default = "unifi8";
|
||||
};
|
||||
services.unifi.unifiPackage = lib.mkPackageOption pkgs "unifi" { };
|
||||
|
||||
services.unifi.mongodbPackage = lib.mkPackageOption pkgs "mongodb" {
|
||||
default = "mongodb-7_0";
|
||||
@@ -116,7 +114,7 @@ in
|
||||
only supports migrating one major version at a time; therefore, you
|
||||
may wish to set `services.unifi.mongodbPackage = pkgs.mongodb-6_0;`
|
||||
and activate your configuration before upgrading again to the default
|
||||
`mongodb-7_0` supported by `unifi8`.
|
||||
`mongodb-7_0` supported by `unifi`.
|
||||
|
||||
For more information, see the MongoDB upgrade notes:
|
||||
<https://www.mongodb.com/docs/manual/release-notes/7.0-upgrade-standalone/#upgrade-recommendations-and-checklists>
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
pkgs,
|
||||
}:
|
||||
let
|
||||
version = "0.0.23";
|
||||
version = "0.0.23-unstable-2025-05-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yetone";
|
||||
repo = "avante.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Ud4NkJH7hze5796KjVe5Nj9DzxwQkDQErCJDDiBzAIY=";
|
||||
rev = "adae032f5fbc611d59545792d3c5bb1c9ddc3fdb";
|
||||
hash = "sha256-v99yu5LvwdmHBcH61L6JIqjQkZR8Lm2fR/uzQZNPo38=";
|
||||
};
|
||||
avante-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "avante-nvim-lib";
|
||||
@@ -73,6 +73,7 @@ vimUtils.buildVimPlugin {
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
attrPath = "vimPlugins.avante-nvim.avante-nvim-lib";
|
||||
};
|
||||
|
||||
@@ -84,6 +85,10 @@ vimUtils.buildVimPlugin {
|
||||
# Requires setup with corresponding provider
|
||||
"avante.providers.azure"
|
||||
"avante.providers.copilot"
|
||||
"avante.providers.gemini"
|
||||
"avante.providers.ollama"
|
||||
"avante.providers.vertex"
|
||||
"avante.providers.vertex_claude"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "puae";
|
||||
version = "0-unstable-2025-04-22";
|
||||
version = "0-unstable-2025-05-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-uae";
|
||||
rev = "7dd724eaa48f05f02d9d2f1bfa131c34b6ab5351";
|
||||
hash = "sha256-i046+gZa8u/nmGGlF/uA2Lz5VZJTgwXz9aK2C/2l470=";
|
||||
rev = "d3c925ef4fadee6c25bcef20d1f165141ba18ac3";
|
||||
hash = "sha256-Wo58+4XSxEVtlKsHmW90Qhm+kdUHmDvN3d2gASNiIrw=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
gitSupport ? false,
|
||||
git,
|
||||
docutilsSupport ? false,
|
||||
python,
|
||||
python3,
|
||||
docutils,
|
||||
monotoneSupport ? false,
|
||||
monotone,
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
CryptSSLeay
|
||||
])
|
||||
++ lib.optionals docutilsSupport [
|
||||
(python.withPackages (pp: with pp; [ pygments ]))
|
||||
(python3.withPackages (pp: with pp; [ pygments ]))
|
||||
docutils
|
||||
]
|
||||
++ lib.optionals gitSupport [ git ]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
python3,
|
||||
makeWrapper,
|
||||
eigen_3_4_0,
|
||||
fftw,
|
||||
@@ -20,7 +20,7 @@
|
||||
withGui ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "mrtrix";
|
||||
version = "3.0.4-unstable-2025-04-09";
|
||||
|
||||
@@ -35,14 +35,14 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
less
|
||||
python
|
||||
python3
|
||||
] ++ lib.optional withGui qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
ants
|
||||
eigen_3_4_0
|
||||
python
|
||||
python3
|
||||
fftw
|
||||
libtiff
|
||||
libpng
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
pkgs,
|
||||
lib,
|
||||
glibcLocales,
|
||||
python,
|
||||
python3,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
# Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; };
|
||||
@@ -13,13 +13,13 @@ let
|
||||
|
||||
# { <name> = { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } }
|
||||
allPlugins = lib.mapAttrs (name: value: value // { inherit name; }) (
|
||||
import ./plugins.nix { inherit pkgs python; }
|
||||
import ./plugins.nix { inherit pkgs python3; }
|
||||
);
|
||||
|
||||
# [ { name = "..."; propagatedBuildInputs = [ ... ]; buildInputs = [ ... ]; } ]
|
||||
selectedPlugins = plugins allPlugins;
|
||||
in
|
||||
python.pkgs.buildPythonPackage {
|
||||
python3.pkgs.buildPythonPackage {
|
||||
pname = "bumblebee-status";
|
||||
inherit version;
|
||||
|
||||
@@ -42,7 +42,7 @@ python.pkgs.buildPythonPackage {
|
||||
buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins;
|
||||
propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins;
|
||||
|
||||
checkInputs = with python.pkgs; [
|
||||
checkInputs = with python3.pkgs; [
|
||||
freezegun
|
||||
netifaces
|
||||
psutil
|
||||
@@ -60,7 +60,7 @@ python.pkgs.buildPythonPackage {
|
||||
# FIXME: We skip the `dunst` module tests, some of which fail with
|
||||
# `RuntimeError: killall -s SIGUSR2 dunst not found`.
|
||||
# This is not solved by adding `pkgs.killall` to `checkInputs`.
|
||||
${python.interpreter} -m pytest -k 'not test_dunst.py'
|
||||
${python3.interpreter} -m pytest -k 'not test_dunst.py'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
@@ -70,7 +70,7 @@ python.pkgs.buildPythonPackage {
|
||||
find $out -name "__pycache__" -type d | xargs rm -rv
|
||||
|
||||
# Make themes available for bumblebee-status to detect them
|
||||
cp -r ./themes $out/${python.sitePackages}
|
||||
cp -r ./themes $out/${python3.sitePackages}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -23,13 +23,13 @@ let
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.30.3";
|
||||
version = "2.31.0";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-l42h6mGqcb7Wy1ryXM0gxnt2fUUDr8+4nc9qIG0nDgc=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-3oxBu0SAbWNgHZxirmKXm0Mk/uRZRPX/qCfYvkANTfM=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-hlktdQCGMtTIbd2j9x0aHKCIoIAydDj/caKaIWJfJTI=" "zip";
|
||||
aarch64-darwin =
|
||||
fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4="
|
||||
fetch "apple_universal" "sha256-PahPWQ4HpaOvEC1zda8X1Bft+8l/0qGWSJUEcfuWlxg="
|
||||
"pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
|
||||
@@ -12,20 +12,20 @@
|
||||
}:
|
||||
let
|
||||
pname = "anubis";
|
||||
version = "1.17.1";
|
||||
version = "1.18.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TecharoHQ";
|
||||
repo = "anubis";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8b2rVVuxhsY0+5IZvzMm7ki3HGbJAnUUoAqpD1PuqZ4=";
|
||||
hash = "sha256-grtzkNxgShbldjm+lnANbKVhkUrbwseAT1NaBL85mHg=";
|
||||
};
|
||||
|
||||
anubisXess = buildNpmPackage {
|
||||
inherit version src;
|
||||
pname = "${pname}-xess";
|
||||
|
||||
npmDepsHash = "sha256-jiLrqn0jenug2ff/mqhOIfc7f+CsQja5g2K9n+W1kVM=";
|
||||
npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
@@ -44,7 +44,7 @@ in
|
||||
buildGoModule (finalAttrs: {
|
||||
inherit pname version src;
|
||||
|
||||
vendorHash = "sha256-v9GsTUzBYfjh6/ETBbFpN5dqMzMaOz8w39Xz1omaPJE=";
|
||||
vendorHash = "sha256-EOT/sdVINj9oO1jZHPYB3jQ+XApf9eCUKuMY0tV+vpg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
esbuild
|
||||
|
||||
@@ -10,15 +10,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-bolero";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-X8C4bNGjJx1VxE5X7ntIsbpMPKHVLU1HSQb7vRdivdg=";
|
||||
hash = "sha256-xU7a5xEFSrFsQ1K5DIYgACuf+34QeCvGmWvlSSwI03I=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-z1JxoJ4D9GRDsD08kn0WZgaqgTmdL57MgwQ+vFghIpY=";
|
||||
cargoHash = "sha256-FMpM42D3h42NfDzH+EVs6NB2RVehFNFAYTMvzRQVt/s=";
|
||||
|
||||
buildInputs = [
|
||||
libbfd
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dap";
|
||||
version = "3.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/dap";
|
||||
description = "Small statistics and graphics package based on C";
|
||||
longDescription = ''
|
||||
Dap is a small statistics and graphics package based on C. Version 3.0 and
|
||||
later of Dap can read SBS programs (based on the utterly famous, industry
|
||||
standard statistics system with similar initials - you know the one I
|
||||
mean)! The user wishing to perform basic statistical analyses is now freed
|
||||
from learning and using C syntax for straightforward tasks, while
|
||||
retaining access to the C-style graphics and statistics features provided
|
||||
by the original implementation. Dap provides core methods of data
|
||||
management, analysis, and graphics that are commonly used in statistical
|
||||
consulting practice (univariate statistics, correlations and regression,
|
||||
ANOVA, categorical data analysis, logistic regression, and nonparametric
|
||||
analyses).
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "factoriolab";
|
||||
version = "3.13.3";
|
||||
version = "3.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "factoriolab";
|
||||
repo = "factoriolab";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HYf6G06dK3wvCOLnKx1aDteQ0SxBDE+yulGJa9VZE9Q=";
|
||||
hash = "sha256-Ml0fJPHIjtqeVmlFKKMteZx1c3Jq1BdEWA0vhxGFR70=";
|
||||
};
|
||||
buildInputs = [ vips ];
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
cairo,
|
||||
cmake,
|
||||
opencv,
|
||||
pcre,
|
||||
pkg-config,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
cudaPackages,
|
||||
@@ -31,7 +30,6 @@ stdenv.mkDerivation rec {
|
||||
[
|
||||
cairo
|
||||
opencv
|
||||
pcre
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ghostfolio";
|
||||
version = "2.156.0";
|
||||
version = "2.161.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-UD44PzJPCzxSocC/znCpiMTwbwivvJawORxRBNXbCA8=";
|
||||
hash = "sha256-fN901bpiFz1sAEBv9MKzpgfr7TFa6s3ghT9v44bXZzM=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-ot+shh2fuZHY0hVRFZpHs1qRN6OaLZlsCuG1RuuTkEc=";
|
||||
npmDepsHash = "sha256-vaIQ6SdsBGfiIkvz+dE9wR/KToobFyWaZOuFHPgLk94=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma
|
||||
|
||||
@@ -17,17 +17,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.8.2";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xbMbCxgwH3Ea3SBKZXzCIEv+AX7OQJmIqAx9PZkmkHo=";
|
||||
hash = "sha256-Uec8DnT6tZcHYchDJr5F0t5kkEjKPOKPkdbr4Rtm51c=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-Vqhdc+WZC8IACEzox5c4PsOvYwQ2WFL3lDM+hB1foE0=";
|
||||
vendorHash = "sha256-b0byafxHXnrYg2dQ0hoNvo0+jmCOJ4/hVMV8J7g7MBc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
fixup-yarn-lock
|
||||
|
||||
@@ -111,6 +111,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ jnsgruk ];
|
||||
platforms = lib.platforms.all;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "jp-zip-code";
|
||||
version = "0-unstable-2025-04-01";
|
||||
version = "0-unstable-2025-05-01";
|
||||
|
||||
# This package uses a mirror as the source because the
|
||||
# original provider uses the same URL for updated content.
|
||||
src = fetchFromGitHub {
|
||||
owner = "musjj";
|
||||
repo = "jp-zip-codes";
|
||||
rev = "b8a350701688cfa61cb2994937cd84e612e0abf3";
|
||||
hash = "sha256-+YE0EINrhRhdqkJyPzXlBPp18TGECaGddVrBlQITYi8=";
|
||||
rev = "3c1c1db248113ad37fac18ede96b5936866a9726";
|
||||
hash = "sha256-BAS7Iqzoxbt77uRh99n0rUC+0+OVgkB7OEIEgZMoDAk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "kreative-square-fonts";
|
||||
version = "unstable-2021-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kreativekorp";
|
||||
repo = "open-relay";
|
||||
rev = "084f05af3602307499981651eca56851bec01fca";
|
||||
hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf
|
||||
install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters";
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/ksquare.shtml";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.linus ];
|
||||
};
|
||||
}
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kuzu";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuzudb";
|
||||
repo = "kuzu";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3B2E51PluPKl0OucmTPZYEa9BzYoU0Y8G1PQY86ynFA=";
|
||||
hash = "sha256-mc9MLIdlxMTQjvpKAa2N8AlhWJDzydd70x/YU6xX6h0=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -12,7 +12,11 @@
|
||||
stdenv.hostPlatform == stdenv.buildPlatform && lib.meta.availableOn stdenv.hostPlatform perl,
|
||||
perl,
|
||||
withPython ?
|
||||
!stdenv.hostPlatform.isStatic && lib.meta.availableOn stdenv.hostPlatform python3Packages.python,
|
||||
# static can't load python libraries
|
||||
!stdenv.hostPlatform.isStatic
|
||||
&& lib.meta.availableOn stdenv.hostPlatform python3Packages.python
|
||||
# m4 python include script fails if cpu bit depth is different across machines
|
||||
&& stdenv.hostPlatform.parsed.cpu.bits == stdenv.buildPlatform.parsed.cpu.bits,
|
||||
python3Packages,
|
||||
swig,
|
||||
ncurses,
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
validatePkgConfig,
|
||||
gfortran,
|
||||
mpi,
|
||||
cmake,
|
||||
ninja,
|
||||
libspatialindex,
|
||||
mpiCheckPhaseHook,
|
||||
testers,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsupermesh";
|
||||
version = "2025.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firedrakeproject";
|
||||
repo = "libsupermesh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RKBi89bUhkbRATaSB8629D+/NeYE3YNDIMEGzSK8z04=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
mpi
|
||||
gfortran
|
||||
cmake
|
||||
ninja
|
||||
validatePkgConfig
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libspatialindex
|
||||
gfortran.cc.lib
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeCheckInputs = [ mpiCheckPhaseHook ];
|
||||
|
||||
# On aarch64-darwin platform, the test program segfault at the line
|
||||
# https://github.com/firedrakeproject/libsupermesh/blob/09af7c9a3beefc715fbdc23e46fdc96da8169ff6/src/tests/test_parallel_p1_inner_product_2d.F90#L164
|
||||
# in defining the lambda subroutine pack_data_b with variable field_b.
|
||||
# This error is test source and compiler related and does not indicate broken functionality of libsupermesh.
|
||||
doCheck = !(stdenv.hostPlatform.system == "aarch64-darwin");
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
pkg-config = testers.hasPkgConfigModules {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/firedrakeproject/libsupermesh";
|
||||
description = "Parallel supermeshing library";
|
||||
changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.lgpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ qbisi ];
|
||||
pkgConfigModules = [ "libsupermesh" ];
|
||||
};
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mihomo";
|
||||
version = "1.19.5";
|
||||
version = "1.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "mihomo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eINcvVnWMDbviqNpD+SmtDYVQjLZgjaAdX9NrRAf0Ww=";
|
||||
hash = "sha256-eVqV7Dt6V4fAT0yGF8D7niZevMmX6WggSpA5J+LU7jY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xGaJ9iAP6Q8L6oC6LqEwi69Bd7H+bjSykGXckkZL92k=";
|
||||
vendorHash = "sha256-8LATtCrQs7rDiEWKep9xPlzKw413DpS1FGJsLiWriIQ=";
|
||||
|
||||
excludedPackages = [ "./test" ];
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
pkg-config,
|
||||
vulkan-headers,
|
||||
SDL2_classic,
|
||||
SDL2_ttf,
|
||||
SDL2_classic_ttf,
|
||||
ffmpeg,
|
||||
libopus,
|
||||
libplacebo,
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs =
|
||||
[
|
||||
(SDL2_classic.override { drmSupport = stdenv.hostPlatform.isLinux; })
|
||||
SDL2_ttf
|
||||
SDL2_classic_ttf
|
||||
ffmpeg
|
||||
libopus
|
||||
libplacebo
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
php83.buildComposerProject2 (finalAttrs: {
|
||||
pname = "n98-magerun2";
|
||||
version = "8.0.0";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netz98";
|
||||
repo = "n98-magerun2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MzJJkbT3AgSX+lLEfKlfg0zTY/79CcFelOK83NnSWI0=";
|
||||
hash = "sha256-GnyIYgVNPumX+GLgPotSzD6BcUiUTlsfYFwFMX94hEk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-4w4HqYSSeVZnsgMGt+m8XN98RuAv7XmVo1vHtEXA0Uk=";
|
||||
vendorHash = "sha256-kF8VXE0K/Gzho5K40H94hXtgSS2rogCtMow2ET8PinU=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
@@ -17,26 +17,25 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ninja";
|
||||
version = lib.removePrefix "v" finalAttrs.src.rev;
|
||||
|
||||
src =
|
||||
version =
|
||||
{
|
||||
# TODO: Remove Ninja 1.11 as soon as possible.
|
||||
"1.11" = fetchFromGitHub {
|
||||
owner = "ninja-build";
|
||||
repo = "ninja";
|
||||
rev = "v1.11.1";
|
||||
hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
|
||||
};
|
||||
|
||||
latest = fetchFromGitHub {
|
||||
owner = "ninja-build";
|
||||
repo = "ninja";
|
||||
rev = "v1.12.1";
|
||||
hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
|
||||
};
|
||||
"1.11" = "1.11.1";
|
||||
latest = "1.12.1";
|
||||
}
|
||||
.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
|
||||
.${ninjaRelease};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ninja-build";
|
||||
repo = "ninja";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash =
|
||||
{
|
||||
# TODO: Remove Ninja 1.11 as soon as possible.
|
||||
"1.11" = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
|
||||
latest = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
|
||||
}
|
||||
.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "noah";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-noah";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0bivfsgb56kndz61lzjgdcnqlhjikqw89ma0h6f6radyvfzy0vis";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bash on Ubuntu on macOS";
|
||||
homepage = "https://github.com/linux-noah/noah";
|
||||
license = [
|
||||
licenses.mit
|
||||
licenses.gpl2Only
|
||||
];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.darwin;
|
||||
# never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "omping";
|
||||
version = "0.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "omping";
|
||||
rev = version;
|
||||
sha256 = "1f0vsbnhxp7bbgdnfqshryx3nhz2sqdnxdj068s0nmzsh53ckbf7";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This can go in 0.0.6+
|
||||
(fetchpatch {
|
||||
url = "https://github.com/troglobit/omping/commit/08a31ec1a6eb4e8f88c301ef679c3b6f9893f333.patch";
|
||||
sha256 = "1xafyvd46bq53w2zvjw8bdw7vjqbrcrr21cyh6d0zfcn4gif1k0f";
|
||||
name = "fix_manpage_install.patch";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
inherit (src.meta) homepage;
|
||||
mainProgram = "omping";
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "pgf";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgf-tikz";
|
||||
repo = "pgf";
|
||||
tag = "version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
|
||||
hash = "sha256-WZ/191iEDd5VK1bnV9JZx2BZfACUeAUhAqrlyx+ZvA4=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/texmf-nix
|
||||
cp -prd context doc generic latex plain $out/share/texmf-nix/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pgf-tikz/pgf";
|
||||
description = "Portable Graphic Format for TeX - version ${finalAttrs.version}";
|
||||
branch = lib.versions.major version;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -1,35 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
glib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psstop";
|
||||
version = "1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clearlinux";
|
||||
repo = "psstop";
|
||||
rev = "v${version}";
|
||||
sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [ glib ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/clearlinux/psstop";
|
||||
description = "Show processes' memory usage by looking into pss"; # upstream summary
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
mainProgram = "psstop";
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/src/tw.c b/src/tw.c
|
||||
index 602f7b3..ca601cd 100644
|
||||
--- a/src/tw.c
|
||||
+++ b/src/tw.c
|
||||
@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts)
|
||||
|
||||
free(cmd);
|
||||
|
||||
- if (o && is_error(o))
|
||||
+ if (!o)
|
||||
return NULL;
|
||||
|
||||
return o;
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
gtk3,
|
||||
json_c,
|
||||
taskwarrior2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ptask";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wpitchoune.net/ptask/files/ptask-${version}.tar.gz";
|
||||
sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
json_c
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [
|
||||
./tw-version.patch
|
||||
./json_c_is_error.patch
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/ptask" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix PATH : "${taskwarrior2}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://wpitchoune.net/ptask/";
|
||||
description = "GTK-based GUI for taskwarrior";
|
||||
mainProgram = "ptask";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.spacefrogg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/src/tw.c 2017-02-21 22:56:19.289037608 +0100
|
||||
+++ b/src/tw.c 2017-02-21 22:57:04.726814256 +0100
|
||||
@@ -116,7 +116,7 @@
|
||||
|| !strcmp(ver, "2.3.0")
|
||||
|| !strcmp(ver, "2.4.0")
|
||||
|| !strcmp(ver, "2.4.1")
|
||||
- || !strcmp(ver, "2.5.0"))
|
||||
+ || !strcmp(ver, "2.5.1"))
|
||||
return 1;
|
||||
else
|
||||
return 0;
|
||||
@@ -1,44 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
makeWrapper,
|
||||
fetchzip,
|
||||
python3,
|
||||
python3Packages,
|
||||
}:
|
||||
let
|
||||
threaded_servers = python3Packages.buildPythonPackage {
|
||||
name = "threaded_servers";
|
||||
src = fetchzip {
|
||||
url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz";
|
||||
sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf";
|
||||
};
|
||||
|
||||
# stuff we don't care about pacserve
|
||||
doCheck = false;
|
||||
};
|
||||
wrappedPython = python3.withPackages (_: [ threaded_servers ]);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "quickserve";
|
||||
version = "2018";
|
||||
|
||||
dontUnpack = true;
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${wrappedPython}/bin/python $out/bin/quickserve \
|
||||
--add-flags -mThreadedServers.PeeredQuickserve
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple HTTP server for quickly sharing files";
|
||||
homepage = "https://xyne.archlinux.ca/projects/quickserve/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ lassulus ];
|
||||
mainProgram = "quickserve";
|
||||
};
|
||||
}
|
||||
@@ -20,13 +20,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rebuilderd";
|
||||
version = "0.22.1";
|
||||
version = "0.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kpcyrd";
|
||||
repo = "rebuilderd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YMBq+Z9yMQRXOM3U679g2lnBZlH/h0VLjoxySxi4SCo=";
|
||||
hash = "sha256-ARm81++VByh/erog1aDQTOaxd60M9OuTbJGdgHx24pw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-MjFQ5d9VWHodjj+hIsKgAIUdaiarXIi5GCS+47n5MGU=";
|
||||
cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sqlite3-to-mysql";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python3Packages.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "techouse";
|
||||
repo = "sqlite3-to-mysql";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-2zylVnPlptPCxUFwU9j9g//T5fzPJgXc3hQc6iMoLLE=";
|
||||
hash = "sha256-1XYDCHR1GitMr6wgpj+roCzf5q4tMr6eGLMWzZgzpBY=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vqeDzLImp0c9qPC8oNmjoTFLMCUJzJGHznALCbKdzWc=";
|
||||
hash = "sha256-FTXwDwdXeXAa6Nk73WPPrxyrXvQ8Yg9tqtdkeekK4x8=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3mXQ1InZGCsCCz1mVNSOE4tvA/qMW7eWZzES8yzriFQ=";
|
||||
npmDepsHash = "sha256-uwohbVV6zNdLmLgSihJsqRxm5ZR8P8mHeZdbCYjA78w=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "tinfoil-cli";
|
||||
version = "0.0.11";
|
||||
version = "0.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinfoilsh";
|
||||
repo = "tinfoil-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zHtF6tKptru3OFU5w93pT9B+mbVxqFB++OMleHk7Q5Q=";
|
||||
hash = "sha256-/VjhInen6f+PYQENhGZ31q51r5J/lyG4rzXI3ZEPUAg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EN6IYOSYuSlKpQKcdKvPjFa9A51uwqSzHNuwlrzYsfI=";
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib, buildDotnetGlobalTool }:
|
||||
buildDotnetGlobalTool {
|
||||
pname = "upgrade-assistant";
|
||||
version = "0.5.829";
|
||||
version = "0.5.1073";
|
||||
|
||||
nugetHash = "sha256-N0xEmPQ88jfirGPLJykeAJQYGwELFzKwUWdFxIgiwhY=";
|
||||
nugetHash = "sha256-kk3SIv1gp9xtof0MkGkNUiqGuXgy1+YMGxLFZPFsw+0=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/dotnet/upgrade-assistant";
|
||||
|
||||
@@ -213,7 +213,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
800+ image files are tested. 90%+ distros in DistroWatch supported.
|
||||
'';
|
||||
changelog = "https://www.ventoy.net/doc_news.html";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
knownVulnerabilities = [
|
||||
''
|
||||
Ventoy uses binary blobs which can't be trusted to be free of malware or compliant to their licenses.
|
||||
https://github.com/NixOS/nixpkgs/issues/404663
|
||||
See the following Issues for context:
|
||||
https://github.com/ventoy/Ventoy/issues/2795
|
||||
https://github.com/ventoy/Ventoy/issues/3224
|
||||
''
|
||||
];
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "ventoy";
|
||||
maintainers = with lib.maintainers; [
|
||||
johnrtitor
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchurl,
|
||||
SDL,
|
||||
SDL_ttf,
|
||||
alsa-lib,
|
||||
jack2,
|
||||
libmpg123,
|
||||
ffmpeg,
|
||||
@@ -38,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL
|
||||
SDL_ttf
|
||||
|
||||
alsa-lib
|
||||
|
||||
# audio server
|
||||
jack2
|
||||
|
||||
@@ -55,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--enable-jack"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "-h";
|
||||
doInstallCheck = true;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "bypass.yazi";
|
||||
version = "0-unstable-2025-04-09";
|
||||
version = "25.3.2-unstable-2025-04-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Rolv-Apneseth";
|
||||
repo = "bypass.yazi";
|
||||
rev = "2ab6d84e8165985dd4d63ef0098e3a30feb3a41a";
|
||||
hash = "sha256-6LiBUvHmN8q/ao1+QhCg75ypuf1i6MyRQiU16Lb8pEs=";
|
||||
rev = "17e86529b2aa8ea7c08e117debf7c55044f9edb4";
|
||||
hash = "sha256-Q5g23sCGx9Ecm350ZiGKA1OaRieECWtF1xe22WzTtdY=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Execute chmod on the selected files to change their mode";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -50,6 +50,11 @@ let
|
||||
meta = meta // {
|
||||
description = meta.description or "";
|
||||
platforms = meta.platforms or lib.platforms.all;
|
||||
homepage =
|
||||
if (src ? owner && src.owner == "yazi-rs") then
|
||||
"https://github.com/yazi-rs/plugins/tree/main/${pname}"
|
||||
else
|
||||
meta.homepage or null;
|
||||
};
|
||||
passthru = (args.passthru or { }) // {
|
||||
updateScript = {
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Add a full border to Yazi to make it look fancier";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Show the status of Git file changes as linemode in the file list";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Switch the preview pane between hidden and shown";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with lsar";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with mactag";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
platforms = lib.platforms.darwin;
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "mediainfo.yazi";
|
||||
version = "25.2.7-unstable-2025-04-05";
|
||||
version = "25.2.7-unstable-2025-04-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "mediainfo.yazi";
|
||||
rev = "436cb5f04d6e5e86ddc0386527254d87b7751ec8";
|
||||
hash = "sha256-oFp8mJ62FsJX46mKQ7/o6qXPC9qx3+oSfqS0cKUZETI=";
|
||||
rev = "9629b1e85c3757c834ec83fb7d931982c55f4c3f";
|
||||
hash = "sha256-EDEIiZJy/RfXVaLNsKDeklH4qY2h+js2m0y6VSAjPkk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with mime-ext";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with mount";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with no-status";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Pipe any shell command as a previewer";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with smart-enter";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with smart-filter";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "smart-paste.yazi";
|
||||
version = "0-unstable-2025-04-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "864a0210d9ba1e8eb925160c2e2a25342031d8d3";
|
||||
hash = "sha256-m3709h7/AHJAtoJ3ebDA40c77D+5dCycpecprjVqj/k=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with smart-filter";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
}
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with toggle-pane";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -49,10 +49,25 @@ def get_github_headers() -> Dict[str, str]:
|
||||
return headers
|
||||
|
||||
|
||||
def get_default_branch(owner: str, repo: str, headers: Dict[str, str]) -> str:
|
||||
"""Get the default branch name for a GitHub repository"""
|
||||
api_url = f"https://api.github.com/repos/{owner}/{repo}"
|
||||
|
||||
try:
|
||||
response = requests.get(api_url, headers=headers)
|
||||
response.raise_for_status()
|
||||
repo_data = response.json()
|
||||
return repo_data["default_branch"]
|
||||
except requests.RequestException as e:
|
||||
print(f"Error fetching repository data: {e}")
|
||||
print("Falling back to 'main' as default branch")
|
||||
return "main"
|
||||
|
||||
def fetch_plugin_content(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> str:
|
||||
"""Fetch the plugin's main.lua content from GitHub"""
|
||||
default_branch = get_default_branch(owner, repo, headers)
|
||||
plugin_path = f"{plugin_pname}/" if owner == "yazi-rs" else ""
|
||||
main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/main/{plugin_path}main.lua"
|
||||
main_lua_url = f"https://raw.githubusercontent.com/{owner}/{repo}/{default_branch}/{plugin_path}main.lua"
|
||||
|
||||
try:
|
||||
response = requests.get(main_lua_url, headers=headers)
|
||||
@@ -81,12 +96,14 @@ def check_version_compatibility(plugin_content: str, plugin_name: str, yazi_vers
|
||||
|
||||
def get_latest_commit(owner: str, repo: str, plugin_pname: str, headers: Dict[str, str]) -> Tuple[str, str]:
|
||||
"""Get the latest commit hash and date for the plugin"""
|
||||
default_branch = get_default_branch(owner, repo, headers)
|
||||
|
||||
if owner == "yazi-rs":
|
||||
# For official plugins, get commit info for the specific plugin file
|
||||
api_url = f"https://api.github.com/repos/{owner}/{repo}/commits?path={plugin_pname}/main.lua&per_page=1"
|
||||
else:
|
||||
# For third-party plugins, get latest commit on main branch
|
||||
api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/main"
|
||||
# For third-party plugins, get latest commit on default branch
|
||||
api_url = f"https://api.github.com/repos/{owner}/{repo}/commits/{default_branch}"
|
||||
|
||||
try:
|
||||
response = requests.get(api_url, headers=headers)
|
||||
|
||||
@@ -16,7 +16,6 @@ mkYaziPlugin {
|
||||
|
||||
meta = {
|
||||
description = "Previewing archive contents with vcs-files";
|
||||
homepage = "https://yazi-rs.github.io";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ khaneliman ];
|
||||
};
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
python,
|
||||
python3,
|
||||
withGodef ? true,
|
||||
godef,
|
||||
withGopls ? true,
|
||||
@@ -22,7 +22,7 @@
|
||||
stdenv.mkDerivation {
|
||||
pname = "ycmd";
|
||||
version = "unstable-2023-11-06";
|
||||
disabled = !python.isPy3k;
|
||||
disabled = !python3.isPy3k;
|
||||
|
||||
# required for third_party directory creation
|
||||
src = fetchFromGitHub {
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
|
||||
ninja
|
||||
] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
|
||||
buildInputs =
|
||||
with python.pkgs;
|
||||
with python3.pkgs;
|
||||
with llvmPackages;
|
||||
[
|
||||
abseil-cpp
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildPhase = ''
|
||||
export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true"
|
||||
${python.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
|
||||
${python3.pythonOnBuildForHost.interpreter} build.py --system-libclang --clang-completer --ninja
|
||||
'';
|
||||
|
||||
dontConfigure = true;
|
||||
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
|
||||
find third_party -type d -name "test" -exec rm -rf {} +
|
||||
|
||||
chmod +x ycmd/__main__.py
|
||||
sed -i "1i #!${python.interpreter}\
|
||||
sed -i "1i #!${python3.interpreter}\
|
||||
" ycmd/__main__.py
|
||||
|
||||
mkdir -p $out/lib/ycmd
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
let
|
||||
mkOpenRelayTypeface =
|
||||
name:
|
||||
{ directory, meta }:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "open-relay-${name}";
|
||||
version = "2025-03-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kreativekorp";
|
||||
repo = "open-relay";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-OQpZHPbNL3rxXH89lwtHvm7eENl8fS0M0i8IBn4m2hI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m444 -t "$out/share/fonts/truetype" "${directory}/*.ttf"
|
||||
install -D -m644 -t "$out/share/doc/${finalAttrs.pname}-${finalAttrs.version}" "${directory}/OFL.txt"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/index.shtml";
|
||||
description = "Free and open source fonts from Kreative Software";
|
||||
license = lib.licenses.ofl;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
linus
|
||||
toastal
|
||||
];
|
||||
} // meta;
|
||||
});
|
||||
in
|
||||
lib.mapAttrs mkOpenRelayTypeface {
|
||||
constructium = {
|
||||
directory = "Constructium";
|
||||
meta = {
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/constructium/";
|
||||
description = "fork of SIL Gentium designed specifically to support constructed scripts as encoded in the Under-ConScript Unicode Registry";
|
||||
longDescription = ''
|
||||
Constructium is a fork of SIL Gentium designed specifically to support
|
||||
constructed scripts as encoded in the Under-ConScript Unicode Registry.
|
||||
It is ideal for mixed Latin, Greek, Cyrillic, IPA, and conlang text in
|
||||
web sites and documents.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
fairfax = {
|
||||
directory = "Fairfax";
|
||||
meta = {
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/fairfax/";
|
||||
description = "6×12 bitmap font supporting many Unicode blocks & scripts as well as constructed scripts";
|
||||
longDescription = ''
|
||||
Fairfax is a 6×12 bitmap font for terminals, text editors, IDEs, etc. It
|
||||
supports many scripts and a large number of Unicode blocks as well as
|
||||
constructed scripts as encoded in the Under-ConScript Unicode Registry,
|
||||
pseudographics and semigraphics, and tons of private use characters. It
|
||||
has been superceded by Fairfax HD but is still maintained.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
fairfax-hd = {
|
||||
directory = "FairfaxHD";
|
||||
meta = {
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/fairfaxhd/";
|
||||
description = "halfwidth scalable monospace font supporting many Unicode blocks & script as well as constructed scripts";
|
||||
longDescription = ''
|
||||
Fairfax HD is a halfwidth scalable monospace font for terminals, text
|
||||
editors, IDEs, etc. It supports many scripts and a large number of
|
||||
Unicode blocks as well as constructed scripts as encoded in the
|
||||
Under-ConScript Unicode Registry, pseudographics and semigraphics, and
|
||||
tons of private use characters.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
kreative-square = {
|
||||
directory = "KreativeSquare";
|
||||
meta = {
|
||||
homepage = "https://www.kreativekorp.com/software/fonts/ksquare/";
|
||||
description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dde-api-proxy";
|
||||
version = "1.0.16";
|
||||
version = "1.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "dde-api-proxy";
|
||||
rev = version;
|
||||
hash = "sha256-kWodNftOPLIiQNPHAIC9p3VHFAis8FAI7vLJTqahAtU=";
|
||||
hash = "sha256-QE31BOh2LFlY6te+2+nSHGbhLsikSX8V7xSvcLzCWRA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
cmake
|
||||
pkg-config
|
||||
libsForQt5.wrapQtAppsHook
|
||||
libsForQt5.polkit-qt
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
pcre,
|
||||
qtbase,
|
||||
glib,
|
||||
perl,
|
||||
@@ -46,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
qtbase
|
||||
glib
|
||||
pcre
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
let
|
||||
pname = "ex_doc";
|
||||
version = "0.37.3";
|
||||
version = "0.38.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "elixir-lang";
|
||||
repo = "${pname}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2tam+3vYLC216Q78GIUI3fGnE5FJ/lECJAUQMSxz46w=";
|
||||
hash = "sha256-NyRvEN07PBk1ZCXLu/lu+d1SYO8fXyiUEcpFZ8cSEng=";
|
||||
};
|
||||
in
|
||||
mixRelease {
|
||||
@@ -37,7 +37,7 @@ mixRelease {
|
||||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
hash = "sha256-s4b6wuBJPdN0FPn76zbLCHzqJNEZ6E4nOyB1whUM2VY=";
|
||||
hash = "sha256-TknrENa0Nb1Eobd4oTBl6TilPVEsw9+XjPdF3Ntq+DI=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
libpng,
|
||||
boost,
|
||||
guile,
|
||||
python,
|
||||
python3,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python.pkgs.pythonImportsCheckHook
|
||||
python3.pkgs.pythonImportsCheckHook
|
||||
];
|
||||
buildInputs = [
|
||||
eigen_3_4_0
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||
libpng
|
||||
boost
|
||||
guile
|
||||
python
|
||||
python3
|
||||
qtbase
|
||||
];
|
||||
|
||||
@@ -59,11 +59,11 @@ stdenv.mkDerivation {
|
||||
|
||||
substituteInPlace libfive/bind/python/CMakeLists.txt \
|
||||
--replace ' ''${PYTHON_SITE_PACKAGES_DIR}' \
|
||||
" $out/${python.sitePackages}" \
|
||||
" $out/${python3.sitePackages}" \
|
||||
|
||||
substituteInPlace libfive/bind/python/libfive/ffi.py \
|
||||
--replace "os.path.join('libfive', folder)" \
|
||||
"os.path.join('$out/${python.sitePackages}/libfive', folder)" \
|
||||
"os.path.join('$out/${python3.sitePackages}/libfive', folder)" \
|
||||
|
||||
export XDG_CACHE_HOME=$(mktemp -d)/.cache
|
||||
'';
|
||||
@@ -91,14 +91,14 @@ stdenv.mkDerivation {
|
||||
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
|
||||
|
||||
# Create links since libfive looks for the library in a specific path.
|
||||
mkdir -p "$out/${python.sitePackages}/libfive/src"
|
||||
ln -s "$out"/lib/libfive.* "$out/${python.sitePackages}/libfive/src/"
|
||||
mkdir -p "$out/${python.sitePackages}/libfive/stdlib"
|
||||
ln -s "$out"/lib/libfive-stdlib.* "$out/${python.sitePackages}/libfive/stdlib/"
|
||||
mkdir -p "$out/${python3.sitePackages}/libfive/src"
|
||||
ln -s "$out"/lib/libfive.* "$out/${python3.sitePackages}/libfive/src/"
|
||||
mkdir -p "$out/${python3.sitePackages}/libfive/stdlib"
|
||||
ln -s "$out"/lib/libfive-stdlib.* "$out/${python3.sitePackages}/libfive/stdlib/"
|
||||
|
||||
# Create links so Studio can find the bindings.
|
||||
mkdir -p "$out/libfive/bind"
|
||||
ln -s "$out/${python.sitePackages}" "$out/libfive/bind/python"
|
||||
ln -s "$out/${python3.sitePackages}" "$out/libfive/bind/python"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
bison,
|
||||
libxml2,
|
||||
pythonSupport ? stdenv.hostPlatform.hasSharedLibraries,
|
||||
python,
|
||||
python3,
|
||||
libusb1,
|
||||
avahiSupport ? true,
|
||||
avahi,
|
||||
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ lib.optionals pythonSupport (
|
||||
[
|
||||
python
|
||||
python3
|
||||
]
|
||||
++ lib.optional python.isPy3k python.pkgs.setuptools
|
||||
++ lib.optional python3.isPy3k python3.pkgs.setuptools
|
||||
);
|
||||
|
||||
buildInputs =
|
||||
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||
"-DOSX_FRAMEWORK=off"
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
"-DPython_EXECUTABLE=${python.pythonOnBuildForHost.interpreter}"
|
||||
"-DPython_EXECUTABLE=${python3.pythonOnBuildForHost.interpreter}"
|
||||
"-DPYTHON_BINDINGS=on"
|
||||
]
|
||||
++ lib.optionals (!avahiSupport) [
|
||||
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = lib.optionalString pythonSupport ''
|
||||
# Move Python bindings into a separate output.
|
||||
moveToOutput ${python.sitePackages} "$python"
|
||||
moveToOutput ${python3.sitePackages} "$python"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
enablePAM ? stdenv.hostPlatform.isLinux,
|
||||
pam,
|
||||
enablePython ? false,
|
||||
python,
|
||||
python3,
|
||||
}:
|
||||
|
||||
# python binding generates a shared library which are unavailable with musl build
|
||||
@@ -67,14 +67,14 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ setuptools ])) ];
|
||||
] ++ lib.optionals enablePython [ (python3.withPackages (ps: with ps; [ setuptools ])) ];
|
||||
buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ];
|
||||
|
||||
configureFlags =
|
||||
if enablePython then
|
||||
[
|
||||
"--enable-python-bindings=yes"
|
||||
"--with-pythonsitedir=\"${python.sitePackages}\""
|
||||
"--with-pythonsitedir=\"${python3.sitePackages}\""
|
||||
]
|
||||
else
|
||||
# change to `--enable-python-bindings=no` in the future
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
libxml2,
|
||||
findXMLCatalogs,
|
||||
gettext,
|
||||
python,
|
||||
python3,
|
||||
ncurses,
|
||||
libgcrypt,
|
||||
cryptoSupport ? false,
|
||||
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals pythonSupport [
|
||||
libxml2.py
|
||||
python
|
||||
python3
|
||||
ncurses
|
||||
]
|
||||
++ lib.optionals cryptoSupport [
|
||||
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
configureFlags = [
|
||||
(lib.withFeature pythonSupport "python")
|
||||
(lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
|
||||
(lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
|
||||
(lib.withFeature cryptoSupport "crypto")
|
||||
];
|
||||
|
||||
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString pythonSupport ''
|
||||
mkdir -p $py/nix-support
|
||||
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
|
||||
moveToOutput ${python.sitePackages} "$py"
|
||||
moveToOutput ${python3.sitePackages} "$py"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
python3,
|
||||
cmake,
|
||||
ninja,
|
||||
}:
|
||||
|
||||
let
|
||||
pyEnv = python.withPackages (ps: [
|
||||
pyEnv = python3.withPackages (ps: [
|
||||
ps.setuptools
|
||||
ps.tomli
|
||||
ps.pip
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Not in propagatedBuildInputs because only the $py output needs it; $out is
|
||||
# just the library itself (e.g. C/C++ headers).
|
||||
buildInputs = with python.pkgs; [
|
||||
buildInputs = with python3.pkgs; [
|
||||
python
|
||||
build
|
||||
pathspec
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
zlib,
|
||||
libxml2,
|
||||
eigen,
|
||||
python,
|
||||
python3,
|
||||
cairo,
|
||||
pcre,
|
||||
pkg-config,
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
zlib
|
||||
libxml2
|
||||
eigen
|
||||
python
|
||||
python3
|
||||
cairo
|
||||
pcre
|
||||
swig
|
||||
@@ -57,14 +57,14 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlagsArray+=(
|
||||
"-DRUN_SWIG=ON"
|
||||
"-DPYTHON_BINDINGS=ON"
|
||||
"-DPYTHON_INSTDIR=$out/${python.sitePackages}"
|
||||
"-DPYTHON_INSTDIR=$out/${python3.sitePackages}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Setuptools only accepts PEP 440 version strings. The "unstable" identifier
|
||||
# can not be used. Instead we pretend to be the 3.2 beta release.
|
||||
postFixup = ''
|
||||
cat << EOF > $out/${python.sitePackages}/setup.py
|
||||
cat << EOF > $out/${python3.sitePackages}/setup.py
|
||||
from setuptools import setup
|
||||
|
||||
setup(
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchurl,
|
||||
bash,
|
||||
python,
|
||||
python3,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
@@ -27,14 +27,14 @@ stdenv.mkDerivation rec {
|
||||
bash
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [
|
||||
python.pkgs.cython
|
||||
++ lib.optionals (python3 != null && lib.versionAtLeast python3.version "3.10") [
|
||||
python3.pkgs.cython
|
||||
];
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
|
||||
configureFlags = lib.optionals (python3 == null) [ "--disable-python" ];
|
||||
|
||||
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
|
||||
preBuild = lib.optionalString (python3 != null && lib.versionAtLeast python3.version "3.10") ''
|
||||
rm wrappers/python/lhapdf.cpp
|
||||
'';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
python,
|
||||
python3,
|
||||
libxml2,
|
||||
sqlite,
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
pythonEnv = python.withPackages (
|
||||
pythonEnv = python3.withPackages (
|
||||
ps:
|
||||
lib.optional withManual ps.sphinx
|
||||
++ lib.optionals pythonSupport (
|
||||
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Make generated python bindings discoverable in customized python environment
|
||||
passthru = {
|
||||
pythonModule = python;
|
||||
pythonModule = python3;
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
cmake,
|
||||
fetchurl,
|
||||
python,
|
||||
python3,
|
||||
blas,
|
||||
lapack,
|
||||
gfortran,
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
python
|
||||
python3
|
||||
]
|
||||
++
|
||||
lib.optionals (lapackSupport)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
attrs,
|
||||
backoff,
|
||||
beautifulsoup4,
|
||||
cachetools,
|
||||
certifi,
|
||||
cffi,
|
||||
charset-normalizer,
|
||||
@@ -33,8 +34,11 @@
|
||||
fsspec,
|
||||
gitdb,
|
||||
gitpython,
|
||||
google-ai-generativelanguage,
|
||||
google-generativeai,
|
||||
grep-ast,
|
||||
h11,
|
||||
hf-xet,
|
||||
httpcore,
|
||||
httpx,
|
||||
huggingface-hub,
|
||||
@@ -54,6 +58,7 @@
|
||||
networkx,
|
||||
numpy,
|
||||
openai,
|
||||
oslex,
|
||||
packaging,
|
||||
pathspec,
|
||||
pexpect,
|
||||
@@ -78,6 +83,7 @@
|
||||
rich,
|
||||
rpds-py,
|
||||
scipy,
|
||||
shtab,
|
||||
smmap,
|
||||
sniffio,
|
||||
sounddevice,
|
||||
@@ -124,20 +130,20 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
version = "0.82.2";
|
||||
version = "0.83.0";
|
||||
aider-chat = buildPythonPackage {
|
||||
pname = "aider-chat";
|
||||
inherit version;
|
||||
pyproject = true;
|
||||
|
||||
# needs exactly Python 3.12
|
||||
disabled = pythonOlder "3.12" || pythonAtLeast "3.13";
|
||||
# dont support python 3.13 (Aider-AI/aider#3037)
|
||||
disabled = pythonOlder "3.10" || pythonAtLeast "3.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Aider-AI";
|
||||
repo = "aider";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lV0d6/cT/B3zmn8/uEyAc3D0n6oFsLoWa/qYmGv3EiI=";
|
||||
hash = "sha256-hXKrjo/9Y3WLgluwEK2q123QcfBVA0ByEKaq8Rtd70E=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
@@ -153,6 +159,7 @@ let
|
||||
attrs
|
||||
backoff
|
||||
beautifulsoup4
|
||||
cachetools
|
||||
certifi
|
||||
cffi
|
||||
charset-normalizer
|
||||
@@ -167,8 +174,11 @@ let
|
||||
fsspec
|
||||
gitdb
|
||||
gitpython
|
||||
google-ai-generativelanguage
|
||||
google-generativeai
|
||||
grep-ast
|
||||
h11
|
||||
hf-xet
|
||||
httpcore
|
||||
httpx
|
||||
huggingface-hub
|
||||
@@ -188,6 +198,7 @@ let
|
||||
networkx
|
||||
numpy
|
||||
openai
|
||||
oslex
|
||||
packaging
|
||||
pathspec
|
||||
pexpect
|
||||
@@ -212,6 +223,7 @@ let
|
||||
rich
|
||||
rpds-py
|
||||
scipy
|
||||
shtab
|
||||
smmap
|
||||
sniffio
|
||||
sounddevice
|
||||
@@ -273,6 +285,9 @@ let
|
||||
"test_main_exit_calls_version_check"
|
||||
# AssertionError: assert 2 == 1
|
||||
"test_simple_send_non_retryable_error"
|
||||
# Broken tests (Aider-AI/aider#3679)
|
||||
"test_language_ocaml"
|
||||
"test_language_ocaml_interface"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Tests fails on darwin
|
||||
@@ -378,7 +393,10 @@ let
|
||||
homepage = "https://github.com/paul-gauthier/aider";
|
||||
changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
maintainers = with lib.maintainers; [
|
||||
happysalada
|
||||
yzx9
|
||||
];
|
||||
mainProgram = "aider";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.38.12";
|
||||
version = "1.38.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-QJSYymyeTOnzLhFTUhe5f6xc1BPlYDOfQAHAJuu3mVI=";
|
||||
hash = "sha256-j3OnRXRdXtOiBkJ/9GroLEjDf4bQ0mQ5WJi98OVWNSA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.38.12";
|
||||
version = "1.38.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-2GVra+ICCPu/1C/e6BuMU3TIrjF6AEbfbBVRQKYGpX4=";
|
||||
hash = "sha256-x2bLqukcE3oc5RYGAfTMIzEuvWCece16Pbz2qJazs1A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.41.0";
|
||||
version = "1.43.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "casbin";
|
||||
repo = "pycasbin";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-axW09wU/xywVui1fZKoTTIeHL0ooV1KsMhynqxiy2dI=";
|
||||
hash = "sha256-vRT8Z0XHDPOnAxy67j88vBX6W20mRWY7O/IrGLM/vuQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Authorization library that supports access control models like ACL, RBAC and ABAC";
|
||||
homepage = "https://github.com/casbin/pycasbin";
|
||||
changelog = "https://github.com/casbin/pycasbin/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/casbin/pycasbin/blob/${src.tag}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flowjax";
|
||||
version = "17.1.1";
|
||||
version = "17.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielward27";
|
||||
repo = "flowjax";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CLtkO7Lr+FpC/RHnqDSmevpJ3/3EfuILrQSbcdNTqsI=";
|
||||
hash = "sha256-NTP5QFJDe4tSAuHsQB4ZWyCcqLgW6uUaABfOG/TFgu0=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -14,16 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hy";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hylang";
|
||||
repo = "hy";
|
||||
tag = version;
|
||||
hash = "sha256-o6txdC8TOdaILAJP9LDAhJ587p+mw0bUEGLneQQYW9c=";
|
||||
hash = "sha256-zaTe9sRmW+lzpbNVrnj5ccp1xIbN10FD1Jst/hM78Lw=";
|
||||
};
|
||||
|
||||
# https://github.com/hylang/hy/blob/1.0a4/get_version.py#L9-L10
|
||||
@@ -31,7 +29,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ funcparserlib ] ++ lib.optionals (pythonOlder "3.9") [ astor ];
|
||||
dependencies = [ funcparserlib ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -61,7 +59,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "LISP dialect embedded in Python";
|
||||
homepage = "https://hylang.org/";
|
||||
changelog = "https://github.com/hylang/hy/releases/tag/${version}";
|
||||
changelog = "https://github.com/hylang/hy/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
mazurel
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jianpu-ly";
|
||||
version = "1.844";
|
||||
version = "1.853";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "jianpu_ly";
|
||||
hash = "sha256-wHNTHj5e5K0QHs+NxULdJZCC6vkKd5FuLxt9Ir1m3aI=";
|
||||
hash = "sha256-LNXFkcSTepbAC36lpeSbxZYHA9O6hOp4MRe6LgbpbZQ=";
|
||||
};
|
||||
|
||||
dependencies = [ lilypond ];
|
||||
@@ -29,6 +29,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
homepage = "https://ssb22.user.srcf.net/mwrhome/jianpu-ly.html";
|
||||
description = "Assists with printing jianpu";
|
||||
changelog = "https://github.com/ssb22/jianpu-ly/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ifurther ];
|
||||
};
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kuzu";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Llnz1NH8OF6ekNeuCfBy7C9M/v9QhYJSOgA0zrB29us=";
|
||||
hash = "sha256-fH+XXQU3SSleqs96ysy9NFv4UiZPXtJTIwAbvZ1Aj0g=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
scikit-build-core,
|
||||
gfortran,
|
||||
cmake,
|
||||
ninja,
|
||||
mpi,
|
||||
libspatialindex,
|
||||
rtree,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
inherit (pkgs.libsupermesh)
|
||||
pname
|
||||
version
|
||||
src
|
||||
meta
|
||||
;
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
scikit-build-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gfortran
|
||||
cmake
|
||||
ninja
|
||||
mpi
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildInputs = [
|
||||
libspatialindex
|
||||
gfortran.cc.lib
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
rtree
|
||||
];
|
||||
|
||||
# Only build tests if not built by scikit-build-core
|
||||
doCheck = false;
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cloud";
|
||||
version = "0.1.19";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-sKVCSuAJnKJ98qLX5a7JkGbenKhgq2WYfJ+THx6nq/8=";
|
||||
hash = "sha256-VnbVTkZQ0pNpH1ztFZfXTUibM/1B9R1nez/TX1bfaT4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-graph-stores-nebula";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_graph_stores_nebula";
|
||||
inherit version;
|
||||
hash = "sha256-0U5DsgojS8i0temD2ehGSOroGwUPIZtUlMDeg4XJaGA=";
|
||||
hash = "sha256-0CooGtmDz9OAJ+B543eFbrFTzii5iXwmo0dV4c/E/es=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -16,19 +16,20 @@
|
||||
# tests
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llm-ollama";
|
||||
version = "0.9.1";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "taketwo";
|
||||
repo = "llm-ollama";
|
||||
tag = version;
|
||||
hash = "sha256-NAJ0tfGRQOxYVAi2X0AI2d9+wyUS3ro1bfMSViZjaR0=";
|
||||
hash = "sha256-IA9Tb82XB+Gr6YwMVqzsw1dPtT3GWK2W/ZtuDVznF1A";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -46,6 +47,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lnkparse3";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Matmaus";
|
||||
repo = "LnkParse3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ebaKVl7GFoJiyQR7x4AN9Md8dtuYUchaN8ORbUrj5DY=";
|
||||
hash = "sha256-z+qjPs7gHQMAUlnGLN06xZ0hyrAnBF8i0FbaiEpguNE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "meshtastic";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -43,7 +43,7 @@ buildPythonPackage rec {
|
||||
owner = "meshtastic";
|
||||
repo = "python";
|
||||
tag = version;
|
||||
hash = "sha256-v9Fr3J829x1KtzplzXF2yDYwra70xNcJfaHpyiNP4ME=";
|
||||
hash = "sha256-pco8io8MzbK7Jv9rkzSK0A9UDLSyvfoZarFFjBLBNoM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
pytest,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mslex";
|
||||
version = "1.3.0";
|
||||
pyproject = true; # fallback to setup.py if pyproject.toml is not present
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smoofra";
|
||||
repo = "mslex";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vr36OTCTJFZRXlkeGgN4UOlH+6uAkMvqTEO9qL8X98w=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"mslex"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Like shlex, but for windows";
|
||||
homepage = "https://github.com/smoofra/mslex";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ yzx9 ];
|
||||
};
|
||||
}
|
||||
@@ -142,8 +142,8 @@ rec {
|
||||
"sha256-ksKIbASQfKzf67Pkdv5HUipoep/8Qv7jVcjC4KCqAoI=";
|
||||
|
||||
mypy-boto3-athena =
|
||||
buildMypyBoto3Package "athena" "1.38.0"
|
||||
"sha256-SiR/6d9mfd7nTd4aPtyknkBDhYTClMUkNLsNudW534o=";
|
||||
buildMypyBoto3Package "athena" "1.38.13"
|
||||
"sha256-1Fonc55fVM8ksqCTBwXVHeqhypgsYegoW8PEEPqcTF4=";
|
||||
|
||||
mypy-boto3-auditmanager =
|
||||
buildMypyBoto3Package "auditmanager" "1.38.0"
|
||||
@@ -810,8 +810,8 @@ rec {
|
||||
"sha256-uypKW3Cqj98SLeWmSwCXVKhKpXWXEvwdUexqqFgXeEc=";
|
||||
|
||||
mypy-boto3-logs =
|
||||
buildMypyBoto3Package "logs" "1.38.6"
|
||||
"sha256-Fpe+7mXJQHikCVyn/hcRvFPu/U+wvDL0JmDN0/Vvxwc=";
|
||||
buildMypyBoto3Package "logs" "1.38.13"
|
||||
"sha256-VOkEcgDn4G1v1DB/Berg5yP+PYUf7YBfQ+T4yvATVBs=";
|
||||
|
||||
mypy-boto3-lookoutequipment =
|
||||
buildMypyBoto3Package "lookoutequipment" "1.38.0"
|
||||
@@ -1346,8 +1346,8 @@ rec {
|
||||
"sha256-b6TgvxWdQI5TAI/OsJzmzlte1v30NdJucdedKgCb9LY=";
|
||||
|
||||
mypy-boto3-synthetics =
|
||||
buildMypyBoto3Package "synthetics" "1.38.11"
|
||||
"sha256-t9gwrPdz8QSB6pDeOZgB+Jl/I91vG58et5XzTXXqZuA=";
|
||||
buildMypyBoto3Package "synthetics" "1.38.13"
|
||||
"sha256-goFpYJQHLzYybY8gt9FTUVXXMX+8k58YNxZ8VsNfwr4=";
|
||||
|
||||
mypy-boto3-textract =
|
||||
buildMypyBoto3Package "textract" "1.38.0"
|
||||
@@ -1426,8 +1426,8 @@ rec {
|
||||
"sha256-naClNCiAqHalhT/+8cI510kBzYxpY3Z+wppDpQbZtdg=";
|
||||
|
||||
mypy-boto3-workspaces =
|
||||
buildMypyBoto3Package "workspaces" "1.38.0"
|
||||
"sha256-Xcp58ZVmnGNDx3vnt2Nb27ipDKoTArbWa6MwkoTlR+k=";
|
||||
buildMypyBoto3Package "workspaces" "1.38.13"
|
||||
"sha256-j4ccEWcU2RBS9TZvVzmPwI2n58JkRFkmyVRyovMtKS4=";
|
||||
|
||||
mypy-boto3-workspaces-web =
|
||||
buildMypyBoto3Package "workspaces-web" "1.38.0"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
uvloop,
|
||||
hypercorn,
|
||||
starlette,
|
||||
pydantic_1,
|
||||
pydantic,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -27,9 +27,12 @@ buildPythonPackage rec {
|
||||
hash = "sha256-Crn+nRbptRycnWJzH8Tm/BBLcBSRCcNtLX8NoKnSDdA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
# pydantic==1.10.2 only affects checks
|
||||
pythonRelaxDeps = [ "pydantic" ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
pyyaml
|
||||
];
|
||||
@@ -37,7 +40,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
pydantic_1
|
||||
pydantic
|
||||
uvloop
|
||||
hypercorn
|
||||
starlette
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
mslex,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslex";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petamas";
|
||||
repo = "oslex";
|
||||
tag = "release/v${version}";
|
||||
hash = "sha256-OcmBtxGS1Cq2kEcxF0Il62LUGbAAcG4lieokr/nK2/4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
mslex
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"oslex"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "OS-independent wrapper for shlex and mslex";
|
||||
homepage = "https://github.com/petamas/oslex";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ yzx9 ];
|
||||
};
|
||||
}
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20250503";
|
||||
version = "1.0.2.20250509";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RHby2R/iEK7zUK4lKq+zTWKVHClZ8+zJ+EK2WxCT9Gw=";
|
||||
hash = "sha256-T6N0QEVucZie4HkUSuJ5Bo3LHMViXRJq/8yLvAEv2l0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
capstone_4,
|
||||
capstone,
|
||||
cmsis-pack-manager,
|
||||
colorama,
|
||||
importlib-metadata,
|
||||
@@ -29,13 +29,16 @@ buildPythonPackage rec {
|
||||
version = "0.36.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k3eCrMna/wVNUPt8b3iM2UqE+A8LhfJarKuZ3Jgihkg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyocd";
|
||||
repo = "pyOCD";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-CSdVWDiSe+xd0MzD9tsKs3DklNjnhchYFuI3Udi0O20=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/pyocd/pyOCD/pull/1332
|
||||
# merged into develop
|
||||
(fetchpatch {
|
||||
name = "libusb-package-optional.patch";
|
||||
url = "https://github.com/pyocd/pyOCD/commit/0b980cf253e3714dd2eaf0bddeb7172d14089649.patch";
|
||||
@@ -43,12 +46,13 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "capstone" ];
|
||||
pythonRemoveDeps = [ "libusb-package" ];
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
dependencies = [
|
||||
capstone_4
|
||||
capstone
|
||||
cmsis-pack-manager
|
||||
colorama
|
||||
importlib-metadata
|
||||
|
||||
@@ -22,6 +22,11 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# https://docs.python.org/3/whatsnew/3.13.html#unittest
|
||||
preCheck = ''
|
||||
substituteInPlace test/test_pySmartDL.py \
|
||||
--replace-fail 'unittest.makeSuite(' 'unittest.TestLoader().loadTestsFromTestCase('
|
||||
'';
|
||||
disabledTests = [
|
||||
# touch the network
|
||||
"test_basic_auth"
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-docs-theme";
|
||||
version = "2025.2";
|
||||
version = "2025.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
disabled = pythonOlder "3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python";
|
||||
repo = "python-docs-theme";
|
||||
tag = version;
|
||||
hash = "sha256-+QOtlgWGPcuKZOfuE0l08GUetR0DZvMzsk8Xl8KaZcQ=";
|
||||
hash = "sha256-fHhgr8JPNLpATAGOBE1lJYA5rBNKZg5paY+MQsgWXqQ=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Sphinx theme for CPython project";
|
||||
homepage = "https://github.com/python/python-docs-theme";
|
||||
changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/python/python-docs-theme/blob/${src.tag}/CHANGELOG.rst";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ kaction ];
|
||||
};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
tag = version;
|
||||
hash = "sha256-khO8mu2aWBU9TiorKkMd1e54r5C7ovv6eWyJ61dzOJw=";
|
||||
hash = "sha256-VOVVUDcjSn8BkXEIRJKHiPkDoFE+4w2iI/uNkY7I8Yg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
# build libsigrok plus its Python bindings. Unfortunately it does not appear
|
||||
# to be possible to build them separately, at least not easily.
|
||||
toPythonModule (
|
||||
(libsigrok.override { inherit python; }).overrideAttrs (orig: {
|
||||
(libsigrok.override { python3 = python; }).overrideAttrs (orig: {
|
||||
pname = "${python.libPrefix}-sigrok";
|
||||
|
||||
patches = orig.patches or [ ] ++ [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sigstore-protobuf-specs";
|
||||
version = "0.4.0";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "sigstore_protobuf_specs";
|
||||
inherit version;
|
||||
hash = "sha256-XrWiz2xAvGDrRwPqMcDfm0EKkhU70i3eWj8bT2bvCpA=";
|
||||
hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
@@ -33,6 +33,8 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "sigstore_protobuf_specs" ];
|
||||
|
||||
passthru.skipBulkUpdate = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for serializing and deserializing Sigstore messages";
|
||||
homepage = "https://pypi.org/project/sigstore-protobuf-specs/";
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sigstore-python";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -37,7 +37,7 @@ buildPythonPackage rec {
|
||||
owner = "sigstore";
|
||||
repo = "sigstore-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BdVX2LWCsMx9r0bDTJjMdrvy4Hqn6hrw9wAcub0nRMk=";
|
||||
hash = "sha256-fghieYu5TDYwJCwesXbqRiuYCaTTDZhmHWvCwSbIO6w=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user