Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
32be7227d2
1353
pkgs/applications/graphics/vkdt/Cargo.lock
generated
Normal file
1353
pkgs/applications/graphics/vkdt/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -21,20 +21,33 @@
|
||||
, libmad
|
||||
, testers
|
||||
, vkdt
|
||||
, xxd
|
||||
, alsa-lib
|
||||
, cargo
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkdt";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-Sk/K+EWvJBkwwD5R1gH9ZQHetojrJTTJrKW9Dvr+lHA=";
|
||||
hash = "sha256-LXUTDwUjlfyhtXkYW4Zivqt8vyctoz+ID5AQ7gg+d9A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rawler-0.6.3" = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw=";
|
||||
};
|
||||
};
|
||||
cargoRoot = "src/pipe/modules/i-raw/rawloader-c";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
clang
|
||||
cmake
|
||||
glslang
|
||||
@ -42,9 +55,12 @@ stdenv.mkDerivation rec {
|
||||
llvmPackages.openmp
|
||||
pkg-config
|
||||
rsync
|
||||
rustPlatform.cargoSetupHook
|
||||
xxd
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
exiv2
|
||||
ffmpeg
|
||||
freetype
|
||||
|
||||
@ -10,15 +10,15 @@ let
|
||||
if stdenv.hostPlatform.isLinux then
|
||||
{
|
||||
stable = "0.0.72";
|
||||
ptb = "0.0.112";
|
||||
canary = "0.0.508";
|
||||
development = "0.0.32";
|
||||
ptb = "0.0.113";
|
||||
canary = "0.0.509";
|
||||
development = "0.0.33";
|
||||
}
|
||||
else
|
||||
{
|
||||
stable = "0.0.323";
|
||||
ptb = "0.0.142";
|
||||
canary = "0.0.617";
|
||||
ptb = "0.0.143";
|
||||
canary = "0.0.618";
|
||||
development = "0.0.55";
|
||||
};
|
||||
version = versions.${branch};
|
||||
@ -30,15 +30,15 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
|
||||
hash = "sha256-wJIVKrP+F6IKeE7rT8vAmWRTtvWj9h3vKJDsPu8x2kQ=";
|
||||
hash = "sha256-1Rhn6pH6KvuhGNTymBK01tA78it7JXekG48XvRZQOiA=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
hash = "sha256-zvjIVXZtYl9GdDCvKyuU+9+rNhRX4fGLpw9jPKEpFCs=";
|
||||
hash = "sha256-jLAeix6IQ6rqOM8NKNryEeswB5VSzc1lIEI7X7Nrc68=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
|
||||
hash = "sha256-Ec2kdoVA5NImT4afXi4GZ9GQF8NjT+h7qM7K3w3qrjU=";
|
||||
hash = "sha256-A87sVmaYRjRi0Q9IrXuQBr+yC+FtGgZA2L/9V4WuYbU=";
|
||||
};
|
||||
};
|
||||
x86_64-darwin = {
|
||||
@ -48,11 +48,11 @@ let
|
||||
};
|
||||
ptb = fetchurl {
|
||||
url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
|
||||
hash = "sha256-69ioQKRoQ1RTO39BdVppOuwQb/6ylnSy1luMAX5TCeQ=";
|
||||
hash = "sha256-ZbHz0OR7p873U7YpwsHxa3Uuf3uPsmVOQF9exARQzdI=";
|
||||
};
|
||||
canary = fetchurl {
|
||||
url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
|
||||
hash = "sha256-L/nnwHNPni93axBvXS4MH/NuoQbl7Ugva2sozVg6GEk=";
|
||||
hash = "sha256-UsJRw7gforZ1OAA6GNtXuTe/y95mIr7R6MRa+qe44tk=";
|
||||
};
|
||||
development = fetchurl {
|
||||
url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
|
||||
|
||||
43
pkgs/by-name/at/atproto-goat/package.nix
Normal file
43
pkgs/by-name/at/atproto-goat/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atproto-goat";
|
||||
version = "0-unstable-2024-10-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bluesky-social";
|
||||
repo = "indigo";
|
||||
rev = "06bacb465af714feb77609566aba15ab1ed41e24";
|
||||
hash = "sha256-wWsE3sAGZQmOBVqTgy4RjoU8zmtuvyQIj9DjwSbtmKw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/goat/main.go \
|
||||
--replace-fail "versioninfo.Short()" '"${version}"' \
|
||||
--replace-fail '"github.com/carlmjohnson/versioninfo"' ""
|
||||
'';
|
||||
|
||||
vendorHash = "sha256-T+jtxubVKskrLGTUa4RI24o/WTSFCBk60HhyCFujPOI=";
|
||||
|
||||
subPackages = [ "cmd/goat" ];
|
||||
|
||||
passthru.updateScript = unstableGitUpdater {
|
||||
hardcodeZeroVersion = true;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Go AT protocol CLI tool";
|
||||
homepage = "https://github.com/bluesky-social/indigo/blob/main/cmd/goat/README.md";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ pyrox0 ];
|
||||
mainProgram = "goat";
|
||||
};
|
||||
}
|
||||
38
pkgs/by-name/ea/earthlyls/package.nix
Normal file
38
pkgs/by-name/ea/earthlyls/package.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
|
||||
earthlyls,
|
||||
nix-update-script,
|
||||
testers,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "earthlyls";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "glehmann";
|
||||
repo = "earthlyls";
|
||||
rev = version;
|
||||
hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
tests.version = testers.testVersion { package = earthlyls; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Earthly language server";
|
||||
homepage = "https://github.com/glehmann/earthlyls";
|
||||
changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "earthlyls";
|
||||
maintainers = with lib.maintainers; [ paveloom ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
2
pkgs/by-name/ma/markdown-oxide/Cargo.lock
generated
2
pkgs/by-name/ma/markdown-oxide/Cargo.lock
generated
@ -642,7 +642,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "markdown-oxide"
|
||||
version = "0.23.1"
|
||||
version = "0.24.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
|
||||
@ -3,16 +3,15 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "markdown-oxide";
|
||||
version = "0.23.1-unstable-2024-07-20";
|
||||
version = "0.24.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Feel-ix-343";
|
||||
repo = "markdown-oxide";
|
||||
rev = "0f1542a54a44de8313087f6c60e6ecd54f52ede5";
|
||||
hash = "sha256-zxJZnhN2cN3sNd+PHi2jYuHDDA4ekEVIi3X52Z/8TGM=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LMDL2jLHKgPBkz7QcU4yVzR2ySaboCZ9AOKmdA/NA4c=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20240910";
|
||||
version = "20241029";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
hash = "sha256-cn0qK81dwbamh5PBlPuC9KtDWyT2NwSxDD0XlCRAv6s=";
|
||||
hash = "sha256-iS7OSWjAYBRHP7X1C+DiMwX2xudA6tXX6cEv/IcICxc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,51 +2,51 @@
|
||||
"depends": [
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
|
||||
"rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
|
||||
"sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
|
||||
"url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
|
||||
"ref": "v0.2.1",
|
||||
"packages": [
|
||||
"checksums"
|
||||
],
|
||||
"path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source",
|
||||
"ref": "v0.1.0",
|
||||
"rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01",
|
||||
"sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"minline"
|
||||
],
|
||||
"path": "/nix/store/rirdlc80sn6pp5vmbw32xaaj56n1zxl8-source",
|
||||
"ref": "v0.1.1",
|
||||
"rev": "a1f11470316500dceb88d7d6c30979c35aab14ff",
|
||||
"sha256": "0wy8svpw0cldh1j6g5af4pxh6d6lac79sngg0i24dplh9pli7wb3",
|
||||
"srcDir": ".",
|
||||
"url": "https://github.com/h3rald/minline/archive/a1f11470316500dceb88d7d6c30979c35aab14ff.tar.gz"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"packages": [
|
||||
"nimquery"
|
||||
],
|
||||
"path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source",
|
||||
"ref": "v2.0.1",
|
||||
"rev": "83e2866422788a1db1906734de056b410a49d047",
|
||||
"sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z",
|
||||
"srcDir": "",
|
||||
"url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz"
|
||||
"srcDir": "src"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source",
|
||||
"rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec",
|
||||
"sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q",
|
||||
"url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz",
|
||||
"ref": "0.5.14",
|
||||
"packages": [
|
||||
"zippy"
|
||||
],
|
||||
"path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source",
|
||||
"ref": "0.5.14",
|
||||
"rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec",
|
||||
"sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q",
|
||||
"srcDir": "src",
|
||||
"url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz"
|
||||
"srcDir": "src"
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source",
|
||||
"rev": "83e2866422788a1db1906734de056b410a49d047",
|
||||
"sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z",
|
||||
"url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz",
|
||||
"ref": "v2.0.1",
|
||||
"packages": [
|
||||
"nimquery"
|
||||
],
|
||||
"srcDir": ""
|
||||
},
|
||||
{
|
||||
"method": "fetchzip",
|
||||
"path": "/nix/store/bn7iv51yqbqi0h8z1r9v2vmpqnz46yfr-source",
|
||||
"rev": "c138b34bf3c5198c26ecfad5e251fa5d56e5ad48",
|
||||
"sha256": "0wwfhjhwpmanjv4vv9yl0a0mami9x8qzzb5nialcfp9iasbwiqgj",
|
||||
"url": "https://github.com/h3rald/minline/archive/c138b34bf3c5198c26ecfad5e251fa5d56e5ad48.tar.gz",
|
||||
"ref": "v0.1.2",
|
||||
"packages": [
|
||||
"minline"
|
||||
],
|
||||
"srcDir": "."
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildNimPackage (finalAttrs: {
|
||||
pname = "min";
|
||||
version = "0.43.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "h3rald";
|
||||
repo = "min";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-4coeasFZrbwYQ6FM0ENkh/pPcvN3rCuheUpmHr1f3wM=";
|
||||
hash = "sha256-Uw03aSFn3EV3H2SkYoYzM5S/WLhEmLV8s3mRF3oT8ro=";
|
||||
};
|
||||
|
||||
lockFile = ./lock.json;
|
||||
@ -16,15 +16,6 @@ buildNimPackage (finalAttrs: {
|
||||
buildInputs = [ openssl pcre ];
|
||||
|
||||
prePatch = ''
|
||||
# substitude our code for their code for data
|
||||
substituteInPlace min.nimble \
|
||||
--replace-fail 'import' "" \
|
||||
--replace-warn 'minpkg/core/meta' "" \
|
||||
--replace-warn 'pkgVersion' '"${finalAttrs.version}"' \
|
||||
--replace-warn 'pkgAuthor' '""' \
|
||||
--replace-warn 'pkgDescription' '""' \
|
||||
--replace-warn 'pkgName' '"${finalAttrs.pname}"' \
|
||||
|
||||
# remove vendorabilities
|
||||
find . -name '*.a' -delete
|
||||
find minpkg/lib -name '*.nim' \
|
||||
|
||||
@ -5,9 +5,10 @@
|
||||
pkg-config,
|
||||
libxkbcommon,
|
||||
python3,
|
||||
python3Packages,
|
||||
runCommand,
|
||||
wprs,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "wprs";
|
||||
version = "0-unstable-2024-10-22";
|
||||
|
||||
@ -24,9 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
python3
|
||||
python3Packages.psutil
|
||||
|
||||
(python3.withPackages (pp: with pp; [ psutil ]))
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
@ -43,6 +42,10 @@ rustPlatform.buildRustPackage rec {
|
||||
cp wprs "$out/bin/wprs"
|
||||
'';
|
||||
|
||||
passthru.tests.sanity = runCommand "wprs-sanity" { nativeBuildInputs = [ wprs ]; } ''
|
||||
${wprs}/bin/wprs -h > /dev/null && touch $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "rootless remote desktop access for remote Wayland";
|
||||
license = licenses.asl20;
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiortm";
|
||||
version = "0.9.21";
|
||||
version = "0.9.22";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "MartinHjelmare";
|
||||
repo = "aiortm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-jRsriLdSLrX8TzU4DgUKGmazN9hYbWPjE383VCulNgU=";
|
||||
hash = "sha256-n8wdHmWMnbgQF6I34ifmNFMv48XowE7JIOkX5kko/io=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "typer" ];
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioswitcher";
|
||||
version = "4.1.0";
|
||||
version = "4.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "TomerFi";
|
||||
repo = "aioswitcher";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-iWEmKyg20qCww/Q+HjOj4Owp26xgY1kXQHVkmxFPfr4=";
|
||||
hash = "sha256-NQm3mKjXsv+0xFuRY3w7f4RmMhOjdb8wGVYcXoto8ZE=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
numpy,
|
||||
pandas,
|
||||
pytestCheckHook,
|
||||
fetchpatch2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -23,22 +22,6 @@ buildPythonPackage rec {
|
||||
hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Needed for below patch to apply properly
|
||||
(fetchpatch2 {
|
||||
name = "deprecate-mmtf-parsing.patch";
|
||||
url = "https://github.com/BioPandas/biopandas/commit/7a1517dbe76f2c70da8edb35f90c9fa69254e726.patch?full_index=1";
|
||||
hash = "sha256-RFtXFqUYl8GnZ319HsBwx5SUbfUDnR66Ppakdvtg/wI=";
|
||||
})
|
||||
# Remove nose as a dependency.
|
||||
(fetchpatch2 {
|
||||
name = "remove-nose.patch";
|
||||
url = "https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f.patch?full_index=1";
|
||||
hash = "sha256-fVl57/vGuzlYX/MBZnma1ZFCVmIpjr1k8t3bUJnb/uI=";
|
||||
excludes = [ "setup.py" ];
|
||||
})
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "looseversion" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -6,17 +6,19 @@
|
||||
asgi-csrf,
|
||||
click,
|
||||
click-default-group,
|
||||
flexcache,
|
||||
flexparser,
|
||||
httpx,
|
||||
hupper,
|
||||
itsdangerous,
|
||||
janus,
|
||||
jinja2,
|
||||
hupper,
|
||||
mergedeep,
|
||||
pint,
|
||||
platformdirs,
|
||||
pluggy,
|
||||
python-baseconv,
|
||||
pyyaml,
|
||||
typing-extensions,
|
||||
uvicorn,
|
||||
httpx,
|
||||
pytestCheckHook,
|
||||
pytest-asyncio,
|
||||
pytest-timeout,
|
||||
@ -30,8 +32,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasette";
|
||||
version = "0.64.8";
|
||||
format = "setuptools";
|
||||
version = "0.65";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -39,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "simonw";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nt/e0j1mF5Qkpp/dRa9W7En1WoGD2MsR3iREv9IQu5E=";
|
||||
hash = "sha256-POdw2vB0D2B5SyrC/HkFqlsMlWtbdC3cRM/cfDhv7Z4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -47,23 +49,31 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"pip"
|
||||
"setuptools"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiofiles
|
||||
asgi-csrf
|
||||
asgiref
|
||||
click
|
||||
click-default-group
|
||||
flexcache
|
||||
flexparser
|
||||
httpx
|
||||
hupper
|
||||
itsdangerous
|
||||
janus
|
||||
jinja2
|
||||
mergedeep
|
||||
pint
|
||||
platformdirs
|
||||
pluggy
|
||||
python-baseconv
|
||||
pyyaml
|
||||
setuptools
|
||||
typing-extensions
|
||||
uvicorn
|
||||
];
|
||||
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dj-database-url";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jazzband";
|
||||
repo = "dj-database-url";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i2btutob+5R+FFPlGwRSNF01MTfxVop8xaePDHxnqLE=";
|
||||
hash = "sha256-Q0A9wA/k1xObw0e8+9qVTfpxBNL4W9rXisi0ge+R3DM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -10,25 +10,28 @@
|
||||
pylibmc,
|
||||
pytestCheckHook,
|
||||
redis,
|
||||
setuptools,
|
||||
watchdog,
|
||||
watchdog-gevent,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dramatiq";
|
||||
version = "1.17.0";
|
||||
format = "setuptools";
|
||||
version = "1.17.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bogdanp";
|
||||
repo = "dramatiq";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c=";
|
||||
hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ prometheus-client ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ prometheus-client ];
|
||||
|
||||
optional-dependencies = {
|
||||
all = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-agent-parameters-types";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "faraday_agent_parameters_types";
|
||||
inherit version;
|
||||
hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w=";
|
||||
hash = "sha256-9+scGbRITK25XLJOMsMzPj/y5Wi05mB0dcXDhon9Cf4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "license-expression";
|
||||
version = "30.3.1";
|
||||
version = "30.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
owner = "aboutcode-org";
|
||||
repo = "license-expression";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+hINYDfUrNsCmXOIa4XO/ML1fJoB8/n6iQ4UGdw5ClE=";
|
||||
hash = "sha256-RAgGg0Xekcw5H13YHmkgfL7eybK+4tA8EAvVTuWFRck=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
@ -34,8 +34,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Utility library to parse, normalize and compare License expressions";
|
||||
homepage = "https://github.com/nexB/license-expression";
|
||||
changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst";
|
||||
homepage = "https://github.com/aboutcode-org/license-expression";
|
||||
changelog = "https://github.com/aboutcode-org/license-expression/blob/v${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@ -4,33 +4,45 @@
|
||||
python,
|
||||
glibcLocales,
|
||||
fetchFromGitHub,
|
||||
pytest-cov-stub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
six,
|
||||
simplejson,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mail-parser";
|
||||
version = "3.15.0";
|
||||
format = "setuptools";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpamScope";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw";
|
||||
repo = "mail-parser";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w=";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.utf-8";
|
||||
|
||||
nativeBuildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = [
|
||||
simplejson
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonRemoveDeps = [ "ipaddress" ];
|
||||
|
||||
dependencies = [
|
||||
six
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mailparser" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-cov-stub
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Taken from .travis.yml
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/test_main.py
|
||||
postCheck = ''
|
||||
${python.interpreter} -m mailparser -v
|
||||
${python.interpreter} -m mailparser -h
|
||||
${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mitogen";
|
||||
version = "0.3.14";
|
||||
version = "0.3.15";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "mitogen-hq";
|
||||
repo = "mitogen";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Gacn3EjyNq5LtjfbCczO+fqlq6+KgzxFs4d/K2xttHE=";
|
||||
hash = "sha256-Zj5hVkIvKdyKLCUyXwhfDy5idH3jehmgIJNahmDdvJ4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocstrings-python";
|
||||
version = "1.12.0";
|
||||
version = "1.12.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Dwh1MQuOjN/quxKlOMIadZ5MR8BrS/s6l4mwSBTfXQE=";
|
||||
hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
fetchpatch,
|
||||
pythonOlder,
|
||||
ninja,
|
||||
ignite,
|
||||
numpy,
|
||||
packaging,
|
||||
pybind11,
|
||||
torch,
|
||||
which,
|
||||
@ -14,41 +14,38 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "monai";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Project-MONAI";
|
||||
repo = "MONAI";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wm4n3FuIXbE99RRLsGnZDeHtR/Tmj6C0s29pvflZg+o=";
|
||||
hash = "sha256-PovYyRLgoYwxqGeCBpWxX/kdClYtYK1bgy8yRa9eue8=";
|
||||
# note: upstream consistently seems to modify the tag shortly after release,
|
||||
# so best to wait a few days before updating
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "remove-distutils";
|
||||
url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch";
|
||||
hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co=";
|
||||
})
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export MAX_JOBS=$NIX_BUILD_CORES;
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
ninja
|
||||
which
|
||||
];
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
propagatedBuildInputs = [
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
packaging
|
||||
torch
|
||||
ignite
|
||||
];
|
||||
|
||||
BUILD_MONAI = 1;
|
||||
env.BUILD_MONAI = 1;
|
||||
|
||||
doCheck = false; # takes too long; tries to download data
|
||||
|
||||
|
||||
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "openrgb-python";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hzuLNbMuF4LR8fkS6ByULdF37qYwL9smaVAP2G2E+Us=";
|
||||
hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.8.4";
|
||||
version = "0.8.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs=";
|
||||
hash = "sha256-3GzShdYNfaBxu1azPW8eUR5rDn8rrGiE/MhTmwzLOg8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "playwrightcapture";
|
||||
version = "1.26.2";
|
||||
version = "1.26.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
||||
owner = "Lookyloo";
|
||||
repo = "PlaywrightCapture";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ=";
|
||||
hash = "sha256-lZ0zteLZFKSeFBXWxUnPwlC9VVjUPulUCUocPGOUmuI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "praw";
|
||||
version = "7.8.0";
|
||||
version = "7.8.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "praw-dev";
|
||||
repo = "praw";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA=";
|
||||
hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@ -14,16 +14,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xknx";
|
||||
version = "3.2.0";
|
||||
version = "3.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XKNX";
|
||||
repo = "xknx";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-hgCmzWncHTsvfVeU/ePpu59THtmuLlqeCO11/L4BRvM=";
|
||||
hash = "sha256-FLGOY7IUdLvRbwSWUYbJl0VzOCJVwiG+2C+CjFAqI6g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -23,7 +23,11 @@ rec {
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
"x86_64-windows"
|
||||
]
|
||||
],
|
||||
|
||||
# Extra attributes to be merged into the resulting derivation's
|
||||
# meta attribute.
|
||||
meta ? {}
|
||||
}:
|
||||
|
||||
{ lib
|
||||
@ -172,7 +176,7 @@ rec {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ lorenzleutgeb liff ];
|
||||
mainProgram = "gradle";
|
||||
};
|
||||
} // meta;
|
||||
});
|
||||
|
||||
# NOTE: Default JDKs that are hardcoded below must be LTS versions
|
||||
@ -195,6 +199,12 @@ rec {
|
||||
version = "6.9.4";
|
||||
hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo=";
|
||||
defaultJava = jdk11;
|
||||
meta.knownVulnerabilities = [
|
||||
"CVE-2021-29429: '[...]files created with open permissions in the system temporary directory can allow an attacker to access information downloaded by Gradle[...]'"
|
||||
"CVE-2021-29427: '[...]there is a vulnerability which can lead to information disclosure and/or dependency poisoning[...] In some cases, Gradle may ignore content filters and search all repositories for dependencies. This only occurs when repository content filtering is used from within a `pluginManagement` block in a settings file.'"
|
||||
"CVE-2021-29428: '[...]the system temporary directory can be created with open permissions that allow multiple users to create and delete files within it. Gradle builds could be vulnerable to a local privilege escalation from an attacker quickly deleting and recreating files in the system temporary directory.'"
|
||||
"CVE-2021-32751: '[...]start scripts generated by the `application` plugin and the `gradlew` script are both vulnerable to arbitrary code execution when an attacker is able to change environment variables for the user running the script[...]'"
|
||||
];
|
||||
};
|
||||
|
||||
wrapGradle = {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage
|
||||
, fetchFromGitHub
|
||||
, gradle_6
|
||||
, fetchpatch
|
||||
, substitute
|
||||
}:
|
||||
|
||||
@ -16,10 +16,26 @@ callPackage ../generic.nix rec {
|
||||
hash = "sha256-VQcWkbGe/0qyt3M5WWgTxczwC5mE3lRHbYidOwRoukI=";
|
||||
};
|
||||
|
||||
patches = [(substitute {
|
||||
src = ./disable-git-version.patch;
|
||||
substitutions = [ "--subst-var-by" "version" version ];
|
||||
})];
|
||||
patches = [
|
||||
(substitute {
|
||||
src = ./disable-git-version.patch;
|
||||
substitutions = [ "--subst-var-by" "version" version ];
|
||||
})
|
||||
# FIXME: Remove after next release
|
||||
(fetchpatch {
|
||||
name = "Update-desktop-build-script-for-Gradle-7.0+";
|
||||
url = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/5610142126e161cbdc78a07c5d5abfbcd6eaf8a6.patch";
|
||||
hash = "sha256-zAiOz/Cu89Y+VmAyLCf7fzq0Mr0sYFZu14sqBZ/XvZU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Upstream patched this in https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/commit/c8a6fdd57c49fd91bf65be48679ae6a77578ef9f,
|
||||
# but the patch fails to apply cleanly. Manually replace the deprecated option instead.
|
||||
# FIXME: Remove after next release
|
||||
substituteInPlace gradle.properties \
|
||||
--replace-fail "-XX:MaxPermSize" "-XX:MaxMetaspaceSize"
|
||||
'';
|
||||
|
||||
desktopName = "Summoning Pixel Dungeon";
|
||||
|
||||
@ -28,7 +44,4 @@ callPackage ../generic.nix rec {
|
||||
downloadPage = "https://github.com/TrashboxBobylev/Summoning-Pixel-Dungeon/releases";
|
||||
description = "A fork of the Shattered Pixel Dungeon roguelike with added summoning mechanics";
|
||||
};
|
||||
|
||||
# Probably due to https://github.com/gradle/gradle/issues/17236
|
||||
gradle = gradle_6;
|
||||
}
|
||||
|
||||
@ -10,6 +10,9 @@
|
||||
}:
|
||||
let
|
||||
versionInfo = lib.importJSON ./version.json;
|
||||
|
||||
# Useful function for packaging schedulers, should be used unless the build system is too complex
|
||||
# passes some default values like src, version (all of which can be overridden)
|
||||
mkScxScheduler =
|
||||
packageType:
|
||||
args@{ schedulerName, ... }:
|
||||
@ -43,7 +46,7 @@ let
|
||||
"zerocallusedregs"
|
||||
] ++ (args.hardeningDisable or [ ]);
|
||||
|
||||
meta = args.meta // {
|
||||
meta = (args.meta or { }) // {
|
||||
description = args.meta.description or "";
|
||||
longDescription =
|
||||
(args.meta.longDescription or "")
|
||||
@ -65,7 +68,9 @@ let
|
||||
{ layered = import ./scx_layered; }
|
||||
{ rlfifo = import ./scx_rlfifo; }
|
||||
{ rustland = import ./scx_rustland; }
|
||||
{ rusty = import ./scx_rusty; }
|
||||
{ csheds = import ./scx_csheds.nix; }
|
||||
{ full = import ./scx_full.nix; }
|
||||
];
|
||||
in
|
||||
(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit mkScxScheduler; }) schedulers)
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" rec {
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_bpfland";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_bpfland";
|
||||
|
||||
@ -53,7 +53,7 @@ let
|
||||
});
|
||||
|
||||
in
|
||||
mkScxScheduler "c" rec {
|
||||
mkScxScheduler "c" {
|
||||
schedulerName = "scx_csheds";
|
||||
|
||||
postPatch = ''
|
||||
@ -78,8 +78,11 @@ mkScxScheduler "c" rec {
|
||||
|
||||
mesonFlags = [
|
||||
(lib.mapAttrsToList lib.mesonEnable {
|
||||
# systemd unit is implemented in the nixos module
|
||||
# upstream systemd files are a hassle to patch
|
||||
"systemd" = false;
|
||||
"openrc" = false;
|
||||
# libbpf is already fetched as FOD
|
||||
"libbpf_a" = false;
|
||||
# not for nix
|
||||
"libalpm" = false;
|
||||
@ -87,7 +90,7 @@ mkScxScheduler "c" rec {
|
||||
(lib.mapAttrsToList lib.mesonBool {
|
||||
# needed libs are already fetched as FOD
|
||||
"offline" = true;
|
||||
# rust schedulers are built seperately
|
||||
# rust based schedulers are built seperately
|
||||
"enable_rust" = false;
|
||||
})
|
||||
];
|
||||
@ -99,8 +102,8 @@ mkScxScheduler "c" rec {
|
||||
meta = {
|
||||
description = "Sched-ext C userspace schedulers";
|
||||
longDescription = ''
|
||||
This includes C based schedulers such as scx_central,
|
||||
scx_flatcg, scx_pair, scx_qmap, scx_simple, scx_userland.
|
||||
This includes C based schedulers such as scx_central, scx_flatcg,
|
||||
scx_nest, scx_pair, scx_qmap, scx_simple, scx_userland.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
28
pkgs/os-specific/linux/scx/scx_full.nix
Normal file
28
pkgs/os-specific/linux/scx/scx_full.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
scx,
|
||||
mkScxScheduler,
|
||||
}:
|
||||
scx.csheds.overrideAttrs (oldAttrs: {
|
||||
pname = "scx_full";
|
||||
postInstall =
|
||||
(oldAttrs.postInstall or "")
|
||||
+ ''
|
||||
cp ${lib.getExe scx.bpfland} $out/bin/
|
||||
cp ${lib.getExe scx.lavd} $out/bin/
|
||||
cp ${lib.getExe scx.layered} $out/bin/
|
||||
cp ${lib.getExe scx.rlfifo} $out/bin/
|
||||
cp ${lib.getExe scx.rustland} $out/bin/
|
||||
cp ${lib.getExe scx.rusty} $out/bin/
|
||||
'';
|
||||
|
||||
meta = oldAttrs.meta // {
|
||||
description = "Sched-ext C and Rust userspace schedulers";
|
||||
longDescription = ''
|
||||
This includes C based schedulers such as scx_central, scx_flatcg,
|
||||
scx_pair, scx_qmap, scx_simple, scx_userland and Rust based schedulers
|
||||
like scx_rustland, scx_bpfland, scx_lavd, scx_layered, scx_rlfifo.
|
||||
'';
|
||||
};
|
||||
})
|
||||
@ -4,7 +4,7 @@
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" rec {
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_lavd";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_lavd";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" rec {
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_layered";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_layered";
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" rec {
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_rlfifo";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_rlfifo";
|
||||
@ -28,8 +28,9 @@ mkScxScheduler "rust" rec {
|
||||
meta = {
|
||||
description = "Sched-ext Rust userspace scheduler";
|
||||
longDescription = ''
|
||||
scx_rlfifo is a simple FIFO scheduler runs in user-space, based on
|
||||
the scx_rustland_core framework. Not a production ready scheduler.
|
||||
scx_rlfifo is a simple FIFO scheduler runs in user-space, based on the
|
||||
scx_rustland_core framework. Not for production use, but useful to test as a
|
||||
baseline against complex scheduling polices or for a basic FIFO scheduling approach.
|
||||
'';
|
||||
mainProgram = "scx_rlfifo";
|
||||
};
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" rec {
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_rustland";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_rustland";
|
||||
|
||||
1689
pkgs/os-specific/linux/scx/scx_rusty/Cargo.lock
generated
Normal file
1689
pkgs/os-specific/linux/scx/scx_rusty/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
38
pkgs/os-specific/linux/scx/scx_rusty/default.nix
Normal file
38
pkgs/os-specific/linux/scx/scx_rusty/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
mkScxScheduler,
|
||||
}:
|
||||
|
||||
mkScxScheduler "rust" {
|
||||
schedulerName = "scx_rusty";
|
||||
|
||||
cargoRoot = "scheds/rust/scx_rusty";
|
||||
cargoLock.lockFile = ./Cargo.lock;
|
||||
postPatch = ''
|
||||
rm Cargo.toml Cargo.lock
|
||||
ln -fs ${./Cargo.lock} scheds/rust/scx_rusty/Cargo.lock
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
cd scheds/rust/scx_rusty
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
cp target/${stdenv.targetPlatform.config}/release/scx_rusty $out/bin/
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Sched-ext Rust userspace scheduler";
|
||||
longDescription = ''
|
||||
Multi-domain, BPF/userspace hybrid scheduler. BPF portion of the scheduler does
|
||||
a simple round robin in each domain, and the userspace portion calculates the load
|
||||
factor of each domain, and informs BPF of how tasks should be load balanced accordingly.
|
||||
Rusty is designed to be flexible, accommodating different architectures and workloads.
|
||||
'';
|
||||
mainProgram = "scx_rusty";
|
||||
};
|
||||
}
|
||||
@ -4,10 +4,10 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
srcJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
|
||||
srcFolder="$(dirname "$srcJson")"
|
||||
versionJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
|
||||
nixFolder="$(dirname "$versionJson")"
|
||||
|
||||
localVer=$(jq -r .version <$srcJson)
|
||||
localVer=$(jq -r .version <$versionJson)
|
||||
latestVer=$(curl -s https://api.github.com/repos/sched-ext/scx/releases/latest | jq -r .tag_name | sed 's/v//g')
|
||||
|
||||
if [ "$localVer" == "$latestVer" ]; then
|
||||
@ -36,16 +36,15 @@ jq \
|
||||
".scx.version = \$latestVer | .scx.hash = \$latestHash |\
|
||||
.bpftool.rev = \$bpftoolRev | .bpftool.hash = \$bpftoolHash |\
|
||||
.libbpf.rev = \$libbpfRev | .libbpf.hash = \$libbpfHash" \
|
||||
"$srcJson" | sponge $srcJson
|
||||
"$versionJson" | sponge $versionJson
|
||||
|
||||
rm -f Cargo.toml Cargo.lock
|
||||
|
||||
pushd scheds/rust
|
||||
for scheduler in bpfland lavd layered rlfifo rustland; do
|
||||
pushd "scx_$scheduler"
|
||||
for scheduler in bpfland lavd layered rlfifo rustland rusty; do
|
||||
pushd "scheds/rust/scx_$scheduler"
|
||||
|
||||
cargo generate-lockfile
|
||||
cp Cargo.lock "$srcFolder/scx_$scheduler/Cargo.lock"
|
||||
cp Cargo.lock "$nixFolder/scx_$scheduler/Cargo.lock"
|
||||
|
||||
popd
|
||||
done
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "bulletmark";
|
||||
repo = "libinput-gestures";
|
||||
rev = "ref/tags/${finalAttrs.version}";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-eMXNlSgQSuN+/5SXJQjsylC1ygHS87sIEmnVGFk3pzA=";
|
||||
};
|
||||
patches = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "7.1.3";
|
||||
version = "7.1.5";
|
||||
pname = "multitail";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folkertvanheusden";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-4iAFxDAS3gthYPECzyFj0AKzIGwZ9hTJ96fCnQGLbXU=";
|
||||
hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
@ -16,8 +16,11 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp bin/multitail $out/bin
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 multitail -t $out/bin/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user