Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-22 06:01:38 +00:00 committed by GitHub
commit 0a501274a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 487 additions and 5617 deletions

View file

@ -4617,7 +4617,7 @@
};
emilytrau = {
name = "Emily Trau";
email = "nix@angus.ws";
email = "emily+nix@downunderctf.com";
github = "emilytrau";
githubId = 13267947;
};

View file

@ -48,5 +48,18 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"umount /tmp/mnt",
"apfsck /dev/vdb",
)
with subtest("Snapshots"):
machine.succeed(
"mkapfs /dev/vdb",
"mount -o cknodes,readwrite /dev/vdb /tmp/mnt",
"echo 'Hello World' > /tmp/mnt/test.txt",
"apfs-snap /tmp/mnt snap-1",
"rm /tmp/mnt/test.txt",
"umount /tmp/mnt",
"mount -o cknodes,readwrite,snap=snap-1 /dev/vdb /tmp/mnt",
"echo 'Hello World' | diff - /tmp/mnt/test.txt",
"umount /tmp/mnt",
"apfsck /dev/vdb",
)
'';
})

View file

@ -31,7 +31,9 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib";
++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib"
# Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin";
nativeBuildInputs = [ cmake flex bison gettext ];
buildInputs = [ libsndfile libsamplerate boost ]

View file

@ -39,7 +39,6 @@ python3Packages.buildPythonApplication rec {
--replace pytest-runner ""
substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \
--replace Exec=vorta "Exec=$out/bin/vorta" \
--replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic"
'';

View file

@ -0,0 +1,36 @@
{ lib
, stdenv
, fetchFromGitHub
, freetype
}:
stdenv.mkDerivation rec {
pname = "otf2bdf";
version = "3.1";
# Original site http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/ unreachable,
# This is a mirror.
src = fetchFromGitHub {
owner = "jirutka";
repo = "otf2bdf";
rev = "v${version}";
hash = "sha256-HK9ZrnwKhhYcBvSl+3RwFD7m/WSaPkGKX6utXnk5k+A=";
};
buildInputs = [ freetype ];
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
install otf2bdf $out/bin
cp otf2bdf.man $out/share/man/man1/otf2bdf.1
'';
meta = with lib; {
#homepage = "http://sofia.nmsu.edu/~mleisher/Software/otf2bdf/"; # timeout
homepage = "https://github.com/jirutka/otf2bdf";
description = "OpenType to BDF font converter";
license = licenses.mit0;
platforms = platforms.all;
maintainers = with maintainers; [ hzeller ];
};
}

View file

@ -46,11 +46,11 @@
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
},
"alicloud": {
"hash": "sha256-qacbj6xquC87cLAuKlI4NzPtqfR8gbLrTfeVN5VSuMI=",
"hash": "sha256-mwYwZObU2WadA1X3EiCVh5T1iHYfPzluEHSUZtrMz98=",
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
"owner": "aliyun",
"repo": "terraform-provider-alicloud",
"rev": "v1.204.1",
"rev": "v1.205.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.233";
version = "1.2.235";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-3T8LbMbM9ZcG8uLspZSNvM7LYuDAOIWweZsYPTC/DOY=";
hash = "sha256-fEo/hHVV+xv60VNe9AqjrP4JGzGXcM8yr/KjhRfOAhk=";
};
vendorHash = "sha256-AKoK/WAelzMhu9W1zoRe4p5Cx/3NzktLGJEG7gPXekQ=";
vendorHash = "sha256-1r32uT98I/pd6lxCb3bKy6uxJJodsaslwy9wynE4Pmg=";
proxyVendor = true;
@ -64,10 +64,6 @@ buildGoModule rec {
integration/suites \
pkg/true_git/*test.go \
test/e2e
# Remove failing tests.
rm -rf \
cmd/werf/docs/replacers/kubectl/kubectl_test.go
'' + lib.optionalString (CGO_ENABLED == 0) ''
# A workaround for osusergo.
export USER=nixbld

View file

@ -23,13 +23,13 @@ let
pname = "wire-desktop";
version = {
x86_64-darwin = "3.30.4506";
x86_64-linux = "3.30.3018";
x86_64-darwin = "3.31.4556";
x86_64-linux = "3.31.3060";
}.${system} or throwSystem;
hash = {
x86_64-darwin = "sha256-+htDeNIuucB4qzNBNYoSUH1DbfgouZS08G5hxPtIuzY=";
x86_64-linux = "sha256-46WjFA+E9M7RfTOM/Xoho+9ooToSgQiZaMlcZ3lJvBQ=";
x86_64-darwin = "sha256-qRRdt/TvSvQ3RiO/I36HT+C88+ev3gFcj+JaEG38BfU=";
x86_64-linux = "sha256-9LdTsBOE1IJH0OM+Ag7GJADsFRgYMjbPXBH6roY7Msg=";
}.${system} or throwSystem;
meta = with lib; {

View file

@ -13,7 +13,7 @@
cd "$(dirname $(readlink -f $0))"
node2nix \
--nodejs-16 \
--nodejs-18 \
--strip-optional-dependencies \
--node-env node-env.nix \
--input package.json \

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
let
nodeEnv = import ./node-env.nix {

View file

@ -85,40 +85,40 @@ let
sha512 = "hzrjPNQcJoSPe0oS20V5i98oiEZSM3mKNiR6P3xHTHTPI/F23lyjGZ+/CSkCmJbSWfGZ5sHZZcU6AWuS7xBdTw==";
};
};
"@aws-sdk/client-cognito-identity-3.332.0" = {
"@aws-sdk/client-cognito-identity-3.335.0" = {
name = "_at_aws-sdk_slash_client-cognito-identity";
packageName = "@aws-sdk/client-cognito-identity";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.332.0.tgz";
sha512 = "o2G3+w0Qm+jd5fnmG6+FF5KRu90PIv2Kd0mmMJIFmACVd+VtuWqsk85capX21YLcxizKe+okqaaD8/9vV7nvfw==";
url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.335.0.tgz";
sha512 = "ghsAzb1K/CR70tQgJHiDzqy39az1zVmCW0AFwnUWIaK1sY+1pSQZ0Ey9BkywmzRIcBfbBxftexDdDX5nHg7oMA==";
};
};
"@aws-sdk/client-sso-3.332.0" = {
"@aws-sdk/client-sso-3.335.0" = {
name = "_at_aws-sdk_slash_client-sso";
packageName = "@aws-sdk/client-sso";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.332.0.tgz";
sha512 = "4q1Nko8M6YVANdEiLYvdv1qb00j4xN4ppE/6d4xpGp7DxHYlm0GA762h0/TR2dun+2I+SMnwj4Fv6BxOmzBaEw==";
url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.335.0.tgz";
sha512 = "tMvOq366QeMzcrRTDhMwuCFirntANX25qi4U32NDl//ny/7V6+7WK8Hf8lRAHvWnY9eT4RdNklXESo2yxlPyUg==";
};
};
"@aws-sdk/client-sso-oidc-3.332.0" = {
"@aws-sdk/client-sso-oidc-3.335.0" = {
name = "_at_aws-sdk_slash_client-sso-oidc";
packageName = "@aws-sdk/client-sso-oidc";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.332.0.tgz";
sha512 = "tz8k8Yqm4TScIfit0Tum2zWAq1md+gZKr747CSixd4Zwcp7Vwh75cRoL7Rz1ZHSEn1Yo983MWREevVez3SubLw==";
url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.335.0.tgz";
sha512 = "szaMq6tDznGy4EuidxPqhZKqEnfGJfoPWUpoFlhXsgZXinZY/vJlJ4G5l6nikhnS3omq3C3WPGJXMKF1ejVXKg==";
};
};
"@aws-sdk/client-sts-3.332.0" = {
"@aws-sdk/client-sts-3.335.0" = {
name = "_at_aws-sdk_slash_client-sts";
packageName = "@aws-sdk/client-sts";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.332.0.tgz";
sha512 = "uVobnXIzMcEhwBDyk6iOt36N/TRNI8hwq7MQugjYGj7Inma9g4vnR09hXJ24HxyKCoVUoIgMbEguQ43+/+uvDQ==";
url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.335.0.tgz";
sha512 = "W+LW1b/3auvGg3EmFeJiraMyH/nxX7qIEBEPPWlJKphGSJAt0l08o8glL2O8s+o2oYWCB2DmgdWyOt1D6YRldQ==";
};
};
"@aws-sdk/config-resolver-3.329.0" = {
@ -130,13 +130,13 @@ let
sha512 = "Oj6eiT3q+Jn685yvUrfRi8PhB3fb81hasJqdrsEivA8IP8qAgnVUTJzXsh8O2UX8UM2MF6A1gTgToSgneJuw2Q==";
};
};
"@aws-sdk/credential-provider-cognito-identity-3.332.0" = {
"@aws-sdk/credential-provider-cognito-identity-3.335.0" = {
name = "_at_aws-sdk_slash_credential-provider-cognito-identity";
packageName = "@aws-sdk/credential-provider-cognito-identity";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.332.0.tgz";
sha512 = "FJI936QVSFd49PWOgTlW7e8rKO/6Y8sMnkvTJ/APQ1K8em+jWkaAMFBl15NrpOo/jlZCzhkkQDatDHAlbSUXGw==";
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.335.0.tgz";
sha512 = "WMR9buxEbEMcghVITk/buVm1ev4rrlUCY8MR9Gg0QI6hUdDUSP6QfWz2Hn++Tfe96v6maHFANvkRLk9NNZQBeg==";
};
};
"@aws-sdk/credential-provider-env-3.329.0" = {
@ -157,22 +157,22 @@ let
sha512 = "ggPlnd7QROPTid0CwT01TYYGvstRRTpzTGsQ/B31wkh30IrRXE81W3S4xrOYuqQD3u0RnflSxnvhs+EayJEYjg==";
};
};
"@aws-sdk/credential-provider-ini-3.332.0" = {
"@aws-sdk/credential-provider-ini-3.335.0" = {
name = "_at_aws-sdk_slash_credential-provider-ini";
packageName = "@aws-sdk/credential-provider-ini";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.332.0.tgz";
sha512 = "DTW6d6rcqizPVyvcIrwvxecQ7e5GONtVc5Wyf0RTfqf41sDOVZYmn6G+zEFSpBLW0975uZbJS0lyLWtJe2VujQ==";
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.335.0.tgz";
sha512 = "3AsKlpAnddLYGEZkfT8ZsAB+1WySSzbLA2eoJTW80nKWVUnvYV6gq/sNXEY43i7T2rOXmblJHbTuMAWA1ruMFg==";
};
};
"@aws-sdk/credential-provider-node-3.332.0" = {
"@aws-sdk/credential-provider-node-3.335.0" = {
name = "_at_aws-sdk_slash_credential-provider-node";
packageName = "@aws-sdk/credential-provider-node";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.332.0.tgz";
sha512 = "KkBayS9k4WyJTvC86ngeRM+RmWxNCS1BHvudkR6PLXfnsNPDzxySDVY0UgxVhbNYDYsO561fXZt9ccpKyVWjgg==";
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.335.0.tgz";
sha512 = "aIelF8GBTbXuVntpeEdnbcajYtkO01OfSmXb08JxvtQ0tPCWY6SbLpNHUAIfBW1OVkm5E7SX+Hc1tawxq9IKAA==";
};
};
"@aws-sdk/credential-provider-process-3.329.0" = {
@ -184,13 +184,13 @@ let
sha512 = "5oO220qoFc2pMdZDQa6XN/mVhp669I3+LqMbbscGtX/UgLJPSOb7YzPld9Wjv12L5rf+sD3G1PF3LZXO0vKLFA==";
};
};
"@aws-sdk/credential-provider-sso-3.332.0" = {
"@aws-sdk/credential-provider-sso-3.335.0" = {
name = "_at_aws-sdk_slash_credential-provider-sso";
packageName = "@aws-sdk/credential-provider-sso";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.332.0.tgz";
sha512 = "SaKXl48af3n6LRitcaEqbeg1YDXwQ0A5QziC1xQyYPraEIj3IZ/GyTjx04Lo2jxNYHuEOE8u4aTw1+IK1GDKbg==";
url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.335.0.tgz";
sha512 = "omEF3m9Vy18QfuGuGx/48MaiKDOdvMZKZI9FKyQxFIwfqRyhmF2jzQ7070FD/E9YakscOZ0hSeYEPJ7nkJa8ww==";
};
};
"@aws-sdk/credential-provider-web-identity-3.329.0" = {
@ -202,13 +202,13 @@ let
sha512 = "lcEibZD7AlutCacpQ6DyNUqElZJDq+ylaIo5a8MH9jGh7Pg2WpDg0Sy+B6FbGCkVn4eIjdHxeX54JM245nhESg==";
};
};
"@aws-sdk/credential-providers-3.332.0" = {
"@aws-sdk/credential-providers-3.335.0" = {
name = "_at_aws-sdk_slash_credential-providers";
packageName = "@aws-sdk/credential-providers";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.332.0.tgz";
sha512 = "UZM8hCJqBBI4yEopVnfQ7HgUCuiYuWJziPFovQpbwvZKadibzo332/n6e5IsQbJxPjymqFLgTn3PQds/+1FOlQ==";
url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.335.0.tgz";
sha512 = "KWZL+B+6BDj1PfP7+Bb3/A6yFWxYtjYR7vi2UgD6QrmB09iUQtheiwObZY3f30OAq10O03gOmhxC2N1o6+i0sQ==";
};
};
"@aws-sdk/fetch-http-handler-3.329.0" = {
@ -436,13 +436,13 @@ let
sha512 = "7E0fGpBKxwFqHHAOqNbgNsHSEmCZLuvmU9yvG9DXKVzrS4P48O/PfOro123WpcFZs3STyOVgH8wjUPftHAVKmg==";
};
};
"@aws-sdk/token-providers-3.332.0" = {
"@aws-sdk/token-providers-3.335.0" = {
name = "_at_aws-sdk_slash_token-providers";
packageName = "@aws-sdk/token-providers";
version = "3.332.0";
version = "3.335.0";
src = fetchurl {
url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.332.0.tgz";
sha512 = "fccbg6OSl0l658pxl2p1MoU9gEePo5B361+JNaN0zfRMu7c5HBXCpdl4djlFxAHjltrX9f1+BKqfGHYgI3h8SQ==";
url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.335.0.tgz";
sha512 = "2Hu62xH4/6V+N5JWsPuvxCCmaf/QUnxtz48ClpxzBKM/whrTTkLku8W2fh2MmnzGzAHtT+N97jkIsy2B+onqIg==";
};
};
"@aws-sdk/types-3.329.0" = {
@ -859,13 +859,13 @@ let
sha512 = "ztJ+5lk0yWf4E7sQQqsidPYJa0a/511Ln/IaI3A+fGv6z0SrGDG0Lu6SAehczcehrhgNwMhPlerJMeXw7vZs2g==";
};
};
"@codemirror/language-6.6.0" = {
"@codemirror/language-6.7.0" = {
name = "_at_codemirror_slash_language";
packageName = "@codemirror/language";
version = "6.6.0";
version = "6.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/@codemirror/language/-/language-6.6.0.tgz";
sha512 = "cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg==";
url = "https://registry.npmjs.org/@codemirror/language/-/language-6.7.0.tgz";
sha512 = "4SMwe6Fwn57klCUsVN0y4/h/iWT+XIXFEmop2lIHHuWO0ubjCrF3suqSZLyOQlznxkNnNbOOfKe5HQbQGCAmTg==";
};
};
"@codemirror/lint-6.2.1" = {
@ -886,13 +886,13 @@ let
sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==";
};
};
"@codemirror/view-6.11.3" = {
"@codemirror/view-6.12.0" = {
name = "_at_codemirror_slash_view";
packageName = "@codemirror/view";
version = "6.11.3";
version = "6.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/@codemirror/view/-/view-6.11.3.tgz";
sha512 = "JInirTUhmwDOEZZHcsx4/wfnBgJk0q3vnDZh1i2k7W+t1SqMugBCO/+J5zgfjJ5rXYFjnpBG9Dkz/ZMSn4bNzg==";
url = "https://registry.npmjs.org/@codemirror/view/-/view-6.12.0.tgz";
sha512 = "xNHvbJBc2v8JuEcIGOck6EUGShpP+TYGCEMVEVQMYxbFXfMhYnoF3znxB/2GgeKR0nrxBs+nhBupiTYQqCp2kw==";
};
};
"@colors/colors-1.5.0" = {
@ -1417,13 +1417,13 @@ let
sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==";
};
};
"@oclif/command-1.8.25" = {
"@oclif/command-1.8.26" = {
name = "_at_oclif_slash_command";
packageName = "@oclif/command";
version = "1.8.25";
version = "1.8.26";
src = fetchurl {
url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.25.tgz";
sha512 = "teCfKH6GNF46fiCn/P5EMHX93RE3KJAW4i0sq3X9phrzs6807WRauhythdc8OKINxd+LpqwQ1i5bnaCKvLZRcQ==";
url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.26.tgz";
sha512 = "IT9kOLFRMc3s6KJ1FymsNjbHShI211eVgAg+JMiDVl8LXwOJxYe8ybesgL1kpV9IUFByOBwZKNG2mmrVeNBHPg==";
};
};
"@oclif/config-1.18.6" = {
@ -1435,13 +1435,13 @@ let
sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA==";
};
};
"@oclif/config-1.18.8" = {
"@oclif/config-1.18.9" = {
name = "_at_oclif_slash_config";
packageName = "@oclif/config";
version = "1.18.8";
version = "1.18.9";
src = fetchurl {
url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.8.tgz";
sha512 = "FetS52+emaZQui0roFSdbBP8ddBkIezEoH2NcjLJRjqkMGdE9Z1V+jsISVqTYXk2KJ1gAI0CHDXFjJlNBYbJBg==";
url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.9.tgz";
sha512 = "CGABvY60IbzK3kecDekCQS4T7fvpraBHV3nvYDtehrqljbMxtTeeJkFJVLbBnZnwzD2u1ApQX/Zggja3lyCoJA==";
};
};
"@oclif/core-1.26.2" = {
@ -1480,13 +1480,13 @@ let
sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw==";
};
};
"@oclif/parser-3.8.10" = {
"@oclif/parser-3.8.11" = {
name = "_at_oclif_slash_parser";
packageName = "@oclif/parser";
version = "3.8.10";
version = "3.8.11";
src = fetchurl {
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz";
sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ==";
url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.11.tgz";
sha512 = "B3NweRn1yZw2g7xaF10Zh/zwlqTJJINfU+CRkqll+LaTisSNvZbW0RR9WGan26EqqLp4qzNjzX/e90Ew8l9NLw==";
};
};
"@oclif/screen-3.0.4" = {
@ -1750,6 +1750,24 @@ let
sha512 = "sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw==";
};
};
"@smithy/protocol-http-1.0.1" = {
name = "_at_smithy_slash_protocol-http";
packageName = "@smithy/protocol-http";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.0.1.tgz";
sha512 = "9OrEn0WfOVtBNYJUjUAn9AOiJ4lzERCJJ/JeZs8E6yajTGxBaFRxUnNBHiNqoDJVg076hY36UmEnPx7xXrvUSg==";
};
};
"@smithy/types-1.0.0" = {
name = "_at_smithy_slash_types";
packageName = "@smithy/types";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/@smithy/types/-/types-1.0.0.tgz";
sha512 = "kc1m5wPBHQCTixwuaOh9vnak/iJm21DrSf9UK6yDE5S3mQQ4u11pqAUiKWnlrZnYkeLfAI9UEHj9OaMT1v5Umg==";
};
};
"@sqltools/formatter-1.2.5" = {
name = "_at_sqltools_slash_formatter";
packageName = "@sqltools/formatter";
@ -1759,13 +1777,13 @@ let
sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==";
};
};
"@swc/core-1.3.58" = {
"@swc/core-1.3.59" = {
name = "_at_swc_slash_core";
packageName = "@swc/core";
version = "1.3.58";
version = "1.3.59";
src = fetchurl {
url = "https://registry.npmjs.org/@swc/core/-/core-1.3.58.tgz";
sha512 = "tSDcHXMBQIo2ohQ/0ryZnUA+0mBrVhe49+cR+QsFru+XEhCok1BLqdE6cZ2a+sgZ1I+Dmw8aTxYm8Ox64PSKPQ==";
url = "https://registry.npmjs.org/@swc/core/-/core-1.3.59.tgz";
sha512 = "ZBw31zd2E5SXiodwGvjQdx5ZC90b2uyX/i2LeMMs8LKfXD86pfOfQac+JVrnyEKDhASXj9icgsF9NXBhaMr3Kw==";
};
};
"@swc/helpers-0.5.1" = {
@ -1777,13 +1795,13 @@ let
sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==";
};
};
"@swc/wasm-1.3.58" = {
"@swc/wasm-1.3.59" = {
name = "_at_swc_slash_wasm";
packageName = "@swc/wasm";
version = "1.3.58";
version = "1.3.59";
src = fetchurl {
url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.58.tgz";
sha512 = "u85cAPJuLn7RBd2JllVpQtF3ngeEeg3oNWzlPD76nw13Z1EZflWBbFCXE5JYfB78NfboEJgMGQF4pYou/7yIdA==";
url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.59.tgz";
sha512 = "HMC6y2rqtomrspvHwEZZuQb8kzw1GZSmaZ8fbbjSRvvvtOHLbIetuFWGVJ6dgthkt10YII21AMZcvxvrTC6H/Q==";
};
};
"@techteamer/ocsp-1.0.0" = {
@ -2002,13 +2020,13 @@ let
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
};
};
"@types/node-20.1.7" = {
"@types/node-20.2.1" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "20.1.7";
version = "20.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-20.1.7.tgz";
sha512 = "WCuw/o4GSwDGMoonES8rcvwsig77dGCMbZDrZr2x4ZZiNW4P/gcoZXe/0twgtobcTkmg9TuKflxYL/DuwDyJzg==";
url = "https://registry.npmjs.org/@types/node/-/node-20.2.1.tgz";
sha512 = "DqJociPbZP1lbZ5SQPk4oag6W7AyaGMO6gSfRwq3PWl4PXTwJpRQJhDq4W0kzrg3w6tJ1SwlvGZ5uKFHY13LIg==";
};
};
"@types/node-fetch-2.6.4" = {
@ -2695,13 +2713,13 @@ let
sha512 = "p/ImGq8duQ4sOqRzB5dJ81T2jto2LcfxEgSHuSHH9+pzOyHdkoMLAgMtVfX9bt9m4i0EP/20jLM2ydID8G7Umw==";
};
};
"aws-sdk-2.1379.0" = {
"aws-sdk-2.1381.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1379.0";
version = "2.1381.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1379.0.tgz";
sha512 = "kziOtAtJxdgYJwhzY+uhNi/AGPrDEMHd0dEz46YR1AB5bVqjS9/SjOZHemB88QfpW11IVB/FoiIusXlGEvgq9Q==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1381.0.tgz";
sha512 = "4dzE/zZZCG/MIYntKs61F0h0zJa3S5aXX90B2ZnNOf1zvPEJ/gMpv7u3C3FV7UMPyfg00JWAu3g9i+G2j8Wujw==";
};
};
"aws-sign2-0.7.0" = {
@ -2749,13 +2767,13 @@ let
sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==";
};
};
"axios-retry-3.4.0" = {
"axios-retry-3.5.0" = {
name = "axios-retry";
packageName = "axios-retry";
version = "3.4.0";
version = "3.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.4.0.tgz";
sha512 = "VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA==";
url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.5.0.tgz";
sha512 = "g48qNrLX30VU6ECWltpFCPegKK6dWzMDYv2o83W2zUL/Zh/SLXbT6ksGoKqYZHtghzqeeXhZBcSXJkO1fPbCcw==";
};
};
"babel-helper-vue-jsx-merge-props-2.0.3" = {
@ -2830,13 +2848,13 @@ let
sha512 = "rQdKZHTWok2uC3wHyGwoV6mOxhnOyp07iHhyWQlS+U5zkYyhOEOT6Ri4Q0vPThTqCYs6RCbtAfTbPG+lUZkocw==";
};
};
"better-sqlite3-8.3.0" = {
"better-sqlite3-8.4.0" = {
name = "better-sqlite3";
packageName = "better-sqlite3";
version = "8.3.0";
version = "8.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.3.0.tgz";
sha512 = "JTmvBZL/JLTc+3Msbvq6gK6elbU9/wVMqiudplHrVJpr7sVMR9KJrNhZAbW+RhXKlpMcuEhYkdcHa3TXKNXQ1w==";
url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.4.0.tgz";
sha512 = "NmsNW1CQvqMszu/CFAJ3pLct6NEFlNfuGM6vw72KHkjOD1UDnL96XNN1BMQc1hiHo8vE2GbOWQYIpZ+YM5wrZw==";
};
};
"big-integer-1.6.51" = {
@ -5602,13 +5620,13 @@ let
sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==";
};
};
"glob-10.2.4" = {
"glob-10.2.6" = {
name = "glob";
packageName = "glob";
version = "10.2.4";
version = "10.2.6";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-10.2.4.tgz";
sha512 = "fDboBse/sl1oXSLhIp0FcCJgzW9KmhC/q8ULTKC82zc+DL3TL7FNb8qlt5qqXN53MsKEUSIcb+7DLmEygOE5Yw==";
url = "https://registry.npmjs.org/glob/-/glob-10.2.6.tgz";
sha512 = "U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA==";
};
};
"glob-7.2.3" = {
@ -6790,13 +6808,13 @@ let
sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==";
};
};
"jackspeak-2.2.0" = {
"jackspeak-2.2.1" = {
name = "jackspeak";
packageName = "jackspeak";
version = "2.2.0";
version = "2.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz";
sha512 = "r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ==";
url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz";
sha512 = "MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw==";
};
};
"jake-10.8.6" = {
@ -8221,13 +8239,13 @@ let
sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==";
};
};
"minimatch-9.0.0" = {
"minimatch-9.0.1" = {
name = "minimatch";
packageName = "minimatch";
version = "9.0.0";
version = "9.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz";
sha512 = "0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==";
url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz";
sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==";
};
};
"minimist-1.2.8" = {
@ -8266,13 +8284,13 @@ let
sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==";
};
};
"minipass-6.0.1" = {
"minipass-6.0.2" = {
name = "minipass";
packageName = "minipass";
version = "6.0.1";
version = "6.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-6.0.1.tgz";
sha512 = "Tenl5QPpgozlOGBiveNYHg2f6y+VpxsXRoIHFUVJuSmTonXRAE6q9b8Mp/O46762/2AlW4ye4Nkyvx0fgWDKbw==";
url = "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz";
sha512 = "MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==";
};
};
"minipass-collect-1.0.2" = {
@ -9499,13 +9517,13 @@ let
sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==";
};
};
"path-scurry-1.9.1" = {
"path-scurry-1.9.2" = {
name = "path-scurry";
packageName = "path-scurry";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.1.tgz";
sha512 = "UgmoiySyjFxP6tscZDgWGEAgsW5ok8W3F5CJDnnH2pozwSTGE6eH7vwTotMwATWA2r5xqdkKdxYPkwlJjAI/3g==";
url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.2.tgz";
sha512 = "qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg==";
};
};
"path-to-regexp-0.1.7" = {
@ -9733,13 +9751,13 @@ let
sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==";
};
};
"pinia-2.1.1" = {
"pinia-2.1.3" = {
name = "pinia";
packageName = "pinia";
version = "2.1.1";
version = "2.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/pinia/-/pinia-2.1.1.tgz";
sha512 = "Y2CgpcUtD8Ogdvo5LW5g20ykSZgnVDMgTSZFr40EvO6HB8axQk+0lHa1UrRah9wworFaxjovwRlY/wRICWj/KQ==";
url = "https://registry.npmjs.org/pinia/-/pinia-2.1.3.tgz";
sha512 = "XNA/z/ye4P5rU1pieVmh0g/hSuDO98/a5UC8oSP0DNdvt6YtetJNHTrXwpwsQuflkGT34qKxAEcp7lSxXNjf/A==";
};
};
"popsicle-12.1.0" = {
@ -12046,13 +12064,13 @@ let
sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==";
};
};
"tslib-2.5.0" = {
"tslib-2.5.2" = {
name = "tslib";
packageName = "tslib";
version = "2.5.0";
version = "2.5.2";
src = fetchurl {
url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz";
sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==";
url = "https://registry.npmjs.org/tslib/-/tslib-2.5.2.tgz";
sha512 = "5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA==";
};
};
"tsscmp-1.0.6" = {
@ -12577,13 +12595,13 @@ let
sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==";
};
};
"vue-demi-0.14.3" = {
"vue-demi-0.14.5" = {
name = "vue-demi";
packageName = "vue-demi";
version = "0.14.3";
version = "0.14.5";
src = fetchurl {
url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.3.tgz";
sha512 = "aknytzARm7U20nMhvOdfa5IRiS+oyATtd55s3fICsT7wEtN/qoOiOINsNsNJjeZCOsPNOGS4p1yDOwH9cTxgjg==";
url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz";
sha512 = "o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==";
};
};
"vue-fragment-1.5.1" = {
@ -13195,20 +13213,20 @@ in
];
})
sources."@aws-sdk/abort-controller-3.329.0"
sources."@aws-sdk/client-cognito-identity-3.332.0"
sources."@aws-sdk/client-sso-3.332.0"
sources."@aws-sdk/client-sso-oidc-3.332.0"
sources."@aws-sdk/client-sts-3.332.0"
sources."@aws-sdk/client-cognito-identity-3.335.0"
sources."@aws-sdk/client-sso-3.335.0"
sources."@aws-sdk/client-sso-oidc-3.335.0"
sources."@aws-sdk/client-sts-3.335.0"
sources."@aws-sdk/config-resolver-3.329.0"
sources."@aws-sdk/credential-provider-cognito-identity-3.332.0"
sources."@aws-sdk/credential-provider-cognito-identity-3.335.0"
sources."@aws-sdk/credential-provider-env-3.329.0"
sources."@aws-sdk/credential-provider-imds-3.329.0"
sources."@aws-sdk/credential-provider-ini-3.332.0"
sources."@aws-sdk/credential-provider-node-3.332.0"
sources."@aws-sdk/credential-provider-ini-3.335.0"
sources."@aws-sdk/credential-provider-node-3.335.0"
sources."@aws-sdk/credential-provider-process-3.329.0"
sources."@aws-sdk/credential-provider-sso-3.332.0"
sources."@aws-sdk/credential-provider-sso-3.335.0"
sources."@aws-sdk/credential-provider-web-identity-3.329.0"
sources."@aws-sdk/credential-providers-3.332.0"
sources."@aws-sdk/credential-providers-3.335.0"
sources."@aws-sdk/fetch-http-handler-3.329.0"
sources."@aws-sdk/hash-node-3.329.0"
sources."@aws-sdk/invalid-dependency-3.329.0"
@ -13234,7 +13252,7 @@ in
sources."@aws-sdk/shared-ini-file-loader-3.329.0"
sources."@aws-sdk/signature-v4-3.329.0"
sources."@aws-sdk/smithy-client-3.329.0"
sources."@aws-sdk/token-providers-3.332.0"
sources."@aws-sdk/token-providers-3.335.0"
sources."@aws-sdk/types-3.329.0"
sources."@aws-sdk/url-parser-3.329.0"
sources."@aws-sdk/util-base64-3.310.0"
@ -13306,10 +13324,10 @@ in
sources."@codemirror/lang-javascript-6.1.8"
sources."@codemirror/lang-json-6.0.1"
sources."@codemirror/lang-sql-6.5.0"
sources."@codemirror/language-6.6.0"
sources."@codemirror/language-6.7.0"
sources."@codemirror/lint-6.2.1"
sources."@codemirror/state-6.2.0"
sources."@codemirror/view-6.11.3"
sources."@codemirror/view-6.12.0"
sources."@colors/colors-1.5.0"
sources."@cspotcode/source-map-support-0.8.1"
sources."@curlconverter/yargs-0.0.2"
@ -13431,8 +13449,8 @@ in
sources."mkdirp-1.0.4"
];
})
sources."@oclif/command-1.8.25"
sources."@oclif/config-1.18.8"
sources."@oclif/command-1.8.26"
sources."@oclif/config-1.18.9"
(sources."@oclif/core-1.26.2" // {
dependencies = [
sources."supports-color-8.1.1"
@ -13453,7 +13471,7 @@ in
];
})
sources."@oclif/linewrap-1.0.0"
sources."@oclif/parser-3.8.10"
sources."@oclif/parser-3.8.11"
sources."@oclif/screen-3.0.4"
sources."@opentelemetry/api-1.4.1"
sources."@protobufjs/aspromise-1.1.2"
@ -13517,10 +13535,12 @@ in
];
})
sources."@servie/events-1.0.0"
sources."@smithy/protocol-http-1.0.1"
sources."@smithy/types-1.0.0"
sources."@sqltools/formatter-1.2.5"
sources."@swc/core-1.3.58"
sources."@swc/core-1.3.59"
sources."@swc/helpers-0.5.1"
sources."@swc/wasm-1.3.58"
sources."@swc/wasm-1.3.59"
sources."@techteamer/ocsp-1.0.0"
sources."@tediousjs/connection-string-0.4.2"
sources."@tokenizer/token-0.3.0"
@ -13543,7 +13563,7 @@ in
sources."@types/long-4.0.2"
sources."@types/mime-1.3.2"
sources."@types/multer-1.4.7"
sources."@types/node-20.1.7"
sources."@types/node-20.2.1"
(sources."@types/node-fetch-2.6.4" // {
dependencies = [
sources."form-data-3.0.1"
@ -13645,7 +13665,7 @@ in
sources."axios-0.24.0"
];
})
(sources."aws-sdk-2.1379.0" // {
(sources."aws-sdk-2.1381.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -13658,7 +13678,7 @@ in
sources."aws-sign2-0.7.0"
sources."aws4-1.12.0"
sources."axios-0.21.4"
sources."axios-retry-3.4.0"
sources."axios-retry-3.5.0"
sources."babel-helper-vue-jsx-merge-props-2.0.3"
(sources."babel-runtime-6.26.0" // {
dependencies = [
@ -13676,7 +13696,7 @@ in
sources."bcrypt-pbkdf-1.0.2"
sources."bcryptjs-2.4.3"
sources."better-eval-1.3.0"
sources."better-sqlite3-8.3.0"
sources."better-sqlite3-8.4.0"
sources."big-integer-1.6.51"
sources."big.js-6.2.1"
sources."bignumber.js-9.1.1"
@ -14107,9 +14127,9 @@ in
})
sources."getpass-0.1.7"
sources."github-from-package-0.0.0"
(sources."glob-10.2.4" // {
(sources."glob-10.2.6" // {
dependencies = [
sources."minimatch-9.0.0"
sources."minimatch-9.0.1"
];
})
sources."glob-parent-5.1.2"
@ -14277,7 +14297,7 @@ in
sources."iso-639-1-2.1.15"
sources."isomorphic-ws-4.0.1"
sources."isstream-0.1.2"
sources."jackspeak-2.2.0"
sources."jackspeak-2.2.1"
sources."jake-10.8.6"
sources."jmespath-0.16.0"
sources."join-component-1.1.0"
@ -14465,7 +14485,7 @@ in
];
})
sources."minimist-1.2.8"
sources."minipass-6.0.1"
sources."minipass-6.0.2"
(sources."minipass-collect-1.0.2" // {
dependencies = [
sources."minipass-3.3.6"
@ -14733,7 +14753,7 @@ in
sources."path-is-absolute-1.0.1"
sources."path-key-2.0.1"
sources."path-parse-1.0.7"
sources."path-scurry-1.9.1"
sources."path-scurry-1.9.2"
sources."path-to-regexp-0.1.7"
sources."path-type-4.0.0"
sources."pause-0.0.1"
@ -14772,7 +14792,7 @@ in
sources."pgpass-1.0.5"
sources."picocolors-1.0.0"
sources."picomatch-2.3.1"
sources."pinia-2.1.1"
sources."pinia-2.1.3"
sources."popsicle-12.1.0"
sources."popsicle-content-encoding-1.0.0"
sources."popsicle-cookie-jar-1.0.0"
@ -15155,7 +15175,7 @@ in
sources."triple-beam-1.3.0"
sources."ts-expect-1.3.0"
sources."ts-node-10.9.1"
sources."tslib-2.5.0"
sources."tslib-2.5.2"
sources."tsscmp-1.0.6"
sources."tunnel-0.0.6"
sources."tunnel-agent-0.6.0"
@ -15250,7 +15270,7 @@ in
sources."vue-2.7.14"
sources."vue-agile-2.0.0"
sources."vue-color-2.8.1"
sources."vue-demi-0.14.3"
sources."vue-demi-0.14.5"
sources."vue-fragment-1.5.1"
sources."vue-i18n-8.28.2"
sources."vue-infinite-loading-2.4.5"

View file

@ -2,19 +2,20 @@
, stdenv
, fetchurl
, dpkg
, wrapGAppsHook
, wrapQtAppsHook
, autoPatchelfHook
, alsa-lib
, at-spi2-core
, libtool
, libxkbcommon
, nspr
, mesa
, libtiff
, cups
, udev
, gtk3
, qtbase
, xorg
, cups
, pango
, makeWrapper
, useChineseVersion ? false
}:
@ -33,35 +34,43 @@ stdenv.mkDerivation rec {
unpackCmd = "dpkg -x $src .";
sourceRoot = ".";
postUnpack = ''
# distribution is missing libkappessframework.so, so we should not let
# autoPatchelfHook fail on the following dead libraries
rm -r opt/kingsoft/wps-office/office6/addons/pdfbatchcompression
# Remove the following libraries because they depend on qt4
rm -r opt/kingsoft/wps-office/office6/{librpcetapi.so,librpcwpsapi.so,librpcwppapi.so,libavdevice.so.58.10.100,libmediacoder.so}
rm -r opt/kingsoft/wps-office/office6/addons/wppcapturer/libwppcapturer.so
rm -r opt/kingsoft/wps-office/office6/addons/wppencoder/libwppencoder.so
'';
nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper autoPatchelfHook ];
nativeBuildInputs = [
dpkg
autoPatchelfHook
];
buildInputs = [
alsa-lib
xorg.libXdamage
xorg.libXtst
at-spi2-core
libtool
libxkbcommon
nspr
mesa
libtiff
udev
gtk3
qtbase
xorg.libXdamage
xorg.libXtst
xorg.libXv
];
dontWrapQtApps = true;
runtimeDependencies = map lib.getLib [
cups
pango
];
autoPatchelfIgnoreMissingDeps = [
# distribution is missing libkappessframework.so
"libkappessframework.so"
# qt4 support is deprecated
"libQtCore.so.4"
"libQtNetwork.so.4"
"libQtXml.so.4"
];
installPhase = ''
runHook preInstall
prefix=$out/opt/kingsoft/wps-office
@ -79,25 +88,13 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
dontWrapQtApps = true;
dontWrapGApps = true;
preFixup = ''
# The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6
patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so}
patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so}
# dlopen dependency
patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
'';
postFixup = ''
for f in "$out"/bin/*; do
echo "Wrapping $f"
wrapProgram "$f" \
"''${gappsWrapperArgs[@]}" \
"''${qtWrapperArgs[@]}"
done
'';
meta = with lib; {
description = "Office suite, formerly Kingsoft Office";
homepage = "https://www.wps.com";

View file

@ -2,17 +2,30 @@
sway-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "swayfx";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "WillPower3309";
repo = "swayfx";
rev = version;
sha256 = "sha256-nVy7GdAnheWhjevcCPE407xWSLN8F4Le0uq2RDwv/Zc=";
sha256 = "sha256-3Odyeb10AGbNf6TI1W79sLiwB4PrszC5VzjCr7FuPz4=";
};
# This patch was backported into SwayFX
# remove when next release is rebased on Sway 1.9
patches =
let
removePatches = [
"LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"
];
in
builtins.filter
(patch: !builtins.elem (patch.name or null) removePatches)
(oldAttrs.patches or [ ]);
meta = with lib; {
description = "A Beautiful Sway Fork";
description = "Sway, but with eye candy!";
homepage = "https://github.com/WillPower3309/swayfx";
maintainers = with maintainers; [ ricarch97 ];
license = licenses.mit;

View file

@ -7,6 +7,10 @@ npmConfigHook() {
export NIX_NODEJS_BUILDNPMPACKAGE=1
export prefetchNpmDeps="@prefetchNpmDeps@"
if [ -n "${npmRoot-}" ]; then
pushd "$npmRoot"
fi
echo "Configuring npm"
export HOME="$TMPDIR"
@ -105,6 +109,10 @@ npmConfigHook() {
rm "$CACHE_MAP_PATH"
unset CACHE_MAP_PATH
if [ -n "${npmRoot-}" ]; then
popd
fi
echo "Finished npmConfigHook"
}

View file

@ -84,11 +84,11 @@
};
};
kde-cli-tools = {
version = "5.27.5";
version = "5.27.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.tar.xz";
sha256 = "0rzggjsly44wxpsqqxylnzw2n3sf7s1584rf1qp1040jf0vmcx7d";
name = "kde-cli-tools-5.27.5.tar.xz";
url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.1.tar.xz";
sha256 = "sha256-E13W626S1tKdeL6Ls/ag1eBcJrPP2kmLJIB8HihEiIU=";
name = "kde-cli-tools-5.27.5.1.tar.xz";
};
};
kde-gtk-config = {

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "minimacy";
version = "0.6.4";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ambermind";
repo = pname;
rev = version;
hash = "sha256-qIK7QnXZ9FmfarMZaHktZCHhvR8cctyKVpFS8PeOpLs=";
hash = "sha256-cpxKZ77Noe/2et3ROAQwG2LJxrlsEfi+bmUj+QaPkk0=";
};
nativeBuildInputs = [ makeBinaryWrapper ];

View file

@ -8,6 +8,7 @@ mkCoqDerivation {
repo = "coq-dpdgraph";
inherit version;
defaultVersion = lib.switch coq.coq-version [
{ case = "8.17"; out = "1.0+8.17"; }
{ case = "8.16"; out = "1.0+8.16"; }
{ case = "8.15"; out = "1.0+8.15"; }
{ case = "8.14"; out = "1.0+8.14"; }
@ -22,6 +23,7 @@ mkCoqDerivation {
{ case = "8.5"; out = "0.6"; }
] null;
release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4=";
release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0=";
release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7";
release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s";

View file

@ -1,44 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, doxygen
, gbenchmark
, graphviz
, gtest
}:
stdenv.mkDerivation rec {
pname = "ftxui";
version = "3.0.0";
version = "4.1.0";
src = fetchFromGitHub {
owner = "ArthurSonzogni";
repo = "ftxui";
rev = "v${version}";
sha256 = "sha256-2pCk4drYIprUKcjnrlX6WzPted7MUAp973EmAQX3RIE=";
sha256 = "sha256-6uPlJXuWcTUnpk+xe6EWDYvDLsfy7hGkEMO/2j3Dz0o=";
};
patches = [
# Can be removed once https://github.com/ArthurSonzogni/FTXUI/pull/403 hits a stable release
(fetchpatch {
name = "fix-postevent-segfault.patch";
url = "https://github.com/ArthurSonzogni/FTXUI/commit/f9256fa132e9d3c50ef1e1eafe2774160b38e063.patch";
sha256 = "sha256-0040/gJcCXzL92FQLhZ2dNMJhNqXXD+UHFv4Koc07K0=";
})
];
nativeBuildInputs = [
cmake
doxygen
graphviz
];
cmakeFlags = [
"-DFTXUI_BUILD_EXAMPLES=OFF"
nativeCheckInputs = [
gbenchmark
gtest
];
# gtest and gbenchmark don't seem to generate any binaries
doCheck = false;
cmakeFlags = [
"-DFTXUI_BUILD_EXAMPLES=OFF"
"-DFTXUI_BUILD_DOCS=ON"
"-DFTXUI_BUILD_TESTS=ON"
];
doCheck = true;
meta = with lib; {
homepage = "https://github.com/ArthurSonzogni/FTXUI";
@ -46,6 +44,6 @@ stdenv.mkDerivation rec {
description = "Functional Terminal User Interface library for C++";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
platforms = platforms.all;
};
}

View file

@ -26,14 +26,14 @@
buildPythonPackage rec {
pname = "httpie";
version = "3.2.1";
version = "3.2.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "httpie";
repo = "httpie";
rev = version;
hash = "sha256-WEe8zSlNckl7bPBi6u8mHQ1/xPw3kE81F8Xr15TchgM=";
hash = "sha256-hPsjEpvT6tnPm68AUB2Tv3Gon4DfSzO2VYCGqP8ozSI=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, docopt
, fetchPypi
, pdfminer-six
, pythonOlder
, pythonRelaxDepsHook
, setuptools
, wand
}:
buildPythonPackage rec {
pname = "py-pdf-parser";
version = "0.10.2";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-F12uDAjG9P3eVyaXqVSHNFrEGnOzLlJERDwOiWSq1ZY=";
};
nativeBuildInputs = [
setuptools
pythonRelaxDepsHook
];
propagatedBuildInputs = [
docopt
pdfminer-six
wand
];
pythonRelaxDeps = [
"docopt"
"pdfminer.six"
"wand"
];
# needs pyvoronoi, which isn't packaged yet
doCheck = false;
pythonImportsCheck = [
"py_pdf_parser"
"py_pdf_parser.loaders"
];
meta = with lib; {
description = "A tool to help extracting information from structured PDFs";
homepage = "https://github.com/jstockwin/py-pdf-parser";
changelog = "https://github.com/jstockwin/py-pdf-parser/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
}

View file

@ -1,55 +0,0 @@
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, fetchzip
, cython
, numpy
, scikit-learn
, six
, setuptools-scm
, gcc
, pytest
, pytest-cov
, isPy27
}:
let
testData = fetchzip {
url = "http://mattmahoney.net/dc/text8.zip";
sha256 = "0w3l64bww9znmmvd9cqbfmh3dddnlrjicz43y5qq6fhi9cfqjfar";
};
in
buildPythonPackage rec {
pname = "word2vec";
version = "0.11.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4";
};
nativeBuildInputs = [ setuptools-scm gcc ];
propagatedBuildInputs = [ cython numpy scikit-learn six ];
nativeCheckInputs = [ pytest pytest-cov ];
# Checks require test data downloaded separately
# See project source Makefile:test-data rule for reference
checkPhase = ''
PATH=$PATH:$out/bin
mkdir data
head -c 100000 ${testData}/text8 > data/text8-small
pytest
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "Tool for computing continuous distributed representations of words";
homepage = "https://github.com/danielfrg/word2vec";
license = licenses.asl20;
maintainers = with maintainers; [ NikolaMandic ];
};
}

View file

@ -2,7 +2,6 @@
, buildPythonPackage
, cython
, fetchFromGitHub
, fetchpatch
, matplotlib
, mock
, numpy
@ -13,7 +12,7 @@
buildPythonPackage rec {
pname = "wordcloud";
version = "unstable-2023-01-04";
version = "1.9.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "amueller";
repo = "word_cloud";
rev = "dbf7ab7753a36e1c12c0e1b36aeeece5023f39f9";
hash = "sha256-ogSkVcPUth7bh7mxwdDmF/Fc2ySDxbLA8ArmBNnPvw8=";
rev = "refs/tags/${version}";
hash = "sha256-Tcle9otT1eBN/RzajwKZDUq8xX0Lhi2t74OvhUrvHZE=";
};
nativeBuildInputs = [

View file

@ -1,25 +1,29 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "dbmate";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "amacneil";
repo = "dbmate";
rev = "v${version}";
sha256 = "sha256-K81AyhQfM1hBoA1gpU1MdcdkUnn2YKyig+fExVsMwMI=";
rev = "refs/tags/v${version}";
hash = "sha256-bWmRdrULXXVIaO5f3rntsVURnyojYFbhbZ43WvGzoZk=";
};
vendorHash = "sha256-NZ2HVFViU8Vzwyo33cueNJwdCT4exZlB7g4WgoWKZBE=";
vendorHash = "sha256-m1Nbu1bE04iOXnxW5kJfI9W95FU87eRKkOzg+YVvRsg=";
doCheck = false;
meta = with lib; {
description = "Database migration tool";
homepage = "https://github.com/amacneil/dbmate";
changelog = "https://github.com/amacneil/dbmate/releases/tag/v${version}";
license = licenses.mit;
maintainers = [ maintainers.manveru ];
maintainers = with maintainers; [ manveru ];
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "httpref";
version = "1.6.1";
src = fetchFromGitHub {
owner = "dnnrly";
repo = "httpref";
rev = "v${version}";
hash = "sha256-T5fR9cyqsM6Kw6kFqZedoSxyvFkkxNpuErscwiUTMa0=";
};
vendorHash = "sha256-9Ei4Lfll79f/+iuO5KesUMaTgkS9nq+1tma/dhOZ7Qw=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "Command line, offline, access to HTTP status code, common header, and port references";
homepage = "https://github.com/dnnrly/httpref";
changelog = "https://github.com/dnnrly/httpref/releases/tag/${src.rev}";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}

View file

@ -9,17 +9,17 @@
rustPlatform.buildRustPackage rec {
pname = "orogene";
version = "0.3.26";
version = "0.3.27";
src = fetchFromGitHub {
owner = "orogene";
repo = "orogene";
rev = "v${version}";
hash = "sha256-9Rq2/o2W0l2/JR/D95+2AjpVzdZuDVDyQFFNb5Us/hg=";
hash = "sha256-y58S8oou1GBR1Cx77IzLvLmZ/MN88P9k1RGCFOVbHHc=";
fetchSubmodules = true;
};
cargoHash = "sha256-X7DWJ/3Zqtjgw2s/H+dG8tu8f7/aZVIliloJe2Uz9RE=";
cargoHash = "sha256-hZQxzhq61h83geLazhEkoaB1oRz/xSXuwW7BuBWxfHs=";
nativeBuildInputs = [
pkg-config

View file

@ -12,7 +12,7 @@
}:
stdenvNoCC.mkDerivation rec {
version = "0.5.9";
version = "0.6.2";
pname = "bun";
src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec {
sources = {
"aarch64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
sha256 = "nkXTyJMvGMBz1xiWudLSwl+s7gb750g1oYTvPoY+o0M=";
sha256 = "Zt17kNKVyqql+wHxR+H2peyz3ADj5h506Vg5jJVF6uE=";
};
"aarch64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
sha256 = "pJXwRuokjlwVNLoDajvhIIBzLdYUHZsLxXr98RkC6Hg=";
sha256 = "I8Z0S6th4Iay5/5VPnL+wY0ROUAyOzNPtkOij8KsyMo=";
};
"x86_64-darwin" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
sha256 = "3vx61oBNS9K5kjAitIO3VJ6mVK4vpkAAn6Pur7ogsBA=";
sha256 = "zl5/fihD+if18ykCJV4VBXhqoarSLsIpT+sz1Ba1Xtg=";
};
"x86_64-linux" = fetchurl {
url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
sha256 = "vwxkydYJdnb8MBUAfywpXdaahsuw5IvnXeoUmilzruE=";
sha256 = "aXZzMxsmkFiZgvLv6oZurb4lc6R2/SmJ6GQaZV/kCLw=";
};
};
updateScript = writeShellScript "update-bun" ''

View file

@ -1,5 +1,4 @@
{ lib
, buildFHSEnv
{ buildFHSEnv
, heroic-unwrapped
, extraPkgs ? pkgs: [ ]
, extraLibraries ? pkgs: [ ]
@ -81,7 +80,6 @@ buildFHSEnv {
libpulseaudio
libselinux
libsndfile
libsndfile
libsoup
libtheora
libtiff
@ -108,7 +106,6 @@ buildFHSEnv {
speex
sqlite
udev
udev
unixODBC
util-linux
v4l-utils

View file

@ -10,15 +10,15 @@ let
in
stdenv.mkDerivation rec {
pname = "urbit";
version = "2.3";
version = "2.6";
src = fetchzip {
url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";
sha256 = {
x86_64-linux = "sha256-7rPkEgJdCDkfz58VYOH2AH6s/048pySpmff0tfRkPqU=";
aarch64-linux = "sha256-8P0BNyaV+VxS2cl3ac2Ey7YC1b2A+DbfZZVpaI3agJw=";
x86_64-darwin = "sha256-EHYr3lG2WeHaFjO7CNcz5Ygv5MYzuFcCoX36hEXZVoo=";
aarch64-darwin = "sha256-lPuavLA73NtMC/yS/L1XwPljPnWw+9mcrw4RrqbVrnA=";
x86_64-linux = "sha256-VWlIneEmuqqvk6VHX3ocSPOtRuXiIoVUio7EA7LnEXA=";
aarch64-linux = "sha256-m+IoatTRR9YpkVPE1cs3/TVI31z7Av1wrrBePiaNAHg=";
x86_64-darwin = "sha256-eWQ37vK9Q1xe/Kso7Ru7wKOUwUIvpIWqD4NVc4XdOOg=";
aarch64-darwin = "sha256-N4omwDmJpk8kIX2KDht1WVljnJm2JNXswoLsWWc5zoY=";
}.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
};

View file

@ -11,14 +11,13 @@
}:
let
dep = { pname, version, hash, buildInputs ? [ ] }:
dep = { pname, version, hash, rev ? version, buildInputs ? [ ] }:
stdenv.mkDerivation {
inherit pname version;
src = fetchFromGitHub {
owner = "c-util";
repo = pname;
rev = version;
inherit hash;
inherit hash rev;
};
nativeBuildInputs = [ meson ninja pkg-config ];
inherit buildInputs;
@ -28,13 +27,14 @@ let
#
# If that changes, we can always break them out, but they are essentially
# part of the dbus-broker project, just in separate repositories.
c-dvar = dep { pname = "c-dvar"; version = "v1"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; };
c-ini = dep { pname = "c-ini"; version = "v1"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; };
c-list = dep { pname = "c-list"; version = "v3"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; };
c-rbtree = dep { pname = "c-rbtree"; version = "v3"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; };
c-shquote = dep { pname = "c-shquote"; version = "v1"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; };
c-stdaux = dep { pname = "c-stdaux"; version = "v1"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; };
c-utf8 = dep { pname = "c-utf8"; version = "v1"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; };
c-dvar = dep { pname = "c-dvar"; version = "v1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; };
c-ini = dep { pname = "c-ini"; version = "v1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; };
c-list = dep { pname = "c-list"; version = "v3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; };
# TODO: Fetch c-rbtree from a tag after its next release
c-rbtree = dep { pname = "c-rbtree"; version = "unstable-2022-07-07"; rev = "431a4746705223673e43940ca1ad9b5f52473a4b"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; };
c-shquote = dep { pname = "c-shquote"; version = "v1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; };
c-stdaux = dep { pname = "c-stdaux"; version = "v1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; };
c-utf8 = dep { pname = "c-utf8"; version = "v1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; };
in
stdenv.mkDerivation rec {

View file

@ -1,31 +1,23 @@
{ pkgs
, lib
{ lib
, stdenv
, fetchFromGitHub
, python3Packages
, ffmpeg
, makeWrapper
, nixosTests
, nodejs
, npmHooks
, fetchNpmDeps
# For the update script
, coreutils
, curl
, nix-prefetch-git
, prefetch-npm-deps
, jq
, nodePackages
, writeShellScript
}:
let
nodejs = pkgs.nodejs_14;
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
botamusiqueNodePackages = import ./node-packages.nix {
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
};
srcJson = lib.importJSON ./src.json;
src = fetchFromGitHub {
owner = "azlux";
@ -33,19 +25,23 @@ let
inherit (srcJson) rev sha256;
};
nodeDependencies = (botamusiqueNodePackages.shell.override (old: {
src = src + "/web";
})).nodeDependencies;
# Python needed to instantiate the html templates
buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]);
in
stdenv.mkDerivation rec {
pname = "botamusique";
version = srcJson.version;
inherit src;
npmDeps = fetchNpmDeps {
src = "${src}/web";
hash = srcJson.npmDepsHash;
};
npmRoot = "web";
patches = [
# botamusique by default resolves relative state paths by first checking
# whether it exists in the working directory, then falls back to using the
@ -67,9 +63,12 @@ stdenv.mkDerivation rec {
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
'';
NODE_OPTIONS = "--openssl-legacy-provider";
nativeBuildInputs = [
makeWrapper
nodejs
npmHooks.npmConfigHook
python3Packages.wrapPython
];
@ -91,9 +90,6 @@ stdenv.mkDerivation rec {
# Generates artifacts in ./static
(
cd web
ln -s ${nodeDependencies}/lib/node_modules ./node_modules
export PATH="${nodeDependencies}/bin:$PATH"
npm run build
)
@ -118,36 +114,26 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = pkgs.writeShellScript "botamusique-updater" ''
export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq nodePackages.node2nix ]}
passthru.updateScript = writeShellScript "botamusique-updater" ''
export PATH=${lib.makeBinPath [ coreutils curl nix-prefetch-git jq prefetch-npm-deps ]}
set -ex
OWNER=azlux
REPO=botamusique
VERSION=$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')
VERSION="$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')"
nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \
jq > ${toString ./src.json } \
jq > "${toString ./src.json}" \
--arg version "$VERSION" \
'.version |= $version'
path=$(jq '.path' -r < ${toString ./src.json})
path="$(jq '.path' -r < "${toString ./src.json}")"
tmp=$(mktemp -d)
tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' exit
# botamusique doesn't have a version in its package.json
# But that's needed for node2nix
jq < "$path"/web/package.json > "$tmp/package.json" \
--arg version "$VERSION" \
'.version |= $version'
node2nix \
--input "$tmp"/package.json \
--lock "$path"/web/package-lock.json \
--no-copy-node-env \
--development \
--composition /dev/null \
--output ${toString ./node-packages.nix}
npmHash="$(prefetch-npm-deps $path/web/package-lock.json)"
jq '. + { npmDepsHash: "'"$npmHash"'" }' < "${toString ./src.json}" > "$tmp/src.json"
mv "$tmp/src.json" "${toString ./src.json}"
'';
passthru.tests = {

File diff suppressed because it is too large Load diff

View file

@ -8,5 +8,6 @@
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false,
"version": "7.2.2"
"version": "7.2.2",
"npmDepsHash": "sha256-IzEO7TFqIZUkhNGf0pnHbK/WFexF27RPD9lkYvmFmDw="
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "easysnap";
version = "unstable-2020-04-04";
version = "unstable-2022-06-03";
src = fetchFromGitHub {
owner = "sjau";
repo = "easysnap";
rev = "26f89c0c3cda01e2595ee19ae5fb8518da25b4ef";
sha256 = "1k49k1m7y8s099wyiiz8411i77j1156ncirynmjfyvdhmhcyp5rw";
rev = "5f961442315a6f7eb8ca5b705bd52fe1e6d7dc42";
sha256 = "sha256-jiKdpwuw0Oil0sxUr/3KJ6Nbfxh8DvBei0yy0nRM+Vs=";
};
installPhase = ''

View file

@ -6,17 +6,18 @@
stdenv.mkDerivation {
pname = "apfsprogs";
version = "unstable-2023-03-21";
version = "unstable-2023-05-16";
src = fetchFromGitHub {
owner = "linux-apfs";
repo = "apfsprogs";
rev = "be41cc38194bd41a41750631577e6d8b31953103";
hash = "sha256-9o8DKXyK5qIoVGVKMJxsinEkbJImyuDglf534kanzFE=";
rev = "7be75bcf1a533272bc69684b4b7d33c2adba315c";
hash = "sha256-WHAUrDiXy5HCwN876bZGc/OUHJITf6Fnpx4kAwAhcAs=";
};
buildPhase = ''
runHook preBuild
make -C apfs-snap $makeFlags
make -C apfsck $makeFlags
make -C mkapfs $makeFlags
runHook postBuild
@ -24,6 +25,7 @@ stdenv.mkDerivation {
installPhase = ''
runHook preInstall
make -C apfs-snap install DESTDIR="$out" $installFlags
make -C apfsck install DESTDIR="$out" $installFlags
make -C mkapfs install DESTDIR="$out" $installFlags
runHook postInstall

View file

@ -9,19 +9,19 @@
buildGoModule rec {
pname = "remote-touchpad";
version = "1.4.0";
version = "1.4.1";
src = fetchFromGitHub {
owner = "unrud";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dSBkRBT3crdoO3JB3kVSUDC0faRrxa/R5MF/3a9POxo=";
sha256 = "sha256-3P72DWwDvmlWM73nzbj1UceWv/CNuCu7+LnBDlCDlgo=";
};
buildInputs = [ libXi libXrandr libXt libXtst ];
tags = [ "portal,x11" ];
vendorHash = "sha256-B/nxV9iHebe3v7VM+TTFGnAnPcBICtW+rDyrNNY6Ixw=";
vendorHash = "sha256-SYh1MhJUrJKguR12L3yyxHoBB6ux6a4TUJyPvoYx7iU=";
meta = with lib; {
description = "Control mouse and keyboard from the webbrowser of a smartphone.";

View file

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.5.1";
version = "2023.5.2";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-alJQgAjlxqgKPpmW3nrcUFysh1juHq4YX3t21+gL/nI=";
hash = "sha256-vxmrb4Myj9B0JO3g0kY8cX82xd9YGaSJ3q23o1VTYKU=";
};
postPatch = ''

View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "pipe-rename";
version = "1.6.2";
version = "1.6.3";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-eMTqKKcFeEICref35/RHWNzpnjLDrG7rjcXjOSAnwIo=";
hash = "sha256-vpSzyDswIIKVFEHwTvFvPq3SRoBePHSv4A31rlj4ymU=";
};
cargoSha256 = "sha256-X4wmhyWpjq4EyAVsfdeP76NSC9tcZjZ6woCsRvw0Gzo=";
cargoHash = "sha256-tlG2Vk1YJBZs2mX1/QqIyFqOsnaK9oa+PsYcmKISC4E=";
nativeCheckInputs = [ python3 ];
@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
description = "Rename your files using your favorite text editor";
homepage = "https://github.com/marcusbuffet/pipe-rename";
homepage = "https://github.com/marcusbuffett/pipe-rename";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "renamer";

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "tmux-mem-cpu-load";
version = "3.7.0";
version = "3.8.0";
src = fetchFromGitHub {
owner = "thewtex";
repo = "tmux-mem-cpu-load";
rev = "v${version}";
sha256 = "sha256-4uSCYH31LO/69pxeur8byp9gYG6gaMYIiUxTmd7pag0=";
sha256 = "sha256-dRHV2XF3NFzd4HT9SbRnEn8U40QTnAUJDsM51NA9fEk=";
};
nativeBuildInputs = [ cmake ];

View file

@ -5,17 +5,17 @@
}:
buildGoModule rec {
pname = "dae";
version = "0.1.8";
version = "0.1.9patch1";
src = fetchFromGitHub {
owner = "daeuniverse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-suCs02q6W9Znmb2mS4NOPTn6I8Xxt0fNbToF7HEbKzw=";
sha256 = "sha256-wCcwHXKjSve4SjgRm8DaLrPOumFAiS2Nw1mbOZwEUnk=";
fetchSubmodules = true;
};
vendorHash = "sha256-euTgB660px8J/3D3n+jzyetzzs6uD6yrXGvIgqzQcR0=";
vendorHash = "sha256-4LfnU3UCNhMBloSCUUXrseiUT6esqWFngrGIFjpAjUc=";
proxyVendor = true;

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "saml2aws";
version = "2.36.7";
version = "2.36.8";
src = fetchFromGitHub {
owner = "Versent";
repo = "saml2aws";
rev = "v${version}";
sha256 = "sha256-Z+rudexDydpM/pExs6TvVTm03qIATf7uLRTQZKgBnLw=";
sha256 = "sha256-eBgyjiospcBzUCMSMRgL3V5YyybD6aqt7gQZ7VfrmZY=";
};
vendorHash = "sha256-h4jPaST15EsoWLsnTkO0GQDC+cTySMCyVnWFrdXeVDg=";
vendorHash = "sha256-wepAJ92IZbUZHO0HiX+JOtQ/WKydCImzHytXRUhjhAU=";
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];

View file

@ -5625,6 +5625,8 @@ with pkgs;
osv-scanner = callPackage ../tools/security/osv-scanner { };
otf2bdf = callPackage ../applications/misc/otf2bdf { };
pastel = callPackage ../applications/misc/pastel {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -21050,6 +21052,8 @@ with pkgs;
http-parser = callPackage ../development/libraries/http-parser { };
httpref = callPackage ../development/tools/misc/httpref { };
hubble = callPackage ../applications/networking/cluster/hubble { };
hunspell = callPackage ../development/libraries/hunspell { };

View file

@ -318,6 +318,7 @@ mapAliases ({
weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
websocket_client = websocket-client; # added 2021-06-15
word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxPython_4_2 instead"; # added 2023-03-19
WSME = wsme; # added 2023-02-19

View file

@ -8101,6 +8101,8 @@ self: super: with self; {
py-nightscout = callPackage ../development/python-modules/py-nightscout { };
py-pdf-parser = callPackage ../development/python-modules/py-pdf-parser { };
py-serializable = callPackage ../development/python-modules/py-serializable { };
py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { };
@ -12970,8 +12972,6 @@ self: super: with self; {
woodblock = callPackage ../development/python-modules/woodblock { };
word2vec = callPackage ../development/python-modules/word2vec { };
wordcloud = callPackage ../development/python-modules/wordcloud { };
wordfreq = callPackage ../development/python-modules/wordfreq { };