mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
Merge staging-next-25.05 into staging-25.05
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
adac6fe7ed
29 changed files with 239 additions and 122 deletions
|
|
@ -477,7 +477,7 @@ let
|
|||
(mkIf config.isNormalUser {
|
||||
group = mkDefault "users";
|
||||
createHome = mkDefault true;
|
||||
home = mkDefault "/home/${config.name}";
|
||||
home = mkDefault "${cfg.defaultUserHome}/${config.name}";
|
||||
homeMode = mkDefault "700";
|
||||
useDefaultShell = mkDefault true;
|
||||
isSystemUser = mkDefault false;
|
||||
|
|
@ -753,6 +753,14 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
users.defaultUserHome = mkOption {
|
||||
type = types.str;
|
||||
default = "/home";
|
||||
description = ''
|
||||
The default home directory for normal users.
|
||||
'';
|
||||
};
|
||||
|
||||
# systemd initrd
|
||||
boot.initrd.systemd.users = mkOption {
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ in
|
|||
# /etc/default/useradd: configuration for useradd.
|
||||
"default/useradd".source = pkgs.writeText "useradd" ''
|
||||
GROUP=100
|
||||
HOME=/home
|
||||
HOME=${config.users.defaultUserHome}
|
||||
SHELL=${utils.toShellPath config.users.defaultUserShell}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@
|
|||
libpulseaudio,
|
||||
withRodio ? true,
|
||||
withAvahi ? false,
|
||||
withMDNS ? true,
|
||||
withDNS-SD ? false,
|
||||
avahi-compat,
|
||||
}:
|
||||
|
||||
|
|
@ -44,13 +46,15 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optional withALSA alsa-lib
|
||||
++ lib.optional withAvahi avahi-compat
|
||||
++ lib.optional withDNS-SD avahi-compat
|
||||
++ lib.optional withPortAudio portaudio
|
||||
++ lib.optional withPulseAudio libpulseaudio;
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures =
|
||||
lib.optional withRodio "rodio-backend"
|
||||
++ lib.optional withMDNS "with-libmdns"
|
||||
++ lib.optional withDNS-SD "with-dns-sd"
|
||||
++ lib.optional withALSA "alsa-backend"
|
||||
++ lib.optional withAvahi "with-avahi"
|
||||
++ lib.optional withPortAudio "portaudio-backend"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@ let
|
|||
extraArgs = builtins.removeAttrs args [ "callPackage" ];
|
||||
in
|
||||
rec {
|
||||
rke2_1_29 = common (
|
||||
rke2_1_29 =
|
||||
(common (
|
||||
(import ./1_29/versions.nix)
|
||||
// {
|
||||
updateScript = [
|
||||
|
|
@ -13,7 +14,12 @@ rec {
|
|||
"29"
|
||||
];
|
||||
}
|
||||
) extraArgs;
|
||||
) extraArgs).overrideAttrs
|
||||
{
|
||||
meta.knownVulnerabilities = [
|
||||
"rke2_1_29 has reached end-of-life on 2025-02-28. See https://www.suse.com/lifecycle#rke2"
|
||||
];
|
||||
};
|
||||
|
||||
rke2_1_30 = common (
|
||||
(import ./1_30/versions.nix)
|
||||
|
|
|
|||
|
|
@ -66,6 +66,10 @@
|
|||
moonlight,
|
||||
withTTS ? true,
|
||||
enableAutoscroll ? false,
|
||||
# Disabling this would normally break Discord.
|
||||
# The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
|
||||
# for example if a settings.json is linked declaratively (e.g., with home-manager).
|
||||
disableUpdates ? true,
|
||||
}:
|
||||
assert lib.assertMsg (
|
||||
!(withMoonlight && withVencord)
|
||||
|
|
@ -180,7 +184,7 @@ stdenv.mkDerivation rec {
|
|||
${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
|
||||
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
|
||||
--run "${lib.getExe disableBreakingUpdates}"
|
||||
${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"}
|
||||
|
||||
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
|
||||
# Without || true the install would fail on case-insensitive filesystems
|
||||
|
|
|
|||
|
|
@ -1034,6 +1034,7 @@ rec {
|
|||
"tag"
|
||||
"url"
|
||||
"outputHash"
|
||||
"outputHashAlgo"
|
||||
] src
|
||||
);
|
||||
in
|
||||
|
|
|
|||
38
pkgs/by-name/de/detach/package.nix
Normal file
38
pkgs/by-name/de/detach/package.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "detach";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchzip {
|
||||
url = "http://inglorion.net/download/detach-${version}.tar.bz2";
|
||||
hash = "sha256-nnhJGtmPlTeqM20FAKRyhhSMViTXFpQT0A1ol4lhsoc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd detach \
|
||||
--zsh contrib/zsh-completer/_detach
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Utility for running a command detached from the current terminal";
|
||||
homepage = "https://inglorion.net/software/detach/";
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "detach";
|
||||
maintainers = with lib.maintainers; [ pbsds ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "flake-checker";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeterminateSystems";
|
||||
repo = "flake-checker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qEdwtyk5IaYCx67BFnLp4iUN+ewfPMl/wjs9K4hKqGc=";
|
||||
hash = "sha256-RwkyyrWm0QRNOn7Bb9jKOyJ049B6pPmhbrx8tXpUf4w=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-5eaVjrAPxBQdG+LQ6mQ/ZYAdslpdK3mrZ5Vbuwe3iQw=";
|
||||
cargoHash = "sha256-lB7+2dQGfbn7IhmCAN0jvFTGjJDBpw57VHi3qIwwOZ4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Health checks for your Nix flakes";
|
||||
|
|
|
|||
|
|
@ -28,22 +28,30 @@
|
|||
"@grpc/grpc-js": "^1.8.22",
|
||||
"@grpc/proto-loader": "^0.7.2",
|
||||
"@hapi/boom": "^10.0.0",
|
||||
"@opentelemetry/api": "^1.9.0",
|
||||
"@opentelemetry/auto-instrumentations-node": "^0.49.0",
|
||||
"@opentelemetry/exporter-trace-otlp-http": "^0.52.1",
|
||||
"@opentelemetry/resources": "^1.25.1",
|
||||
"@opentelemetry/sdk-node": "^0.52.1",
|
||||
"@opentelemetry/semantic-conventions": "^1.25.1",
|
||||
"@puppeteer/browsers": "^2.3.1",
|
||||
"chokidar": "^3.5.2",
|
||||
"dompurify": "^3.2.4",
|
||||
"express": "^4.21.1",
|
||||
"express-prom-bundle": "^6.5.0",
|
||||
"ioredis": "^5.6.1",
|
||||
"jimp": "^0.22.12",
|
||||
"jsdom": "20.0.0",
|
||||
"lodash": "^4.17.21",
|
||||
"minimist": "^1.2.6",
|
||||
"morgan": "^1.9.0",
|
||||
"multer": "^1.4.5-lts.1",
|
||||
"multer": "^2.0.0",
|
||||
"on-finished": "^2.3.0",
|
||||
"poolpeteer": "^0.24.0",
|
||||
"prom-client": "^14.1.0",
|
||||
"puppeteer": "^22.8.2",
|
||||
"puppeteer-cluster": "^0.24.0",
|
||||
"rate-limiter-flexible": "^7.0.0",
|
||||
"unique-filename": "^2.0.1",
|
||||
"winston": "^3.8.2"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@
|
|||
|
||||
mkYarnPackage rec {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "3.12.5";
|
||||
version = "3.12.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-dcWmMcvWwG4wGEEyFKa1R0jGGpK5x1F5Amr74JzJaLE=";
|
||||
hash = "sha256-xParYkEeH/jH18SH0tTwN4a8NsO8D30Tcmc76Xy77Ew=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-BBu+vOO0UgX3L7Svj0HgVKHR2lSe4tD6c9HDgJZdhHU=";
|
||||
hash = "sha256-lV+4r+5E55J4H1zl05SimxIhGVD/PvEkIr3j1yhZS4o=";
|
||||
};
|
||||
|
||||
packageJSON = ./package.json;
|
||||
|
|
|
|||
|
|
@ -17,20 +17,19 @@ let
|
|||
in
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "matrix-synapse";
|
||||
version = "1.130.0";
|
||||
version = "1.131.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "element-hq";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k=";
|
||||
hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
|
||||
inherit pname version src;
|
||||
hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
30
pkgs/by-name/mo/mozhi/package.nix
Normal file
30
pkgs/by-name/mo/mozhi/package.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitea,
|
||||
unstableGitUpdater,
|
||||
}:
|
||||
buildGoModule {
|
||||
pname = "mozhi";
|
||||
version = "0-unstable-2025-04-14";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "aryak";
|
||||
repo = "mozhi";
|
||||
rev = "c2c14988c09e6c5fae5a8ac59c07a650f0997a5a";
|
||||
hash = "sha256-xJw9BkdKlN1VToKyDlkW8UUZB94gzD9nclNciDmVIkk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ptwP+ZuuzxRpIuNDoXnAML1KYEh9zTBcOs9YTI8z63A=";
|
||||
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://codeberg.org/aryak/mozhi";
|
||||
description = "Alternative-frontend for many translation engines, fork of SimplyTranslate";
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ lib.maintainers.ryand56 ];
|
||||
mainProgram = "mozhi";
|
||||
};
|
||||
}
|
||||
|
|
@ -30,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openvswitch";
|
||||
repo = "ovs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-fEntEZHmQX78XZZic9hFr07PWC2RQIpuCfb1FYX3hd0=";
|
||||
hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
installShellFiles,
|
||||
|
|
@ -17,17 +18,15 @@ rustPlatform.buildRustPackage rec {
|
|||
hash = "sha256-HYPzgynCeWDRRNyACHqnzkjn6uZWS0TDHuJE9STJxbQ=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-+BlLVnvI2qBfwEtyxmZFNhR9MEzs0/a1Ce6ALOKtoPU=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
for shell in {ba,fi,z}sh; do
|
||||
$out/bin/rustic completions $shell > rustic.$shell
|
||||
done
|
||||
|
||||
installShellCompletion rustic.{ba,fi,z}sh
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd rustic \
|
||||
--bash <($out/bin/rustic completions bash) \
|
||||
--fish <($out/bin/rustic completions fish) \
|
||||
--zsh <($out/bin/rustic completions zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
|
@ -35,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = {
|
||||
homepage = "https://github.com/rustic-rs/rustic";
|
||||
changelog = "https://github.com/rustic-rs/rustic/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "fast, encrypted, deduplicated backups powered by pure Rust";
|
||||
description = "Fast, encrypted, deduplicated backups powered by pure Rust";
|
||||
mainProgram = "rustic";
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = [
|
||||
|
|
|
|||
|
|
@ -119,7 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
passthru = {
|
||||
tests.openorbis-example = nixosTests.shadps4;
|
||||
updateScript = nix-update-script { };
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"v\\.(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=ac286a71ed78429e16c612161251b9ea90ccd431";
|
||||
sha256 = "sha256-oLmUShtvO6io3jibKT67eO0O58vEDZEeaB51QTd3UkU=";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "0013-fix-FTBFS-GCC-14.patch";
|
||||
url = "https://salsa.debian.org/sylpheed-team/sylpheed/-/raw/22984c6d2bf76b0667256a9e8b660447497e1220/debian/patches/0013-fix-FTBFS-GCC-14.patch?inline=false";
|
||||
sha256 = "sha256-ZfQKiOK8pMrN87hrP0/2LxYZZdnaciBoa0khG1Djelo=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,19 +1,21 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
fetchFromGitHub,
|
||||
tcl,
|
||||
tk,
|
||||
autoreconfHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uudeview";
|
||||
version = "0.5.20";
|
||||
version = "0.5.20-unstable-2025-03-20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
|
||||
sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hannob";
|
||||
repo = "uudeview";
|
||||
rev = "7640bc56aa5016cdc9c139eb1ab3ec874e47c744";
|
||||
hash = "sha256-IdHxkrXe+2I+aJpZ0bhimXq4xEXE9HDXrL5DtCs7MKk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -21,22 +23,13 @@ stdenv.mkDerivation rec {
|
|||
tk
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-tk=${tk.dev}"
|
||||
"--enable-tcl=${tcl}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://wiki.tcl.tk/3577
|
||||
./matherr.patch
|
||||
# format hardening
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
|
||||
sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
base = callPackage ./generic.nix (
|
||||
_args
|
||||
// {
|
||||
version = "8.3.21";
|
||||
hash = "sha256-0HaebhHPpsWaFt4kFmi+jH8xpymVCo0GGQ360thiKwQ=";
|
||||
version = "8.3.22";
|
||||
hash = "sha256-mRM+LNoq83uqedsX2O/UFGKPFKAux18UGKCqP2qmZzs=";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ let
|
|||
base = callPackage ./generic.nix (
|
||||
_args
|
||||
// {
|
||||
version = "8.4.7";
|
||||
hash = "sha256-bsyxsGpN2c6jFNvnDHYtPUdlRxy26/kludowiXi/+Yg=";
|
||||
version = "8.4.8";
|
||||
hash = "sha256-NlacZN0UmeVwxDZgO2Qe7nzeSvV2r3hll9DucRs6Ooo=";
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -260,6 +260,7 @@ stdenv.mkDerivation (
|
|||
|
||||
// (removeAttrs args [
|
||||
"withLinuxHeaders"
|
||||
"linuxHeaders"
|
||||
"withGd"
|
||||
"enableCET"
|
||||
"postInstall"
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
stdenv,
|
||||
callPackage,
|
||||
withLinuxHeaders ? true,
|
||||
linuxHeaders ? null,
|
||||
profilingLibraries ? false,
|
||||
withGd ? false,
|
||||
enableCET ? if stdenv.hostPlatform.isx86_64 then "permissive" else false,
|
||||
|
|
@ -19,7 +20,7 @@ let
|
|||
];
|
||||
in
|
||||
|
||||
(callPackage ./common.nix { inherit stdenv; } {
|
||||
(callPackage ./common.nix { inherit stdenv linuxHeaders; } {
|
||||
inherit
|
||||
withLinuxHeaders
|
||||
withGd
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
|
||||
clangStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.48.2";
|
||||
version = "2.48.3";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
|
||||
if lib.versionAtLeast gtk3.version "4.0" then
|
||||
"6.0"
|
||||
|
|
@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
|
||||
hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
|
||||
};
|
||||
|
||||
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
|
||||
|
|
|
|||
|
|
@ -12,35 +12,35 @@
|
|||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "5d9bba193dd522548da5c9289eae79016f053cefad77d0540e8412f1318462a8",
|
||||
"aarch64-linux": "65e4c5fbbf452378664777696727384853ca4de699da7c84ac39463d8d0e7de9",
|
||||
"armv7l-linux": "cd3dbedf798ddfcd28f3931b8d2214ee49af8a753c21b16d4068edad44dba2ef",
|
||||
"aarch64-darwin": "56c27f79c298bd21f6a0434b70776633ce9971667edf22783b4b3f0051646248",
|
||||
"aarch64-linux": "2172a9fa02331ba9c645dd6a6c5c6c07235e902c0aebb61b123d2f6c3ea0121f",
|
||||
"armv7l-linux": "03514c1e42d4215972add90eb828221aec29278113ecf6761ec014aee92b3c4e",
|
||||
"headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
|
||||
"x86_64-darwin": "8171d8f26305eb01001ddb2d8ff6c922a6142378e1cdac8d5cc72f727bd4e6b6",
|
||||
"x86_64-linux": "0ad6461a74c6bb7ef076ee4b2f5c22801ea1efb585d716b01ba499d9158d34e5"
|
||||
"x86_64-darwin": "fb13c7bf7f01529e0084433166f6b66b149407d8f950ca176fde20f023ee64b6",
|
||||
"x86_64-linux": "da78b040068b6f0d41b3ccc5e5d26f1130bcdeba83f23ebbdae416c26bcf80e2"
|
||||
},
|
||||
"version": "34.5.7"
|
||||
"version": "34.5.8"
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "03b2926356c6cf8718b2d62ee8dd1eaa0812c1f44c5a751c332401dd2867aa47",
|
||||
"aarch64-linux": "9e98b01d5c6611437e8eecece093307e3e59733bb64c068fc3f9bd226b92238d",
|
||||
"armv7l-linux": "3072f6865c6f0202d4059224cb43ecab27f03852025addf09a4fa1b6606cb80c",
|
||||
"headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
|
||||
"x86_64-darwin": "3cfff8110bd11d2b3c342b56674d3fd5863698d8413a2a97be80169f61e23ddf",
|
||||
"x86_64-linux": "4e9d927a8edecf59dde02b98fe6bfde64814141898650ca1c69820ae0edbcfa4"
|
||||
"aarch64-darwin": "3d2759f9ba2201a22c9ea2bc2cc2b2392d00b5584a613c82f0fe2493b2c7c108",
|
||||
"aarch64-linux": "d3338afa395d2eb9eef1a96278e6ced8aeec87c59e3eff754efdc02325b27c2f",
|
||||
"armv7l-linux": "d73dbb4e39f21d8fcca98b59b278a3ea53728f5d0c469dcf0b88a67b4b2b50c3",
|
||||
"headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
|
||||
"x86_64-darwin": "87b6abd92012904e2b8cf96062657e4ab9b93d60194da88f44b7d84ca281e847",
|
||||
"x86_64-linux": "8eeaaf8035e471d4c0f4519765feb383c164168d95659d349f36d906dec02fb5"
|
||||
},
|
||||
"version": "35.5.0"
|
||||
"version": "35.5.1"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2b51b3001a0e79d9130a379d5276b87c22c054ddf4f19413fd9e0aa2983b4a9e",
|
||||
"aarch64-linux": "0e68a05932d1c662ec8c33a2773aea5575eae1081514cf6ce1c4efe331b772bf",
|
||||
"armv7l-linux": "216d0c8b6a76ef78e7c3b82a45cda251e5d6b038de89bc62f32a7317590d3995",
|
||||
"headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
|
||||
"x86_64-darwin": "460d54a596a3a8a04c6414fb7866e453b7075c1a848bc3230aa01b6d566e8b03",
|
||||
"x86_64-linux": "d124c39544faf125f45f3adccf83e53ca23589d9f35115f69644cfc5c8133e4e"
|
||||
"aarch64-darwin": "33744982d4f182df72b8b22c20fc83942a1bdadcd2358deb83000ca578dd767d",
|
||||
"aarch64-linux": "27bf37e1cecc7683575140730cbcd4e1b0847bace2d5a705c69e6d1bcd1c0f4c",
|
||||
"armv7l-linux": "5953b7f3747d657334b07bc47971cdbfa1b37ef807e21ef5001637aaaa43f635",
|
||||
"headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
|
||||
"x86_64-darwin": "4d33e24a87df1f839053eba4dc8500026df46cc62b7e57c39d5ec2edecddab91",
|
||||
"x86_64-linux": "d2ef32b2bff3fe2594774fca81abda8d617d5f6c0c40529e39900296309e4a3c"
|
||||
},
|
||||
"version": "36.3.2"
|
||||
"version": "36.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,35 +12,35 @@
|
|||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "f8d82b6fde28011e3fd75410fe0d9141deeac78a9a3754f3e9e517b485f75b52",
|
||||
"aarch64-linux": "1a65ef666f61c695bf92c7beb52ea9ec70e105d822363ade0998277d19e5cd01",
|
||||
"armv7l-linux": "bfa62551c5ef52f907ebb52004504b083a075d6f6582c1ef41dd180873d86518",
|
||||
"aarch64-darwin": "a3078146762ff67f27dd97470a9d2b4b5a04c182c6fcc5c949303e9a666b8d73",
|
||||
"aarch64-linux": "b0a9aa381fb4b12822408d8ca668b64cbc67c1b18b8a4e5dedd2d0ad7b3513f9",
|
||||
"armv7l-linux": "61a62d8b3d5604a098dc03cac7c89a325ff478d896921e286aabfd22735c64b1",
|
||||
"headers": "0gxibckgmbvbr84469fvl1f32aw1hbycnsj1lz5cmx196rpdj0r6",
|
||||
"x86_64-darwin": "5dff162e53b4c5200b581cd4e3d93a9d5aec31bd3d69b7ede7d2a697daee7f97",
|
||||
"x86_64-linux": "8fad178d82cc5e65fa18061f213f6d071e2ae1d773824e18703006dab18acf95"
|
||||
"x86_64-darwin": "aa2ac2aa0dbe410ca152e85ceaf5baeb2cccb28bac7b52b866468edd5e6eb113",
|
||||
"x86_64-linux": "1a6b534f65c47d2e839f5da0efeeb449cebe622e731b624ccc8c91f493eeec4f"
|
||||
},
|
||||
"version": "34.5.7"
|
||||
"version": "34.5.8"
|
||||
},
|
||||
"35": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "511a3c6a6b6032985224bcbc1c4884f8673f7573bde7f3919e9797d6645b53c4",
|
||||
"aarch64-linux": "25923b319e958285847d4e5c154eb7877b49380042a20c781185d8b6eb558afa",
|
||||
"armv7l-linux": "d67750b53d37699ade36ebe1912bd72b64af6e825d2d0ac5095531a0b84b191d",
|
||||
"headers": "0wspga950dap8wk6ak2idsmp8irjn4xaxq431vxr5ik6r07zn89b",
|
||||
"x86_64-darwin": "c995faf74d2d7e5b6000b8a1e9551d60e396a19a29796608a090417388a9dd1a",
|
||||
"x86_64-linux": "a1ef549561d64a9d10c1e658f8e86cd735d4261f0c4fc871d8c342240c23d9e0"
|
||||
"aarch64-darwin": "20f78c2d699cdfb676afe06984bce966be143755e5be6b36a7a16ceb950861d4",
|
||||
"aarch64-linux": "1f5442d17ad795ff7e8132b20d0e31dc6c9b275a86011f9827cc1b37c9d7a191",
|
||||
"armv7l-linux": "a384606f04e08ce777d0eb4810cbcda036c4c94fb4ccf5388f9a65a565b28c65",
|
||||
"headers": "00r5swhxsv7bj8k35ymmprp1mvz337f066jhh1xsh437b1abvscp",
|
||||
"x86_64-darwin": "efbc881a7599c5f250f57193d98ad08124e9f678467bc3c0977b694d3a557862",
|
||||
"x86_64-linux": "1929735f9c3c862bad6ed90edce811f25a38daa9e9a77d49c8d39ce309fd499d"
|
||||
},
|
||||
"version": "35.5.0"
|
||||
"version": "35.5.1"
|
||||
},
|
||||
"36": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "dbbfe5a72cdce199204c32039e5cf38992dd4a5bde95d9a1f351a130fadde340",
|
||||
"aarch64-linux": "ffacf585beb157ab6e2607ac0d288d8cac979f73f08355a50c2244a700272ec1",
|
||||
"armv7l-linux": "d7e290f616e8a7ba2d3b9463939e7b48e3b7f49727483424f3b06ecf7d1bebc6",
|
||||
"headers": "1s0didlyil9vzxjkmnf49h7k99319l71m37fdz6zj45v5dnqqj7g",
|
||||
"x86_64-darwin": "d1dbd94952411b0663f9da05c1c5938d87f4498c798b4b90c7db21bc311329f1",
|
||||
"x86_64-linux": "54296abbcc99416528555113ec0871f230eef5492304827a1208591457d6968a"
|
||||
"aarch64-darwin": "54580cb9d22b469c6eedb5a95b0f499c90e5efb79939dbe401a92461bf2ffda2",
|
||||
"aarch64-linux": "05499a412299c811357250d00beb26c72e0e8abe9bb1c2dbbc23262399821a9e",
|
||||
"armv7l-linux": "4296a52873910c65612e45eba86a6967033b4ee5442eb97ffb8d311eab0e5b1e",
|
||||
"headers": "0zww9rwrvi6g5vjpmxsvp1cqqkmx9rnl6yzwba8kyvyapk5daz8d",
|
||||
"x86_64-darwin": "971dcef573297e05befc8c8618ea5ac38501945e9cee5bf7d49e5a66718cf7b5",
|
||||
"x86_64-linux": "215623fd1736752f70a273a2ea591a8ce0a63a3c4305866cc30c80505aadc5ca"
|
||||
},
|
||||
"version": "36.3.2"
|
||||
"version": "36.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,10 +57,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-V393R2leEFjj337xVnqo9hlSn7rq44n2PnLcaUrYQ4M=",
|
||||
"hash": "sha256-ABlVuW0EUsFUyuIaugoI09EsHF+g7fxRSS/bOaOAkjg=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v34.5.7"
|
||||
"tag": "v34.5.8"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -1274,7 +1274,7 @@
|
|||
"electron_yarn_hash": "0gh5bcsh23s3rqxqc2l3jz5vjb553sk0a1jycn94zm821pc3csd2",
|
||||
"modules": "132",
|
||||
"node": "20.19.1",
|
||||
"version": "34.5.7"
|
||||
"version": "34.5.8"
|
||||
},
|
||||
"35": {
|
||||
"chrome": "134.0.6998.205",
|
||||
|
|
@ -1334,10 +1334,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-+Kj09hzwmAs5UvzV2wkBY4pPJDDNNmdIcjWXAbfrwz0=",
|
||||
"hash": "sha256-jIEeMTY8D4o2cCmk2RupGKu9HTVFjNI+90QZlXNrOWM=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v35.5.0"
|
||||
"tag": "v35.5.1"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -2583,10 +2583,10 @@
|
|||
"electron_yarn_hash": "1p9gs8s1zhwxvvmi9zb76k5nn1wly4yq0i12ibr0wvw5ls8bbars",
|
||||
"modules": "133",
|
||||
"node": "22.15.1",
|
||||
"version": "35.5.0"
|
||||
"version": "35.5.1"
|
||||
},
|
||||
"36": {
|
||||
"chrome": "136.0.7103.115",
|
||||
"chrome": "136.0.7103.149",
|
||||
"chromium": {
|
||||
"deps": {
|
||||
"gn": {
|
||||
|
|
@ -2596,15 +2596,15 @@
|
|||
"version": "2025-03-24"
|
||||
}
|
||||
},
|
||||
"version": "136.0.7103.115"
|
||||
"version": "136.0.7103.149"
|
||||
},
|
||||
"chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
|
||||
"deps": {
|
||||
"src": {
|
||||
"args": {
|
||||
"hash": "sha256-yUWNV65TshvAMaz1kGOUQuy+J5vXPryjisGN3MxTU9Q=",
|
||||
"hash": "sha256-qu3+U2o7N0MSx+nifQMAfSEjxTDIBSz/DNkEZdo5uFw=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"tag": "136.0.7103.115",
|
||||
"tag": "136.0.7103.149",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -2643,10 +2643,10 @@
|
|||
},
|
||||
"src/electron": {
|
||||
"args": {
|
||||
"hash": "sha256-bMQJfOkWRFE7Qg4kHiwkNcuXOSWU0EzEGSo8U1SuGTQ=",
|
||||
"hash": "sha256-DwV8hZ6iK1Pc0j/86UnrkJ6FhOXD3eCBiOk5Y14N4jg=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"tag": "v36.3.2"
|
||||
"tag": "v36.4.0"
|
||||
},
|
||||
"fetcher": "fetchFromGitHub"
|
||||
},
|
||||
|
|
@ -3898,8 +3898,8 @@
|
|||
},
|
||||
"src/v8": {
|
||||
"args": {
|
||||
"hash": "sha256-Fi4pl6xSXkHF4XaQNfNzULVjQZSzDfaHFIyIxH103go=",
|
||||
"rev": "5297e56d91816747d539abca52b578e5832135f0",
|
||||
"hash": "sha256-COlRcmBtuP/XBe9j4Qxikkz7ZSwcQhcWVe5+I0++OOk=",
|
||||
"rev": "150f01318cda02f1ef63dd79672eae6c81dd3301",
|
||||
"url": "https://chromium.googlesource.com/v8/v8.git"
|
||||
},
|
||||
"fetcher": "fetchFromGitiles"
|
||||
|
|
@ -3908,6 +3908,6 @@
|
|||
"electron_yarn_hash": "10n86jnzcq8kh0nk29ljw9wi1fgj13f07h92b009i1dryagliyrs",
|
||||
"modules": "135",
|
||||
"node": "22.15.1",
|
||||
"version": "36.3.2"
|
||||
"version": "36.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@ let
|
|||
variants = {
|
||||
# ./update-zen.py zen
|
||||
zen = {
|
||||
version = "6.14.7"; # zen
|
||||
version = "6.14.9"; # zen
|
||||
suffix = "zen1"; # zen
|
||||
sha256 = "04vcy71wjs6n1ahnva55i0czayn96w8qq0b0v0qymcq9lrbms2mr"; # zen
|
||||
sha256 = "1v28cdv8dyn5181z242f63ns6b472jx8a7wmw77n5wijj8fv5ba1"; # zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqx = {
|
||||
version = "6.14.7"; # lqx
|
||||
version = "6.14.9"; # lqx
|
||||
suffix = "lqx1"; # lqx
|
||||
sha256 = "0in1ymvnac9kic974r5sqkk730fm71d49q0cgzk7lj1ykd9jzxpp"; # lqx
|
||||
sha256 = "1f8sram3xabv119pznpixpm5igyxf33wkg4v8fm5nh9c9g91q19j"; # lqx
|
||||
isLqx = true;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
installShellFiles,
|
||||
iana-etc,
|
||||
libredirect,
|
||||
|
|
@ -20,6 +21,15 @@ buildGoModule rec {
|
|||
hash = "sha256-CrdMxRAgrDE1lJ3v9AhCN+cKOVqmIVwjE0x+msSVT+c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-machine-map-endpoint-vulnerability.patch";
|
||||
url = "https://github.com/juanfont/headscale/pull/2642.patch";
|
||||
excludes = [ "CHANGELOG.md" ];
|
||||
hash = "sha256-OmggrI0mkA3mk+k18oYWrQWt9iIFIbKE1cyB3ZBwbC4=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-ZQj2A0GdLhHc7JLW7qgpGBveXXNWg9ueSG47OZQQXEw=";
|
||||
|
||||
subPackages = [ "cmd/headscale" ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pg_net";
|
||||
version = "0.14.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "pg_net";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-c1pxhTyrE5j6dY+M5eKAboQNofIORS+Dccz+7HKEKQI=";
|
||||
hash = "sha256-BhLZdoMeK6QkmEEn3/+G6+TElFea2uifaQBW5aftqpM=";
|
||||
};
|
||||
|
||||
buildInputs = [ curl ];
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
# include a compatible pyopenssl version: https://github.com/NixOS/nixpkgs/issues/379291
|
||||
# remove ASAP: https://github.com/googleapis/google-api-python-client/issues/2554
|
||||
pythonCustom = python3.override {
|
||||
self = pythonCustom;
|
||||
|
|
@ -29,8 +30,12 @@ let
|
|||
version = "24.2.1";
|
||||
src = old.src.override {
|
||||
tag = version;
|
||||
hash = "sha256-otK7Y7Kb/l3QOErhAcuDHB/CKG9l1vH2BTnOieAWNc0=";
|
||||
hash = "sha256-/TQnDWdycN4hQ7ZGvBhMJEZVafmL+0wy9eJ8hC6rfio=";
|
||||
};
|
||||
disabledTests = old.disabledTests ++ [
|
||||
"test_shutdown_closed"
|
||||
"test_closed"
|
||||
];
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue