diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:16:15 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-12-26 14:17:36 +0100 |
commit | 77b6c3cd06a679140fb5a44f81f904497007f333 (patch) | |
tree | e8ed1606b326cdafba719cc2a14c527c1b601f2e /pkgs/applications/version-management | |
parent | 602bccd1a8262d4e6bd787838d21fc3c2c1c50ba (diff) | |
parent | 4d2dd1554618831f0a5b159b8a4dff86612c02a9 (diff) | |
download | nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.gz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.bz2 nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.lz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.xz nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.tar.zst nixpkgs-77b6c3cd06a679140fb5a44f81f904497007f333.zip |
Merge remote-tracking branch 'origin/master' into gcc-9
Diffstat (limited to 'pkgs/applications/version-management')
54 files changed, 2006 insertions, 3080 deletions
diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 8c82ed1d451..d8a6ec05844 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,12 +1,12 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.1.24438"; + version = "4.3.2.24472"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "19rbcl0l49qbzn4bisdl9ibj0qm83kjkclva4qcy7jaqna9g7qrh"; + sha256 = "1msygg01yi0n8lpk8sl226p09ls7wvd3z3k067mdgrss8rjy5va5"; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix deleted file mode 100644 index 7d1de378f53..00000000000 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, pythonPackages, fetchurl }: - -# -# Upstream stopped development of this package. If this package does not build -# anymore, feel free to remove it by reverting the appropriate patch -# (git log --grep bugseverywhere) -# -pythonPackages.buildPythonApplication rec { - version = "1.1.1"; - pname = "bugseverywhere"; - - src = fetchurl { - url = - "mirror://pypi/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz"; - sha256 = "1ikm3ckwpimwcvx32vy7gh5gbp7q750j3327m17nvrj99g3daz2d"; - }; - - # There are no tests in the repository. - doCheck = false; - - buildInputs = with pythonPackages; [ - jinja2 - cherrypy - ]; - - meta = with stdenv.lib; { - description = "Bugtracker supporting distributed revision control"; - homepage = http://www.bugseverywhere.org/; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; - }; -} - diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 0a1ecbb6532..176e42bbd8a 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.48"; + version = "1.49"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.48.tar.gz"; - sha256 = "16gw24y5x96mx6zby8cys0f03x1bqw4r7g1390qlpg75pbydqlf9"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.49.tar.gz"; + sha256 = "1d75aq6inmd6yvc3rpxw1al95lvbl7wq64v3wygq69prrnzg8b6i"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix deleted file mode 100644 index fc591dd710e..00000000000 --- a/pkgs/applications/version-management/diffuse/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, python27Packages, makeWrapper }: - -let - inherit (python27Packages) pygtk python; -in stdenv.mkDerivation rec { - version = "0.4.8"; - pname = "diffuse"; - - src = fetchurl { - url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1"; - }; - - buildInputs = [ python pygtk makeWrapper ]; - - buildPhase = '' - python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python" - wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0 - ''; - - # no-op, everything is done in buildPhase - installPhase = "true"; - - # NOTE: diffuse installs a .desktop file itself - - meta = with stdenv.lib; { - description = "Graphical diff and merge tool"; - homepage = http://diffuse.sourceforge.net/; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 5c46879e319..8a41221a267 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! - stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.maggesi stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index db82cc54135..d57ffd75d7f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -103,6 +103,8 @@ let git-imerge = callPackage ./git-imerge { }; + git-machete = python3Packages.callPackage ./git-machete { }; + git-octopus = callPackage ./git-octopus { }; git-open = callPackage ./git-open { }; @@ -127,6 +129,8 @@ let git-subrepo = callPackage ./git-subrepo { }; + git-subtrac = callPackage ./git-subtrac { }; + git-sync = callPackage ./git-sync { }; git-test = callPackage ./git-test { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 023b9f6d967..2551c980fa8 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "11kjxa39mqdd9jh969ibxd0nlp9bacj2fm4cj6sk4gp6xf7gv90h"; + sha256 = "1c2zqvkzkrj8rcz226vfk43yw113b1fdcz2gx0xh8fs72arqx6wh"; }; cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1"; @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/dandavison/delta"; description = "A syntax-highlighting pager for git"; + changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 09c9169e434..cfdcd80f38b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; - version = "4.7.0"; + version = "5.1.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0pab4f5kmmcn333aswkgndf1fgilc41h8h0rk3lviz0yi8j59vaq"; + sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky"; }; + nativeBuildInputs = [ unixtools.column which ]; + dontBuild = true; - installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + preInstall = '' + patchShebangs . + ''; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + # bash completion is already handled by make install install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index d445e0181f4..61852684387 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.1.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf"; + sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; }; - cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx"; + cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + postFixup = '' + wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + ''; meta = with stdenv.lib; { description = "Cleanup stale Git branches of pull requests"; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 193133d6d3e..33b3d0bc167 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { - sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z"; - rev = "v${version}"; - repo = "git-hub"; owner = "sociomantic-tsunami"; + repo = "git-hub"; + rev = "v${version}"; + sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb"; }; buildInputs = [ python2Packages.python ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix new file mode 100644 index 00000000000..92c54dcac6b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonApplication, fetchPypi +, installShellFiles, pbr +, flake8, mock, pycodestyle, pylint, tox }: + +buildPythonApplication rec { + pname = "git-machete"; + version = "2.12.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m4j8nhdkr28xs2xbnyy3ric9i99swb4d5drj4wpkqd2xqln5wlq"; + }; + + nativeBuildInputs = [ installShellFiles pbr ]; + + # TODO: Add missing check inputs (2019-11-22): + # - stestr + doCheck = false; + checkInputs = [ flake8 mock pycodestyle pylint tox ]; + + postInstall = '' + installShellCompletion --bash --name git-machete completion/git-machete.completion.bash + installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + ''; + + meta = with lib; { + homepage = https://github.com/VirtusLab/git-machete; + description = "Git repository organizer and rebase workflow automation tool"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.blitz ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index b196d39b46f..969ea7cc2fa 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/ingydotnet/git-subrepo; description = "Git submodule alternative"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix ++ platforms.darwin; maintainers = [ maintainers.ryantrinkle ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix new file mode 100644 index 00000000000..07c63ea0119 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "git-subtrac"; + version = "0.01"; + + src = fetchFromGitHub { + owner = "apenwarr"; + repo = pname; + rev = "v${version}"; + sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + }; + + modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; + + meta = with lib; { + description = "Keep the content for your git submodules all in one place: the parent repo"; + homepage = "https://github.com/apenwarr/git-subtrac"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 46bbc72fb3b..312879a49e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, buildPackages -, curl, openssl, zlib, expat, perlPackages, python, gettext, cpio +, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.23.0"; + version = "2.24.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3"; + sha256 = "0ql5z31vgl7b785gwrf00m129mg7zi9pa65n12ij3mpxx3f28gvj"; }; outputs = [ "out" ]; @@ -91,9 +91,9 @@ stdenv.mkDerivation { "SHELL_PATH=${stdenv.shell}" ] ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) - ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) + ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] - ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) + ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; @@ -230,6 +230,7 @@ stdenv.mkDerivation { -e "s|exec wish|exec '${tk}/bin/wish'|g" \ "$out/$prog" done + ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts for prog in bin/gitk libexec/git-core/git-gui; do @@ -253,7 +254,10 @@ stdenv.mkDerivation { installCheckTarget = "test"; # see also installCheckFlagsArray - installCheckFlags = "DEFAULT_TEST_TARGET=prove"; + installCheckFlags = [ + "DEFAULT_TEST_TARGET=prove" + "PERL_PATH=${buildPackages.perl}/bin/perl" + ]; preInstallCheck = '' installCheckFlagsArray+=( @@ -290,14 +294,18 @@ stdenv.mkDerivation { disable_test t1700-split-index "null sha1" # Tested to fail: 2.18.0 - disable_test t7005-editor "editor with a space" - disable_test t7005-editor "core.editor with a space" - - # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" - # As of 2.19.0, t5562 refers to #!/usr/bin/perl - patchShebangs t/t5562/invoke-with-content-length.pl + ${stdenv.lib.optionalString (!perlSupport) '' + # request-pull is a Bash script that invokes Perl, so it is not available + # when NO_PERL=1, and the test should be skipped, but the test suite does + # not check for the Perl prerequisite. + disable_test t5150-request-pull + ''} + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # XXX: Some tests added in 2.24.0 fail. + # Please try to re-enable on the next release. + disable_test t7816-grep-binary-pattern '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index 05944014743..a9fa18be155 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq +#!nix-shell -i bash -p curl common-updater-scripts jq git set -eu -o pipefail -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')" +oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" if [ ! "${oldVersion}" = "${latestTag}" ]; then diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index e40bfc9961b..ee21a2158ac 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.8"; + version = "2.13.0"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "0a2dpg0w29nblk1dba9a35bpwwyf0zbqcgrwn4a8diyx27b77x3x"; + sha256 = "18b0r16fk5wahvysqvg6vzjr7smyc2sdxp9sf55viby3kkwjfbkh"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index a1ef489b007..3e47631caf6 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "lab"; - version = "0.16.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0f1gi4mlcxjvz2sgh0hzzsqxg5gfvq2ay7xjd0y1kz3pp8kxja7i"; + sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c"; }; subPackages = [ "." ]; - modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb"; + modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 03933788551..3636ad11fb6 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.8"; + name = "subgit-3.3.9"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://subgit.com/download/${name}.zip"; - sha256 = "0gvyyr4prx1v06f9j9fmmr8br1gjd45bnncl40c9agiqsyy0q06n"; + sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5"; }; } diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 59354598d00..424694d7262 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, fetchpatch , readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig }: stdenv.mkDerivation rec { pname = "tig"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; + sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { rm -f contrib/config.make-* ''; + patches = [ + # Fix memory leak. Remove with the next release + (fetchpatch { + url = "https://github.com/jonas/tig/commit/6202c6032f17438a2facb23f02e330b9d0566d9d.patch"; + sha256 = "15zn8hw9y7bqa1np4mj0qnm2z86nif7qwh7wc4vgy2rwxdil85bd"; + }) + ]; + enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b4fee1c90fa..d5abb6d004b 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.7.1"; + version = "1.13.8"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0acsvrc45kdwpj5mi5i61mibr1fdx4g4835c3b8x0fdgrya4n37c"; + sha256 = "1wmzgijmssgwkkw8g4zgmc4x64xkvz6nq1b3szcvawgv1ndwnb2j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix index 7a92679583b..6d41098ee1a 100644 --- a/pkgs/applications/version-management/git-sizer/default.nix +++ b/pkgs/applications/version-management/git-sizer/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "git-sizer"; - version = "1.0.0"; + version = "1.3.0"; goPackagePath = "github.com/github/git-sizer"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h"; + sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh"; }; meta = with lib; { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 6a7a42bacc1..99e660d9276 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.5"; + version = "1.10.1"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "07isawbasshkgij2mh7pmp6h3ns758ysflngr18z0k2m38ny9h31"; + sha256 = "1b1vmixc94kzfnd266r3hx25lcm3h4ywqg7d9kif83ixm612cj3g"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 01a73e6c212..2272e66faf5 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.3.0"; + version = "6.4.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "06hjzkkrg2f9lb72ik16zgv813cxsv679szfdzrfygbb6wxnkjyp"; + sha256 = "1w8iwpbr6nwzhhf63fvr7pd66yjx3jgjy4gx5y02qxa3ip5psq5b"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a0e62271373..76c681f7106 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.4.1", - "repo_hash": "0dmb8ds6c5paxg35nricaywfhsgmp5rr46kk21hy2hsddgwkyb4k", + "version": "12.5.5", + "repo_hash": "1vafy31s2sbs6xc2cp457k535yyawz630i8ks22ypyg2m2gy5n5m", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.4.1-ee", + "rev": "v12.5.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.67.0", - "GITLAB_PAGES_VERSION": "1.11.0", + "GITALY_SERVER_VERSION": "1.72.1", + "GITLAB_PAGES_VERSION": "1.12.0", "GITLAB_SHELL_VERSION": "10.2.0", - "GITLAB_WORKHORSE_VERSION": "8.14.0" + "GITLAB_WORKHORSE_VERSION": "8.14.1" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e6ed0ef53a2..60035990ed0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs , gitlabEnterprise ? false, callPackage, yarn -, yarn2nix-moretea, replace +, fixup_yarn_lock, replace }: let @@ -62,7 +62,12 @@ let yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${yarn2nix-moretea.fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + + # fixup_yarn_lock currently doesn't correctly fix the dagre-d3 + # url, so we have to do it manually + ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \ + '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive @@ -76,7 +81,7 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" + bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=2048" bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production runHook postBuild diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 9478dc9a84b..841f6bfdefc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,13 +4,13 @@ source 'https://rubygems.org' gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 6.1', require: 'linguist' +gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.2.3' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.19.0' +gem 'grpc', '~> 1.24.0' gem 'sentry-raven', '~> 2.9.0', require: false gem 'faraday', '~> 0.12' gem 'rbtrace', require: false @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.5.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.7.1' +gem 'google-protobuf', '~> 3.8.0' group :development, :test do gem 'rubocop', '~> 0.69', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cb292af8cc3..90c4e1bccea 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -49,10 +49,10 @@ GEM ffi (1.11.1) gemojione (3.3.0) json - github-linguist (6.4.1) + github-linguist (7.5.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) - mime-types (>= 1.19) + mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) gitlab-gollum-lib (4.2.7.7) @@ -81,12 +81,12 @@ GEM gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - google-protobuf (3.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) + grpc (1.24.0) + google-protobuf (~> 3.8) + googleapis-common-protos-types (~> 1.0) hashdiff (0.3.9) i18n (1.6.0) concurrent-ruby (~> 1.0) @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.2.3) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -108,12 +108,13 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.0) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -138,14 +139,14 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rainbow (3.0.0) rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (4.3.0) + rdoc (6.2.0) redis (4.1.2) rouge (3.11.0) rspec (3.8.0) @@ -217,18 +218,18 @@ DEPENDENCIES bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - github-linguist (~> 6.1) + github-linguist (~> 7.5) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.5.0) gitlab-markup (~> 1.7.0) - google-protobuf (~> 3.7.1) - grpc (~> 1.19.0) + google-protobuf (~> 3.8.0) + grpc (~> 1.24.0) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) rbtrace - rdoc (~> 4.2) + rdoc (~> 6.0) rspec rspec-parameterized rubocop (~> 0.69) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index b07c3590d3d..2c764162230 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.67.0"; + version = "1.72.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3"; + sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; @@ -55,7 +55,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { homepage = https://gitlab.com/gitlab-org/gitaly; description = "A Git RPC service for handling all the git calls made by GitLab"; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ roblabla globin fpletz ]; license = licenses.mit; }; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 34c30f71054..951ea39e5be 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -19,6 +19,42 @@ }; } { + goPackagePath = "github.com/Joker/hpp"; + fetch = { + type = "git"; + url = "https://github.com/Joker/hpp"; + rev = "6893e659854a"; + sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5"; + }; + } + { + goPackagePath = "github.com/Joker/jade"; + fetch = { + type = "git"; + url = "https://github.com/Joker/jade"; + rev = "v1.0.0"; + sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf"; + }; + } + { + goPackagePath = "github.com/Shopify/goreferrer"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/goreferrer"; + rev = "ec9c9a553398"; + sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; + }; + } + { + goPackagePath = "github.com/ajg/form"; + fetch = { + type = "git"; + url = "https://github.com/ajg/form"; + rev = "v1.5.1"; + sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; + }; + } + { goPackagePath = "github.com/alecthomas/template"; fetch = { type = "git"; @@ -37,6 +73,15 @@ }; } { + goPackagePath = "github.com/aymerick/raymond"; + fetch = { + type = "git"; + url = "https://github.com/aymerick/raymond"; + rev = "v2.0.2"; + sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3"; + }; + } + { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; @@ -82,6 +127,15 @@ }; } { + goPackagePath = "github.com/codegangsta/inject"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/inject"; + rev = "33e0aa1cb7c0"; + sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; + }; + } + { goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; @@ -91,6 +145,42 @@ }; } { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "cdade1c07385"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "v1.1.0"; + sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; + }; + } + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; @@ -100,15 +190,69 @@ }; } { + goPackagePath = "github.com/gavv/monotime"; + fetch = { + type = "git"; + url = "https://github.com/gavv/monotime"; + rev = "30dba4353424"; + sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g"; + }; + } + { goPackagePath = "github.com/getsentry/raven-go"; fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.2"; + rev = "v0.1.0"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } { + goPackagePath = "github.com/getsentry/sentry-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/sentry-go"; + rev = "v0.3.0"; + sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1"; + }; + } + { + goPackagePath = "github.com/gin-contrib/sse"; + fetch = { + type = "git"; + url = "https://github.com/gin-contrib/sse"; + rev = "5545eab6dad3"; + sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = "https://github.com/gin-gonic/gin"; + rev = "v1.4.0"; + sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; + }; + } + { + goPackagePath = "github.com/go-check/check"; + fetch = { + type = "git"; + url = "https://github.com/go-check/check"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { goPackagePath = "github.com/go-kit/kit"; fetch = { type = "git"; @@ -127,6 +271,15 @@ }; } { + goPackagePath = "github.com/go-martini/martini"; + fetch = { + type = "git"; + url = "https://github.com/go-martini/martini"; + rev = "22fa46961aab"; + sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; + }; + } + { goPackagePath = "github.com/go-stack/stack"; fetch = { type = "git"; @@ -176,8 +329,26 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; }; } { @@ -190,6 +361,24 @@ }; } { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { + goPackagePath = "github.com/gorilla/schema"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/schema"; + rev = "v1.1.0"; + sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9"; + }; + } + { goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; fetch = { type = "git"; @@ -217,6 +406,51 @@ }; } { + goPackagePath = "github.com/imkira/go-interpol"; + fetch = { + type = "git"; + url = "https://github.com/imkira/go-interpol"; + rev = "v1.1.0"; + sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; + }; + } + { + goPackagePath = "github.com/iris-contrib/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/blackfriday"; + rev = "v2.0.0"; + sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; + }; + } + { + goPackagePath = "github.com/iris-contrib/formBinder"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/formBinder"; + rev = "v5.0.0"; + sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg"; + }; + } + { + goPackagePath = "github.com/iris-contrib/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/go.uuid"; + rev = "v2.0.0"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + }; + } + { + goPackagePath = "github.com/iris-contrib/httpexpect"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/httpexpect"; + rev = "ebe99fcebbce"; + sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; + }; + } + { goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; @@ -226,6 +460,42 @@ }; } { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "089d3ea4e4d5"; + sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "584905176618"; + sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; + }; + } + { + goPackagePath = "github.com/juju/testing"; + fetch = { + type = "git"; + url = "https://github.com/juju/testing"; + rev = "472a3e8b2073"; + sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; + }; + } + { goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; @@ -235,6 +505,42 @@ }; } { + goPackagePath = "github.com/k0kubun/colorstring"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/colorstring"; + rev = "9440f1994b88"; + sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; + }; + } + { + goPackagePath = "github.com/kataras/golog"; + fetch = { + type = "git"; + url = "https://github.com/kataras/golog"; + rev = "99c81de45f40"; + sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p"; + }; + } + { + goPackagePath = "github.com/kataras/iris"; + fetch = { + type = "git"; + url = "https://github.com/kataras/iris"; + rev = "v11.1.1"; + sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg"; + }; + } + { + goPackagePath = "github.com/kataras/pio"; + fetch = { + type = "git"; + url = "https://github.com/kataras/pio"; + rev = "ea782b38602d"; + sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; + }; + } + { goPackagePath = "github.com/kelseyhightower/envconfig"; fetch = { type = "git"; @@ -253,6 +559,24 @@ }; } { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "v1.4.0"; + sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "e7e905edc00e"; + sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf"; + }; + } + { goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; fetch = { type = "git"; @@ -271,6 +595,51 @@ }; } { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.10"; + sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; @@ -289,6 +658,33 @@ }; } { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.2"; + sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.9"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/goveralls"; + fetch = { + type = "git"; + url = "https://github.com/mattn/goveralls"; + rev = "v0.0.2"; + sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; + }; + } + { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; @@ -298,6 +694,15 @@ }; } { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "v1.0.2"; + sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; + }; + } + { goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; @@ -316,6 +721,15 @@ }; } { + goPackagePath = "github.com/moul/http2curl"; + fetch = { + type = "git"; + url = "https://github.com/moul/http2curl"; + rev = "v1.0.0"; + sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; + }; + } + { goPackagePath = "github.com/mwitkow/go-conntrack"; fetch = { type = "git"; @@ -329,8 +743,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; }; } { @@ -338,8 +752,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; }; } { @@ -361,12 +775,21 @@ }; } { + goPackagePath = "github.com/pingcap/errors"; + fetch = { + type = "git"; + url = "https://github.com/pingcap/errors"; + rev = "v0.11.1"; + sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp"; + }; + } + { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -415,6 +838,33 @@ }; } { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; @@ -424,6 +874,24 @@ }; } { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "505e41936337"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } + { goPackagePath = "github.com/stretchr/objx"; fetch = { type = "git"; @@ -437,8 +905,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -478,6 +946,123 @@ }; } { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "v1.0.0"; + sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasthttp"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasthttp"; + rev = "v1.4.0"; + sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.0.1"; + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; + }; + } + { + goPackagePath = "github.com/valyala/tcplisten"; + fetch = { + type = "git"; + url = "https://github.com/valyala/tcplisten"; + rev = "ceec8f93295a"; + sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "df4f5c81cb3b"; + sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.1.0"; + sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; + }; + } + { + goPackagePath = "github.com/yalp/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/yalp/jsonpath"; + rev = "5cc68e5049a0"; + sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; + }; + } + { + goPackagePath = "github.com/yudai/gojsondiff"; + fetch = { + type = "git"; + url = "https://github.com/yudai/gojsondiff"; + rev = "v1.0.0"; + sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; + }; + } + { + goPackagePath = "github.com/yudai/golcs"; + fetch = { + type = "git"; + url = "https://github.com/yudai/golcs"; + rev = "ecda9a501e82"; + sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; + }; + } + { + goPackagePath = "github.com/yudai/pp"; + fetch = { + type = "git"; + url = "https://github.com/yudai/pp"; + rev = "v2.0.1"; + sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; + }; + } + { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { type = "git"; @@ -500,8 +1085,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "20be4c3c3ed5"; - sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + rev = "4def268fd1a4"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; }; } { @@ -509,8 +1094,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; }; } { @@ -536,8 +1121,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -545,8 +1130,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "953cdadca894"; - sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; + rev = "fde4db37ae7a"; + sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3"; }; } { @@ -563,8 +1148,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } { @@ -590,8 +1175,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + rev = "v1.24.0"; + sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; }; } { @@ -631,6 +1216,33 @@ }; } { + goPackagePath = "gopkg.in/go-playground/assert.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/assert.v1"; + rev = "v1.2.1"; + sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; + }; + } + { + goPackagePath = "gopkg.in/go-playground/validator.v8"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/validator.v8"; + rev = "v8.18.2"; + sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { goPackagePath = "gopkg.in/tomb.v1"; fetch = { type = "git"; @@ -653,8 +1265,8 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } ] diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index a5140972ef0..47e1c3b3568 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -224,15 +224,15 @@ version = "3.3.0"; }; github-linguist = { - dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; + dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf"; + sha256 = "092bq7bjfj2yvss2ig6jb71j0h04cigq79xxfis37j315iixl12j"; type = "gem"; }; - version = "6.4.1"; + version = "7.5.1"; }; github-markup = { source = { @@ -308,10 +308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; + sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -330,10 +330,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.0"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -418,10 +418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -459,6 +459,16 @@ }; version = "3.2019.0331"; }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; @@ -507,10 +517,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -640,10 +650,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; rainbow = { source = { @@ -663,12 +673,14 @@ version = "0.4.11"; }; rdoc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9"; type = "gem"; }; - version = "4.3.0"; + version = "6.2.0"; }; redis = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 03aad8c02c3..2a83cbe5f3c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; homepage = http://www.gitlab.com/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index 5b5d0b99bcf..d5ea22f960b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -163,6 +163,15 @@ }; } { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { goPackagePath = "github.com/golang/mock"; fetch = { type = "git"; @@ -253,6 +262,15 @@ }; } { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; fetch = { type = "git"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b8364c1efeb..4f3322f3d0f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.14.0"; + version = "8.14.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq"; + sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; @@ -29,7 +29,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 920f778c053..bdfae5a24ec 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -8,12 +8,12 @@ gem 'bootsnap', '~> 1.4' gem 'nakayoshi_fork', '~> 0.0.4' # Responders respond_to and respond_with -gem 'responders', '~> 2.0' +gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.2.0' +gem 'default_value_for', '~> 3.3.0' # Supported DBs gem 'pg', '~> 1.1' @@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'omniauth_openid_connect', '~> 0.3.1' +gem 'omniauth_openid_connect', '~> 0.3.3' gem "omniauth-ultraauth", '~> 0.0.2' gem 'omniauth-salesforce', '~> 1.0.5' gem 'rack-oauth2', '~> 1.9.3' @@ -53,7 +53,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' -gem 'akismet', '~> 2.0' +gem 'akismet', '~> 3.0' gem 'invisible_captcha', '~> 0.12.1' # Two-factor authentication @@ -64,7 +64,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.6' -gem 'rubyzip', '~> 1.2.2', require: 'zip' +gem 'rubyzip', '~> 1.3.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0.2' @@ -72,7 +72,7 @@ gem 'acme-client', '~> 2.0.2' gem 'browser', '~> 2.5' # GPG -gem 'gpgme', '~> 2.0.18' +gem 'gpgme', '~> 2.0.19' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -136,7 +136,7 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.2.0' +gem 'deckar01-task_list', '2.2.1' gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.17' @@ -151,7 +151,7 @@ gem 'asciidoctor-plantuml', '0.0.9' gem 'rouge', '~> 3.11.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.4' +gem 'nokogiri', '~> 1.10.5' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -159,6 +159,7 @@ gem 'icalendar' # Diffs gem 'diffy', '~> 3.1.0' +gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.0.7' @@ -175,7 +176,7 @@ group :puma do end # State machine -gem 'state_machines-activerecord', '~> 0.5.1' +gem 'state_machines-activerecord', '~> 0.6.0' # Issue tags gem 'acts-as-taggable-on', '~> 6.0' @@ -241,7 +242,7 @@ gem 'slack-notifier', '~> 1.5.1' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '~> 0.8.1' +gem 'asana', '~> 0.9' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -259,9 +260,6 @@ gem 'loofah', '~> 2.2' # Working with license gem 'licensee', '~> 8.9' -# Protect against bruteforcing -gem 'rack-attack', '~> 4.4.1' - # Ace editor gem 'ace-rails-ap', '~> 4.1.0' @@ -293,10 +291,13 @@ gem 'base32', '~> 0.3.0' gem "gitlab-license", "~> 1.0" +# Protect against bruteforcing +gem 'rack-attack', '~> 6.2.0' + # Sentry integration gem 'sentry-raven', '~> 2.9' -gem 'premailer-rails', '~> 1.9.7' +gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation gem 'gitlab-labkit', '~> 0.5' @@ -331,7 +332,6 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false gem 'danger', '~> 6.0', require: false @@ -388,7 +388,6 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false - gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' gem 'stackprof', '~> 0.2.10', require: false @@ -398,6 +397,11 @@ group :development, :test do gem 'timecop', '~> 0.8.0' end +# Gems required in omnibus-gitlab pipeline +group :development, :test, :omnibus do + gem 'license_finder', '~> 5.4', require: false +end + group :test do gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' @@ -407,6 +411,7 @@ group :test do gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.10.0' gem 'rspec_junit_formatter' + gem 'guard-rspec' end gem 'octokit', '~> 4.9' @@ -446,18 +451,18 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.65.0' +gem 'gitaly', '~> 1.70.0' -gem 'grpc', '~> 1.19.0' +gem 'grpc', '~> 1.24.0' -gem 'google-protobuf', '~> 3.7.1' +gem 'google-protobuf', '~> 3.8.0' gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.13.0' -gem 'flipper-active_record', '~> 0.13.0' -gem 'flipper-active_support_cache_store', '~> 0.13.0' +gem 'flipper', '~> 0.17.1' +gem 'flipper-active_record', '~> 0.17.1' +gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' # Structured logging @@ -469,3 +474,5 @@ gem 'gitlab-net-dns', '~> 0.9.1' # Countries list gem 'countries', '~> 3.0' + +gem 'retriable', '~> 3.1.2' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 18160932c56..469bea9d4fb 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -50,24 +50,24 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (6.0.0) - activerecord (~> 5.0) + acts-as-taggable-on (6.5.0) + activerecord (>= 5.0, < 6.1) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) - akismet (2.0.0) + akismet (3.0.0) apollo_upload_server (2.0.0.beta.3) graphql (>= 1.8) rails (>= 4.2) arel (9.0.0) - asana (0.8.1) + asana (0.9.3) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) + oauth2 (~> 1.4) asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) @@ -80,14 +80,16 @@ GEM encryptor (~> 3.0.0) attr_required (1.0.1) awesome_print (1.8.0) - aws-sdk (2.9.32) - aws-sdk-resources (= 2.9.32) - aws-sdk-core (2.9.32) + aws-eventstream (1.0.3) + aws-sdk (2.11.374) + aws-sdk-resources (= 2.11.374) + aws-sdk-core (2.11.374) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.32) - aws-sdk-core (= 2.9.32) - aws-sigv4 (1.0.0) + aws-sdk-resources (2.11.374) + aws-sdk-core (= 2.11.374) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -171,9 +173,9 @@ GEM unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) creole (0.5.0) - css_parser (1.5.0) + css_parser (1.7.0) addressable daemons (1.2.6) danger (6.0.9) @@ -192,12 +194,12 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.2.0) + deckar01-task_list (2.2.1) html-pipeline declarative (0.0.10) declarative-option (0.1.0) - default_value_for (3.2.0) - activerecord (>= 3.2.0, < 6.0) + default_value_for (3.3.0) + activerecord (>= 3.2.0, < 6.1) derailed_benchmarks (1.3.5) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -222,6 +224,7 @@ GEM railties rotp (~> 2.0) diff-lcs (1.3) + diff_match_patch (0.1.0) diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) @@ -285,13 +288,13 @@ GEM fast_gettext (1.6.0) ffaker (2.10.0) ffi (1.11.1) - flipper (0.13.0) - flipper-active_record (0.13.0) - activerecord (>= 3.2, < 6) - flipper (~> 0.13.0) - flipper-active_support_cache_store (0.13.0) - activesupport (>= 3.2, < 6) - flipper (~> 0.13.0) + flipper (0.17.1) + flipper-active_record (0.17.1) + activerecord (>= 4.2, < 7) + flipper (~> 0.17.1) + flipper-active_support_cache_store (0.17.1) + activesupport (>= 4.2, < 7) + flipper (~> 0.17.1) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -332,10 +335,8 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) - foreman (0.84.0) - thor (~> 0.19.1) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) @@ -358,12 +359,12 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.65.0) + gitaly (1.70.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-labkit (0.5.2) - actionpack (~> 5) - activesupport (~> 5) + gitlab-labkit (0.7.0) + actionpack (>= 5.0.0, < 6.1.0) + activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) @@ -400,7 +401,7 @@ GEM mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.7.1) + google-protobuf (3.8.0) googleapis-common-protos-types (1.0.4) google-protobuf (~> 3.0) googleauth (0.6.6) @@ -410,7 +411,7 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - gpgme (2.0.18) + gpgme (2.0.19) mini_portile2 (~> 2.3) grape (1.1.0) activesupport @@ -440,11 +441,25 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) + grpc (1.24.0) + google-protobuf (~> 3.8) + googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) + guard (2.15.1) + formatador (>= 0.2.4) + listen (>= 2.7, < 4.0) + lumberjack (>= 1.0.12, < 2.0) + nenv (~> 0.1) + notiffany (~> 0.0) + pry (>= 0.9.12) + shellany (~> 0.0) + thor (>= 0.18.1) + guard-compat (1.2.1) + guard-rspec (4.7.3) + guard (~> 2.1) + guard-compat (~> 1.1) + rspec (>= 2.99.0, < 4.0) haml (5.0.4) temple (>= 0.8.0) tilt @@ -508,7 +523,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.3.1) + jmespath (1.4.0) js_regex (3.1.1) character_set (~> 1.1) regexp_parser (~> 1.1) @@ -560,15 +575,20 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) locale (2.1.2) lograge (0.10.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) + lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) mail_room (0.9.1) @@ -584,7 +604,7 @@ GEM mime-types-data (3.2019.0331) mimemagic (0.3.2) mini_magick (4.9.5) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) msgpack (1.3.1) @@ -597,16 +617,20 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) + nenv (0.3.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) no_proxy_fix (0.1.2) - nokogiri (1.10.4) + nokogiri (1.10.5) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + notiffany (0.1.3) + nenv (~> 0.1) + shellany (~> 0.0) numerizer (0.1.1) oauth (0.5.4) oauth2 (1.4.1) @@ -675,12 +699,12 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.3.1) + omniauth_openid_connect (0.3.3) addressable (~> 2.5) - omniauth (~> 1.3) + omniauth (~> 1.9) openid_connect (~> 1.1) open4 (1.3.4) - openid_connect (1.1.6) + openid_connect (1.1.8) activemodel attr_required (>= 1.0.0) json-jwt (>= 1.5.0) @@ -703,12 +727,12 @@ GEM pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.10.4) + premailer (1.11.1) addressable - css_parser (>= 1.4.10) + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.9.7) - actionmailer (>= 3, < 6) + premailer-rails (1.10.3) + actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) proc_to_ast (0.1.0) coderay @@ -724,7 +748,7 @@ GEM pry (~> 0.10) pry-rails (0.3.6) pry (>= 0.10.4) - public_suffix (3.1.0) + public_suffix (3.1.1) puma (3.12.0) puma_worker_killer (0.1.0) get_process_mem (~> 0.2) @@ -734,8 +758,8 @@ GEM rack (2.0.7) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.4.1) - rack + rack-attack (6.2.0) + rack (>= 1.0, < 3) rack-cors (1.0.2) rack-oauth2 (1.9.3) activesupport @@ -763,10 +787,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.3) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -798,25 +822,25 @@ GEM recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redis (4.1.2) - redis-actionpack (5.0.2) - actionpack (>= 4.0, < 6) + redis (4.1.3) + redis-actionpack (5.1.0) + actionpack (>= 4.0, < 7) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.0.7) - activesupport (>= 3, < 6) + redis-activesupport (5.2.0) + activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.5) + redis-rack (2.0.6) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) redis-activesupport (>= 5.0, < 6) redis-store (>= 1.2, < 2) - redis-store (1.6.0) - redis (>= 2.2, < 5) + redis-store (1.8.1) + redis (>= 4, < 5) regexp_parser (1.5.1) regexp_property_values (0.3.4) representable (3.0.4) @@ -824,9 +848,9 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) request_store (1.3.1) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) + responders (3.0.0) + actionpack (>= 5.0) + railties (>= 5.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -897,11 +921,12 @@ GEM ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) + ruby_dep (1.5.0) ruby_parser (3.13.1) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (1.2.2) + rubyzip (1.3.0) rugged (0.28.3.1) safe_yaml (1.0.4) sanitize (4.6.6) @@ -938,6 +963,7 @@ GEM faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) + shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) sidekiq (5.2.7) @@ -978,11 +1004,11 @@ GEM sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) - state_machines-activemodel (0.5.1) - activemodel (>= 4.1, < 6.0) + state_machines-activemodel (0.7.1) + activemodel (>= 4.1) state_machines (>= 0.5.0) - state_machines-activerecord (0.5.1) - activerecord (>= 4.1, < 6.0) + state_machines-activerecord (0.6.0) + activerecord (>= 4.1) state_machines-activemodel (>= 0.5.0) swd (1.1.2) activesupport (>= 3) @@ -1091,9 +1117,9 @@ DEPENDENCIES activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) - akismet (~> 2.0) + akismet (~> 3.0) apollo_upload_server (~> 2.0.0.beta3) - asana (~> 0.8.1) + asana (~> 0.9) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (= 0.0.9) @@ -1127,12 +1153,13 @@ DEPENDENCIES creole (~> 0.5.0) danger (~> 6.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.2.0) - default_value_for (~> 3.2.0) + deckar01-task_list (= 2.2.1) + default_value_for (~> 3.3.0) derailed_benchmarks device_detector devise (~> 4.6) devise-two-factor (~> 3.0.0) + diff_match_patch (~> 0.1.0) diffy (~> 3.1.0) discordrb-webhooks-blackst0ne (~> 3.3) doorkeeper (~> 4.3) @@ -1149,9 +1176,9 @@ DEPENDENCIES faraday_middleware-aws-signers-v4 fast_blank ffaker (~> 2.10) - flipper (~> 0.13.0) - flipper-active_record (~> 0.13.0) - flipper-active_support_cache_store (~> 0.13.0) + flipper (~> 0.17.1) + flipper-active_record (~> 0.17.1) + flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.5) @@ -1161,14 +1188,13 @@ DEPENDENCIES fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.84.0) fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.65.0) + gitaly (~> 1.70.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) @@ -1181,8 +1207,8 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) - google-protobuf (~> 3.7.1) - gpgme (~> 2.0.18) + google-protobuf (~> 3.8.0) + gpgme (~> 2.0.19) grape (~> 1.1.0) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.1) @@ -1190,8 +1216,9 @@ DEPENDENCIES graphiql-rails (~> 1.4.10) graphql (~> 1.9.11) graphql-docs (~> 1.6.0) - grpc (~> 1.19.0) + grpc (~> 1.24.0) gssapi + guard-rspec haml_lint (~> 0.31.0) hamlit (~> 2.8.8) hangouts-chat (~> 0.0.5) @@ -1226,7 +1253,7 @@ DEPENDENCIES net-ldap net-ntp net-ssh (~> 5.2) - nokogiri (~> 1.10.4) + nokogiri (~> 1.10.5) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1246,17 +1273,17 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth-ultraauth (~> 0.0.2) omniauth_crowd (~> 2.2.0) - omniauth_openid_connect (~> 0.3.1) + omniauth_openid_connect (~> 0.3.3) org-ruby (~> 0.9.12) pg (~> 1.1) - premailer-rails (~> 1.9.7) + premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) puma_worker_killer rack (~> 2.0.7) - rack-attack (~> 4.4.1) + rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) @@ -1275,7 +1302,8 @@ DEPENDENCIES redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) - responders (~> 2.0) + responders (~> 3.0) + retriable (~> 3.1.2) rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized @@ -1291,7 +1319,7 @@ DEPENDENCIES ruby-prof (~> 1.0.0) ruby-progressbar ruby_parser (~> 3.8) - rubyzip (~> 1.2.2) + rubyzip (~> 1.3.0) rugged (~> 0.28) sanitize (~> 4.6) sassc-rails (~> 2.1.0) @@ -1312,7 +1340,7 @@ DEPENDENCIES sprockets (~> 3.7.0) sshkey (~> 2.0) stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.5.1) + state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) thin (~> 1.7.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 84a984ea2b3..73a64a62d4b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -146,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; + sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga"; type = "gem"; }; - version = "6.0.0"; + version = "6.5.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -188,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; + sha256 = "0c5jhqfgvpz84d8jai51hin018ldpfd0civbk7mfwmrj7n71p6bl"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; apollo_upload_server = { dependencies = ["graphql" "rails"]; @@ -220,10 +220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx"; + sha256 = "19yr6ibz481jizvx0cjfvql142v8izi474c4vmwy9qzksyq2xhdj"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.3"; }; asciidoctor = { groups = ["default"]; @@ -309,16 +309,26 @@ }; version = "1.8.0"; }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + type = "gem"; + }; + version = "1.0.3"; + }; aws-sdk = { dependencies = ["aws-sdk-resources"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn"; + sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sdk-core = { dependencies = ["aws-sigv4" "jmespath"]; @@ -326,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x"; + sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sdk-resources = { dependencies = ["aws-sdk-core"]; @@ -337,20 +347,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi"; + sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; type = "gem"; }; - version = "2.9.32"; + version = "2.11.374"; }; aws-sigv4 = { + dependencies = ["aws-eventstream"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; + sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -814,10 +825,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; creole = { groups = ["default"]; @@ -835,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy"; + sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; daemons = { groups = ["default" "development"]; @@ -901,10 +912,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; + sha256 = "09k7rlxsl7pd5kn3wyswgqi0hhbmlj40b66l4mf8v9mqf3c7v0yk"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; declarative = { groups = ["default"]; @@ -932,10 +943,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; + sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my"; type = "gem"; }; - version = "3.2.0"; + version = "3.3.0"; }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; @@ -1001,6 +1012,16 @@ }; version = "1.3"; }; + diff_match_patch = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03n4g4w2pwiygmqq5lfhqrpbs9g6kv0jhb3vrffz3vgaryzmfq5k"; + type = "gem"; + }; + version = "0.1.0"; + }; diffy = { groups = ["default"]; platforms = []; @@ -1374,10 +1395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; + sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -1385,10 +1406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; + sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; @@ -1396,10 +1417,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; + sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg"; type = "gem"; }; - version = "0.13.0"; + version = "0.17.1"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -1517,21 +1538,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj"; - type = "gem"; - }; - version = "4.7.0.4"; - }; - foreman = { - dependencies = ["thor"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; + sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz"; type = "gem"; }; - version = "0.84.0"; + version = "4.7.0.5"; }; formatador = { groups = ["default"]; @@ -1645,10 +1655,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j"; + sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3"; type = "gem"; }; - version = "1.65.0"; + version = "1.70.0"; }; github-markup = { groups = ["default"]; @@ -1666,10 +1676,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h"; + sha256 = "0r2zkxkj2l78c6qgr6k9lgcp7w6x7r703259rbsbrg7cfnjm43b7"; type = "gem"; }; - version = "0.5.2"; + version = "0.7.0"; }; gitlab-license = { groups = ["default"]; @@ -1794,10 +1804,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; + sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; type = "gem"; }; - version = "3.7.1"; + version = "3.8.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -1827,10 +1837,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; + sha256 = "0jbqajngi5ndqfarw9dxkhbphva0j71jav5wfym3fsiisvk5gg6p"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.19"; }; grape = { dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; @@ -1914,10 +1924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; + sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; type = "gem"; }; - version = "1.19.0"; + version = "1.24.0"; }; gssapi = { dependencies = ["ffi"]; @@ -1930,6 +1940,38 @@ }; version = "1.2.0"; }; + guard = { + dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf"; + type = "gem"; + }; + version = "2.15.1"; + }; + guard-compat = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; + type = "gem"; + }; + version = "1.2.1"; + }; + guard-rspec = { + dependencies = ["guard" "guard-compat" "rspec"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"; + type = "gem"; + }; + version = "4.7.3"; + }; haml = { dependencies = ["temple" "tilt"]; groups = ["default" "development" "test"]; @@ -2241,10 +2283,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -2450,6 +2492,17 @@ }; version = "8.9.2"; }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + type = "gem"; + }; + version = "3.1.5"; + }; locale = { groups = ["default" "development"]; platforms = []; @@ -2477,10 +2530,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; + sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; + }; + lumberjack = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n"; + type = "gem"; + }; + version = "1.0.13"; }; mail = { dependencies = ["mini_mime"]; @@ -2605,10 +2668,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -2721,6 +2784,16 @@ }; version = "1.1.0"; }; + nenv = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; + type = "gem"; + }; + version = "0.3.0"; + }; net-ldap = { groups = ["default"]; platforms = []; @@ -2787,10 +2860,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; type = "gem"; }; - version = "1.10.4"; + version = "1.10.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2803,6 +2876,17 @@ }; version = "1.5.0"; }; + notiffany = { + dependencies = ["nenv" "shellany"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; + type = "gem"; + }; + version = "0.1.3"; + }; numerizer = { groups = ["default"]; platforms = []; @@ -3071,10 +3155,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb"; + sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.3"; }; open4 = { groups = ["default" "development"]; @@ -3092,10 +3176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd"; + sha256 = "0r50vwf9hsf6r8gx5mwqs3w3w92l864ikiz9d0fcibqsr1489pbg"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; opentracing = { groups = ["default"]; @@ -3206,10 +3290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf"; + sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; type = "gem"; }; - version = "1.10.4"; + version = "1.11.1"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -3217,10 +3301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim"; + sha256 = "0bqi7d4f15vy3f1g0xb3bxmncfbzv9dd3ilhqj0plvw64xqbkp3w"; type = "gem"; }; - version = "1.9.7"; + version = "1.10.3"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -3299,10 +3383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; + sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; type = "gem"; }; - version = "3.1.0"; + version = "3.1.1"; }; puma = { groups = ["puma"]; @@ -3372,10 +3456,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; + sha256 = "1sqjqwa18c0l59zdymcvvvnh5nk3pjggnzaydb2q1qbrk3rypcnq"; type = "gem"; }; - version = "4.4.1"; + version = "6.2.0"; }; rack-cors = { groups = ["default"]; @@ -3458,10 +3542,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy"; + sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -3640,10 +3724,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3"; + sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -3651,10 +3735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; + sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; type = "gem"; }; - version = "5.0.2"; + version = "5.1.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3662,10 +3746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62"; + sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59"; type = "gem"; }; - version = "5.0.7"; + version = "5.2.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -3684,10 +3768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi"; + sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; @@ -3706,10 +3790,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b"; + sha256 = "1isqzzds9kszc2nn8jiy8ikry01qspn7637ba9z2k6sk7vky46d9"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.1"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -3758,10 +3842,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm"; + sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2"; type = "gem"; }; - version = "2.4.1"; + version = "3.0.0"; }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; @@ -4052,6 +4136,16 @@ }; version = "1.7.2"; }; + ruby_dep = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; + type = "gem"; + }; + version = "1.5.0"; + }; ruby_parser = { dependencies = ["sexp_processor"]; groups = ["default"]; @@ -4084,14 +4178,14 @@ version = "0.2.0"; }; rubyzip = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; rugged = { groups = ["default"]; @@ -4243,6 +4337,16 @@ }; version = "4.12.0"; }; + shellany = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; + type = "gem"; + }; + version = "0.0.1"; + }; shoulda-matchers = { dependencies = ["activesupport"]; groups = ["test"]; @@ -4439,10 +4543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; + sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd"; type = "gem"; }; - version = "0.5.1"; + version = "0.7.1"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; @@ -4450,10 +4554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; + sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 1aeb459f64c..a2231f813e8 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix +#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index cff2603129d..04c0b44f4ac 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -42,14 +42,6 @@ }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; - }; - } - { name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; path = fetchurl { name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; @@ -210,14 +202,6 @@ }; } { - name = "_babel_parser___parser_7.1.3.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz"; - sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77"; - }; - } - { name = "_babel_parser___parser_7.6.2.tgz"; path = fetchurl { name = "_babel_parser___parser_7.6.2.tgz"; @@ -242,22 +226,6 @@ }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; - sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; - }; - } - { - name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz"; - sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a"; - }; - } - { name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; @@ -266,38 +234,6 @@ }; } { - name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz"; - sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145"; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz"; - sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"; - }; - } - { - name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz"; - sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7"; - }; - } - { - name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz"; - sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7"; - }; - } - { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; @@ -306,30 +242,6 @@ }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz"; - sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57"; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz"; - sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39"; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz"; - sha1 = "646854daf4cd22fd6733f6076013a936310443ac"; - }; - } - { name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; path = fetchurl { name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; @@ -346,22 +258,6 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz"; - sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"; - }; - } - { - name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz"; - sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06"; - }; - } - { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; @@ -370,14 +266,6 @@ }; } { - name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz"; - sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739"; - }; - } - { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; path = fetchurl { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; @@ -394,22 +282,6 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; - }; - } - { - name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz"; - sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a"; - }; - } - { name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; @@ -418,46 +290,6 @@ }; } { - name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz"; - sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820"; - }; - } - { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz"; - sha1 = "8d257838c6b3b779db52c0224443459bd27fb039"; - }; - } - { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; - }; - } - { - name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz"; - sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309"; - }; - } - { - name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz"; - sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c"; - }; - } - { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; @@ -474,38 +306,6 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; - }; - } - { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz"; - sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb"; - }; - } - { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz"; - sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624"; - }; - } - { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz"; - sha1 = "7470fe070c2944469a756752a69a6963135018be"; - }; - } - { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; @@ -522,30 +322,6 @@ }; } { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz"; - sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"; - }; - } - { - name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz"; - sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e"; - }; - } - { - name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz"; - sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"; - }; - } - { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; @@ -626,14 +402,6 @@ }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; - }; - } - { name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; path = fetchurl { name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; @@ -738,38 +506,6 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; - }; - } - { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; - }; - } - { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; - }; - } - { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; - }; - } - { name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; path = fetchurl { name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; @@ -842,30 +578,6 @@ }; } { - name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; - sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2"; - }; - } - { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; - }; - } - { - name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; - path = fetchurl { - name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz"; - sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646"; - }; - } - { name = "_babel_standalone___standalone_7.5.5.tgz"; path = fetchurl { name = "_babel_standalone___standalone_7.5.5.tgz"; @@ -938,27 +650,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.78.0.tgz"; + name = "_gitlab_svgs___svgs_1.82.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.78.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz"; - sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4"; + name = "_gitlab_svgs___svgs_1.82.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz"; + sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80"; }; } { - name = "_gitlab_ui___ui_5.36.0.tgz"; + name = "_gitlab_ui___ui_7.11.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_5.36.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz"; - sha1 = "3087b23c138ad1c222f6b047e533f253371bc618"; + name = "_gitlab_ui___ui_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz"; + sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b"; }; } { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; path = fetchurl { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz"; - sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz"; + sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a"; }; } { @@ -1074,6 +786,62 @@ }; } { + name = "_sentry_browser___browser_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_browser___browser_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz"; + sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4"; + }; + } + { + name = "_sentry_core___core_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_core___core_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz"; + sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e"; + }; + } + { + name = "_sentry_hub___hub_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_hub___hub_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz"; + sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad"; + }; + } + { + name = "_sentry_minimal___minimal_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_minimal___minimal_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz"; + sha1 = "56afc537737586929e25349765e37a367958c1e1"; + }; + } + { + name = "_sentry_types___types_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_types___types_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz"; + sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090"; + }; + } + { + name = "_sentry_utils___utils_5.7.1.tgz"; + path = fetchurl { + name = "_sentry_utils___utils_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz"; + sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0"; + }; + } + { + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; + path = fetchurl { + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz"; + sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596"; + }; + } + { name = "_types_anymatch___anymatch_1.3.0.tgz"; path = fetchurl { name = "_types_anymatch___anymatch_1.3.0.tgz"; @@ -1434,6 +1202,22 @@ }; } { + name = "_wry_context___context_0.4.4.tgz"; + path = fetchurl { + name = "_wry_context___context_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz"; + sha1 = "e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"; + }; + } + { + name = "_wry_equality___equality_0.1.9.tgz"; + path = fetchurl { + name = "_wry_equality___equality_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz"; + sha1 = "b13e18b7a8053c6858aa6c85b54911fb31e3a909"; + }; + } + { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; path = fetchurl { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; @@ -1458,14 +1242,6 @@ }; } { - name = "JSONStream___JSONStream_1.3.5.tgz"; - path = fetchurl { - name = "JSONStream___JSONStream_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; - sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; - }; - } - { name = "abab___abab_2.0.0.tgz"; path = fetchurl { name = "abab___abab_2.0.0.tgz"; @@ -1658,27 +1434,27 @@ }; } { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; path = fetchurl { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz"; - sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz"; + sha1 = "826861d20baca4abc45f7ca7a874105905b8525d"; }; } { - name = "apollo_cache___apollo_cache_1.2.1.tgz"; + name = "apollo_cache___apollo_cache_1.3.2.tgz"; path = fetchurl { - name = "apollo_cache___apollo_cache_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz"; - sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644"; + name = "apollo_cache___apollo_cache_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz"; + sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a"; }; } { - name = "apollo_client___apollo_client_2.5.1.tgz"; + name = "apollo_client___apollo_client_2.6.4.tgz"; path = fetchurl { - name = "apollo_client___apollo_client_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz"; - sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1"; + name = "apollo_client___apollo_client_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz"; + sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140"; }; } { @@ -1698,14 +1474,6 @@ }; } { - name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; - path = fetchurl { - name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz"; - sha1 = "7b94589fe7f969777efd18a129043c78430800ae"; - }; - } - { name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; path = fetchurl { name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; @@ -1730,19 +1498,11 @@ }; } { - name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; + name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; path = fetchurl { - name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz"; - sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"; - }; - } - { - name = "append_buffer___append_buffer_1.0.2.tgz"; - path = fetchurl { - name = "append_buffer___append_buffer_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz"; - sha1 = "d8220cf466081525efea50614f3de6514dfa58f1"; + name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz"; + sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"; }; } { @@ -2122,14 +1882,6 @@ }; } { - name = "babelify___babelify_10.0.0.tgz"; - path = fetchurl { - name = "babelify___babelify_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz"; - sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"; - }; - } - { name = "babylon___babylon_7.0.0_beta.19.tgz"; path = fetchurl { name = "babylon___babylon_7.0.0_beta.19.tgz"; @@ -2298,14 +2050,6 @@ }; } { - name = "body___body_5.1.0.tgz"; - path = fetchurl { - name = "body___body_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz"; - sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; - }; - } - { name = "bonjour___bonjour_3.5.0.tgz"; path = fetchurl { name = "bonjour___bonjour_3.5.0.tgz"; @@ -2458,14 +2202,6 @@ }; } { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; - }; - } - { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; @@ -2490,14 +2226,6 @@ }; } { - name = "buffer_shims___buffer_shims_1.0.0.tgz"; - path = fetchurl { - name = "buffer_shims___buffer_shims_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - } - { name = "buffer_xor___buffer_xor_1.0.3.tgz"; path = fetchurl { name = "buffer_xor___buffer_xor_1.0.3.tgz"; @@ -2522,14 +2250,6 @@ }; } { - name = "bytes___bytes_1.0.0.tgz"; - path = fetchurl { - name = "bytes___bytes_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz"; - sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; - }; - } - { name = "bytes___bytes_3.0.0.tgz"; path = fetchurl { name = "bytes___bytes_3.0.0.tgz"; @@ -2578,14 +2298,6 @@ }; } { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - path = fetchurl { - name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; - sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; - }; - } - { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; path = fetchurl { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; @@ -2994,14 +2706,6 @@ }; } { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - path = fetchurl { - name = "clone_buffer___clone_buffer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; - sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; - }; - } - { name = "clone_deep___clone_deep_4.0.1.tgz"; path = fetchurl { name = "clone_deep___clone_deep_4.0.1.tgz"; @@ -3018,30 +2722,6 @@ }; } { - name = "clone_stats___clone_stats_1.0.0.tgz"; - path = fetchurl { - name = "clone_stats___clone_stats_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; - sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; - }; - } - { - name = "clone___clone_2.1.2.tgz"; - path = fetchurl { - name = "clone___clone_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; - }; - } - { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - path = fetchurl { - name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; - sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; - }; - } - { name = "co___co_4.6.0.tgz"; path = fetchurl { name = "co___co_4.6.0.tgz"; @@ -3138,14 +2818,6 @@ }; } { - name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; - path = fetchurl { - name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz"; - sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59"; - }; - } - { name = "commander___commander_2.20.0.tgz"; path = fetchurl { name = "commander___commander_2.20.0.tgz"; @@ -3242,14 +2914,6 @@ }; } { - name = "concat_stream___concat_stream_1.5.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz"; - sha1 = "708978624d856af41a5a741defdd261da752c266"; - }; - } - { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { name = "config_chain___config_chain_1.1.12.tgz"; @@ -3346,14 +3010,6 @@ }; } { - name = "continuable_cache___continuable_cache_0.3.1.tgz"; - path = fetchurl { - name = "continuable_cache___continuable_cache_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz"; - sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; - }; - } - { name = "convert_source_map___convert_source_map_1.6.0.tgz"; path = fetchurl { name = "convert_source_map___convert_source_map_1.6.0.tgz"; @@ -3554,6 +3210,14 @@ }; } { + name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz"; + sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a"; + }; + } + { name = "css_b64_images___css_b64_images_0.2.5.tgz"; path = fetchurl { name = "css_b64_images___css_b64_images_0.2.5.tgz"; @@ -3618,6 +3282,14 @@ }; } { + name = "cssfontparser___cssfontparser_1.2.1.tgz"; + path = fetchurl { + name = "cssfontparser___cssfontparser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz"; + sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3"; + }; + } + { name = "cssom___cssom_0.3.4.tgz"; path = fetchurl { name = "cssom___cssom_0.3.4.tgz"; @@ -3946,27 +3618,27 @@ }; } { - name = "d3___d3_5.9.2.tgz"; + name = "d3___d3_5.12.0.tgz"; path = fetchurl { - name = "d3___d3_5.9.2.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz"; - sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5"; + name = "d3___d3_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz"; + sha1 = "0ddeac879c28c882317cd439b495290acd59ab61"; }; } { - name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; + name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; path = fetchurl { - name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; - url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz"; - sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3"; + name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"; + url = "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"; + sha1 = "7400df3f5fe80538fde43d0201e1570e1d689004"; }; } { - name = "dagre_layout___dagre_layout_0.8.8.tgz"; + name = "dagre___dagre_0.8.4.tgz"; path = fetchurl { - name = "dagre_layout___dagre_layout_0.8.8.tgz"; - url = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz"; - sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9"; + name = "dagre___dagre_0.8.4.tgz"; + url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz"; + sha1 = "26b9fb8f7bdc60c6110a0458c375261836786061"; }; } { @@ -4066,11 +3738,11 @@ }; } { - name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; + name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; path = fetchurl { - name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz"; - sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3"; + name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz"; + sha1 = "e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b"; }; } { @@ -4162,14 +3834,6 @@ }; } { - name = "defined___defined_1.0.0.tgz"; - path = fetchurl { - name = "defined___defined_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; - sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; - }; - } - { name = "del___del_2.2.2.tgz"; path = fetchurl { name = "del___del_2.2.2.tgz"; @@ -4242,14 +3906,6 @@ }; } { - name = "detab___detab_2.0.2.tgz"; - path = fetchurl { - name = "detab___detab_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz"; - sha1 = "074970d1a807b045d0258a4235df5928dd683561"; - }; - } - { name = "detect_file___detect_file_1.0.0.tgz"; path = fetchurl { name = "detect_file___detect_file_1.0.0.tgz"; @@ -4282,14 +3938,6 @@ }; } { - name = "detective___detective_4.7.1.tgz"; - path = fetchurl { - name = "detective___detective_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz"; - sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e"; - }; - } - { name = "di___di_0.0.1.tgz"; path = fetchurl { name = "di___di_0.0.1.tgz"; @@ -4314,14 +3962,6 @@ }; } { - name = "diff___diff_4.0.1.tgz"; - path = fetchurl { - name = "diff___diff_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; - sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; - }; - } - { name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; path = fetchurl { name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; @@ -4370,14 +4010,6 @@ }; } { - name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; - path = fetchurl { - name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz"; - sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57"; - }; - } - { name = "doctrine___doctrine_1.5.0.tgz"; path = fetchurl { name = "doctrine___doctrine_1.5.0.tgz"; @@ -4402,14 +4034,6 @@ }; } { - name = "documentation___documentation_12.0.3.tgz"; - path = fetchurl { - name = "documentation___documentation_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz"; - sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240"; - }; - } - { name = "dom_serialize___dom_serialize_2.2.1.tgz"; path = fetchurl { name = "dom_serialize___dom_serialize_2.2.1.tgz"; @@ -4490,14 +4114,6 @@ }; } { - name = "duplexer2___duplexer2_0.1.4.tgz"; - path = fetchurl { - name = "duplexer2___duplexer2_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; - }; - } - { name = "duplexer3___duplexer3_0.1.4.tgz"; path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; @@ -4586,14 +4202,6 @@ }; } { - name = "emoji_regex___emoji_regex_6.1.1.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz"; - sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; - }; - } - { name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { name = "emoji_regex___emoji_regex_7.0.3.tgz"; @@ -4714,14 +4322,6 @@ }; } { - name = "error___error_7.0.2.tgz"; - path = fetchurl { - name = "error___error_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz"; - sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; - }; - } - { name = "es_abstract___es_abstract_1.13.0.tgz"; path = fetchurl { name = "es_abstract___es_abstract_1.13.0.tgz"; @@ -5546,14 +5146,6 @@ }; } { - name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; - path = fetchurl { - name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"; - sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; - }; - } - { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; path = fetchurl { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; @@ -5650,14 +5242,6 @@ }; } { - name = "get_port___get_port_4.2.0.tgz"; - path = fetchurl { - name = "get_port___get_port_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; - sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; - }; - } - { name = "get_stdin___get_stdin_4.0.1.tgz"; path = fetchurl { name = "get_stdin___get_stdin_4.0.1.tgz"; @@ -5738,38 +5322,6 @@ }; } { - name = "git_up___git_up_2.1.0.tgz"; - path = fetchurl { - name = "git_up___git_up_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz"; - sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c"; - }; - } - { - name = "git_url_parse___git_url_parse_10.1.0.tgz"; - path = fetchurl { - name = "git_url_parse___git_url_parse_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz"; - sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e"; - }; - } - { - name = "github_slugger___github_slugger_1.2.0.tgz"; - path = fetchurl { - name = "github_slugger___github_slugger_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz"; - sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a"; - }; - } - { - name = "github_slugger___github_slugger_1.2.1.tgz"; - path = fetchurl { - name = "github_slugger___github_slugger_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz"; - sha1 = "47e904e70bf2dccd0014748142d31126cfd49508"; - }; - } - { name = "glob_parent___glob_parent_3.1.0.tgz"; path = fetchurl { name = "glob_parent___glob_parent_3.1.0.tgz"; @@ -5786,14 +5338,6 @@ }; } { - name = "glob_stream___glob_stream_6.1.0.tgz"; - path = fetchurl { - name = "glob_stream___glob_stream_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz"; - sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; - }; - } - { name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; path = fetchurl { name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; @@ -5858,14 +5402,6 @@ }; } { - name = "globals_docs___globals_docs_2.4.0.tgz"; - path = fetchurl { - name = "globals_docs___globals_docs_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz"; - sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb"; - }; - } - { name = "globals___globals_11.12.0.tgz"; path = fetchurl { name = "globals___globals_11.12.0.tgz"; @@ -5962,11 +5498,11 @@ }; } { - name = "graphlibrary___graphlibrary_2.2.0.tgz"; + name = "graphlib___graphlib_2.1.7.tgz"; path = fetchurl { - name = "graphlibrary___graphlibrary_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz"; - sha1 = "017a14899775228dec4497a39babfdd6bf56eac6"; + name = "graphlib___graphlib_2.1.7.tgz"; + url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz"; + sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc"; }; } { @@ -6154,38 +5690,6 @@ }; } { - name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; - path = fetchurl { - name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz"; - sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4"; - }; - } - { - name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; - path = fetchurl { - name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz"; - sha1 = "4e60d66336bd67e52354d581967467029a933f2e"; - }; - } - { - name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; - path = fetchurl { - name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz"; - sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a"; - }; - } - { - name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; - path = fetchurl { - name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz"; - sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34"; - }; - } - { name = "he___he_1.2.0.tgz"; path = fetchurl { name = "he___he_1.2.0.tgz"; @@ -6194,14 +5698,6 @@ }; } { - name = "highlight.js___highlight.js_9.15.8.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_9.15.8.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz"; - sha1 = "f344fda123f36f1a65490e932cf90569e4999971"; - }; - } - { name = "highlight.js___highlight.js_9.13.1.tgz"; path = fetchurl { name = "highlight.js___highlight.js_9.13.1.tgz"; @@ -6282,14 +5778,6 @@ }; } { - name = "html_void_elements___html_void_elements_1.0.4.tgz"; - path = fetchurl { - name = "html_void_elements___html_void_elements_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz"; - sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5"; - }; - } - { name = "htmlparser2___htmlparser2_3.10.0.tgz"; path = fetchurl { name = "htmlparser2___htmlparser2_3.10.0.tgz"; @@ -6442,14 +5930,6 @@ }; } { - name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; - path = fetchurl { - name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; - url = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz"; - sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0"; - }; - } - { name = "import_fresh___import_fresh_2.0.0.tgz"; path = fetchurl { name = "import_fresh___import_fresh_2.0.0.tgz"; @@ -6658,14 +6138,6 @@ }; } { - name = "is_absolute___is_absolute_1.0.0.tgz"; - path = fetchurl { - name = "is_absolute___is_absolute_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; - sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576"; - }; - } - { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; @@ -6922,14 +6394,6 @@ }; } { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - path = fetchurl { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; - }; - } - { name = "is_npm___is_npm_1.0.0.tgz"; path = fetchurl { name = "is_npm___is_npm_1.0.0.tgz"; @@ -7066,14 +6530,6 @@ }; } { - name = "is_relative___is_relative_1.0.0.tgz"; - path = fetchurl { - name = "is_relative___is_relative_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; - sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"; - }; - } - { name = "is_resolvable___is_resolvable_1.1.0.tgz"; path = fetchurl { name = "is_resolvable___is_resolvable_1.1.0.tgz"; @@ -7090,14 +6546,6 @@ }; } { - name = "is_ssh___is_ssh_1.3.1.tgz"; - path = fetchurl { - name = "is_ssh___is_ssh_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz"; - sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3"; - }; - } - { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; @@ -7122,14 +6570,6 @@ }; } { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - path = fetchurl { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; - }; - } - { name = "is_utf8___is_utf8_0.2.1.tgz"; path = fetchurl { name = "is_utf8___is_utf8_0.2.1.tgz"; @@ -7138,14 +6578,6 @@ }; } { - name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; - path = fetchurl { - name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; - sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; - }; - } - { name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; path = fetchurl { name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; @@ -7338,6 +6770,14 @@ }; } { + name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz"; + path = fetchurl { + name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.1.2.tgz"; + sha1 = "0d16c9f91534f773fd132fc289f2e6b6db8faa28"; + }; + } + { name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; path = fetchurl { name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; @@ -7802,14 +7242,6 @@ }; } { - name = "jsonparse___jsonparse_1.3.1.tgz"; - path = fetchurl { - name = "jsonparse___jsonparse_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; - }; - } - { name = "jsprim___jsprim_1.4.1.tgz"; path = fetchurl { name = "jsprim___jsprim_1.4.1.tgz"; @@ -7978,14 +7410,6 @@ }; } { - name = "lazystream___lazystream_1.0.0.tgz"; - path = fetchurl { - name = "lazystream___lazystream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; - }; - } - { name = "lcid___lcid_1.0.0.tgz"; path = fetchurl { name = "lcid___lcid_1.0.0.tgz"; @@ -8002,14 +7426,6 @@ }; } { - name = "lead___lead_1.0.0.tgz"; - path = fetchurl { - name = "lead___lead_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz"; - sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; - }; - } - { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { name = "left_pad___left_pad_1.3.0.tgz"; @@ -8066,14 +7482,6 @@ }; } { - name = "livereload_js___livereload_js_2.4.0.tgz"; - path = fetchurl { - name = "livereload_js___livereload_js_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz"; - sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c"; - }; - } - { name = "load_json_file___load_json_file_1.1.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_1.1.0.tgz"; @@ -8186,6 +7594,22 @@ }; } { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + path = fetchurl { + name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + } + { name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; path = fetchurl { name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; @@ -8514,46 +7938,6 @@ }; } { - name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; - path = fetchurl { - name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz"; - sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7"; - }; - } - { - name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; - path = fetchurl { - name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz"; - sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675"; - }; - } - { - name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; - path = fetchurl { - name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz"; - sha1 = "132001b266031192348d3366a6b011f28e54dc40"; - }; - } - { - name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; - path = fetchurl { - name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz"; - sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d"; - }; - } - { - name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; - path = fetchurl { - name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz"; - sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934"; - }; - } - { name = "mdurl___mdurl_1.0.1.tgz"; path = fetchurl { name = "mdurl___mdurl_1.0.1.tgz"; @@ -8642,11 +8026,11 @@ }; } { - name = "mermaid___mermaid_8.2.6.tgz"; + name = "mermaid___mermaid_8.4.2.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.2.6.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz"; - sha1 = "e73f396461a435c39a998819171c2114f59e46e1"; + name = "mermaid___mermaid_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.2.tgz"; + sha1 = "91d3d8e9541e72eed7a78d0e882db11564fab3bb"; }; } { @@ -8834,14 +8218,6 @@ }; } { - name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; - path = fetchurl { - name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz"; - sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74"; - }; - } - { name = "moment_mini___moment_mini_2.22.1.tgz"; path = fetchurl { name = "moment_mini___moment_mini_2.22.1.tgz"; @@ -9154,22 +8530,6 @@ }; } { - name = "normalize_url___normalize_url_1.9.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; - sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; - }; - } - { - name = "now_and_later___now_and_later_2.0.1.tgz"; - path = fetchurl { - name = "now_and_later___now_and_later_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz"; - sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c"; - }; - } - { name = "npm_bundled___npm_bundled_1.0.6.tgz"; path = fetchurl { name = "npm_bundled___npm_bundled_1.0.6.tgz"; @@ -9362,11 +8722,11 @@ }; } { - name = "optimism___optimism_0.6.9.tgz"; + name = "optimism___optimism_0.10.3.tgz"; path = fetchurl { - name = "optimism___optimism_0.6.9.tgz"; - url = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz"; - sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb"; + name = "optimism___optimism_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz"; + sha1 = "163268fdc741dea2fb50f300bedda80356445fd7"; }; } { @@ -9386,14 +8746,6 @@ }; } { - name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; - path = fetchurl { - name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; - }; - } - { name = "orderedmap___orderedmap_1.0.0.tgz"; path = fetchurl { name = "orderedmap___orderedmap_1.0.0.tgz"; @@ -9610,27 +8962,19 @@ }; } { - name = "parse_entities___parse_entities_1.2.0.tgz"; + name = "parse_color___parse_color_1.0.0.tgz"; path = fetchurl { - name = "parse_entities___parse_entities_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; - sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; + name = "parse_color___parse_color_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz"; + sha1 = "7b748b95a83f03f16a94f535e52d7f3d94658619"; }; } { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - path = fetchurl { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; - }; - } - { - name = "parse_git_config___parse_git_config_0.2.0.tgz"; + name = "parse_entities___parse_entities_1.2.0.tgz"; path = fetchurl { - name = "parse_git_config___parse_git_config_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz"; - sha1 = "272833fdd15fea146fb75d336d236b963b6ff706"; + name = "parse_entities___parse_entities_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; + sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; }; } { @@ -9658,22 +9002,6 @@ }; } { - name = "parse_path___parse_path_3.0.4.tgz"; - path = fetchurl { - name = "parse_path___parse_path_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz"; - sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4"; - }; - } - { - name = "parse_url___parse_url_3.0.2.tgz"; - path = fetchurl { - name = "parse_url___parse_url_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz"; - sha1 = "602787a7063a795d72b8673197505e72f60610be"; - }; - } - { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -9794,22 +9122,6 @@ }; } { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - path = fetchurl { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; - }; - } - { - name = "path_root___path_root_0.1.1.tgz"; - path = fetchurl { - name = "path_root___path_root_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; - sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; - }; - } - { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; path = fetchurl { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; @@ -10194,11 +9506,11 @@ }; } { - name = "postcss___postcss_7.0.18.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.18.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz"; - sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { @@ -10258,14 +9570,6 @@ }; } { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; - }; - } - { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; path = fetchurl { name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; @@ -10274,6 +9578,14 @@ }; } { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { name = "process___process_0.11.10.tgz"; path = fetchurl { name = "process___process_0.11.10.tgz"; @@ -10306,14 +9618,6 @@ }; } { - name = "property_information___property_information_4.2.0.tgz"; - path = fetchurl { - name = "property_information___property_information_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz"; - sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e"; - }; - } - { name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; path = fetchurl { name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; @@ -10434,14 +9738,6 @@ }; } { - name = "protocols___protocols_1.4.7.tgz"; - path = fetchurl { - name = "protocols___protocols_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz"; - sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32"; - }; - } - { name = "proxy_addr___proxy_addr_2.0.5.tgz"; path = fetchurl { name = "proxy_addr___proxy_addr_2.0.5.tgz"; @@ -10562,14 +9858,6 @@ }; } { - name = "query_string___query_string_4.3.4.tgz"; - path = fetchurl { - name = "query_string___query_string_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; - sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; - }; - } - { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; @@ -10634,14 +9922,6 @@ }; } { - name = "raven_js___raven_js_3.22.1.tgz"; - path = fetchurl { - name = "raven_js___raven_js_3.22.1.tgz"; - url = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz"; - sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da"; - }; - } - { name = "raw_body___raw_body_2.4.0.tgz"; path = fetchurl { name = "raw_body___raw_body_2.4.0.tgz"; @@ -10650,14 +9930,6 @@ }; } { - name = "raw_body___raw_body_1.1.7.tgz"; - path = fetchurl { - name = "raw_body___raw_body_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz"; - sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; - }; - } - { name = "raw_loader___raw_loader_3.1.0.tgz"; path = fetchurl { name = "raw_loader___raw_loader_3.1.0.tgz"; @@ -10762,14 +10034,6 @@ }; } { - name = "readable_stream___readable_stream_2.1.5.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; - }; - } - { name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; path = fetchurl { name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; @@ -10930,22 +10194,6 @@ }; } { - name = "remark_html___remark_html_8.0.0.tgz"; - path = fetchurl { - name = "remark_html___remark_html_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz"; - sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a"; - }; - } - { - name = "remark_parse___remark_parse_5.0.0.tgz"; - path = fetchurl { - name = "remark_parse___remark_parse_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz"; - sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95"; - }; - } - { name = "remark_parse___remark_parse_6.0.3.tgz"; path = fetchurl { name = "remark_parse___remark_parse_6.0.3.tgz"; @@ -10954,30 +10202,6 @@ }; } { - name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; - path = fetchurl { - name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz"; - sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab"; - }; - } - { - name = "remark_slug___remark_slug_5.1.2.tgz"; - path = fetchurl { - name = "remark_slug___remark_slug_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz"; - sha1 = "715ecdef8df1226786204b1887d31ab16aa24609"; - }; - } - { - name = "remark_stringify___remark_stringify_5.0.0.tgz"; - path = fetchurl { - name = "remark_stringify___remark_stringify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz"; - sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba"; - }; - } - { name = "remark_stringify___remark_stringify_6.0.4.tgz"; path = fetchurl { name = "remark_stringify___remark_stringify_6.0.4.tgz"; @@ -10986,14 +10210,6 @@ }; } { - name = "remark_toc___remark_toc_5.1.1.tgz"; - path = fetchurl { - name = "remark_toc___remark_toc_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz"; - sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78"; - }; - } - { name = "remark___remark_10.0.1.tgz"; path = fetchurl { name = "remark___remark_10.0.1.tgz"; @@ -11002,38 +10218,6 @@ }; } { - name = "remark___remark_9.0.0.tgz"; - path = fetchurl { - name = "remark___remark_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz"; - sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"; - }; - } - { - name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; - path = fetchurl { - name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz"; - sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30"; - }; - } - { - name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; - path = fetchurl { - name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; - sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53"; - }; - } - { - name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; - path = fetchurl { - name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; - sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; - }; - } - { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; path = fetchurl { name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; @@ -11202,14 +10386,6 @@ }; } { - name = "resolve_options___resolve_options_1.1.0.tgz"; - path = fetchurl { - name = "resolve_options___resolve_options_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz"; - sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; - }; - } - { name = "resolve_url___resolve_url_0.2.1.tgz"; path = fetchurl { name = "resolve_url___resolve_url_0.2.1.tgz"; @@ -11338,14 +10514,6 @@ }; } { - name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; - path = fetchurl { - name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; - sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; - }; - } - { name = "safe_regex___safe_regex_1.1.0.tgz"; path = fetchurl { name = "safe_regex___safe_regex_1.1.0.tgz"; @@ -11370,11 +10538,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.16.3.tgz"; + name = "sanitize_html___sanitize_html_1.20.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.16.3.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz"; - sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56"; + name = "sanitize_html___sanitize_html_1.20.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz"; + sha1 = "f6effdf55dd398807171215a62bfc21811bacf85"; }; } { @@ -11778,14 +10946,6 @@ }; } { - name = "sort_keys___sort_keys_1.1.2.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; - }; - } - { name = "sortablejs___sortablejs_1.10.0.tgz"; path = fetchurl { name = "sortablejs___sortablejs_1.10.0.tgz"; @@ -11866,14 +11026,6 @@ }; } { - name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; - path = fetchurl { - name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz"; - sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa"; - }; - } - { name = "spdx_correct___spdx_correct_1.0.2.tgz"; path = fetchurl { name = "spdx_correct___spdx_correct_1.0.2.tgz"; @@ -12034,14 +11186,6 @@ }; } { - name = "stream_array___stream_array_1.1.2.tgz"; - path = fetchurl { - name = "stream_array___stream_array_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz"; - sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5"; - }; - } - { name = "stream_browserify___stream_browserify_2.0.1.tgz"; path = fetchurl { name = "stream_browserify___stream_browserify_2.0.1.tgz"; @@ -12050,14 +11194,6 @@ }; } { - name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; - path = fetchurl { - name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; - }; - } - { name = "stream_each___stream_each_1.2.2.tgz"; path = fetchurl { name = "stream_each___stream_each_1.2.2.tgz"; @@ -12090,14 +11226,6 @@ }; } { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - path = fetchurl { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; - }; - } - { name = "string_length___string_length_2.0.0.tgz"; path = fetchurl { name = "string_length___string_length_2.0.0.tgz"; @@ -12106,14 +11234,6 @@ }; } { - name = "string_template___string_template_0.2.1.tgz"; - path = fetchurl { - name = "string_template___string_template_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz"; - sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; - }; - } - { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; @@ -12146,14 +11266,6 @@ }; } { - name = "string_decoder___string_decoder_0.10.31.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_0.10.31.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - } - { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; @@ -12162,6 +11274,14 @@ }; } { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { name = "stringify_entities___stringify_entities_1.3.2.tgz"; path = fetchurl { name = "stringify_entities___stringify_entities_1.3.2.tgz"; @@ -12290,14 +11410,6 @@ }; } { - name = "subarg___subarg_1.0.0.tgz"; - path = fetchurl { - name = "subarg___subarg_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; - sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; - }; - } - { name = "sugarss___sugarss_2.0.0.tgz"; path = fetchurl { name = "sugarss___sugarss_2.0.0.tgz"; @@ -12498,14 +11610,6 @@ }; } { - name = "through2_filter___through2_filter_3.0.0.tgz"; - path = fetchurl { - name = "through2_filter___through2_filter_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz"; - sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254"; - }; - } - { name = "through2___through2_2.0.5.tgz"; path = fetchurl { name = "through2___through2_2.0.5.tgz"; @@ -12570,14 +11674,6 @@ }; } { - name = "tiny_lr___tiny_lr_1.1.1.tgz"; - path = fetchurl { - name = "tiny_lr___tiny_lr_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz"; - sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab"; - }; - } - { name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; path = fetchurl { name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; @@ -12626,14 +11722,6 @@ }; } { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - path = fetchurl { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; - sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; - }; - } - { name = "to_array___to_array_0.1.4.tgz"; path = fetchurl { name = "to_array___to_array_0.1.4.tgz"; @@ -12690,14 +11778,6 @@ }; } { - name = "to_through___to_through_2.0.0.tgz"; - path = fetchurl { - name = "to_through___to_through_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz"; - sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; - }; - } - { name = "toggle_selection___toggle_selection_1.0.6.tgz"; path = fetchurl { name = "toggle_selection___toggle_selection_1.0.6.tgz"; @@ -12738,14 +11818,6 @@ }; } { - name = "trim_lines___trim_lines_1.1.2.tgz"; - path = fetchurl { - name = "trim_lines___trim_lines_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz"; - sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b"; - }; - } - { name = "trim_newlines___trim_newlines_1.0.0.tgz"; path = fetchurl { name = "trim_newlines___trim_newlines_1.0.0.tgz"; @@ -12818,14 +11890,6 @@ }; } { - name = "ts_invariant___ts_invariant_0.2.1.tgz"; - path = fetchurl { - name = "ts_invariant___ts_invariant_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz"; - sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"; - }; - } - { name = "ts_invariant___ts_invariant_0.3.2.tgz"; path = fetchurl { name = "ts_invariant___ts_invariant_0.3.2.tgz"; @@ -12834,6 +11898,14 @@ }; } { + name = "ts_invariant___ts_invariant_0.4.4.tgz"; + path = fetchurl { + name = "ts_invariant___ts_invariant_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz"; + sha1 = "97a523518688f93aafad01b0e80eb803eb2abd86"; + }; + } + { name = "ts_jest___ts_jest_24.0.0.tgz"; path = fetchurl { name = "ts_jest___ts_jest_24.0.0.tgz"; @@ -12882,6 +11954,14 @@ }; } { + name = "type_fest___type_fest_0.5.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz"; + sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2"; + }; + } + { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; @@ -12930,14 +12010,6 @@ }; } { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - path = fetchurl { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; - }; - } - { name = "undefsafe___undefsafe_2.0.2.tgz"; path = fetchurl { name = "undefsafe___undefsafe_2.0.2.tgz"; @@ -13018,14 +12090,6 @@ }; } { - name = "unified___unified_6.2.0.tgz"; - path = fetchurl { - name = "unified___unified_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz"; - sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba"; - }; - } - { name = "unified___unified_7.1.0.tgz"; path = fetchurl { name = "unified___unified_7.1.0.tgz"; @@ -13066,14 +12130,6 @@ }; } { - name = "unique_stream___unique_stream_2.3.1.tgz"; - path = fetchurl { - name = "unique_stream___unique_stream_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz"; - sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"; - }; - } - { name = "unique_string___unique_string_1.0.0.tgz"; path = fetchurl { name = "unique_string___unique_string_1.0.0.tgz"; @@ -13082,14 +12138,6 @@ }; } { - name = "unist_builder___unist_builder_1.0.4.tgz"; - path = fetchurl { - name = "unist_builder___unist_builder_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz"; - sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17"; - }; - } - { name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; path = fetchurl { name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; @@ -13098,14 +12146,6 @@ }; } { - name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; - path = fetchurl { - name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz"; - sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7"; - }; - } - { name = "unist_util_is___unist_util_is_2.1.2.tgz"; path = fetchurl { name = "unist_util_is___unist_util_is_2.1.2.tgz"; @@ -13114,14 +12154,6 @@ }; } { - name = "unist_util_position___unist_util_position_3.0.3.tgz"; - path = fetchurl { - name = "unist_util_position___unist_util_position_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz"; - sha1 = "fff942b879538b242096c148153826664b1ca373"; - }; - } - { name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; path = fetchurl { name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; @@ -13138,14 +12170,6 @@ }; } { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; - path = fetchurl { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; - sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3"; - }; - } - { name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; path = fetchurl { name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; @@ -13362,14 +12386,6 @@ }; } { - name = "value_or_function___value_or_function_3.0.0.tgz"; - path = fetchurl { - name = "value_or_function___value_or_function_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz"; - sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; - }; - } - { name = "vary___vary_1.1.2.tgz"; path = fetchurl { name = "vary___vary_1.1.2.tgz"; @@ -13402,46 +12418,6 @@ }; } { - name = "vfile_message___vfile_message_2.0.1.tgz"; - path = fetchurl { - name = "vfile_message___vfile_message_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz"; - sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d"; - }; - } - { - name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; - path = fetchurl { - name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz"; - sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e"; - }; - } - { - name = "vfile_sort___vfile_sort_2.2.1.tgz"; - path = fetchurl { - name = "vfile_sort___vfile_sort_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz"; - sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567"; - }; - } - { - name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; - path = fetchurl { - name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz"; - sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60"; - }; - } - { - name = "vfile___vfile_2.3.0.tgz"; - path = fetchurl { - name = "vfile___vfile_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz"; - sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a"; - }; - } - { name = "vfile___vfile_3.0.1.tgz"; path = fetchurl { name = "vfile___vfile_3.0.1.tgz"; @@ -13450,38 +12426,6 @@ }; } { - name = "vfile___vfile_4.0.1.tgz"; - path = fetchurl { - name = "vfile___vfile_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz"; - sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c"; - }; - } - { - name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; - path = fetchurl { - name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; - sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7"; - }; - } - { - name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; - path = fetchurl { - name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"; - sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; - }; - } - { - name = "vinyl___vinyl_2.2.0.tgz"; - path = fetchurl { - name = "vinyl___vinyl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; - sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; - }; - } - { name = "visibilityjs___visibilityjs_1.2.4.tgz"; path = fetchurl { name = "visibilityjs___visibilityjs_1.2.4.tgz"; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 7c157191ab9..9f298e0129e 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, nettools, perl }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh"; }; - buildInputs = [ git nettools perl ]; + buildInputs = [ nettools perl ]; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ git ]; dontBuild = true; @@ -25,6 +27,11 @@ stdenv.mkDerivation rec { --replace hostname "${nettools}/bin/hostname" ''; + postFixup = '' + wrapProgram $out/bin/gitolite-shell \ + --prefix PATH : "${git}/bin" + ''; + installPhase = '' mkdir -p $out/bin perl ./install -to $out/bin diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 0a24cfbb3a0..2ce855d3a7f 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL2_image, freetype, glew, libGLU_combined, boost, glm +, SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: stdenv.mkDerivation rec { - version = "0.49"; + version = "0.51"; pname = "gource"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9"; + sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined + glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype ]; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index ee0ab375666..792e647324a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ stdenv, fetchurl, python3Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices -, mercurialSrc ? fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = "4.9.1"; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - } }: let - inherit (python2Packages) docutils hg-git dulwich python; + inherit (python3Packages) docutils dulwich python; -in python2Packages.buildPythonApplication { +in python3Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "5.2.1"; - inherit (mercurialSrc.meta) name version; - src = mercurialSrc; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + }; format = "other"; @@ -24,41 +22,39 @@ in python2Packages.buildPythonApplication { buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ]; + propagatedBuildInputs = [ dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport - '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') + - '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done + postInstall = (stdenv.lib.optionalString guiSupport '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi - # install bash/zsh completions - install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg - install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg - ''; + # install bash/zsh completions + install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg + install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg + ''; meta = { - inherit (mercurialSrc.meta) version; + inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = https://www.mercurial-scm.org; downloadPage = https://www.mercurial-scm.org/release/; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 7081e1a0899..bf8e5652d99 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -5,7 +5,7 @@ let version = "1.1"; - perlVersion = (builtins.parseDrvName perl.name).version; + perlVersion = stdenv.lib.getVersion perl; in assert perlVersion != ""; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 6d0e39d47bf..3c553918925 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,17 @@ { stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }: -rustPlatform.buildRustPackage rec { +let + # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in + # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416 + # Remove with the next release + nettle_34 = nettle.overrideAttrs (_oldAttrs: rec { + version = "3.4.1"; + src = fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr"; + }; + }); +in rustPlatform.buildRustPackage rec { pname = "pijul"; version = "0.12.0"; @@ -20,7 +31,7 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = libclang + "/lib"; - buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin + buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security ]); doCheck = false; diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile deleted file mode 100644 index 343c7b3a547..00000000000 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile +++ /dev/null @@ -1,72 +0,0 @@ -source 'https://rubygems.org' - -gem "bundler", ">= 1.5.0" - -gem "rails", "5.2.3" -gem "rouge", "~> 3.3.0" -gem "request_store", "1.0.5" -gem "mini_mime", "~> 1.0.1" -gem "actionpack-xml_parser" -gem "roadie-rails", "~> 1.3.0" -gem "mimemagic" -gem "mail", "~> 2.7.1" -gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" - -gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") -gem "i18n", "~> 0.7.0" -gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] -gem "rbpdf", "~> 1.19.6" - -# Optional gem for LDAP authentication -group :ldap do - gem "net-ldap", "~> 0.16.0" -end - -# Optional gem for OpenID authentication -group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" - gem "rack-openid" -end - -platforms :mri, :mingw, :x64_mingw do - # Optional gem for exporting the gantt to a PNG file, not supported with jruby - group :rmagick do - gem "rmagick", "~> 2.16.0" - end - - # Optional Markdown support, not for JRuby - group :markdown do - gem "redcarpet", "~> 3.4.0" - end -end - -# Include database gems for the database adapters NixOS supports -gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] -gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] - -group :development do - gem "yard" -end - -group :test do - gem "rails-dom-testing" - gem "mocha" - gem "simplecov", "~> 0.14.1", :require => false - # For running system tests - gem 'puma', '~> 3.7' - gem "capybara", '~> 2.13' - gem "selenium-webdriver" -end - -local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exists?(local_gemfile) - eval_gemfile local_gemfile -end - -# Load plugins' Gemfiles -Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| - eval_gemfile file -end diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock deleted file mode 100644 index 671d2bb4ac1..00000000000 --- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock +++ /dev/null @@ -1,203 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.2.3) - actionpack (= 5.2.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionpack-xml_parser (2.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - actionview (5.2.3) - activesupport (= 5.2.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) - globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) - marcel (~> 0.3.1) - activesupport (5.2.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - arel (9.0.0) - builder (3.2.3) - capybara (2.18.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - childprocess (1.0.1) - rake (< 13.0) - concurrent-ruby (1.1.5) - crass (1.0.4) - css_parser (1.7.0) - addressable - csv (3.0.9) - docile (1.1.5) - erubi (1.8.0) - globalid (0.4.2) - activesupport (>= 4.2.0) - htmlentities (4.3.4) - i18n (0.7.0) - json (2.2.0) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - metaclass (0.0.4) - method_source (0.9.2) - mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - mysql2 (0.5.2) - net-ldap (0.16.1) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) - pg (1.1.4) - public_suffix (3.1.0) - puma (3.12.1) - rack (2.0.7) - rack-openid (1.4.2) - rack (>= 1.1.0) - ruby-openid (>= 2.1.8) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) - bundler (>= 1.3.0) - railties (= 5.2.3) - sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rake (12.3.2) - rbpdf (1.19.8) - htmlentities - rbpdf-font (~> 1.19.0) - rbpdf-font (1.19.1) - redcarpet (3.4.0) - request_store (1.0.5) - rmagick (2.16.0) - roadie (3.5.0) - css_parser (~> 1.4) - nokogiri (~> 1.8) - roadie-rails (1.3.0) - railties (>= 3.0, < 5.3) - roadie (~> 3.1) - rouge (3.3.0) - ruby-openid (2.3.0) - rubyzip (1.2.3) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) - rubyzip (~> 1.2, >= 1.2.2) - simplecov (0.14.1) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - thor (0.20.3) - thread_safe (0.3.6) - tzinfo (1.2.5) - thread_safe (~> 0.1) - websocket-driver (0.7.1) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) - xpath (3.2.0) - nokogiri (~> 1.8) - yard (0.9.19) - -PLATFORMS - ruby - -DEPENDENCIES - actionpack-xml_parser - bundler (>= 1.5.0) - capybara (~> 2.13) - csv (~> 3.0.1) - i18n (~> 0.7.0) - mail (~> 2.7.1) - mimemagic - mini_mime (~> 1.0.1) - mocha - mysql2 (~> 0.5.0) - net-ldap (~> 0.16.0) - nokogiri (~> 1.10.0) - pg (~> 1.1.4) - puma (~> 3.7) - rack-openid - rails (= 5.2.3) - rails-dom-testing - rbpdf (~> 1.19.6) - redcarpet (~> 3.4.0) - request_store (= 1.0.5) - rmagick (~> 2.16.0) - roadie-rails (~> 1.3.0) - rouge (~> 3.3.0) - ruby-openid (~> 2.3.0) - selenium-webdriver - simplecov (~> 0.14.1) - tzinfo-data - yard - -BUNDLED WITH - 1.16.3 diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix deleted file mode 100644 index a3ba418a146..00000000000 --- a/pkgs/applications/version-management/redmine/4.x/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, bundlerEnv, ruby }: - -let - version = "4.0.4"; - rubyEnv = bundlerEnv { - name = "redmine-env-${version}"; - - inherit ruby; - gemdir = ./.; - groups = [ "ldap" "openid" ]; - }; -in - stdenv.mkDerivation rec { - pname = "redmine"; - inherit version; - - src = fetchurl { - url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a"; - }; - - buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; - - buildPhase = '' - mv config config.dist - mv public/themes public/themes.dist - ''; - - installPhase = '' - mkdir -p $out/share - cp -r . $out/share/redmine - for i in config files log plugins public/plugin_assets public/themes tmp; do - rm -rf $out/share/redmine/$i - ln -fs /run/redmine/$i $out/share/redmine/$i - done - ''; - - meta = with stdenv.lib; { - homepage = http://www.redmine.org/; - platforms = platforms.linux; - maintainers = [ maintainers.aanderse ]; - license = licenses.gpl2; - }; - } diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix deleted file mode 100644 index 34e459111f8..00000000000 --- a/pkgs/applications/version-management/redmine/4.x/gemset.nix +++ /dev/null @@ -1,614 +0,0 @@ -{ - actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionpack-xml_parser = { - dependencies = ["actionpack" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; - type = "gem"; - }; - version = "2.0.1"; - }; - actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; - type = "gem"; - }; - version = "5.2.3"; - }; - activejob = { - dependencies = ["activesupport" "globalid"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; - type = "gem"; - }; - version = "5.2.3"; - }; - activemodel = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; - type = "gem"; - }; - version = "5.2.3"; - }; - activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; - type = "gem"; - }; - version = "5.2.3"; - }; - activestorage = { - dependencies = ["actionpack" "activerecord" "marcel"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; - type = "gem"; - }; - version = "5.2.3"; - }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; - type = "gem"; - }; - version = "5.2.3"; - }; - addressable = { - dependencies = ["public_suffix"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; - type = "gem"; - }; - version = "2.6.0"; - }; - arel = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; - }; - builder = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; - type = "gem"; - }; - version = "3.2.3"; - }; - capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8"; - type = "gem"; - }; - version = "2.18.0"; - }; - childprocess = { - dependencies = ["rake"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz"; - type = "gem"; - }; - version = "1.0.1"; - }; - concurrent-ruby = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; - type = "gem"; - }; - version = "1.1.5"; - }; - crass = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; - type = "gem"; - }; - version = "1.0.4"; - }; - css_parser = { - dependencies = ["addressable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; - type = "gem"; - }; - version = "1.7.0"; - }; - csv = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b"; - type = "gem"; - }; - version = "3.0.9"; - }; - docile = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - type = "gem"; - }; - version = "1.1.5"; - }; - erubi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; - type = "gem"; - }; - version = "1.8.0"; - }; - globalid = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; - type = "gem"; - }; - version = "0.4.2"; - }; - htmlentities = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - i18n = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; - type = "gem"; - }; - version = "0.7.0"; - }; - json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; - type = "gem"; - }; - version = "2.2.0"; - }; - loofah = { - dependencies = ["crass" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; - type = "gem"; - }; - version = "2.2.3"; - }; - mail = { - dependencies = ["mini_mime"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; - type = "gem"; - }; - version = "2.7.1"; - }; - marcel = { - dependencies = ["mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; - type = "gem"; - }; - version = "0.3.3"; - }; - metaclass = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; - type = "gem"; - }; - version = "0.0.4"; - }; - method_source = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; - type = "gem"; - }; - version = "0.9.2"; - }; - mimemagic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; - type = "gem"; - }; - version = "0.3.3"; - }; - mini_mime = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; - type = "gem"; - }; - version = "1.0.1"; - }; - mini_portile2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; - type = "gem"; - }; - version = "2.4.0"; - }; - minitest = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; - type = "gem"; - }; - version = "5.11.3"; - }; - mocha = { - dependencies = ["metaclass"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al"; - type = "gem"; - }; - version = "1.8.0"; - }; - mysql2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4"; - type = "gem"; - }; - version = "0.5.2"; - }; - net-ldap = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "016igqz81a8zcwqzp5bbhryqmb2skmyf57ij3nb5z8sxwhw22jgh"; - type = "gem"; - }; - version = "0.16.1"; - }; - nio4r = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; - type = "gem"; - }; - version = "2.3.1"; - }; - nokogiri = { - dependencies = ["mini_portile2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; - type = "gem"; - }; - version = "1.10.3"; - }; - pg = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; - type = "gem"; - }; - version = "1.1.4"; - }; - public_suffix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; - type = "gem"; - }; - version = "3.1.0"; - }; - puma = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3"; - type = "gem"; - }; - version = "3.12.1"; - }; - rack = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; - type = "gem"; - }; - version = "2.0.7"; - }; - rack-openid = { - dependencies = ["rack" "ruby-openid"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; - type = "gem"; - }; - version = "1.4.2"; - }; - rack-test = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; - type = "gem"; - }; - version = "1.1.0"; - }; - rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; - type = "gem"; - }; - version = "5.2.3"; - }; - rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; - type = "gem"; - }; - version = "2.0.3"; - }; - rails-html-sanitizer = { - dependencies = ["loofah"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; - type = "gem"; - }; - version = "1.0.4"; - }; - railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; - type = "gem"; - }; - version = "5.2.3"; - }; - rake = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; - type = "gem"; - }; - version = "12.3.2"; - }; - rbpdf = { - dependencies = ["htmlentities" "rbpdf-font"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; - type = "gem"; - }; - version = "1.19.8"; - }; - rbpdf-font = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; - type = "gem"; - }; - version = "1.19.1"; - }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; - request_store = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; - type = "gem"; - }; - version = "1.0.5"; - }; - rmagick = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; - type = "gem"; - }; - version = "2.16.0"; - }; - roadie = { - dependencies = ["css_parser" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d"; - type = "gem"; - }; - version = "3.5.0"; - }; - roadie-rails = { - dependencies = ["railties" "roadie"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02km0ama85mkw7kkn6qif86b781pglfdmqrwx5s6hwjlzk16qih3"; - type = "gem"; - }; - version = "1.3.0"; - }; - rouge = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; - type = "gem"; - }; - version = "3.3.0"; - }; - ruby-openid = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn"; - type = "gem"; - }; - version = "2.3.0"; - }; - rubyzip = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; - type = "gem"; - }; - version = "1.2.3"; - }; - selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy"; - type = "gem"; - }; - version = "3.142.3"; - }; - simplecov = { - dependencies = ["docile" "json" "simplecov-html"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; - type = "gem"; - }; - version = "0.14.1"; - }; - simplecov-html = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; - type = "gem"; - }; - version = "0.10.2"; - }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; - type = "gem"; - }; - version = "3.2.1"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; - type = "gem"; - }; - version = "0.20.3"; - }; - thread_safe = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; - tzinfo = { - dependencies = ["thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; - type = "gem"; - }; - version = "1.2.5"; - }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; - type = "gem"; - }; - version = "0.7.1"; - }; - websocket-extensions = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; - type = "gem"; - }; - version = "0.1.4"; - }; - xpath = { - dependencies = ["nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; - yard = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; - type = "gem"; - }; - version = "0.9.19"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 5a0283e20ed..b1c651695c7 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -1,77 +1,65 @@ source 'https://rubygems.org' -gem "bundler", ">= 1.5.0", "< 2.0.0" +gem "bundler", ">= 1.5.0" -gem "rails", "4.2.11.1" -gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" -if RUBY_VERSION < "2.1" - gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5") -end -gem "jquery-rails", "~> 3.1.4" -gem "coderay", "~> 1.1.1" -gem "request_store", "1.0.5" -gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") -gem "protected_attributes" +gem "rails", "5.2.4.1" +gem "rouge", "~> 3.12.0" +gem "request_store", "~> 1.4.1" +gem "mini_mime", "~> 1.0.1" gem "actionpack-xml_parser" -gem "roadie-rails", "~> 1.1.1" -gem "roadie", "~> 3.2.1" +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") gem "mimemagic" -gem "mail", "~> 2.6.4" - -gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8") -gem "i18n", "~> 0.7.0" -gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" -gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" - -# Request at least rails-html-sanitizer 1.0.3 because of security advisories -gem "rails-html-sanitizer", ">= 1.0.3" +gem "mail", "~> 2.7.1" +gem "csv", "~> 3.1.1" +gem "nokogiri", "~> 1.10.0" +gem "i18n", "~> 1.6.0" +gem "rbpdf", "~> 1.20.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] -gem "rbpdf", "~> 1.19.6" # Optional gem for LDAP authentication group :ldap do - gem "net-ldap", "~> 0.12.0" + gem "net-ldap", "~> 0.16.0" end # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "ruby-openid", "~> 2.9.2", :require => "openid" gem "rack-openid" end -platforms :mri, :mingw, :x64_mingw do - # Optional gem for exporting the gantt to a PNG file, not supported with jruby - group :rmagick do - gem "rmagick", "~> 2.16.0" - end +# Optional gem for exporting the gantt to a PNG file +group :minimagick do + gem "mini_magick", "~> 4.9.5" +end - # Optional Markdown support, not for JRuby - group :markdown do - gem "redcarpet", "~> 3.4.0" - end +# Optional Markdown support, not for JRuby +group :markdown do + gem "redcarpet", "~> 3.5.0" end # Include database gems for the database adapters NixOS supports -gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw] -gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw] +gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] +gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] group :development do - gem "rdoc", "~> 4.3" gem "yard" end group :test do - gem "minitest" gem "rails-dom-testing" - gem "mocha" - gem "simplecov", "~> 0.9.1", :require => false - # TODO: remove this after upgrading to Rails 5 - gem "test_after_commit", "~> 0.4.2" - # For running UI tests - gem "capybara", '~> 2.13' - gem "selenium-webdriver", "~> 2.53.4" + gem 'mocha', '>= 1.4.0' + gem "simplecov", "~> 0.17.0", :require => false + gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] + # For running system tests + gem 'puma', '~> 3.7' + gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0") + gem "selenium-webdriver" + # RuboCop + gem 'rubocop', '~> 0.76.0' + gem 'rubocop-performance', '~> 1.5.0' + gem 'rubocop-rails', '~> 2.3.0' end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 21296d343b4..806847a298e 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,203 +1,226 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionpack-xml_parser (1.0.2) - actionpack (>= 4.0.0, < 5) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionpack-xml_parser (2.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11.1) - activesupport (= 4.2.11.1) - globalid (>= 0.3.0) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) - builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) - arel (~> 6.0) - activesupport (4.2.11.1) - i18n (~> 0.7) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) + globalid (>= 0.3.6) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) + arel (>= 9.0) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) + marcel (~> 0.3.1) + activesupport (5.2.4.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - arel (6.0.4) - builder (3.2.3) - capybara (2.18.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + arel (9.0.0) + ast (2.4.0) + builder (3.2.4) + capybara (3.25.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - coderay (1.1.2) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) + childprocess (3.0.0) concurrent-ruby (1.1.5) - crass (1.0.4) - css_parser (1.7.0) + crass (1.0.5) + css_parser (1.7.1) addressable - docile (1.1.5) - erubis (2.7.0) - ffi (1.11.1) + csv (3.1.2) + docile (1.3.2) + erubi (1.9.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) - i18n (0.7.0) - jquery-rails (3.1.5) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - loofah (2.2.3) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + json (2.3.0) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) - metaclass (0.0.4) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) mimemagic (0.3.3) - mini_mime (1.0.1) - mini_portile2 (2.3.0) - minitest (5.11.3) - mocha (1.8.0) - metaclass (~> 0.0.1) - multi_json (1.13.1) - mysql2 (0.4.10) - net-ldap (0.12.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) - pg (0.18.4) - protected_attributes (1.1.4) - activemodel (>= 4.0.1, < 5.0) - public_suffix (3.1.0) - rack (1.6.11) + mini_magick (4.9.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.13.0) + mocha (1.11.1) + mysql2 (0.5.3) + net-ldap (0.16.2) + nio4r (2.5.2) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) + parallel (1.19.1) + parser (2.6.5.0) + ast (~> 2.4.0) + pg (1.1.4) + public_suffix (4.0.1) + puma (3.12.2) + rack (2.0.8) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.11.1) - actionmailer (= 4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) - activemodel (= 4.2.11.1) - activerecord (= 4.2.11.1) - activesupport (= 4.2.11.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) + bundler (>= 1.3.0) + railties (= 5.2.4.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) + method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (12.3.2) - rbpdf (1.19.8) + thor (>= 0.19.0, < 2.0) + rainbow (3.0.0) + rake (13.0.1) + rbpdf (1.20.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - rdoc (4.3.0) - redcarpet (3.4.0) - request_store (1.0.5) - rmagick (2.16.0) - roadie (3.2.2) + redcarpet (3.5.0) + regexp_parser (1.6.0) + request_store (1.4.1) + rack (>= 1.4) + roadie (3.5.1) css_parser (~> 1.4) - nokogiri (~> 1.5) - roadie-rails (1.1.1) - railties (>= 3.0, < 5.1) + nokogiri (~> 1.8) + roadie-rails (2.1.0) + railties (>= 5.1, < 6.1) roadie (~> 3.1) - ruby-openid (2.3.0) - rubyzip (1.2.3) - selenium-webdriver (2.53.4) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - sprockets (3.7.2) + rouge (3.12.0) + rubocop (0.76.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.5.1) + rubocop (>= 0.71.0) + rubocop-rails (2.3.2) + rack (>= 1.1) + rubocop (>= 0.72.0) + ruby-openid (2.9.2) + ruby-progressbar (1.10.1) + rubyzip (2.0.0) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + simplecov (0.17.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - test_after_commit (0.4.2) - activerecord (>= 3.2) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - websocket (1.2.8) + unicode-display_width (1.6.0) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.19) + yard (0.9.20) PLATFORMS ruby DEPENDENCIES actionpack-xml_parser - bundler (>= 1.5.0, < 2.0.0) - capybara (~> 2.13) - coderay (~> 1.1.1) - i18n (~> 0.7.0) - jquery-rails (~> 3.1.4) - mail (~> 2.6.4) - mime-types (~> 3.0) + bundler (>= 1.5.0) + capybara (~> 3.25.0) + csv (~> 3.1.1) + ffi + i18n (~> 1.6.0) + mail (~> 2.7.1) mimemagic - minitest - mocha - mysql2 (~> 0.4.6) - net-ldap (~> 0.12.0) - nokogiri (~> 1.8.1) - pg (~> 0.18.1) - protected_attributes + mini_magick (~> 4.9.5) + mini_mime (~> 1.0.1) + mocha (>= 1.4.0) + mysql2 (~> 0.5.0) + net-ldap (~> 0.16.0) + nokogiri (~> 1.10.0) + pg (~> 1.1.4) + puma (~> 3.7) rack-openid - rails (= 4.2.11.1) + rails (= 5.2.4.1) rails-dom-testing - rails-html-sanitizer (>= 1.0.3) - rbpdf (~> 1.19.6) - rdoc (~> 4.3) - redcarpet (~> 3.4.0) - request_store (= 1.0.5) - rmagick (~> 2.16.0) - roadie (~> 3.2.1) - roadie-rails (~> 1.1.1) - ruby-openid (~> 2.3.0) - selenium-webdriver (~> 2.53.4) - simplecov (~> 0.9.1) - test_after_commit (~> 0.4.2) + rbpdf (~> 1.20.0) + redcarpet (~> 3.5.0) + request_store (~> 1.4.1) + roadie-rails (~> 2.1.0) + rouge (~> 3.12.0) + rubocop (~> 0.76.0) + rubocop-performance (~> 1.5.0) + rubocop-rails (~> 2.3.0) + ruby-openid (~> 2.9.2) + selenium-webdriver + simplecov (~> 0.17.0) tzinfo-data yard diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 0b1f64b58a1..e25cde11af0 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "3.4.11"; + version = "4.1.0"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r"; + sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index 4ef4bd40427..e69cbb0e1c2 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1,126 +1,143 @@ { + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm"; + type = "gem"; + }; + version = "5.2.4.1"; + }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy"; + sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh"; + sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; actionpack-xml_parser = { - dependencies = ["actionpack"]; + dependencies = ["actionpack" "railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17am4nd7x6g8x7f8i35rzzv2qrxlkc230rbgzg98af0yf50j8gka"; + sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; type = "gem"; }; - version = "1.0.2"; + version = "2.0.1"; }; actionview = { - dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p"; + sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj"; + sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; activemodel = { - dependencies = ["activesupport" "builder"]; + dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33"; + sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p"; + sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; + }; + activestorage = { + dependencies = ["actionpack" "activerecord" "marcel"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f"; + type = "gem"; + }; + version = "5.2.4.1"; }; activesupport = { - dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6"; + sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; addressable = { dependencies = ["public_suffix"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; arel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4"; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; type = "gem"; }; - version = "6.0.4"; + version = "9.0.0"; }; - builder = { + ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "3.2.3"; + version = "2.4.0"; }; - capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + builder = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "2.18.0"; + version = "3.2.4"; }; - childprocess = { - dependencies = ["ffi"]; + capybara = { + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; + sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx"; type = "gem"; }; - version = "0.9.0"; + version = "3.25.0"; }; - coderay = { + childprocess = { source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "1.1.2"; + version = "3.0.0"; }; concurrent-ruby = { source = { @@ -133,43 +150,43 @@ crass = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; + sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; css_parser = { dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; - docile = { + csv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; type = "gem"; }; - version = "1.1.5"; + version = "3.1.2"; }; - erubis = { + docile = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; type = "gem"; }; - version = "2.7.0"; + version = "1.3.2"; }; - ffi = { + erubi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; type = "gem"; }; - version = "1.11.1"; + version = "1.9.0"; }; globalid = { dependencies = ["activesupport"]; @@ -189,64 +206,64 @@ version = "4.3.4"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "0.7.0"; + version = "1.6.0"; }; - jquery-rails = { - dependencies = ["railties" "thor"]; + jaro_winkler = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lk7xqmms45czylxs22kv5khlbm7a0yqcchqijxb9m10zsqc6lp5"; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; type = "gem"; }; - version = "3.1.5"; + version = "1.5.4"; }; - loofah = { - dependencies = ["crass" "nokogiri"]; + json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; - mail = { - dependencies = ["mime-types"]; + loofah = { + dependencies = ["crass" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; type = "gem"; }; - version = "2.6.6"; + version = "2.4.0"; }; - metaclass = { + mail = { + dependencies = ["mini_mime"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "0.0.4"; + version = "2.7.1"; }; - mime-types = { - dependencies = ["mime-types-data"]; + marcel = { + dependencies = ["mimemagic"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; + sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; type = "gem"; }; - version = "3.2.2"; + version = "0.3.3"; }; - mime-types-data = { + method_source = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; type = "gem"; }; - version = "3.2019.0331"; + version = "0.9.2"; }; mimemagic = { source = { @@ -256,85 +273,100 @@ }; version = "0.3.3"; }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; + type = "gem"; + }; + version = "4.9.5"; + }; mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; type = "gem"; }; - version = "5.11.3"; + version = "5.13.0"; }; mocha = { - dependencies = ["metaclass"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al"; + sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.1"; }; - multi_json = { + mysql2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; type = "gem"; }; - version = "1.13.1"; + version = "0.5.3"; }; - mysql2 = { + net-ldap = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; + sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; type = "gem"; }; - version = "0.4.10"; + version = "0.16.2"; }; - net-ldap = { + nio4r = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46"; + sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; type = "gem"; }; - version = "0.12.1"; + version = "2.5.2"; }; nokogiri = { dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.7"; }; - pg = { + parallel = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; type = "gem"; }; - version = "0.18.4"; + version = "1.19.1"; }; - protected_attributes = { - dependencies = ["activemodel"]; + parser = { + dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18lvrvmcwjvjr2mrn20vaf68a0q6mg4cy9f0m1i7x83p0ljhhyar"; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + type = "gem"; + }; + version = "2.6.5.0"; + }; + pg = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; type = "gem"; }; version = "1.1.4"; @@ -342,18 +374,26 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + type = "gem"; + }; + version = "4.0.1"; + }; + puma = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj"; type = "gem"; }; - version = "3.1.0"; + version = "3.12.2"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr"; type = "gem"; }; - version = "1.6.11"; + version = "2.0.8"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -368,72 +408,71 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; type = "gem"; }; - version = "0.6.3"; + version = "1.1.0"; }; rails = { - dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml"; + sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20"; type = "gem"; }; - version = "4.2.11.1"; + version = "5.2.4.1"; }; - rails-deprecated_sanitizer = { - dependencies = ["activesupport"]; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; type = "gem"; }; - version = "1.0.3"; + version = "2.0.3"; }; - rails-dom-testing = { - dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; + rails-html-sanitizer = { + dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.0.9"; + version = "1.3.0"; }; - rails-html-sanitizer = { - dependencies = ["loofah"]; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb"; type = "gem"; }; - version = "1.0.4"; + version = "5.2.4.1"; }; - railties = { - dependencies = ["actionpack" "activesupport" "rake" "thor"]; + rainbow = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m"; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; type = "gem"; }; - version = "4.2.11.1"; + version = "3.0.0"; }; rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; type = "gem"; }; - version = "12.3.2"; + version = "13.0.1"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; + sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71"; type = "gem"; }; - version = "1.19.8"; + version = "1.20.1"; }; rbpdf-font = { source = { @@ -443,106 +482,142 @@ }; version = "1.19.1"; }; - rdoc = { + redcarpet = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "4.3.0"; + version = "3.5.0"; }; - redcarpet = { + regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2"; type = "gem"; }; - version = "3.4.0"; + version = "1.6.0"; }; request_store = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; + sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d"; type = "gem"; }; - version = "1.0.5"; + version = "1.4.1"; + }; + roadie = { + dependencies = ["css_parser" "nokogiri"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r"; + type = "gem"; + }; + version = "3.5.1"; }; - rmagick = { + roadie-rails = { + dependencies = ["railties" "roadie"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; + sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i"; type = "gem"; }; - version = "2.16.0"; + version = "2.1.0"; }; - roadie = { - dependencies = ["css_parser" "nokogiri"]; + rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0frp5yb07ib9y1k43shd4xjkb9a6wavhqq892l8yi9y73qi2cqbc"; + sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw"; type = "gem"; }; - version = "3.2.2"; + version = "3.12.0"; }; - roadie-rails = { - dependencies = ["railties" "roadie"]; + rubocop = { + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0"; + type = "gem"; + }; + version = "0.76.0"; + }; + rubocop-performance = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8"; + type = "gem"; + }; + version = "1.5.1"; + }; + rubocop-rails = { + dependencies = ["rack" "rubocop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hxgl5marq2hi6lcc73f7g6afd7dz4w893rrgrbh7m3k8zrwjyk1"; + sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf"; type = "gem"; }; - version = "1.1.1"; + version = "2.3.2"; }; ruby-openid = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn"; + sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz"; type = "gem"; }; - version = "2.3.0"; + version = "2.9.2"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; }; rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc"; + sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; type = "gem"; }; - version = "1.2.3"; + version = "2.0.0"; }; selenium-webdriver = { - dependencies = ["childprocess" "rubyzip" "websocket"]; + dependencies = ["childprocess" "rubyzip"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15qyf7b9fa2nxhhwp551b9fjj82kb3wmy65559yrrcwpdadqvcs4"; + sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb"; type = "gem"; }; - version = "2.53.4"; + version = "3.142.6"; }; simplecov = { - dependencies = ["docile" "multi_json" "simplecov-html"]; + dependencies = ["docile" "json" "simplecov-html"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; type = "gem"; }; - version = "0.9.2"; + version = "0.17.1"; }; simplecov-html = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; type = "gem"; }; - version = "0.9.0"; + version = "0.10.2"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; type = "gem"; }; - version = "3.7.2"; + version = "4.0.0"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -553,22 +628,13 @@ }; version = "3.2.1"; }; - test_after_commit = { - dependencies = ["activerecord"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb"; - type = "gem"; - }; - version = "0.4.2"; - }; thor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; thread_safe = { source = { @@ -587,13 +653,30 @@ }; version = "1.2.5"; }; - websocket = { + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + type = "gem"; + }; + version = "1.6.0"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + type = "gem"; + }; + version = "0.7.1"; + }; + websocket-extensions = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0f11rcn4qgffb1rq4kjfwi7di79w8840x9l74pkyif5arp0mb08x"; + sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; type = "gem"; }; - version = "1.2.8"; + version = "0.1.4"; }; xpath = { dependencies = ["nokogiri"]; @@ -607,9 +690,9 @@ yard = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v"; + sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny"; type = "gem"; }; - version = "0.9.19"; + version = "0.9.20"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 8aa6128819f..d050895ca23 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, buildPythonPackage , python -, srht, asyncpg, unidiff, aiosmtpd, emailthreads }: +, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { pname = "listssrht"; @@ -20,6 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ srht + pygit2 asyncpg unidiff aiosmtpd diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 779c33627e8..653db11ab5d 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,43 +1,38 @@ -{ lib, fetchurl, python2Packages -, mercurial +{ lib, fetchurl, python3Packages +, mercurial, qt5 }@args: let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.0.2"; - url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz"; - sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz"; + meta.version = "5.2.1"; + url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz"; + sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv"; }; - mercurial = - if args.mercurial.meta.version == tortoisehgSrc.meta.version - then args.mercurial - else args.mercurial.override { - mercurialSrc = fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = tortoisehgSrc.meta.version; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19"; - }; - }; - -in python2Packages.buildPythonApplication { + tortoiseMercurial = mercurial.overridePythonAttrs (old: rec { + inherit (tortoisehgSrc.meta) version; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + }; + }); +in python3Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; src = tortoisehgSrc; - pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; - - propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial qscintilla-qt5 iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; # tests fail with "thg: cannot connect to X server" - dontStrip = true; - buildPhase = ""; - installPhase = '' - ${python2Packages.python.executable} setup.py install --prefix=$out + postInstall = '' mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz - ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg ''; checkPhase = '' @@ -45,7 +40,7 @@ in python2Packages.buildPythonApplication { $out/bin/thg version ''; - passthru.mercurial = mercurial; + passthru.mercurial = tortoiseMercurial; meta = { description = "Qt based graphical tool for working with Mercurial"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 66b785e43b1..f3ddf8059b2 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,37 +1,39 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, git, gnupg }: -let version = "1.12.0"; in +let version = "2.3.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; + buildInputs = [ git gnupg ]; + src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; + sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0"; }; - buildCommand = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - mkdir -p $out/share/bash-completion/completions - sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm - chmod 755 $out/bin/yadm - install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1 - install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dt $out/bin $src/yadm + install -Dt $out/share/man/man1 $src/yadm.1 + install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm + install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + runHook postInstall ''; meta = { homepage = https://github.com/TheLocehiliosan/yadm; description = "Yet Another Dotfiles Manager"; longDescription = '' - yadm is a dotfile management tool with 3 main features: Manages files across - systems using a single Git repository. Provides a way to use alternate files on - a specific OS or host. Supplies a method of encrypting confidential data so it - can safely be stored in your repository. + yadm is a dotfile management tool with 3 main features: + * Manages files across systems using a single Git repository. + * Provides a way to use alternate files on a specific OS or host. + * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; |