Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-08-06 18:01:00 +00:00
committed by GitHub
83 changed files with 1739 additions and 2160 deletions
+1
View File
@@ -1,5 +1,6 @@
ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
Anderson Torres <torres.anderson.85@protonmail.com>
Atemu <git@atemu.net> <atemu.main@gmail.com>
Daniel Løvbrøtte Olsen <me@dandellion.xyz> <daniel.olsen99@gmail.com>
Fabian Affolter <mail@fabian-affolter.ch> <fabian@affolter-engineering.ch>
Janne Heß <janne@hess.ooo> <dasJ@users.noreply.github.com>
+8 -8
View File
@@ -1059,13 +1059,6 @@
githubId = 45176912;
name = "Tomasz Hołubowicz";
};
AluisioASG = {
name = "Aluísio Augusto Silva Gonçalves";
email = "aluisio@aasg.name";
github = "AluisioASG";
githubId = 1904165;
keys = [ { fingerprint = "7FDB 17B3 C29B 5BA6 E5A9 8BB2 9FAA 63E0 9750 6D9D"; } ];
};
alunduil = {
email = "alunduil@gmail.com";
github = "alunduil";
@@ -1934,7 +1927,7 @@
};
atemu = {
name = "Atemu";
email = "atemu.main+nixpkgs@gmail.com";
email = "nixpkgs@mail.atemu.net";
github = "Atemu";
githubId = 18599032;
};
@@ -19144,6 +19137,13 @@
githubId = 602439;
name = "Serguei Narojnyi";
};
snaki = {
email = "ek@kyouma.net";
matrix = "@snaki:kescher.at";
name = "emily";
github = "snaakey";
githubId = 38018554;
};
snapdgn = {
email = "snapdgn@proton.me";
name = "Nitish Kumar";
+2
View File
@@ -72,6 +72,8 @@ in {
# To make the Miriway session available if a display manager like SDDM is enabled:
services.displayManager.sessionPackages = [ pkgs.miriway ];
xdg.icons.enable = true;
};
meta.maintainers = with lib.maintainers; [ OPNA2608 ];
@@ -52,6 +52,8 @@ in
services.displayManager.sessionPackages = [ finalPackage ];
xdg.icons.enable = true;
xdg.portal = {
enable = lib.mkDefault true;
wlr.enable = lib.mkDefault true;
@@ -19,6 +19,8 @@
xwayland.enable = lib.mkDefault enableXWayland;
};
xdg.icons.enable = true;
xdg.portal.wlr.enable = enableWlrPortal;
# Window manager only sessions (unlike DEs) don't handle XDG
@@ -238,6 +238,8 @@ in {
systemd.packages = [kdePackages.drkonqi];
systemd.services."drkonqi-coredump-processor@".wantedBy = ["systemd-coredump@.service"];
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = [kdePackages.xdg-desktop-portal-kde];
xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde];
+1 -1
View File
@@ -484,7 +484,7 @@ in
};
config = mkOption {
type = with types; attrsOf (oneOf [ bool str (listOf str) ]);
type = with types; attrsOf (oneOf [ bool int str (listOf str) ]);
description = ''
The main.cf configuration file as key value set.
'';
+1 -1
View File
@@ -18,7 +18,7 @@ let
lib.concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.extraCgroups
);
servicename =
if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-pp)) then "ananicy-cpp" else "ananicy";
if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy";
# Ananicy-CPP with BPF is not supported on hardened kernels https://github.com/NixOS/nixpkgs/issues/327382
finalPackage =
if (servicename == "ananicy-cpp" && config.boot.kernelPackages.isHardened) then
@@ -7,6 +7,8 @@ let
StateDirectory = if lib.versionOlder config.system.stateVersion "24.11" then "bitwarden_rs" else "vaultwarden";
dataDir = "/var/lib/${StateDirectory}";
# Convert name from camel case (e.g. disable2FARemember) to upper case snake case (e.g. DISABLE_2FA_REMEMBER).
nameToEnvVar = name:
let
@@ -25,7 +27,7 @@ let
configEnv = lib.concatMapAttrs (name: value: lib.optionalAttrs (value != null) {
${nameToEnvVar name} = if lib.isBool value then lib.boolToString value else toString value;
}) cfg.config;
in { DATA_FOLDER = "/var/lib/${StateDirectory}"; } // lib.optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
in { DATA_FOLDER = dataDir; } // lib.optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault";
} // configEnv;
@@ -160,10 +162,16 @@ in {
};
config = lib.mkIf cfg.enable {
assertions = [ {
assertion = cfg.backupDir != null -> cfg.dbBackend == "sqlite";
message = "Backups for database backends other than sqlite will need customization";
} ];
assertions = [
{
assertion = cfg.backupDir != null -> cfg.dbBackend == "sqlite";
message = "Backups for database backends other than sqlite will need customization";
}
{
assertion = !(lib.hasPrefix dataDir cfg.backupDir);
message = "Backup directory can not be in ${dataDir}";
}
];
users.users.vaultwarden = {
inherit group;
@@ -224,7 +232,7 @@ in {
systemd.services.backup-vaultwarden = lib.mkIf (cfg.backupDir != null) {
description = "Backup vaultwarden";
environment = {
DATA_FOLDER = "/var/lib/${StateDirectory}";
DATA_FOLDER = dataDir;
BACKUP_FOLDER = cfg.backupDir;
};
path = with pkgs; [ sqlite ];
@@ -374,6 +374,8 @@ in
};
};
xdg.icons.enable = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.plasma5Packages.xdg-desktop-portal-kde ];
xdg.portal.configPackages = mkDefault [ pkgs.plasma5Packages.xdg-desktop-portal-kde ];
@@ -187,8 +187,7 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None)
def write_loader_conf(profile: str | None) -> None:
with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f:
if TIMEOUT != "":
f.write(f"timeout {TIMEOUT}\n")
f.write(f"timeout {TIMEOUT}\n")
if profile:
f.write("default nixos-%s-generation-*\n" % profile)
else:
@@ -36,7 +36,7 @@ let
nix = config.nix.package.out;
timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout;
timeout = if config.boot.loader.timeout == null then "menu-force" else config.boot.loader.timeout;
configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit;
+6 -6
View File
@@ -122,7 +122,7 @@ let
};
sqlite = {
services.vaultwarden.backupDir = "/var/lib/vaultwarden/backups";
services.vaultwarden.backupDir = "/srv/backups/vaultwarden";
environment.systemPackages = [ pkgs.sqlite ];
};
@@ -205,12 +205,12 @@ builtins.mapAttrs (k: v: makeVaultwardenTest k v) {
server.start_job("backup-vaultwarden.service")
with subtest("Check that backup exists"):
server.succeed('[ -d "/var/lib/vaultwarden/backups" ]')
server.succeed('[ -f "/var/lib/vaultwarden/backups/db.sqlite3" ]')
server.succeed('[ -d "/var/lib/vaultwarden/backups/attachments" ]')
server.succeed('[ -f "/var/lib/vaultwarden/backups/rsa_key.pem" ]')
server.succeed('[ -d "/srv/backups/vaultwarden" ]')
server.succeed('[ -f "/srv/backups/vaultwarden/db.sqlite3" ]')
server.succeed('[ -d "/srv/backups/vaultwarden/attachments" ]')
server.succeed('[ -f "/srv/backups/vaultwarden/rsa_key.pem" ]')
# Ensure only the db backed up with the backup command exists and not the other db files.
server.succeed('[ ! -f "/var/lib/vaultwarden/backups/db.sqlite3-shm" ]')
server.succeed('[ ! -f "/srv/backups/vaultwarden/db.sqlite3-shm" ]')
'';
};
}
+1 -1
View File
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
mainProgram = "r128gain";
homepage = "https://github.com/desbma/r128gain";
license = licenses.lgpl2Plus;
maintainers = [ maintainers.AluisioASG ];
maintainers = [ ];
platforms = platforms.all;
};
}
File diff suppressed because it is too large Load Diff
@@ -5,10 +5,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "128.0.3";
version = "129.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "52a0a1a6fa653f5a621a9e16e1937760c05a5ebc81a058ecc16b2c3d29d09d418dc5129deabed86ad2f82abdb3100969478a67f48b11616dc3b3e3698a1acf51";
sha512 = "e406d00dc53c66a1ee6b56e7001efcdd8b323caa3676d66d874d39a99f44ac7cebf4c60d76b5d239ebcf834a75cecabf801a74a1d08a97a66ea5e8ec6c8f7c5b";
};
extraPatches = [
@@ -96,14 +96,14 @@
firefox-esr-128 = buildMozillaMach rec {
pname = "firefox";
version = "128.0esr";
version = "128.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "b65f28a530016fd0cf46bc5f55fdec2a0cc66bd9a71b606b8d6dace1f6ce1d8744b08298549cf9c338eca1d9331dd506874ed3244bd3b856c153bd765e6071be";
sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388";
};
meta = {
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
description = "Web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [ hexa ];
@@ -115,7 +115,7 @@
license = lib.licenses.mpl20;
mainProgram = "firefox";
};
tests = [ nixosTests.firefox ];
tests = [ nixosTests.firefox-esr-128 ];
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-128-unwrapped";
versionPrefix = "128";
@@ -125,11 +125,11 @@
firefox-esr-115 = (buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.13.0esr";
version = "115.14.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "799cdf2d0494003a5addd0da703f53deb9c9d6bb6f6c95d40026363382803e2d086039c7798940a1f35f4cba111f2e8e21bde8ac2eac29fd9bd6876dd8d3a85f";
sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54";
};
meta = {
@@ -75,7 +75,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/infothrill/python-dyndnsc";
changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
mainProgram = "dyndnsc";
platforms = platforms.unix;
};
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
(makeDesktopItem {
name = "armcord";
desktopName = "ArmCord";
exec = "${placeholder "out"}/bin/armcord %U";
exec = "armcord %U";
icon = "armcord";
comment = meta.description;
categories = [ "Network" ];
@@ -1,4 +1,4 @@
{ lib, stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }:
{ lib, stdenv, fetchpatch, substituteAll, buildEnv, fetchFromGitHub, python3Packages }:
stdenv.mkDerivation rec {
pname = "wee-slack";
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
};
patches = [
# Fix for https://github.com/wee-slack/wee-slack/issues/930
(fetchpatch {
url = "https://github.com/wee-slack/wee-slack/commit/e610b39aee2d9a49d080924d47d96c5d140f66ac.patch";
hash = "sha256-+yBZSx0LsoXmTmdN9d3VV2KNzpXfgfNVp4ZqfS4oKzg=";
})
(substituteAll {
src = ./libpath.patch;
env = "${buildEnv {
+2 -2
View File
@@ -71,13 +71,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.2.7";
version = "6.2.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-j9Jk/mG/EYQUyVCBMJ7B4ZFiSSb3fl+TgQ+wvSSpcwo=";
hash = "sha256-d1r+ouomcmiqTMHL/iHNL1kUJZvy35e2Qpv5j3bHDAA=";
};
patches = [
+417 -348
View File
File diff suppressed because it is too large Load Diff
+6 -5
View File
@@ -11,20 +11,21 @@
rustPlatform.buildRustPackage rec {
pname = "cosmic-bg";
version = "unstable-2023-10-10";
version = "1.0.0-alpha.1";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "6a6fe4e387e46c2e159df56a9768220a6269ccf4";
hash = "sha256-fdRFndhwISmbTqmXfekFqh+Wrtdjg3vSZut4IAQUBbA=";
rev = "epoch-${version}";
hash = "sha256-imGSOPS/ay3EycyrrQcIePDXNEYRk7NTAV+EtUPtEdg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"cosmic-config-0.1.0" = "sha256-vM5iIr71zg8OWShuoyQI+pV9C5dPXnvkfEVYAg0XAH4=";
"smithay-client-toolkit-0.17.0" = "sha256-XXfXRXeEm2LCLTfyd74PYuLmTtLu50pcXKld/6H4juA=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-5J9tjpEcZJrUtW7barwXTOTNXNr33TLwYjApKkwDSvc=";
"smithay-client-toolkit-0.18.0" = "sha256-2WbDKlSGiyVmi7blNBr2Aih9FfF2dq/bny57hoA4BrE=";
};
};
+1 -1
View File
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
to do things that aren't provided out-of-the-box.
'';
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ AndersonTorres AluisioASG ];
maintainers = with lib.maintainers; [ AndersonTorres ];
inherit (guile.meta) platforms;
};
})
+2 -2
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "6.2.6";
version = "6.2.7";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-2gUIdAKpdL2obfK5lmlwRgyeeIkiFLO8LBdem1hBzkU=";
sha256 = "sha256-wYzBrFRCgfmvmjSP6X1cCAFU5aFydO2FNl86j5rAfgA=";
};
patches = [
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "nil";
version = "2023-08-09";
version = "2024-08-06";
src = fetchFromGitHub {
owner = "oxalica";
repo = pname;
rev = version;
hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=";
hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
};
cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";
cargoHash = "sha256-E4wmVunaX5SeBlXaLEpzMZ+IY0YVeJ1NORPo9msHr6M=";
nativeBuildInputs = [
(lib.getBin nixVersions.nix_2_23)
(lib.getBin nixVersions.latest)
];
env.CFG_RELEASE = version;
+35
View File
@@ -0,0 +1,35 @@
{
buildNpmPackage,
fetchFromGitHub,
lib,
}:
buildNpmPackage rec {
pname = "node-pre-gyp";
version = "1.0.11";
src = fetchFromGitHub {
owner = "mapbox";
repo = "node-pre-gyp";
rev = "refs/tags/v${version}";
hash = "sha256-O0PLEy2bEIrypaC+WyQJI5kfkqBBps029CujBKkzZ6o=";
};
npmDepsHash = "sha256-pZEnyovFp+wOz7D73JpNfEsVNkukPe9sGt1oIO8Tvnc=";
dontNpmBuild = true;
postInstall = ''
mv $out/bin/@mapbox/node-pre-gyp $out/bin
rmdir $out/bin/@mapbox
'';
meta = {
changelog = "https://github.com/mapbox/node-pre-gyp/blob/${src.rev}/CHANGELOG.md";
description = "Node.js tool for easy binary deployment of C++ addons";
homepage = "https://github.com/mapbox/node-pre-gyp";
license = lib.licenses.bsd3;
mainProgram = "node-pre-gyp";
maintainers = with lib.maintainers; [ dotlambda ];
};
}
+10 -6
View File
@@ -1,19 +1,20 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "tdl";
version = "0.17.1";
version = "0.17.3";
src = fetchFromGitHub {
owner = "iyear";
repo = "tdl";
rev = "v${version}";
hash = "sha256-qyoZqd6VLiq8L4p4ubKIM6HWJdn7SaQDQN9kIArbnls=";
hash = "sha256-PX6Ja7o7K/iq7hqn0g9jZHPPRp97sHau1Xd37m8RD2A=";
};
vendorHash = "sha256-Xfd98qce/xThwF+dssNznny8FgrORGsAhDALfW9bWEQ=";
vendorHash = "sha256-NNTIigd8Gm+7jJzhizaRHc4jLwO7QKhFh4ce0lrYBh4=";
ldflags = [
"-s"
@@ -21,6 +22,9 @@ buildGoModule rec {
"-X=github.com/iyear/tdl/pkg/consts.Version=${version}"
];
# Filter out the main executable
subPackages = [ "." ];
# Requires network access
doCheck = false;
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
owner = "LLNL";
repo = "umpire";
rev = "v${version}";
hash = "sha256-T3f5zFaDri7v09/LNJE7v45Nosx9QQjTptnuFREk6PM=";
hash = "sha256-JbYaJe4bqlB272aZxB3Amw8fX/pmZr/4/7kaukAiK8c=";
fetchSubmodules = true;
};
+80
View File
@@ -0,0 +1,80 @@
{
lib,
mkDerivation,
fetchFromGitHub,
makeWrapper,
runCommand,
python3,
vapoursynth,
qmake,
qtbase,
qtwebsockets,
}:
let
unwrapped = mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19-mod-4";
src = fetchFromGitHub {
owner = "YomikoR";
repo = pname;
rev = lib.toLower version;
sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
};
nativeBuildInputs = [ qmake ];
buildInputs = [
qtbase
vapoursynth
qtwebsockets
];
dontWrapQtApps = true;
preConfigure = "cd pro";
preFixup = ''
cd ../build/release*
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
mv $bin $out/bin
wrapQtApp $out/bin/$bin
done
'';
passthru = {
inherit withPlugins;
};
meta = with lib; {
description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit;
maintainers = [ ];
platforms = platforms.all;
};
};
withPlugins =
plugins:
let
vapoursynthWithPlugins = vapoursynth.withPlugins plugins;
in
runCommand "${unwrapped.name}-with-plugins"
{
nativeBuildInputs = [ makeWrapper ];
passthru = {
withPlugins = plugins': withPlugins (plugins ++ plugins');
};
}
''
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \
--prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \
--prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib
done
'';
in
withPlugins [ ]
@@ -0,0 +1,28 @@
diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp
index 73e2eafc..66a01326 100644
--- a/src/core/vscore.cpp
+++ b/src/core/vscore.cpp
@@ -1779,6 +1779,12 @@ void VSCore::isPortableInit() {
}
#endif
+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(VSCore *core, const std::filesystem::path &), VSCore *);
+
+static void VSLoadPluginsNixCallback(VSCore *core, const std::filesystem::path &path) {
+ core->loadAllPluginsInPath(path);
+}
+
VSCore::VSCore(int flags) :
numFilterInstances(1),
numFunctionInstances(0),
@@ -1890,6 +1896,10 @@ VSCore::VSCore(int flags) :
#endif
}
+ if (VSLoadPluginsNix != nullptr) {
+ VSLoadPluginsNix(VSLoadPluginsNixCallback, this);
+ };
+
VSMap *settings = readSettings(configFile);
const char *error = vs_internal_vsapi.mapGetError(settings);
if (error) {
@@ -1,29 +1,56 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper
, runCommandCC, runCommand, vapoursynth, writeText, buildEnv
, zimg, libass, python3, libiconv, testers
, ApplicationServices
{
lib,
stdenv,
fetchFromGitHub,
pkg-config,
autoreconfHook,
makeWrapper,
runCommandCC,
runCommand,
vapoursynth,
writeText,
buildEnv,
zimg,
libass,
python3,
libiconv,
testers,
ApplicationServices,
}:
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "65";
version = "69";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = "R${version}";
sha256 = "sha256-HrTXhRoKSFeLXYQM7W2FvYf7yCD1diSZGtPop9urrSk=";
owner = "vapoursynth";
repo = "vapoursynth";
rev = "R${version}";
hash = "sha256-T2bCVNH0dLM9lFYChXzvD6AJM3xEtOVCb2tI10tIXJs=";
};
patches = [
./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch
];
patches = [ ./nix-plugin-loader.patch ];
nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ];
buildInputs = [
zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ];
nativeBuildInputs = [
pkg-config
autoreconfHook
makeWrapper
];
buildInputs =
[
zimg
libass
(python3.withPackages (
ps: with ps; [
sphinx
cython
]
))
]
++ lib.optionals stdenv.isDarwin [
libiconv
ApplicationServices
];
enableParallelBuilding = true;
@@ -35,8 +62,18 @@ stdenv.mkDerivation rec {
inherit python3;
withPlugins = import ./plugin-interface.nix {
inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand
vapoursynth makeWrapper withPlugins;
inherit
lib
python3
buildEnv
writeText
runCommandCC
stdenv
runCommand
vapoursynth
makeWrapper
withPlugins
;
};
tests.version = testers.testVersion {
@@ -58,10 +95,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix
description = "Video processing framework with the future in mind";
homepage = "http://www.vapoursynth.com/";
license = licenses.lgpl21;
platforms = platforms.x86_64;
maintainers = with maintainers; [ rnhmjoj sbruder ];
homepage = "http://www.vapoursynth.com/";
license = licenses.lgpl21;
platforms = platforms.x86_64;
maintainers = with maintainers; [
rnhmjoj
sbruder
snaki
];
mainProgram = "vspipe";
};
}
@@ -0,0 +1,140 @@
{
lib,
python3,
buildEnv,
writeText,
runCommandCC,
stdenv,
runCommand,
vapoursynth,
makeWrapper,
withPlugins,
}:
plugins:
let
pythonEnvironment = python3.buildEnv.override { extraLibs = plugins; };
getRecursivePropagatedBuildInputs =
pkgs:
lib.flatten (
map (
pkg:
let
cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs;
in
cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs)
) pkgs
);
deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins));
pluginsEnv = buildEnv {
name = "vapoursynth-plugins-env";
pathsToLink = [ "/lib/vapoursynth" ];
paths = deepPlugins;
};
pluginLoader =
let
source = writeText "vapoursynth-nix-plugins.cpp" ''
#include <filesystem>
struct VSCore;
void VSLoadPluginsNix(void (*load)(VSCore *, const std::filesystem::path &), VSCore *core) {
${lib.concatMapStrings (
path: ''load(core, std::filesystem::u8path("${path}/lib/vapoursynth"));''
) deepPlugins}
}
'';
in
runCommandCC "vapoursynth-plugin-loader"
{
executable = true;
preferLocalBuild = true;
allowSubstitutes = false;
}
''
mkdir -p $out/lib
$CXX -std=c++17 -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
'';
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
runCommand "${vapoursynth.name}-with-plugins"
{
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit python3;
inherit (vapoursynth) src version;
withPlugins = plugins': withPlugins (plugins ++ plugins');
};
}
''
mkdir -p \
$out/bin \
$out/lib/pkgconfig \
$out/lib/vapoursynth \
$out/${python3.sitePackages}
for textFile in \
lib/pkgconfig/vapoursynth{,-script}.pc \
lib/libvapoursynth.la \
lib/libvapoursynth-script.la \
${python3.sitePackages}/vapoursynth.la
do
substitute ${vapoursynth}/$textFile $out/$textFile \
--replace "${vapoursynth}" "$out"
done
for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do
ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"}
done
for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do
ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"}
done
for binaryFile in \
lib/libvapoursynth${ext} \
lib/libvapoursynth-script${ext}.0.0.0
do
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
new_rpath="$old_rpath:$out/lib"
patchelf \
--set-rpath "$new_rpath" \
--output $out/$binaryFile \
${vapoursynth}/$binaryFile
patchelf \
--add-needed libvapoursynth-nix-plugins${ext} \
$out/$binaryFile
done
for binaryFile in \
${python3.sitePackages}/vapoursynth${ext} \
bin/.vspipe-wrapped
do
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}"
patchelf \
--set-rpath "$new_rpath" \
--output $out/$binaryFile \
${vapoursynth}/$binaryFile
done
ln -s \
${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \
$out/lib/libvapoursynth-nix-plugins${ext}
ln -s ${vapoursynth}/include $out/include
ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth
ln -s \
libvapoursynth-script${ext}.0.0.0 \
$out/lib/libvapoursynth-script${ext}
ln -s \
libvapoursynth-script${ext}.0.0.0 \
$out/lib/libvapoursynth-script${ext}.0
makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \
--prefix PYTHONPATH : $out/${python3.sitePackages}
''
-1
View File
@@ -138,7 +138,6 @@ buildNpmPackage rec {
maintainers = with maintainers; [
ttuegel
rileyinman
AluisioASG
lunik1
];
};
@@ -24,7 +24,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libadwaita";
version = "1.5.2";
version = "1.5.3";
outputs = [ "out" "dev" "devdoc" ];
outputBin = "devdoc"; # demo app
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GNOME";
repo = "libadwaita";
rev = finalAttrs.version;
hash = "sha256-0Zu6knxP6GiqJMtwd8uRN72Lf7JfwB6JWjS1ggeANPM=";
hash = "sha256-NCQCd/QnJg2fEI6q5ys8HQXinGnKaoxhMUHd8rwxAmk=";
};
depsBuildBuild = [
@@ -1,74 +0,0 @@
From 439e2effe1cc372925daf6d5c28569663ffb93ed Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Mon, 25 Jan 2021 11:17:44 -0700
Subject: [PATCH] Call weak function to allow adding preloaded plugins after
compile
---
src/core/vscore.cpp | 19 +++++++++++++++++++
src/core/vscore.h | 5 +++++
2 files changed, 24 insertions(+)
diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp
index f8e69062..4ce4c623 100644
--- a/src/core/vscore.cpp
+++ b/src/core/vscore.cpp
@@ -1791,6 +1791,20 @@ void VSCore::destroyFilterInstance(VSNode *node) {
freeDepth--;
}
+extern "C" {
+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data);
+
+struct VSLoadPluginsNixCallbackData {
+ VSCore *core;
+ const char *filter;
+};
+
+static void VSLoadPluginsNixCallback(void *data, const char *path) {
+ auto callbackData = static_cast<VSLoadPluginsNixCallbackData *>(data);
+ callbackData->core->loadAllPluginsInPath(path, callbackData->filter);
+}
+}
+
VSCore::VSCore(int flags) :
numFilterInstances(1),
numFunctionInstances(0),
@@ -1918,6 +1932,11 @@ VSCore::VSCore(int flags) :
} // If neither exists, an empty string will do.
#endif
+ if (VSLoadPluginsNix != nullptr) {
+ VSLoadPluginsNixCallbackData data{this, filter.c_str()};
+ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data);
+ }
+
VSMap *settings = readSettings(configFile);
const char *error = vs_internal_vsapi.mapGetError(settings);
if (error) {
diff --git a/src/core/vscore.h b/src/core/vscore.h
index 2ce0f56b..2982b133 100644
--- a/src/core/vscore.h
+++ b/src/core/vscore.h
@@ -985,6 +985,9 @@ public:
std::string getV3ArgString() const;
};
+extern "C" {
+static void VSLoadPluginsNixCallback(void *data, const char *path);
+}
struct VSPlugin {
friend struct VSPluginFunction;
@@ -1140,6 +1143,8 @@ public:
explicit VSCore(int flags);
void freeCore();
+
+ friend void VSLoadPluginsNixCallback(void *data, const char *path);
};
#endif // VSCORE_H
--
2.32.0
@@ -1,59 +0,0 @@
{ lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:
let
unwrapped = mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19-mod-4";
src = fetchFromGitHub {
owner = "YomikoR";
repo = pname;
rev = lib.toLower version;
sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
};
nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase vapoursynth qtwebsockets ];
dontWrapQtApps = true;
preConfigure = "cd pro";
preFixup = ''
cd ../build/release*
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
mv $bin $out/bin
wrapQtApp $out/bin/$bin
done
'';
passthru = { inherit withPlugins; };
meta = with lib; {
description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit;
maintainers = [ ];
platforms = platforms.all;
};
};
withPlugins = plugins: let
vapoursynthWithPlugins = vapoursynth.withPlugins plugins;
in runCommand "${unwrapped.name}-with-plugins" {
nativeBuildInputs = [ makeWrapper ];
passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); };
} ''
mkdir -p $out/bin
for bin in vsedit{,-job-server{,-watcher}}; do
makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \
--prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \
--prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib
done
'';
in
withPlugins []
@@ -1,114 +0,0 @@
{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand
, vapoursynth, makeWrapper, withPlugins }:
plugins: let
pythonEnvironment = python3.buildEnv.override {
extraLibs = plugins;
};
getRecursivePropagatedBuildInputs = pkgs: lib.flatten
(map
(pkg: let cleanPropagatedBuildInputs = lib.filter lib.isDerivation pkg.propagatedBuildInputs;
in cleanPropagatedBuildInputs ++ (getRecursivePropagatedBuildInputs cleanPropagatedBuildInputs))
pkgs);
deepPlugins = lib.unique (plugins ++ (getRecursivePropagatedBuildInputs plugins));
pluginsEnv = buildEnv {
name = "vapoursynth-plugins-env";
pathsToLink = [ "/lib/vapoursynth" ];
paths = deepPlugins;
};
pluginLoader = let
source = writeText "vapoursynth-nix-plugins.c" ''
void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) {
${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins}
}
'';
in
runCommandCC "vapoursynth-plugin-loader" {
executable = true;
preferLocalBuild = true;
allowSubstitutes = false;
} ''
mkdir -p $out/lib
$CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}"
'';
ext = stdenv.hostPlatform.extensions.sharedLibrary;
in
runCommand "${vapoursynth.name}-with-plugins" {
nativeBuildInputs = [ makeWrapper ];
passthru = {
inherit python3;
inherit (vapoursynth) src version;
withPlugins = plugins': withPlugins (plugins ++ plugins');
};
} ''
mkdir -p \
$out/bin \
$out/lib/pkgconfig \
$out/lib/vapoursynth \
$out/${python3.sitePackages}
for textFile in \
lib/pkgconfig/vapoursynth{,-script}.pc \
lib/libvapoursynth.la \
lib/libvapoursynth-script.la \
${python3.sitePackages}/vapoursynth.la
do
substitute ${vapoursynth}/$textFile $out/$textFile \
--replace "${vapoursynth}" "$out"
done
for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do
ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"}
done
for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do
ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"}
done
for binaryFile in \
lib/libvapoursynth${ext} \
lib/libvapoursynth-script${ext}.0.0.0
do
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
new_rpath="$old_rpath:$out/lib"
patchelf \
--set-rpath "$new_rpath" \
--output $out/$binaryFile \
${vapoursynth}/$binaryFile
patchelf \
--add-needed libvapoursynth-nix-plugins${ext} \
$out/$binaryFile
done
for binaryFile in \
${python3.sitePackages}/vapoursynth${ext} \
bin/.vspipe-wrapped
do
old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile)
new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}"
patchelf \
--set-rpath "$new_rpath" \
--output $out/$binaryFile \
${vapoursynth}/$binaryFile
done
ln -s \
${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \
$out/lib/libvapoursynth-nix-plugins${ext}
ln -s ${vapoursynth}/include $out/include
ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth
ln -s \
libvapoursynth-script${ext}.0.0.0 \
$out/lib/libvapoursynth-script${ext}
ln -s \
libvapoursynth-script${ext}.0.0.0 \
$out/lib/libvapoursynth-script${ext}.0
makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \
--prefix PYTHONPATH : $out/${python3.sitePackages}
''
@@ -4,38 +4,36 @@
, meson
, ninja
, pkg-config
, wrapGAppsHook3
, wrapGAppsNoGuiHook
, cinnamon-desktop
, glib
, gsettings-desktop-schemas
, gtk3
, mate
, xdg-desktop-portal
}:
stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-xapp";
version = "1.0.8";
version = "1.0.9";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "xdg-desktop-portal-xapp";
rev = version;
hash = "sha256-e8yfFL09nztFF6FZpnT0JZyPSQCPQEI76Q29V1b0gs8=";
hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook3
wrapGAppsNoGuiHook
];
buildInputs = [
cinnamon-desktop # org.cinnamon.desktop.background
glib
gsettings-desktop-schemas # org.gnome.system.location
gtk3
mate.mate-desktop # org.mate.background
xdg-desktop-portal
];
@@ -125,6 +125,7 @@ mapAliases {
musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
inherit (pkgs) near-cli; # added 2023-09-09
node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21
inherit (pkgs) node-pre-gyp; # added 2024-08-05
inherit (pkgs) nodemon; # added 2024-06-28
inherit (pkgs) npm-check-updates; # added 2023-08-22
ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
@@ -153,7 +153,6 @@
, "nijs"
, "node-gyp"
, "node-gyp-build"
, "node-pre-gyp"
, "node-red"
, "node2nix"
, "np"
-89
View File
@@ -78508,95 +78508,6 @@ in
bypassCache = true;
reconstructLock = true;
};
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
version = "0.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";
sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";
};
dependencies = [
sources."abbrev-1.1.1"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.7"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."chownr-1.1.4"
sources."code-point-at-1.1.0"
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.3"
sources."debug-3.2.7"
sources."deep-extend-0.6.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
sources."gauge-2.7.4"
sources."glob-7.2.3"
sources."has-unicode-2.0.1"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-fullwidth-code-point-1.0.0"
sources."isarray-1.0.0"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.6"
sources."ms-2.1.3"
sources."needle-2.9.1"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.2"
sources."npm-normalize-package-bin-1.0.1"
sources."npm-packlist-1.4.8"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."object-assign-4.1.1"
sources."once-1.4.0"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."path-is-absolute-1.0.1"
sources."process-nextick-args-2.0.1"
sources."rc-1.2.8"
sources."readable-stream-2.3.8"
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.4.1"
sources."semver-5.7.2"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.7"
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
(sources."tar-4.4.19" // {
dependencies = [
sources."safe-buffer-5.2.1"
];
})
sources."util-deprecate-1.0.2"
sources."wide-align-1.1.5"
sources."wrappy-1.0.2"
sources."yallist-3.1.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "Node.js native addon binary install tool";
homepage = "https://github.com/mapbox/node-pre-gyp#readme";
license = "BSD-3-Clause";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
node-red = nodeEnv.buildNodePackage {
name = "node-red";
packageName = "node-red";
+8 -8
View File
@@ -106,7 +106,7 @@ final: prev: {
libsecret
final.node-gyp-build
final.node-pre-gyp
node-pre-gyp
pixman
cairo
@@ -179,7 +179,7 @@ final: prev: {
};
node-red = prev.node-red.override {
buildInputs = [ final.node-pre-gyp ];
buildInputs = [ pkgs.node-pre-gyp ];
};
node2nix = prev.node2nix.override {
@@ -349,15 +349,15 @@ final: prev: {
});
thelounge-plugin-closepms = prev.thelounge-plugin-closepms.override {
nativeBuildInputs = [ final.node-pre-gyp ];
nativeBuildInputs = [ pkgs.node-pre-gyp ];
};
thelounge-plugin-giphy = prev.thelounge-plugin-giphy.override {
nativeBuildInputs = [ final.node-pre-gyp ];
nativeBuildInputs = [ pkgs.node-pre-gyp ];
};
thelounge-theme-flat-blue = prev.thelounge-theme-flat-blue.override {
nativeBuildInputs = [ final.node-pre-gyp ];
nativeBuildInputs = [ pkgs.node-pre-gyp ];
# TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)
preRebuild = ''
rm -r node_modules/node-gyp
@@ -365,7 +365,7 @@ final: prev: {
};
thelounge-theme-flat-dark = prev.thelounge-theme-flat-dark.override {
nativeBuildInputs = [ final.node-pre-gyp ];
nativeBuildInputs = [ pkgs.node-pre-gyp ];
# TODO: needed until upstream pins thelounge version 4.3.1+ (which fixes dependency on old sqlite3 and transitively very old node-gyp 3.x)
preRebuild = ''
rm -r node_modules/node-gyp
@@ -395,7 +395,7 @@ final: prev: {
vega-cli = prev.vega-cli.override {
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [
final.node-pre-gyp
node-pre-gyp
pixman
cairo
pango
@@ -422,7 +422,7 @@ final: prev: {
};
wavedrom-cli = prev.wavedrom-cli.override {
nativeBuildInputs = [ pkgs.pkg-config final.node-pre-gyp ];
nativeBuildInputs = [ pkgs.pkg-config pkgs.node-pre-gyp ];
# These dependencies are required by
# https://github.com/Automattic/node-canvas.
buildInputs = with pkgs; [
@@ -3,34 +3,49 @@
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
scikit-learn,
numpy,
scipy,
colorama,
jupyter,
matplotlib,
nbconvert,
nbformat,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "bayesian-optimization";
version = "1.4.3";
format = "setuptools";
version = "1.5.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "bayesian-optimization";
repo = "BayesianOptimization";
rev = "refs/tags/v${version}";
hash = "sha256-Bp/ZhVSW5lTGwnsd/doOXu++Gxw/51owCfMm96Qmgd4=";
hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM=";
};
build-system = [ poetry-core ];
propagatedBuildInputs = [
scikit-learn
numpy
scipy
colorama
];
nativeCheckInputs = [ pytestCheckHook ];
nativeCheckInputs = [
jupyter
matplotlib
nbconvert
nbformat
pytestCheckHook
];
pythonImportsCheck = [ "bayes_opt" ];
@@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.153";
version = "1.34.154";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-TOuJEvk9fVbxAmsr5EIvcn6dXjZSD4irnn8bJcuXJZ4=";
hash = "sha256-caDk9fqLr/a65FwPu1pj33Xei6rpg8X3XWG97J6xwHI=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "botocore-stubs";
version = "1.34.153";
version = "1.34.154";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "botocore_stubs";
inherit version;
hash = "sha256-zSInN2lWIEwcJH7RiSnzkDAecD+GqmTMFOP29ffL5Cc=";
hash = "sha256-nu9OVrcr/Hw3KFBKO1CtgPCLEv4u6Syj1uHjTQXJzls=";
};
nativeBuildInputs = [ poetry-core ];
@@ -53,7 +53,7 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/jnrbsn/daemonocle";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
platforms = platforms.unix;
};
}
@@ -52,6 +52,6 @@ buildPythonPackage rec {
description = "Python bindings for FFmpeg - with complex filtering support";
homepage = "https://github.com/kkroening/ffmpeg-python";
license = licenses.asl20;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "greeclimate";
version = "2.0.0";
version = "2.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "cmroche";
repo = "greeclimate";
rev = "refs/tags/v${version}";
hash = "sha256-EHVUbvz0lz0gnmLd8XpIVo8OaZPr2k96l1Wu57pnIJE=";
hash = "sha256-SO7/uheAPVFZ1C2qrzP7jB88u6EH79f1+qMZIgHZaCE=";
};
build-system = [ setuptools ];
@@ -69,6 +69,6 @@ buildPythonPackage rec {
homepage = "https://github.com/bobbui/json-logging-python";
changelog = "https://github.com/bobbui/json-logging-python/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Links recognition library with full unicode support";
homepage = "https://github.com/tsutsu3/linkify-it-py";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -1,35 +1,43 @@
{
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
libmysqlclient,
lib,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "mariadb";
version = "1.1.4";
format = "setuptools";
version = "1.1.10";
pyproject = true;
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-c6CsvSrOOB7BvPxhztenmlGeZsAsJOEq5tJ7qgNxeHY=";
extension = "zip";
src = fetchFromGitHub {
owner = "mariadb-corporation";
repo = "mariadb-connector-python";
rev = "refs/tags/v${version}";
hash = "sha256-YpA65J8ozKJfpOc4hZLdgCcT3j/lqRiNeX7k8U/aYkE=";
};
nativeBuildInputs = [ libmysqlclient ];
build-system = [ setuptools ];
nativeBuildInputs = [
libmysqlclient # for mariadb_config
];
buildInputs = [ libmysqlclient ];
# Requires a running MariaDB instance
doCheck = false;
pythonImportsCheck = [ "mariadb" ];
meta = with lib; {
meta = {
description = "MariaDB Connector/Python";
homepage = "https://github.com/mariadb-corporation/mariadb-connector-python";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ vanilla ];
license = lib.licenses.lgpl21Plus;
maintainers = [ ];
};
}
@@ -39,6 +39,6 @@ buildPythonPackage rec {
homepage = "https://github.com/executablebooks/mdit-py-plugins";
changelog = "https://github.com/executablebooks/mdit-py-plugins/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -41,14 +41,14 @@
buildPythonPackage rec {
pname = "mlflow";
version = "2.14.2";
version = "2.14.3";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-zqC2eK3zjR+PbNlxMKhjJddLsVk7iVtq+tx1ACHr9aI=";
hash = "sha256-KSyuS4NXSgyyIxF+IkyqZ5iTMHivAjNxnCthK+pkVhc=";
};
# Remove currently broken dependency `shap`, a model explainability package.
@@ -0,0 +1,41 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pythonOlder,
pyserial,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "modbus-tk";
version = "1.1.1";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "ljean";
repo = "modbus-tk";
rev = "refs/tags/${version}";
hash = "sha256-zikfVMFdlOJvuKVQGEsK03i58X6BGFsGWGrGOJZGC0g=";
};
build-system = [ setuptools ];
dependencies = [ pyserial ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "modbus_tk" ];
pytestFlagsArray = [ "tests/unittest_*.py" ];
meta = with lib; {
description = "Module for simple Modbus interactions";
homepage = "https://github.com/ljean/modbus-tk";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ fab ];
};
}
@@ -58,6 +58,6 @@ buildPythonPackage rec {
description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0";
homepage = "https://github.com/python-openapi/openapi-schema-validator";
license = licenses.bsd3;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pyserial,
pythonOlder,
}:
buildPythonPackage rec {
pname = "ppk2-api";
version = "0.9.2";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "IRNAS";
repo = "ppk2-api-python";
rev = "refs/tags/v${version}";
hash = "sha256-fubDFtOXiv2YFYUCOUbuyXs1sHgs0/6ZVK9sAwxQ+Pk=";
};
build-system = [ setuptools ];
dependencies = [ pyserial ];
# Module has no tests
doCheck = false;
pythonImportsCheck = [ "ppk2_api" ];
meta = with lib; {
description = "Power Profiling Kit 2 unofficial Python API";
homepage = "https://github.com/IRNAS/ppk2-api-python";
changelog = "https://github.com/IRNAS/ppk2-api-python/releases/tag/v${version}";
license = licenses.gpl2Only;
maintainers = with maintainers; [ fab ];
};
}
@@ -0,0 +1,40 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "print-color";
version = "0.4.6";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "xy3";
repo = "print-color";
rev = "refs/tags/v${version}";
hash = "sha256-PHPbzzWG7smEsoTFYFT2tgXfCxUYjevpB9rxG2bZVy4=";
};
build-system = [ poetry-core ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "print_color" ];
meta = with lib; {
description = "Module to print color messages in the terminal";
homepage = "https://github.com/xy3/print-color";
changelog = "https://github.com/xy3/print-color/releases/tag/v${version}";
license = with licenses; [
asl20
mit
];
maintainers = with maintainers; [ fab ];
};
}
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "6.46.0";
version = "6.48.0";
pyproject = true;
build-system = [ setuptools ];
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-TxtvvkZULEDhxodUyc+T6Xo3i8qwOEE7Mh8Wh0WMJTA=";
hash = "sha256-Q4peAFlwH1th/WZawg0QF5SdKHJkytJoy9aMw0b9Ak4=";
};
sourceRoot = "${src.name}/sdk/python";
@@ -0,0 +1,46 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
aiohttp,
pytest-aiohttp,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pyemoncms";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Open-Building-Management";
repo = "pyemoncms";
rev = "refs/tags/v${version}";
hash = "sha256-IBrYys0i9pTAw9ul8bqni0H3KNSvKQYNU6D4OSfR6ZE=";
};
build-system = [ setuptools ];
dependencies = [ aiohttp ];
pythonImportsCheck = [ "pyemoncms" ];
nativeCheckInputs = [
pytest-aiohttp
pytestCheckHook
];
disabledTests = [
# requires networking
"test_timeout"
];
meta = {
changelog = "https://github.com/Open-Building-Management/pyemoncms/releases/tag/v${version}";
description = "Python library for emoncms API";
homepage = "https://github.com/Open-Building-Management/pyemoncms";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
@@ -47,6 +47,6 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/kvas-it/pytest-console-scripts";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -76,6 +76,6 @@ buildPythonPackage rec {
'';
homepage = "https://github.com/ESSS/pytest-regressions";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -32,6 +32,6 @@ buildPythonPackage rec {
description = "RFC 3339 validator for Python";
homepage = "https://github.com/naimetti/rfc3339-validator";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -33,6 +33,6 @@ buildPythonPackage rec {
homepage = "https://github.com/sanic-org/sanic-routing";
changelog = "https://github.com/sanic-org/sanic-routing/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -53,6 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/sanic-org/sanic-testing";
changelog = "https://github.com/sanic-org/sanic-testing/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -168,6 +168,6 @@ buildPythonPackage rec {
homepage = "https://github.com/sanic-org/sanic/";
changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -1,28 +1,31 @@
{
lib,
buildPythonPackage,
docutils,
fetchPypi,
flit-core,
docutils,
sphinx,
requests,
jinja2,
pythonOlder,
requests,
sphinx,
}:
buildPythonPackage rec {
pname = "sphinxcontrib-confluencebuilder";
version = "2.6.0";
format = "pyproject";
version = "2.6.1";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "sphinxcontrib_confluencebuilder";
inherit version;
hash = "sha256-yheaZjD62JUq8NUOjhcqK/nLUC9Q4xlQx9hlza3rgoc=";
hash = "sha256-9ymYfxL50ZDGlLzo2LXiBnuo2svWxnl37H/c6ENACjA=";
};
nativeBuildInputs = [ flit-core ];
build-system = [ flit-core ];
propagatedBuildInputs = [
dependencies = [
docutils
sphinx
requests
@@ -38,9 +41,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "Confluence builder for sphinx";
mainProgram = "sphinx-build-confluence";
homepage = "https://github.com/sphinx-contrib/confluencebuilder";
changelog = "https://github.com/sphinx-contrib/confluencebuilder/blob/v${version}/CHANGES.rst";
license = licenses.bsd1;
maintainers = with maintainers; [ graysonhead ];
mainProgram = "sphinx-build-confluence";
};
}
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "stripe";
version = "10.4.0";
version = "10.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-WRVdvVkWInyd7euvrr6SuVDdMvBd26YVs7xSR5qXcHA=";
hash = "sha256-QcywraWSjYlTDtBtF6cb+/X06k8jJOMNjWNqKrcYCnQ=";
};
build-system = [ setuptools ];
@@ -31,6 +31,6 @@ buildPythonPackage rec {
description = "Micro subset of unicode data files for linkify-it-py";
homepage = "https://github.com/tsutsu3/uc.micro-py";
license = licenses.mit;
maintainers = with maintainers; [ AluisioASG ];
maintainers = [ ];
};
}
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-gazelle";
version = "0.37.0";
version = "0.38.0";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
hash = "sha256-YtgqhwPpkw+lPgsBDCDxkcNsSu1/ZoIhXMuQeZgLXNU=";
hash = "sha256-0FOKLBu1eZMK1nXOmXN4achrZgNUqzzcuC6sH0RLtbc=";
};
vendorHash = null;
@@ -119,6 +119,7 @@ let
NIX_PGLIBDIR="${postgresql}/lib" \
PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \
RUSTFLAGS="${lib.optionalString stdenv.isDarwin "-Clink-args=-Wl,-undefined,dynamic_lookup"}" \
cargo pgrx package \
--pg-config ${postgresql}/bin/pg_config \
${maybeDebugFlag} \
+192 -192
View File
@@ -1,322 +1,322 @@
{
"bluedevil": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/bluedevil-6.1.3.tar.xz",
"hash": "sha256-uaKIDTYaGWe9jenlCIfM1jtenKm7k14ZSPa2GaJoKzk="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/bluedevil-6.1.4.tar.xz",
"hash": "sha256-cPjpXMm1kSBOgjJ4kkBHqeOWWwOFv5oSIgEy5sAMFA8="
},
"breeze": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/breeze-6.1.3.tar.xz",
"hash": "sha256-8Vu6jd7QdZVTRlbeerDbrJsM3uhGLVOqqjCbPPLVdtE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/breeze-6.1.4.tar.xz",
"hash": "sha256-Imcm3zewPLyuFUCfy13Dtp9WCu5oVB5AHivXYIDaAaU="
},
"breeze-grub": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/breeze-grub-6.1.3.tar.xz",
"hash": "sha256-7INKgZa/CokwRl5cOJcUfickR7NHy91eHiWYSBSvPKE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/breeze-grub-6.1.4.tar.xz",
"hash": "sha256-kU++NVAJnd4PBufxsixTui7iF+7Dz+d3GntvbWxicAQ="
},
"breeze-gtk": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/breeze-gtk-6.1.3.tar.xz",
"hash": "sha256-pSf00cR8y2hE3ukYHrHnaeBNrLvAHB0dP11UZFKaxds="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/breeze-gtk-6.1.4.tar.xz",
"hash": "sha256-Xlv86u28XdtpPxd17QAuWBmyYXgyGjHclNO/2NYQrsk="
},
"breeze-plymouth": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/breeze-plymouth-6.1.3.tar.xz",
"hash": "sha256-6hrTm0KNg11J9P1t5e+dDh3V3fpXDZ3+BgFC/ILVQus="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/breeze-plymouth-6.1.4.tar.xz",
"hash": "sha256-6XdesIkZALeHBnBNjIpCY5cMrHUzmL8REcXkhzevL/4="
},
"discover": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/discover-6.1.3.tar.xz",
"hash": "sha256-RaKX38uQcKq8jdoLvnjamjALJwc7MXVuik6BpfmIUYM="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/discover-6.1.4.tar.xz",
"hash": "sha256-ZOc+mQvr4TomFCRfA761HFAnwoX8eTMJos/3nmFW0oQ="
},
"drkonqi": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/drkonqi-6.1.3.tar.xz",
"hash": "sha256-e6GpnkRP4N3nPjxgTZTmxwxJzy0/k6Ct4+y70oWoIK0="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/drkonqi-6.1.4.tar.xz",
"hash": "sha256-a5cXw7BrkHFLQLw/iyiNJM2uI5Bgk2JXfuDh6QHgOFs="
},
"flatpak-kcm": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/flatpak-kcm-6.1.3.tar.xz",
"hash": "sha256-x+bInKwBbLMjJaYgxt/pxaKjfm5AUBBgvA8Gejy6VIE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/flatpak-kcm-6.1.4.tar.xz",
"hash": "sha256-5Bt38ewwuLIkDLCQA0EOYB2s3VkhIuCFNeXFsVeCvhI="
},
"kactivitymanagerd": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kactivitymanagerd-6.1.3.tar.xz",
"hash": "sha256-QMSY5lr+cDnEZM+6pEKp46VhQMvUW2O2lXJnJgxTdGA="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kactivitymanagerd-6.1.4.tar.xz",
"hash": "sha256-mJZSw3G6gRw+ubFhswaH9Gyv/DvB+skXVUx5UUqYcMA="
},
"kde-cli-tools": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kde-cli-tools-6.1.3.tar.xz",
"hash": "sha256-2WkFHigyym6wDrwiI0g05GovPL/Gw9TuipYgWLFLyHo="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kde-cli-tools-6.1.4.tar.xz",
"hash": "sha256-1thK/HG6tr7EXKhzM7JhaUkgzCJGNFs2PMRp7a2uGuI="
},
"kdecoration": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kdecoration-6.1.3.tar.xz",
"hash": "sha256-Fd1Hn0LrSrZ1JpTTEpqkIWSuyZVNtb4Et8O7fIEbDfs="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kdecoration-6.1.4.tar.xz",
"hash": "sha256-h/DgCGkHjhBIVRkqtC22PR1qTSul6QvzU2kIteS3u/E="
},
"kde-gtk-config": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kde-gtk-config-6.1.3.tar.xz",
"hash": "sha256-D6T5VVepPYrW1FSmd/4/12kPeuBaZ4hSTEJXZhhATkY="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kde-gtk-config-6.1.4.tar.xz",
"hash": "sha256-s9TlyNoudSW9I8d6hUaOOnzzsanZyeiuaofiB6P5gBk="
},
"kdeplasma-addons": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kdeplasma-addons-6.1.3.tar.xz",
"hash": "sha256-nfd6Jaa8hqAtKp8/YaqGKa3sTBfVTcULdkv8VG+DBd4="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kdeplasma-addons-6.1.4.tar.xz",
"hash": "sha256-izOaflDG+fOj0UyvEF2D5/OhW7yWdDF+OdVV+6G+mhI="
},
"kgamma": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kgamma-6.1.3.tar.xz",
"hash": "sha256-re1ChFLwgRQWE/RnSLVskHhQqjBVc7BpKfupTqDeU1s="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kgamma-6.1.4.tar.xz",
"hash": "sha256-vSCIKmZ2p2oGIGtCQ2irSu9yeYcepUYbvYUi2sFxinw="
},
"kglobalacceld": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kglobalacceld-6.1.3.tar.xz",
"hash": "sha256-NZFV80VJSPJxeuZ4XtHm3C3IwoHmUmywaFLPSqGioGI="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kglobalacceld-6.1.4.tar.xz",
"hash": "sha256-bLSTvqMxaskW6H9WAimal/HwL9wBZppS6iUiOmCFrag="
},
"kinfocenter": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kinfocenter-6.1.3.tar.xz",
"hash": "sha256-acS+v5fFqYDD2lfe7f/2KCVPA7fAlMyo10L1N7/EVzg="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kinfocenter-6.1.4.tar.xz",
"hash": "sha256-F539wiT/ZvHWkkVlYLHJ8N10tWjiMzRxgjFnCawlINk="
},
"kmenuedit": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kmenuedit-6.1.3.tar.xz",
"hash": "sha256-kAb7DlXK0PrUj522YsgUX4nkVQ8QiqdO+ydGcyj8TYU="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kmenuedit-6.1.4.tar.xz",
"hash": "sha256-xqLXReZAKEPbCrxjPv9jYtbk0tgO9OpbB9PZxdwK39A="
},
"kpipewire": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kpipewire-6.1.3.tar.xz",
"hash": "sha256-6yIXAk4786R3dUi5oL2ojKC5eRLSAzawP1lCsosbrvk="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kpipewire-6.1.4.tar.xz",
"hash": "sha256-qxFtVv2Kazbaa1lfWXz0OD2O0XH45iXcpnt6RkUzcTQ="
},
"krdp": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/krdp-6.1.3.tar.xz",
"hash": "sha256-l5e5+pznb0jHLZMnK91Hx3jnYNSm2UwfY5IidbNG0+o="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/krdp-6.1.4.tar.xz",
"hash": "sha256-dN6OGFvmfTW91mpBlMedf+TZh5SjPsm+kVQzyGvFkcs="
},
"kscreen": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kscreen-6.1.3.tar.xz",
"hash": "sha256-MAkZMFp58dQlFB6NNo3jsONei0/0xfpA5N8HAXrmBWs="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kscreen-6.1.4.tar.xz",
"hash": "sha256-mf5k7bCX/IKF7CvTIi0C/LXJVg0p/L5B9/S4mLHjMa8="
},
"kscreenlocker": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kscreenlocker-6.1.3.tar.xz",
"hash": "sha256-wpwPCYZBEakzy6dU4NsvlU/lFdE8OQSWdwrcnuwM5lM="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kscreenlocker-6.1.4.tar.xz",
"hash": "sha256-HccK6N42XT7EH49aM7Rgma3VplDCNGn3pz9yyFs663M="
},
"ksshaskpass": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/ksshaskpass-6.1.3.tar.xz",
"hash": "sha256-8alT3TLBqWiPR6x+QVhkRumsx86U1HjkT/RTA+EkXmk="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/ksshaskpass-6.1.4.tar.xz",
"hash": "sha256-W3Izf5OaqBRI6JK9PLYvWb120M0PnYBwAUYDP7vZZQw="
},
"ksystemstats": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/ksystemstats-6.1.3.tar.xz",
"hash": "sha256-yf21zEfMTz9m2SpsSSyoElsD8DR1UW3s+0yIe7sDToU="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/ksystemstats-6.1.4.tar.xz",
"hash": "sha256-pBETmZ+QdzzYfy5u10solTu6fA9vnQ1xMWSF7jvAg5w="
},
"kwallet-pam": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kwallet-pam-6.1.3.tar.xz",
"hash": "sha256-a4Bx2DjIEPqYIffapn2Sn7bWPHZvdGzFrIVfd4wHQNo="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kwallet-pam-6.1.4.tar.xz",
"hash": "sha256-cySxPgMnz7c/20reiUjK0XuFTgIkHfqcF8urhY8vLjY="
},
"kwayland": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kwayland-6.1.3.tar.xz",
"hash": "sha256-aWdKZlbQQtlqOhOrHXB2qwVRxAvDh60z1pOk0Hfqmrw="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kwayland-6.1.4.tar.xz",
"hash": "sha256-hpHAbmWsLHOd5IQsDRIZV577SuGGS4YU3HSkZF3Vl3Q="
},
"kwayland-integration": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kwayland-integration-6.1.3.tar.xz",
"hash": "sha256-tEGDxOWWD2ZO8fDjnQxOSLMjM6NOPp0mCZ50JFCJE80="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kwayland-integration-6.1.4.tar.xz",
"hash": "sha256-XB4oE4Yh2AYd75CGQsahPqttMRkoUFL2oeF3lLOAzk4="
},
"kwin": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kwin-6.1.3.tar.xz",
"hash": "sha256-+yO50IU4G6lFXNPzrKGEsTenZTlRyp97ePnnRt0Mxr8="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kwin-6.1.4.tar.xz",
"hash": "sha256-/P/ORo3qI6ksrTOsGxJkxVwHmdSX9U9rjiNDnc2t6zo="
},
"kwrited": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/kwrited-6.1.3.tar.xz",
"hash": "sha256-NEjWfgqZKBPlL5MMuNHDzCDqKwwYG2fVV9an2tlYoCM="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/kwrited-6.1.4.tar.xz",
"hash": "sha256-z76mnrm3S33+/m1m8Jso3os0jMt8rF7sZUtKRlJFgUs="
},
"layer-shell-qt": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/layer-shell-qt-6.1.3.tar.xz",
"hash": "sha256-ogG9PIZxMOlsrnXc/sB/gq903C6AdNjRvZsK4mRb+AI="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/layer-shell-qt-6.1.4.tar.xz",
"hash": "sha256-YjnS3GvvU4a5SOwhgCAqGPdeI/N5AsLXQQ+zgR37Mmg="
},
"libkscreen": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/libkscreen-6.1.3.tar.xz",
"hash": "sha256-mYjzc27D2Rf3uL8XWcEcFVqOxX/P14dkIOS7lxizspM="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/libkscreen-6.1.4.tar.xz",
"hash": "sha256-cwJivuy8YnC5avwNP7v+tUa044OIkiKzhdB67LQsZns="
},
"libksysguard": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/libksysguard-6.1.3.tar.xz",
"hash": "sha256-auhjE6pj0z1fvn+LkUgCzmxu913ujACf4a5NX1tb/6Q="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/libksysguard-6.1.4.tar.xz",
"hash": "sha256-0qeuvJVxzoG0ynkJW3Sg2RgpwkkwPSJGIDggOkxWxbE="
},
"libplasma": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/libplasma-6.1.3.tar.xz",
"hash": "sha256-WitrfFObbRcanCt0PVVKdNzz5XUSoEI7RvzpL6KlRd4="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/libplasma-6.1.4.tar.xz",
"hash": "sha256-Kv4xTZlg6G4NF5mqwmkExWZb4pNNXZ1chTO6liprhBA="
},
"milou": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/milou-6.1.3.tar.xz",
"hash": "sha256-3mmK3FbSl/M2t1bcweMR1VuEw0M8ItGzbe1+xZ4J64g="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/milou-6.1.4.tar.xz",
"hash": "sha256-coA8zCCnhG7kWY/h6yyFobz+aKxeI3ZuS0tgelJyAII="
},
"ocean-sound-theme": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/ocean-sound-theme-6.1.3.tar.xz",
"hash": "sha256-BvlrEUhxYCsrXS182QYb5QHhJ4n/v4BCQUmoN3Qlmhg="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/ocean-sound-theme-6.1.4.tar.xz",
"hash": "sha256-ogAEz6y4sNzp5d63LXVe6Wv9GOtzB6ChuCnDL9ylb1w="
},
"oxygen": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/oxygen-6.1.3.tar.xz",
"hash": "sha256-sueB9dxPER4XSFo0KZcA9I/mv2aElLOgCFe4QrjK7aE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/oxygen-6.1.4.tar.xz",
"hash": "sha256-A2AX2f33J2TLS7B4lypdlcYdYvhlEAxW71qBHjGrqdU="
},
"oxygen-sounds": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/oxygen-sounds-6.1.3.tar.xz",
"hash": "sha256-fydxab5p7JnWuSNTajM1IkpxwbJ9RBBieqyxFzujutQ="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/oxygen-sounds-6.1.4.tar.xz",
"hash": "sha256-aHXpmEzhnHnsGZ9uju0f2FoIinhmlxCoj2ErWCqjQck="
},
"plasma5support": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma5support-6.1.3.tar.xz",
"hash": "sha256-N9h193+PDUY7QJzDHilsWB2+c+dawBTbOuETcqUf920="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma5support-6.1.4.tar.xz",
"hash": "sha256-yZ/VDWSW988SPRHjdnkLy81sgGcK9+kD7gKVrULdRNY="
},
"plasma-activities": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-activities-6.1.3.tar.xz",
"hash": "sha256-ZVMwdtu/P4BaUniR1wQTT5E0riKwIDxhkppgiO/d65A="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-6.1.4.tar.xz",
"hash": "sha256-7LOVeSNL/+uPUYq30ZZAkbMW8Pl8JRyJCZLud7j1IoY="
},
"plasma-activities-stats": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-activities-stats-6.1.3.tar.xz",
"hash": "sha256-++IjXZEfb3EvXMMS2AeZnMKNhKJG1Gd4GtUolWuJ1mk="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-stats-6.1.4.tar.xz",
"hash": "sha256-kvrmvylZTF/pliUIa8lPW7q5knYPlta0Mk6Txex/IHc="
},
"plasma-browser-integration": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-browser-integration-6.1.3.tar.xz",
"hash": "sha256-nvNqT954ZT2UtgIcmyTP9N+i2CS0or99UsM6u+23acA="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-browser-integration-6.1.4.tar.xz",
"hash": "sha256-1r+a6v48iw5lzB78SEbQwhI20Elh3qjG1qezPi1MPFU="
},
"plasma-desktop": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-desktop-6.1.3.tar.xz",
"hash": "sha256-Ni9k+hrxwpXX/a3hRr9XURdiVsGf1B3RhQ//NgPCH60="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-desktop-6.1.4.tar.xz",
"hash": "sha256-g7iX9gL73LjVcZCMJ/IwPh+LqN3tM8GwN1JDfEEkh9E="
},
"plasma-disks": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-disks-6.1.3.tar.xz",
"hash": "sha256-EW7esxGyiHxH/afrIEDgI4zsMJkK6Sj5bis1x4x/88Y="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-disks-6.1.4.tar.xz",
"hash": "sha256-eV9r2rov6XnVg2R5ER/D1vxrKgs1W0jIMz21q7XfTEc="
},
"plasma-firewall": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-firewall-6.1.3.tar.xz",
"hash": "sha256-8qCnTgGWljDNIaDwNpepJOoz1tovkrCNkA0ouXhDz5M="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-firewall-6.1.4.tar.xz",
"hash": "sha256-yz8cmu0MZZ4KvKPIIEGGDr9ACfDnMQPrVlKZtIo3u2Q="
},
"plasma-integration": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-integration-6.1.3.tar.xz",
"hash": "sha256-o+9zeVtffU1LPFYmRcD9wxwwNEmcxq1hzUjM+z/j5Vs="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-integration-6.1.4.tar.xz",
"hash": "sha256-CKEoI/14574E4j8d0fXubrFTXKtWEjfW79Sw0DLcqnQ="
},
"plasma-mobile": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-mobile-6.1.3.tar.xz",
"hash": "sha256-4A5dYJFDh6eMDq+JBuSfjFwOaF3u/ZR7YB4mKWuovAI="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-mobile-6.1.4.tar.xz",
"hash": "sha256-lJsF1BwFpadOS3qqoFBg/B5AabOPT87AbCnLy/kjMNI="
},
"plasma-nano": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-nano-6.1.3.tar.xz",
"hash": "sha256-I2xd3ctRoisUIkISV4Xt+4bFpLGsqby11XvqS1ISiJg="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-nano-6.1.4.tar.xz",
"hash": "sha256-hE59Cmt4GSgN85e6mcRNQsJ1A5N7/yoTpqxDrrjYiMI="
},
"plasma-nm": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-nm-6.1.3.tar.xz",
"hash": "sha256-W1ECrXyAjrL6SwNu9IXWWG0ldfB4kHbe3vwTAKuQEXw="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-nm-6.1.4.tar.xz",
"hash": "sha256-FK9HEIzzKvaMANDOb7NifztKkeLgV6bvW6j8/Lb1BeE="
},
"plasma-pa": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-pa-6.1.3.tar.xz",
"hash": "sha256-QhGwXwNtgORVpMKjIYQmYBf+Xc0B+3UydgrIHYhqrfc="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-pa-6.1.4.tar.xz",
"hash": "sha256-NEvUYKj2qf9E6/cT9kWfsdxcOrHD7aWs9m+8kfPkc00="
},
"plasma-sdk": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-sdk-6.1.3.tar.xz",
"hash": "sha256-WvX+d07UC0cOFUj+Q7ziudyEL08BAkXD9YMqh2iVND8="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-sdk-6.1.4.tar.xz",
"hash": "sha256-8GZKIu6Z9BUFC8LtWD2KE3IUrLKCkwyw8eDZsX7Sc0o="
},
"plasma-systemmonitor": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-systemmonitor-6.1.3.tar.xz",
"hash": "sha256-/4Li/XqETT0sZSU3p4PgCfPEKGl3ZxRSDUOYFfyy2Pk="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-systemmonitor-6.1.4.tar.xz",
"hash": "sha256-JipI0p2gYbx2qnwkkE1IKLwt7AtmQKz/zjeZGUxL5Fc="
},
"plasma-thunderbolt": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-thunderbolt-6.1.3.tar.xz",
"hash": "sha256-e8vd70aJge9Tb1C+aOUCPVCpNthIbbjGwJSjj4bywt4="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-thunderbolt-6.1.4.tar.xz",
"hash": "sha256-gahEJUn8r3wA/VESR0jB1IhcUTrCSwq4nwSGbabtTGw="
},
"plasma-vault": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-vault-6.1.3.tar.xz",
"hash": "sha256-0BTyDwLObGKJ9UEttoWZbDzPpwSh5seyLls0LqBEG3A="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-vault-6.1.4.tar.xz",
"hash": "sha256-NKT/TFub9v51xOqwIl2uohwlEpF53vyJsLkuyxp7yN8="
},
"plasma-welcome": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-welcome-6.1.3.tar.xz",
"hash": "sha256-QW01aN6uKfRBNddU37o5+RKyQ1tJTe0g6P+fO5A0tBw="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-welcome-6.1.4.tar.xz",
"hash": "sha256-pK22ef6cdc3cUVOmMTgJoRtMRxndEFkNBE0pNcfVO34="
},
"plasma-workspace": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-workspace-6.1.3.tar.xz",
"hash": "sha256-eZze+1KFbbcnO7SaIFxuBXFl53uuxITHxiLuaILE1co="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-6.1.4.tar.xz",
"hash": "sha256-yyCZ3TnAsj/0sFyM9leEUYcHXTH3X+QfD+Ae3OVsjVY="
},
"plasma-workspace-wallpapers": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plasma-workspace-wallpapers-6.1.3.tar.xz",
"hash": "sha256-IUtAcRwLZ3gZtrMKUe5hky7uWuK0Rv0zByMYZ5HYdjE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-wallpapers-6.1.4.tar.xz",
"hash": "sha256-iPZcI2CNeTMXzDaeqO792rJuYaIcptQ0oCDv7ppbQ8Q="
},
"plymouth-kcm": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/plymouth-kcm-6.1.3.tar.xz",
"hash": "sha256-av1sfAERo9jiUB1ZE8ZKtT03e1F/lZDocQ1vIlTj+rc="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/plymouth-kcm-6.1.4.tar.xz",
"hash": "sha256-K1U6vuM4JPLWEtW2Qd3pkL746Qvw7L13zF6gSHwDNFw="
},
"polkit-kde-agent-1": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/polkit-kde-agent-1-6.1.3.tar.xz",
"hash": "sha256-J7naZQVrHQeso7YGQfyP+kHp3QP/0eE4GD9kFhPyOW8="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/polkit-kde-agent-1-6.1.4.tar.xz",
"hash": "sha256-ePqZS3Eqq82+/e8MBfr9oEasPOTlBlfYGjzDD6Jd278="
},
"powerdevil": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/powerdevil-6.1.3.tar.xz",
"hash": "sha256-Yk+MlJgFbTxwZbtypho4H6ICHcNvWh8yxzVDWyOZGPM="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/powerdevil-6.1.4.tar.xz",
"hash": "sha256-oalm4uJJgwXjM5fvJ9+mjRAlX8twmbDZHF7ajUKQE+U="
},
"print-manager": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/print-manager-6.1.3.tar.xz",
"hash": "sha256-lQVGnobiA2Pkvt3GlI2dngeoNzrtt6+Zkoy5gQHduwQ="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/print-manager-6.1.4.tar.xz",
"hash": "sha256-xXR79USAS6EhED0mRP/dblLtgEZWgpLMohdROnbQDt8="
},
"qqc2-breeze-style": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/qqc2-breeze-style-6.1.3.tar.xz",
"hash": "sha256-SUcxLh5ygpI9+r/mxttg6Qw89MMpCSy30Hf3GEVRvmg="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/qqc2-breeze-style-6.1.4.tar.xz",
"hash": "sha256-j7m8QVb53JIMY7DYr6pKrLcutlDpB8BtrN44v9VdUWg="
},
"sddm-kcm": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/sddm-kcm-6.1.3.tar.xz",
"hash": "sha256-DPFM4SVP+2l1AqktfiISXm1EuwjnXmH/31hCZevCrO0="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/sddm-kcm-6.1.4.tar.xz",
"hash": "sha256-IE9gmeyxQOtYjOkHT/zBRCES4pHSzd7obDGYPJ9OFKA="
},
"systemsettings": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/systemsettings-6.1.3.tar.xz",
"hash": "sha256-ZboE8iq02/64yaBrVAsuqdVv5+m6KVNEpcfmtj8YITE="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/systemsettings-6.1.4.tar.xz",
"hash": "sha256-wOomYnfMt1mns7nFidYJlnTz4/YD56pHHtidxq0AfaM="
},
"wacomtablet": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/wacomtablet-6.1.3.tar.xz",
"hash": "sha256-EyUCUdeg1MGq+d0XhDM31W2OMLdgDziSVXaRAkgBj58="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/wacomtablet-6.1.4.tar.xz",
"hash": "sha256-Uy8DnsW7JltwxlyeDiiwNh39Tzt71Z4nj0nZ26szf4k="
},
"xdg-desktop-portal-kde": {
"version": "6.1.3",
"url": "mirror://kde/stable/plasma/6.1.3/xdg-desktop-portal-kde-6.1.3.tar.xz",
"hash": "sha256-gkz+ewZXhb5/gCqBJpLVCbghPWSphNl+gwRI9wqhPMY="
"version": "6.1.4",
"url": "mirror://kde/stable/plasma/6.1.4/xdg-desktop-portal-kde-6.1.4.tar.xz",
"hash": "sha256-OMoV/YbV/vLMeayY9WtM09k879MugtOyJGu3dALcp7I="
}
}
-1
View File
@@ -3,6 +3,5 @@
exec node2nix --nodejs-18 \
--input node-packages.json \
--output node-packages-generated.nix \
--supplement-input supplement.json \
--composition node-packages.nix \
--node-env ./../../development/node-packages/node-env.nix \
+1 -5
View File
@@ -5,10 +5,6 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
inherit nodeEnv;
inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
});
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
@@ -17,5 +13,5 @@ let
in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv globalBuildInputs;
inherit nodeEnv;
}
-3
View File
@@ -1,3 +0,0 @@
[
"node-pre-gyp"
]
-693
View File
@@ -1,693 +0,0 @@
# This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
"abbrev-1.1.1" = {
name = "abbrev";
packageName = "abbrev";
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
"ansi-regex-2.1.1" = {
name = "ansi-regex";
packageName = "ansi-regex";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==";
};
};
"aproba-1.2.0" = {
name = "aproba";
packageName = "aproba";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
};
};
"are-we-there-yet-1.1.7" = {
name = "are-we-there-yet";
packageName = "are-we-there-yet";
version = "1.1.7";
src = fetchurl {
url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz";
sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==";
};
};
"balanced-match-1.0.2" = {
name = "balanced-match";
packageName = "balanced-match";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz";
sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
};
};
"brace-expansion-1.1.11" = {
name = "brace-expansion";
packageName = "brace-expansion";
version = "1.1.11";
src = fetchurl {
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
};
};
"chownr-1.1.4" = {
name = "chownr";
packageName = "chownr";
version = "1.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
};
};
"code-point-at-1.1.0" = {
name = "code-point-at";
packageName = "code-point-at";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==";
};
};
"concat-map-0.0.1" = {
name = "concat-map";
packageName = "concat-map";
version = "0.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==";
};
};
"console-control-strings-1.1.0" = {
name = "console-control-strings";
packageName = "console-control-strings";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==";
};
};
"core-util-is-1.0.3" = {
name = "core-util-is";
packageName = "core-util-is";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz";
sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==";
};
};
"debug-3.2.7" = {
name = "debug";
packageName = "debug";
version = "3.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
};
};
"deep-extend-0.6.0" = {
name = "deep-extend";
packageName = "deep-extend";
version = "0.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
"delegates-1.0.0" = {
name = "delegates";
packageName = "delegates";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
};
};
"detect-libc-1.0.3" = {
name = "detect-libc";
packageName = "detect-libc";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";
sha512 = "pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==";
};
};
"fs-minipass-1.2.7" = {
name = "fs-minipass";
packageName = "fs-minipass";
version = "1.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
};
};
"fs.realpath-1.0.0" = {
name = "fs.realpath";
packageName = "fs.realpath";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==";
};
};
"gauge-2.7.4" = {
name = "gauge";
packageName = "gauge";
version = "2.7.4";
src = fetchurl {
url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==";
};
};
"glob-7.2.3" = {
name = "glob";
packageName = "glob";
version = "7.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz";
sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
};
};
"has-unicode-2.0.1" = {
name = "has-unicode";
packageName = "has-unicode";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==";
};
};
"iconv-lite-0.4.24" = {
name = "iconv-lite";
packageName = "iconv-lite";
version = "0.4.24";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
"ignore-walk-3.0.4" = {
name = "ignore-walk";
packageName = "ignore-walk";
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz";
sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==";
};
};
"inflight-1.0.6" = {
name = "inflight";
packageName = "inflight";
version = "1.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==";
};
};
"inherits-2.0.4" = {
name = "inherits";
packageName = "inherits";
version = "2.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
};
};
"ini-1.3.8" = {
name = "ini";
packageName = "ini";
version = "1.3.8";
src = fetchurl {
url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
};
};
"is-fullwidth-code-point-1.0.0" = {
name = "is-fullwidth-code-point";
packageName = "is-fullwidth-code-point";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==";
};
};
"isarray-1.0.0" = {
name = "isarray";
packageName = "isarray";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
};
};
"minimatch-3.1.2" = {
name = "minimatch";
packageName = "minimatch";
version = "3.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz";
sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==";
};
};
"minimist-1.2.8" = {
name = "minimist";
packageName = "minimist";
version = "1.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz";
sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==";
};
};
"minipass-2.9.0" = {
name = "minipass";
packageName = "minipass";
version = "2.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
};
};
"minizlib-1.3.3" = {
name = "minizlib";
packageName = "minizlib";
version = "1.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
"mkdirp-0.5.6" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.6";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz";
sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==";
};
};
"ms-2.1.3" = {
name = "ms";
packageName = "ms";
version = "2.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
};
};
"needle-2.9.1" = {
name = "needle";
packageName = "needle";
version = "2.9.1";
src = fetchurl {
url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz";
sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==";
};
};
"nopt-4.0.3" = {
name = "nopt";
packageName = "nopt";
version = "4.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
};
};
"npm-bundled-1.1.2" = {
name = "npm-bundled";
packageName = "npm-bundled";
version = "1.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz";
sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==";
};
};
"npm-normalize-package-bin-1.0.1" = {
name = "npm-normalize-package-bin";
packageName = "npm-normalize-package-bin";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
};
};
"npm-packlist-1.4.8" = {
name = "npm-packlist";
packageName = "npm-packlist";
version = "1.4.8";
src = fetchurl {
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
};
};
"npmlog-4.1.2" = {
name = "npmlog";
packageName = "npmlog";
version = "4.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
};
};
"number-is-nan-1.0.1" = {
name = "number-is-nan";
packageName = "number-is-nan";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==";
};
};
"object-assign-4.1.1" = {
name = "object-assign";
packageName = "object-assign";
version = "4.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
};
};
"once-1.4.0" = {
name = "once";
packageName = "once";
version = "1.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==";
};
};
"os-homedir-1.0.2" = {
name = "os-homedir";
packageName = "os-homedir";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==";
};
};
"os-tmpdir-1.0.2" = {
name = "os-tmpdir";
packageName = "os-tmpdir";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==";
};
};
"osenv-0.1.5" = {
name = "osenv";
packageName = "osenv";
version = "0.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
};
};
"path-is-absolute-1.0.1" = {
name = "path-is-absolute";
packageName = "path-is-absolute";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
};
};
"process-nextick-args-2.0.1" = {
name = "process-nextick-args";
packageName = "process-nextick-args";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
};
};
"rc-1.2.8" = {
name = "rc";
packageName = "rc";
version = "1.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
};
};
"readable-stream-2.3.8" = {
name = "readable-stream";
packageName = "readable-stream";
version = "2.3.8";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz";
sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==";
};
};
"rimraf-2.7.1" = {
name = "rimraf";
packageName = "rimraf";
version = "2.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
};
};
"safe-buffer-5.1.2" = {
name = "safe-buffer";
packageName = "safe-buffer";
version = "5.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
};
};
"safe-buffer-5.2.1" = {
name = "safe-buffer";
packageName = "safe-buffer";
version = "5.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
};
};
"safer-buffer-2.1.2" = {
name = "safer-buffer";
packageName = "safer-buffer";
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"sax-1.2.4" = {
name = "sax";
packageName = "sax";
version = "1.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
};
};
"semver-5.7.1" = {
name = "semver";
packageName = "semver";
version = "5.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
};
};
"set-blocking-2.0.0" = {
name = "set-blocking";
packageName = "set-blocking";
version = "2.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==";
};
};
"signal-exit-3.0.7" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz";
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
};
};
"string-width-1.0.2" = {
name = "string-width";
packageName = "string-width";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==";
};
};
"string_decoder-1.1.1" = {
name = "string_decoder";
packageName = "string_decoder";
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
};
};
"strip-ansi-3.0.1" = {
name = "strip-ansi";
packageName = "strip-ansi";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==";
};
};
"strip-json-comments-2.0.1" = {
name = "strip-json-comments";
packageName = "strip-json-comments";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==";
};
};
"tar-4.4.19" = {
name = "tar";
packageName = "tar";
version = "4.4.19";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz";
sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==";
};
};
"util-deprecate-1.0.2" = {
name = "util-deprecate";
packageName = "util-deprecate";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
};
};
"wide-align-1.1.5" = {
name = "wide-align";
packageName = "wide-align";
version = "1.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz";
sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==";
};
};
"wrappy-1.0.2" = {
name = "wrappy";
packageName = "wrappy";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
};
};
"yallist-3.1.1" = {
name = "yallist";
packageName = "yallist";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
};
};
};
in
{
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
version = "0.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";
sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";
};
dependencies = [
sources."abbrev-1.1.1"
sources."ansi-regex-2.1.1"
sources."aproba-1.2.0"
sources."are-we-there-yet-1.1.7"
sources."balanced-match-1.0.2"
sources."brace-expansion-1.1.11"
sources."chownr-1.1.4"
sources."code-point-at-1.1.0"
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.3"
sources."debug-3.2.7"
sources."deep-extend-0.6.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
sources."fs-minipass-1.2.7"
sources."fs.realpath-1.0.0"
sources."gauge-2.7.4"
sources."glob-7.2.3"
sources."has-unicode-2.0.1"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.8"
sources."is-fullwidth-code-point-1.0.0"
sources."isarray-1.0.0"
sources."minimatch-3.1.2"
sources."minimist-1.2.8"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.6"
sources."ms-2.1.3"
sources."needle-2.9.1"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.2"
sources."npm-normalize-package-bin-1.0.1"
sources."npm-packlist-1.4.8"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
sources."object-assign-4.1.1"
sources."once-1.4.0"
sources."os-homedir-1.0.2"
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."path-is-absolute-1.0.1"
sources."process-nextick-args-2.0.1"
sources."rc-1.2.8"
sources."readable-stream-2.3.8"
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."semver-5.7.1"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.7"
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
(sources."tar-4.4.19" // {
dependencies = [
sources."safe-buffer-5.2.1"
];
})
sources."util-deprecate-1.0.2"
sources."wide-align-1.1.5"
sources."wrappy-1.0.2"
sources."yallist-3.1.1"
];
buildInputs = globalBuildInputs;
meta = {
description = "Node.js native addon binary install tool";
homepage = "https://github.com/mapbox/node-pre-gyp#readme";
license = "BSD-3-Clause";
};
production = true;
bypassCache = true;
reconstructLock = true;
};
}
@@ -1071,7 +1071,8 @@
pyemby
];
"emoncms" = ps: with ps; [
]; # missing inputs: pyemoncms
pyemoncms
];
"emoncms_history" = ps: with ps; [
];
"emonitor" = ps: with ps; [
+3 -2
View File
@@ -4,6 +4,7 @@
fetchFromGitHub,
fetchYarnDeps,
makeWrapper,
node-pre-gyp,
nodejs,
python3,
sqlite,
@@ -35,7 +36,7 @@ mkYarnPackage rec {
# Fixes "SQLite package has not been found installed" at launch
pkgConfig.sqlite3 = {
nativeBuildInputs = [
nodejs.pkgs.node-pre-gyp
node-pre-gyp
python3
sqlite
];
@@ -48,7 +49,7 @@ mkYarnPackage rec {
pkgConfig.bcrypt = {
nativeBuildInputs = [
nodejs.pkgs.node-pre-gyp
node-pre-gyp
python3
];
postInstall = ''
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_18, pkg-config
{ stdenv, fetchFromGitLab, pkgs, lib, node-pre-gyp, nodejs_18, pkg-config
, libjpeg, pixman, cairo, pango, which, postgresql }:
let
@@ -22,7 +22,7 @@ let
in myNodePackages.package.override {
inherit version src;
nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ];
nativeBuildInputs = [ node-pre-gyp nodejs.pkgs.node-gyp-build pkg-config which ];
buildInputs = [ libjpeg pixman cairo pango postgresql ];
postRebuild = ''
@@ -5,7 +5,6 @@
, nixosTests
, cargo-pgrx_0_10_2
, nix-update-script
, stdenv
}:
(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_10_2; }) rec {
@@ -40,8 +39,5 @@
maintainers = with maintainers; [ typetetris ];
platforms = postgresql.meta.platforms;
license = licenses.tsl;
# as it needs to be used with timescaledb, simply use the condition from there
broken = stdenv.isDarwin;
};
}
+2 -2
View File
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "pistol";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "doronbehar";
repo = pname;
rev = "v${version}";
sha256 = "sha256-gTiuA42WXRUvmGvuUmE7yvukCBXKSFoPOfnZXhOL1HI=";
sha256 = "sha256-/w2BenBIzhD0KHtELlFy7YGv0lykHrjrROZeW75gHis=";
};
vendorHash = "sha256-+Q72DUKLqahgbLCaXOTAYZaMvNfv3XF+SpyqHyB065g=";
+2 -6
View File
@@ -2075,8 +2075,6 @@ with pkgs;
wine = wineWowPackages.stable;
};
wtwitch = callPackage ../tools/video/wtwitch { };
wwcd = callPackage ../tools/misc/wwcd { };
writedisk = callPackage ../tools/misc/writedisk { };
@@ -17415,8 +17413,6 @@ with pkgs;
neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };
nil = callPackage ../development/tools/language-servers/nil { };
inherit (callPackages ../development/tools/language-servers/nixd {
llvmPackages = llvmPackages_16;
nix = nixVersions.nix_2_19;
@@ -20037,11 +20033,11 @@ with pkgs;
eigenmath = callPackage ../applications/science/math/eigenmath { };
vapoursynth = callPackage ../development/libraries/vapoursynth {
vapoursynth = callPackage ../by-name/va/vapoursynth/package.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
vapoursynth-editor = libsForQt5.callPackage ../development/libraries/vapoursynth/editor.nix { };
vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { };
+8
View File
@@ -7885,6 +7885,8 @@ self: super: with self; {
mockupdb = callPackage ../development/python-modules/mockupdb { };
modbus-tk = callPackage ../development/python-modules/modbus-tk { };
moddb = callPackage ../development/python-modules/moddb { };
model-bakery = callPackage ../development/python-modules/model-bakery { };
@@ -10199,6 +10201,10 @@ self: super: with self; {
ppdeep = callPackage ../development/python-modules/ppdeep { };
ppk2-api = callPackage ../development/python-modules/ppk2-api { };
print-color = callPackage ../development/python-modules/print-color { };
private-gpt = callPackage ../development/python-modules/private-gpt { };
prodict = callPackage ../development/python-modules/prodict { };
@@ -11302,6 +11308,8 @@ self: super: with self; {
pyemd = callPackage ../development/python-modules/pyemd { };
pyemoncms = callPackage ../development/python-modules/pyemoncms { };
pyemvue = callPackage ../development/python-modules/pyemvue { };
pyenchant = callPackage ../development/python-modules/pyenchant {