Merge staging-next into staging
This commit is contained in:
commit
ef03fda032
@ -130,9 +130,12 @@ rec {
|
||||
|
||||
nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes);
|
||||
|
||||
# TODO: This is an implementation error and needs fixing
|
||||
# the testing famework cannot legitimately restrict hostnames further
|
||||
# beyond RFC1035
|
||||
invalidNodeNames = lib.filter
|
||||
(node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null)
|
||||
(builtins.attrNames nodes);
|
||||
nodeHostNames;
|
||||
|
||||
testScript' =
|
||||
# Call the test script with the computed nodes.
|
||||
@ -146,7 +149,9 @@ rec {
|
||||
Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
|
||||
All machines are referenced as python variables in the testing framework which will break the
|
||||
script when special characters are used.
|
||||
Please stick to alphanumeric chars and underscores as separation.
|
||||
|
||||
This is an IMPLEMENTATION ERROR and needs to be fixed. Meanwhile,
|
||||
please stick to alphanumeric chars and underscores as separation.
|
||||
''
|
||||
else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ fetchurl, lib, pythonPackages, libmms }:
|
||||
{ fetchurl, lib, python2Packages, libmms }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pname = "mimms";
|
||||
version = "3.2";
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL
|
||||
, qtbase, python }:
|
||||
, qtbase, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = let
|
||||
options = {
|
||||
PYTHON_EXECUTABLE = "${python}/bin/python";
|
||||
PYTHON_EXECUTABLE = "${python3.interpreter}";
|
||||
NANO_SHARED_BOOST = "ON";
|
||||
BOOST_ROOT = boost;
|
||||
RAIBLOCKS_GUI = "ON";
|
||||
@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [ boost libGL qtbase ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
make nano_wallet
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "447";
|
||||
version = "448";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "v${version}";
|
||||
sha256 = "0a9nrsbw3w1229bm90xayixvkpvr6g338w64x4v75sqxvpbx84lz";
|
||||
sha256 = "sha256-h7FQRgxqXDEXDFRQEPeJUIbJYf9fs68oUQv5rCUS0zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
|
||||
, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
|
||||
, cmake, ninja, libGLU, libGL, zlib, python2, expat, libxml2, libsigcxx, libuuid, freetype
|
||||
, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff
|
||||
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
|
||||
|
||||
buildInputs = [
|
||||
libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng
|
||||
libGLU libGL zlib python2 expat libxml2 libsigcxx libuuid freetype libpng
|
||||
boost cairomm libjpeg libtiff
|
||||
ftgl glew gtkmm2 glibmm gtkglext libXmu
|
||||
];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, openssl }:
|
||||
|
||||
let
|
||||
version = "6.4.16";
|
||||
version = "6.4.20";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "fetchmail";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
|
||||
sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k=";
|
||||
sha256 = "0xk171sbxcwjh1ibpipryw5sv4sy7jjfvhn5n373j04g5sp428f8";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.2.6";
|
||||
version = "0.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y=";
|
||||
sha256 = "1YVOyaHDcv+GKx5nQq3cUrViKZ6CEuHQPiDvK0Jv+Qc=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, lib, mkDerivation, pkg-config, python, file, bc
|
||||
{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc
|
||||
, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost
|
||||
}:
|
||||
|
||||
@ -14,7 +14,7 @@ mkDerivation rec {
|
||||
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
qtbase qtsvg python file/*for libmagic*/ bc
|
||||
qtbase qtsvg python3 file/*for libmagic*/ bc
|
||||
hunspell makeWrapper # enchant
|
||||
];
|
||||
|
||||
@ -31,7 +31,7 @@ mkDerivation rec {
|
||||
|
||||
# python is run during runtime to do various tasks
|
||||
qtWrapperArgs = [
|
||||
" --prefix PATH : ${python}/bin"
|
||||
" --prefix PATH : ${python3}/bin"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, fetchurl, pythonPackages }:
|
||||
{ lib, fetchurl, python2Packages }:
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pname = "menumaker";
|
||||
version = "0.99.12";
|
||||
|
||||
|
@ -26,13 +26,13 @@ let
|
||||
in
|
||||
python3'.pkgs.buildPythonPackage rec {
|
||||
pname = "privacyIDEA";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg=";
|
||||
sha256 = "sha256-kv6XqsbGkaGEhfNxSOjCe6JbFOJnuqwM8CR/J9lJjks=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -11,11 +11,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d";
|
||||
sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
|
@ -37,7 +37,6 @@
|
||||
, ortp
|
||||
, pango
|
||||
, pkg-config
|
||||
, python
|
||||
, qtbase
|
||||
, qtgraphicaleffects
|
||||
, qtquickcontrols2
|
||||
|
@ -28,7 +28,7 @@ let
|
||||
else "");
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.10.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.11.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "049i4nypqr6lx8f3w32pia6cfb3pmqmvasxjb5zhp6mxb3vn7wz3";
|
||||
sha256 = "17r7apmsz5bvcfnf81m6jjsj17a4h7bhgy1vllwyyvaa585nspmp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -44,14 +44,14 @@ let
|
||||
|
||||
pname = "slack";
|
||||
|
||||
x86_64-darwin-version = "4.17.0";
|
||||
x86_64-darwin-sha256 = "0r5cafxw73qnn14ljprn7w8bfn67zbkcniq60k9pf2zbqgb4cyj9";
|
||||
x86_64-darwin-version = "4.18.0";
|
||||
x86_64-darwin-sha256 = "1qldmh0xdbl18gvxxsi2jvcq1ziwap3naxgax4gn36x5k25ipw5k";
|
||||
|
||||
x86_64-linux-version = "4.17.0";
|
||||
x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi";
|
||||
x86_64-linux-version = "4.18.0";
|
||||
x86_64-linux-sha256 = "1dhdmi2rvww8m6400c5dc0c6mrircvflgwcja2rr7ry0lv98n6kh";
|
||||
|
||||
aarch64-darwin-version = "4.17.0";
|
||||
aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46";
|
||||
aarch64-darwin-version = "4.18.0";
|
||||
aarch64-darwin-sha256 = "0qlfxskqq5gr45p1gfc2jcbr1abhc6di653jwjgh7yibim0hpjab";
|
||||
|
||||
version = {
|
||||
x86_64-darwin = x86_64-darwin-version;
|
||||
|
@ -18,13 +18,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.3.2";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-qqpdMBDcVfXm/KB54zv23O8raGqBhAKqXo6Kj2VaI8w=";
|
||||
sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python, makeWrapper, autoreconfHook
|
||||
{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook
|
||||
, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false
|
||||
}:
|
||||
|
||||
@ -6,9 +6,11 @@ let
|
||||
name = "maxima";
|
||||
version = "5.44.0";
|
||||
|
||||
lisp-compiler = if ecl-fasl then ecl else sbcl;
|
||||
|
||||
searchPath =
|
||||
lib.makeBinPath
|
||||
(lib.filter (x: x != null) [ sbcl ecl rlwrap tk gnuplot ]);
|
||||
(lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]);
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
inherit version;
|
||||
@ -19,11 +21,18 @@ stdenv.mkDerivation ({
|
||||
sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
lisp-compiler
|
||||
makeWrapper
|
||||
python3
|
||||
texinfo
|
||||
];
|
||||
|
||||
buildInputs = lib.filter (x: x != null) [
|
||||
sbcl ecl texinfo perl python makeWrapper
|
||||
gnuplot # required in the test suite
|
||||
strictDeps = true;
|
||||
|
||||
checkInputs = [
|
||||
gnuplot
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,13 +1,13 @@
|
||||
{
|
||||
"version": "14.0.5",
|
||||
"repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs",
|
||||
"version": "14.1.0",
|
||||
"repo_hash": "1a61jc8rsbdbyh891nwygl7qlsj0lm8v59s66hn22csg0dvn6qk6",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v14.0.5-ee",
|
||||
"rev": "v14.1.0-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "14.0.5",
|
||||
"GITLAB_PAGES_VERSION": "1.40.0",
|
||||
"GITALY_SERVER_VERSION": "14.1.0",
|
||||
"GITLAB_PAGES_VERSION": "1.41.0",
|
||||
"GITLAB_SHELL_VERSION": "13.19.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "14.0.5"
|
||||
"GITLAB_WORKHORSE_VERSION": "14.1.0"
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
||||
gem 'rugged', '~> 1.1'
|
||||
gem 'github-linguist', '~> 7.12', require: 'linguist'
|
||||
gem 'gitlab-markup', '~> 1.7.1'
|
||||
gem 'activesupport', '~> 6.0.3.6'
|
||||
gem 'activesupport', '~> 6.1.3.2'
|
||||
gem 'rdoc', '~> 6.0'
|
||||
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
|
||||
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
|
||||
@ -13,13 +13,13 @@ gem 'faraday', '~> 1.0'
|
||||
gem 'rbtrace', require: false
|
||||
|
||||
# Labkit provides observability functionality
|
||||
gem 'gitlab-labkit', '~> 0.17.1'
|
||||
gem 'gitlab-labkit', '~> 0.20.0'
|
||||
|
||||
# Detects the open source license the repository includes
|
||||
# This version needs to be in sync with GitLab CE/EE
|
||||
gem 'licensee', '~> 9.14.1'
|
||||
|
||||
gem 'google-protobuf', '~> 3.14.0'
|
||||
gem 'google-protobuf', '~> 3.17.0'
|
||||
|
||||
group :development, :test do
|
||||
gem 'rubocop', '~> 0.69', require: false
|
||||
|
@ -2,25 +2,25 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
abstract_type (0.0.7)
|
||||
actionpack (6.0.3.6)
|
||||
actionview (= 6.0.3.6)
|
||||
activesupport (= 6.0.3.6)
|
||||
rack (~> 2.0, >= 2.0.8)
|
||||
actionpack (6.1.3.2)
|
||||
actionview (= 6.1.3.2)
|
||||
activesupport (= 6.1.3.2)
|
||||
rack (~> 2.0, >= 2.0.9)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||
actionview (6.0.3.6)
|
||||
activesupport (= 6.0.3.6)
|
||||
actionview (6.1.3.2)
|
||||
activesupport (= 6.1.3.2)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||
activesupport (6.0.3.6)
|
||||
activesupport (6.1.3.2)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
tzinfo (~> 1.1)
|
||||
zeitwerk (~> 2.2, >= 2.2.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
@ -34,7 +34,7 @@ GEM
|
||||
concord (0.1.5)
|
||||
adamantium (~> 0.2.0)
|
||||
equalizer (~> 0.0.9)
|
||||
concurrent-ruby (1.1.8)
|
||||
concurrent-ruby (1.1.9)
|
||||
crass (1.0.6)
|
||||
diff-lcs (1.3)
|
||||
dotenv (2.7.6)
|
||||
@ -45,7 +45,7 @@ GEM
|
||||
activesupport (>= 4.2.0)
|
||||
faraday (1.0.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.13.1)
|
||||
ffi (1.15.3)
|
||||
gemojione (3.3.0)
|
||||
json
|
||||
github-linguist (7.12.1)
|
||||
@ -65,16 +65,16 @@ GEM
|
||||
gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
|
||||
mime-types (>= 1.15)
|
||||
rugged (~> 1.0)
|
||||
gitlab-labkit (0.17.1)
|
||||
gitlab-labkit (0.20.0)
|
||||
actionpack (>= 5.0.0, < 7.0.0)
|
||||
activesupport (>= 5.0.0, < 7.0.0)
|
||||
grpc (~> 1.19)
|
||||
jaeger-client (~> 1.1)
|
||||
opentracing (~> 0.4)
|
||||
pg_query (~> 2.0)
|
||||
pg_query (~> 2.1)
|
||||
redis (> 3.0.0, < 5.0.0)
|
||||
gitlab-markup (1.7.1)
|
||||
google-protobuf (3.14.0)
|
||||
google-protobuf (3.17.3)
|
||||
googleapis-common-protos-types (1.0.5)
|
||||
google-protobuf (~> 3.11)
|
||||
grpc (1.30.2)
|
||||
@ -94,7 +94,7 @@ GEM
|
||||
reverse_markdown (~> 1.0)
|
||||
rugged (>= 0.24, < 2.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
loofah (2.9.1)
|
||||
loofah (2.10.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
memoizable (0.4.2)
|
||||
@ -105,7 +105,7 @@ GEM
|
||||
mime-types-data (3.2020.1104)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.5.1)
|
||||
minitest (5.14.2)
|
||||
minitest (5.14.4)
|
||||
msgpack (1.3.3)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.11.5)
|
||||
@ -121,8 +121,8 @@ GEM
|
||||
parallel (1.19.2)
|
||||
parser (2.7.2.0)
|
||||
ast (~> 2.4.1)
|
||||
pg_query (2.0.3)
|
||||
google-protobuf (~> 3.15.5)
|
||||
pg_query (2.1.0)
|
||||
google-protobuf (>= 3.17.1)
|
||||
proc_to_ast (0.1.0)
|
||||
coderay
|
||||
parser
|
||||
@ -199,8 +199,8 @@ GEM
|
||||
thread_safe (0.3.6)
|
||||
thrift (0.14.1)
|
||||
timecop (0.9.1)
|
||||
tzinfo (1.2.9)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
unicode-display_width (1.7.0)
|
||||
unparser (0.4.7)
|
||||
abstract_type (~> 0.0.7)
|
||||
@ -216,15 +216,15 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
activesupport (~> 6.0.3.6)
|
||||
activesupport (~> 6.1.3.2)
|
||||
factory_bot
|
||||
faraday (~> 1.0)
|
||||
github-linguist (~> 7.12)
|
||||
gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
|
||||
gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
|
||||
gitlab-labkit (~> 0.17.1)
|
||||
gitlab-labkit (~> 0.20.0)
|
||||
gitlab-markup (~> 1.7.1)
|
||||
google-protobuf (~> 3.14.0)
|
||||
google-protobuf (~> 3.17.0)
|
||||
grpc (~> 1.30.2)
|
||||
grpc-tools (= 1.30.2)
|
||||
licensee (~> 9.14.1)
|
||||
|
@ -21,17 +21,17 @@ let
|
||||
};
|
||||
};
|
||||
in buildGoModule rec {
|
||||
version = "14.0.5";
|
||||
version = "14.1.0";
|
||||
pname = "gitaly";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM=";
|
||||
sha256 = "sha256-k9Vz/b5ZKz93/7nzEA5mnQI8U++CB3E9b8gJBefl2b0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I=";
|
||||
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
|
||||
|
||||
passthru = {
|
||||
inherit rubyEnv;
|
||||
|
@ -13,10 +13,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz";
|
||||
sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.3.6";
|
||||
version = "6.1.3.2";
|
||||
};
|
||||
actionview = {
|
||||
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
|
||||
@ -24,10 +24,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5";
|
||||
sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.3.6";
|
||||
version = "6.1.3.2";
|
||||
};
|
||||
activesupport = {
|
||||
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
|
||||
@ -35,10 +35,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z";
|
||||
sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.3.6";
|
||||
version = "6.1.3.2";
|
||||
};
|
||||
adamantium = {
|
||||
dependencies = ["ice_nine" "memoizable"];
|
||||
@ -122,10 +122,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
@ -208,10 +208,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
|
||||
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.1";
|
||||
version = "1.15.3";
|
||||
};
|
||||
gemojione = {
|
||||
dependencies = ["json"];
|
||||
@ -269,10 +269,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469";
|
||||
sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.17.1";
|
||||
version = "0.20.0";
|
||||
};
|
||||
gitlab-markup = {
|
||||
groups = ["default"];
|
||||
@ -289,10 +289,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
|
||||
sha256 = "0vmll4nnkha3vsqj1g76pwni6x7mp2i81pka4wdwq8qfhn210108";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.14.0";
|
||||
version = "3.17.3";
|
||||
};
|
||||
googleapis-common-protos-types = {
|
||||
dependencies = ["google-protobuf"];
|
||||
@ -383,10 +383,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
|
||||
sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.1";
|
||||
version = "2.10.0";
|
||||
};
|
||||
memoizable = {
|
||||
dependencies = ["thread_safe"];
|
||||
@ -451,10 +451,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
|
||||
sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.14.2";
|
||||
version = "5.14.4";
|
||||
};
|
||||
msgpack = {
|
||||
groups = ["default"];
|
||||
@ -554,10 +554,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag";
|
||||
sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.3";
|
||||
version = "2.1.0";
|
||||
};
|
||||
proc_to_ast = {
|
||||
dependencies = ["coderay" "parser" "unparser"];
|
||||
@ -913,15 +913,15 @@
|
||||
version = "0.9.1";
|
||||
};
|
||||
tzinfo = {
|
||||
dependencies = ["thread_safe"];
|
||||
dependencies = ["concurrent-ruby"];
|
||||
groups = ["default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
|
||||
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.9";
|
||||
version = "2.0.4";
|
||||
};
|
||||
unicode-display_width = {
|
||||
groups = ["default" "development" "test"];
|
||||
|
@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.0.5";
|
||||
version = "14.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
@ -35,7 +35,7 @@ gem 'rexml', '~> 3.2.5'
|
||||
gem 'ruby-saml', '~> 1.12.1'
|
||||
gem 'omniauth', '~> 1.8'
|
||||
gem 'omniauth-auth0', '~> 2.0.0'
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 0.1'
|
||||
gem 'omniauth-azure-activedirectory-v2', '~> 1.0'
|
||||
gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version
|
||||
gem 'omniauth-cas3', '~> 1.1.4'
|
||||
gem 'omniauth-facebook', '~> 4.0.0'
|
||||
@ -124,7 +124,7 @@ gem 'fog-aws', '~> 3.9'
|
||||
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
|
||||
# Also see config/initializers/fog_core_patch.rb.
|
||||
gem 'fog-core', '= 2.1.0'
|
||||
gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
|
||||
gem 'fog-google', '~> 1.15', require: 'fog/google'
|
||||
gem 'fog-local', '~> 0.6'
|
||||
gem 'fog-openstack', '~> 1.0'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
@ -157,14 +157,14 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup'
|
||||
gem 'commonmarker', '~> 0.21'
|
||||
gem 'kramdown', '~> 2.3.1'
|
||||
gem 'RedCloth', '~> 4.3.2'
|
||||
gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695
|
||||
gem 'rdoc', '~> 6.3.2'
|
||||
gem 'org-ruby', '~> 0.9.12'
|
||||
gem 'creole', '~> 0.5.0'
|
||||
gem 'wikicloth', '0.8.1'
|
||||
gem 'asciidoctor', '~> 2.0.10'
|
||||
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
|
||||
gem 'asciidoctor-plantuml', '~> 0.0.12'
|
||||
gem 'asciidoctor-kroki', '~> 0.4.0', require: false
|
||||
gem 'asciidoctor-kroki', '~> 0.5.0', require: false
|
||||
gem 'rouge', '~> 3.26.0'
|
||||
gem 'truncato', '~> 0.7.11'
|
||||
gem 'bootstrap_form', '~> 4.2.0'
|
||||
@ -197,7 +197,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
|
||||
# Background jobs
|
||||
gem 'sidekiq', '~> 5.2.7'
|
||||
gem 'sidekiq-cron', '~> 1.0'
|
||||
gem 'redis-namespace', '~> 1.7.0'
|
||||
gem 'redis-namespace', '~> 1.8.1'
|
||||
gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'
|
||||
|
||||
# Cron Parser
|
||||
@ -229,7 +229,7 @@ gem 'js_regex', '~> 3.4'
|
||||
gem 'device_detector'
|
||||
|
||||
# Redis
|
||||
gem 'redis', '~> 4.0'
|
||||
gem 'redis', '~> 4.1.4'
|
||||
gem 'connection_pool', '~> 2.0'
|
||||
|
||||
# Redis session store
|
||||
@ -258,7 +258,7 @@ gem 'asana', '~> 0.10.3'
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# Kubernetes integration
|
||||
gem 'kubeclient', '~> 4.9.1'
|
||||
gem 'kubeclient', '~> 4.9.2'
|
||||
|
||||
# Sanitize user input
|
||||
gem 'sanitize', '~> 5.2.1'
|
||||
@ -286,16 +286,16 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2'
|
||||
gem 'rack-proxy', '~> 0.6.0'
|
||||
|
||||
gem 'sassc-rails', '~> 2.1.0'
|
||||
gem 'autoprefixer-rails', '10.2.0.0'
|
||||
gem 'autoprefixer-rails', '10.2.5.1'
|
||||
gem 'terser', '1.0.2'
|
||||
|
||||
gem 'addressable', '~> 2.7'
|
||||
gem 'addressable', '~> 2.8'
|
||||
gem 'gemojione', '~> 3.3'
|
||||
gem 'gon', '~> 6.4.0'
|
||||
gem 'request_store', '~> 1.5'
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
gem 'gitlab-license', '~> 1.5'
|
||||
gem 'gitlab-license', '~> 2.0'
|
||||
|
||||
# Protect against bruteforcing
|
||||
gem 'rack-attack', '~> 6.3.0'
|
||||
@ -305,16 +305,12 @@ gem 'sentry-raven', '~> 3.1'
|
||||
|
||||
# PostgreSQL query parsing
|
||||
#
|
||||
# We need this fork until https://github.com/pganalyze/pg_query/pull/212
|
||||
# and https://github.com/pganalyze/pg_query/pull/213 are
|
||||
# released. gitlab-labkit will need to be updated to use the pg_query
|
||||
# version.
|
||||
gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
|
||||
gem 'pg_query', '~> 2.1'
|
||||
|
||||
gem 'premailer-rails', '~> 1.10.3'
|
||||
|
||||
# LabKit: Tracing and Correlation
|
||||
gem 'gitlab-labkit', '~> 0.18.0'
|
||||
gem 'gitlab-labkit', '~> 0.20.0'
|
||||
# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
|
||||
# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
|
||||
gem 'thrift', '>= 0.14.0'
|
||||
@ -335,13 +331,9 @@ gem 'peek', '~> 1.1'
|
||||
gem 'snowplow-tracker', '~> 0.6.1'
|
||||
|
||||
# Metrics
|
||||
group :metrics do
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
gem 'webrick', '~> 1.6.1', require: false
|
||||
|
||||
# Prometheus
|
||||
gem 'prometheus-client-mmap', '~> 0.12.0'
|
||||
end
|
||||
gem 'method_source', '~> 1.0', require: false
|
||||
gem 'webrick', '~> 1.6.1', require: false
|
||||
gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
|
||||
|
||||
group :development do
|
||||
gem 'lefthook', '~> 0.7.0', require: false
|
||||
@ -402,7 +394,7 @@ group :development, :test do
|
||||
end
|
||||
|
||||
group :development, :test, :danger do
|
||||
gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
|
||||
gem 'gitlab-dangerfiles', '~> 2.2.2', require: false
|
||||
end
|
||||
|
||||
group :development, :test, :coverage do
|
||||
@ -480,7 +472,7 @@ end
|
||||
gem 'spamcheck', '~> 0.1.0'
|
||||
|
||||
# Gitaly GRPC protocol definitions
|
||||
gem 'gitaly', '~> 14.0.0.pre.rc2'
|
||||
gem 'gitaly', '~> 14.1.0.pre.rc3'
|
||||
|
||||
# KAS GRPC protocol definitions
|
||||
gem 'kas-grpc', '~> 0.0.2'
|
||||
@ -489,14 +481,14 @@ gem 'grpc', '~> 1.30.2'
|
||||
|
||||
gem 'google-protobuf', '~> 3.17.1'
|
||||
|
||||
gem 'toml-rb', '~> 1.0.0'
|
||||
gem 'toml-rb', '~> 2.0'
|
||||
|
||||
# Feature toggles
|
||||
gem 'flipper', '~> 0.21.0'
|
||||
gem 'flipper-active_record', '~> 0.21.0'
|
||||
gem 'flipper-active_support_cache_store', '~> 0.21.0'
|
||||
gem 'unleash', '~> 0.1.5'
|
||||
gem 'gitlab-experiment', '~> 0.5.4'
|
||||
gem 'gitlab-experiment', '~> 0.6.1'
|
||||
|
||||
# Structured logging
|
||||
gem 'lograge', '~> 0.5'
|
||||
|
@ -72,7 +72,7 @@ GEM
|
||||
adamantium (0.2.0)
|
||||
ice_nine (~> 0.11.0)
|
||||
memoizable (~> 0.4.0)
|
||||
addressable (2.7.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
aes_key_wrap (1.1.0)
|
||||
akismet (3.0.0)
|
||||
@ -85,10 +85,10 @@ GEM
|
||||
faraday_middleware (~> 1.0)
|
||||
faraday_middleware-multi_json (~> 0.0)
|
||||
oauth2 (~> 1.4)
|
||||
asciidoctor (2.0.12)
|
||||
asciidoctor (2.0.15)
|
||||
asciidoctor-include-ext (0.3.1)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
asciidoctor-kroki (0.4.0)
|
||||
asciidoctor-kroki (0.5.0)
|
||||
asciidoctor (~> 2.0)
|
||||
asciidoctor-plantuml (0.0.12)
|
||||
asciidoctor (>= 1.5.6, < 3.0.0)
|
||||
@ -98,9 +98,9 @@ GEM
|
||||
attr_encrypted (3.1.0)
|
||||
encryptor (~> 3.0.0)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (10.2.0.0)
|
||||
execjs
|
||||
awesome_print (1.8.0)
|
||||
autoprefixer-rails (10.2.5.1)
|
||||
execjs (> 0)
|
||||
awesome_print (1.9.2)
|
||||
awrence (1.1.1)
|
||||
aws-eventstream (1.1.0)
|
||||
aws-partitions (1.345.0)
|
||||
@ -222,7 +222,7 @@ GEM
|
||||
css_parser (1.7.0)
|
||||
addressable
|
||||
daemons (1.3.1)
|
||||
danger (8.2.3)
|
||||
danger (8.3.1)
|
||||
claide (~> 1.0)
|
||||
claide-plugins (>= 0.9.2)
|
||||
colored2 (~> 3.1)
|
||||
@ -336,7 +336,7 @@ GEM
|
||||
tzinfo
|
||||
eventmachine (1.2.7)
|
||||
excon (0.71.1)
|
||||
execjs (2.7.0)
|
||||
execjs (2.8.1)
|
||||
expression_parser (0.9.0)
|
||||
extended-markdown-filter (0.6.0)
|
||||
html-pipeline (~> 2.0)
|
||||
@ -374,7 +374,7 @@ GEM
|
||||
fast_blank (1.0.0)
|
||||
fast_gettext (1.6.0)
|
||||
ffaker (2.10.0)
|
||||
ffi (1.15.1)
|
||||
ffi (1.15.3)
|
||||
ffi-compiler (1.0.1)
|
||||
ffi (>= 1.0.0)
|
||||
rake
|
||||
@ -405,6 +405,12 @@ GEM
|
||||
excon (~> 0.58)
|
||||
formatador (~> 0.2)
|
||||
mime-types
|
||||
fog-google (1.15.0)
|
||||
fog-core (<= 2.1.0)
|
||||
fog-json (~> 1.2)
|
||||
fog-xml (~> 0.1.0)
|
||||
google-api-client (>= 0.44.2, < 0.51)
|
||||
google-cloud-env (~> 1.2)
|
||||
fog-json (1.2.0)
|
||||
fog-core
|
||||
multi_json (~> 1.10)
|
||||
@ -447,7 +453,7 @@ GEM
|
||||
rails (>= 3.2.0)
|
||||
git (1.7.0)
|
||||
rchardet (~> 1.8)
|
||||
gitaly (14.0.0.pre.rc2)
|
||||
gitaly (14.1.0.pre.rc3)
|
||||
grpc (~> 1.0)
|
||||
github-markup (1.7.0)
|
||||
gitlab (4.16.1)
|
||||
@ -455,9 +461,10 @@ GEM
|
||||
terminal-table (~> 1.5, >= 1.5.1)
|
||||
gitlab-chronic (0.10.5)
|
||||
numerizer (~> 0.2)
|
||||
gitlab-dangerfiles (2.1.2)
|
||||
danger-gitlab
|
||||
gitlab-experiment (0.5.4)
|
||||
gitlab-dangerfiles (2.2.2)
|
||||
danger (>= 8.3.1)
|
||||
danger-gitlab (>= 8.0.0)
|
||||
gitlab-experiment (0.6.1)
|
||||
activesupport (>= 3.0)
|
||||
request_store (>= 1.0)
|
||||
scientist (~> 1.6, >= 1.6.0)
|
||||
@ -468,22 +475,15 @@ GEM
|
||||
fog-json (~> 1.2.0)
|
||||
mime-types
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
gitlab-fog-google (1.13.0)
|
||||
addressable (>= 2.7.0)
|
||||
fog-core (<= 2.1.0)
|
||||
fog-json (~> 1.2)
|
||||
fog-xml (~> 0.1.0)
|
||||
google-api-client (>= 0.44.2, < 0.51)
|
||||
google-cloud-env (~> 1.2)
|
||||
gitlab-labkit (0.18.0)
|
||||
gitlab-labkit (0.20.0)
|
||||
actionpack (>= 5.0.0, < 7.0.0)
|
||||
activesupport (>= 5.0.0, < 7.0.0)
|
||||
gitlab-pg_query (~> 2.0)
|
||||
grpc (~> 1.19)
|
||||
jaeger-client (~> 1.1)
|
||||
opentracing (~> 0.4)
|
||||
pg_query (~> 2.1)
|
||||
redis (> 3.0.0, < 5.0.0)
|
||||
gitlab-license (1.5.0)
|
||||
gitlab-license (2.0.0)
|
||||
gitlab-mail_room (0.0.9)
|
||||
gitlab-markup (1.7.1)
|
||||
gitlab-net-dns (0.9.1)
|
||||
@ -491,9 +491,6 @@ GEM
|
||||
addressable (~> 2.7)
|
||||
omniauth (~> 1.9)
|
||||
openid_connect (~> 1.2)
|
||||
gitlab-pg_query (2.0.4)
|
||||
google-protobuf (>= 3.17.1)
|
||||
gitlab-rdoc (6.3.2)
|
||||
gitlab-sidekiq-fetcher (0.5.6)
|
||||
sidekiq (~> 5)
|
||||
gitlab-styles (6.2.0)
|
||||
@ -525,7 +522,7 @@ GEM
|
||||
retriable (>= 2.0, < 4.0)
|
||||
rexml
|
||||
signet (~> 0.12)
|
||||
google-cloud-env (1.4.0)
|
||||
google-cloud-env (1.5.0)
|
||||
faraday (>= 0.17.3, < 2.0)
|
||||
google-protobuf (3.17.1)
|
||||
googleapis-common-protos-types (1.0.6)
|
||||
@ -611,7 +608,7 @@ GEM
|
||||
hana (1.3.6)
|
||||
hangouts-chat (0.0.5)
|
||||
hashdiff (1.0.1)
|
||||
hashie (3.6.0)
|
||||
hashie (4.1.0)
|
||||
hashie-forbidden_attributes (0.1.1)
|
||||
hashie (>= 3.0)
|
||||
health_check (3.0.0)
|
||||
@ -671,9 +668,8 @@ GEM
|
||||
hana (~> 1.3)
|
||||
regexp_parser (~> 1.5)
|
||||
uri_template (~> 0.7)
|
||||
jsonpath (1.0.5)
|
||||
jsonpath (1.1.0)
|
||||
multi_json
|
||||
to_regexp (~> 0.2.1)
|
||||
jwt (2.1.0)
|
||||
kaminari (1.2.1)
|
||||
activesupport (>= 4.1.0)
|
||||
@ -695,7 +691,7 @@ GEM
|
||||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
kubeclient (4.9.1)
|
||||
kubeclient (4.9.2)
|
||||
http (>= 3.0, < 5.0)
|
||||
jsonpath (~> 1.0)
|
||||
recursive-open-struct (~> 1.1, >= 1.1.1)
|
||||
@ -755,7 +751,7 @@ GEM
|
||||
mini_histogram (0.3.1)
|
||||
mini_magick (4.10.1)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.5.0)
|
||||
mini_portile2 (2.5.1)
|
||||
minitest (5.11.3)
|
||||
mixlib-cli (2.1.8)
|
||||
mixlib-config (3.0.9)
|
||||
@ -793,7 +789,7 @@ GEM
|
||||
netrc (0.11.0)
|
||||
nio4r (2.5.4)
|
||||
no_proxy_fix (0.1.2)
|
||||
nokogiri (1.11.4)
|
||||
nokogiri (1.11.5)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
nokogumbo (2.0.2)
|
||||
@ -803,7 +799,7 @@ GEM
|
||||
shellany (~> 0.0)
|
||||
numerizer (0.2.0)
|
||||
oauth (0.5.4)
|
||||
oauth2 (1.4.4)
|
||||
oauth2 (1.4.7)
|
||||
faraday (>= 0.8, < 2.0)
|
||||
jwt (>= 1.0, < 3.0)
|
||||
multi_json (~> 1.3)
|
||||
@ -826,8 +822,8 @@ GEM
|
||||
train-core
|
||||
wmi-lite (~> 1.0)
|
||||
oj (3.10.6)
|
||||
omniauth (1.9.0)
|
||||
hashie (>= 3.4.6, < 3.7.0)
|
||||
omniauth (1.9.1)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
omniauth-atlassian-oauth2 (0.2.0)
|
||||
omniauth (>= 1.1.1)
|
||||
@ -837,8 +833,8 @@ GEM
|
||||
omniauth-authentiq (0.3.3)
|
||||
jwt (>= 1.5)
|
||||
omniauth-oauth2 (>= 1.5)
|
||||
omniauth-azure-activedirectory-v2 (0.1.1)
|
||||
omniauth-oauth2
|
||||
omniauth-azure-activedirectory-v2 (1.0.0)
|
||||
omniauth-oauth2 (~> 1.7)
|
||||
omniauth-azure-oauth2 (0.0.10)
|
||||
jwt (>= 1.0, < 3.0)
|
||||
omniauth (~> 1.0)
|
||||
@ -867,9 +863,9 @@ GEM
|
||||
omniauth-oauth (1.1.0)
|
||||
oauth
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (1.6.0)
|
||||
oauth2 (~> 1.1)
|
||||
omniauth (~> 1.9)
|
||||
omniauth-oauth2 (1.7.1)
|
||||
oauth2 (~> 1.4)
|
||||
omniauth (>= 1.9, < 3)
|
||||
omniauth-oauth2-generic (0.2.2)
|
||||
omniauth-oauth2 (~> 1.0)
|
||||
omniauth-salesforce (1.0.5)
|
||||
@ -915,6 +911,8 @@ GEM
|
||||
peek (1.1.0)
|
||||
railties (>= 4.0.0)
|
||||
pg (1.2.3)
|
||||
pg_query (2.1.0)
|
||||
google-protobuf (>= 3.17.1)
|
||||
plist (3.6.0)
|
||||
png_quantizator (0.2.1)
|
||||
po_to_json (1.0.1)
|
||||
@ -1018,11 +1016,12 @@ GEM
|
||||
msgpack (>= 0.4.3)
|
||||
optimist (>= 3.0.0)
|
||||
rchardet (1.8.0)
|
||||
rdoc (6.3.2)
|
||||
re2 (1.2.0)
|
||||
recaptcha (4.13.1)
|
||||
json
|
||||
recursive-open-struct (1.1.2)
|
||||
redis (4.1.3)
|
||||
recursive-open-struct (1.1.3)
|
||||
redis (4.1.4)
|
||||
redis-actionpack (5.2.0)
|
||||
actionpack (>= 5, < 7)
|
||||
redis-rack (>= 2.1.0, < 3)
|
||||
@ -1030,7 +1029,7 @@ GEM
|
||||
redis-activesupport (5.2.0)
|
||||
activesupport (>= 3, < 7)
|
||||
redis-store (>= 1.3, < 2)
|
||||
redis-namespace (1.7.0)
|
||||
redis-namespace (1.8.1)
|
||||
redis (>= 3.0.4)
|
||||
redis-rack (2.1.2)
|
||||
rack (>= 2.0.8, < 3)
|
||||
@ -1256,7 +1255,7 @@ GEM
|
||||
activesupport (>= 3)
|
||||
attr_required (>= 0.0.5)
|
||||
httpclient (>= 2.4)
|
||||
sys-filesystem (1.1.6)
|
||||
sys-filesystem (1.1.9)
|
||||
ffi
|
||||
sysexits (1.2.0)
|
||||
temple (0.8.2)
|
||||
@ -1279,10 +1278,9 @@ GEM
|
||||
timecop (0.9.1)
|
||||
timeliness (0.3.10)
|
||||
timfel-krb5-auth (0.8.3)
|
||||
to_regexp (0.2.1)
|
||||
toml (0.2.0)
|
||||
parslet (~> 1.8.0)
|
||||
toml-rb (1.0.0)
|
||||
toml-rb (2.0.1)
|
||||
citrus (~> 3.0, > 3.0)
|
||||
tomlrb (1.3.0)
|
||||
tpm-key_attestation (0.9.0)
|
||||
@ -1395,17 +1393,17 @@ DEPENDENCIES
|
||||
acme-client (~> 2.0, >= 2.0.6)
|
||||
activerecord-explain-analyze (~> 0.1)
|
||||
acts-as-taggable-on (~> 7.0)
|
||||
addressable (~> 2.7)
|
||||
addressable (~> 2.8)
|
||||
akismet (~> 3.0)
|
||||
apollo_upload_server (~> 2.0.2)
|
||||
asana (~> 0.10.3)
|
||||
asciidoctor (~> 2.0.10)
|
||||
asciidoctor-include-ext (~> 0.3.1)
|
||||
asciidoctor-kroki (~> 0.4.0)
|
||||
asciidoctor-kroki (~> 0.5.0)
|
||||
asciidoctor-plantuml (~> 0.0.12)
|
||||
atlassian-jwt (~> 0.2.0)
|
||||
attr_encrypted (~> 3.1.0)
|
||||
autoprefixer-rails (= 10.2.0.0)
|
||||
autoprefixer-rails (= 10.2.5.1)
|
||||
awesome_print
|
||||
aws-sdk-cloudformation (~> 1)
|
||||
aws-sdk-core (~> 3)
|
||||
@ -1467,6 +1465,7 @@ DEPENDENCIES
|
||||
fog-aliyun (~> 0.3)
|
||||
fog-aws (~> 3.9)
|
||||
fog-core (= 2.1.0)
|
||||
fog-google (~> 1.15)
|
||||
fog-local (~> 0.6)
|
||||
fog-openstack (~> 1.0)
|
||||
fog-rackspace (~> 0.1.1)
|
||||
@ -1476,21 +1475,18 @@ DEPENDENCIES
|
||||
gettext (~> 3.3)
|
||||
gettext_i18n_rails (~> 1.8.0)
|
||||
gettext_i18n_rails_js (~> 1.3)
|
||||
gitaly (~> 14.0.0.pre.rc2)
|
||||
gitaly (~> 14.1.0.pre.rc3)
|
||||
github-markup (~> 1.7.0)
|
||||
gitlab-chronic (~> 0.10.5)
|
||||
gitlab-dangerfiles (~> 2.1.2)
|
||||
gitlab-experiment (~> 0.5.4)
|
||||
gitlab-dangerfiles (~> 2.2.2)
|
||||
gitlab-experiment (~> 0.6.1)
|
||||
gitlab-fog-azure-rm (~> 1.1.1)
|
||||
gitlab-fog-google (~> 1.13)
|
||||
gitlab-labkit (~> 0.18.0)
|
||||
gitlab-license (~> 1.5)
|
||||
gitlab-labkit (~> 0.20.0)
|
||||
gitlab-license (~> 2.0)
|
||||
gitlab-mail_room (~> 0.0.9)
|
||||
gitlab-markup (~> 1.7.1)
|
||||
gitlab-net-dns (~> 0.9.1)
|
||||
gitlab-omniauth-openid-connect (~> 0.4.0)
|
||||
gitlab-pg_query (~> 2.0.4)
|
||||
gitlab-rdoc (~> 6.3.2)
|
||||
gitlab-sidekiq-fetcher (= 0.5.6)
|
||||
gitlab-styles (~> 6.2.0)
|
||||
gitlab_chronic_duration (~> 0.10.6.2)
|
||||
@ -1531,7 +1527,7 @@ DEPENDENCIES
|
||||
kas-grpc (~> 0.0.2)
|
||||
knapsack (~> 1.21.1)
|
||||
kramdown (~> 2.3.1)
|
||||
kubeclient (~> 4.9.1)
|
||||
kubeclient (~> 4.9.2)
|
||||
lefthook (~> 0.7.0)
|
||||
letter_opener_web (~> 1.4.0)
|
||||
license_finder (~> 6.0)
|
||||
@ -1559,7 +1555,7 @@ DEPENDENCIES
|
||||
omniauth-atlassian-oauth2 (~> 0.2.0)
|
||||
omniauth-auth0 (~> 2.0.0)
|
||||
omniauth-authentiq (~> 0.3.3)
|
||||
omniauth-azure-activedirectory-v2 (~> 0.1)
|
||||
omniauth-azure-activedirectory-v2 (~> 1.0)
|
||||
omniauth-azure-oauth2 (~> 0.0.9)
|
||||
omniauth-cas3 (~> 1.1.4)
|
||||
omniauth-facebook (~> 4.0.0)
|
||||
@ -1578,6 +1574,7 @@ DEPENDENCIES
|
||||
parslet (~> 1.8)
|
||||
peek (~> 1.1)
|
||||
pg (~> 1.1)
|
||||
pg_query (~> 2.1)
|
||||
png_quantizator (~> 0.2.1)
|
||||
premailer-rails (~> 1.10.3)
|
||||
prometheus-client-mmap (~> 0.12.0)
|
||||
@ -1598,10 +1595,11 @@ DEPENDENCIES
|
||||
rainbow (~> 3.0)
|
||||
rblineprof (~> 0.3.6)
|
||||
rbtrace (~> 0.4)
|
||||
rdoc (~> 6.3.2)
|
||||
re2 (~> 1.2.0)
|
||||
recaptcha (~> 4.11)
|
||||
redis (~> 4.0)
|
||||
redis-namespace (~> 1.7.0)
|
||||
redis (~> 4.1.4)
|
||||
redis-namespace (~> 1.8.1)
|
||||
redis-rails (~> 5.0.2)
|
||||
request_store (~> 1.5)
|
||||
responders (~> 3.0)
|
||||
@ -1651,7 +1649,7 @@ DEPENDENCIES
|
||||
thin (~> 1.8.0)
|
||||
thrift (>= 0.14.0)
|
||||
timecop (~> 0.9.1)
|
||||
toml-rb (~> 1.0.0)
|
||||
toml-rb (~> 2.0)
|
||||
truncato (~> 0.7.11)
|
||||
u2f (~> 0.2.1)
|
||||
unf (~> 0.1.4)
|
||||
|
@ -176,14 +176,14 @@
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
groups = ["default" "development" "test"];
|
||||
groups = ["danger" "default" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
|
||||
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
};
|
||||
aes_key_wrap = {
|
||||
groups = ["default"];
|
||||
@ -242,10 +242,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9";
|
||||
sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.12";
|
||||
version = "2.0.15";
|
||||
};
|
||||
asciidoctor-include-ext = {
|
||||
dependencies = ["asciidoctor"];
|
||||
@ -264,10 +264,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w";
|
||||
sha256 = "04jzsicaynwyy4l3w69x1qqww4av57army5xiapvv2b6g5s8nb32";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
};
|
||||
asciidoctor-plantuml = {
|
||||
dependencies = ["asciidoctor"];
|
||||
@ -328,20 +328,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0p9j0sxw0nm27x7wj0n8a9zikwb0v8b6varr601rcgymsjj2v7wy";
|
||||
sha256 = "1vlqwy2qkp39ibp7llj7ps53nvxav29c2yl451v1qdhj25zxc49p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "10.2.0.0";
|
||||
version = "10.2.5.1";
|
||||
};
|
||||
awesome_print = {
|
||||
groups = ["development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h";
|
||||
sha256 = "0vkq6c8y2jvaw03ynds5vjzl1v9wg608cimkd3bidzxc0jvk56z9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.9.2";
|
||||
};
|
||||
awrence = {
|
||||
groups = ["default"];
|
||||
@ -963,10 +963,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nv02gq90nngnfa6hgiyyk60a31xfayk67va98k41gy9arhdkz5g";
|
||||
sha256 = "12nmycrlwr8ca2s0fx76k81gjw12iz15k1n0qanszv5d4l1ykj2l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.2.3";
|
||||
version = "8.3.1";
|
||||
};
|
||||
danger-gitlab = {
|
||||
dependencies = ["danger" "gitlab"];
|
||||
@ -1460,10 +1460,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
|
||||
sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
expression_parser = {
|
||||
groups = ["default"];
|
||||
@ -1659,10 +1659,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi";
|
||||
sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.1";
|
||||
version = "1.15.3";
|
||||
};
|
||||
ffi-compiler = {
|
||||
dependencies = ["ffi" "rake"];
|
||||
@ -1762,6 +1762,17 @@
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
fog-google = {
|
||||
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01mky1gqgg8vijr2avyspc9l4asjzkr5xc31x4c4ff7jzf00g11g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
};
|
||||
fog-json = {
|
||||
dependencies = ["fog-core" "multi_json"];
|
||||
groups = ["default"];
|
||||
@ -1941,10 +1952,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wpp1zdwjmglsycliag6v9844jnhpvkblry9i14a16gspqdsfam4";
|
||||
sha256 = "0kf335cnps9ix3jfnfq99zlp7wrf6p9lip7cxicxylvn682i7l4y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "14.0.0.pre.rc2";
|
||||
version = "14.1.0.pre.rc3";
|
||||
};
|
||||
github-markup = {
|
||||
groups = ["default"];
|
||||
@ -1979,15 +1990,15 @@
|
||||
version = "0.10.5";
|
||||
};
|
||||
gitlab-dangerfiles = {
|
||||
dependencies = ["danger-gitlab"];
|
||||
dependencies = ["danger" "danger-gitlab"];
|
||||
groups = ["danger" "development" "test"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09vcxzbsvgis47ifgd82rjn12587qcw6q2q0n0y3cg5snag6fqdb";
|
||||
sha256 = "1x5qlncyc090vyvgpj5f186109gfyv4jcbyibbyq3mcd38brqgc2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
version = "2.2.2";
|
||||
};
|
||||
gitlab-experiment = {
|
||||
dependencies = ["activesupport" "request_store" "scientist"];
|
||||
@ -1995,10 +2006,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18xc1785b9h0vwlqgi2m0mhjim6jaqqpi8nnl4hh8mbjd4d6kf1j";
|
||||
sha256 = "0d1w5vd3001469bk5cqac5d9l44f6sbqbzw5z4xiflyi7fdad9jf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.4";
|
||||
version = "0.6.1";
|
||||
};
|
||||
gitlab-fog-azure-rm = {
|
||||
dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
|
||||
@ -2011,37 +2022,26 @@
|
||||
};
|
||||
version = "1.1.1";
|
||||
};
|
||||
gitlab-fog-google = {
|
||||
dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ybmiclsdpkp1l91z6d4qkhha6cik6kgf4kzs3a2c26mhnnj6gxy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.0";
|
||||
};
|
||||
gitlab-labkit = {
|
||||
dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"];
|
||||
dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d18fx54dq2a2ngdix3dchbk4xpxfpqz1rkr2hi1kvi6idq4k6qp";
|
||||
sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.18.0";
|
||||
version = "0.20.0";
|
||||
};
|
||||
gitlab-license = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07qcbdrxqwbri0kgiamrvx9y7cii3smf94g6scgn2l369m6955x1";
|
||||
sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.0";
|
||||
version = "2.0.0";
|
||||
};
|
||||
gitlab-mail_room = {
|
||||
groups = ["default"];
|
||||
@ -2084,27 +2084,6 @@
|
||||
};
|
||||
version = "0.4.0";
|
||||
};
|
||||
gitlab-pg_query = {
|
||||
dependencies = ["google-protobuf"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17whjbrmyh1wn3badapa1xhdcjpdrxgn7vz705fpi1p9r8q0a2vj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.4";
|
||||
};
|
||||
gitlab-rdoc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.3.2";
|
||||
};
|
||||
gitlab-sidekiq-fetcher = {
|
||||
dependencies = ["sidekiq"];
|
||||
groups = ["default"];
|
||||
@ -2188,10 +2167,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
|
||||
sha256 = "0ajc3w4wqg46ywcbmb5fz1q6gfm6g7874s9h31i1r038kz2bzfag";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
google-protobuf = {
|
||||
groups = ["default"];
|
||||
@ -2456,10 +2435,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh";
|
||||
sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.6.0";
|
||||
version = "4.1.0";
|
||||
};
|
||||
hashie-forbidden_attributes = {
|
||||
dependencies = ["hashie"];
|
||||
@ -2748,15 +2727,15 @@
|
||||
version = "0.2.12";
|
||||
};
|
||||
jsonpath = {
|
||||
dependencies = ["multi_json" "to_regexp"];
|
||||
dependencies = ["multi_json"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bwgk17dwraaf6grv6v99xjjy3ds1sqsf1v49fnlyfjkniy6ap8q";
|
||||
sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.5";
|
||||
version = "1.1.0";
|
||||
};
|
||||
jwt = {
|
||||
groups = ["default"];
|
||||
@ -2861,10 +2840,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07ygwvdrdhqmvqj3g7hsrgwimr1xcphk9d6qjdxr0iynqaahn0l7";
|
||||
sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.9.1";
|
||||
version = "4.9.2";
|
||||
};
|
||||
launchy = {
|
||||
dependencies = ["addressable"];
|
||||
@ -3147,10 +3126,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["development" "test"];
|
||||
@ -3406,10 +3385,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b";
|
||||
sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.4";
|
||||
version = "1.11.5";
|
||||
};
|
||||
nokogumbo = {
|
||||
dependencies = ["nokogiri"];
|
||||
@ -3459,10 +3438,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bhakjh30vi8scqwnhd1c9qkac9r8hh2lr0dbs5ynwmrc5djxknm";
|
||||
sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
version = "1.4.7";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@ -3502,10 +3481,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x";
|
||||
sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
};
|
||||
omniauth-atlassian-oauth2 = {
|
||||
dependencies = ["omniauth" "omniauth-oauth2"];
|
||||
@ -3546,10 +3525,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bgdyzjh7x9knkzaa6bl9f5fvh05nd0gqxrqassww0vqh5qgyfpy";
|
||||
sha256 = "1pv9pxff3g4cva76zzsx8fibb08c9av51lxksh73mbl9rrxdgkgd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.1";
|
||||
version = "1.0.0";
|
||||
};
|
||||
omniauth-azure-oauth2 = {
|
||||
dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
|
||||
@ -3656,10 +3635,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79";
|
||||
sha256 = "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
version = "1.7.1";
|
||||
};
|
||||
omniauth-oauth2-generic = {
|
||||
dependencies = ["omniauth-oauth2"];
|
||||
@ -3882,6 +3861,17 @@
|
||||
};
|
||||
version = "1.2.3";
|
||||
};
|
||||
pg_query = {
|
||||
dependencies = ["google-protobuf"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12dibsqndfnckc24yryy8v467rxp7p80jx21jhm8z7swp8118jhx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
plist = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -4316,6 +4306,16 @@
|
||||
};
|
||||
version = "1.8.0";
|
||||
};
|
||||
rdoc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.3.2";
|
||||
};
|
||||
re2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -4342,10 +4342,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12manni00r5qn50z8w316pnm8mqn858i5kj6s9sr9sfl8qx8ws5g";
|
||||
sha256 = "0nnyr6qsqrcszf6c10n4zfjs8h9n67zvsmx6mp8brkigamr8llx3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
};
|
||||
RedCloth = {
|
||||
groups = ["default"];
|
||||
@ -4362,10 +4362,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
|
||||
sha256 = "0j0p82yb2a0z2sv38jq9xdzs0kvbslpyfdxky9f3znpy3igxj6yh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.3";
|
||||
version = "4.1.4";
|
||||
};
|
||||
redis-actionpack = {
|
||||
dependencies = ["actionpack" "redis-rack" "redis-store"];
|
||||
@ -4395,10 +4395,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1wb4x8bg2d0plv3izpmi1sd7nd1ix8nxw7b43hd9bac08f4w62mx";
|
||||
sha256 = "0k65fr7f8ciq7d9nwc5ziw1d32zsxilgmqdlj3359rz5jgb0f5y8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
};
|
||||
redis-rack = {
|
||||
dependencies = ["rack" "redis-store"];
|
||||
@ -5352,10 +5352,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq";
|
||||
sha256 = "03y0mnn5mp9ydi5jc4d3y0gnk5fxwljzzfzj9rg7q94kslwi1kx4";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.9";
|
||||
};
|
||||
sysexits = {
|
||||
groups = ["default" "development" "test"];
|
||||
@ -5511,16 +5511,6 @@
|
||||
};
|
||||
version = "0.8.3";
|
||||
};
|
||||
to_regexp = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.2.1";
|
||||
};
|
||||
toml = {
|
||||
dependencies = ["parslet"];
|
||||
groups = ["default" "development" "test"];
|
||||
@ -5538,10 +5528,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d";
|
||||
sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.0";
|
||||
version = "2.0.1";
|
||||
};
|
||||
tomlrb = {
|
||||
groups = ["default"];
|
||||
|
@ -778,11 +778,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_eslint_eslintrc___eslintrc_0.4.2.tgz";
|
||||
name = "_eslint_eslintrc___eslintrc_0.4.3.tgz";
|
||||
path = fetchurl {
|
||||
name = "_eslint_eslintrc___eslintrc_0.4.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz";
|
||||
sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179";
|
||||
name = "_eslint_eslintrc___eslintrc_0.4.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz";
|
||||
sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -794,11 +794,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_gitlab_eslint_plugin___eslint_plugin_8.4.0.tgz";
|
||||
name = "_gitlab_eslint_plugin___eslint_plugin_9.0.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_gitlab_eslint_plugin___eslint_plugin_8.4.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.4.0.tgz";
|
||||
sha1 = "094fa4d41676a71146f82e1b19257a7ceabefd88";
|
||||
name = "_gitlab_eslint_plugin___eslint_plugin_9.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-9.0.2.tgz";
|
||||
sha1 = "c7e0c8744001227d88624eb533047f3d5dd8d419";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -818,11 +818,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_gitlab_svgs___svgs_1.199.0.tgz";
|
||||
name = "_gitlab_svgs___svgs_1.202.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "_gitlab_svgs___svgs_1.199.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.199.0.tgz";
|
||||
sha1 = "0512a854018defc4e286b8ecb2143958bb535146";
|
||||
name = "_gitlab_svgs___svgs_1.202.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.202.0.tgz";
|
||||
sha1 = "dbfad291fc5f597f0d31ca6a694fa8e78af57847";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -834,11 +834,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_gitlab_ui___ui_29.35.0.tgz";
|
||||
name = "_gitlab_ui___ui_31.5.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "_gitlab_ui___ui_29.35.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.35.0.tgz";
|
||||
sha1 = "bb04d1e4f8796134bc406adaa869c1b5b1fdcaf2";
|
||||
name = "_gitlab_ui___ui_31.5.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.5.0.tgz";
|
||||
sha1 = "45b7866b790e7d5a1b67b39000c047991036b437";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -850,11 +850,19 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
|
||||
name = "_humanwhocodes_config_array___config_array_0.5.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.3.0.tgz";
|
||||
sha1 = "f21550d4ce406ee5f99447a02abf36250ecc922d";
|
||||
name = "_humanwhocodes_config_array___config_array_0.5.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz";
|
||||
sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz";
|
||||
sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1114,11 +1122,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.57.tgz";
|
||||
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz";
|
||||
path = fetchurl {
|
||||
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.57.tgz";
|
||||
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.57.tgz";
|
||||
sha1 = "aed4649a51745deef5e4ee79b9a4fdc092471237";
|
||||
name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz";
|
||||
url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.58.tgz";
|
||||
sha1 = "7adc78c0a420e7527c68782e2f0c9c62652df02d";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1154,67 +1162,67 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_core___core_2.0.0_beta.75.tgz";
|
||||
name = "_tiptap_core___core_2.0.0_beta.86.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_core___core_2.0.0_beta.75.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.75.tgz";
|
||||
sha1 = "8295dfa7ca4b22de61e9c68a102763343b26e03a";
|
||||
name = "_tiptap_core___core_2.0.0_beta.86.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.86.tgz";
|
||||
sha1 = "11b575aee4ad2f30f73114c786da5cd13dde30e0";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.13.tgz";
|
||||
sha1 = "72a26dd54e5edb9abc4488ad7c1f0a43d4089bd5";
|
||||
name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.14.tgz";
|
||||
sha1 = "f49872981aecdd21341c4d5db32ab68cba945756";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.13.tgz";
|
||||
sha1 = "d6b8f3797a6f7932ae38b9d761cc1effa886b715";
|
||||
name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.14.tgz";
|
||||
sha1 = "6bf9ea70f7e24e6d674c7780471fcb6a7a4b91f4";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz";
|
||||
name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.24.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.20.tgz";
|
||||
sha1 = "248c70910bf232ed5fb9eb3a7c084bc592d2341d";
|
||||
name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.24.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.24.tgz";
|
||||
sha1 = "e6db5bc0386ccdbd483e57296b22eb6dd55914ba";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.13.tgz";
|
||||
sha1 = "8b2c4ec8decc5562ae9bb5d97b0a99e0b27f9794";
|
||||
name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.14.tgz";
|
||||
sha1 = "29b9bfa2e908cdb01943242f75daf82115f5afd1";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz";
|
||||
name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.32.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.25.tgz";
|
||||
sha1 = "eb5f721fa8a4035244b7883e3cfc770f17fae27f";
|
||||
name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.32.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.32.tgz";
|
||||
sha1 = "ef9ff6883f2d669e6be79c69f26749641462e1ea";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz";
|
||||
name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.16.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.15.tgz";
|
||||
sha1 = "3fb0f04c38f8276195a1a958cc7d3399b52dc46a";
|
||||
name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.16.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.16.tgz";
|
||||
sha1 = "7788ee1af04eb84fe194261bb1bb835dbe7ad59e";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_code___extension_code_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.13.tgz";
|
||||
sha1 = "fa2d14c61fe213c2c40b196e1b1b7a8862cec987";
|
||||
name = "_tiptap_extension_code___extension_code_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.14.tgz";
|
||||
sha1 = "679a741589d63006140605553be7c6148c000814";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1226,83 +1234,83 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz";
|
||||
name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.17.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.14.tgz";
|
||||
sha1 = "b5e4137d4be1afe14a8f67d932af5e6d3df7cb56";
|
||||
name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.17.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.17.tgz";
|
||||
sha1 = "3ca59c264b49a91c1a5b2ce8de3e898903d0a5bc";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz";
|
||||
name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.18.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.16.tgz";
|
||||
sha1 = "109226c060351b83916441cd58d631eff47d6bb2";
|
||||
name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.18.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.18.tgz";
|
||||
sha1 = "4d9b7f58c73f6c718a74503c5ff514b06f615e27";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz";
|
||||
name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.18.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.17.tgz";
|
||||
sha1 = "774037fddab50379b21a58cab91bfd988b9b793f";
|
||||
name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.18.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.18.tgz";
|
||||
sha1 = "67c2266ec21c90f003e989862b709475f5427fea";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.13.tgz";
|
||||
sha1 = "36b5433e70e8eac121d6d26871ff60527b500442";
|
||||
name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.14.tgz";
|
||||
sha1 = "dce00c49dc614caac82720b930501a59b38d5584";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.13.tgz";
|
||||
sha1 = "7d6f4a0e28af47ad1a1e455af01dbd1997a9f948";
|
||||
name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.14.tgz";
|
||||
sha1 = "63df6d7282afd3c2db2253af2e538c3bf2800751";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz";
|
||||
name = "_tiptap_extension_history___extension_history_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.12.tgz";
|
||||
sha1 = "a25607aab594998d6b46576724d56701a2833689";
|
||||
name = "_tiptap_extension_history___extension_history_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.14.tgz";
|
||||
sha1 = "7990a592a521ca4147e733eed78fcb738ed6ba95";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz";
|
||||
name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.17.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.16.tgz";
|
||||
sha1 = "7f8a3e14de2fc8bbb52816a697450a61d8797689";
|
||||
name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.17.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.17.tgz";
|
||||
sha1 = "25c15bfab5794a3f1bcf6f4df03bef56ddac80aa";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_image___extension_image_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.13.tgz";
|
||||
sha1 = "58a2e66533e2ef63e67aeb7980fe642b75fa17a0";
|
||||
name = "_tiptap_extension_image___extension_image_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.14.tgz";
|
||||
sha1 = "31eae69cce3d81af81a1c0fbd253beca3c253429";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.13.tgz";
|
||||
sha1 = "8b0810e41dc5c3bfb0640d638b0b40464cd81fea";
|
||||
name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.14.tgz";
|
||||
sha1 = "5b56a806ef6507dc2001eaeeeb234ee0b25d8544";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz";
|
||||
name = "_tiptap_extension_link___extension_link_2.0.0_beta.18.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.17.tgz";
|
||||
sha1 = "5a3c28762cf332bb4de0fb13ce6973b11496697a";
|
||||
name = "_tiptap_extension_link___extension_link_2.0.0_beta.18.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.18.tgz";
|
||||
sha1 = "792c671daf3db79873b8425e68da43dd19af230b";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1314,27 +1322,59 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz";
|
||||
name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.14.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.13.tgz";
|
||||
sha1 = "4df2264e1405f73848cd2fedcea95f3064911cd7";
|
||||
name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.14.tgz";
|
||||
sha1 = "54487f8b9246226586d0190d07a449a97536436a";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz";
|
||||
name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.15.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.14.tgz";
|
||||
sha1 = "6b8c64166f3b581a1f8e1ae415b895e5bd2952d1";
|
||||
name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.15.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.15.tgz";
|
||||
sha1 = "89483a2f438d8412287d441c890304985c2ac07f";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz";
|
||||
name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.16.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.15.tgz";
|
||||
sha1 = "c274ae85b1067f80d45a1cb30d0cad24733c9be7";
|
||||
name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.16.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.16.tgz";
|
||||
sha1 = "cccce9713824e05ebde895f84f747b8bbed45f7d";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.0.0-beta.13.tgz";
|
||||
sha1 = "c01eada4859d5ea487d61e68cc7fab7ed2e4842a";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_table_header___extension_table_header_2.0.0_beta.15.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_table_header___extension_table_header_2.0.0_beta.15.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.0.0-beta.15.tgz";
|
||||
sha1 = "884d16f104671ee672f1f629f4e4fef0b096bfbb";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_table_row___extension_table_row_2.0.0_beta.13.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_table_row___extension_table_row_2.0.0_beta.13.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.0.0-beta.13.tgz";
|
||||
sha1 = "3f9a61112afcde750228f4437ae3cd7b82d02f74";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_extension_table___extension_table_2.0.0_beta.25.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_extension_table___extension_table_2.0.0_beta.25.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.0.0-beta.25.tgz";
|
||||
sha1 = "57accf19c07e96bd0db868eb791da20bd423af36";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1346,11 +1386,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz";
|
||||
name = "_tiptap_vue_2___vue_2_2.0.0_beta.39.tgz";
|
||||
path = fetchurl {
|
||||
name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.34.tgz";
|
||||
sha1 = "df9309eb812b50a85315c4623ac222db751fc97a";
|
||||
name = "_tiptap_vue_2___vue_2_2.0.0_beta.39.tgz";
|
||||
url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.39.tgz";
|
||||
sha1 = "f6d75af99b072848381f0c443b50ec09186eb43b";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1498,11 +1538,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_lowlight___lowlight_0.0.2.tgz";
|
||||
name = "_types_lowlight___lowlight_0.0.3.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_lowlight___lowlight_0.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.2.tgz";
|
||||
sha1 = "bb517f1486477a8c59dea11be0dfaf96d629d35d";
|
||||
name = "_types_lowlight___lowlight_0.0.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.3.tgz";
|
||||
sha1 = "433b03dd63894dde17860063f4c90a688431194b";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1586,27 +1626,27 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.1.tgz";
|
||||
name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.1.tgz";
|
||||
sha1 = "3ba98dd861ff2a62559e70f453f996a1ef5ec55d";
|
||||
name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.2.tgz";
|
||||
sha1 = "476b90a661f32d6d6a21599f53fcd71e36c65a1f";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz";
|
||||
name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz";
|
||||
sha1 = "989e98c734e01e2ed4cab39992e60a1b0646cab6";
|
||||
name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz";
|
||||
sha1 = "7df7d373edb33ea8da12084bfd462cf84cd69761";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_history___prosemirror_history_1.0.2.tgz";
|
||||
name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_history___prosemirror_history_1.0.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.2.tgz";
|
||||
sha1 = "f90a009a0dcd71393faa69ce705593dec76347a1";
|
||||
name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz";
|
||||
sha1 = "f1110efbe758129b5475e466ff077f0a8d9b964f";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1626,11 +1666,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_model___prosemirror_model_1.13.0.tgz";
|
||||
name = "_types_prosemirror_model___prosemirror_model_1.13.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_model___prosemirror_model_1.13.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.13.0.tgz";
|
||||
sha1 = "d05937e918c3cac2cf49630ccab04a65fc5fffd6";
|
||||
name = "_types_prosemirror_model___prosemirror_model_1.13.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.13.1.tgz";
|
||||
sha1 = "53df04ee174a7e1dc12747005b1b4c02565adcc4";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -1642,27 +1682,27 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_state___prosemirror_state_1.2.6.tgz";
|
||||
name = "_types_prosemirror_state___prosemirror_state_1.2.7.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_state___prosemirror_state_1.2.6.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.6.tgz";
|
||||
sha1 = "bb0169084239a8393b354c6fda5420fc347d6bab";
|
||||
name = "_types_prosemirror_state___prosemirror_state_1.2.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.7.tgz";
|
||||
sha1 = "cd55062e4043a31e3426f47668f1d7038b5d8dfb";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz";
|
||||
name = "_types_prosemirror_transform___prosemirror_transform_1.1.4.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz";
|
||||
sha1 = "cf30d275976978d1c0317d0659145426fc49ce6f";
|
||||
name = "_types_prosemirror_transform___prosemirror_transform_1.1.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.4.tgz";
|
||||
sha1 = "c3565e81b2ef3ce3254e6927d6f63eb8d7bb20d0";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "_types_prosemirror_view___prosemirror_view_1.17.1.tgz";
|
||||
name = "_types_prosemirror_view___prosemirror_view_1.17.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "_types_prosemirror_view___prosemirror_view_1.17.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.17.1.tgz";
|
||||
sha1 = "0895df5a57ae6e68d4f3f8020d9be4ef52192980";
|
||||
name = "_types_prosemirror_view___prosemirror_view_1.17.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.17.2.tgz";
|
||||
sha1 = "3aff71a0802bdfc310404db8a37ced2db69fd74f";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -2882,11 +2922,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "browserslist___browserslist_4.16.1.tgz";
|
||||
name = "browserslist___browserslist_4.16.6.tgz";
|
||||
path = fetchurl {
|
||||
name = "browserslist___browserslist_4.16.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz";
|
||||
sha1 = "bf757a2da376b3447b800a16f0f1c96358138766";
|
||||
name = "browserslist___browserslist_4.16.6.tgz";
|
||||
url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz";
|
||||
sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -3066,11 +3106,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz";
|
||||
name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz";
|
||||
path = fetchurl {
|
||||
name = "caniuse_lite___caniuse_lite_1.0.30001185.tgz";
|
||||
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz";
|
||||
sha1 = "3482a407d261da04393e2f0d61eefbc53be43b95";
|
||||
name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz";
|
||||
url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz";
|
||||
sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -3698,11 +3738,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "core_js_compat___core_js_compat_3.6.4.tgz";
|
||||
name = "core_js_compat___core_js_compat_3.15.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "core_js_compat___core_js_compat_3.6.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz";
|
||||
sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17";
|
||||
name = "core_js_compat___core_js_compat_3.15.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz";
|
||||
sha1 = "47272fbb479880de14b4e6081f71f3492f5bd3cb";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -4722,11 +4762,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "dompurify___dompurify_2.2.9.tgz";
|
||||
name = "dompurify___dompurify_2.3.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "dompurify___dompurify_2.2.9.tgz";
|
||||
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz";
|
||||
sha1 = "4b42e244238032d9286a0d2c87b51313581d9624";
|
||||
name = "dompurify___dompurify_2.3.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz";
|
||||
sha1 = "07bb39515e491588e5756b1d3e8375b5964814e2";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -4826,11 +4866,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz";
|
||||
name = "electron_to_chromium___electron_to_chromium_1.3.762.tgz";
|
||||
path = fetchurl {
|
||||
name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz";
|
||||
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz";
|
||||
sha1 = "8b884f50296c2ae2a9997f024d0e3e57facc2b94";
|
||||
name = "electron_to_chromium___electron_to_chromium_1.3.762.tgz";
|
||||
url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.762.tgz";
|
||||
sha1 = "3fa4e3bcbda539b50e3aa23041627063a5cffe61";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -5258,11 +5298,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "eslint___eslint_7.28.0.tgz";
|
||||
name = "eslint___eslint_7.31.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "eslint___eslint_7.28.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz";
|
||||
sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820";
|
||||
name = "eslint___eslint_7.31.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz";
|
||||
sha1 = "f972b539424bf2604907a970860732c5d99d3aca";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -8441,14 +8481,6 @@
|
||||
sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "lodash___lodash_4.17.20.tgz";
|
||||
path = fetchurl {
|
||||
name = "lodash___lodash_4.17.20.tgz";
|
||||
url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
|
||||
sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "lodash___lodash_4.17.21.tgz";
|
||||
path = fetchurl {
|
||||
@ -9074,19 +9106,27 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz";
|
||||
name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_4.0.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz";
|
||||
sha1 = "eb4bbb1c5e5bfb554541c1ae1542e74c2a9f43fd";
|
||||
name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_4.0.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-4.0.0.tgz";
|
||||
sha1 = "95be3f48f4220999b909266a9997727f0deab947";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "monaco_editor___monaco_editor_0.20.0.tgz";
|
||||
name = "monaco_editor___monaco_editor_0.24.0.tgz";
|
||||
path = fetchurl {
|
||||
name = "monaco_editor___monaco_editor_0.20.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz";
|
||||
sha1 = "5d5009343a550124426cb4d965a4d27a348b4dea";
|
||||
name = "monaco_editor___monaco_editor_0.24.0.tgz";
|
||||
url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.24.0.tgz";
|
||||
sha1 = "990b55096bcc95d08d8d28e55264c6eb17707269";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "monaco_editor___monaco_editor_0.25.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "monaco_editor___monaco_editor_0.25.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.25.2.tgz";
|
||||
sha1 = "119e2b15bbd968a1a99c03cac9c329316d7c37e9";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -9266,11 +9306,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "node_releases___node_releases_1.1.70.tgz";
|
||||
name = "node_releases___node_releases_1.1.73.tgz";
|
||||
path = fetchurl {
|
||||
name = "node_releases___node_releases_1.1.70.tgz";
|
||||
url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz";
|
||||
sha1 = "66e0ed0273aa65666d7fe78febe7634875426a08";
|
||||
name = "node_releases___node_releases_1.1.73.tgz";
|
||||
url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz";
|
||||
sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -9745,6 +9785,14 @@
|
||||
sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "papaparse___papaparse_5.3.1.tgz";
|
||||
path = fetchurl {
|
||||
name = "papaparse___papaparse_5.3.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.1.tgz";
|
||||
sha1 = "770b7a9124d821d4b2132132b7bd7dce7194b5b1";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "parallel_transform___parallel_transform_1.1.0.tgz";
|
||||
path = fetchurl {
|
||||
@ -10386,11 +10434,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz";
|
||||
name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.8.tgz";
|
||||
sha1 = "61aec59ac101b7990ec59726199f2a31ef0cd8ca";
|
||||
name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz";
|
||||
sha1 = "406a6589966e6cd80809cea2d801fb998639b37d";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -10442,19 +10490,27 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_model___prosemirror_model_1.14.1.tgz";
|
||||
name = "prosemirror_model___prosemirror_model_1.14.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_model___prosemirror_model_1.14.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.1.tgz";
|
||||
sha1 = "d784c67f95a5d66b853e82ff9a87a50353ef9cd5";
|
||||
name = "prosemirror_model___prosemirror_model_1.14.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.2.tgz";
|
||||
sha1 = "4e8c39cfff4e097631af4495e125d9a8a9773116";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz";
|
||||
name = "prosemirror_schema_basic___prosemirror_schema_basic_1.1.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_schema_list___prosemirror_schema_list_1.1.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz";
|
||||
sha1 = "471f9caf2d2bed93641d2e490434c0d2d4330df1";
|
||||
name = "prosemirror_schema_basic___prosemirror_schema_basic_1.1.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.1.2.tgz";
|
||||
sha1 = "4bde5c339c845e0d08ec8fe473064e372ca51ae3";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz";
|
||||
sha1 = "e7ad9e337ea3d77da6d6a4250f3d7bd51ae980a4";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -10473,6 +10529,14 @@
|
||||
sha1 = "ad66300cc49500455cf1243bb129c9e7d883321e";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_test_builder___prosemirror_test_builder_1.0.4.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_test_builder___prosemirror_test_builder_1.0.4.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.0.4.tgz";
|
||||
sha1 = "68d1d1cedcd90cc2fdd976d736ce87b7a5f1e873";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz";
|
||||
path = fetchurl {
|
||||
@ -10482,11 +10546,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "prosemirror_view___prosemirror_view_1.18.7.tgz";
|
||||
name = "prosemirror_view___prosemirror_view_1.18.9.tgz";
|
||||
path = fetchurl {
|
||||
name = "prosemirror_view___prosemirror_view_1.18.7.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.7.tgz";
|
||||
sha1 = "d9843337a1649f532401589899b724e7e87e83c0";
|
||||
name = "prosemirror_view___prosemirror_view_1.18.9.tgz";
|
||||
url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.9.tgz";
|
||||
sha1 = "29bc11759438aecc5b7fadaa8520165c84c2144a";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
@ -29,6 +29,7 @@ let
|
||||
];
|
||||
sha256 = "0ssg3q1z80652d4gkv1z7kpsxx82xcw6kpsw266c8q4y2n8x7c76";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
pname = "makemkv";
|
||||
inherit version;
|
||||
@ -51,9 +52,15 @@ in mkDerivation {
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon
|
||||
install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.*
|
||||
install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/*
|
||||
install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon
|
||||
install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.*
|
||||
install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/*
|
||||
install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop
|
||||
install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/*
|
||||
install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/*
|
||||
install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/*
|
||||
install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/*
|
||||
install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/*
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
25
pkgs/applications/video/srtrelay/default.nix
Normal file
25
pkgs/applications/video/srtrelay/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, srt, ffmpeg }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "srtrelay-unstable";
|
||||
version = "2021-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voc";
|
||||
repo = "srtrelay";
|
||||
rev = "c4f02ff2e9637b01a0679b29e5a76f4521eeeef3";
|
||||
sha256 = "06zbl97bjjyv51zp27qk37ffpbh1ylm9bsr0s5qlyd73pyavcj1g";
|
||||
};
|
||||
|
||||
vendorSha256 = "1pdpb0my7gdvjjkka6jhj19b9nx575k6117hg536b106ij2n4zd2";
|
||||
|
||||
buildInputs = [ srt ];
|
||||
checkInputs = [ ffmpeg ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Streaming-Relay for the SRT-protocol";
|
||||
homepage = "https://github.com/voc/srtrelay";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, fetchpatch
|
||||
, libarchive, perl, xorg, libdvdnav, libbluray
|
||||
, zlib, a52dec, libmad, faad2, ffmpeg, alsa-lib
|
||||
, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska
|
||||
@ -8,7 +8,7 @@
|
||||
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz
|
||||
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
|
||||
, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
|
||||
, ncurses
|
||||
, ncurses, srt
|
||||
, onlyLibVLC ? false
|
||||
, withQt5 ? true, qtbase, qtsvg, qtx11extras, wrapQtAppsHook
|
||||
, jackSupport ? false
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva
|
||||
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
|
||||
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
|
||||
fluidsynth wayland wayland-protocols ncurses
|
||||
fluidsynth wayland wayland-protocols ncurses srt
|
||||
] ++ optional (!stdenv.hostPlatform.isAarch64) live555
|
||||
++ optionals withQt5 [ qtbase qtsvg qtx11extras ]
|
||||
++ optionals skins2Support (with xorg; [ libXpm freetype libXext libXinerama ])
|
||||
@ -61,6 +61,13 @@ stdenv.mkDerivation rec {
|
||||
# set the path to the compiler
|
||||
BUILDCC = "${stdenv.cc}/bin/gcc";
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch";
|
||||
sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
|
||||
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
|
||||
@ -80,6 +87,7 @@ stdenv.mkDerivation rec {
|
||||
# "--enable-foo" flags here
|
||||
configureFlags = [
|
||||
"--with-kde-solid=$out/share/apps/solid/actions"
|
||||
"--enable-srt" # Explicit enable srt to ensure the patch is applied.
|
||||
] ++ optional onlyLibVLC "--disable-vlc"
|
||||
++ optional skins2Support "--enable-skins2"
|
||||
++ optionals chromecastSupport [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, bc, python, bison, flex, fuse, libarchive
|
||||
{ lib, stdenv, fetchFromGitHub, bc, python3, bison, flex, fuse, libarchive
|
||||
, buildPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
outputs = [ "dev" "lib" "out" ];
|
||||
|
||||
nativeBuildInputs = [ bc bison flex python ];
|
||||
nativeBuildInputs = [ bc bison flex python3 ];
|
||||
|
||||
buildInputs = [ fuse libarchive ];
|
||||
|
||||
|
@ -1,18 +1,20 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
in fetchzip rec {
|
||||
name = "overpass-${version}";
|
||||
|
||||
url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip";
|
||||
url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
|
||||
mkdir -p $out/share/fonts $out/share/doc
|
||||
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
|
||||
unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
|
||||
'';
|
||||
|
||||
sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64";
|
||||
sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://overpassfont.org/";
|
||||
|
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaru";
|
||||
version = "21.04.1";
|
||||
version = "21.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ubuntu";
|
||||
repo = "yaru";
|
||||
rev = version;
|
||||
sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz";
|
||||
sha256 = "sha256-VcuH/lEnSeOYGFXr3OPw9PRUwHOVx4RjUQXblv6jdD8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchFromGitLab
|
||||
, llvmPackages
|
||||
, cmake, boehmgc, gmp, zlib, ncurses, boost, libelf
|
||||
, python, git, sbcl
|
||||
, python3, git, sbcl
|
||||
, wafHook
|
||||
}:
|
||||
let
|
||||
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python git sbcl wafHook ] ++
|
||||
nativeBuildInputs = [ cmake python3 git sbcl wafHook ] ++
|
||||
(with llvmPackages; [ llvm clang ]);
|
||||
|
||||
buildInputs = with llvmPackages;
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
|
||||
, pythonSupport ? false, python, swig, libyaml
|
||||
, pythonSupport ? false, python ? null, swig, libyaml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python
|
||||
, python3
|
||||
, llvm
|
||||
, clang-tools-extra_src ? null
|
||||
, lld
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
pname = "clang";
|
||||
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
|
||||
buildInputs = [ llvm ];
|
||||
|
||||
|
54
pkgs/development/compilers/marst/default.nix
Normal file
54
pkgs/development/compilers/marst/default.nix
Normal file
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, texinfo
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marst";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gnu/${pname}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
texinfo
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
makeinfo doc/marst.texi -o doc/marst.info
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -m644 doc/marst.info -Dt $out/share/info/
|
||||
install -m644 doc/marst.pdf -Dt $out/share/doc/${pname}/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.gnu.org/software/marst/";
|
||||
description = "An Algol-60-to-C translator";
|
||||
longDescription = ''
|
||||
MARST is an Algol-to-C translator. It automatically translates programs
|
||||
written on the algorithmic language Algol 60 to the C programming
|
||||
language.
|
||||
|
||||
The MARST package includes three main components:
|
||||
|
||||
- the translator, MARST, that translates Algol 60 programs to the C
|
||||
programming language.
|
||||
|
||||
- the library, ALGLIB, that contains precompiled standard Algol 60
|
||||
procedures and other necessary library routines. This library is to be
|
||||
used at linking stage. (In the distribution the name libalgol.a is used
|
||||
for this library.)
|
||||
|
||||
- the converter, MACVT, that allows to convert existing Algol 60 programs
|
||||
from some other representations to MARST representation.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
|
||||
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python, ruby
|
||||
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby
|
||||
, openjdk11-bootstrap }:
|
||||
|
||||
let
|
||||
@ -20,7 +20,7 @@ let
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ];
|
||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
|
||||
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ clangStdenv, lib, fetchFromGitHub, cmake, zlib, openexr,
|
||||
openimageio, llvm, boost165, flex, bison, partio, pugixml,
|
||||
util-linux, python
|
||||
util-linux, python3
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override { enableStatic = true; };
|
||||
@ -26,7 +26,7 @@ in clangStdenv.mkDerivation rec {
|
||||
zlib openexr openimageio llvm
|
||||
partio pugixml
|
||||
util-linux # needed just for hexdump
|
||||
python # CMake doesn't check this?
|
||||
python3 # CMake doesn't check this?
|
||||
];
|
||||
# TODO: How important is partio? CMake doesn't seem to find it
|
||||
meta = with lib; {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libpng, zlib, qt4,
|
||||
bison, flex, libGLU, pythonPackages
|
||||
bison, flex, libGLU, python2Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ];
|
||||
buildInputs = [ libGLU libpng zlib qt4 python2Packages.pyqt4 bison flex ];
|
||||
meta = with lib; {
|
||||
description = "Embeddable expression evaluation engine from Disney Animation";
|
||||
homepage = "https://www.disneyanimation.com/technology/seexpr.html";
|
||||
|
33
pkgs/development/coq-modules/graph-theory/default.nix
Normal file
33
pkgs/development/coq-modules/graph-theory/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap
|
||||
, hierarchy-builder, version ? null }:
|
||||
|
||||
with lib;
|
||||
|
||||
mkCoqDerivation {
|
||||
pname = "graph-theory";
|
||||
|
||||
release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI=";
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.13"; out = "0.9"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ];
|
||||
|
||||
meta = {
|
||||
description = "Library of formalized graph theory results in Coq";
|
||||
longDescription = ''
|
||||
A library of formalized graph theory results, including various
|
||||
standard results from the literature (e.g., Menger’s Theorem, Hall’s
|
||||
Marriage Theorem, and the excluded minor characterization of
|
||||
treewidth-two graphs) as well as some more recent results arising from
|
||||
the study of relation algebra within the ERC CoVeCe project (e.g.,
|
||||
soundness and completeness of an axiomatization of graph isomorphism).
|
||||
'';
|
||||
maintainers = with maintainers; [ siraben ];
|
||||
license = licenses.cecill-b;
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ pkgs, lib, emscripten, python }:
|
||||
{ pkgs, lib, emscripten, python2 }:
|
||||
|
||||
{ buildInputs ? [], nativeBuildInputs ? []
|
||||
|
||||
@ -12,8 +12,8 @@ pkgs.stdenv.mkDerivation (
|
||||
|
||||
pname = "emscripten-${lib.getName args}";
|
||||
version = lib.getVersion args;
|
||||
buildInputs = [ emscripten python ] ++ buildInputs;
|
||||
nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
|
||||
buildInputs = [ emscripten python2 ] ++ buildInputs;
|
||||
nativeBuildInputs = [ emscripten python2 ] ++ nativeBuildInputs;
|
||||
|
||||
# fake conftest results with emscripten's python magic
|
||||
EMCONFIGURE_JS=2;
|
||||
|
@ -85,6 +85,7 @@ with pkgs;
|
||||
(lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))
|
||||
{
|
||||
overrides = packageOverrides;
|
||||
python = self;
|
||||
};
|
||||
in rec {
|
||||
isPy27 = pythonVersion == "2.7";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
|
||||
{ lib, stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python2, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lvtk";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python wafHook ];
|
||||
nativeBuildInputs = [ pkg-config python2 wafHook ];
|
||||
buildInputs = [ boost gtkmm2 lv2 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
|
||||
{ lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv
|
||||
, fetchpatch
|
||||
, which
|
||||
, buildPackages
|
||||
|
@ -7,7 +7,7 @@
|
||||
, ApplicationServices
|
||||
, Cocoa
|
||||
, enablePython ? false
|
||||
, python
|
||||
, python ? null
|
||||
, swig
|
||||
}:
|
||||
|
||||
|
@ -81,6 +81,9 @@ stdenv.mkDerivation rec {
|
||||
# asn1 compilers, move them to $dev
|
||||
mv $out/libexec/heimdal/heimdal/* $dev/bin
|
||||
rmdir $out/libexec/heimdal/heimdal
|
||||
|
||||
# compile_et is needed for cross-compiling this package and samba
|
||||
mv lib/com_err/.libs/compile_et $dev/bin
|
||||
'';
|
||||
|
||||
# Issues with hydra
|
||||
|
@ -0,0 +1,29 @@
|
||||
From 8e6328e932ab2739f075e8e8d602c2370a2a8ce8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <musfay@protonmail.com>
|
||||
Date: Wed, 28 Jul 2021 02:26:39 +0300
|
||||
Subject: [PATCH] fix application dirs
|
||||
|
||||
---
|
||||
cprime/systemxdg.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
|
||||
index f9eee66..ea0553d 100644
|
||||
--- a/cprime/systemxdg.cpp
|
||||
+++ b/cprime/systemxdg.cpp
|
||||
@@ -233,8 +233,10 @@ void SystemXdgMime::setApplicationAsDefault( QString appFileName, QString mimety
|
||||
SystemXdgMime::SystemXdgMime() {
|
||||
|
||||
appsDirs << QDir::home().filePath( ".local/share/applications/" );
|
||||
- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/";
|
||||
- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/";
|
||||
+ appsDirs << QDir::home().filePath( ".nix-profile/share/applications/" );
|
||||
+ appsDirs << "/run/current-system/sw/share/applications/";
|
||||
+ appsDirs << "/run/current-system/sw/share/applications/kde4/";
|
||||
+ appsDirs << "/run/current-system/sw/share/gnome/applications/";
|
||||
};
|
||||
|
||||
DesktopFile SystemXdgMime::xdgDefaultApp( QMimeType mimeType ) {
|
||||
--
|
||||
2.32.0
|
||||
|
@ -19,6 +19,8 @@ mkDerivation rec {
|
||||
sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-application-dirs.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
|
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchgit, gettext, python, elfutils}:
|
||||
{lib, stdenv, fetchgit, gettext, python2, elfutils}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libsystemtap";
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ gettext python elfutils ];
|
||||
nativeBuildInputs = [ gettext python2 elfutils ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/include
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchzip
|
||||
, boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff
|
||||
, libwebp, libxml2, proj, python, sqlite, zlib
|
||||
, libwebp, libxml2, proj, python3, python ? python3, sqlite, zlib
|
||||
|
||||
# supply a postgresql package to enable the PostGIS input plugin
|
||||
, postgresql ? null
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
# a distinct dev output makes python-mapnik fail
|
||||
outputs = [ "out" ];
|
||||
|
||||
nativeBuildInputs = [ python ];
|
||||
nativeBuildInputs = [ python3 ];
|
||||
|
||||
buildInputs = [
|
||||
boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
|
||||
|
@ -3,7 +3,7 @@
|
||||
, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2
|
||||
, gtk2, genericUpdater, common-updater-scripts, libebur128
|
||||
, jack2, ladspa-sdk, swig, which, ncurses
|
||||
, enablePython ? false, python
|
||||
, enablePython ? false, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
|
||||
] ++ lib.optional enablePython ncurses;
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper which ]
|
||||
++ lib.optionals enablePython [ python swig ];
|
||||
++ lib.optionals enablePython [ python3 swig ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# Mostly taken from:
|
||||
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nuspell";
|
||||
version = "4.2.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nuspell";
|
||||
repo = "nuspell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ=";
|
||||
sha256 = "039ryhwfbbrrhavzyr999kngj10nk9n81i6qigxj6igfl4fzjy87";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config pandoc ];
|
||||
|
@ -6,7 +6,7 @@
|
||||
, gfortran
|
||||
, lhapdf
|
||||
, ncurses
|
||||
, python
|
||||
, python ? null
|
||||
, swig
|
||||
, yoda
|
||||
, zlib
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }:
|
||||
{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0";
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
buildInputs = [ boost eigen python vtk zlib tbb ];
|
||||
buildInputs = [ boost eigen python3 vtk zlib tbb ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/BioMedIA/MIRTK";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, pythonPackages }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, check, cppunit, perl, python3Packages }:
|
||||
|
||||
# NOTE: for subunit python library see pkgs/top-level/python-packages.nix
|
||||
|
||||
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ check cppunit perl pythonPackages.wrapPython ];
|
||||
buildInputs = [ check cppunit perl python3Packages.wrapPython ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [ testtools testscenarios ];
|
||||
propagatedBuildInputs = with python3Packages; [ testtools testscenarios ];
|
||||
|
||||
postFixup = "wrapPythonPrograms";
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
, wafHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "talloc";
|
||||
version = "2.3.2";
|
||||
|
||||
@ -42,6 +42,11 @@ stdenv.mkDerivation (rec {
|
||||
"--builtin-libraries=replace"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
# this must not be exported before the ConfigurePhase otherwise waf whines
|
||||
preBuild = lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
export NIX_CFLAGS_LINK="-no-pie -shared";
|
||||
@ -57,9 +62,4 @@ stdenv.mkDerivation (rec {
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly when cross-compiling.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
})
|
||||
}
|
||||
|
@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
pkg-config
|
||||
wafHook
|
||||
libxslt
|
||||
@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
|
||||
"--builtin-libraries=replace"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The trivial database";
|
||||
longDescription = ''
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-headers";
|
||||
version = "1.2.162.0";
|
||||
version = "1.2.182.0";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Headers";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "057c49w1138l02v9gqsk1z8wdz0iilp96jblnldycwm9jc1a1ipq";
|
||||
sha256 = "03j0kzq2qxhy0y82l10m8am26zrms2sjrdb1dcbpv9zh5vkxhcla";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,23 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkg-config
|
||||
, xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
|
||||
, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-loader";
|
||||
version = "1.2.162.0";
|
||||
version = "1.2.182.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Loader";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "0w9i2pliw4ccmjyfzff4i2f3hxwsfd54jg7ahv2v634qmx59bsbi";
|
||||
};
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Loader";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "0gmr9q3a6s8xvaa74fs9zbi9c305i2b3rx768qvl79nhbdj8nc02";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
|
||||
"-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"
|
||||
"-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include"
|
||||
];
|
||||
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolip";
|
||||
version = "1.1.4";
|
||||
version = "1.1.6";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1f8mlvbnfcn3sigsmjdpdpgxmnbvcjhfr7lzch61i8sy25dgakji";
|
||||
sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
, setuptools
|
||||
@ -21,24 +20,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nvchecker";
|
||||
version = "2.3";
|
||||
version = "2.4";
|
||||
|
||||
# Tests not included in PyPI tarball
|
||||
src = fetchFromGitHub {
|
||||
owner = "lilydjwg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx";
|
||||
sha256 = "0ys4shp7gz6aaxrbflwcz7yjbvdv2v8pgj047p4rnp8ascpxg044";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch";
|
||||
sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles docutils ];
|
||||
propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ];
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ];
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = version;
|
||||
sha256 = "sha256-S39rl8bJsxYAmTcaZk9+s9G45lOvREjlGVBk1m30tJo=";
|
||||
sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage {
|
||||
--ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
postPatch = ''
|
||||
sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py
|
||||
'';
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
# This seperates "what to build" (the exact gem versions) from "how to build"
|
||||
# (to make gems behave if necessary).
|
||||
|
||||
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python, stdenv, which
|
||||
{ lib, fetchurl, writeScript, ruby, libkrb5, libxml2, libxslt, python2, stdenv, which
|
||||
, libiconv, postgresql, v8, clang, sqlite, zlib, imagemagick, lasem
|
||||
, pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi
|
||||
, cmake, libssh2, openssl, libmysqlclient, git, perl, pcre, gecode_3, curl
|
||||
@ -328,7 +328,7 @@ in
|
||||
# otherwise the gem will fail to link to the libv8 binary.
|
||||
# see: https://github.com/cowboyd/libv8/pull/161
|
||||
libv8 = attrs: {
|
||||
buildInputs = [ which v8 python ];
|
||||
buildInputs = [ which v8 python2 ];
|
||||
buildFlags = [ "--with-system-v8=true" ];
|
||||
dontBuild = false;
|
||||
postPatch = ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
|
||||
, libserialport, librevisa, doxygen, glibmm, python
|
||||
, libserialport, librevisa, doxygen, glibmm
|
||||
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
|
||||
}:
|
||||
|
||||
@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libzip glib libusb1 libftdi1 check libserialport
|
||||
librevisa doxygen glibmm python
|
||||
librevisa doxygen glibmm
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p "$out/share/sigrok-firmware/"
|
||||
tar --strip-components=1 -xvf "${firmware}" -C "$out/share/sigrok-firmware/"
|
||||
|
23
pkgs/development/tools/misc/aviator/default.nix
Normal file
23
pkgs/development/tools/misc/aviator/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "aviator";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "herrjulz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Oa4z8n+q7LKWMnwk+xj9UunzOa3ChaPBCTo828yYJGQ=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
vendorSha256 = "sha256-rYOphvI1ZE8X5UExfgxHnWBn697SDkNnmxeY7ihIZ1s=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Merge YAML/JSON files in a in a convenient fashion";
|
||||
homepage = "https://github.com/herrjulz/aviator";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ risson ];
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, lib, stdenv, python, ncurses, ocamlPackages, pkg-config }:
|
||||
{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coccinelle";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = with ocamlPackages; [
|
||||
ocaml findlib menhir
|
||||
ocaml_pcre parmap stdcompat
|
||||
python ncurses pkg-config
|
||||
python3 ncurses pkg-config
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
23
pkgs/development/tools/misc/spruce/default.nix
Normal file
23
pkgs/development/tools/misc/spruce/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spruce";
|
||||
version = "1.28.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geofffranks";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cNO+6rMQPO1e4Hen8vcFU1FRnnCv2+fDYtXXbuR2UCU=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
vendorSha256 = "sha256-5EM4Z9AN1Mjy7DayII0Iu+XrjM9lyUqrScMT/fe43dw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A BOSH template merge tool";
|
||||
homepage = "https://github.com/geofffranks/spruce";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ risson ];
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }:
|
||||
{ lib, stdenv, fetchgit, glib, pkg-config, scons }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "hammer";
|
||||
@ -10,8 +10,10 @@ stdenv.mkDerivation {
|
||||
rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib python scons ];
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A bit-oriented parser combinator library";
|
||||
|
@ -1,31 +1,30 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, writeText
|
||||
, python3
|
||||
, glslang
|
||||
, libX11
|
||||
, libxcb
|
||||
, libXrandr
|
||||
, spirv-headers
|
||||
, spirv-tools
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, glslang
|
||||
, pkg-config
|
||||
, xlibsWrapper
|
||||
, libxcb
|
||||
, libXrandr
|
||||
, wayland
|
||||
}:
|
||||
# vulkan-validation-layers requires a custom glslang version, while glslang requires
|
||||
# custom versions for spirv-tools and spirv-headers. The git hashes required for all
|
||||
# of these deps is documented upstream here:
|
||||
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
|
||||
|
||||
let
|
||||
# vulkan-validation-layers requires a custom glslang & robin-hood-hashing
|
||||
# version, while glslang requires custom versions for spirv-tools and spirv-headers.
|
||||
#
|
||||
# The git hashes required for all of these deps is documented upstream here:
|
||||
# https://github.com/KhronosGroup/Vulkan-ValidationLayers/blob/master/scripts/known_good.json
|
||||
# and https://github.com/KhronosGroup/glslang/blob/master/known_good.json
|
||||
localSpirvHeaders = spirv-headers.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Headers";
|
||||
rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
|
||||
sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
|
||||
rev = "dafead1765f6c1a5f9f8a76387dcb2abe4e54acd"; # pin
|
||||
sha256 = "1kj6wcx9y7r1xyg8n7ai2pzrg9ira7hbakr45wh5p4zyxh0m45n8";
|
||||
};
|
||||
});
|
||||
localGlslang = (glslang.override {
|
||||
@ -33,8 +32,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-Tools";
|
||||
rev = "c9c1f54330d13a0bec1aa3f08d436249d8e35596";
|
||||
sha256 = "0r5whsw9x8j4199xwxv293ar2ga73pm2s7rngw732ylh6rw3bkly";
|
||||
rev = "dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07"; # pin
|
||||
sha256 = "0pxgbq6xapw9hgrzb3rk5cylzgg1y1bkqz5wxzwqls63pwga5912";
|
||||
};
|
||||
});
|
||||
argSpirv-headers = localSpirvHeaders;
|
||||
@ -42,55 +41,64 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "glslang";
|
||||
rev = "dd69df7f3dac26362e10b0f38efb9e47990f7537";
|
||||
sha256 = "1iafbh524avsjg4pjiq156b62pck2rwlfl2pjnml8sjy285506rk";
|
||||
rev = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73"; # pin
|
||||
sha256 = "0wwj7q509pkp8wj7120g1n2ddl4x2r03ljf5czd9794ji6yraidn";
|
||||
};
|
||||
});
|
||||
robin-hood-hashing = fetchFromGitHub {
|
||||
owner = "martinus";
|
||||
repo = "robin-hood-hashing";
|
||||
rev = "3.11.2"; # pin
|
||||
sha256 = "0103mnqpmka1smy0arnrbihlvi7i8xr5im0px8wn4faw4flikkcm";
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-validation-layers";
|
||||
version = "1.2.162.0";
|
||||
version = "1.2.182.0";
|
||||
|
||||
# If we were to use "dev" here instead of headers, the setupHook would be
|
||||
# placed in that output instead of "out".
|
||||
outputs = ["out" "headers"];
|
||||
outputInclude = "headers";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ValidationLayers";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "1mpqmxh9zm20jdar59lp4yjpqfzxn2pwds6bkvnzihfy0pymf15k";
|
||||
};
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ValidationLayers";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "1fnmb7vbm7y1x67bf1xiwdrpj9j4lkvhk9xhb6hp6x2aryvcyrnc";
|
||||
});
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
# layer definition json files.
|
||||
postPatch = ''
|
||||
sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
localGlslang
|
||||
localGlslang.spirv-headers
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
libX11
|
||||
libxcb
|
||||
libXrandr
|
||||
vulkan-headers
|
||||
wayland
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGLSLANG_INSTALL_DIR=${localGlslang}"
|
||||
"-DSPIRV_HEADERS_INSTALL_DIR=${localSpirvHeaders}"
|
||||
"-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"
|
||||
"-DBUILD_LAYER_SUPPORT_FILES=ON"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
# layer definition json files.
|
||||
patchPhase = ''
|
||||
sed "s|\([[:space:]]*set(INSTALL_DEFINES \''${INSTALL_DEFINES} -DRELATIVE_LAYER_BINARY=\"\)\(\$<TARGET_FILE_NAME:\''${TARGET_NAME}>\")\)|\1$out/lib/\2|" -i layers/CMakeLists.txt
|
||||
'';
|
||||
# Tests require access to vulkan-compatible GPU, which isn't
|
||||
# available in Nix sandbox. Fails with VK_ERROR_INCOMPATIBLE_DRIVER.
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "The official Khronos Vulkan validation layers";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, python, rustPlatform, SDL2, fltk, rapidjson, gtest, Carbon, Cocoa }:
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, python3, rustPlatform, SDL2, fltk, rapidjson, gtest, Carbon, Cocoa }:
|
||||
let
|
||||
version = "0.17.0";
|
||||
src = fetchFromGitHub {
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
pname = "ja2-stracciatella";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
nativeBuildInputs = [ cmake python3 ];
|
||||
buildInputs = [ SDL2 fltk rapidjson gtest ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
|
||||
|
||||
patches = [
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python2Packages, makeWrapper }:
|
||||
|
||||
let
|
||||
vasm =
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm ];
|
||||
buildInputs = [ pkg-config SDL2 glew xcftools python2Packages.python python2Packages.pillow vasm ];
|
||||
preBuild = ''
|
||||
patchShebangs img2tiles.py
|
||||
'';
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "1.40.0";
|
||||
version = "1.41.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U=";
|
||||
sha256 = "sha256-f/dmQvsWHlc9thJ9Ekp14VjdjW5+IMtD0vDMlYksUx4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM=";
|
||||
vendorSha256 = "sha256-C/1CuUbZEfawzAasTM1VsbK3vVvuRAWUR3cBm5zGzXs=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python, nodejs }:
|
||||
{ lib, mkYarnPackage, fetchFromGitHub, runCommand, makeWrapper, python3, nodejs }:
|
||||
|
||||
assert lib.versionAtLeast nodejs.version "12.0.0";
|
||||
|
||||
@ -26,7 +26,7 @@ in mkYarnPackage rec {
|
||||
|
||||
pkgConfig = {
|
||||
better-sqlite3 = {
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python3 ];
|
||||
postInstall = ''
|
||||
# build native sqlite bindings
|
||||
npm run build-release --offline --nodedir="${nodeSources}"
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages
|
||||
, python, ruby, jre, nettools, bc
|
||||
, python2, ruby, jre, nettools, bc
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
perlPackages.ListMoreUtils
|
||||
perlPackages.LWP
|
||||
perlPackages.DBDPg
|
||||
python
|
||||
python2
|
||||
ruby
|
||||
jre
|
||||
# tests
|
||||
@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||
"DESTDIR=$(out)"
|
||||
"PERLLIB=$(out)/${perlPackages.perl.libPrefix}"
|
||||
"PERL=${perlPackages.perl.outPath}/bin/perl"
|
||||
"PYTHON=${python.outPath}/bin/python"
|
||||
"PYTHON=${python2.outPath}/bin/python"
|
||||
"RUBY=${ruby.outPath}/bin/ruby"
|
||||
"JAVARUN=${jre.outPath}/bin/java"
|
||||
"PLUGINUSER=munin"
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "postgres_exporter";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wrouesnel";
|
||||
repo = "postgres_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Kv+sjqhlmH36L4YvDuGYODR/eTHA2TKQ6IUCXAiItyo=";
|
||||
sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yMcoUl9NsiiZQyEHlLu79DzIyl6BbhLZ/xNFavaGrEs=";
|
||||
vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY=";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "neard-0.16";
|
||||
@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ];
|
||||
pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ];
|
||||
buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]);
|
||||
pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ];
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, python
|
||||
, python2
|
||||
, makeWrapper
|
||||
, gawk
|
||||
, bash
|
||||
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
|
||||
fi
|
||||
done
|
||||
|
||||
wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin
|
||||
wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
@ -1,13 +1,15 @@
|
||||
{ lib, stdenv
|
||||
, buildPackages
|
||||
, fetchurl
|
||||
, python
|
||||
, python3
|
||||
, wafHook
|
||||
, pkg-config
|
||||
, bison
|
||||
, flex
|
||||
, perl
|
||||
, libxslt
|
||||
, heimdal
|
||||
, docbook_xsl
|
||||
, rpcgen
|
||||
, fixDarwinDylibNames
|
||||
, docbook_xml_dtd_45
|
||||
, readline
|
||||
@ -17,7 +19,6 @@
|
||||
, libarchive
|
||||
, zlib
|
||||
, liburing
|
||||
, fam
|
||||
, gnutls
|
||||
, libunwind
|
||||
, systemd
|
||||
@ -59,26 +60,30 @@ stdenv.mkDerivation rec {
|
||||
./patch-source3__libads__kerberos_keytab.c.patch
|
||||
./4.x-no-persistent-install-dynconfig.patch
|
||||
./4.x-fix-makeflags-parsing.patch
|
||||
./build-find-pre-built-heimdal-build-tools-in-case-of-.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3
|
||||
wafHook
|
||||
pkg-config
|
||||
bison
|
||||
flex
|
||||
perl
|
||||
perl.pkgs.ParseYapp
|
||||
libxslt
|
||||
buildPackages.stdenv.cc
|
||||
heimdal
|
||||
docbook_xsl
|
||||
docbook_xml_dtd_45
|
||||
cmocka
|
||||
rpcsvc-proto
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
rpcgen
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python
|
||||
python3
|
||||
readline
|
||||
popt
|
||||
dbus
|
||||
@ -86,7 +91,6 @@ stdenv.mkDerivation rec {
|
||||
libbsd
|
||||
libarchive
|
||||
zlib
|
||||
fam
|
||||
libunwind
|
||||
gnutls
|
||||
libtasn1
|
||||
@ -102,6 +106,8 @@ stdenv.mkDerivation rec {
|
||||
++ optional enableAcl acl
|
||||
++ optional enablePam pam;
|
||||
|
||||
wafPath = "buildtools/bin/waf";
|
||||
|
||||
postPatch = ''
|
||||
# Removes absolute paths in scripts
|
||||
sed -i 's,/sbin/,,g' ctdb/config/functions
|
||||
@ -112,7 +118,11 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs ./buildtools/bin
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
preConfigure = ''
|
||||
export PKGCONFIG="$PKG_CONFIG"
|
||||
'';
|
||||
|
||||
wafConfigureFlags = [
|
||||
"--with-static-modules=NONE"
|
||||
"--with-shared-modules=ALL"
|
||||
"--enable-fhs"
|
||||
@ -126,7 +136,15 @@ stdenv.mkDerivation rec {
|
||||
"--without-ads"
|
||||
] ++ optional enableProfiling "--with-profiling-data"
|
||||
++ optional (!enableAcl) "--without-acl-support"
|
||||
++ optional (!enablePam) "--without-pam";
|
||||
++ optional (!enablePam) "--without-pam"
|
||||
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
"--bundled-libraries=!asn1_compile,!compile_et"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
preBuild = ''
|
||||
export MAKEFLAGS="-j $NIX_BUILD_CORES"
|
||||
@ -146,6 +164,10 @@ stdenv.mkDerivation rec {
|
||||
patchelf --shrink-rpath "\$BIN";
|
||||
EOF
|
||||
find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \;
|
||||
|
||||
# Samba does its own shebang patching, but uses build Python
|
||||
find "$out/bin" -type f -executable -exec \
|
||||
sed -i '1 s^#!${python3.pythonForBuild}/bin/python.*^#!${python3.interpreter}^' {} \;
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
@ -0,0 +1,87 @@
|
||||
From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001
|
||||
From: Uri Simchoni <uri@samba.org>
|
||||
Date: Sun, 20 Oct 2019 00:03:14 +0300
|
||||
Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
|
||||
heimdal
|
||||
|
||||
This patch fixes the case of finding asn1_compile and compile_et for
|
||||
building embedded heimdal, by setting
|
||||
--bundled-libraries='!asn1_compile,!compile_et' as configure flags.
|
||||
|
||||
The Heimdal build tools compile_et and asn1_compile are needed *only*
|
||||
if we use the embedded heimdal (otherwise we don't build heimdal and
|
||||
use headers that have been generated by those tools elsewhere).
|
||||
|
||||
For cross-compilation with embedded heimdal, it is vital to use host build
|
||||
tools, and so asn1_compile and compile_et must be supplied and not
|
||||
built. One way of doing this would be to set the COMPILE_ET and
|
||||
ASN1_COMPILE env vars to the location of supplied binaries. Another way,
|
||||
which is more commonly used, is to exclude asn1_compile and compile_et
|
||||
from bundled packages via the switch
|
||||
-bundled-libraries='!asn1_compile,!compile_et'. When this is done,
|
||||
the build script searches the path for those tools and sets the
|
||||
ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly
|
||||
kind of a round-about way of doing things but this has become the
|
||||
de-facto standard amongst embedded distro builders).
|
||||
|
||||
In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of
|
||||
finding the binaris has been moved to be carried out only in the
|
||||
system heimdal case. As explained above, we only need these tools,
|
||||
and hence the check, in bundled mode.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164
|
||||
|
||||
Signed-off-by: Uri Simchoni <uri@samba.org>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Bernd: rebased for version 4.11.13]
|
||||
---
|
||||
wscript_configure_embedded_heimdal | 11 +++++++++++
|
||||
wscript_configure_system_heimdal | 11 -----------
|
||||
2 files changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
|
||||
index 8c55ae2a938..4fdae8062c5 100644
|
||||
--- a/wscript_configure_embedded_heimdal
|
||||
+++ b/wscript_configure_embedded_heimdal
|
||||
@@ -1 +1,12 @@
|
||||
conf.RECURSE('source4/heimdal_build')
|
||||
+
|
||||
+def check_system_heimdal_binary(name):
|
||||
+ if conf.LIB_MAY_BE_BUNDLED(name):
|
||||
+ return False
|
||||
+ if not conf.find_program(name, var=name.upper()):
|
||||
+ return False
|
||||
+ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
||||
+ return True
|
||||
+
|
||||
+check_system_heimdal_binary("compile_et")
|
||||
+check_system_heimdal_binary("asn1_compile")
|
||||
diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
|
||||
index 0ff6dad2f55..f77c177442f 100644
|
||||
--- a/wscript_configure_system_heimdal
|
||||
+++ b/wscript_configure_system_heimdal
|
||||
@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
|
||||
conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
||||
return True
|
||||
|
||||
-def check_system_heimdal_binary(name):
|
||||
- if conf.LIB_MAY_BE_BUNDLED(name):
|
||||
- return False
|
||||
- if not conf.find_program(name, var=name.upper()):
|
||||
- return False
|
||||
- conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
||||
- return True
|
||||
-
|
||||
check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
|
||||
|
||||
if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
|
||||
@@ -96,7 +96,4 @@
|
||||
#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
|
||||
# conf.define('USING_SYSTEM_TOMMATH', 1)
|
||||
|
||||
-check_system_heimdal_binary("compile_et")
|
||||
-check_system_heimdal_binary("asn1_compile")
|
||||
-
|
||||
conf.define('USING_SYSTEM_KRB5', 1)
|
||||
--
|
||||
2.20.1
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "darkice";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/darkice/${version}/darkice-${version}.tar.gz";
|
||||
sha256 = "1rlxds7ssq7nk2in4s46xws7xy9ylxsqgcz85hxjgh17lsm0y39c";
|
||||
url = "https://github.com/rafael2k/darkice/releases/download/v${version}/darkice-${version}.tar.gz";
|
||||
sha256 = "05yq7lggxygrkd76yiqby3msrgdn082p0qlvmzzv9xbw8hmyra76";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, pythonPackages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }:
|
||||
{ lib, python2Packages, fetchFromGitHub, pkg-config, glib, alsa-lib, libjack2 }:
|
||||
|
||||
pythonPackages.buildPythonApplication {
|
||||
python2Packages.buildPythonApplication {
|
||||
version = "2015-11-17";
|
||||
pname = "mididings";
|
||||
|
||||
@ -12,8 +12,8 @@ pythonPackages.buildPythonApplication {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib alsa-lib libjack2 pythonPackages.boost ];
|
||||
propagatedBuildInputs = with pythonPackages; [ decorator ]
|
||||
buildInputs = [ glib alsa-lib libjack2 python2Packages.boost ];
|
||||
propagatedBuildInputs = with python2Packages; [ decorator ]
|
||||
# for livedings
|
||||
++ [ tkinter pyliblo ]
|
||||
# for mididings.extra
|
||||
@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication {
|
||||
|
||||
preBuild = with lib.versions; ''
|
||||
substituteInPlace setup.py \
|
||||
--replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}"
|
||||
--replace boost_python "boost_python${major python2Packages.python.version}${minor python2Packages.python.version}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuse-overlayfs";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YNR9Cj2StbmA2MjoQEWgJCMoHXQ1wIYikXGUEkmJEIg=";
|
||||
sha256 = "sha256-eJTyiepQpCptZUnlmWTYejCyzf3QHCzqrn67UjW9mU4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, coreutils, makeWrapper
|
||||
, rsync, python3, pythonPackages }:
|
||||
, rsync, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mergerfs-tools";
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
postInstall = with lib; ''
|
||||
wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]}
|
||||
wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]}
|
||||
wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]}
|
||||
wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ python3.pkgs.xattr ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, python
|
||||
, python3
|
||||
, fuse
|
||||
, pkg-config
|
||||
, libpcap
|
||||
@ -19,10 +18,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ fuse libpcap zlib python ];
|
||||
[ fuse libpcap zlib python3 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildFlags = lib.optionals stdenv.isDarwin [ "CPPFLAGS=-UHAVE_STRUCT_STAT_ST_BIRTHTIME" ];
|
||||
|
||||
|
@ -8,9 +8,9 @@ diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
|
||||
index 4b06ccb..3cad2ab 100644
|
||||
--- a/squashfs-tools/action.c
|
||||
+++ b/squashfs-tools/action.c
|
||||
@@ -38,6 +38,10 @@
|
||||
#include <limits.h>
|
||||
@@ -39,6 +39,10 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
+#ifndef FNM_EXTMATCH /* glibc extension */
|
||||
+ #define FNM_EXTMATCH 0
|
||||
@ -19,7 +19,7 @@ index 4b06ccb..3cad2ab 100644
|
||||
#include "squashfs_fs.h"
|
||||
#include "mksquashfs.h"
|
||||
#include "action.h"
|
||||
@@ -2284,9 +2288,12 @@ static char *get_start(char *s, int n)
|
||||
@@ -2414,9 +2418,12 @@ static char *get_start(char *s, int n)
|
||||
|
||||
static int subpathname_fn(struct atom *atom, struct action_data *action_data)
|
||||
{
|
||||
@ -27,7 +27,7 @@ index 4b06ccb..3cad2ab 100644
|
||||
+ char *path = strdup(action_data->subpath);
|
||||
+ int is_match = fnmatch(atom->argv[0], get_start(path,
|
||||
count_components(atom->argv[0])),
|
||||
FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == 0;
|
||||
FNM_PATHNAME|FNM_EXTMATCH) == 0;
|
||||
+ free(path);
|
||||
+ return is_match;
|
||||
}
|
||||
@ -116,8 +116,8 @@ index a45b77f..3607448 100644
|
||||
+#endif
|
||||
|
||||
#ifndef linux
|
||||
#define __BYTE_ORDER BYTE_ORDER
|
||||
@@ -4348,6 +4356,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
|
||||
#include <sys/sysctl.h>
|
||||
@@ -5022,6 +5030,7 @@ static void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
|
||||
sigemptyset(&sigmask);
|
||||
sigaddset(&sigmask, SIGQUIT);
|
||||
sigaddset(&sigmask, SIGHUP);
|
||||
@ -125,7 +125,7 @@ index a45b77f..3607448 100644
|
||||
if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
|
||||
BAD_ERROR("Failed to set signal mask in intialise_threads\n");
|
||||
|
||||
@@ -5195,6 +5204,35 @@ int get_physical_memory()
|
||||
@@ -5760,6 +5769,35 @@ static int get_physical_memory()
|
||||
long long page_size = sysconf(_SC_PAGESIZE);
|
||||
int phys_mem;
|
||||
|
||||
@ -161,7 +161,7 @@ index a45b77f..3607448 100644
|
||||
if(num_pages == -1 || page_size == -1) {
|
||||
struct sysinfo sys;
|
||||
int res = sysinfo(&sys);
|
||||
@@ -5207,6 +5245,7 @@ int get_physical_memory()
|
||||
@@ -5772,6 +5810,7 @@ static int get_physical_memory()
|
||||
}
|
||||
|
||||
phys_mem = num_pages * page_size >> 20;
|
||||
@ -173,9 +173,9 @@ diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c
|
||||
index 4debedf..3257c30 100644
|
||||
--- a/squashfs-tools/read_xattrs.c
|
||||
+++ b/squashfs-tools/read_xattrs.c
|
||||
@@ -39,13 +39,13 @@
|
||||
#include <endian.h>
|
||||
#endif
|
||||
@@ -31,13 +31,13 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
@ -206,7 +206,7 @@ index 727f1d5..c1a6183 100644
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
@@ -1080,7 +1084,7 @@ int create_inode(char *pathname, struct inode *i)
|
||||
@@ -1175,7 +1179,7 @@ int create_inode(char *pathname, struct inode *i)
|
||||
break;
|
||||
case SQUASHFS_SYMLINK_TYPE:
|
||||
case SQUASHFS_LSYMLINK_TYPE: {
|
||||
@ -215,7 +215,7 @@ index 727f1d5..c1a6183 100644
|
||||
{ i->time, 0 },
|
||||
{ i->time, 0 }
|
||||
};
|
||||
@@ -1099,8 +1103,7 @@ int create_inode(char *pathname, struct inode *i)
|
||||
@@ -1194,8 +1198,7 @@ int create_inode(char *pathname, struct inode *i)
|
||||
goto failed;
|
||||
}
|
||||
|
||||
@ -223,16 +223,16 @@ index 727f1d5..c1a6183 100644
|
||||
- AT_SYMLINK_NOFOLLOW);
|
||||
+ res = lutimes(pathname, times);
|
||||
if(res == -1) {
|
||||
EXIT_UNSQUASH_STRICT("create_inode: failed to set time on "
|
||||
"%s, because %s\n", pathname,
|
||||
@@ -2235,6 +2238,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
|
||||
sigemptyset(&sigmask);
|
||||
sigaddset(&sigmask, SIGQUIT);
|
||||
sigaddset(&sigmask, SIGHUP);
|
||||
+ sigaddset(&sigmask, SIGALRM);
|
||||
if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
|
||||
EXIT_UNSQUASH("Failed to set signal mask in initialise_threads"
|
||||
"\n");
|
||||
EXIT_UNSQUASH_STRICT("create_inode: failed to"
|
||||
" set time on %s, because %s\n",
|
||||
@@ -2683,6 +2686,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size, int cat_
|
||||
sigemptyset(&sigmask);
|
||||
sigaddset(&sigmask, SIGQUIT);
|
||||
sigaddset(&sigmask, SIGHUP);
|
||||
+ sigaddset(&sigmask, SIGALRM);
|
||||
if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) != 0)
|
||||
EXIT_UNSQUASH("Failed to set signal mask in initialise_threads\n");
|
||||
|
||||
diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
|
||||
index 934618b..0e680ab 100644
|
||||
--- a/squashfs-tools/unsquashfs.h
|
||||
@ -245,14 +245,14 @@ index 934618b..0e680ab 100644
|
||||
+ #define FNM_EXTMATCH 0
|
||||
+#endif
|
||||
+
|
||||
#ifndef linux
|
||||
#define __BYTE_ORDER BYTE_ORDER
|
||||
#define __BIG_ENDIAN BIG_ENDIAN
|
||||
#include "endian_compat.h"
|
||||
#include "squashfs_fs.h"
|
||||
#include "unsquashfs_error.h"
|
||||
diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c
|
||||
index c8e2b9b..7d4f7af 100644
|
||||
--- a/squashfs-tools/unsquashfs_info.c
|
||||
+++ b/squashfs-tools/unsquashfs_info.c
|
||||
@@ -97,31 +97,22 @@ void dump_state()
|
||||
@@ -96,31 +96,22 @@ void dump_state()
|
||||
void *info_thrd(void *arg)
|
||||
{
|
||||
sigset_t sigmask;
|
||||
@ -289,7 +289,7 @@ index c8e2b9b..7d4f7af 100644
|
||||
"because %s\n", strerror(errno));
|
||||
}
|
||||
}
|
||||
@@ -133,8 +124,12 @@ void *info_thrd(void *arg)
|
||||
@@ -132,8 +123,12 @@ void *info_thrd(void *arg)
|
||||
/* set one second interval period, if ^\ received
|
||||
within then, dump queue and cache status */
|
||||
waiting = 1;
|
||||
|
@ -1,11 +1,12 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile,
|
||||
eigen, libpng, python, libGLU, qt4, openexr, openimageio,
|
||||
eigen, libpng, python3, libGLU, qt4, openexr, openimageio,
|
||||
opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper
|
||||
}:
|
||||
|
||||
let boost_static = boost165.override {
|
||||
enableStatic = true;
|
||||
enablePython = true;
|
||||
python = python3;
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
@ -20,7 +21,7 @@ in stdenv.mkDerivation rec {
|
||||
};
|
||||
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
|
||||
buildInputs = [
|
||||
boost_static guile eigen libpng python
|
||||
boost_static guile eigen libpng python3
|
||||
libGLU qt4 openexr openimageio opencolorio_1 xercesc
|
||||
osl seexpr
|
||||
];
|
||||
@ -59,7 +60,7 @@ in stdenv.mkDerivation rec {
|
||||
# Work around a bug in the CMake build:
|
||||
postInstall = ''
|
||||
chmod a+x $out/bin/*
|
||||
wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python}
|
||||
wrapProgram $out/bin/appleseed.studio --set PYTHONHOME ${python3}
|
||||
'';
|
||||
}
|
||||
|
||||
|
@ -2,14 +2,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-extension-layer";
|
||||
version = "2020-11-20";
|
||||
version = "1.2.182.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ExtensionLayer";
|
||||
rev = "7474cb8e1f70e9f4a8bf382708a7f15465453af5";
|
||||
sha256 = "1lxkgcnv32wqk4hlckv13xy84g38jzgc4qxp9vsbkrgz87hkdvwj";
|
||||
};
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-ExtensionLayer";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "0by2kp48jbd55xk26rmlvc4wm77g1zvidx8czn1587ng2yzi7acr";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ cmake jq ];
|
||||
|
||||
|
@ -1,26 +1,44 @@
|
||||
{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi
|
||||
, libxcb, pkg-config, python3, symlinkJoin, vulkan-headers, vulkan-loader
|
||||
, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm
|
||||
, xlibsWrapper }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, python3
|
||||
, jq
|
||||
, expat
|
||||
, libX11
|
||||
, libXdmcp
|
||||
, libXrandr
|
||||
, libffi
|
||||
, libxcb
|
||||
, wayland
|
||||
, xcbutilkeysyms
|
||||
, xcbutilwm
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, symlinkJoin
|
||||
, vulkan-validation-layers
|
||||
, writeText
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-tools-lunarg";
|
||||
# The version must match that in vulkan-headers
|
||||
version = "1.2.162.0";
|
||||
version = "1.2.182.0";
|
||||
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "LunarG";
|
||||
repo = "VulkanTools";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "13v4202bfd7d7nwi8w12ja9k1vi10p9xxypzkpi063hmsgzxm5k5";
|
||||
sha256 = "1b7762fcbakfvj2b2l68qj25pc7pz9jhfabf1x80b9w3q205hl2f";
|
||||
fetchSubmodules = true;
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config python3 jq ];
|
||||
nativeBuildInputs = [ cmake python3 jq ];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
libX11
|
||||
libXdmcp
|
||||
libXrandr
|
||||
libffi
|
||||
@ -28,7 +46,6 @@ stdenv.mkDerivation rec {
|
||||
wayland
|
||||
xcbutilkeysyms
|
||||
xcbutilwm
|
||||
xlibsWrapper
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -40,6 +57,8 @@ stdenv.mkDerivation rec {
|
||||
paths = [ vulkan-validation-layers.headers vulkan-validation-layers ];
|
||||
}
|
||||
}"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@ -63,7 +82,6 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
# Same as vulkan-validation-layers
|
||||
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
|
||||
dontPatchELF = true;
|
||||
|
||||
# Help vulkan-loader find the validation layers
|
||||
|
@ -1,20 +1,23 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, python3, vulkan-loader,
|
||||
vulkan-headers, glslang, pkg-config, xlibsWrapper, libxcb,
|
||||
libXrandr, wayland }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, glslang, libX11, libxcb
|
||||
, libXrandr, vulkan-headers, vulkan-loader, wayland }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vulkan-tools";
|
||||
version = "1.2.162.0";
|
||||
version = "1.2.182.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Tools";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "088vqh956zma3p1qc3p6rsygf5s395b6cv8b1x0whp2a0a1y81xz";
|
||||
};
|
||||
# It's not strictly necessary to have matching versions here, however
|
||||
# since we're using the SDK version we may as well be consistent with
|
||||
# the rest of nixpkgs.
|
||||
src = (assert version == vulkan-headers.version;
|
||||
fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "Vulkan-Tools";
|
||||
rev = "sdk-${version}";
|
||||
sha256 = "028l2l7jx4443k8207q8jmjq1mnnm9kgyl2417jrkrvylcbv8ji9";
|
||||
});
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ glslang libX11 libxcb libXrandr vulkan-headers vulkan-loader wayland ];
|
||||
|
||||
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
|
||||
|
||||
@ -23,9 +26,10 @@ stdenv.mkDerivation rec {
|
||||
cmakeFlags = [
|
||||
# Don't build the mock ICD as it may get used instead of other drivers, if installed
|
||||
"-DBUILD_ICD=OFF"
|
||||
"-DGLSLANG_INSTALL_DIR=${glslang}"
|
||||
# vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
|
||||
"-DCMAKE_INSTALL_RPATH=${libraryPath}"
|
||||
# Hide dev warnings that are useless for packaging
|
||||
"-Wno-dev"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
with python3.pkgs; buildPythonPackage rec {
|
||||
pname = "esphome-dashboard";
|
||||
version = "20210719.0";
|
||||
version = "20210728.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc=";
|
||||
sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ=";
|
||||
};
|
||||
|
||||
# no tests
|
||||
|
@ -16,13 +16,13 @@ let
|
||||
in
|
||||
with python.pkgs; buildPythonApplication rec {
|
||||
pname = "esphome";
|
||||
version = "1.20.1";
|
||||
version = "1.20.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uCMxtMEOWrlOpc8SXDzleLY5VfyizmSh1tWgxTLUjzg=";
|
||||
sha256 = "sha256-th0UJsLTJ8fAgiIv3HvNrbigFwoJO7gEXObYFV3c3WA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -10,13 +10,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "flameshot";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flameshot-org";
|
||||
repo = "flameshot";
|
||||
rev = "v${version}";
|
||||
sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2";
|
||||
sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub }:
|
||||
{ lib, python2, fetchFromGitHub }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python2.pkgs.buildPythonPackage rec {
|
||||
pname = "me_cleaner";
|
||||
version = "1.2";
|
||||
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-07-27";
|
||||
version = "2021-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab";
|
||||
sha256 = "sha256-cM7VxZRIs5QktjI1YkJGtdxkA1/CXCCuVynyTVCILsI=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -1,9 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, autoconf, bison, libpaper, gperf, file, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "a2ps-4.14";
|
||||
pname = "a2ps";
|
||||
version = "4.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/a2ps/${name}.tar.gz";
|
||||
url = "mirror://gnu/a2ps/a2ps-${version}.tar.gz";
|
||||
sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk";
|
||||
};
|
||||
|
||||
|
@ -1,10 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, gettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "enscript-1.6.6";
|
||||
pname = "enscript";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/enscript/${name}.tar.gz";
|
||||
url = "mirror://gnu/enscript/enscript-${version}.tar.gz";
|
||||
sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd";
|
||||
};
|
||||
|
||||
|
@ -2001,8 +2001,8 @@ in
|
||||
};
|
||||
|
||||
libtensorflow =
|
||||
if python.pkgs.tensorflow ? libtensorflow
|
||||
then python.pkgs.tensorflow.libtensorflow
|
||||
if python3.pkgs.tensorflow ? libtensorflow
|
||||
then python3.pkgs.tensorflow.libtensorflow
|
||||
else libtensorflow-bin;
|
||||
|
||||
libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix {
|
||||
@ -3537,9 +3537,7 @@ in
|
||||
birdfont = callPackage ../tools/misc/birdfont { };
|
||||
xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; };
|
||||
|
||||
blastem = callPackage ../misc/emulators/blastem {
|
||||
inherit (python27Packages) pillow;
|
||||
};
|
||||
blastem = callPackage ../misc/emulators/blastem { };
|
||||
|
||||
blueberry = callPackage ../tools/bluetooth/blueberry { };
|
||||
|
||||
@ -3758,7 +3756,7 @@ in
|
||||
convertlit = callPackage ../tools/text/convertlit { };
|
||||
|
||||
collectd = callPackage ../tools/system/collectd {
|
||||
libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
|
||||
libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet
|
||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
|
||||
@ -9052,6 +9050,8 @@ in
|
||||
|
||||
srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { };
|
||||
|
||||
srtrelay = callPackage ../applications/video/srtrelay { };
|
||||
|
||||
sourcehut = callPackage ../applications/version-management/sourcehut { };
|
||||
|
||||
sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { };
|
||||
@ -11842,6 +11842,8 @@ in
|
||||
|
||||
manticore = callPackage ../development/compilers/manticore { };
|
||||
|
||||
marst = callPackage ../development/compilers/marst { };
|
||||
|
||||
mercury = callPackage ../development/compilers/mercury {
|
||||
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
};
|
||||
@ -12598,7 +12600,7 @@ in
|
||||
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
};
|
||||
|
||||
me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { };
|
||||
me_cleaner = callPackage ../tools/misc/me_cleaner { };
|
||||
|
||||
mesos-dns = callPackage ../servers/mesos-dns { };
|
||||
|
||||
@ -13091,6 +13093,8 @@ in
|
||||
|
||||
automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { };
|
||||
|
||||
aviator = callPackage ../development/tools/misc/aviator { };
|
||||
|
||||
awf = callPackage ../development/tools/misc/awf { };
|
||||
|
||||
aws-adfs = with python3Packages; toPythonApplication aws-adfs;
|
||||
@ -13500,7 +13504,7 @@ in
|
||||
|
||||
libsigrok = callPackage ../development/tools/libsigrok { };
|
||||
# old version:
|
||||
libsigrok-0-3-0 = libsigrok.override {
|
||||
libsigrok_0_3 = libsigrok.override {
|
||||
version = "0.3.0";
|
||||
sha256 = "0l3h7zvn3w4c1b9dgvl3hirc4aj1csfkgbk87jkpl7bgl03nk4j3";
|
||||
};
|
||||
@ -14346,6 +14350,8 @@ in
|
||||
|
||||
spooles = callPackage ../development/libraries/science/math/spooles {};
|
||||
|
||||
spruce = callPackage ../development/tools/misc/spruce { };
|
||||
|
||||
sqlcheck = callPackage ../development/tools/database/sqlcheck { };
|
||||
|
||||
sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { };
|
||||
@ -17205,9 +17211,12 @@ in
|
||||
|
||||
libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
|
||||
python = python2;
|
||||
};
|
||||
|
||||
libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { };
|
||||
libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix {
|
||||
python = python2;
|
||||
};
|
||||
|
||||
libtorrent-rasterbar = libtorrent-rasterbar-2_0_x;
|
||||
|
||||
@ -17620,7 +17629,7 @@ in
|
||||
|
||||
mvapich = callPackage ../development/libraries/mvapich { };
|
||||
|
||||
mygpoclient = pythonPackages.mygpoclient;
|
||||
mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;
|
||||
|
||||
mygui = callPackage ../development/libraries/mygui {
|
||||
ogre = ogre1_9;
|
||||
@ -17832,6 +17841,7 @@ in
|
||||
|
||||
opencv4 = callPackage ../development/libraries/opencv/4.x.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox;
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
opencv = opencv4;
|
||||
@ -20277,10 +20287,7 @@ in
|
||||
|
||||
deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
|
||||
|
||||
samba4 = callPackage ../servers/samba/4.x.nix {
|
||||
rpcgen = netbsd.rpcgen;
|
||||
python = python3;
|
||||
};
|
||||
samba4 = callPackage ../servers/samba/4.x.nix { };
|
||||
|
||||
samba = samba4;
|
||||
|
||||
@ -25191,6 +25198,7 @@ in
|
||||
stdenv = gcc6Stdenv;
|
||||
boost = boost155.override {
|
||||
enablePython = true;
|
||||
python = python2;
|
||||
stdenv = gcc6Stdenv;
|
||||
buildPackages = buildPackages // {
|
||||
stdenv = gcc6Stdenv;
|
||||
@ -30787,7 +30795,9 @@ in
|
||||
|
||||
scotch = callPackage ../applications/science/math/scotch { };
|
||||
|
||||
mininet = callPackage ../tools/virtualization/mininet { };
|
||||
mininet = callPackage ../tools/virtualization/mininet {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
msieve = callPackage ../applications/science/math/msieve { };
|
||||
|
||||
|
@ -42,6 +42,7 @@ let
|
||||
fourcolor = callPackage ../development/coq-modules/fourcolor {};
|
||||
gappalib = callPackage ../development/coq-modules/gappalib {};
|
||||
goedel = callPackage ../development/coq-modules/goedel {};
|
||||
graph-theory = callPackage ../development/coq-modules/graph-theory {};
|
||||
heq = callPackage ../development/coq-modules/heq {};
|
||||
hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
|
||||
HoTT = callPackage ../development/coq-modules/HoTT {};
|
||||
|
@ -4514,7 +4514,7 @@ in {
|
||||
mlxtend = callPackage ../development/python-modules/mlxtend { };
|
||||
|
||||
mlt = toPythonModule (pkgs.mlt.override {
|
||||
inherit python;
|
||||
python3 = python;
|
||||
enablePython = true;
|
||||
});
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user