Merge master into staging-nixos
This commit is contained in:
nixpkgs-ci[bot]
@@ -188,12 +188,7 @@ let
|
||||
kernel: rebuilds: lib.nameValuePair "10.rebuild-${kernel}-stdenv" (lib.elem "stdenv" rebuilds)
|
||||
) rebuildsByKernel
|
||||
// {
|
||||
"10.rebuild-nixos-tests" =
|
||||
lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds)
|
||||
&&
|
||||
# Only set this label when no other label with indication for staging has been set.
|
||||
# This avoids confusion whether to target staging or batch this with kernel updates.
|
||||
lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;
|
||||
"10.rebuild-nixos-tests" = lib.elem "nixosTests.simple" (extractPackageNames diffAttrs.rebuilds);
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "gambatte";
|
||||
version = "0-unstable-2026-04-11";
|
||||
version = "0-unstable-2026-04-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "gambatte-libretro";
|
||||
rev = "ac3d17d07a1119df5eb124494dfa90e47ae2e5ff";
|
||||
hash = "sha256-5240slUbHUYb6Xp65xPvvCopdciyGK+Z8mdk7i0ALIQ=";
|
||||
rev = "5ba6bd1ad745e04b7069d0eb2b44091364fc997a";
|
||||
hash = "sha256-A9OQx0eXVgrGcmpMTtTe97rHCjrV3Ksi/ooLefsysbQ=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "vba-next";
|
||||
version = "0-unstable-2024-10-21";
|
||||
version = "0-unstable-2026-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "vba-next";
|
||||
rev = "d0ec7f3e209a91b903bb9d2c2397fef2bb3cca32";
|
||||
hash = "sha256-g3Eb1bMGjt+H7awUlMCtKVu223+UvyQ2VBh8aQG1yo8=";
|
||||
rev = "82119ba97ee57c738a2eb1dc3a45cd2122ad2232";
|
||||
hash = "sha256-On2O4WBVLmuj5FJZyaYUtgCEl1mEZffqAvGZpKz+Or8=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abaddon";
|
||||
version = "0.2.2";
|
||||
version = "0.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uowuo";
|
||||
repo = "abaddon";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-48lR1rIWMwLaTv+nIdqmQ3mHOayrC1P5OQuUb+URYh0=";
|
||||
hash = "sha256-fSNXMbyYmUOA4x911/an02fhhhWe6a4xlLVb2DIqIOE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "c2patool";
|
||||
version = "0.26.37";
|
||||
version = "0.26.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contentauth";
|
||||
repo = "c2pa-rs";
|
||||
tag = "c2patool-v${finalAttrs.version}";
|
||||
hash = "sha256-bxiYY55r1Vg8ljoGlUBi5WgAU8GtcEsX030uzfMsals=";
|
||||
hash = "sha256-4I+q+6gz+xNz+lhxyC14hZ8yyYG4qzT8TtkLxl8Y71g=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-AJr4auizFqumMaQzFd5G1keSIRJ3fWX7ftGHDTkPmX0=";
|
||||
cargoHash = "sha256-Fp+EuxrPx817wjzzq8+f6vBzBe5vyhkXGRsaEqTa/Jo=";
|
||||
|
||||
# use the non-vendored openssl
|
||||
env.OPENSSL_NO_VENDOR = 1;
|
||||
|
||||
@@ -16,13 +16,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flow";
|
||||
version = "0.309.0";
|
||||
version = "0.311.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ml1bi5LXk2qzS1Us6ddzctfazoS3XFz2jJQy1of6txc=";
|
||||
hash = "sha256-43a4Q1cr5Lv60OiQUbBMep3YBGNAt0cytgL0oC5BXGo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "haguichi";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ztefn";
|
||||
repo = "haguichi";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-cVM8VbW8aFq9fXFiVfGhkIhyqSXG2zyB3HyA5tTEDVY=";
|
||||
hash = "sha256-BKpHAlhxd8Zy/ZpPkLhXqlgZsil9JEZmVmHis1gte4Q=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchCrate,
|
||||
installShellFiles,
|
||||
makeWrapper,
|
||||
pkg-config,
|
||||
ronn,
|
||||
openssl,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "httplz";
|
||||
version = "1.13.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit (finalAttrs) version;
|
||||
pname = "https";
|
||||
hash = "sha256-uxEMgSrcxMZD/3GQuH9S/oYtMUPzgMR61ZzLcb65zXU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-DXSHaiiIRdyrlX4UYPFD3aTAv65k3x/PU2VW047odH0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
pkg-config
|
||||
ronn
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--bin"
|
||||
"httplz"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
sed -E 's/http(`| |\(|$)/httplz\1/g' http.md > httplz.1.ronn
|
||||
RUBYOPT=-Eutf-8:utf-8 ronn --organization "http developers" -r httplz.1.ronn
|
||||
installManPage httplz.1
|
||||
wrapProgram $out/bin/httplz \
|
||||
--prefix PATH : "${openssl}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Basic http server for hosting a folder fast and simply";
|
||||
mainProgram = "httplz";
|
||||
homepage = "https://github.com/thecoshman/http";
|
||||
changelog = "https://github.com/thecoshman/http/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.matthiasbeyer ];
|
||||
};
|
||||
})
|
||||
@@ -7,15 +7,15 @@
|
||||
}:
|
||||
|
||||
let
|
||||
timestamp = "202602261110";
|
||||
timestamp = "202604151538";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "jdt-language-server";
|
||||
version = "1.57.0";
|
||||
version = "1.58.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
|
||||
hash = "sha256-9/+pP+G7vqldrBPdl83NJcWC1uVttnJY2g3M6yMCYB4=";
|
||||
hash = "sha256-Klu+VeyRtDJTkgUNxCLOrTIgokWbN2a+NeH/9FtKUNk=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "libsignal-ffi";
|
||||
# must match the version used in mautrix-signal
|
||||
# see https://github.com/mautrix/signal/issues/401
|
||||
version = "0.87.5";
|
||||
version = "0.92.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
fetchSubmodules = true;
|
||||
owner = "signalapp";
|
||||
repo = "libsignal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-xffBXvq1ikesIjw6cXfphnTIiyuMiUcY8h0pzSgfD8U=";
|
||||
hash = "sha256-gAXLt0e2k5PA6PgFRQa22oGuNLM7TGkOKQnYtFhn8I8=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-MwAtUrLoSi/pjsBWOAd9JoepAueq17hkZCH21q72O3w=";
|
||||
cargoHash = "sha256-TqYxkkzlbgrc7jkAubz3TsXhcU8Do5IFaLRqSPiZVR0=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"-p"
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "11.4.0";
|
||||
version = "11.4.1";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-2ZEZgQPznh7BvE5OLxno/4aH49tzME3ffuOENKQ8IaA=";
|
||||
hash = "sha256-sTmjVVhOb2EOhohW/SMJgrM8HT5t6afq1ekv+6eZNuY=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -20,14 +20,14 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "26.03";
|
||||
tag = "v0.2603.0";
|
||||
version = "26.04";
|
||||
tag = "v0.2604.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
inherit tag;
|
||||
hash = "sha256-6CTgzhAojDBn7mArysuSh9GUGaleUHb4HFNq+shpKy4=";
|
||||
hash = "sha256-DKJ8BiBu3lhBqeqjCsNNSwF+iSFd8QnJ4wDS7EGU/UM=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
@@ -46,7 +46,7 @@ buildGoModule rec {
|
||||
CGO_LDFLAGS = toString [ cppStdLib ];
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RDr8EUqix8XXMTUGCwCCkQyuvYQeZ8wpYM/dU2dw0m0=";
|
||||
vendorHash = "sha256-rTDEB8OS0RbXNlKHrdtBPkti2PzjbuxaoAKa3uri5CM=";
|
||||
|
||||
ldflags = [
|
||||
"-X"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,144 +0,0 @@
|
||||
{
|
||||
"name": "meshcentral",
|
||||
"version": "1.1.56",
|
||||
"keywords": [
|
||||
"Remote Device Management",
|
||||
"Remote Device Monitoring",
|
||||
"Remote Desktop",
|
||||
"Remote Terminal",
|
||||
"Remote File Access",
|
||||
"KVM",
|
||||
"2FA",
|
||||
"Two-Factor Authentication",
|
||||
"Intel Active Management Technology",
|
||||
"Intel AMT"
|
||||
],
|
||||
"homepage": "https://meshcentral.com",
|
||||
"description": "Web based remote computer management server",
|
||||
"author": "Ylian Saint-Hilaire <ylianst@gmail.com>",
|
||||
"main": "meshcentral.js",
|
||||
"bin": {
|
||||
"meshcentral": "bin/meshcentral"
|
||||
},
|
||||
"license": "Apache-2.0",
|
||||
"files": [
|
||||
"*.js",
|
||||
"amt",
|
||||
"bin",
|
||||
"rdp",
|
||||
"views",
|
||||
"emails",
|
||||
"agents",
|
||||
"public",
|
||||
"translate",
|
||||
"readme.txt",
|
||||
"license.txt",
|
||||
"sample-config.json",
|
||||
"sample-config-advanced.json"
|
||||
],
|
||||
"dependencies": {
|
||||
"@seald-io/nedb": "4.1.2",
|
||||
"archiver": "7.0.1",
|
||||
"body-parser": "1.20.4",
|
||||
"cbor": "5.2.0",
|
||||
"compression": "1.8.1",
|
||||
"cookie-session": "2.1.1",
|
||||
"express": "4.22.1",
|
||||
"express-handlebars": "7.1.3",
|
||||
"express-ws": "5.0.2",
|
||||
"ipcheck": "0.1.0",
|
||||
"minimist": "1.2.8",
|
||||
"multiparty": "4.2.3",
|
||||
"node-forge": "1.3.2",
|
||||
"otplib": "12.0.1",
|
||||
"ua-client-hints-js": "0.1.2",
|
||||
"ua-parser-js": "1.0.40",
|
||||
"ws": "8.18.3",
|
||||
"yauzl": "2.10.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16.0.0"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Ylianst/MeshCentral.git"
|
||||
},
|
||||
"readme": "readme.md",
|
||||
"optionalDependencies": {
|
||||
"passport": "0.7.0",
|
||||
"connect-flash": "0.1.1",
|
||||
"passport-twitter": "1.0.4",
|
||||
"passport-google-oauth20": "2.0.0",
|
||||
"passport-github2": "0.1.12",
|
||||
"passport-azure-oauth2": "0.1.0",
|
||||
"jwt-simple": "0.5.6",
|
||||
"openid-client": "5.7.1",
|
||||
"passport-saml": "*",
|
||||
"@duosecurity/duo_universal": "2.1.0",
|
||||
"archiver": "7.0.1",
|
||||
"body-parser": "1.20.4",
|
||||
"cbor": "5.2.0",
|
||||
"compression": "1.8.1",
|
||||
"cookie-session": "2.1.1",
|
||||
"express": "4.22.1",
|
||||
"express-handlebars": "7.1.3",
|
||||
"express-ws": "5.0.2",
|
||||
"ipcheck": "0.1.0",
|
||||
"minimist": "1.2.8",
|
||||
"multiparty": "4.2.3",
|
||||
"@seald-io/nedb": "4.1.2",
|
||||
"node-forge": "1.3.2",
|
||||
"ua-parser-js": "1.0.40",
|
||||
"ua-client-hints-js": "0.1.2",
|
||||
"ws": "8.18.3",
|
||||
"yauzl": "2.10.0",
|
||||
"node-windows": "0.1.14",
|
||||
"loadavg-windows": "1.1.1",
|
||||
"node-sspi": "0.2.10",
|
||||
"ldapauth-fork": "5.0.5",
|
||||
"ssh2": "1.17.0",
|
||||
"svg-captcha": "1.4.0",
|
||||
"image-size": "2.0.2",
|
||||
"acme-client": "4.2.5",
|
||||
"aedes": "0.51.3",
|
||||
"mysql2": "3.15.1",
|
||||
"@mysql/xdevapi": "8.0.33",
|
||||
"mongodb": "4.17.2",
|
||||
"@mongodb-js/saslprep": "1.3.1",
|
||||
"pg": "8.16.3",
|
||||
"mariadb": "3.4.5",
|
||||
"acebase": "1.29.5",
|
||||
"sqlite3": "5.1.7",
|
||||
"node-vault": "0.10.5",
|
||||
"https-proxy-agent": "7.0.6",
|
||||
"mongojs": "3.1.0",
|
||||
"nodemailer": "6.10.1",
|
||||
"@sendgrid/mail": "8.1.6",
|
||||
"jsdom": "22.1.0",
|
||||
"esprima": "4.0.1",
|
||||
"html-minifier-terser": "7.2.0",
|
||||
"@crowdsec/express-bouncer": "0.1.0",
|
||||
"prom-client": "15.1.3",
|
||||
"archiver-zip-encrypted": "2.0.0",
|
||||
"googleapis": "128.0.0",
|
||||
"webdav": "5.8.0",
|
||||
"minio": "8.0.6",
|
||||
"wildleek": "2.0.0",
|
||||
"yub": "0.11.1",
|
||||
"otplib": "12.0.1",
|
||||
"twilio": "4.23.0",
|
||||
"plivo": "4.75.1",
|
||||
"telnyx": "1.25.5",
|
||||
"telegram": "2.26.22",
|
||||
"input": "1.0.1",
|
||||
"discord.js": "14.6.0",
|
||||
"@xmpp/client": "0.13.6",
|
||||
"node-pushover": "1.0.0",
|
||||
"zulip": "0.1.0",
|
||||
"web-push": "3.6.7",
|
||||
"firebase-admin": "12.7.0",
|
||||
"modern-syslog": "1.2.0",
|
||||
"syslog": "0.1.1-1",
|
||||
"heapdump": "0.3.15"
|
||||
}
|
||||
}
|
||||
@@ -1,51 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchzip,
|
||||
fetchYarnDeps,
|
||||
yarn2nix-moretea,
|
||||
nodejs-slim_20,
|
||||
dos2unix,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nodejs_22,
|
||||
}:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.56";
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "meshcentral";
|
||||
version = "1.1.57";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.56.tgz";
|
||||
sha256 = "1n6kzbgmsn083sdwgwnn6cwch1ay20n1218bgzyv604hyvzrm0i2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ylianst";
|
||||
repo = "MeshCentral";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-tXv4AWFLBoaHraSTYbEuNjdxnB3tYyAYq5xPe4jRcmw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-vWCd+7SnQCf6iBhQboqMKL7TQRPxvt4DOe9+XJ8XJ1Y=";
|
||||
# Using the npmDeps with a newer nodejs causes `npm ci` errors, also upstream
|
||||
# states they stick to the LTS version of nodejs:
|
||||
# https://meshcentral.com/docs/MeshCentral2InstallGuide.pdf
|
||||
nodejs = nodejs_22;
|
||||
|
||||
patches = [
|
||||
./fix-js-include-paths.patch
|
||||
# from some reason the way the package is installed causes the `require`
|
||||
# line in `$out/lib/node_modules/meshcentral/bin/meshcentral` to import the
|
||||
# main file as a module, and thus nothing happens when it runs. We remove
|
||||
# this conditional since we never use this as a module.
|
||||
./run.patch
|
||||
# Add `optionalDependencies` that are used during runtime, to
|
||||
# `package{,-lock}.json`. During a video meeting with upstream, they sort
|
||||
# of agreed to track these optionalDependencies from now on, but they are
|
||||
# still not sure about a few details regarding this. See:
|
||||
#
|
||||
# https://github.com/Ylianst/MeshCentral/pull/7672
|
||||
#
|
||||
# The above doesn't apply cleanly on 1.1.57, but hopefully it shouldn't be
|
||||
# too hard to regenerate it for the next version.
|
||||
./optionalDependencies.patch
|
||||
];
|
||||
|
||||
packageJSON = ./package.json;
|
||||
yarnLock = ./yarn.lock;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-M5TZhY995VFFbY3cjM3jiEceiVm54N6CKxQRVACOL9w=";
|
||||
};
|
||||
|
||||
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
|
||||
nativeBuildInputs = [ dos2unix ];
|
||||
prePatch = ''
|
||||
find . -name '*.js' -exec dos2unix {} +
|
||||
ln -snf meshcentral.js bin/meshcentral
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
mkdir -p $out/bin
|
||||
chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
|
||||
sed -i '1i#!${lib.getExe nodejs-slim_20}' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
|
||||
ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
|
||||
'';
|
||||
|
||||
doDist = false;
|
||||
|
||||
publishBinsFor = [ ];
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
description = "Computer management web app";
|
||||
@@ -54,4 +50,4 @@ yarn2nix-moretea.mkYarnPackage {
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "meshcentral";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
diff --git c/meshcentral.js w/meshcentral.js
|
||||
index ea784b4c..62dfd645 100644
|
||||
--- c/meshcentral.js
|
||||
+++ w/meshcentral.js
|
||||
@@ -4461,8 +4461,4 @@ function mainStart() {
|
||||
});
|
||||
}
|
||||
|
||||
-if (require.main === module) {
|
||||
- mainStart(); // Called directly, launch normally.
|
||||
-} else {
|
||||
- module.exports.mainStart = mainStart; // Required as a module, useful for winservice.js
|
||||
-}
|
||||
+mainStart(); // Called directly, launch normally.
|
||||
@@ -1,54 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodejs yarn prefetch-yarn-deps jq rsync common-updater-scripts moreutils
|
||||
|
||||
set -exuo pipefail
|
||||
|
||||
expr_dir=$(cd "$(dirname "$0")"; pwd)
|
||||
tmp=$(mktemp -dt update-meshcentral.XXXXXX)
|
||||
|
||||
npm show --json meshcentral > "$tmp/npm.json"
|
||||
version=$(<"$tmp/npm.json" jq -r .version)
|
||||
tarball=$(<"$tmp/npm.json" jq -r .dist.tarball)
|
||||
|
||||
prefetch=$(nix-prefetch-url --unpack --print-path "$tarball" | tr '\n' ' ')
|
||||
read -r hash storePath <<<"$prefetch"
|
||||
cd "$tmp"
|
||||
rsync -r --chmod=u=rwX "$storePath/" package/
|
||||
cd package
|
||||
|
||||
# Very crude way of discovering optional dependencies. These are
|
||||
# fetched at runtime by stock upstream, but we don't allow that kind
|
||||
# of thing in nix :)
|
||||
awk <meshcentral.js "
|
||||
BEGIN { RS=\"[\n;]\" }
|
||||
match(\$0, /(modules|passport) = (\[.*\])$/, a) { print a[2] }
|
||||
match(\$0, /(modules|passport).push\(('[^)]+')\)/, a) { print \"[\" a[2] \"]\" }
|
||||
" |
|
||||
tr \' \" |
|
||||
jq --slurp '[if type == "array" then .[] else . end] | flatten' |
|
||||
# And an equally crude way of adding them to package.json. We
|
||||
# can't use yarn add here, because that will blow up on
|
||||
# dependencies which don't support the current platform. Even with
|
||||
# --optional.
|
||||
jq --slurpfile package package.json \
|
||||
'(. | map(. | capture("(?<name>@?[^@]+)(@(?<version>.+))?") | { key: .name, value: (.version // "*")}) | from_entries) as $optionalDependencies | $package | .[] | .optionalDependencies |= . + $optionalDependencies' |
|
||||
sponge package.json
|
||||
|
||||
# Fetch all the optional dependencies, so we have them available in
|
||||
# yarn.lock/yarn.nix
|
||||
yarn install --ignore-scripts
|
||||
|
||||
cp package.json "$expr_dir"
|
||||
cp yarn.lock "$expr_dir/yarn.lock"
|
||||
|
||||
cd "$expr_dir/../../../.."
|
||||
update-source-version meshcentral "$version" "$hash" "$tarball"
|
||||
|
||||
new_yarn_hash=$(prefetch-yarn-deps "$expr_dir/yarn.lock")
|
||||
new_yarn_hash=$(nix-hash --type sha256 --to-sri "$new_yarn_hash")
|
||||
old_yarn_hash=$(nix-instantiate --eval -A meshcentral.offlineCache.outputHash | tr -d '"')
|
||||
sed -i "$expr_dir/default.nix" -e "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|"
|
||||
|
||||
# Only clean up if everything worked
|
||||
cd /
|
||||
rm -rf "$tmp"
|
||||
File diff suppressed because it is too large
Load Diff
@@ -74,5 +74,14 @@ buildGoModule (finalAttrs: {
|
||||
];
|
||||
license = lib.licenses.agpl3Plus;
|
||||
mainProgram = "minio";
|
||||
knownVulnerabilities = [
|
||||
"CVE-2026-40344: MinIO has an Unauthenticated Object Write via Missing Signature Verification in Unsigned-Trailer Uploads"
|
||||
"CVE-2026-41145: Unauthenticated Object Write via Query-String Credential Signature Bypass in Unsigned-Trailer Uploads"
|
||||
"CVE-2026-33322: JWT Algorithm Confusion in OIDC Authentication"
|
||||
"CVE-2026-33419: LDAP login brute-force via user enumeration and missing rate limit"
|
||||
"CVE-2026-34204: SSE Metadata Injection via Replication Headers"
|
||||
"CVE-2026-39414: DoS via Unbounded Memory Allocation in S3 Select CSV Parsing"
|
||||
"minio has been abandoned by upstream and security issues won't be fixed. Users should migrate to alternatives such as Garage, SeaweedFS, or Ceph. S3-compatible clients such as rclone can be used to move data."
|
||||
];
|
||||
};
|
||||
})
|
||||
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mlt";
|
||||
version = "7.36.1";
|
||||
version = "7.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mltframework";
|
||||
repo = "mlt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3WZirFMrU8T8UClkUQRBjqBqycpI7pAjcVzeGpYMwhY=";
|
||||
hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc=";
|
||||
# The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
|
||||
# Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
|
||||
# submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
|
||||
|
||||
@@ -27,13 +27,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "niri";
|
||||
version = "25.11";
|
||||
version = "26.04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "niri-wm";
|
||||
repo = "niri";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=";
|
||||
hash = "sha256-ehSMsSpE+0k8r+2Vseu8kangsYxToZv3vinynsDp9zs=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -44,10 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
postPatch = ''
|
||||
patchShebangs resources/niri-session
|
||||
substituteInPlace resources/niri.service \
|
||||
--replace-fail '/usr/bin' "$out/bin"
|
||||
--replace-fail 'niri' "$out/bin/niri"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-X28M0jyhUtVtMQAYdxIPQF9mJ5a77v8jw1LKaXSjy7E=";
|
||||
cargoHash = "sha256-gfnalA3qI3a9h3PvsxgQLCrzapfjLLkxhTMJpwRh+ro=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -139,6 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
maintainers = with lib.maintainers; [
|
||||
sodiboo
|
||||
getchoo
|
||||
zimward
|
||||
];
|
||||
mainProgram = "niri";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -22,9 +22,9 @@ let
|
||||
|
||||
phome = "$out/lib/olympus";
|
||||
# The following variables are to be updated by the update script.
|
||||
version = "26.04.16.02";
|
||||
buildId = "5566"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "047950f997ecf24c3ec5cc01244ffbe2fdc601d9";
|
||||
version = "26.04.22.01";
|
||||
buildId = "5580"; # IMPORTANT: This line is matched with regex in update.sh.
|
||||
rev = "78728dcc08e5aba23100527da864ec3c93948a44";
|
||||
in
|
||||
buildDotnetModule {
|
||||
pname = "olympus-unwrapped";
|
||||
@@ -37,7 +37,7 @@ buildDotnetModule {
|
||||
owner = "EverestAPI";
|
||||
repo = "Olympus";
|
||||
fetchSubmodules = true; # Required. See upstream's README.
|
||||
hash = "sha256-lj2cBwtalTK5wJrIzKcZKirviodUehqIagL9j61iTyM=";
|
||||
hash = "sha256-qB41sG3KATUXj/k0WePwM0z0w6UOyfAYEo2Y7YWoKeo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
rustPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "re-appintentsmetadataprocessor";
|
||||
version = "1.0.0";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "viraptor";
|
||||
repo = "re-appintentsmetadataprocessor";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-yZZd1j1V9hNFg1zZmXoNwDi9aueoEIqnptS+NityGlg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-mkev7O6eO2ddFoP3Gm6r+2kllnz2c9HiYADjFZXQIHo=";
|
||||
|
||||
meta = {
|
||||
mainProgram = "appintentsmetadataprocessor";
|
||||
description = "Open reimplementation of Apple's appintentsmetadataprocessor";
|
||||
homepage = "https://codeberg.org/viraptor/re-appintentsmetadataprocessor";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
rustPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "re-derq";
|
||||
version = "1.0.1";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "viraptor";
|
||||
repo = "re-derq";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-dnkxHEuFCn/QVMdTNhWtv5fh54Gald0YQCO0/LoQtCI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KnH8jJb2rLn2LAgno+QbBg5K5NQErlvGDbhxEthwryM=";
|
||||
|
||||
meta = {
|
||||
mainProgram = "derq";
|
||||
description = "Open reimplementation of Apple's derq";
|
||||
homepage = "https://codeberg.org/viraptor/re-derq";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromCodeberg,
|
||||
rustPlatform,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "re-intentbuilderc";
|
||||
version = "1.0.2";
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromCodeberg {
|
||||
owner = "viraptor";
|
||||
repo = "re-intentbuilderc";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-MucaZ+5MfwMj2nxMcKONxlVXaeHJnN1KVvP2961dQIY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9PmIoXngNuWUXYa1f4CS5JS1yh+/9E8GBfjndIFEqTk=";
|
||||
|
||||
meta = {
|
||||
mainProgram = "intentbuilderc";
|
||||
description = "Open reimplementation of Apple's intentbuilderc";
|
||||
homepage = "https://codeberg.com/viraptor/re-intentbuilderc";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ viraptor ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
@@ -19,16 +19,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rusty-path-of-building";
|
||||
version = "0.2.15";
|
||||
version = "0.2.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "meehl";
|
||||
repo = "rusty-path-of-building";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YhCJkyzWVZ1BEux85qyTHlyLS/LaotMoe+tGwwd9EOI=";
|
||||
hash = "sha256-2pXT9Wyn49sGHDqjlmlCRUyIIAEERAKNK6cDTUwwjGM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-B04Jf3G7UVwhzVY1mO6IUqb1AXpvJQs+aWggMhYPHRw=";
|
||||
cargoHash = "sha256-VZfwk6Yf4JPkjC9XY93t1jXTJCrwwfkRFFgqNYWx8HE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "trayscale";
|
||||
version = "0.18.7";
|
||||
version = "0.18.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DeedleFake";
|
||||
repo = "trayscale";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-t284DpU4kmfrAgOmBZTwHYsxpl6vt7FPytv8/nsNfPM=";
|
||||
hash = "sha256-eOKTzIZ/040R6qIRBTtNXz8Me9I/PYuX9+ne4gxGKSw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-+2NoNIbB4lXcZhj2pifQpdiKZXslAhv6lxiKUThqTVc=";
|
||||
vendorHash = "sha256-NdXXnSaNhp1CikrkycvGbjFS3Ow0SOQcBiWIVYwEODU=";
|
||||
|
||||
subPackages = [ "cmd/trayscale" ];
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version_4 = "4.14.1";
|
||||
version_4 = "4.13.0";
|
||||
version_3 = "3.8.7";
|
||||
hash_4 = "sha256-0UnU5jRSUFMw+WowvXqYqaaN1ZbZAdLLJ6LPyuK6iCc=";
|
||||
hash_4 = "sha256-FP15a2ueihDm6f/GdXsnqI5drVHo0EtbmrhCZfRdugQ=";
|
||||
hash_3 = "sha256-vRrk+Fs/7dZha3h7yI5NpMfd1xezesnigpFgTRCACZo=";
|
||||
in
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.233.5";
|
||||
version = "0.233.10";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-sMjl0WRLYIshN9TIBqu6wFnTohIKGyxalT6+vmVwX+E=";
|
||||
hash = "sha256-ftbrApKQhSn6SNs7ysgBot9XctuVtAskBTnm2hmCBaA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
rm -r $out/git/*/candle-book/
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-RAgCFV7AzeW+ois529+rqHOjVxH42bZ6/ju7Dmh/FWg=";
|
||||
cargoHash = "sha256-9r0jaT+ETAkGGHYDL1KFmq3M+apaLsRpORk7OOz4s5Q=";
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -150,7 +150,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
cargo-about
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ makeBinaryWrapper ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
cargo-bundle
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zookeeper";
|
||||
version = "3.9.5";
|
||||
version = "3.9.5"; # Don't forget to update zookeeper_mt's hash!
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/zookeeper/zookeeper-${finalAttrs.version}/apache-zookeeper-${finalAttrs.version}-bin.tar.gz";
|
||||
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
|
||||
hash = "sha512-K8HvBwIdf0tHVotFoFuk0uYr2HFPsCKjPmK9xI/hHTxkpT1Tyx11Lxel9NlJppttillKMYAHvgrzinPDcQ7bdg==";
|
||||
hash = "sha512-Zb6uvLbvf2m4RMLwpZ3E2S9ChFvcOpyp/TH+WSfTe6tOmecAnv/YM6gz4z5PyBulyg0j7jqc3BmQvotvyPt5tw==";
|
||||
};
|
||||
|
||||
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
|
||||
|
||||
@@ -42,13 +42,13 @@ assert lib.asserts.assertOneOf "buildMaximumColorFonts" buildMaximumColorFonts [
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "openmoji";
|
||||
version = "16.0.0";
|
||||
version = "17.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hfg-gmuend";
|
||||
repo = "openmoji";
|
||||
rev = version;
|
||||
hash = "sha256-4dYtLaABu88z25Ud/cuOECajxSJWR01qcTIZNWN7Fhw=";
|
||||
hash = "sha256-mE34l94C/jc7Fd4v7opMeneFZAou5w9KhjLSVxw0s/0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
-36
@@ -1,36 +0,0 @@
|
||||
From df28165c0955ab963aeda41ffda86651115f4efb Mon Sep 17 00:00:00 2001
|
||||
From: OPNA2608 <opna2608@protonmail.com>
|
||||
Date: Tue, 24 Feb 2026 21:04:37 +0100
|
||||
Subject: [PATCH] tests/authentication-test.cpp: Fix compat with libnotify
|
||||
0.8.8
|
||||
|
||||
---
|
||||
tests/authentication-test.cpp | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/authentication-test.cpp b/tests/authentication-test.cpp
|
||||
index 8c74867..2fee42d 100644
|
||||
--- a/tests/authentication-test.cpp
|
||||
+++ b/tests/authentication-test.cpp
|
||||
@@ -245,12 +245,16 @@ TEST_F(AuthenticationTest, BasicRequest)
|
||||
EXPECT_EQ("Cancel", dialogs[0].actions[3]);
|
||||
|
||||
/* Hints */
|
||||
-#if (NOTIFY_VERSION_MAJOR >= 0) && (NOTIFY_VERSION_MINOR >= 8)
|
||||
+#if NOTIFY_CHECK_VERSION(0, 8, 0)
|
||||
+#if NOTIFY_CHECK_VERSION(0, 8, 8)
|
||||
+ EXPECT_EQ(4, dialogs[0].hints.size());
|
||||
+#else
|
||||
EXPECT_EQ(3, dialogs[0].hints.size());
|
||||
+#endif // NOTIFY_CHECK_VERSION(0, 8, 8)
|
||||
EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("sender-pid"));
|
||||
#else
|
||||
EXPECT_EQ(2, dialogs[0].hints.size());
|
||||
-#endif
|
||||
+#endif // NOTIFY_CHECK_VERSION(0, 8, 0)
|
||||
EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-snap-decisions"));
|
||||
EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-private-menu-model"));
|
||||
|
||||
--
|
||||
2.51.2
|
||||
|
||||
@@ -18,20 +18,15 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lomiri-polkit-agent";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ubports";
|
||||
repo = "development/core/lomiri-polkit-agent";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-JKU2lm5wco9aC2cu3lgJ9OfGAzKQO/wQXFPEdb9Uz3Y=";
|
||||
hash = "sha256-e7aPQ0c5uDz69D2RTWGodRKfPi2vBZbHk6ua4YLbC0s=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/17 merged & in release
|
||||
./1001-Fix-compat-with-libnotify-0.8.8.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
libportal-gtk3,
|
||||
granite,
|
||||
pango,
|
||||
poppler_gi,
|
||||
sqlite,
|
||||
zeitgeist,
|
||||
libcloudproviders,
|
||||
@@ -26,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-files";
|
||||
version = "7.2.0";
|
||||
version = "7.3.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = "files";
|
||||
rev = version;
|
||||
hash = "sha256-m6ICWL2JZoWh3myHLOhrKZ4St8zJcyVWhfozg+kdOng=";
|
||||
hash = "sha256-/LhQznVm9w8YO69LFrZw7goDY/S34pldAai8CbJpLGo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||
libhandy
|
||||
libportal-gtk3
|
||||
pango
|
||||
poppler_gi
|
||||
sqlite
|
||||
systemd
|
||||
zeitgeist
|
||||
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.95";
|
||||
version = "1.42.96";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-5sPTA/eUY0vj21nWNr/p1Key5ZZjYraRE/PBD6BjcFQ=";
|
||||
hash = "sha256-HngZw00ero5ePPr50UT9ytZarRhLOASIhx3h0LKFGHk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "iamdata";
|
||||
version = "0.1.202604241";
|
||||
version = "0.1.202604251";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloud-copilot";
|
||||
repo = "iam-data-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-7efnhH/HdKGmiUVnKaxpv4YjunmnxHQCotSY02mwJMQ=";
|
||||
hash = "sha256-nKFt32gK7SYyKoMxy28QDM2YySglu6ftpgcDWUwo28Y=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -10,21 +10,21 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "jsonrpc-websocket";
|
||||
version = "3.2.0";
|
||||
version = "3.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emlove";
|
||||
repo = "jsonrpc-websocket";
|
||||
tag = version;
|
||||
hash = "sha256-SgwEY/5MPEkSrcsQV4qkVgKmYYYsWA2YluReOz7sEjc=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-vhE5jee3ryrKFm9s8SFklBIk+pV8FkUERwWQ75u/PIw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
jsonrpc-base
|
||||
@@ -48,7 +48,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "JSON-RPC websocket client library for asyncio";
|
||||
homepage = "https://github.com/emlove/jsonrpc-websocket";
|
||||
changelog = "https://github.com/emlove/jsonrpc-websocket/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,26 +2,30 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "multitasking";
|
||||
version = "0.0.12";
|
||||
format = "setuptools";
|
||||
version = "0.0.13";
|
||||
pyproject = true;
|
||||
|
||||
# GitHub source releases aren't tagged
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L7ovqO2MS4XiJ8XdfcQcfWWN47byR5JzFhdaVzSbhNE=";
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2Ja134d8nKXu3b8OWZQSRpTWy1NaummPsjNExwJRVaE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
doCheck = false; # No tests included
|
||||
|
||||
pythonImportsCheck = [ "multitasking" ];
|
||||
|
||||
meta = {
|
||||
description = "Non-blocking Python methods using decorators";
|
||||
homepage = "https://github.com/ranaroussi/multitasking";
|
||||
changelog = "https://github.com/ranaroussi/multitasking/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -335,8 +335,8 @@ in
|
||||
"sha256-UNxmIK9UD6AVmT4nyQzunNAKjp2YmV1wQ5oloHOwcXw=";
|
||||
|
||||
mypy-boto3-connect =
|
||||
buildMypyBoto3Package "connect" "1.42.91"
|
||||
"sha256-d/xCgnFZIqqBBq4XbOFjpRCxqdpH8FIgm8msv4V8hZQ=";
|
||||
buildMypyBoto3Package "connect" "1.42.96"
|
||||
"sha256-SMtRblhW1FEJpMvLdg6gLZhh8o/Hh2DarMBgyfwzRMI=";
|
||||
|
||||
mypy-boto3-connect-contact-lens =
|
||||
buildMypyBoto3Package "connect-contact-lens" "1.42.3"
|
||||
@@ -806,8 +806,8 @@ in
|
||||
"sha256-UBSxl5YmYh3m4gl4iKdDU2McetKuDcLkiR73Yvf0AQQ=";
|
||||
|
||||
mypy-boto3-logs =
|
||||
buildMypyBoto3Package "logs" "1.42.90"
|
||||
"sha256-V+msnycNcwaLWCpOnCJ2gGRVs6irf1Qk09pzlYTSkBk=";
|
||||
buildMypyBoto3Package "logs" "1.42.96"
|
||||
"sha256-MU6OS6h65vu4ILnioSVFSjptSkCow4T2qbTky2vo8ao=";
|
||||
|
||||
mypy-boto3-lookoutequipment =
|
||||
buildMypyBoto3Package "lookoutequipment" "1.42.3"
|
||||
@@ -1366,8 +1366,8 @@ in
|
||||
"sha256-RQkxMKk7svSYMoPac44m9X0YyEEQWCz/geSRD2qjlI8=";
|
||||
|
||||
mypy-boto3-transfer =
|
||||
buildMypyBoto3Package "transfer" "1.42.84"
|
||||
"sha256-42Ep7vDUBgqDLeIaQEakr45Pay6HOC0nHE4gamNFyw4=";
|
||||
buildMypyBoto3Package "transfer" "1.42.96"
|
||||
"sha256-Y/3Va1N/wP9vYfdHeqovrz0UHZLB3JFHg8K4Y+Ewycs=";
|
||||
|
||||
mypy-boto3-translate =
|
||||
buildMypyBoto3Package "translate" "1.42.3"
|
||||
|
||||
@@ -925,6 +925,7 @@ mapAliases {
|
||||
hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27
|
||||
hspellDicts = throw "'hspellDicts' has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
|
||||
http-prompt = throw "'http-prompt' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-26
|
||||
httplz = throw "'httplz' has been removed as it was unmaintained upstream"; # Added 2026-04-25
|
||||
hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
|
||||
hydraAntLogger = warnAlias "'hydraAntLogger' has been renamed to 'hydra-ant-logger'" hydra-ant-logger; # Added 2026-02-08
|
||||
hyprfreeze = warnAlias "'hyprfreeze' has been renamed to 'wl-freeze'" wl-freeze; # Added 2026-04-10
|
||||
|
||||
Reference in New Issue
Block a user