Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7f4495da2a
|
|
@ -6267,16 +6267,6 @@
|
|||
githubId = 541748;
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
federicoschonborn = {
|
||||
name = "Federico Damián Schonborn";
|
||||
email = "fdschonborn@gmail.com";
|
||||
github = "FedericoSchonborn";
|
||||
githubId = 62166915;
|
||||
matrix = "@FedericoDSchonborn:matrix.org";
|
||||
keys = [
|
||||
{ fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; }
|
||||
];
|
||||
};
|
||||
fedx-sudo = {
|
||||
email = "fedx-sudo@pm.me";
|
||||
github = "FedX-sudo";
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ stdlib,,,,41.2.2,,vyp
|
|||
teal-language-server,,,http://luarocks.org/dev,,,
|
||||
telescope.nvim,,,,,5.1,
|
||||
telescope-manix,,,,,,
|
||||
tiktoken_core,,,,,,natsukium
|
||||
tl,,,,,,mephistophiles
|
||||
toml,,,,,,mrcjkb
|
||||
toml-edit,,,,,5.1,mrcjkb
|
||||
|
|
|
|||
|
|
|
@ -96,6 +96,14 @@ with lib.maintainers; {
|
|||
shortName = "Blockchains";
|
||||
};
|
||||
|
||||
budgie = {
|
||||
members = [
|
||||
bobby285271
|
||||
];
|
||||
scope = "Maintain Budgie desktop environment";
|
||||
shortName = "Budgie";
|
||||
};
|
||||
|
||||
buildbot = {
|
||||
members = [
|
||||
lopsided98
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
name = "budgie";
|
||||
|
||||
meta.maintainers = [ lib.maintainers.federicoschonborn ];
|
||||
meta.maintainers = lib.teams.budgie.members;
|
||||
|
||||
nodes.machine = { ... }: {
|
||||
imports = [
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.61.0";
|
||||
version = "0.61.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-NBBBeTy15q6G30XR2PVd/xdIg41U2pWSPtqpdQX/+9o=";
|
||||
hash = "sha256-/m4s5BW33I9g9hi5j3Vtui271w8Jv91+rQrI3qpO5Og=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config which zip ]
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://valent.andyholmes.ca";
|
||||
changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md";
|
||||
license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ];
|
||||
maintainers = with maintainers; [ federicoschonborn aleksana ];
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.14.2";
|
||||
version = "3.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7Cd5lxPSXXCvYLLh334qnDmd9zbF1LMxTNoZEBpzHS4=";
|
||||
sha256 = "sha256-GC9rkB35m+a/9pEvD7aNjE4z3qrv33NES842crrzD3I=";
|
||||
};
|
||||
vendorHash = "sha256-pYB9J7Zf6MApGpFL7HzqIDcC/vERiVE4z8SsipIeJ7c=";
|
||||
vendorHash = "sha256-f5tLyq9tP5tdE73Mlee9vAUSHqkUAtAJkwjZP/K6wPM=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "roxctl";
|
||||
version = "4.3.4";
|
||||
version = "4.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = "stackrox";
|
||||
rev = version;
|
||||
sha256 = "sha256-5UMU3oKi3QhREum2YevOzwF5OOi8quPWgt+kgGjkeFQ=";
|
||||
sha256 = "sha256-zTZ03Qtb3ndBf1MunhYS8rzPReExzEPGxCh1JexkwuA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Jzv4ozR8RJiwkgVGGq6dlV/7rbBLq8hFe/Pm4SJZCkU=";
|
||||
vendorHash = "sha256-Sl5eIK8PWeGi2V7q/Qm5Gfjj1A9nQPtM0BGdO6inPxk=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "deck";
|
||||
version = "1.35.0";
|
||||
version = "1.36.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kong";
|
||||
repo = "deck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Cng1T/TjhPttLFcI3if0Ea/M2edXDnrMVAFzAZmNAD8=";
|
||||
hash = "sha256-bbHJilMh7qnGvYuid8/PmIg5m42jddqOOuMd7mzQmCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -21,7 +21,7 @@ buildGoModule rec {
|
|||
];
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-tv/wI4AN10io9x1wl2etKC+MB2vz+6FkmT/eJSsT4VI=";
|
||||
vendorHash = "sha256-Er9m8G020SKEN8jMIhEYiKvF27YY4dZvG0noYaH3bPU=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd deck \
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "3.99.22";
|
||||
version = "3.99.23";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.22-build-240307lufv3wsra-x86_64.AppImage";
|
||||
hash = "sha256-T3MABc11rWRjCU+4fvbpYDVq4XjSVfEeBrS03ITw8x8=";
|
||||
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.99.23-build-240309svrjfqia1-x86_64.AppImage";
|
||||
hash = "sha256-8kZk5tEJCcSPKgpsVKrHB5twujZF2LdepW7HIJsb52E=";
|
||||
};
|
||||
appimage = appimageTools.wrapType2 {
|
||||
inherit version pname src;
|
||||
|
|
|
|||
|
|
@ -48,23 +48,23 @@ let
|
|||
# and often with different versions. We write them on three lines
|
||||
# like this (rather than using {}) so that the updater script can
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.17.10.30974";
|
||||
versions.x86_64-darwin = "5.17.10.30974";
|
||||
versions.x86_64-linux = "5.17.10.3512";
|
||||
versions.aarch64-darwin = "5.17.11.31580";
|
||||
versions.x86_64-darwin = "5.17.11.31580";
|
||||
versions.x86_64-linux = "5.17.11.3835";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
|
||||
name = "zoomusInstallerFull.pkg";
|
||||
hash = "sha256-JWGy8je6hFDTSKPx4GAUDMJdi5/zKoj4KK5w6E0pcsI=";
|
||||
hash = "sha256-oCCZksH5sgfPVxh6I7ZpIMvkMX0+HnL1R9voNRjTUP4=";
|
||||
};
|
||||
x86_64-darwin = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
|
||||
hash = "sha256-lO0fyW5catdgKZ7cAQhdAbfQW+EewdCjTne+ZC3UW3w=";
|
||||
hash = "sha256-6bIUfS6bZWh7fEq2xY++nIbnmE5DJxte6sjyoSKUMzU=";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-dXpfgouZjd+0YyHz1c/7VL3a1SATAX8BpkR4KBeEDbc=";
|
||||
hash = "sha256-eIa8ESoYi0gPbJbqahqKKvnM7rGPT+WeMIYCyFEWHGE=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "fava";
|
||||
version = "1.27.2";
|
||||
version = "1.27.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kLQAWFHDmzsBjVMm/ZUn+TFkM52W0h0jg0wSp1tmPZQ=";
|
||||
hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [ setuptools-scm ];
|
||||
|
|
|
|||
|
|
@ -279,20 +279,6 @@ rec {
|
|||
|
||||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.26";
|
||||
cliRev = "v${version}";
|
||||
cliHash = "sha256-EPhsng0kLnweVbC8ZnH0NK1/yHlYSA5Sred4rWJX/Gs=";
|
||||
mobyRev = "v${version}";
|
||||
mobyHash = "sha256-IJ7m2mQnsLiom0EuZLpuLY6fYEko7rEy35igJv1AY04=";
|
||||
runcRev = "v1.1.8";
|
||||
runcHash = "sha256-rDJYEc64KW4Qa3Eg2oUjJqIKrg6THb5hxQFFbvb9Zp4=";
|
||||
containerdRev = "v1.6.22";
|
||||
containerdHash = "sha256-In7OkK3xm7Cz3H1jzG9b4tsZbmo44QCq8pNU+PPy8dY=";
|
||||
tiniRev = "v0.19.0";
|
||||
tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
|
||||
};
|
||||
|
||||
docker_24 = callPackage dockerGen rec {
|
||||
version = "24.0.5";
|
||||
cliRev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wf-shell";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WayfireWM";
|
||||
repo = "wf-shell";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs=";
|
||||
hash = "sha256-/ajFPIk8VJnlu2DzvSyGD3bC4r/pxALTkZeLNvs9dTw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "boxbuddy";
|
||||
version = "2.1.3";
|
||||
version = "2.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dvlv";
|
||||
repo = "BoxBuddyRS";
|
||||
rev = version;
|
||||
hash = "sha256-Jl9WhMqb40Olub5eV7Meu5DJi+bzWhPf3DCRPe4CMfo=";
|
||||
hash = "sha256-954jMFWSIDDqtMitgc8456SMcQLzi6LhLbVvOC45fxQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-HN+yGODTRXRa3AsBOuRVOnnU2pxBZfy0zlnCWs2oQCI=";
|
||||
cargoHash = "sha256-08d0mPSGYySxw2uq16MNOu2Y39kjqyfZ8rJ2yTOL3/w=";
|
||||
|
||||
# The software assumes it is installed either in flatpak or in the home directory
|
||||
# so the xdg data path needs to be patched here
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doublecmd";
|
||||
version = "1.1.10";
|
||||
version = "1.1.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doublecmd";
|
||||
repo = "doublecmd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vRB4qUws3kqCf7gp8Lzt8e9p68FaAfQyFHj4oJS9QtI=";
|
||||
hash = "sha256-8kxaJp9mSJ6fHOgVD5iFjecUU0Kt10KCAVSYMQt+bSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mbpoll";
|
||||
version = "1.5";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "epsilonrt";
|
||||
repo = "mbpoll";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-rHjLDgfKtpREemttWt0pr7VtBjwZCSplUR4OWNBVW0c=";
|
||||
hash = "sha256-rO3j/p7MABlxcwRAZm26u7wgODGFTtetSDhPWPzTuEA=";
|
||||
};
|
||||
|
||||
buildInputs = [ libmodbus ];
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "route-graph";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audiusGmbH";
|
||||
repo = "route-graph";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-sIUuy3J7wsxyTZ1XPSmQcDdoqfE+yKHqFKbYlwk7/j4=";
|
||||
hash = "sha256-OOXLmHxWre5t4tysDXV23PTkyUG6Zcpanw0fVCOLFTM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shopware-cli";
|
||||
version = "0.4.28";
|
||||
version = "0.4.29";
|
||||
src = fetchFromGitHub {
|
||||
repo = "shopware-cli";
|
||||
owner = "FriendsOfShopware";
|
||||
rev = version;
|
||||
hash = "sha256-zj/PusNQtJsbwKi9USZUL/7Zy5IM5mHOz7fYkBYfD2Q=";
|
||||
hash = "sha256-gAn/AkubIwcNBrqBWggVXEmqXuXxjt1xZop0dQ291pA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
nativeCheckInputs = [ git dart-sass ];
|
||||
|
||||
vendorHash = "sha256-h3XYXI9Lnfxrnm9U0u6ixDUGK6QBJU/GKVlODw+swy8=";
|
||||
vendorHash = "sha256-S7M7B4jtAe1jD6W5q2UewgwG++ecE46Rrp2Qt6kCDeQ=";
|
||||
|
||||
postInstall = ''
|
||||
export HOME="$(mktemp -d)"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -11,20 +11,20 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uv";
|
||||
version = "0.1.18";
|
||||
version = "0.1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = version;
|
||||
hash = "sha256-lHvSfp+pCECVbuwSj7zNmheA1pleHaitKG0wf24s/CY=";
|
||||
hash = "sha256-OJDN6guJpUfGhX2Sk47wLHfT3XT2mnSINPiI2DgyfsU=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0=";
|
||||
"pubgrub-0.2.1" = "sha256-C3A6WzpmR3l8MgUCFzoDdehLVRgk3/2VbCVFUS+iS9M=";
|
||||
"pubgrub-0.2.1" = "sha256-Pn60v5tfpGrssCeuaUcxw5eJ1g8Dk/+un0s8+k4abpo=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Simple GUI that displays the protocols implemented by a Wayland compositor";
|
||||
homepage = "https://gitlab.freedesktop.org/serebit/waycheck";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ julienmalka federicoschonborn ];
|
||||
maintainers = with maintainers; [ julienmalka ];
|
||||
mainProgram = "waycheck";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "2.0.7";
|
||||
version = "2.0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf";
|
||||
hash = "sha256-HP9fCP3CPsxc/l8nklV7bvEl4mDUYvQp+fT10AFX5LM=";
|
||||
hash = "sha256-WX30kF0DF85RNMapVrADCh1LKLnYpJdpgG/3dGWhuRs=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "clash-geoip";
|
||||
version = "20240212";
|
||||
version = "20240312";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb";
|
||||
sha256 = "sha256-cNVEWdIRo2Z2FluZIR0O5o3Aso4tDcVyHAG3DkNmpSQ=";
|
||||
sha256 = "sha256-h6nrlzFBRrvL+hUOnpWi/aixKDOlRoTV4zQYIHGslIY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
description = "The default background set for the Budgie Desktop";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-backgrounds";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
license = licenses.cc0;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/BuddiesOfBudgie/budgie-control-center";
|
||||
mainProgram = "budgie-control-center";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
license = licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
mainProgram = "org.buddiesofbudgie.budgie-desktop-view";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ federicoschonborn ];
|
||||
maintainers = lib.teams.budgie.members;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -102,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";
|
||||
license = with lib.licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ federicoschonborn ];
|
||||
maintainers = lib.teams.budgie.members;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/BuddiesOfBudgie/budgie-screensaver";
|
||||
mainProgram = "budgie-screensaver";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
license = licenses.gpl2Only;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Session manager for Budgie";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/budgie-session";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [federicoschonborn];
|
||||
maintainers = lib.teams.budgie.members;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Softish fork of Mutter 43.x";
|
||||
homepage = "https://github.com/BuddiesOfBudgie/magpie";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Analogue Clock Applet for the Budgie desktop";
|
||||
homepage = "https://github.com/samlane-ma/analogue-clock-applet";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,6 @@ stdenv.mkDerivation {
|
|||
homepage = "https://github.com/zalesyc/budgie-media-player-applet";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ federicoschonborn ];
|
||||
maintainers = lib.teams.budgie.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
|
|||
changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = teams.budgie.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://valent.andyholmes.ca/";
|
||||
changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,6 @@ mkXfceDerivation {
|
|||
meta = {
|
||||
description = "Windowing concept abstraction library for X11 and Wayland";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
maintainers = with lib; [ maintainers.federicoschonborn ] ++ teams.xfce.members;
|
||||
maintainers = lib.teams.xfce.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.67.0";
|
||||
version = "1.68.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-ftKtqKIgGVqiETTsirhydjmFiozqHoMRdu+IBZc8iMI=";
|
||||
hash = "sha256-N2OpKzniVUqi+L48mD5W1wW1GdECPVWZCo30f4XD3n0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgbinder";
|
||||
version = "1.1.37";
|
||||
version = "1.1.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mer-hybris";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes=";
|
||||
sha256 = "sha256-k5oCwi1KvyRVawH0d4Kp+MCxkymAtl6zVk7DVRXFVMg=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
homepage = "https://github.com/ibireme/yyjson";
|
||||
changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ federicoschonborn ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3297,6 +3297,39 @@ buildLuarocksPackage {
|
|||
};
|
||||
}) {};
|
||||
|
||||
tiktoken_core = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }:
|
||||
buildLuarocksPackage {
|
||||
pname = "tiktoken_core";
|
||||
version = "0.2.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/tiktoken_core-0.2.1-1.rockspec";
|
||||
sha256 = "0mdmrpg82vmk0cqiqdayyk4vvl299z0xqrg58q18dfs5nc27wkla";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/gptlang/lua-tiktoken",
|
||||
"rev": "61d831a81a01ba095f8c94e148b721b3aa7b1e45",
|
||||
"date": "2024-03-03T23:24:06+00:00",
|
||||
"path": "/nix/store/5ik17k726wl8hpz295n7dqq3438k8ddj-lua-tiktoken",
|
||||
"sha256": "11lpzxmmb4zglkp9czlzggd8i46r7whpq021b5d3fx7bc5a81d3n",
|
||||
"hash": "sha256-drSAVGHrdDdaWUEAfCE/2ZCI2nuffpbupO+TVWv/l4Y=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path" "sha256"]) ;
|
||||
|
||||
disabled = (luaOlder "5.1");
|
||||
propagatedBuildInputs = [ lua luarocks-build-rust-mlua ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/gptlang/lua-tiktoken";
|
||||
description = "An experimental port of OpenAI's Tokenizer to lua";
|
||||
maintainers = with lib.maintainers; [ natsukium ];
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }:
|
||||
buildLuarocksPackage {
|
||||
pname = "tl";
|
||||
|
|
|
|||
|
|
@ -642,6 +642,14 @@ with prev;
|
|||
'';
|
||||
});
|
||||
|
||||
tiktoken_core = prev.tiktoken_core.overrideAttrs (oa: {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
src = oa.src;
|
||||
hash = "sha256-YApsOGfAw34zp069lyGR6FGjxty1bE23+Tic07f8zI4=";
|
||||
};
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [ cargo rustPlatform.cargoSetupHook ];
|
||||
});
|
||||
|
||||
toml = prev.toml.overrideAttrs (oa: {
|
||||
patches = [ ./toml.patch ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiomqtt";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "sbtinstruments";
|
||||
repo = "aiomqtt";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ww4NdCtT04b4tRmarJjB4xmfRBNIQekP8iARAdpmBH0=";
|
||||
hash = "sha256-bV1elEO1518LVLwNDN5pzjxRgcG34K1XUsK7fTw8h+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyauth";
|
||||
version = "0.0.18";
|
||||
version = "0.0.20";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-t2AolP0GZ88b0+FqHXHIP1V6TIV61Bvd8wVXpZZltK0=";
|
||||
hash = "sha256-QQVgIPdonPXwpVl1nH8Cps4nGb2oTfeDvRBY1XgeUUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "autoflake";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jCAR+jRwG519zwW5hzvEhZ1Pzk5i3+qQ3/79FXb18B0=";
|
||||
hash = "sha256-yYt13FsKhkWcTwGh0yrH60M47EMXpEaVFf8eaH7NkJ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "brother";
|
||||
version = "4.0.0";
|
||||
version = "4.0.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "bieniu";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FLaSj1LQy/eWPxU1a4WGpsdoN5Zi4EwrgCmz8AXGeLc=";
|
||||
hash = "sha256-n1CIozKuF0+N8Vg3QA2jy5xNLDBJPdnhVT/xg1R+t90=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
From d448321436e8314d3e2a6a09d4017c4bc10f612d Mon Sep 17 00:00:00 2001
|
||||
From: Gaetan Lepage <gaetan@glepage.com>
|
||||
Date: Sat, 17 Feb 2024 17:37:22 +0100
|
||||
Subject: [PATCH] fix-dlopen-cuda
|
||||
|
||||
---
|
||||
gpuctypes/cuda.py | 20 ++++++++++++++++++--
|
||||
1 file changed, 18 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py
|
||||
index acba81c..091f7f7 100644
|
||||
--- a/gpuctypes/cuda.py
|
||||
+++ b/gpuctypes/cuda.py
|
||||
@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'):
|
||||
|
||||
|
||||
|
||||
+NAME_TO_PATHS = {
|
||||
+ "libcuda.so": ["@driverLink@/lib/libcuda.so"],
|
||||
+ "libnvrtc.so": ["@libnvrtc@"],
|
||||
+}
|
||||
+def _try_dlopen(name):
|
||||
+ try:
|
||||
+ return ctypes.CDLL(name)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
+ for candidate in NAME_TO_PATHS.get(name, []):
|
||||
+ try:
|
||||
+ return ctypes.CDLL(candidate)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
+ raise RuntimeError(f"{name} not found")
|
||||
+
|
||||
_libraries = {}
|
||||
-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda'))
|
||||
-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc'))
|
||||
+_libraries['libcuda.so'] = _try_dlopen('libcuda.so')
|
||||
+_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so')
|
||||
|
||||
|
||||
cuuint32_t = ctypes.c_uint32
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -0,0 +1,127 @@
|
|||
{ lib
|
||||
, config
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, addDriverRunpath
|
||||
, cudaSupport ? config.cudaSupport
|
||||
, rocmSupport ? config.rocmSupport
|
||||
, cudaPackages
|
||||
, setuptools
|
||||
, ocl-icd
|
||||
, rocmPackages
|
||||
, pytestCheckHook
|
||||
, gpuctypes
|
||||
, testCudaRuntime ? false
|
||||
, testOpenclRuntime ? false
|
||||
, testRocmRuntime ? false
|
||||
}:
|
||||
assert testCudaRuntime -> cudaSupport;
|
||||
assert testRocmRuntime -> rocmSupport;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gpuctypes";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "gpuctypes";
|
||||
owner = "tinygrad";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xUMvMBK1UhZaMZfik0Ia6+siyZGpCkBV+LTnQvzt/rw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./0001-fix-dlopen-cuda.patch;
|
||||
inherit (addDriverRunpath) driverLink;
|
||||
libnvrtc =
|
||||
if cudaSupport
|
||||
then "${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so"
|
||||
else "Please import nixpkgs with `config.cudaSupport = true`";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gpuctypes/opencl.py \
|
||||
--replace "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'"
|
||||
''
|
||||
# hipGetDevicePropertiesR0600 is a symbol from rocm-6. We are currently at rocm-5.
|
||||
# We are not sure that this works. Remove when rocm gets updated to version 6.
|
||||
+ lib.optionalString rocmSupport ''
|
||||
substituteInPlace gpuctypes/hip.py \
|
||||
--replace "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \
|
||||
--replace "/opt/rocm/lib/libhiprtc.so" "${rocmPackages.clr}/lib/libhiprtc.so" \
|
||||
--replace "hipGetDevicePropertiesR0600" "hipGetDeviceProperties"
|
||||
|
||||
substituteInPlace gpuctypes/comgr.py \
|
||||
--replace "/opt/rocm/lib/libamd_comgr.so" "${rocmPackages.rocm-comgr}/lib/libamd_comgr.so"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "gpuctypes" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (!testOpenclRuntime) [
|
||||
"test/test_opencl.py"
|
||||
] ++ lib.optionals (!rocmSupport) [
|
||||
"test/test_hip.py"
|
||||
] ++ lib.optionals (!cudaSupport) [
|
||||
"test/test_cuda.py"
|
||||
];
|
||||
|
||||
# Require GPU access to run (not available in the sandbox)
|
||||
pytestFlagsArray = lib.optionals (!testCudaRuntime) [
|
||||
"-k" "'not TestCUDADevice'"
|
||||
] ++ lib.optionals (!testRocmRuntime) [
|
||||
"-k" "'not TestHIPDevice'"
|
||||
] ++ lib.optionals (testCudaRuntime || testOpenclRuntime || testRocmRuntime) [
|
||||
"-v"
|
||||
];
|
||||
|
||||
# Running these tests requires special configuration on the builder.
|
||||
# e.g. https://github.com/NixOS/nixpkgs/pull/256230 implements a nix
|
||||
# pre-build hook which exposes the devices and the drivers in the sandbox
|
||||
# based on requiredSystemFeatures:
|
||||
requiredSystemFeatures = lib.optionals testCudaRuntime [
|
||||
"cuda"
|
||||
] ++ lib.optionals testOpenclRuntime [
|
||||
"opencl"
|
||||
] ++ lib.optionals testRocmRuntime [
|
||||
"rocm"
|
||||
];
|
||||
|
||||
passthru.gpuChecks = {
|
||||
cuda = gpuctypes.override {
|
||||
cudaSupport = true;
|
||||
testCudaRuntime = true;
|
||||
};
|
||||
opencl = gpuctypes.override {
|
||||
testOpenclRuntime = true;
|
||||
};
|
||||
rocm = gpuctypes.override {
|
||||
rocmSupport = true;
|
||||
testRocmRuntime = true;
|
||||
};
|
||||
};
|
||||
|
||||
preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) ''
|
||||
addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs
|
||||
'';
|
||||
|
||||
# If neither rocmSupport or cudaSupport is enabled, no tests are selected
|
||||
dontUsePytestCheck = !(rocmSupport || cudaSupport) && (!testOpenclRuntime);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ctypes wrappers for HIP, CUDA, and OpenCL";
|
||||
homepage = "https://github.com/tinygrad/gpuctypes";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage matthewcroughan wozeparrot ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
diff --git a/gpuctypes/cuda.py b/gpuctypes/cuda.py
|
||||
index acba81c..aac5fc7 100644
|
||||
--- a/gpuctypes/cuda.py
|
||||
+++ b/gpuctypes/cuda.py
|
||||
@@ -143,9 +143,25 @@ def char_pointer_cast(string, encoding='utf-8'):
|
||||
|
||||
|
||||
|
||||
+NAME_TO_PATHS = {
|
||||
+ "libcuda.so": ["@driverLink@/lib/libcuda.so"],
|
||||
+ "libnvrtc.so": ["@libnvrtc@"],
|
||||
+}
|
||||
+def _try_dlopen(name):
|
||||
+ try:
|
||||
+ return ctypes.CDLL(name)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
+ for candidate in NAME_TO_PATHS.get(name, []):
|
||||
+ try:
|
||||
+ return ctypes.CDLL(candidate)
|
||||
+ except OSError:
|
||||
+ pass
|
||||
+ raise RuntimeError(f"{name} not found")
|
||||
+
|
||||
_libraries = {}
|
||||
-_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda'))
|
||||
-_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc'))
|
||||
+_libraries['libcuda.so'] = _try_dlopen('libcuda.so')
|
||||
+_libraries['libnvrtc.so'] = _try_dlopen('libnvrtc.so')
|
||||
|
||||
|
||||
cuuint32_t = ctypes.c_uint32
|
||||
|
|
@ -108,7 +108,8 @@ in buildPythonPackage {
|
|||
|
||||
format = "wheel";
|
||||
|
||||
src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}";
|
||||
src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}"
|
||||
or (throw "Unsupported '${pythonVersion}-${stdenv.hostPlatform.system}' target");
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for pulsar";
|
||||
|
|
|
|||
|
|
@ -0,0 +1,111 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, wheel
|
||||
, gpuctypes
|
||||
, numpy
|
||||
, tqdm
|
||||
, hypothesis
|
||||
, librosa
|
||||
, onnx
|
||||
, pillow
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, safetensors
|
||||
, sentencepiece
|
||||
, tiktoken
|
||||
, torch
|
||||
, transformers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tinygrad";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinygrad";
|
||||
repo = "tinygrad";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QAccZ79qUbe27yUykIf22WdkxYUlOffnMlShakKfp60=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gpuctypes
|
||||
numpy
|
||||
tqdm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "tinygrad" ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
librosa
|
||||
onnx
|
||||
pillow
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
safetensors
|
||||
sentencepiece
|
||||
tiktoken
|
||||
torch
|
||||
transformers
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# Require internet access
|
||||
"test_benchmark_openpilot_model"
|
||||
"test_bn_alone"
|
||||
"test_bn_linear"
|
||||
"test_bn_mnist"
|
||||
"test_car"
|
||||
"test_chicken"
|
||||
"test_chicken_bigbatch"
|
||||
"test_conv_mnist"
|
||||
"testCopySHMtoDefault"
|
||||
"test_data_parallel_resnet"
|
||||
"test_e2e_big"
|
||||
"test_fetch_small"
|
||||
"test_huggingface_enet_safetensors"
|
||||
"test_linear_mnist"
|
||||
"test_load_convnext"
|
||||
"test_load_enet"
|
||||
"test_load_enet_alt"
|
||||
"test_load_llama2bfloat"
|
||||
"test_load_resnet"
|
||||
"test_openpilot_model"
|
||||
"test_resnet"
|
||||
"test_shufflenet"
|
||||
"test_transcribe_batch12"
|
||||
"test_transcribe_batch21"
|
||||
"test_transcribe_file1"
|
||||
"test_transcribe_file2"
|
||||
"test_transcribe_long"
|
||||
"test_transcribe_long_no_batch"
|
||||
"test_vgg7"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
"test/extra/test_lr_scheduler.py"
|
||||
"test/models/test_mnist.py"
|
||||
"test/models/test_real_world.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple and powerful neural network framework";
|
||||
homepage = "https://github.com/tinygrad/tinygrad";
|
||||
changelog = "https://github.com/tinygrad/tinygrad/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pillow";
|
||||
version = "10.2.0.20240213";
|
||||
version = "10.2.0.20240311";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "types-Pillow";
|
||||
hash = "sha256-SAC2G/fqva4vGxet4NCAcJ7TPp8moukA5HDotW6+I4c=";
|
||||
hash = "sha256-9hH2uvfDeE/lUO6SsQgGD1VEpHw3xzrLgaeF8cYxJ3I=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.36";
|
||||
version = "3.2.37";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Of09iIRON1YLdHjmRVxerTlvUff8I8G5m+Y3pRBfRnY=";
|
||||
hash = "sha256-aZKfS/xJYy5P+/xqReKty6yNQi8CcVfe4pOxios1/O4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.230.0";
|
||||
version = "0.231.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8sfyjUlyJ9A96xD7n6BeJxDNhT7FMq/7HlVC373uLM8=";
|
||||
hash = "sha256-xZ6hyAnfWMwNZfkDIPV+0Cjs/HBMwBME6tZwQW38Cmk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,30 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, boost
|
||||
, autoconf
|
||||
, automake
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "re-flex";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Genivia";
|
||||
repo = "RE-flex";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eQ2+RthvOKCd2Dl6i+9DahJArFfOhPJkn6PI/yuaqos=";
|
||||
hash = "sha256-pjYiCRKaskJg1IuCxNBUQ9FY2abGi4HEZxsfZ5ctjNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ boost autoconf automake ];
|
||||
outputs = [ "out" "bin" "dev" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Genivia/RE-flex";
|
||||
homepage = "https://www.genivia.com/doc/reflex/html";
|
||||
description = "The regex-centric, fast lexical analyzer generator for C++ with full Unicode support";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.all;
|
||||
maintainers = with lib.maintainers; [ prrlvr ];
|
||||
mainProgram = "reflex";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sentry-cli";
|
||||
version = "2.30.0";
|
||||
version = "2.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-cli";
|
||||
rev = version;
|
||||
sha256 = "sha256-pICQBV8tIGeNoQF694uaVGx1eFN0iLACv1ztKXucKlM=";
|
||||
sha256 = "sha256-ThZb6/Mprz9qgEGsJ+EbENvjmgehDsjVgFGBq4PZMRM=";
|
||||
};
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ];
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
cargoHash = "sha256-sYPmVum1xY4p7imR1iZdXugM5je4ncNoEf0Q8dvWM4c=";
|
||||
cargoHash = "sha256-yoBoPk5PvMLGvhU/kg+WwO5WgwEnfKQlnkCC6IctfAI=";
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd sentry-cli \
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "turso-cli";
|
||||
version = "0.88.8";
|
||||
version = "0.89.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tursodatabase";
|
||||
repo = "turso-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F+/xCs35ugdr2KlHbZ01wE9AX3qhsxvfaly/yDCcGJI=";
|
||||
hash = "sha256-BFL5D4GkcYdHkEc5448jgQflhhncePYfHMTprPynvmU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rTeW2RQhcdwJTAMQELm4cdObJbm8gk/I2Qz3Wk3+zpI=";
|
||||
vendorHash = "sha256-oxlIaSSLZ6JirvUPOIHirp43G5qrDFJhNd6HjA9UYKo=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.22.3";
|
||||
version = "0.22.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = "pocketbase";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cJ/+A7gFPWkp8BxLWmEQaR1SloU4M1+cI3bV3VOkrD4=";
|
||||
hash = "sha256-IhqrPXQ430sfdI8HB4cLS8dntluYgstO3DBfZyd8Jrk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-C4sipr1rxNIFY5FA94ogNhryGntLGIJStRJHy7NZjAs=";
|
||||
vendorHash = "sha256-iXcMxsiKyCY91a7zCl+OxkHwSIKx/AfT0HOEpZ8JgeM=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dolt";
|
||||
version = "1.35.1";
|
||||
version = "1.35.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dolthub";
|
||||
repo = "dolt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UtyLC+rPft4g4ENO3IzQDBmsyJg38zPxTVDWiuf7Kc8=";
|
||||
sha256 = "sha256-p4hScXdIDa3zAHltUMhg61YyfpdFWZaJ8LAdQi8OZv8=";
|
||||
};
|
||||
|
||||
modRoot = "./go";
|
||||
subPackages = [ "cmd/dolt" ];
|
||||
vendorHash = "sha256-VQVpKgqzfnRCoHnZSCq2RZywNYcLyBycz74Ir48QwCk=";
|
||||
vendorHash = "sha256-1fH9JrWi38jtPjaN2lEplCkiLdYa4g6FsdcB8ZQqVD4=";
|
||||
proxyVendor = true;
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abcMIDI";
|
||||
version = "2024.03.05";
|
||||
version = "2024.03.13";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
|
||||
hash = "sha256-nZVI+fIS5av+RUX4P1CsncnQUuqDmIRoT1TGRLdg2Bg=";
|
||||
hash = "sha256-lhnCf4Il3pRNY6tfb19qyRDbeuWSPK6JEmOrcG92MeI=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-caps-viewer";
|
||||
version = "3.33";
|
||||
version = "3.34";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SaschaWillems";
|
||||
repo = "VulkanCapsViewer";
|
||||
rev = version;
|
||||
hash = "sha256-eKUgsT3KDua+whO0JdtnniKqoRmBt58LELeUz24goPM=";
|
||||
hash = "sha256-F1D/+Q/GXqQazTNgwdiHS9qqIHy0YGssmagw615E+xg=";
|
||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||
# To help us, they've put it in a git-submodule.
|
||||
# The result will work with any vulkan-loader version.
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Like neofetch, but much faster because written in C";
|
||||
homepage = "https://github.com/fastfetch-cli/fastfetch";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ];
|
||||
maintainers = with lib.maintainers; [ gerg-l khaneliman ];
|
||||
platforms = lib.platforms.all;
|
||||
mainProgram = "fastfetch";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "otel-cli";
|
||||
version = "0.4.1";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "equinix-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-kOTReHG7byOqKsaVrXXNq9DAyawTz4hUeR4Q5lJKmiM=";
|
||||
hash = "sha256-XVhnDtt2FhYgfGWDPFkneZTboeHGaIbiF5YdHoqB8N8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-HwbEqWtOqiTe5Z/MtMAs63Lzvll/vgmbCpMTREXgtXA=";
|
||||
|
|
|
|||
|
|
@ -7,17 +7,23 @@
|
|||
, llvmPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "plfit";
|
||||
version = "0.9.4";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntamas";
|
||||
repo = "plfit";
|
||||
rev = version;
|
||||
hash = "sha256-hnmP/56P2anR0S8zQyQqN1lbge5GgK+P8Lx8bRkwSxA=";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XRl6poEdgPNorFideQmEJHCU+phs4rIhMYa8iAOtL1A=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (python != null) ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail ' ''${Python3_SITEARCH}' ' ${placeholder "out"}/${python.sitePackages}' \
|
||||
--replace-fail ' ''${Python3_SITELIB}' ' ${placeholder "out"}/${python.sitePackages}'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
] ++ lib.optionals (python != null) [
|
||||
|
|
@ -35,11 +41,13 @@ stdenv.mkDerivation rec {
|
|||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fitting power-law distributions to empirical data";
|
||||
homepage = "https://github.com/ntamas/plfit";
|
||||
changelog = "https://github.com/ntamas/plfit/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/ntamas/plfit/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -31,16 +31,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "netbird";
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netbirdio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8=";
|
||||
hash = "sha256-StZDhCBuwmJk8VimbsVO9Sfxlv5NcpV689YPUZRgOLk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34=";
|
||||
vendorHash = "sha256-n5n9bIQ026WlvwatMmEIBaLGfquTgek1eiQDb0xDAdI=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
hash = "sha256-q7XtYOBruEmjPC4gx+hBO5oRwbxL7wQJenBS8Pl6yRk=";
|
||||
hash = "sha256-wbbh4IpAla3I/xgmiuzy9E9npS/PUtRFCZS4dl7JYRQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-av4xUjoUGt53UoEpWULv15JKVWZq1x0YXvF5XFf4meQ=";
|
||||
cargoHash = "sha256-TPW+dic9KdtGXGlcEi7YAmt442ZJRifumnrmcX8+unM=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "2.0.6";
|
||||
version = "2.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uywQshOjdz8Vi/yN6X25LQYVLv/indzTHPmE56BqidI=";
|
||||
sha256 = "sha256-MMxLy7clzvE5LyrpvKCffBpyV0eiOn7aHMH929aT+KM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8ZuJF3hdmOOP4s7FIIPc7xTUAPT5TahH/8Yn5hGEnX0=";
|
||||
cargoHash = "sha256-dKcghpc2aaXOtcRpABqTzwtlRM2RBGzAnXZMFbMbdlk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
|
|
|||
|
|
@ -30767,7 +30767,7 @@ with pkgs;
|
|||
dnglab = callPackage ../tools/graphics/dnglab { };
|
||||
|
||||
inherit (callPackage ../applications/virtualization/docker {})
|
||||
docker_20_10 docker_24 docker_25;
|
||||
docker_24 docker_25;
|
||||
|
||||
docker = docker_24;
|
||||
docker-client = docker.override { clientOnly = true; };
|
||||
|
|
|
|||
|
|
@ -4943,6 +4943,8 @@ self: super: with self; {
|
|||
|
||||
gpsoauth = callPackage ../development/python-modules/gpsoauth { };
|
||||
|
||||
gpuctypes = callPackage ../development/python-modules/gpuctypes { };
|
||||
|
||||
gpustat = callPackage ../development/python-modules/gpustat { };
|
||||
|
||||
gpxpy = callPackage ../development/python-modules/gpxpy { };
|
||||
|
|
@ -14772,6 +14774,8 @@ self: super: with self; {
|
|||
|
||||
tinydb = callPackage ../development/python-modules/tinydb { };
|
||||
|
||||
tinygrad = callPackage ../development/python-modules/tinygrad { };
|
||||
|
||||
tinyobjloader-py = callPackage ../development/python-modules/tinyobjloader-py { };
|
||||
|
||||
tinyrecord = callPackage ../development/python-modules/tinyrecord { };
|
||||
|
|
|
|||
Loading…
Reference in New Issue