mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
commit
1f2a60a8e6
20 changed files with 136 additions and 59 deletions
|
|
@ -4744,12 +4744,6 @@
|
|||
githubId = 32384814;
|
||||
name = "Nikita Mitasov";
|
||||
};
|
||||
chaduffy = {
|
||||
email = "charles@dyfis.net";
|
||||
github = "charles-dyfis-net";
|
||||
githubId = 22370;
|
||||
name = "Charles Duffy";
|
||||
};
|
||||
changlinli = {
|
||||
email = "mail@changlinli.com";
|
||||
github = "changlinli";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
ffmpeg_6,
|
||||
protobuf,
|
||||
openal-soft,
|
||||
minizip-ng,
|
||||
minizip-ng-compat,
|
||||
range-v3,
|
||||
tl-expected,
|
||||
hunspell,
|
||||
|
|
@ -45,14 +45,14 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "6.8.2";
|
||||
version = "6.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-1zKAywh6EXGDi5t7CKQRWADRKX0mFEMyeIoK4hrTFFQ=";
|
||||
hash = "sha256-QCGtESg+38lHWCFcsevHdc0kQ7LKJQmJjUJWszphah8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
xxhash
|
||||
ffmpeg_6
|
||||
openal-soft
|
||||
minizip-ng
|
||||
minizip-ng-compat
|
||||
range-v3
|
||||
tl-expected
|
||||
rnnoise
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ telegram-desktop.override {
|
|||
inherit withWebkit;
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec {
|
||||
pname = "64gram-unwrapped";
|
||||
version = "1.2.2";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TDesktop-x64";
|
||||
repo = "tdesktop";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qT7GQCqIaEZmbtFeoWMChUX6J8uqs/+UZYi0YoBIYDY=";
|
||||
hash = "sha256-CcYcdSgeVEbGKOzim+Q/gIxMIfDGaSStF4cLLttA+SM=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
let
|
||||
nodejs = nodejs_24;
|
||||
|
||||
version = "2025.12.5";
|
||||
version = "2025.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goauthentik";
|
||||
repo = "authentik";
|
||||
tag = "version/${version}";
|
||||
hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ=";
|
||||
hash = "sha256-uIg47z4LaCawF/5ir4mKE6DpDnEpQ8DuObCNaq6TcYk=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -137,8 +137,8 @@ let
|
|||
|
||||
outputHash =
|
||||
{
|
||||
"aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs=";
|
||||
"x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8=";
|
||||
"aarch64-linux" = "sha256-EbLneRDCyLLLBOZ2DUDpf2TbZoTL8QMXP4WlAZEzS90=";
|
||||
"x86_64-linux" = "sha256-yDjwN/+lX2i9WYDXq4yWwf9o8nA4342iHDDQH4Jt7eQ=";
|
||||
}
|
||||
.${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
|
||||
|
||||
|
|
|
|||
|
|
@ -79,6 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ chaduffy ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
45
pkgs/by-name/co/codexbar/package.nix
Normal file
45
pkgs/by-name/co/codexbar/package.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
nix-update-script,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "codexbar";
|
||||
version = "0.37.2";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip";
|
||||
hash = "sha256-3I98PH/eAH1G9up+1AiwXshxGoZRNf3bFxsx5W32unc=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [ "--url=https://github.com/steipete/CodexBar" ];
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Show usage stats for AI coding-provider limits";
|
||||
homepage = "https://codex.bar/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Br1ght0ne ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -62,9 +62,6 @@ buildGoModule (finalAttrs: {
|
|||
homepage = "https://github.com/folbricht/desync";
|
||||
changelog = "https://github.com/folbricht/desync/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
chaduffy
|
||||
matshch
|
||||
];
|
||||
maintainers = with lib.maintainers; [ matshch ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "newt";
|
||||
version = "1.12.4";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fosrl";
|
||||
repo = "newt";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-wYLnuKIU+wcCxF57cdfepTVm52btfdrveQ8Y+R9flMo=";
|
||||
hash = "sha256-Kt7YCxHQEv1DeASPJtjAwzmAiWBrkf+XNs7aJEZvb+M=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-WfIK+Q8WQ372NzLw6DRapv1nYPduShi4KnVJBPk0Oz0=";
|
||||
vendorHash = "sha256-QJ70q53k4EvLpiMY+Nm70QqaZk14V0Q1CrwWVSowdUU=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
homepage = "https://freeplane.org/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ chaduffy ];
|
||||
maintainers = [ ];
|
||||
mainProgram = "freeplane";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.7.52";
|
||||
version = "1.7.53";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "grav";
|
||||
|
|
@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
|
||||
hash = "sha256-xAXUS4qGOSExniggPWwIooalHjHhpk4YK5tQvkRLp0g=";
|
||||
hash = "sha256-Ug8sIEMwIoCUyHpxk5NaGHaJA7lThgbUuu+8NpmI9YI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
in
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "irpf";
|
||||
version = "2026-1.4";
|
||||
version = "2026-1.5";
|
||||
|
||||
# https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
|
||||
# Para outros sistemas operacionais -> Multi
|
||||
|
|
@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
in
|
||||
fetchzip {
|
||||
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
|
||||
hash = "sha256-tPIu1nt1FtGyjM1vnzAHenjlKeAKJfqPus+XsP2CH5g=";
|
||||
hash = "sha256-/y0XE+i+Sug/2TfqQuPQesYaDVn41v3hkikU/hmxxNE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
_7zz,
|
||||
undmg,
|
||||
pname,
|
||||
version,
|
||||
hash,
|
||||
|
|
@ -20,17 +20,16 @@ stdenvNoCC.mkDerivation {
|
|||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ _7zz ];
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "LosslessCut.app";
|
||||
sourceRoot = ".";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p "$out/Applications"
|
||||
cd ..
|
||||
mv "$sourceRoot" "$out/Applications"
|
||||
cp -r LosslessCut.app "$out/Applications"
|
||||
mkdir -p "$out/bin"
|
||||
ln -s "$out/Applications/$(basename "$sourceRoot")/Contents/MacOS/LosslessCut" "$out/bin/losslesscut"
|
||||
ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut"
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -4,36 +4,38 @@
|
|||
callPackage,
|
||||
buildPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "losslesscut";
|
||||
version = "3.64.0";
|
||||
version = "3.69.0";
|
||||
metaCommon = {
|
||||
description = "Swiss army knife of lossless video/audio editing";
|
||||
homepage = "https://mifi.no/losslesscut/";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
maintainers = with lib.maintainers; [
|
||||
ShamrockLee
|
||||
Br1ght0ne
|
||||
];
|
||||
mainProgram = "losslesscut";
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
x86_64-appimage = callPackage ./build-from-appimage.nix {
|
||||
inherit pname version metaCommon;
|
||||
hash = "sha256-K90cJuJFcIkPuAQusJcOBkZ5PQ8T25q7IFIhtmK+jzc=";
|
||||
hash = "sha256-F56q4nv/viWmVJpKcUR0EmtXwojO/DBwRvycYxOhJnY=";
|
||||
inherit (buildPackages) makeWrapper;
|
||||
};
|
||||
x86_64-dmg = callPackage ./build-from-dmg.nix {
|
||||
inherit pname version metaCommon;
|
||||
hash = "sha256-BO2KoYAevbVL0Eix1knvaPVBkWucYI89VkueWYRTcXY=";
|
||||
hash = "sha256-q4KNGmUsiVZhsVtoLYEQZWLg8R+ry4wtHkvyxP3d9ko=";
|
||||
isAarch64 = false;
|
||||
};
|
||||
aarch64-dmg = callPackage ./build-from-dmg.nix {
|
||||
inherit pname version metaCommon;
|
||||
hash = "sha256-/M5yafZQDqCoDzHpjZBC80CcL9KMO5lwvyCcq19caRg=";
|
||||
hash = "sha256-x4AbSC3zvgOErMgXHVp9FsznDRWIhx40SxVarKOfpYs=";
|
||||
isAarch64 = true;
|
||||
};
|
||||
x86_64-windows = callPackage ./build-from-windows.nix {
|
||||
inherit pname version metaCommon;
|
||||
hash = "sha256-FYrnTiZ5ATT+Y08zceIIHbVM//5Bg2ozIEyC5UxmIno=";
|
||||
hash = "sha256-uvcQZXaZnhRg+RgFTjrUrjipVGmJLMahqXtBMfAoGOQ=";
|
||||
};
|
||||
in
|
||||
(
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
let
|
||||
pname = "nrfconnect";
|
||||
version = "5.2.1";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://eu.files.nordicsemi.com/ui/api/v1/download?repoKey=web-assets-com_nordicsemi&path=external%2fswtools%2fncd%2flauncher%2fv${version}%2fnrfconnect-${version}-x86_64.AppImage";
|
||||
hash = "sha256-3YPH/HmeAHm1Cf4/tCUIRTdT3JX0tOLVS/b6lk27Wn4=";
|
||||
hash = "sha256-IRpY8D9jigQjWvBVEfFshqTV4h9/6OaJf9T178B2m/c=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openshift";
|
||||
version = "4.19.0-202505210330";
|
||||
version = "4.22.0-202605222050";
|
||||
gitCommit = "8f1c8b5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openshift";
|
||||
repo = "oc";
|
||||
tag = "openshift-clients-${finalAttrs.version}";
|
||||
hash = "sha256-EIsK73zSozqBOFZalURNcamk5FRDusUEhXtup60c2zQ=";
|
||||
hash = "sha256-WUFeRRKymdOJfbFhut9nGAvMCI1OsanYGKCioEZSOng=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -29,9 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Terminal interaction recorder and player";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [
|
||||
chaduffy
|
||||
zimbatm
|
||||
];
|
||||
maintainers = with lib.maintainers; [ zimbatm ];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "spacetimedb";
|
||||
version = "2.5.0-hotfix1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clockworklabs";
|
||||
repo = "spacetimedb";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-CXc/AKzK4aTVhKgzIzkA5cdInYqOu7sMdCUyeSwixbc=";
|
||||
hash = "sha256-vQ50ufMn/y5lqoXiyX0SjN15MkA0LMrpp5SkJExR/co=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iO1TGctPVmQxn1h+Md6p3pbEkfXNX91n5NZhIDK5BLI=";
|
||||
cargoHash = "sha256-YwhWgJP0znAN5H1ZBXWAwe8DimRC6cvs6gGyTUIRRuc=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
43
pkgs/by-name/tr/trex/package.nix
Normal file
43
pkgs/by-name/tr/trex/package.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
nix-update-script,
|
||||
unzip,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "trex";
|
||||
version = "2.0.0";
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/amebalabs/TRex/releases/download/v${finalAttrs.version}/TRex-${finalAttrs.version}.zip";
|
||||
hash = "sha256-To3vxoDapuCcstq6V2qiQ2g8d1uTqVEM5fElRNIi3k0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
cp -r *.app $out/Applications
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Copy any text on your screen using OCR";
|
||||
homepage = "https://github.com/amebalabs/TRex";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Br1ght0ne ];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wezterm";
|
||||
version = "0-unstable-2026-03-31";
|
||||
version = "0-unstable-2026-06-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wezterm";
|
||||
repo = "wezterm";
|
||||
rev = "577474d89ee61aef4a48145cdec82a638d874751";
|
||||
rev = "6ff5492866490be859f23db01541df0ec67dcc3b";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-LNQJAYILUZ9LZ4E4soh7tr5Zy+rntHz1Gd66lyPPkdk=";
|
||||
hash = "sha256-1QPLiudM2rmD3OYrc+LKvzE9VJS6Ut7QiS48pf0zU14=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
# https://github.com/wezterm/wezterm/blob/main/nix/flake.nix#L134
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-waXq0U2Ud7FhlJn3evO7bZSBsOAA39ObiVWHycNQXmA=";
|
||||
cargoHash = "sha256-UDCTHu/BiAXXQOEJtZhVVJ9lYFyHSSxviLSqXuZismk=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezvizapi";
|
||||
version = "1.0.4.9";
|
||||
version = "1.0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RenierM26";
|
||||
repo = "pyEzvizApi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hpfsDZzv5rhr8y7PNcprwFoQdVUq0UlN+UtPrkqz4zE=";
|
||||
hash = "sha256-m3rj8ELu8/X/3TPtC1wfN8VOs7eHKb4DNvb7JAoKXfE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue