mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-20 15:41:16 +00:00
Merge master into staging-next
This commit is contained in:
@@ -232,6 +232,10 @@ in
|
||||
"openssh"
|
||||
"banner"
|
||||
] "Use services.openssh.settings.Banner instead.")
|
||||
(lib.mkRenamedOptionModule
|
||||
[ "services" "openssh" "moduliFile" ]
|
||||
[ "services" "openssh" "settings" "ModuliFile" ]
|
||||
)
|
||||
];
|
||||
|
||||
###### interface
|
||||
@@ -729,6 +733,14 @@ in
|
||||
'';
|
||||
example = "/etc/ssh/banner";
|
||||
};
|
||||
ModuliFile = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
default = "${config.services.openssh.package}/etc/ssh/moduli";
|
||||
defaultText = lib.literalExpression ''"''${config.services.openssh.package}/etc/ssh/moduli"'';
|
||||
description = ''
|
||||
Specifies the {manpage}`moduli(5)` file to use for Diffie-Hellman key exchange.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
@@ -740,16 +752,6 @@ in
|
||||
description = "Verbatim contents of {file}`sshd_config`.";
|
||||
};
|
||||
|
||||
moduliFile = lib.mkOption {
|
||||
example = "/etc/my-local-ssh-moduli;";
|
||||
type = lib.types.path;
|
||||
description = ''
|
||||
Path to `moduli` file to install in
|
||||
`/etc/ssh/moduli`. If this option is unset, then
|
||||
the `moduli` file shipped with OpenSSH will be used.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
users.users = lib.mkOption {
|
||||
@@ -770,14 +772,12 @@ in
|
||||
};
|
||||
users.groups.sshd = { };
|
||||
|
||||
services.openssh.moduliFile = lib.mkDefault "${cfg.package}/etc/ssh/moduli";
|
||||
services.openssh.sftpServerExecutable = lib.mkDefault "${cfg.package}/libexec/sftp-server";
|
||||
|
||||
environment.etc =
|
||||
authKeysFiles
|
||||
// authPrincipalsFiles
|
||||
// {
|
||||
"ssh/moduli".source = cfg.moduliFile;
|
||||
"ssh/sshd_config".source = sshconf;
|
||||
};
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "acme.sh";
|
||||
version = "3.1.3";
|
||||
version = "3.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acmesh-official";
|
||||
repo = "acme.sh";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oWVTk4fKbplMY4NJWf9eTokiHSxPMZ8lgSoG4aF8DVk=";
|
||||
hash = "sha256-xw10M4C6bqnxLxPeXE9dbFP/ajkpO2SQUJp56CeYysk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
runCommand,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
makeWrapper,
|
||||
@@ -10,13 +11,21 @@
|
||||
}:
|
||||
let
|
||||
pname = "beeper";
|
||||
version = "4.2.957";
|
||||
version = "4.2.985";
|
||||
src = fetchurl {
|
||||
url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
|
||||
hash = "sha256-wUGUwWopQ8ox2+UP5hXIIF2XVLQmZyhfb712S8JjTGk=";
|
||||
hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM=";
|
||||
};
|
||||
# Beeper 4.2.985+ ships AppImages without the type-2 magic bytes
|
||||
# (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires.
|
||||
linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } ''
|
||||
cp $src $out
|
||||
chmod +w $out
|
||||
printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none
|
||||
'';
|
||||
appimageContents = appimageTools.extract {
|
||||
inherit pname version src;
|
||||
inherit pname version;
|
||||
src = linuxSrc;
|
||||
|
||||
postExtract = ''
|
||||
appRoot="$out/resources/app"
|
||||
@@ -35,7 +44,6 @@ let
|
||||
|
||||
# hide version status element on about page otherwise an error message is shown
|
||||
sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $appRoot/build-browser/*.css
|
||||
|
||||
'';
|
||||
};
|
||||
in
|
||||
@@ -89,6 +97,7 @@ appimageTools.wrapAppImage {
|
||||
maintainers = with lib.maintainers; [
|
||||
jshcmpbll
|
||||
zh4ngx
|
||||
aspauldingcode
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "bomly";
|
||||
version = "0.16.1";
|
||||
version = "0.18.0";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -19,10 +19,10 @@ buildGoModule (finalAttrs: {
|
||||
owner = "bomly-dev";
|
||||
repo = "bomly-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-RJqYRCnE4lqR68lP9hL9hTOxXS3cPEgspBn2JgvffyM=";
|
||||
hash = "sha256-U7h9U4wiKohJQUauD8lmTScEWpT0kHZobJnJp8u0VbI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-W7FfqWV86D8fXZ4nm/0IVZuqocgo8/Sd9DA1Ef4SJ/4=";
|
||||
vendorHash = "sha256-rO1hymsyc6Ar7PtNLymP66tKK6X6mwVz4kQt4UzzwDI=";
|
||||
|
||||
# .gitattributes excludes all testdata from the GitHub tarball
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.9.1";
|
||||
srcHash = "sha256-aVJpUigIkGXsjvb40hEkZ2OiUghGcte3Msq4DMLIcbU=";
|
||||
vendorHash = "sha256-TG41xOrAAVBsE6CJ4av6y3bxfudk6gV49+/xB9Qu5ME=";
|
||||
manifestsHash = "sha256-DeTjdgOZyvrpQvIoXyVUfRIbHoJ9o74FRuTpVgT1/3I=";
|
||||
version = "2.9.2";
|
||||
srcHash = "sha256-a4925TZIqYqSk4/gyjwTeThOaQiIt1S3Md7b9eu7H20=";
|
||||
vendorHash = "sha256-iPj7F/7u5MrxoZJ4qk6XONeUmAXkMckpXK/P0HNQ78A=";
|
||||
manifestsHash = "sha256-uSfH2hcz1+rqHc9szCe4V40mTl6d+Li308WW9xLVXWs=";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "fresh";
|
||||
version = "0.4.3";
|
||||
version = "0.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sinelaw";
|
||||
repo = "fresh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-fVBDjcX0AjUTH+vKV5H4NYmknJYfHNHRizuzjQTHYpA=";
|
||||
hash = "sha256-ycB5wEDYlyTDdIk5lE26c2YFMmDGGqcMuSqwqDSyxs0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bsIyf63U7/GNZnCD8g6RBykCiArwlD5v1YhrZNsf1is=";
|
||||
cargoHash = "sha256-HWuHKn+vJC3cdS6bKp5iw9VSTRHn/Q5Zsj6OHvmfYp0=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"dev"
|
||||
"doc"
|
||||
"out"
|
||||
];
|
||||
|
||||
@@ -15,23 +15,23 @@
|
||||
}:
|
||||
|
||||
let
|
||||
beylaVersion = "v3.9.5";
|
||||
beylaVersion = "v3.9.8";
|
||||
in
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-alloy";
|
||||
version = "1.16.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "alloy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-q5R2noxBZ3OPyZqmB+bx3iJKWFxC2WIprcgh9RwjLzk=";
|
||||
hash = "sha256-4HjOerOe+v8GkKgID/oBm5Rt7nQiHjucAQkSYGY5zZs=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${finalAttrs.src}/internal/web/ui";
|
||||
hash = "sha256-vResNUT4auDsK9ngnJYfMUUOYr/ikPhrvakqCjGq2Q8=";
|
||||
hash = "sha256-eGyKXsZzyDovsMY2U1uAOn22nyRTYGJT+kEh61857Ls=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
@@ -65,7 +65,7 @@ buildGoModule (finalAttrs: {
|
||||
modRoot = "collector";
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-uTIdurwLfxh27fb1CPCHbHmENk3S6VYNBaGT/5yh3Sc=";
|
||||
vendorHash = "sha256-C6qVdSfTwmjseCjXKn5f9Q9mn3EBg31CQlLk5QY4YRY=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "herdr";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "ogulcancelik";
|
||||
repo = "herdr";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q2yvMs/N6oAF8xnRIrMxEOOV6Aj8aAXQzuvcaux2enA=";
|
||||
hash = "sha256-dBOQYLFitJ+E3XNz44Ag3CIrBxFj16CmVPp7qil0ssg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DRjcIJXWGxiA9c7xIiQoWU9az2EFjXsnFKu5sC933eE=";
|
||||
cargoHash = "sha256-XHzZy2tKLbMQy4POmXowUcGf77ZPunG/oQ3P2wOoVls=";
|
||||
|
||||
zigDeps = zig_0_15.fetchDeps {
|
||||
inherit (finalAttrs) pname version;
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jimtcl";
|
||||
version = "0.82";
|
||||
version = "0.84";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msteveb";
|
||||
repo = "jimtcl";
|
||||
rev = finalAttrs.version;
|
||||
sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
|
||||
sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libphonenumber";
|
||||
version = "9.0.34";
|
||||
version = "9.0.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "libphonenumber";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KWn58r2Dnh9DMwiESmrF/pN5LPuYe0G7z3TeM+Zp6ZA=";
|
||||
hash = "sha256-bGbPTZJWdGTdnWQCK9yXqcqK0AkAOsmZ/rRR2a+IT7M=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mcp-server-fetch";
|
||||
version = "2026.7.4";
|
||||
version = "2026.7.10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -6,23 +6,27 @@
|
||||
|
||||
# native check inputs
|
||||
git,
|
||||
jujutsu,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "mergiraf";
|
||||
version = "0.17.0";
|
||||
version = "0.18.0";
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "mergiraf";
|
||||
repo = "mergiraf";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws=";
|
||||
hash = "sha256-PfGiPH7CU8z+Flj3X04XnRdWcv5K+hTZMfvHpM52Fic=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8=";
|
||||
cargoHash = "sha256-1MDjaaH2PcvQz0DKSTADRB+8YEUWP1GN2edHk4EDVGA=";
|
||||
|
||||
nativeCheckInputs = [ git ];
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
jujutsu
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
49
pkgs/by-name/mk/mkroot-utils/package.nix
Normal file
49
pkgs/by-name/mk/mkroot-utils/package.nix
Normal file
@@ -0,0 +1,49 @@
|
||||
{
|
||||
busybox,
|
||||
cmake,
|
||||
fakeroot,
|
||||
fetchFromGitLab,
|
||||
gitUpdater,
|
||||
lib,
|
||||
python3,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mkroot-utils";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "mkroot-utils";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BT0OSK6QzxCegj8cXQcBbdfxoj+GxfGfDkyry0JN4Jo=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
python3
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt flash/flash.c pico/picoget.c --replace-fail '/bin/ash' '${lib.getExe' busybox "ash"}'
|
||||
patchShebangs test
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ fakeroot ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Simple utilities to extend RunC and \"mkroot\"";
|
||||
homepage = "https://gitlab.com/arpa2/mkroot-utils";
|
||||
license = lib.licenses.bsd2;
|
||||
teams = with lib.teams; [ ngi ];
|
||||
};
|
||||
})
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
let
|
||||
pname = "models-dev";
|
||||
version = "sdk-v0.0.5-unstable-2026-07-07";
|
||||
version = "sdk-v0.0.5-unstable-2026-07-17";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "models.dev";
|
||||
rev = "f1a9be19f62c24474d27947d5236067504dd755a";
|
||||
hash = "sha256-ty8l1jURV2uf245Xqm+I95qZ8gU9IjTGqR7+yLGxBUs=";
|
||||
rev = "d15aa5a09dc0226f0a292699e35f14243e61d65e";
|
||||
hash = "sha256-S1WzSYs9of11Onw/hK+stSmakjJJhq1rs6mcW8m+xlc=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nuclei-templates";
|
||||
version = "10.4.5";
|
||||
version = "10.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6czf84bHyvHIT9rA2HUYqQe7lgODl4uRMP/8QepV3AU=";
|
||||
hash = "sha256-Mv+W1CmUUAs6KntuTBgrp5JDlvyMC1C2Ddm5AGDPtbU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -17,10 +17,19 @@
|
||||
extraHardwareSupport ? [ ],
|
||||
}:
|
||||
let
|
||||
|
||||
isWindows = stdenv.hostPlatform.isWindows;
|
||||
notWindows = !isWindows;
|
||||
|
||||
# OpenOCD needs JimTcl 0.82 and fails to build with the latest version (0.84).
|
||||
# When updating OpenOCD, check which JimTcl version its jimtcl submodule uses.
|
||||
jimtcl_0_82 = jimtcl.overrideAttrs (oldAttrs: rec {
|
||||
version = "0.82";
|
||||
src = oldAttrs.src.override {
|
||||
rev = version;
|
||||
sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
|
||||
};
|
||||
});
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openocd";
|
||||
@@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals notWindows [
|
||||
hidapi
|
||||
jimtcl
|
||||
jimtcl_0_82
|
||||
libftdi1
|
||||
libjaylink
|
||||
]
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "pkgsite";
|
||||
version = "0.2.0-unstable-2026-07-07";
|
||||
version = "0.3.0-unstable-2026-07-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golang";
|
||||
repo = "pkgsite";
|
||||
rev = "0cc61a18508245cabd093f065961abd5df0af028";
|
||||
hash = "sha256-tgLjEs9dt7TA9yRq/toUWPiorA4b20GnjmO6HJbFFd8=";
|
||||
rev = "8d05c43dae2e668886572ee959babdb429ad6429";
|
||||
hash = "sha256-xc/pPJIRGuTGrdh2VFwPY+uud98ST0HaFPUsa5GvvhQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-a53JKkoJmnSO+ShxUt68LEq9uDeNi/vN/d0OuhrIUvA=";
|
||||
vendorHash = "sha256-NZzA9QxVSYuSjeZOiwUAXAPBrN00JLHQNPp1lXqtmCw=";
|
||||
|
||||
subPackages = [ "cmd/pkgsite" ];
|
||||
|
||||
|
||||
@@ -28,13 +28,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "prismlauncher-unwrapped";
|
||||
version = "11.0.2";
|
||||
version = "11.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrismLauncher";
|
||||
repo = "PrismLauncher";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-GvAfrZxQSlBnCJ59nvK87jDTVo60D8n25K42SokE1q8=";
|
||||
hash = "sha256-0o31pLKnYY0mulLrZKzZtaTPzCviGsgCnEcBt0Y/aG4=";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
|
||||
@@ -134,13 +134,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rectangle";
|
||||
version = "0.96";
|
||||
version = "0.98";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rxhanson";
|
||||
repo = "Rectangle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3FDCptlNztmexfFDRD/XX9fVuEHVG+EzcrqksJeI+fo=";
|
||||
hash = "sha256-GGK9mMxllVg0rfcrTg5aUYaECwV7mNCPLwXM+tKazN8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
version = "26.1.12";
|
||||
version = "26.1.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redpanda-data";
|
||||
repo = "redpanda";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZF9YzRW1b40syRCV+a5NOsS/SDwstVs1mI++dTDcpWc=";
|
||||
sha256 = "sha256-vYAicA6tUJt4fz2HBvu+T5rKuVjUWP1QN9ViThkMrpA=";
|
||||
};
|
||||
in
|
||||
buildGoModule rec {
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rtklib-ex";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtklibexplorer";
|
||||
repo = "RTKLIB";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-j00VEQvxOiAc3EQX3x2b3RxYkbtvCZ17ugnW6b6ChWU=";
|
||||
hash = "sha256-IGjrLuw3q0J6NXv2+Y3N22+nBu31W63QkmZpuHuvQnc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "steam-unwrapped";
|
||||
version = "1.0.0.85";
|
||||
version = "1.0.0.87";
|
||||
|
||||
src = fetchurl {
|
||||
# use archive url so the tarball doesn't 404 on a new release
|
||||
url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-fy03Si+0E87VuBJRUUViGdkYolWHK0u3cBbLzPOLt/E=";
|
||||
hash = "sha256-ZJN10vk3f4AJqvPi/wmXgEHrkRSJfZxaOIbx2C4nuh8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -126,10 +126,7 @@ buildStdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
bzip2
|
||||
geos
|
||||
# FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ?
|
||||
(geographiclib.overrideAttrs {
|
||||
outputs = [ "out" ];
|
||||
})
|
||||
geographiclib
|
||||
glew
|
||||
glm
|
||||
gtest
|
||||
|
||||
@@ -8,10 +8,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "teehee";
|
||||
version = "0.2.8";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gskartwii";
|
||||
repo = "teehee";
|
||||
rev = "v${finalAttrs.version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI=";
|
||||
};
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "yashiki";
|
||||
version = "0.14.0";
|
||||
version = "0.15.2";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "typester";
|
||||
repo = "yashiki";
|
||||
tag = "yashiki-v${finalAttrs.version}";
|
||||
hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ=";
|
||||
hash = "sha256-nsmUuhi0yy6x6POC4qLbMib4fxS3QRjlK6QgCiVEnyQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U=";
|
||||
cargoHash = "sha256-3JxtsSipMbMxQO58ZLJbQVrOFFC7FoVguNpqdoL+ziQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
@@ -42,8 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
|
||||
cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car"
|
||||
substitute Info.plist.template "$app/Contents/Info.plist" \
|
||||
--replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \
|
||||
--replace-fail "<string>yashiki-launcher</string>" "<string>yashiki</string>"
|
||||
--replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}"
|
||||
|
||||
installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki
|
||||
'';
|
||||
@@ -62,7 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
maintainers = with lib.maintainers; [ anntnzrb ];
|
||||
maintainers = with lib.maintainers; [
|
||||
anntnzrb
|
||||
Br1ght0ne
|
||||
];
|
||||
mainProgram = "yashiki";
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "ytdl-sub";
|
||||
version = "2026.06.23";
|
||||
version = "2026.07.16";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmbannon";
|
||||
repo = "ytdl-sub";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-VakqR66V90MIx6Bh5MS69iX1nZsFuTJ6YOJG90kf5s0=";
|
||||
hash = "sha256-uvuwp6OqdL4mK3RF7rr2hrDhETgoOaNef7ZLPU95EQg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boschshcpy";
|
||||
version = "0.4.8";
|
||||
version = "0.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tschamm";
|
||||
repo = "boschshcpy";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VYraW9zeTQn2fvc1pdpF8Tx+iFRxoNQ6b98VphGao7k=";
|
||||
hash = "sha256-Un+rcG78t3TdbKuBHOuDPq5+wjlA8jf0pE3zvuHzpjM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
poetry-core,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "generic";
|
||||
version = "1.1.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-0U2uZihULrCEQ0WI01B1bIjy8wx+I0itX8+gH723zu0=";
|
||||
};
|
||||
|
||||
@@ -25,8 +25,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Generic programming (Multiple dispatch) library for Python";
|
||||
homepage = "https://github.com/gaphor/generic";
|
||||
changelog = "https://github.com/gaphor/generic/releases/tag/${version}";
|
||||
changelog = "https://github.com/gaphor/generic/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -57,7 +56,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "glean" ];
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
broken = true; # fails to build since 2025-12
|
||||
description = "Telemetry client libraries and are a part of the Glean project";
|
||||
homepage = "https://mozilla.github.io/glean/book/index.html";
|
||||
license = lib.licenses.mpl20;
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "gto";
|
||||
version = "1.9.0";
|
||||
version = "1.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = "gto";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LXYpOnk9W/ellG70qZLihmvk4kvVcwZfE5buPNU2qzQ=";
|
||||
hash = "sha256-pzXU7H4ysu0IBHEtSduA7ogNqmRVWagTI5E4P0z/Wio=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202607151";
|
||||
version = "0.1.202607171";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-MGKX+QzsXyohsRHHy4qt+H4BemgvJesKwKzi2KrETr4=";
|
||||
hash = "sha256-i4/vmq7Adxrmb6Ad/eFU5NwOseHo/uBMsN5UyyqDyqY=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchgit,
|
||||
setuptools,
|
||||
setuptools_80,
|
||||
lazr-delegates,
|
||||
zope-interface,
|
||||
pytestCheckHook,
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-eYJY4JRoqTMG4j1jyiYrI8xEKdJ+wQYVVU/6OqVIodk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ setuptools_80 ];
|
||||
|
||||
dependencies = [
|
||||
lazr-delegates
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
setuptools_80,
|
||||
zope-interface,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
hash = "sha256-rs6yYW5Rtz8yf78SxOwrfXZwy4IL1eT2hRIV+3lsAtw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
build-system = [ setuptools_80 ];
|
||||
|
||||
dependencies = [ zope-interface ];
|
||||
|
||||
|
||||
@@ -53,15 +53,15 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "opensfm";
|
||||
version = "odm-4-unstable-2026-07-01";
|
||||
version = "0.5.1-unstable-2026-07-13";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapillary";
|
||||
repo = "OpenSfM";
|
||||
rev = "a677b6f0648ff3caf439aebbe9aad0ca8abc175b";
|
||||
hash = "sha256-Bxpfaj87N2QxP/AczpP3fOl6G8ciMJq5jaaIn7oGR9g=";
|
||||
rev = "238744cdf3b5d50149c50d136a87f7fea25ad5cd";
|
||||
hash = "sha256-3T9wjuuN5AjM/MtSo3xGoHJcvXOI8Keyxcqv7BQavlw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -187,7 +187,10 @@ buildPythonPackage (finalAttrs: {
|
||||
);
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [ "--version=branch" ];
|
||||
extraArgs = [
|
||||
"--version=branch"
|
||||
"--version-regex=v(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -69,14 +69,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "sentry-sdk";
|
||||
version = "2.64.0";
|
||||
version = "2.66.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "getsentry";
|
||||
repo = "sentry-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-uAxHNyZgTpw6NoXGCw91AgsKQqlJkdgPsw/WdhFMhs4=";
|
||||
hash = "sha256-0xHcTcJH7cNzQ16Yc+fkSKYE316Ztu6Bl7hTwtD97Ds=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.1.133";
|
||||
version = "3.1.135";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-E9xxurSGAvJd4f2CGxI8IR9mSGTwGpOLqNMSEhrhOXY=";
|
||||
hash = "sha256-UErVS8+/IUNjePhBcvpJE4hNxec3pU19eZBbwD+jDcA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
vte,
|
||||
xxhash,
|
||||
zlib,
|
||||
zydis,
|
||||
useX11 ? false,
|
||||
rubyBindings ? false,
|
||||
luaBindings ? false,
|
||||
@@ -40,8 +41,8 @@ let
|
||||
sdb = fetchFromGitHub {
|
||||
owner = "radareorg";
|
||||
repo = "sdb";
|
||||
tag = "2.4.2"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
|
||||
hash = "sha256-JN27SkDqHtX83d1CPUF9hbVKwE/dwhDgn5MlCX9RPrc=";
|
||||
tag = "2.4.6"; # https://github.com/radareorg/radare2/blob/master/subprojects/sdb.wrap
|
||||
hash = "sha256-5DuHC5uL4gXBJPGW2awDq/5Ufdi1RoEJnm+eAU3X8S4=";
|
||||
};
|
||||
|
||||
qjs = fetchFromGitHub {
|
||||
@@ -53,13 +54,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "radare2";
|
||||
version = "6.1.4";
|
||||
version = "6.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "radare";
|
||||
repo = "radare2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3MwBtjR3XQMhbJHnD30OVedUEKcje5jDPszNynkGCT8=";
|
||||
hash = "sha256-Gh+W0vWsIscbew1u5cuOXWC20azCxYuA7D+qVTkfEN0=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
@@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.mesonBool "use_sys_openssl" true)
|
||||
(lib.mesonBool "use_sys_xxhash" true)
|
||||
(lib.mesonBool "use_sys_zip" true)
|
||||
(lib.mesonBool "use_sys_zydis" true)
|
||||
(lib.mesonBool "use_sys_zlib" true)
|
||||
(lib.mesonOption "r2_gittap" finalAttrs.version)
|
||||
];
|
||||
@@ -97,6 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
perl
|
||||
readline
|
||||
zlib
|
||||
zydis
|
||||
]
|
||||
++ lib.optionals useX11 [
|
||||
gtkdialog
|
||||
|
||||
@@ -35,6 +35,12 @@ buildPythonPackage (finalAttrs: {
|
||||
url = "https://gitlab.com/mailman/hyperkitty/-/commit/e815be11752ac6a3e839b155f0c43808619c56b0.patch";
|
||||
hash = "sha256-fsJyNsh3l5iR9WgsiEsHlptkN+nlWoop0m2STyucDEc=";
|
||||
})
|
||||
# Fix test with mistune >= 3.3
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.com/mailman/hyperkitty/-/commit/7e8aa0150d8dcaef66039db3a0205dfd4160a265.patch";
|
||||
excludes = [ "pyproject.toml" ];
|
||||
hash = "sha256-BpjnLugUU0nyn3XN0zZ0eEeK0sFd64GOUaQsen6fFyw=";
|
||||
})
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
|
||||
Reference in New Issue
Block a user