Merge staging-next into staging
This commit is contained in:
@@ -124,12 +124,13 @@ let
|
||||
genLogConfigFile =
|
||||
logName:
|
||||
format.generate "synapse-log-${logName}.yaml" (
|
||||
cfg.log
|
||||
// optionalAttrs (cfg.log ? handlers.journal) {
|
||||
handlers.journal = cfg.log.handlers.journal // {
|
||||
SYSLOG_IDENTIFIER = logName;
|
||||
};
|
||||
}
|
||||
attrsets.recursiveUpdate cfg.log (
|
||||
optionalAttrs (cfg.log ? handlers.journal) {
|
||||
handlers.journal = cfg.log.handlers.journal // {
|
||||
SYSLOG_IDENTIFIER = logName;
|
||||
};
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
toIntBase8 =
|
||||
|
||||
@@ -25,13 +25,13 @@ let
|
||||
in
|
||||
mkLibretroCore {
|
||||
core = "scummvm";
|
||||
version = "0-unstable-2025-05-23";
|
||||
version = "0-unstable-2025-06-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "scummvm";
|
||||
rev = "e566a6432fd1951417bf78280cc7c741957fc419";
|
||||
hash = "sha256-K78lyq1v3v55CCFLVAJStvfPltfkoGE9tj39gwPgZ44=";
|
||||
rev = "55fcf4050ac1102638cd7975677f81ae1a2c2070";
|
||||
hash = "sha256-GJqh34l7qC59l5zFnGGBeVIvyUCB9AfHKioqtCmjN2s=";
|
||||
};
|
||||
|
||||
extraBuildInputs = [
|
||||
|
||||
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://sr.ht/~bptato/chawan/";
|
||||
license = lib.licenses.publicDomain;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ jtbx ];
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
mainProgram = "cha";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cordless";
|
||||
version = "2020-11-22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bios-Marcel";
|
||||
repo = "cordless";
|
||||
rev = version;
|
||||
hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-XnwTqd19q+hOJZsfnFExiPDbg4pzV1Z9A6cq/jhcVgU=";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Bios-Marcel/cordless";
|
||||
description = "Discord terminal client";
|
||||
mainProgram = "cordless";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
@@ -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,16 +6,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "firezone-gateway";
|
||||
version = "1.4.9";
|
||||
version = "1.4.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firezone";
|
||||
repo = "firezone";
|
||||
tag = "gateway-${version}";
|
||||
hash = "sha256-JfsOiNTwwpO998mKA1ZGZTdZfzOgP6AKBkg8cuaqKr0=";
|
||||
hash = "sha256-3iU7AHu3GupqiZEDkuOEb+rFPA2KB1fjVNX1BY4abXc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Ok+pyGG5VHJbsKenKBr0mM1XRoOiAso0ebeQ5hDuwjM=";
|
||||
cargoHash = "sha256-p2zLhLFL6NbHvVojQU5+1amf+Kh0jRAbIESPt2vqWwg=";
|
||||
sourceRoot = "${src.name}/rust";
|
||||
buildAndTestSubdir = "gateway";
|
||||
RUSTFLAGS = "--cfg system_certs";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -4,18 +4,16 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
installCompatHeader ? false,
|
||||
installLegacyHeaders ? false,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gsl-lite";
|
||||
version = "0.43.0";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gsl-lite";
|
||||
repo = "gsl-lite";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9mvbD7zVTtfFRy2qIYJpU9XAlAW4ZLh5DE3WPEQpf38=";
|
||||
hash = "sha256-QlAeXUKVzH0QYxbKgWPS64h1iL4nnsmJ10h/wzoxq78=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -25,8 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck)
|
||||
(lib.cmakeBool "GSL_LITE_OPT_INSTALL_COMPAT_HEADER" installCompatHeader)
|
||||
(lib.cmakeBool "GSL_LITE_OPT_INSTALL_LEGACY_HEADERS" installLegacyHeaders)
|
||||
];
|
||||
|
||||
# Building tests is broken on Darwin.
|
||||
|
||||
@@ -101,6 +101,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# Fails to build on x86_64-linux as of 2025-03-16 and potentially earlier
|
||||
broken = true;
|
||||
description = "Jagged Alliance 2, with community fixes";
|
||||
license = "SFI Source Code license agreement";
|
||||
homepage = "https://ja2-stracciatella.github.io/";
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "level-zero";
|
||||
version = "1.22.3";
|
||||
version = "1.21.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "level-zero";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-yCrfaAoxvsDngfayw13/HqL4RW/gC+eRls6WgIELWHE=";
|
||||
hash = "sha256-I9jCS4ZDEfOH/2kgIgeNne96Z5YZdzsmUGXza8PmXZI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logcheck";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
_name = "logcheck_${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
|
||||
sha256 = "sha256-1A4aknB+GVgc3F8VlqVtJjlvGLBhYS6E+w+9lXvAOGQ=";
|
||||
sha256 = "sha256-enUxHYVhdiDQLMAnQnRjx/mvIEHgL8k/W8Jda6PMrfE=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -2,32 +2,52 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miniaudio";
|
||||
version = "0.11.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mackron";
|
||||
repo = "miniaudio";
|
||||
rev = version;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-o/7sfBcrhyXEakccOAogQqm8dO4Szj1QSpaIHg6OSt4=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/* $out/
|
||||
postInstall = ''
|
||||
mkdir -p $out/include
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
|
||||
cp $src/miniaudio.h $out/include
|
||||
ln -s $out/include/miniaudio.h $out
|
||||
|
||||
cp -r $src/extras $out/
|
||||
|
||||
cat <<EOF >$out/lib/pkgconfig/miniaudio.pc
|
||||
prefix=$out
|
||||
includedir=$out/include
|
||||
|
||||
Name: miniaudio
|
||||
Description: An audio playback and capture library in a single source file.
|
||||
Version: $version
|
||||
Cflags: -I$out/include
|
||||
Libs: -lm -lpthread -latomic
|
||||
EOF
|
||||
'';
|
||||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Single header audio playback and capture library written in C";
|
||||
homepage = "https://github.com/mackron/miniaudio";
|
||||
changelog = "https://github.com/mackron/miniaudio/blob/${src.rev}/CHANGES.md";
|
||||
changelog = "https://github.com/mackron/miniaudio/blob/${finalAttrs.version}/CHANGES.md";
|
||||
license = with licenses; [
|
||||
unlicense # or
|
||||
mit0
|
||||
];
|
||||
maintainers = [ maintainers.jansol ];
|
||||
pkgConfigModules = [ "miniaudio" ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
ncurses,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "n2048";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.dettus.net/n2048/n2048_v${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-c4bHWmdQuwyRXIm/sqw3p71pMv6VLAzIuUTaDHIWn6A=";
|
||||
};
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
];
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
ncurses
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p "$out"/{share/man,bin}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Console implementation of 2048 game";
|
||||
mainProgram = "n2048";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://www.dettus.net/n2048/";
|
||||
};
|
||||
})
|
||||
@@ -22,13 +22,13 @@ let
|
||||
in
|
||||
maven.buildMavenPackage rec {
|
||||
pname = "ns-usbloader";
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developersu";
|
||||
repo = "ns-usbloader";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gSf5SCIhcUEYGsYssXVGjUweVU+guxOI+lzD3ANr96w=";
|
||||
sha256 = "sha256-nZfAZ+IjoYXEWwH9oOhOQ5TOYUNiAGAqhHRhskyx/Vo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opengrok";
|
||||
version = "1.13.30";
|
||||
version = "1.14.0";
|
||||
|
||||
# binary distribution
|
||||
src = fetchurl {
|
||||
url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-upmmgyZXl4DUn4BjU0b7+T7LYw/JC9cRyiy169Ned/U=";
|
||||
hash = "sha256-9tTUD5mG6xdkGcZkwXyo9YnvlehuHDT/FH6tvua0S7c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -10,23 +10,23 @@
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2025.605.3";
|
||||
version = "2025.607.0";
|
||||
|
||||
src =
|
||||
{
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
|
||||
hash = "sha256-rfWP6vF68mE+pnKvJjSgkxzTBj3sWDRlB9NZZkPOYOE=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
|
||||
hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
|
||||
hash = "sha256-FpMugHVyhpyzCRp+EH/RSQDsgoUEQrAuIVCaMTucz88=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||
hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
|
||||
hash = "sha256-jG3KedllnVNd5TLSkKYae2V8CzN90g5lJhT4EKI+nuk=";
|
||||
};
|
||||
}
|
||||
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2025.605.3";
|
||||
version = "2025.607.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
tag = version;
|
||||
hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
|
||||
hash = "sha256-qAKtINbWbC76a4vhEFIE6WnEtn/0brcIPp5WXBGQoEI=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
|
||||
@@ -12,12 +12,14 @@
|
||||
perl,
|
||||
cabal-install,
|
||||
julia,
|
||||
julia-bin,
|
||||
pre-commit,
|
||||
}:
|
||||
|
||||
with python3Packages;
|
||||
let
|
||||
i686Linux = stdenv.buildPlatform.system == "i686-linux";
|
||||
julia' = if lib.meta.availableOn stdenv.hostPlatform julia then julia else julia-bin;
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "pre-commit";
|
||||
@@ -61,7 +63,7 @@ buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
re-assert
|
||||
cabal-install
|
||||
julia
|
||||
julia'
|
||||
]
|
||||
++ lib.optionals (!i686Linux) [
|
||||
# coursier can be moved back to the main nativeCheckInputs list once we’re able to bootstrap a
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "3.88";
|
||||
version = "3.89";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "seaweedfs";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
hash = "sha256-66yZtRF+gMSafcXQoUJ0bMuBJMDHXvImCWB3vMze/K8=";
|
||||
hash = "sha256-qIbqgcm+qqmbKU+BZ9wrKW16yH7qz5WPijtGz2pusNg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-aSNmEY82ODnxtlnQG6dZWTQfZ+zKCqLtj0DfpPcu3ik=";
|
||||
vendorHash = "sha256-Y1ST5wKIkVKOhNVV1V9eDZ5DupQNm9mcA90Kqt3dQYQ=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -60,7 +60,6 @@ buildGoModule rec {
|
||||
maintainers = with maintainers; [
|
||||
azahi
|
||||
malte-v
|
||||
jtbx
|
||||
];
|
||||
mainProgram = "sojuctl";
|
||||
};
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "stevenblack-blocklist";
|
||||
version = "3.15.37";
|
||||
version = "3.15.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StevenBlack";
|
||||
repo = "hosts";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-d254AsNQgjExXaGd9EQ5dZ1xy5nP6Zqe2INtR9IKMiQ=";
|
||||
hash = "sha256-Hd5jy64tknibRgPQczERdXLtX/PJdc9tC4gI1K+2uhE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -18,17 +18,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "uv";
|
||||
version = "0.7.11";
|
||||
version = "0.7.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY=";
|
||||
hash = "sha256-0ZgsGADMTjVgKUKriBkq0AEldpFxmo/5MPLoShzREO4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA=";
|
||||
cargoHash = "sha256-uvJQlTJrD5ZEbZykllBm/7LLdqOYFvkdNEZpSyVqct0=";
|
||||
|
||||
buildInputs = [
|
||||
rust-jemalloc-sys
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vte";
|
||||
version = "0.80.1";
|
||||
version = "0.80.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-DNvQ6YOv2dIuBl4yOnQxYAcr9ktFPgCxXtvm8tzdpGw=";
|
||||
hash = "sha256-siW+vQQ2M71JHy6hcTdNDz+d5i3+wHZTBTvAjE+s5G8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wgsl-analyzer";
|
||||
version = "2025-04-04";
|
||||
version = "2025-06-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wgsl-analyzer";
|
||||
repo = "wgsl-analyzer";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-t+Gpm+p2EaobuzUppkhCsaj3q/v+YjMSlau4GVoLgJo=";
|
||||
hash = "sha256-bLwehCmWzqDmmg4iGM21BOUquSYJSY2LIqlKuB1bAlA=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-QjR0O/GFOsYi0+r3rYBdR9rw/4Qa5pNjWSbn6CsshqU=";
|
||||
cargoHash = "sha256-Z+slANnmrY5bhM8+Ki+l29OAbpqnx38n53CFCuOR6cM=";
|
||||
|
||||
checkFlags = [
|
||||
# Imports failures
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
bash,
|
||||
fetchFromGitHub,
|
||||
gtk3,
|
||||
pkg-config,
|
||||
@@ -32,13 +33,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
pkg-config
|
||||
libxslt
|
||||
makeWrapper
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
buildInputs = [
|
||||
gtk3
|
||||
libxslt
|
||||
bash # so patchShebangs can patch #!/bin/sh in xarchiver.tap
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
|
||||
}
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = {
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
|
||||
|
||||
@@ -1,55 +1,42 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
ocaml,
|
||||
findlib,
|
||||
ocamlbuild,
|
||||
menhir,
|
||||
odoc,
|
||||
buildDunePackage,
|
||||
}:
|
||||
buildDunePackage rec {
|
||||
pname = "wasm";
|
||||
version = "2.0.2";
|
||||
|
||||
if lib.versionOlder ocaml.version "4.08" then
|
||||
throw "wasm is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-wasm";
|
||||
version = "2.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "spec";
|
||||
tag = "opam-${version}";
|
||||
hash = "sha256-RbVGW6laC3trP6IhtA2tLrAYVbx0Oucox9FgoEvs6LQ=";
|
||||
};
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WebAssembly";
|
||||
repo = "spec";
|
||||
rev = "opam-${version}";
|
||||
hash = "sha256-5eo8MIui2GxRS5X9az0NlLGZfxi5KGsTI/EaP6m/zts=";
|
||||
};
|
||||
postUnpack = ''
|
||||
cd "$sourceRoot/interpreter"
|
||||
export sourceRoot=$PWD
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
ocaml
|
||||
findlib
|
||||
ocamlbuild
|
||||
];
|
||||
strictDeps = true;
|
||||
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
|
||||
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
|
||||
|
||||
# x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
|
||||
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
|
||||
nativeBuildInputs = [
|
||||
menhir
|
||||
odoc
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"-C"
|
||||
"interpreter"
|
||||
];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/bin
|
||||
cp -L interpreter/wasm $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST";
|
||||
mainProgram = "wasm";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter";
|
||||
inherit (ocaml.meta) platforms;
|
||||
};
|
||||
}
|
||||
meta = {
|
||||
description = "Library to read and write WebAssembly (Wasm) files and manipulate their AST";
|
||||
mainProgram = "wasm";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
homepage = "https://github.com/WebAssembly/spec/tree/main/interpreter";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.44";
|
||||
version = "1.1.45";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.44.tgz";
|
||||
sha256 = "1rjn608czjn0f066wgakdzkz73wx0lrinrqs83j44h49qfqwxkl3";
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.45.tgz";
|
||||
sha256 = "1dwn0xaqa5f2wzlc3xygwww0pv9dkvxax8a5ysy08d9zsnpy61ra";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-WltJXI9hd2OIRuPrqjDoCsa6/zjRGydPYCeiVxZIcS8=";
|
||||
hash = "sha256-mH8R2KMN1rSbRkKPUV5BhnL7VjAN8m8O5stg+s9Zye8=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.44",
|
||||
"version": "1.1.45",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
@@ -97,13 +97,12 @@
|
||||
"ldapauth-fork": "5.0.5",
|
||||
"ssh2": "1.16.0",
|
||||
"svg-captcha": "1.4.0",
|
||||
"image-size": "1.1.1",
|
||||
"image-size": "2.0.2",
|
||||
"acme-client": "4.2.5",
|
||||
"aedes": "0.39.0",
|
||||
"mysql2": "3.11.4",
|
||||
"@mysql/xdevapi": "8.0.33",
|
||||
"mongodb": "4.13.0",
|
||||
"saslprep": "1.0.3",
|
||||
"mongodb": "4.17.2",
|
||||
"pg": "8.14.1",
|
||||
"mariadb": "3.4.0",
|
||||
"acebase": "1.29.5",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -451,6 +451,7 @@ mapAliases {
|
||||
collada-dom = opencollada; # added 2024-02-21
|
||||
colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
|
||||
connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
|
||||
cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
|
||||
coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
|
||||
corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
|
||||
cosmic-tasks = tasks; # Added 2024-07-04
|
||||
@@ -1286,7 +1287,6 @@ mapAliases {
|
||||
|
||||
### N ###
|
||||
|
||||
n2048 = throw "'n2048' has been removed due to lack of maintenance upstream. Consider using '_2048-in-terminal'."; # Added 2025-06-07
|
||||
ncdu_2 = ncdu; # Added 2022-07-22
|
||||
neocities-cli = neocities; # Added 2024-07-31
|
||||
neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
|
||||
|
||||
Reference in New Issue
Block a user