Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-07-21 12:02:20 +00:00 committed by GitHub
commit 1136a4b3df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 3310 additions and 3162 deletions

View File

@ -44,12 +44,19 @@ let
in stdenv.mkDerivation rec {
pname = "1password";
version = "8.8.0-165.BETA";
version = "8.8.0-215.BETA";
src = fetchurl {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-ZpKAkuIMeHEFdz/od/sKDh8VXoWOZYO8GjvMiho3D4A=";
};
src =
if stdenv.hostPlatform.isAarch64 then
fetchurl {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
sha256 = "sha256-GjLwLeJ6GE39NFIZ+v83xaUVsgrkKRH3xt60aG/XrDg=";
}
else
fetchurl {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-TR0evvu5NNR6Kvqj8JlpYuTcK9Rmf1oDFGrfzrGZzo8=";
};
nativeBuildInputs = [ makeWrapper ];
@ -132,6 +139,6 @@ in stdenv.mkDerivation rec {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ];
platforms = [ "x86_64-linux" ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

View File

@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
patches = [ ./cvc3-2.4.1-gccv6-fix.patch ];
# fails to configure on darwin due to gmp not found
configureFlags = [ "LIBS=-L${gmp}/lib" "CXXFLAGS=-I${gmp.dev}/include" ];
# disable stackprotector on aarch64-darwin for now
# https://github.com/NixOS/nixpkgs/issues/127608
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
postPatch = ''
sed -e "s@ /bin/bash@bash@g" -i Makefile.std
find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,4 @@
{ lib
, fetchpatch
, fetchurl
, buildDunePackage
, ppx_sexp_conv
, base
@ -57,13 +55,6 @@ buildDunePackage {
core
];
# Compatibility with core 0.15. No longer needed after updating cohttp to 5.0.0.
patches = fetchpatch {
url = "https://github.com/mirage/ocaml-cohttp/commit/5a7124478ed31c6b1fa6a9a50602c2ec839083b5.patch";
sha256 = "0i99rl8604xqwb6d0yzk9ws4dflbn0j4hv2nba2qscbqrrn22rw3";
};
patchFlags = "-p1 -F3";
meta = cohttp.meta // {
description = "CoHTTP implementation for the Async concurrency library";
};

View File

@ -1,26 +1,32 @@
{ lib, fetchFromGitHub, buildOasisPackage
{ lib, fetchurl, stdenv
, ocaml, findlib, ocamlbuild
, ctypes, mariadb, libmysqlclient }:
buildOasisPackage rec {
pname = "mariadb";
version = "1.1.4";
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
"mariadb is not available for OCaml ${ocaml.version}"
minimumOCamlVersion = "4.07.0";
stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-mariadb";
version = "1.1.6";
src = fetchFromGitHub {
owner = "andrenth";
repo = "ocaml-mariadb";
rev = version;
sha256 = "1rxqvxr6sv4x2hsi05qm9jz0asaq969m71db4ckl672rcql1kwbr";
src = fetchurl {
url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ mariadb libmysqlclient ];
propagatedBuildInputs = [ ctypes ];
strictDeps = true;
preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
meta = {
description = "OCaml bindings for MariaDB";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcc32 ];
homepage = "https://github.com/andrenth/ocaml-mariadb";
inherit (ocaml.meta) platforms;
};
}

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "0.0.26";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-g2oKxPQogdfS544fYgKBAxvmJgU35A0ewsPQcX1XOJE=";
hash = "sha256-s399GZ/ZuGQcV03NMJMUczEI00m8/xuuFJfzcjuV7T0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "google-cloud-access-context-manager";
version = "0.1.12";
version = "0.1.13";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-OHTuAh8JsKnK9sDkXZbx/P9ElrQRSCGBk83wuhL8qEg=";
hash = "sha256-AnWAJyvLU4vurVv9uJvi2fkl0Sk1nCK5iNxSplxflHs=";
};
propagatedBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.1";
version = "2.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-D66bw014FWGf26rG0e65wg6F/N1bl0z/Uemq+jUxJ74=";
sha256 = "sha256-EIr+u8tfvMFLc2A4dIsaMk3ZlpIU5c3FBqyv3mRRfac=";
};
checkInputs = [

View File

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pydal";
version = "20220609.1";
version = "20220720.1";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-c9cWdQ+V1Phw1cfe5MUif2edXIrFQaDZC9qGBDevedI=";
sha256 = "sha256-cKw3thTqQWsTRqJQD9SyaBVBLM9YIqE/y/gIh4FL1bc=";
};
postPatch = ''

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.6.5";
version = "0.6.6";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
hash = "sha256-DZ5cnzvcYMiqu8WjIfxQV+1uJeSRGK+nupfWtryoF2E=";
hash = "sha256-9t582CuDq7JeCcaPqWZGMUVLx8e78PygfNPp/s7rMA8=";
};
nativeBuildInputs = [

View File

@ -1,10 +1,10 @@
GEM
remote: https://rubygems.org/
specs:
google-protobuf (3.15.6)
pg_query (2.0.2)
google-protobuf (~> 3.15.5)
sqlint (0.2.0)
google-protobuf (3.21.2)
pg_query (2.1.3)
google-protobuf (>= 3.19.2)
sqlint (0.2.1)
pg_query (~> 2)
PLATFORMS
@ -14,4 +14,4 @@ DEPENDENCIES
sqlint
BUNDLED WITH
2.1.4
2.3.9

View File

@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ak5yqqhr04b4x0axzvpw1xzwmxmfcw0gf4r1ijixv15kidhsj3z";
sha256 = "1i5g23mjc4fiwymrfkvgcmsym50rapw7vm988fm46rlpg3zijgl1";
type = "gem";
};
version = "3.15.6";
version = "3.21.2";
};
pg_query = {
dependencies = ["google-protobuf"];
@ -15,10 +15,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y";
sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk";
type = "gem";
};
version = "2.0.2";
version = "2.1.3";
};
sqlint = {
dependencies = ["pg_query"];
@ -26,9 +26,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ylicsc9x4vpj6ff3hmrm6iz1xswrwwgn1m7ri8nx86ij30w9hkk";
sha256 = "1wbsi0ivashmpgavz7j22qns3zcya8j6sd2f9y8hk8bnqx7i3ak0";
type = "gem";
};
version = "0.2.0";
version = "0.2.1";
};
}

View File

@ -2,15 +2,15 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.48";
version = "1.1.49";
src = fetchurl {
# To find new versions, visit
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
# some printer like for instance "WF-7210" to get to the most recent
# version.
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/52/26/977f2b2c13cc185981479fbd225b802c35c92beb/epson-inkjet-printer-escpr2-1.1.48-1lsb3.2.src.rpm";
sha256 = "sha256-E+ZZLt7hdXojQkKr0qgdL+UuSZXAESWW9AHIfAX1jK0=";
url = "https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/16f624dc1dfad10c3b4eb141c50c651a6360f69a/epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm";
sha256 = "sha256-WKDOpS7YL7J/IaNQcTjcoyXNXJGOuEexopdhYFubf50=";
};
unpackPhase = ''

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.7.4";
version = "2022.7.5";
components = {
"abode" = ps: with ps; [
abodepy

View File

@ -177,7 +177,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.7.4";
hassVersion = "2022.7.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -195,7 +195,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-TQsIChMoIlTd8+gN4bxiWFId6V2wB1j3XfhXYpYMw9M=";
hash = "sha256-fUKT9ZSu8dhwapvdjq50t5kh6ZwGsMteuvCjYpPQNx0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220707.0";
version = "20220707.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-ZNaa+YyY77b8Pg462tVewUe+K7ePTflESjZ+ar1cFc4=";
sha256 = "sha256-nsQBMERX4DMm1s3jgDwUzWNnqP44S95AM3+RQ8MdCgI=";
};
# there is nothing to strip in this package

View File

@ -1,6 +1,6 @@
{
"name": "HedgeDoc",
"version": "1.9.0",
"version": "1.9.4",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",
@ -30,25 +30,25 @@
"compression": "^1.6.2",
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^7.1.2",
"cookie": "^0.4.0",
"cookie": "^0.5.0",
"cookie-parser": "^1.4.3",
"deep-freeze": "^0.0.1",
"diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git",
"ejs": "^3.0.0",
"express": ">=4.14",
"express-session": "^1.14.2",
"file-type": "^16.1.0",
"formidable": "^1.0.17",
"file-type": "^17.0.0",
"formidable": "^2.0.0",
"graceful-fs": "^4.1.11",
"helmet": "^4.5.0",
"i18n": "^0.13.0",
"i18n": "^0.15.0",
"is-svg": "^4.3.1",
"jsdom-nogyp": "^0.8.3",
"lodash": "^4.17.20",
"lutim": "^1.0.2",
"lz-string": "git+https://github.com/hackmdio/lz-string.git",
"mariadb": "^2.1.2",
"markdown-it": "^12.0.0",
"mariadb": "^3.0.0",
"markdown-it": "^13.0.0",
"markdown-it-abbr": "^1.0.4",
"markdown-it-container": "^3.0.0",
"markdown-it-deflist": "^2.0.1",
@ -65,12 +65,12 @@
"meta-marked": "git+https://github.com/hedgedoc/meta-marked",
"method-override": "^3.0.0",
"minimist": "^1.2.0",
"minio": "^7.0.19",
"minio": "7.0.29",
"moment": "^2.17.1",
"morgan": "^1.7.0",
"mysql2": "^2.0.0",
"node-fetch": "^2.6.1",
"passport": "^0.4.0",
"passport": "^0.6.0",
"passport-dropbox-oauth2": "^1.1.0",
"passport-facebook": "^3.0.0",
"passport-github": "^1.1.0",
@ -85,7 +85,7 @@
"pdfobject": "^2.0.201604172",
"pg": "^8.2.1",
"pg-hstore": "^2.3.3",
"prom-client": "^13.1.0",
"prom-client": "^14.0.0",
"prometheus-api-metrics": "^3.2.0",
"randomcolor": "^0.6.0",
"readline-sync": "^1.4.7",
@ -94,7 +94,7 @@
"sequelize": "^5.21.1",
"shortid": "2.2.16",
"socket.io": "^2.1.1",
"sqlite3": "^5.0.0",
"sqlite3": "^5.0.8",
"store": "^2.0.12",
"string": "^3.3.3",
"toobusy-js": "^0.5.1",
@ -104,13 +104,8 @@
"winston": "^3.1.0",
"xss": "^1.0.3"
},
"resolutions": {
"**/tough-cookie": "~2.5.0",
"**/minimatch": "^3.0.2",
"**/request": "^2.88.0"
},
"engines": {
"node": ">=12"
"node": "^14.13.1 || 16.x"
},
"bugs": "https://github.com/hedgedoc/hedgedoc/issues",
"keywords": [
@ -139,7 +134,7 @@
"url": "https://github.com/hedgedoc/hedgedoc.git"
},
"devDependencies": {
"abcjs": "5.12.0",
"abcjs": "6.0.3",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-loader": "7.1.5",
@ -153,19 +148,20 @@
"copy-webpack-plugin": "6.4.1",
"css-loader": "5.2.7",
"emojify.js": "1.1.0",
"esbuild-loader": "2.15.1",
"esbuild-loader": "2.19.0",
"escape-html": "1.0.3",
"eslint": "7.32.0",
"eslint-config-standard": "16.0.3",
"eslint-plugin-import": "2.24.2",
"eslint": "8.19.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.2.4",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "5.1.0",
"eslint-plugin-promise": "6.0.0",
"eslint-plugin-standard": "4.1.0",
"exports-loader": "1.1.1",
"expose-loader": "1.0.3",
"file-loader": "6.2.0",
"file-saver": "2.0.5",
"flowchart.js": "1.15.0",
"flowchart.js": "1.17.1",
"fork-awesome": "1.2.0",
"gist-embed": "2.6.0",
"highlight.js": "10.7.3",
@ -174,28 +170,28 @@
"ionicons": "2.0.1",
"jquery": "3.6.0",
"jquery-mousewheel": "3.1.13",
"jquery-ui": "1.12.1",
"jquery-ui": "1.13.1",
"js-cookie": "3.0.1",
"js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git",
"js-yaml": "3.14.1",
"jsonlint": "1.6.3",
"keymaster": "1.6.2",
"less": "4.1.1",
"less": "4.1.3",
"less-loader": "7.3.0",
"list.js": "2.3.1",
"mathjax": "2.7.9",
"mermaid": "8.12.1",
"mermaid": "9.1.3",
"mini-css-extract-plugin": "1.6.2",
"mocha": "9.1.1",
"mocha": "10.0.0",
"mock-require": "3.0.3",
"optimize-css-assets-webpack-plugin": "6.0.1",
"prismjs": "1.24.1",
"prismjs": "1.28.0",
"raphael": "2.3.0",
"remark-cli": "10.0.0",
"remark-preset-lint-markdown-style-guide": "5.0.1",
"remark-cli": "11.0.0",
"remark-preset-lint-markdown-style-guide": "5.1.2",
"reveal.js": "3.9.2",
"select2": "3.5.2-browserify",
"socket.io-client": "2.4.0",
"socket.io-client": "2.5.0",
"spin.js": "4.1.1",
"string-loader": "0.0.1",
"turndown": "7.1.1",
@ -204,7 +200,7 @@
"visibilityjs": "2.0.2",
"viz.js": "1.8.2",
"webpack": "4.46.0",
"webpack-cli": "4.8.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.8.0",
"wurl": "2.5.4"
},

View File

@ -1,5 +1,5 @@
{
"version": "1.9.0",
"srcHash": "hSKQGkI1+68Zf05RhgRKZo47buyobzjhURSZ30/h0PA=",
"yarnHash": "0v51jmmbg8fx66ay2glby0gxw07in95igz325p42g5hjd5kankf6"
"version": "1.9.4",
"srcHash": "0tOuSVz/b9qYNQppsxREY/emG1F3t5jeEhX4ek7Ktgg=",
"yarnHash": "15xakqcgy3amw52p63z9xlbfq2rp6c2ayf46551zx5mnvdp6wz5n"
}

View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github
#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."

File diff suppressed because it is too large Load Diff

View File

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "trivy";
version = "0.29.2";
version = "0.30.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IZ94kYnZ1iNX4sgYF/XvRNvycXJ4fNmRwFgSpYcSopU=";
sha256 = "sha256-9omVpLpQvCbGr4abbJvMZxLgvOezofhMSyducS0jcf8=";
};
vendorSha256 = "sha256-C1dOeVt+ocqj3s3tSXn8B/vHTRRWj8XU5RWmlQ0lZdA=";
vendorSha256 = "sha256-6WDoXyZirSKjSNCzm6MPLJLHhjNG7PEFBZBWukiWhXE=";
excludedPackages = "misc";

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "bash_unit";
version = "1.9.1";
version = "2.0.0";
src = fetchFromGitHub {
owner = "pgrange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TtpVldIAqyv+apXmbI+1L0NgZxoKdc6Ffrl4WOqRI9c=";
sha256 = "sha256-ekkyyp280YRXMuNXbiV78Hrfd/zk2nESE1bRCpUP1eE=";
};
installPhase = ''

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gvproxy";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "containers";
repo = "gvisor-tap-vsock";
rev = "v${version}";
sha256 = "sha256-xoPqgt/d0RyDqkRY+ZhP02nKr3uEu8be0Go2H7JRg3k=";
sha256 = "sha256-mU5uJ/RnVAbL7M1lcBZKjGvfc2WfbJGyZB+65GrAr5M=";
};
vendorSha256 = null;

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.7.3";
version = "2.7.4";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-E0oEB7N1+XyyoGrIgR7IECyKFRV5oDiEwZncVbq5urs=";
sha256 = "sha256-J65NAc0yswIgDPHH26mzx2OqMgcMV4n/gVG77Xe64wg=";
};
vendorSha256 = "sha256-oqM/rOaqL/6un9J9OEconmobvzUwmuz0Hi+C7CR8Yak=";
vendorSha256 = "sha256-ewKKn+P8W/Fl3VaRiTmbA88DyMLJ38CG2rDExSa3oWw=";
modRoot = "./v2";
subPackages = [