Merge staging-next into staging
This commit is contained in:
@@ -19376,6 +19376,12 @@
|
||||
githubId = 137805;
|
||||
name = "Alexander Tsvyashchenko";
|
||||
};
|
||||
ndom91 = {
|
||||
email = "nix@ndo.dev";
|
||||
github = "ndom91";
|
||||
githubId = 7415984;
|
||||
name = "Nico Domino";
|
||||
};
|
||||
nealfennimore = {
|
||||
email = "hi@neal.codes";
|
||||
github = "nealfennimore";
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image-aarch64-new-kernel-installer.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image-aarch64-installer.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image-armv7l-multiplatform-installer.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image-raspberrypi-installer.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../sd-card/sd-image.nix
|
||||
];
|
||||
config = {
|
||||
warnings = [
|
||||
''
|
||||
.../cd-dvd/sd-image.nix is deprecated and will eventually be removed.
|
||||
Please switch to .../sd-card/sd-image.nix, instead.
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -11,13 +11,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
pname = "codediff.nvim";
|
||||
version = "2.45.1";
|
||||
version = "2.49.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esmuellert";
|
||||
repo = "codediff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-1F6z/rhZxiuI6W1ReyHP6EQFxys4qm3fbINxoy1hQZA=";
|
||||
hash = "sha256-kT5plTJP4VfN6mFkq6voDTmr9LaZ37W80UU3QUGlKkY=";
|
||||
};
|
||||
|
||||
dependencies = [ vimPlugins.nui-nvim ];
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "fbneo";
|
||||
version = "0-unstable-2026-06-04";
|
||||
version = "0-unstable-2026-06-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "fbneo";
|
||||
rev = "298f913aeb781908c7f6a568a2ede3940a98738d";
|
||||
hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8=";
|
||||
rev = "9723c47c2d782ccb8cf48f96568a89a44631e6ba";
|
||||
hash = "sha256-zYIC0up0tkvq0TLjSiypxwSTYAF1XnmHXsUTKsUQejA=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "hatari";
|
||||
version = "0-unstable-2026-04-20";
|
||||
version = "0-unstable-2026-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "hatari";
|
||||
rev = "6aa7c7079b3186025ebc6bad4b4251aa359a3947";
|
||||
hash = "sha256-17L2EpLGwkWA/9XTgtIq+PNABGvgdBQDsAfAZFRKLOE=";
|
||||
rev = "c605d3aa342f2ad8f915f94bf03bae018e1be7b7";
|
||||
hash = "sha256-UJyfIt5+anXaqqMmL9JNTBvXu5bmyMYloYc8fWxx2m0=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [ which ];
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame";
|
||||
version = "0-unstable-2026-05-31";
|
||||
version = "0-unstable-2026-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame";
|
||||
rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56";
|
||||
hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc=";
|
||||
rev = "e126237dcf44622deaf18e7668f07ba96c363673";
|
||||
hash = "sha256-6M4revCs32ffmUjhl10nL/MsVl8QRn6JQmC7NzDW1Mo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,2 +1,11 @@
|
||||
{ lib, fetchFromGitea }:
|
||||
lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args))
|
||||
lib.makeOverridable (
|
||||
args:
|
||||
fetchFromGitea (
|
||||
{
|
||||
domain = "codeberg.org";
|
||||
functionName = "fetchFromCodeberg";
|
||||
}
|
||||
// args
|
||||
)
|
||||
)
|
||||
|
||||
@@ -3,7 +3,20 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
lib.makeOverridable (
|
||||
{ domain, ... }@args:
|
||||
{
|
||||
domain,
|
||||
functionName ? "fetchFromGitea",
|
||||
...
|
||||
}@args:
|
||||
|
||||
fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; })
|
||||
fetchFromGitHub (
|
||||
(removeAttrs args [
|
||||
"domain"
|
||||
"functionName"
|
||||
])
|
||||
// {
|
||||
inherit functionName;
|
||||
githubBase = domain;
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -48,6 +48,7 @@ decorate (
|
||||
repo,
|
||||
tag ? null,
|
||||
rev ? null,
|
||||
functionName ? "fetchFromGitHub",
|
||||
# TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation
|
||||
# name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github",
|
||||
private ? false,
|
||||
@@ -60,7 +61,7 @@ decorate (
|
||||
|
||||
assert (
|
||||
lib.xor (tag == null) (rev == null)
|
||||
|| throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)."
|
||||
|| throw "${functionName} requires one of either `rev` or `tag` to be provided (not both)."
|
||||
);
|
||||
|
||||
let
|
||||
@@ -115,6 +116,7 @@ decorate (
|
||||
"repo"
|
||||
"tag"
|
||||
"rev"
|
||||
"functionName"
|
||||
"private"
|
||||
"githubBase"
|
||||
"varPrefix"
|
||||
@@ -135,7 +137,7 @@ decorate (
|
||||
in
|
||||
''
|
||||
if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
|
||||
echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
|
||||
echo "Error: Private ${functionName} requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
|
||||
exit 1
|
||||
fi
|
||||
cat > netrc <<EOF
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bsky-cli";
|
||||
version = "0.0.79";
|
||||
version = "0.0.81";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattn";
|
||||
repo = "bsky";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-id7+g9NMCSicPbDoDSqnc7OwEMIVXbXw3O8TkeQjfmg=";
|
||||
hash = "sha256-Su2AhHaIozuqTzK1vyAjZR/a01j0dnlayV14Q7hTcCU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-m4kth6r13++53fbceWjKYu4D297meAwnkaSsCiu5zS8=";
|
||||
vendorHash = "sha256-jGeKaAR0rAqrhoUx/FqdDwdOxA/WioppFjGyi/PsIQs=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "cdncheck";
|
||||
version = "1.2.39";
|
||||
version = "1.2.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "cdncheck";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zBxNONUM5/7i7qmLzCl/xWadbP9FO9xWD/j96ncyIBo=";
|
||||
hash = "sha256-awlLfO9YvsRwLRguCB+qDBYuqRkQb2Z+8gdTvzwDQYs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ=";
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "flawz";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = "flawz";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI=";
|
||||
hash = "sha256-a+UfWoBQP54/Vj5VJ9eMKcG+wQxXtd1bXii281SwjHo=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU=";
|
||||
cargoHash = "sha256-MnBbxGS70pG2vRQKfqI/fuWC4gCOYehoh/ncNXsN9kI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "gerbil";
|
||||
version = "1.4.1";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "gerbil";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wKqJfiCzmMbKZXJGB7BWoXRNDukc4t+PX60XyynJNAU=";
|
||||
hash = "sha256-NlwP2A1SGEDgoLubLs2HHnaOPUu5L84I1kJAbXyja7Q=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-S5olgsmX0uZR9P/u/8Rf3lzRCSIwPDcmlvSzJhhJM3w=";
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "ghostfolio";
|
||||
version = "3.3.0";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-74CqCDyLrn3//FiTfo6xR5jLyo4jU+daBF9ES/uQE3E=";
|
||||
hash = "sha256-nVk4KjNOIQQRRRvyPdSodL4s3yarIb1p2t2fBNcMps4=";
|
||||
# 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;
|
||||
@@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-klWmB6LYf6h1WPi3AasDrdVdaPCyb5ePWuO9zqMcXys=";
|
||||
npmDepsHash = "sha256-IMUbBYFiSS0AfsenPvxoC5HHHW7Lhxfd5DaysgV+vBU=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace replace.build.mjs \
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.0.11";
|
||||
version = "6.1.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-mit";
|
||||
@@ -19,10 +19,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "PurpleBooth";
|
||||
repo = "git-mit";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Hnmhvql7oTbNQnBvWlV60bxddH7H7intEsjfXhV4Z2Y=";
|
||||
hash = "sha256-2ApBtZPfpV5mrvD/6NS+qsA8/WLFZL6OGWnANJBMchI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4HNr/m+n+M1BaL67Fo/S4A9EXBYOIp7il0sAtm4rSQc=";
|
||||
cargoHash = "sha256-ahT2jMFwU1+xQykqedmhOWjr+6mxpaUpjAMCeBwUTY0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -20,22 +20,22 @@
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "gscreenshot";
|
||||
version = "3.11.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thenaterhood";
|
||||
repo = "gscreenshot";
|
||||
tag = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc=";
|
||||
hash = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc=";
|
||||
};
|
||||
|
||||
# needed for wrapGAppsHook3 to function
|
||||
strictDeps = false;
|
||||
# tests require a display and fail
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 ];
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
gettext
|
||||
gobject-introspection
|
||||
gtk3
|
||||
@@ -57,7 +57,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
||||
++ (with python3Packages; [
|
||||
pillow
|
||||
pygobject3
|
||||
setuptools
|
||||
]);
|
||||
|
||||
patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hygg";
|
||||
version = "0.1.20";
|
||||
version = "0.1.21";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kruseio";
|
||||
repo = "hygg";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-lqN8n51nm+FtmlI0PEgTZATE+jWE9Wc+o3Gedrdg/fo=";
|
||||
hash = "sha256-Gu56WH7Sp1y/fXwEOOACUAe8nshvc6d2302YwPvM+ZM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-x8aZKyqLaR1cdLx9JofbXGLKwgNDWORqEi2UdcSOAzI=";
|
||||
cargoHash = "sha256-AUkwjgF/LwOvbhOWcrK8ayvL2/MSc7GFh+/bfdZ28/8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kdiskmark";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonmagon";
|
||||
repo = "kdiskmark";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ=";
|
||||
hash = "sha256-cdKkOe5BbzF8K+buwctsSMlw4ko0DrNHZ2HwJA9Det4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "matrix-commander-rs";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8go";
|
||||
repo = "matrix-commander-rs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CvsMRxB5s891cVu03RroTQYOGA6rmhpif8VT0njXTnc=";
|
||||
hash = "sha256-SyAKKSPGO8yjP3Pgsr2sPW5cpNyNLiYTy7CDDAXdztw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hzWq09qJTox8yZuMOQ1///hKxY4EsWn/mHKy3svxlF8=";
|
||||
cargoHash = "sha256-X1xBhJ0B4FcC66qKtYZbcX2+92hy2R4fM/GYBI8AFTY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -25,16 +25,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "motrix-next";
|
||||
version = "3.9.3";
|
||||
version = "3.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AnInsomniacy";
|
||||
repo = "motrix-next";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TK3M9fL+g1F9vFibZL4TXYCBeID1uz6+gRPtOxAAmLs=";
|
||||
hash = "sha256-iubiVegDnOOczeYqMIU65RX43te91TbSdw2UdN/p6qQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-IUAoV6PAW4ae0BMBYfdfdezJXyOzaqKtPlqkSVCaqJk=";
|
||||
cargoHash = "sha256-cZJ6KE28QC3WT9h8KMOmgvTMjwJLNCZ4ml+q2q7cH2c=";
|
||||
|
||||
pnpmDeps = fetchPnpmDeps {
|
||||
inherit (finalAttrs)
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nom";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Uxsq6tbWAPNvOz9fQ8820b2E2Xo/a1Pfzq8p/2mAVoc=";
|
||||
hash = "sha256-ZsauLHdGkD6cJ9SYwoTyOLu2CDLp8tBGqXn4jDElAMA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-otrK4mTqgRr9Ntf2D1f0/deQcObejRWN7BaScV4q+FY=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "phpstan";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phpstan";
|
||||
repo = "phpstan";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oZ4ph5pQimUuJVjIRhGDgFg4rbrMwVGxdXC71zVh6Lc=";
|
||||
hash = "sha256-4C3d8ae9TGpyLNspClSS+Eor6epjG1BTS/Nzy4K5zZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "knot-exporter";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "knot_exporter";
|
||||
inherit version;
|
||||
hash = "sha256-3i1k3xCKdmDV/oNX8vhoJNzigx562OwdZ+oXbDjdbiI=";
|
||||
hash = "sha256-4V7fIY5qgKFGSKoodRFgP8e0P0DDvsBPBmzP9TdG98A=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "redis_exporter";
|
||||
version = "1.85.0";
|
||||
version = "1.86.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oliver006";
|
||||
repo = "redis_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-04LDNXHaVADvcH3CLVYnFXnLPvBPqjGIBls2KeHHdlY=";
|
||||
sha256 = "sha256-N7IW1u/ifo8S0yRmdRYFAXfqke/GUVy5omrEqaCZ/3I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-muGgriK1DDkKk4DOWf7m+W6/qquwYwqgTOzyNGbjV+U=";
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
diff --git a/Source/UI/FilterVisualizer.cpp b/Source/UI/FilterVisualizer.cpp
|
||||
index 103da54..c96a62a 100644
|
||||
--- a/Source/UI/FilterVisualizer.cpp
|
||||
+++ b/Source/UI/FilterVisualizer.cpp
|
||||
@@ -151,9 +151,15 @@ void FilterVisualizer::paint(juce::Graphics& g)
|
||||
|
||||
wA = wMixArr[0]; wB = wMixArr[1]; wC = wMixArr[2]; wD = wMixArr[3];
|
||||
// ----- 周波数応答の計算 -----
|
||||
- int wInt = (int)w;
|
||||
+ // The standalone window is resizable, and on HiDPI / large / tiled displays
|
||||
+ // the visualizer is far wider than the design's assumed ~700px. Clamp the
|
||||
+ // working width to the rawMag capacity: an unclamped px loop writes past the
|
||||
+ // end of rawMag and corrupts the adjacent editor members (the next member,
|
||||
+ // groupA.enableButton, is child #2 of the editor), which later crashes in
|
||||
+ // Component::paintComponentAndChildren via a dangling affineTransform.
|
||||
+ const int wInt = juce::jmin ((int) w, (int) rawMag.size() - 1);
|
||||
// rawMag はメンバー変数 (paint()内allocを回避)。使用範囲だけゼロクリア。
|
||||
- std::fill(rawMag.begin(), rawMag.begin() + juce::jmin(wInt + 2, 1024), 0.0f);
|
||||
+ std::fill(rawMag.begin(), rawMag.begin() + juce::jmin(wInt + 2, (int) rawMag.size()), 0.0f);
|
||||
for (int px = 0; px <= wInt; ++px)
|
||||
{
|
||||
float freq = 20.0f * std::pow(1000.0f, (float)px / w);
|
||||
diff --git a/Source/UI/FilterVisualizer.h b/Source/UI/FilterVisualizer.h
|
||||
index 05a193b..4854851 100644
|
||||
--- a/Source/UI/FilterVisualizer.h
|
||||
+++ b/Source/UI/FilterVisualizer.h
|
||||
@@ -25,8 +25,9 @@ private:
|
||||
QuadMorphFilterAudioProcessorEditor* editor = nullptr;
|
||||
|
||||
// paint() 内アロケーション禁止 (CLAUDE.md §4) のためメンバーに移行。
|
||||
- // FilterVisualizer の幅は最大 ~700px なので 1024 で十分。
|
||||
- std::array<float, 1024> rawMag {};
|
||||
+ // Sized to cover wide / HiDPI windows; paint() additionally clamps the
|
||||
+ // working width to this capacity so the buffer can never be overrun.
|
||||
+ std::array<float, 4096> rawMag {};
|
||||
|
||||
// Background color randomization
|
||||
juce::Colour bgColour = juce::Colour(0xff2a2a2a); // Default dark color
|
||||
@@ -0,0 +1,126 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
|
||||
cmake,
|
||||
pkg-config,
|
||||
|
||||
alsa-lib,
|
||||
freetype,
|
||||
juce,
|
||||
xsimd,
|
||||
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxext,
|
||||
libxinerama,
|
||||
libxrandr,
|
||||
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quad-morph-filter";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OTODESK4193";
|
||||
repo = "QuadMorphFilter";
|
||||
tag = "V${finalAttrs.version}";
|
||||
hash = "sha256-xz97h8j411r7g6fSVDo8E4ARLyIP++qK26aTvDqP+Yo=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
# FilterVisualizer writes a per-pixel response curve into a fixed
|
||||
# std::array<float,1024>, assuming the editor is <=1024px wide. The standalone
|
||||
# window is resizable (HiDPI/large/tiled displays make it far wider), so the
|
||||
# write overruns the array and smashes adjacent editor members -> SIGSEGV on the
|
||||
# first paint. Clamp the width to the buffer and size the buffer for wide windows.
|
||||
# see https://github.com/OTODESK4193/QuadMorphFilter/issues/2
|
||||
patches = [ ./filtervisualizer-clamp-width.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# Use JUCE from nixpkgs instead of a hardcoded Windows path, and drop
|
||||
# -mavx2/-mfma: baseline x86_64-linux has no AVX2 and other platforms
|
||||
# reject the flags. The code contains no AVX intrinsics; it compiles
|
||||
# and runs fine without them.
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail 'set(JUCE_DIR "C:/JUCE")' 'find_package(JUCE CONFIG REQUIRED)' \
|
||||
--replace-fail 'add_subdirectory(''${JUCE_DIR} build_juce)' "" \
|
||||
--replace-fail ' -mavx2 -mfma' "" \
|
||||
--replace-fail ' -ffast-math' ""
|
||||
|
||||
# The Linux WebBrowserComponent (gtk3/webkit) and curl are unused by the
|
||||
# plugin; disable them instead of pulling the dependencies in.
|
||||
printf '\ntarget_compile_definitions(QuadMorphFilter PUBLIC JUCE_WEB_BROWSER=0 JUCE_USE_CURL=0)\n' >> CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
freetype
|
||||
juce # propagates fontconfig
|
||||
libx11
|
||||
libxcursor
|
||||
libxext
|
||||
libxinerama
|
||||
libxrandr
|
||||
xsimd
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Upstream pulls xsimd via FetchContent; resolve it through
|
||||
# find_package against the xsimd in buildInputs instead of the network.
|
||||
(lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
|
||||
];
|
||||
|
||||
cmakeBuildType = "RelWithDebInfo";
|
||||
|
||||
# JUCE dlopens these at runtime, standalone executable crashes without them.
|
||||
# Must go through `env`: with __structuredAttrs only `env` entries are
|
||||
# exported, so a top-level NIX_LDFLAGS never reaches the ld wrapper.
|
||||
env.NIX_LDFLAGS = toString [
|
||||
"-lX11"
|
||||
"-lXext"
|
||||
"-lXcursor"
|
||||
"-lXinerama"
|
||||
"-lXrandr"
|
||||
];
|
||||
|
||||
# Upstream has no install rules.
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 "QuadMorphFilter_artefacts/$cmakeBuildType/Standalone/Quad-Morph Filter" \
|
||||
"$out/bin/quad-morph-filter"
|
||||
mkdir -p "$out/lib/vst3"
|
||||
cp -r "QuadMorphFilter_artefacts/$cmakeBuildType/VST3/Quad-Morph Filter.vst3" "$out/lib/vst3/"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"V(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Morphing multi-filter audio plugin with 28 filter models controlled from an XY pad";
|
||||
homepage = "https://github.com/OTODESK4193/QuadMorphFilter";
|
||||
changelog = "https://github.com/OTODESK4193/QuadMorphFilter/releases/tag/V${finalAttrs.version}";
|
||||
# Stated in README.md ("GPLv3, inherited via the JUCE framework");
|
||||
# the repository ships no LICENSE file.
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ magnetophon ];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "quad-morph-filter";
|
||||
};
|
||||
})
|
||||
@@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# See https://github.com/apenwarr/redo/pull/47
|
||||
substituteInPlace minimal/do \
|
||||
--replace-fail 'cd "$dodir"' 'cd "''${dodir:-.}"'
|
||||
|
||||
# the tests refer to /etc/passwd (as an arbitrarily-chosen absolute-path file that won't change),
|
||||
# but that fails under sandboxing. Replace it with another arbrarily-chosen file that won't change:
|
||||
substituteInPlace t/105-sympath/all.do \
|
||||
--replace-fail "/etc/passwd" "${coreutils}/bin/pwd"
|
||||
'';
|
||||
|
||||
inherit doCheck;
|
||||
|
||||
@@ -1,27 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
bzip2,
|
||||
dbus,
|
||||
python3,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rs-reticulum";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ratspeak";
|
||||
repo = "rsReticulum";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CoA+HOcMkwmo7WUhXCLIwx4hMqLHFQqu6d1NOz1N2PY=";
|
||||
hash = "sha256-MSvIgB/E1Ce8M8vOaXlHQGYnxFf0lT2hg8g0tx6QY/w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-h8P2PuW3hiyQuvAHhat831dxBGSmV0rxDWB8lffZpac=";
|
||||
cargoHash = "sha256-Kv3aVET69yI28muyaJop4YQEqOxNeyajK7j5J+jDhe0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@@ -38,6 +40,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
checkFlags = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
# Broken since 0.9.4
|
||||
"--skip=actor::tests::test_rate_tracking"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/rnid-rs";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
@@ -46,6 +57,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
homepage = "https://github.com/ratspeak/rsReticulum";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ drupol ];
|
||||
mainProgram = "rs-reticulum";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "sandhole";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EpicEric";
|
||||
repo = "sandhole";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-nOh9JRb1T85gEsQzd0BJqvR941QMoqeIjRFg4d8eASc=";
|
||||
hash = "sha256-ZK8yXitfHT2al2xmYM8uk7is5zelLr3JYS7WcaUR834=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EZxRKq5r5Cgp/WqcL1dY4ypf2K73YjaadqI5Tl+6Kec=";
|
||||
cargoHash = "sha256-ujEIuUNEcHftpeHD6UX8CzoQ1tEcfL0sT3H0z81UBfc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "sbb-tui";
|
||||
version = "1.14.2";
|
||||
version = "1.15.0";
|
||||
__structuredAttrs = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "Necrom4";
|
||||
repo = "sbb-tui";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-kmT8wVkmAmVQLtSkRRIGInCjXiLfsYd9OrixYcDofS4=";
|
||||
hash = "sha256-bYIIMFUogowywYmXNWRobmo7etbHqwOV8eHmaxz1AUg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-K4DOu3rfSlKAa5JNKCzWWpnWZlXXxtN5Po7p1Spqe1w=";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
libglvnd,
|
||||
libxext,
|
||||
libxrandr,
|
||||
mailspring,
|
||||
openssl,
|
||||
libx11,
|
||||
libice,
|
||||
libxrender,
|
||||
@@ -59,16 +59,17 @@ let
|
||||
libglvnd
|
||||
libxext
|
||||
libxrandr
|
||||
mailspring
|
||||
libx11
|
||||
libice
|
||||
libxrender
|
||||
openssl
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
bash $src --target $name --noexec
|
||||
mkdir -p $out/bin $out/lib/unigine/superposition/
|
||||
cp -r $name/* $out/lib/unigine/superposition/
|
||||
ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0
|
||||
echo "exec $out/lib/unigine/superposition/Superposition" >> $out/bin/superposition
|
||||
chmod +x $out/bin/superposition
|
||||
wrapProgram $out/lib/unigine/superposition/Superposition \
|
||||
@@ -116,11 +117,11 @@ buildFHSEnv {
|
||||
libglvnd
|
||||
libxext
|
||||
libxrandr
|
||||
mailspring
|
||||
libx11
|
||||
libice
|
||||
libxrender
|
||||
openal
|
||||
openssl
|
||||
];
|
||||
runScript = "superposition";
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "allmytoes.yazi";
|
||||
version = "0-unstable-2025-11-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Sonico98";
|
||||
repo = "allmytoes.yazi";
|
||||
rev = "acdc53be76434a82218eed8e1fda5512971bf3cc";
|
||||
hash = "sha256-zZ9L0FrcxFvSuDJwi6VHQXDT7b/sM4DhZ3LPi/i9tig=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Generate freedesktop-compatible thumbnails while using yazi";
|
||||
homepage = "https://github.com/Sonico98/allmytoes.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ luminarleaf ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "omni-trash.yazi";
|
||||
version = "0-unstable-2026-06-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goon";
|
||||
repo = "omni-trash.yazi";
|
||||
rev = "3c2a9923673e0552a093afc4122473df1d427a93";
|
||||
hash = "sha256-heqqEWzJCoNt3CIJAEaWfqUX4J9BfVEw3OsU7Xjc17M=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Yazi plugin to manage your trash across all drives from a single, unified interface, powered by trash-cli";
|
||||
homepage = "https://github.com/goon/omni-trash.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ anninzy ];
|
||||
};
|
||||
}
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "yq-go";
|
||||
version = "4.53.2";
|
||||
version = "4.53.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-So0yUblAxLgbw1/BrOp6zj9wGMTtsspjk2UQaBIBIYE=";
|
||||
hash = "sha256-e4/Tu40Fe2DKzP7+ZLqkWty+VJ5eWGyKAwH0U07gQeg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t+u3rJNbe8JcfWBb+jMaZuTcSWYmhMiCeKbI2noVaCo=";
|
||||
vendorHash = "sha256-B+FGknoNYfWXT8nx0teSCdT9i18VJMv8L1dv1w8gcF8=";
|
||||
|
||||
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
installShellFiles
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
xvfb-run,
|
||||
makeBinaryWrapper,
|
||||
doCheck ? false,
|
||||
zotero,
|
||||
}:
|
||||
let
|
||||
# note-editor needs nodejs 22. Any newer version fails to build zotero's fork of @benrbray/prosemirror-math during npm install.
|
||||
@@ -345,7 +346,12 @@ buildNpmPackage (finalAttrs: {
|
||||
makeWrapper $out/Applications/Zotero.app/Contents/MacOS/zotero $out/bin/zotero
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru = {
|
||||
tests.build-with-checks = zotero.override {
|
||||
doCheck = true;
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.zotero.org";
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "bleak-esphome";
|
||||
version = "3.9.1";
|
||||
version = "3.9.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluetooth-devices";
|
||||
repo = "bleak-esphome";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6qwg6jI9zFf3x0Yfp03C62f+LMO/RIDju+/ykoiOCI4=";
|
||||
hash = "sha256-kH+UiXpu0HNdz55Qz8y/NJ/XzOkTk7fkah7CZE2Zets=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cf-xarray";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xarray-contrib";
|
||||
repo = "cf-xarray";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-UB/aMXnfX2dOprjQp51QHYOGq9Acn030oLqjLt/avS4=";
|
||||
hash = "sha256-njwK8wJH0YKzA7Lq8J0gBvAzNJa24XncF7IB9Dy6Lys=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fastcore";
|
||||
version = "1.12.39";
|
||||
version = "1.13.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fastai";
|
||||
repo = "fastcore";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4pa0h+8V7E3CJtJguM/OhEK61OeK/+JKEL7fNsWIKek=";
|
||||
hash = "sha256-ZwiqTGgvu/OdnaJHq+oWZat33BvhF52X48d6ipcexRU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-appengine-logging";
|
||||
version = "1.8.0";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_appengine_logging";
|
||||
inherit version;
|
||||
hash = "sha256-hLcFpp5BCfwvaN/jbOPfajTVw9mJ7ubQrBsCTdoLpvU=";
|
||||
hash = "sha256-tVY+dgEKNuat8cxIliDCnuT7O5hrAG0jfpoGHrDwq7c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "growattserver";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indykoning";
|
||||
repo = "PyPi_GrowattServer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MRxNPyvIlMafJYhjMNirb0cqppJYr9MUR7FxjhqQsyY=";
|
||||
hash = "sha256-zVcKuwTxuCCIZzVKgEdjULSyKgKcb/Fb93rk3J8ztCg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202606121";
|
||||
version = "0.1.202606131";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-d7joiPl5EQaGH0co6SC1ifnjRV7FowFswGFF6mSmIcM=";
|
||||
hash = "sha256-QPaaJ+yeRC2CYsUNTwBrqZStJ/+BxfYG0xteo+iYV/Y=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "libknot";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-pwXOlz5oxtDOkUXWcqTSwPc9BeYaikG4E7qJ4rbVsAk=";
|
||||
hash = "sha256-zv8N2Nmk+9BK2U6kfqV+tVoJDQXXZ9vgV+jEYDAYN3g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "raylib-python-cffi";
|
||||
version = "5.5.0.4";
|
||||
version = "6.0.1.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electronstudio";
|
||||
repo = "raylib-python-cffi";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MKyTpGnup4QmRui2OVBpnyn9KENATWcwYcikOmYX4c8=";
|
||||
hash = "sha256-9eN3H62gYDloMHbJbTFiO3acif3GJuTkk4CWltzBOXg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,12 +2,15 @@
|
||||
lib,
|
||||
stdenv,
|
||||
altair,
|
||||
anyio,
|
||||
blinker,
|
||||
buildPythonPackage,
|
||||
cachetools,
|
||||
click,
|
||||
fetchPypi,
|
||||
gitpython,
|
||||
httptools,
|
||||
itsdangerous,
|
||||
numpy,
|
||||
packaging,
|
||||
pandas,
|
||||
@@ -15,24 +18,28 @@
|
||||
protobuf,
|
||||
pyarrow,
|
||||
pydeck,
|
||||
setuptools,
|
||||
python-multipart,
|
||||
requests,
|
||||
rich,
|
||||
setuptools,
|
||||
starlette,
|
||||
tenacity,
|
||||
toml,
|
||||
tornado,
|
||||
typing-extensions,
|
||||
uvicorn,
|
||||
watchdog,
|
||||
websockets,
|
||||
}:
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "streamlit";
|
||||
version = "1.55.0";
|
||||
version = "1.58.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-AV5RK70C0AD0BH5REY3AhrcOfZxGtKEaM8JQlzE3liY=";
|
||||
hash = "sha256-eKIucIWwU6985UREK/S2cHceaMUJuhvaoFa6Bwj0nD0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -44,23 +51,30 @@ buildPythonPackage (finalAttrs: {
|
||||
|
||||
dependencies = [
|
||||
altair
|
||||
anyio
|
||||
blinker
|
||||
cachetools
|
||||
click
|
||||
gitpython
|
||||
httptools
|
||||
itsdangerous
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
pillow
|
||||
protobuf
|
||||
pyarrow
|
||||
pydeck
|
||||
python-multipart
|
||||
requests
|
||||
rich
|
||||
starlette
|
||||
tenacity
|
||||
toml
|
||||
typing-extensions
|
||||
gitpython
|
||||
pydeck
|
||||
tornado
|
||||
typing-extensions
|
||||
uvicorn
|
||||
websockets
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ watchdog ];
|
||||
|
||||
|
||||
@@ -2,18 +2,23 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "types-urllib3";
|
||||
version = "1.26.25.14";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
@@ -25,4 +30,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
+3
-3
@@ -10,19 +10,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "karousel";
|
||||
version = "0.15";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "peterfajdiga";
|
||||
repo = "karousel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-pxcKfhQmudxCJ7fwteT+QZrRib03tYZEWiRjmZtVKgQ=";
|
||||
hash = "sha256-qrsdVyeDD4VuGQKzUqxxGt+a4zA6jOI0cSxTSnBkkgQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs run-ts.sh
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "build: lint tests" "build: tests"
|
||||
--replace-fail "build: lint test" "build: test"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1359,6 +1359,49 @@ in
|
||||
maintainers = with lib.maintainers; [ szaffarano ];
|
||||
};
|
||||
};
|
||||
|
||||
tmux-window-name = mkTmuxPlugin {
|
||||
pluginName = "tmux-window-name";
|
||||
version = "2024-03-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ofirgall";
|
||||
repo = "tmux-window-name";
|
||||
rev = "34026b6f442ceb07628bf25ae1b04a0cd475e9ae";
|
||||
sha256 = "sha256-BNgxLk/BkaQkGlB4g2WKVs39y4VHL1Y2TdTEoBy7yo0=";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
rtpFilePath = "tmux_window_name.tmux";
|
||||
postInstall = ''
|
||||
script=$target/scripts/rename_session_windows.py
|
||||
|
||||
sed -i \
|
||||
-e 's|^USR_BIN_REMOVER.*|USR_BIN_REMOVER = (r"^" + os.path.expanduser("~") + r"/.nix-profile/bin/(.+)( --.*)?", r"\\g<1>")|' \
|
||||
-e 's|^\(\s*\)substitute_sets: List.*|\1substitute_sets: List[Tuple] = field(default_factory=lambda: [(os.path.expanduser("~") + r"/.nix-profile/bin/(.+) --.*", r"\\g<1>"), (r".+ipython([32])", r"ipython\\g<1>"), USR_BIN_REMOVER, (r"(bash) (.+)/(.+[ $])(.+)", r"\\g<3>\\g<4>")])|' \
|
||||
-e 's|^\(\s*\)dir_programs: List.*|\1dir_programs: List[str] = field(default_factory=lambda: [os.path.expanduser("~") + "/.nix-profile/bin/" + p for p in ["vim", "vi", "git", "nvim"]])|' \
|
||||
$script
|
||||
|
||||
for f in tmux_window_name.tmux scripts/rename_session_windows.py; do
|
||||
wrapProgram $target/$f \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
(pkgs.python3.withPackages (
|
||||
p: with p; [
|
||||
libtmux
|
||||
pip
|
||||
]
|
||||
))
|
||||
]
|
||||
}
|
||||
done
|
||||
'';
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ofirgall/tmux-window-name";
|
||||
description = "Tmux plugin to name your windows smartly, like IDE's";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ndom91 ];
|
||||
};
|
||||
};
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{
|
||||
"serverVersion": "0.19.18",
|
||||
"uiVersion": "0.19.18",
|
||||
"serverHash": "sha256-NUr96dsH3Gd+1ouOAgPheU0hnDI37a87EN642u482Sg=",
|
||||
"serverCargoHash": "sha256-oI8o+29kqjkAP2DIoSopPMQb5YlZNja1hV1bVmfMIvU=",
|
||||
"uiHash": "sha256-7WcPujev7VrkoX5vvGUvS0hUVJnCZjsceO5zK36jPbw=",
|
||||
"uiPNPMDepsHash": "sha256-dRUD/R7Qtlfy2saX7grfdi5qBDP8gc3L3+C2m7ro1CU="
|
||||
"serverVersion": "0.19.19",
|
||||
"uiVersion": "0.19.19",
|
||||
"serverHash": "sha256-JcJV1dEWlFsbv9eH2yQMGYEZEFB/Pe1xtL1UNtKI6c4=",
|
||||
"serverCargoHash": "sha256-cwmz8Gf7T1IsCRyxo3ap+byX+Aj7+iCTHmZ/IeMN2no=",
|
||||
"uiHash": "sha256-67OMwzOGl+dMX5YNPPBG/QwKOVerkSa7ICbrQl4YBp4=",
|
||||
"uiPNPMDepsHash": "sha256-T7vHfeewwT8fCH6AM6u2GFRkd+KWsp4lKj5I7I+yJAo="
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# This gets installed automatically by cargoInstallHook,
|
||||
# but we don't actually need it, and it leaks a reference to rustc.
|
||||
postInstall = ''
|
||||
postInstall = lib.optionals (!stdenv.hostPlatform.isDarwin) ''
|
||||
rm $out/lib/libhtml2md.so
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user