Merge master into staging-next
This commit is contained in:
@@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "boxflat";
|
||||
version = "1.32.1";
|
||||
version = "1.33.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lawstorant";
|
||||
repo = "boxflat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-G+jLVFyBTy5DiWe8RM80eWnmnEunfHC+awduJjmGop0=";
|
||||
hash = "sha256-efEEp2FDXrMrNFalwqNiOhSgQq3uFHNJEA+o34yiS5E=";
|
||||
};
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
|
||||
@@ -15,17 +15,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "eza";
|
||||
version = "0.22.0";
|
||||
version = "0.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/mk8UMWiw+YrEcZK+C/2AkHXekvxTwWGBsJG7lWbz38=";
|
||||
hash = "sha256-/SqkaMt4XCdxMYMp7bYY9dYhe3KKKen/YpPg6Xr4fmI=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-6I7Enwp95u2d3xtnBykVCBE1tBm1OeAyQtxvGCDJPdc=";
|
||||
cargoHash = "sha256-NwguuIXNKwjFIhNGY1Una78RzxKykkNy+TCTuJvdxnM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
let
|
||||
pname = "fiddler-everywhere";
|
||||
version = "6.6.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
|
||||
hash = "sha256-qSQx9uz8P6k/wdPpe7XwhQ6qCZp6IUoLOZnkDWMFS3E=";
|
||||
hash = "sha256-pDXvzTuivQUjEr0mi/Bw98il6a1D7gJfQ5x5OuQu2wE=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fq";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wader";
|
||||
repo = "fq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/yRTeWyHVZZzWbkI/VhYD/T5KZq8E2j678LE8gn5ILE=";
|
||||
hash = "sha256-7AWugaSK9JFkWPKjjtgTZZ37rXUYYco2XXY4JEA7sSk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-vp7JQSnzijCkWximw4E2abd39l0qjIGkl+mPfEoli0w=";
|
||||
vendorHash = "sha256-87jMUtFy/BNUqsfzqyFtk3EB5i71O2zeFYvErV+HBAA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "hugo";
|
||||
version = "0.147.9";
|
||||
version = "0.148.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rTEtllENG33jAAgROjQrOjd4FKpe8uYAi3VLMII71SM=";
|
||||
hash = "sha256-EGga3tSaq+95s+3iamiCZ0qfdLE6Nw3hhZ7t54OIRjU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lSTSzQFR1JpGb8iYWyL/UM0W/AmFvFAcvi3+pJAJOws=";
|
||||
vendorHash = "sha256-vckvhw1kpcI2SXSNjUR6u5o21qz9ZcWw+namDglpwxc=";
|
||||
|
||||
checkFlags =
|
||||
let
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-tui";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhonus";
|
||||
repo = "jellyfin-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ECMZ8sWzX/aZK0N8zGz5dMCndVVxwkZW/qSvmHu+87Q=";
|
||||
hash = "sha256-gT6Zs32BhSfwH+JjwJcY9wK7WrqGuaWP+q/2rF8gp4M=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-rOKgaEDfOZfVuwMnp81Kd/mq0o0SkQD2lVNLubUq1HQ=";
|
||||
cargoHash = "sha256-U298pYDYzaRdU5w3FWHMkgaCT15aUTZITroVcEJ1Q0w=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -1,23 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
flutter327,
|
||||
stdenv,
|
||||
flutter332,
|
||||
fetchFromGitHub,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
alsa-lib,
|
||||
mpv-unwrapped,
|
||||
}:
|
||||
flutter327.buildFlutterApplication rec {
|
||||
flutter332.buildFlutterApplication rec {
|
||||
pname = "jellyflix";
|
||||
version = "1.0.0";
|
||||
version = "1.4.886";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyflix-app";
|
||||
repo = "jellyflix";
|
||||
tag = version;
|
||||
hash = "sha256-jqMjKpUOcL4hElEWM1mrQaoraZPj0aUNt2hGLw39inc=";
|
||||
hash = "sha256-1kQIHUHDRKuJbqrYo40vjmcxSTPEi5uVUSi2MCKk6qA=";
|
||||
};
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/services/api_service.dart \
|
||||
--replace-fail "} on DioException catch (_) {
|
||||
return _.response!.statusCode ?? 400;" "} on DioException catch (e) {
|
||||
return e.response!.statusCode ?? 400;"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 $src/assets/icon/icon.png $out/share/icons/hicolor/scalable/apps/jellyflix.png
|
||||
'';
|
||||
@@ -27,21 +36,51 @@ flutter327.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
mpv-unwrapped
|
||||
];
|
||||
|
||||
gitHashes = {
|
||||
filter_list = "sha256-/KgFLeoBTC3yq77esDqXwqP97+BcO3msYKki86OJEj0=";
|
||||
tentacle = "sha256-30a4Vn8wL0TdboSYPm1W+hRqXSsuID0gNOVnNe3KmPE=";
|
||||
media_kit = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_libs_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_libs_android_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_libs_ios_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_libs_macos_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
media_kit_libs_windows_video = "sha256-7ER60VqnXN1diIg/y8nuJWgX3N0viWBq0g+2FsGEwFM=";
|
||||
customSourceBuilders = {
|
||||
volume_controller =
|
||||
{ version, src, ... }:
|
||||
stdenv.mkDerivation {
|
||||
pname = "volume_controller";
|
||||
inherit version src;
|
||||
inherit (src) passthru;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace linux/CMakeLists.txt \
|
||||
--replace-fail '# ALSA dependency for volume control' 'find_package(PkgConfig REQUIRED)' \
|
||||
--replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r ./* $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
gitHashes =
|
||||
let
|
||||
media_kit-hash = "sha256-8dIiEeeBQOGST9kGHSp15Cdg377AQeBynbvWPAnGbJc=";
|
||||
in
|
||||
{
|
||||
filter_list = "sha256-cYnsujNMC6n9hZNHcbOevXWh54+jPeuHEUbdt1mDgP8=";
|
||||
tentacle = "sha256-30a4Vn8wL0TdboSYPm1W+hRqXSsuID0gNOVnNe3KmPE=";
|
||||
media_kit = media_kit-hash;
|
||||
media_kit_video = media_kit-hash;
|
||||
media_kit_libs_video = media_kit-hash;
|
||||
media_kit_libs_android_video = media_kit-hash;
|
||||
media_kit_libs_ios_video = media_kit-hash;
|
||||
media_kit_libs_macos_video = media_kit-hash;
|
||||
media_kit_libs_windows_video = media_kit-hash;
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "jellyflix";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "11.18";
|
||||
version = "11.20";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
|
||||
hash = "sha256-RkxnV9b7gzZgRl5YaMwwVkOJwdtEFwyZRvQw/B1CciM=";
|
||||
hash = "sha256-grZji+s1nffeSMdvsJBsmY0tW4yul2a7gYnenOtGa8g=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "revive";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgechev";
|
||||
repo = "revive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pQ6Gc9gCpU4GTy+4ipWH/kccadTCveM9KD74sOHpwmQ=";
|
||||
hash = "sha256-89BlSc2tgxAJUGZM951fF+0H+SOsl0+xz/G18neRZxI=";
|
||||
# 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;
|
||||
@@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-LrZMpq8ck9G5aXzXW3HZWiQ3KN7ze9WO/pmMGDLUXRw=";
|
||||
vendorHash = "sha256-ZxTBGcGSRWlYFBz0+5wR/9d8p7lvjJjyId5VNIVW9rQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snx-rs";
|
||||
version = "4.4.4";
|
||||
version = "4.4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ancwrd1";
|
||||
repo = "snx-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FVrj26pQthy6gY6UWXD4ACvy0/PPLXM0zrGOIjXl07U=";
|
||||
hash = "sha256-iJAeZj1tnd03qF3vvr+VKC5El0sVAFvl901biNvaAp4=";
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
|
||||
];
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ZzVTl1IVTAut+7o9QXaPDk8QCemRt2EoYX/Wi0RXJ3U=";
|
||||
cargoHash = "sha256-XBiwLpmqm1QgdTkaTJ7R+llRpTM7Wf8NX2Ar+//5l5w=";
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
|
||||
|
||||
Generated
+130
@@ -0,0 +1,130 @@
|
||||
{ fetchFromGitHub }:
|
||||
{
|
||||
yaml-cpp = fetchFromGitHub {
|
||||
owner = "jbeder";
|
||||
repo = "yaml-cpp";
|
||||
rev = "2f86d13775d119edbb69af52e5f566fd65c6953b";
|
||||
hash = "sha256-GtUTbEaRR3+GfVkt3t8EsqBHVffVKOl8urtQTaHozIo=";
|
||||
};
|
||||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
tag = "v1.13.0";
|
||||
hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ=";
|
||||
};
|
||||
reflect = fetchFromGitHub {
|
||||
owner = "boost-ext";
|
||||
repo = "reflect";
|
||||
tag = "v1.2.6";
|
||||
hash = "sha256-qjy5KyAm7/WeCyxMu/5QrBVjDSJPs0q/ZPyQwXp0WLA=";
|
||||
};
|
||||
magic_enum = fetchFromGitHub {
|
||||
owner = "Neargye";
|
||||
repo = "magic_enum";
|
||||
tag = "v0.9.7";
|
||||
hash = "sha256-P6fl/dcGOSE1lTJwZlimbvsTPelHwdQdZr18H4Zji20=";
|
||||
};
|
||||
fmt = fetchFromGitHub {
|
||||
owner = "fmtlib";
|
||||
repo = "fmt";
|
||||
tag = "11.1.4";
|
||||
hash = "sha256-sUbxlYi/Aupaox3JjWFqXIjcaQa0LFjclQAOleT+FRA=";
|
||||
};
|
||||
range-v3 = fetchFromGitHub {
|
||||
owner = "ericniebler";
|
||||
repo = "range-v3";
|
||||
tag = "0.12.0";
|
||||
hash = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU=";
|
||||
};
|
||||
pybind11 = fetchFromGitHub {
|
||||
owner = "pybind";
|
||||
repo = "pybind11";
|
||||
tag = "v2.13.6";
|
||||
hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
|
||||
};
|
||||
nlohmann_json = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
tag = "v3.11.3";
|
||||
hash = "sha256-7F0Jon+1oWL7uqet5i1IgHX0fUw/+z0QwEcA3zs5xHg=";
|
||||
};
|
||||
xtl = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xtl";
|
||||
tag = "0.8.0";
|
||||
hash = "sha256-hhXM2fG3Yl4KeEJlOAcNPVLJjKy9vFlI63lhbmIAsT8=";
|
||||
};
|
||||
xtensor = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xtensor";
|
||||
tag = "0.26.0";
|
||||
hash = "sha256-gAGLb5NPT4jiIpXONqY+kalxKCFKFXlNqbM79x1lTKE=";
|
||||
};
|
||||
xtensor-blas = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xtensor-blas";
|
||||
tag = "0.22.0";
|
||||
hash = "sha256-Lg6MjJbZUCMqv4eSiZQrLfJy/86RWQ9P85UfeIQJ6bk=";
|
||||
};
|
||||
benchmark = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
tag = "v1.9.1";
|
||||
hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
|
||||
};
|
||||
taskflow = fetchFromGitHub {
|
||||
owner = "taskflow";
|
||||
repo = "taskflow";
|
||||
tag = "v3.7.0";
|
||||
hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0=";
|
||||
};
|
||||
flatbuffers = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "flatbuffers";
|
||||
tag = "v24.3.25";
|
||||
hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA=";
|
||||
};
|
||||
simd-everywhere = fetchFromGitHub {
|
||||
owner = "simd-everywhere";
|
||||
repo = "simde";
|
||||
tag = "v0.8.2";
|
||||
hash = "sha256-igjDHCpKXy6EbA9Mf6peL4OTVRPYTV0Y2jbgYQuWMT4=";
|
||||
};
|
||||
spdlog = fetchFromGitHub {
|
||||
owner = "gabime";
|
||||
repo = "spdlog";
|
||||
tag = "v1.15.2";
|
||||
hash = "sha256-9RhB4GdFjZbCIfMOWWriLAUf9DE/i/+FTXczr0pD0Vg=";
|
||||
};
|
||||
tt-logger = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-logger";
|
||||
tag = "v1.1.3";
|
||||
hash = "sha256-N7Rs6mrs800B7XONCOOxR8koVEMWakZ1f2pexRwnUh8=";
|
||||
};
|
||||
nanomsg = fetchFromGitHub {
|
||||
owner = "nanomsg";
|
||||
repo = "nng";
|
||||
tag = "v1.8.0";
|
||||
hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA=";
|
||||
};
|
||||
libuv = fetchFromGitHub {
|
||||
owner = "libuv";
|
||||
repo = "libuv";
|
||||
tag = "v1.48.0";
|
||||
hash = "sha256-U68BmIQNpmIy3prS7LkYl+wvDJQNikoeFiKh50yQFoA=";
|
||||
};
|
||||
cxxopts = fetchFromGitHub {
|
||||
owner = "jarro2783";
|
||||
repo = "cxxopts";
|
||||
rev = "dbf4c6a66816f6c3872b46cc6af119ad227e04e1";
|
||||
hash = "sha256-2Z8DT9ihlmbiqCi8gcNzW4C5AUh4xCrpCKrGbRYcreQ=";
|
||||
};
|
||||
nanobind = fetchFromGitHub {
|
||||
owner = "wjakob";
|
||||
repo = "nanobind";
|
||||
tag = "v2.7.0";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE=";
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
callPackage,
|
||||
pkg-config,
|
||||
cmake,
|
||||
ninja,
|
||||
boost,
|
||||
numactl,
|
||||
mpi,
|
||||
hwloc,
|
||||
python3,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tt-metal";
|
||||
version = "0.59.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenstorrent";
|
||||
repo = "tt-metal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-iDO9q79gurIpIR+6swywlxTe3XI/2ToZxz11EuXc0gI=";
|
||||
};
|
||||
|
||||
cpm = fetchurl {
|
||||
url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.2/CPM.cmake";
|
||||
hash = "sha256-yM3DLAOBZTjOInge1ylk3IZLKjSjENO3EEgSpcotg10=";
|
||||
};
|
||||
|
||||
sfpi = callPackage ./sfpi.nix { };
|
||||
|
||||
postUnpack = ''
|
||||
mkdir -p "$sourceRoot/runtime"
|
||||
ln -s "$sfpi" "$sourceRoot/runtime/sfpi"
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
cp $cpm cmake/CPM.cmake
|
||||
cp $cpm tt_metal/third_party/umd/cmake/CPM.cmake
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
|
||||
(lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true)
|
||||
(lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version)
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p build/_deps
|
||||
${lib.concatMapAttrsStringSep "\n"
|
||||
(name: src: "cp -r --no-preserve=ownership,mode ${src} build/_deps/${name}-src")
|
||||
(
|
||||
import ./deps.nix {
|
||||
inherit fetchFromGitHub;
|
||||
}
|
||||
)
|
||||
}
|
||||
cp $cpm build/_deps/tt-logger-src/cmake/CPM.cmake
|
||||
'';
|
||||
|
||||
# CMake install fails because "$out/include/tt-logger" tree does not exist.
|
||||
preInstall = ''
|
||||
mkdir -p $out/include
|
||||
cp -r ../build/_deps/tt-logger-src/include/tt-logger $out/include/tt-logger
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/pkgconfig/magic_enum.pc \
|
||||
--replace-fail 'includedir=''${prefix}/' "includedir="
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
numactl
|
||||
boost
|
||||
mpi
|
||||
hwloc
|
||||
];
|
||||
|
||||
# Fixes the parallel hook crashing in the fixupPhase with no error.
|
||||
noAuditTmpdir = true;
|
||||
|
||||
meta = {
|
||||
description = "TT-NN operator library, and TT-Metalium low level kernel programming model";
|
||||
homepage = "https://github.com/tenstorrent/tt-metal";
|
||||
maintainers = with lib.maintainers; [ RossComputerGuy ];
|
||||
license = with lib.licenses; [ asl20 ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,48 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
runCommand,
|
||||
autoPatchelfHook,
|
||||
ncurses,
|
||||
isl_0_23,
|
||||
mpfr,
|
||||
libmpc,
|
||||
xz,
|
||||
}:
|
||||
let
|
||||
version = "6.12.0";
|
||||
in
|
||||
runCommand "sfpi-${version}"
|
||||
{
|
||||
inherit version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
isl_0_23
|
||||
mpfr
|
||||
libmpc
|
||||
xz
|
||||
];
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi-aarch64_Linux.txz";
|
||||
hash = "sha256-4RGwYhsEGx1/ANBUmNeSQcdmMRjFXN8Bg3DICLF6d5o=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/tenstorrent/sfpi/releases/download/v${version}/sfpi-x86_64_Linux.txz";
|
||||
hash = "sha256-hZvet4ErN1nNScjuU6YW7XEjvV9sR6xvb1IJjgMcXlg=";
|
||||
};
|
||||
}
|
||||
."${stdenv.hostPlatform.system}" or (throw "SFPI does not support ${stdenv.hostPlatform.system}");
|
||||
}
|
||||
''
|
||||
runPhase unpackPhase
|
||||
cp -r ../"$sourceRoot" "$out"
|
||||
runPhase fixupPhase
|
||||
''
|
||||
@@ -13,11 +13,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xlockmore";
|
||||
version = "5.83";
|
||||
version = "5.84";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz";
|
||||
sha256 = "sha256-ppjQmf1qPBnEHhl8EG2ejDo4pOj/B3wqpLrHYp1pyMM=";
|
||||
sha256 = "sha256-HiZ89pIL6nmBNemMJZBaj1Q21H5cYLJOCbIXZgWpRtQ=";
|
||||
curlOpts = "--user-agent 'Mozilla/5.0'";
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
import ./generic.nix rec {
|
||||
version = "0.23";
|
||||
urls = [
|
||||
"mirror://sourceforge/libisl/isl-${version}.tar.xz"
|
||||
"https://libisl.sourceforge.io/isl-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-XvxT767xUTAfTn3eOFa2aBLYFT3t4k+rF2c/gByGmPI=";
|
||||
configureFlags = [
|
||||
"--with-gcc-arch=generic" # don't guess -march=/mtune=
|
||||
];
|
||||
}
|
||||
@@ -27,9 +27,9 @@ stdenv.mkDerivation {
|
||||
inherit patches;
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.24") [ buildPackages.stdenv.cc ];
|
||||
depsBuildBuild = lib.optionals (lib.versionAtLeast version "0.23") [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs =
|
||||
lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.24") [
|
||||
lib.optionals (stdenv.hostPlatform.isRiscV && lib.versionOlder version "0.23") [
|
||||
autoreconfHook
|
||||
]
|
||||
++ [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qtutilities";
|
||||
version = "6.16.0";
|
||||
version = "6.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "qtutilities";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0VRV/f/Murx/ikX/UOrGWlenkmrV8kAqwiUD8lGyObc=";
|
||||
hash = "sha256-oPC4/JXqsCCX9DsUBeqYSvQeBGXYKBScaNSBCosugnY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guidata";
|
||||
version = "3.10.0";
|
||||
version = "3.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PlotPyStack";
|
||||
repo = "guidata";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-jVRUnP+0mPA79K23VI8/BXaCGvR2DUfyd+cXA8On34Y=";
|
||||
hash = "sha256-dh1WyUgJ+rkBFtcyXEFgU8UNPQEkJfiJBwmkT1eqKoI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "snakemake-interface-report-plugins";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "snakemake";
|
||||
repo = "snakemake-interface-report-plugins";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yk2fYlueaobXJgF7ob6jTccEz8r0geq1HFVsa+ZO30Q=";
|
||||
hash = "sha256-PSybPYo7soq7GHY7mo9q0yGxoFX2pvVeAXgRsa6oXoo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
||||
@@ -3344,9 +3344,18 @@ with pkgs;
|
||||
# ipscan is commonly known under the name angryipscanner
|
||||
angryipscanner = ipscan;
|
||||
|
||||
isl = isl_0_20;
|
||||
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
|
||||
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
|
||||
inherit
|
||||
(rec {
|
||||
isl = isl_0_20;
|
||||
isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
|
||||
isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { };
|
||||
isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
|
||||
})
|
||||
isl
|
||||
isl_0_20
|
||||
isl_0_23
|
||||
isl_0_24
|
||||
;
|
||||
|
||||
jackett = callPackage ../servers/jackett { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user