diff options
Diffstat (limited to 'pkgs/applications/version-management')
41 files changed, 1010 insertions, 790 deletions
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index d23f2847049..d9ebdbf5312 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-tqlJANxJl2r0ZxPb7d8KU9cRMQUFPUIm/zMp4zREGL0="; + sha256 = "sha256-GNUpSK9cczGISyvo05KrLzeO+zRm5dEYOmX2Oy7TjzE="; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix index cce37df357b..c3524417829 100644 --- a/pkgs/applications/version-management/git-and-tools/bit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "chriswalz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60="; + sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8="; }; vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; 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 f642a7d9afb..46d19f2814d 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8"; + sha256 = "sha256-lwdsl3dzqrIL1JoBFmldwsCvNCWUcTlgeoEoCvmlTCQ="; }; - cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr"; + cargoSha256 = "sha256-7TvxkSJ3iWJnjD3Xe7WDXBNWIyl8U9XTCn9muUG1AmI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 77ad7d8658d..95060714c24 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE="; + sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ma27 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 707aefdf0c1..16f87df678c 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-rUGhKiTB5uVMbW0HdOEvubGkWh1ARUXCnGR7ezmsT3g="; + sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU="; }; vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix index be6d64646a5..5570dbf1014 100644 --- a/pkgs/applications/version-management/git-and-tools/ghr/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghr"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a"; + sha256 = "sha256-pF1TPvQLPa5BbXZ9rRCq7xWofXCBRa9CDgNxX/kaTMo="; }; - vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj"; + vendorSha256 = "sha256-+e9Q4Pw9pJyOXVz85KhOSuybj1PBcJi51fGR3a2Gixk="; # Tests require a Github API token, and networking doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix new file mode 100644 index 00000000000..c80db8ee958 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchFromGitHub + +, coreutils +, git +, ncurses +, rustPlatform +, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "git-branchless"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "arxanas"; + repo = "git-branchless"; + rev = "v${version}"; + sha256 = "0pfiyb23ah1h6risrhjr8ky7b1k1f3yfc3z70s92q3czdlrk6k07"; + }; + + cargoSha256 = "0gplx80xhpz8kwry7l4nv4rlj9z02jg0sgb6zy1y3vd9s2j5wals"; + + # Remove path hardcodes patching if they get fixed upstream, see: + # https://github.com/arxanas/git-branchless/issues/26 + postPatch = '' + # Inline test hardcodes `echo` location. + substituteInPlace ./src/commands/wrap.rs --replace '/bin/echo' '${coreutils}/bin/echo' + + # Tests in general hardcode `git` location. + substituteInPlace ./src/testing.rs --replace '/usr/bin/git' '${git}/bin/git' + ''; + + buildInputs = [ + ncurses + sqlite + ]; + + preCheck = '' + # Tests require path to git. + export PATH_TO_GIT=${git}/bin/git + ''; + + meta = with lib; { + description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; + homepage = "https://github.com/arxanas/git-branchless"; + license = licenses.asl20; + maintainers = with maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 707e0855d15..f0ff57b2cb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.9"; + version = "3.10.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "11186pdgaw5p4iv10dqcnynf5pws2v9nhqqqca7z5b7m20fpfjl7"; + sha256 = "120hds7v29v70qxz20ppxf2glmgbah16v7jyy9i6hb6cfqp68vr8"; }; buildInputs = [ git gettext ]; @@ -20,10 +20,8 @@ in buildPythonApplication rec { doCheck = false; - postFixup = '' - wrapQtApp $out/bin/git-cola - wrapQtApp $out/bin/git-dag - + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { 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 index f93947d0515..3dd241840c7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.1.1"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "00f1rq80vya464dkvf3mzs9zpvkz15ki8srwg08snsm5kb7amwlm"; + sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index add7bfc5526..15d0fe9bc0f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git -}: +{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: stdenv.mkDerivation rec { pname = "git-sync"; - version = "20151024"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; - sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; + sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,10 +17,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a git-sync $out/bin/git-sync + cp -a git-* $out/bin/ ''; wrapperPath = with lib; makeBinPath [ + inotify-tools coreutils git gnugrep diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index c7884c2b52e..ec4db1631b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.1"; - sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY="; + version = "1.2.2"; + sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; in stdenv.mkDerivation { pname = "git-vendor"; 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 886f293d105..775c4dd09cd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.isFreeBSD) "-lthr"; configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -337,8 +337,11 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; - passthru.tests = { - buildbot-integration = nixosTests.buildbot; + passthru = { + shellPath = "/bin/git-shell"; + tests = { + buildbot-integration = nixosTests.buildbot; + }; }; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index f4b74405eba..ab0ce9c7cd0 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.4"; + version = "1.5.2"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; + sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 3049012160d..4fc1bce4474 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8RPIPimDImLUR9oHVZZ7ZeKLtIhebv/d0kl4CQ5NFdU="; + sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo="; }; - cargoSha256 = "sha256-1IHbOjZV8Rc0el7J983B8pvnbt8+QtYiknZU/I85OnY="; + cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 12fd8357fc7..f2a5e2368b4 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ="; + sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g="; }; - vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw="; + vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 264677dc1cd..374e68a71c7 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4="; + sha256 = "sha256-qCj6FsbzxnMISCITKFcIIYtqMiHzSNYNjlpgpE9S/Ss="; }; vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index c84375cfece..3623dbba6b8 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 = "2.15.4"; + version = "2.16"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "1ayw2pz9falcsi528q63z3w7npzkk7y8z258danqh41j6q9871js"; + sha256 = "sha256-F36MuqgVkKM2RCIGEGJmL3/KpZy3eDRZ7WWUE15mTfU="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index e92a5a38a28..bd61d984c62 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.2"; + version = "1.14.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-0EvKk0/ro1YAqvc5yCt8vn2LkRoIbXrFTwcQtomoWsM="; + sha256 = "sha256-8nwLVpe/5IjXJqO179lN80B/3WGUL3LKM8OWdh/bYOE="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c0cc9d5e2b1..3e10add49d4 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 = "7.6.1"; + version = "7.7.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-wpfTozXxanZkYtYQHY950PLsVO4lXLt5OOP/xDCrFEw="; + sha256 = "0zb94ipi777qkznxpgb7ah31mx9b63713k92vhxhz4glna59lvk3"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d7e6261a932..b214b663ae6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.3", - "repo_hash": "0kpdl1gwcxy13lwyl96nsia62wysrnxdygil6sz6s72hg0y2fsgr", + "version": "14.0.5", + "repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.3-ee", + "rev": "v14.0.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.3", - "GITLAB_PAGES_VERSION": "1.39.0", - "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.3" + "GITALY_SERVER_VERSION": "14.0.5", + "GITLAB_PAGES_VERSION": "1.40.0", + "GITLAB_SHELL_VERSION": "13.19.0", + "GITLAB_WORKHORSE_VERSION": "14.0.5" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 225b9f6c0cb..fffe8894405 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin krav talyz ]; + maintainers = with maintainers; [ fpletz globin krav talyz yuka ]; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index adee2020f6f..20f1034fc90 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.16.2' +gem 'gitlab-labkit', '~> 0.17.1' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index a8e2f3f5a67..af6a3ce8142 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -65,13 +65,13 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.16.2) + gitlab-labkit (0.17.1) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 1.3) + pg_query (~> 2.0) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) google-protobuf (3.14.0) @@ -104,11 +104,11 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_portile2 (2.5.1) minitest (5.14.2) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.11.1) + nokogiri (1.11.5) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (1.5.0) @@ -121,7 +121,8 @@ GEM parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) - pg_query (1.3.0) + pg_query (2.0.3) + google-protobuf (~> 3.15.5) proc_to_ast (0.1.0) coderay parser @@ -221,7 +222,7 @@ DEPENDENCIES github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.16.2) + gitlab-labkit (~> 0.17.1) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.14.0) grpc (~> 1.30.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 6276dd75eaf..ced652e68d9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,17 +21,17 @@ let }; }; in buildGoModule rec { - version = "13.12.3"; + version = "14.0.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-qqLVYNCE8rKPBY5tj6AAoWcyIEtQZkO980NVPg0WO18="; + sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM="; }; - vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY="; + vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c3c742b6669..91e5217c271 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; + sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.1"; }; gitlab-markup = { groups = ["default"]; @@ -441,10 +441,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.1"; }; minitest = { groups = ["default" "development" "test"]; @@ -482,10 +482,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.5"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -549,14 +549,15 @@ version = "2.7.2.0"; }; pg_query = { + dependencies = ["google-protobuf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; + sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag"; type = "gem"; }; - version = "1.3.0"; + version = "2.0.3"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index bdbde4dbde4..704d9080331 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.18.0"; + version = "13.19.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-TPe2quDg/ljI2v1HciDajosSPm4Z/iT2skeveNdrKdo="; + sha256 = "sha256-CmatKArkpDS3GGbIIkKjs4FwywLiU+lRL32GKEpOqZ0="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-MvWpZ/Z9ieNE0+p975BG302BPzFbCZD3cACXMW5fiTQ="; + vendorSha256 = "sha256-+nUMxHWo/d/WrQ4LAEG2+ghtNBF9vcnSyg6Ki412rPA="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e900a6522eb..e237c4fd480 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.12.3"; + version = "14.0.5"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-JJN1KqqbP4fIW/k6LebIaWdYOmIzHqxCDgOKrkbB7Nw="; + vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ="; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 14dcc7ab4b1..03b275e11d2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0.3.6' +gem 'rails', '~> 6.1.3.2' gem 'bootsnap', '~> 1.4.6' @@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false +gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false # for Google storage gem 'google-api-client', '~> 0.33' @@ -157,7 +157,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.1.2' +gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.11.1' +gem 'nokogiri', '~> 1.11.4' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -183,13 +183,8 @@ gem 'rack', '~> 2.2.3' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' -group :unicorn do - gem 'unicorn', '~> 5.5' - gem 'unicorn-worker-killer', '~> 0.4.4' -end - group :puma do - gem 'puma', '~> 5.1.1', require: false + gem 'puma', '~> 5.3.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false end @@ -254,7 +249,7 @@ gem 'flowdock', '~> 0.7' gem 'slack-messenger', '~> 2.3.4' # Hangouts Chat integration -gem 'hangouts-chat', '~> 0.0.5' +gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' # Asana integration gem 'asana', '~> 0.10.3' @@ -306,15 +301,20 @@ gem 'gitlab-license', '~> 1.5' gem 'rack-attack', '~> 6.3.0' # Sentry integration -gem 'sentry-raven', '~> 3.0' +gem 'sentry-raven', '~> 3.1' # PostgreSQL query parsing -gem 'pg_query', '~> 1.3.0' +# +# We need this fork until https://github.com/pganalyze/pg_query/pull/212 +# and https://github.com/pganalyze/pg_query/pull/213 are +# released. gitlab-labkit will need to be updated to use the pg_query +# version. +gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.16.2' +gem 'gitlab-labkit', '~> 0.18.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -341,12 +341,11 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.12.0' - gem 'raindrops', '~> 0.18' end group :development do gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.40.4', require: false + gem 'solargraph', '~> 0.42', require: false gem 'letter_opener_web', '~> 1.4.0' @@ -403,7 +402,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.0.0', require: false + gem 'gitlab-dangerfiles', '~> 2.1.2', require: false end group :development, :test, :coverage do @@ -481,18 +480,21 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.12.0.pre.rc1' +gem 'gitaly', '~> 14.0.0.pre.rc2' + +# KAS GRPC protocol definitions +gem 'kas-grpc', '~> 0.0.2' gem 'grpc', '~> 1.30.2' -gem 'google-protobuf', '~> 3.14.0' +gem 'google-protobuf', '~> 3.17.1' gem 'toml-rb', '~> 1.0.0' # Feature toggles -gem 'flipper', '~> 0.17.1' -gem 'flipper-active_record', '~> 0.17.1' -gem 'flipper-active_support_cache_store', '~> 0.17.1' +gem 'flipper', '~> 0.21.0' +gem 'flipper-active_record', '~> 0.21.0' +gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 0.1.5' gem 'gitlab-experiment', '~> 0.5.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 31f362c9f9b..62222b56396 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -5,64 +5,68 @@ GEM abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.6) - actionpack (= 6.0.3.6) + actioncable (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.6) - actionpack (= 6.0.3.6) - activejob (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) + actionmailbox (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (>= 2.7.1) - actionmailer (6.0.3.6) - actionpack (= 6.0.3.6) - actionview (= 6.0.3.6) - activejob (= 6.0.3.6) + actionmailer (6.1.3.2) + actionpack (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.6) - actionview (= 6.0.3.6) - activesupport (= 6.0.3.6) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.3.2) + actionview (= 6.1.3.2) + activesupport (= 6.1.3.2) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.6) - actionpack (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) + actiontext (6.1.3.2) + actionpack (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) nokogiri (>= 1.8.5) - actionview (6.0.3.6) - activesupport (= 6.0.3.6) + actionview (6.1.3.2) + activesupport (= 6.1.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.6) - activesupport (= 6.0.3.6) + activejob (6.1.3.2) + activesupport (= 6.1.3.2) globalid (>= 0.3.6) - activemodel (6.0.3.6) - activesupport (= 6.0.3.6) - activerecord (6.0.3.6) - activemodel (= 6.0.3.6) - activesupport (= 6.0.3.6) + activemodel (6.1.3.2) + activesupport (= 6.1.3.2) + activerecord (6.1.3.2) + activemodel (= 6.1.3.2) + activesupport (= 6.1.3.2) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.6) - actionpack (= 6.0.3.6) - activejob (= 6.0.3.6) - activerecord (= 6.0.3.6) + activestorage (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activesupport (= 6.1.3.2) marcel (~> 1.0.0) - activesupport (6.0.3.6) + mini_mime (~> 1.0.2) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) acts-as-taggable-on (7.0.0) activerecord (>= 5.0, < 6.2) adamantium (0.2.0) @@ -126,7 +130,7 @@ GEM net-http-persistent (~> 4.0) nokogiri (~> 1.11.0.rc2) babosa (1.0.4) - backport (1.1.2) + backport (1.2.0) base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) @@ -341,13 +345,24 @@ GEM factory_bot_rails (6.1.0) factory_bot (~> 6.1.0) railties (>= 5.0.0) - faraday (1.0.1) + faraday (1.4.2) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) faraday_middleware (1.0.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (0.3.0) @@ -359,19 +374,19 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.13.1) + ffi (1.15.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) - 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) + flipper (0.21.0) + flipper-active_record (0.21.0) + activerecord (>= 5.0, < 7) + flipper (~> 0.21.0) + flipper-active_support_cache_store (0.21.0) + activesupport (>= 5.0, < 7) + flipper (~> 0.21.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -432,7 +447,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.12.0.pre.rc1) + gitaly (14.0.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -440,13 +455,13 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.0.0) + gitlab-dangerfiles (2.1.2) danger-gitlab gitlab-experiment (0.5.4) activesupport (>= 3.0) request_store (>= 1.0) scientist (~> 1.6, >= 1.6.0) - gitlab-fog-azure-rm (1.0.1) + gitlab-fog-azure-rm (1.1.1) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) @@ -460,13 +475,13 @@ GEM fog-xml (~> 0.1.0) google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) - gitlab-labkit (0.16.2) + gitlab-labkit (0.18.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) + gitlab-pg_query (~> 2.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-license (1.5.0) gitlab-mail_room (0.0.9) @@ -476,6 +491,9 @@ GEM addressable (~> 2.7) omniauth (~> 1.9) openid_connect (~> 1.2) + gitlab-pg_query (2.0.4) + google-protobuf (>= 3.17.1) + gitlab-rdoc (6.3.2) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) gitlab-styles (6.2.0) @@ -509,7 +527,7 @@ GEM signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.14.0) + google-protobuf (3.17.1) googleapis-common-protos-types (1.0.6) google-protobuf (~> 3.14) googleauth (0.14.0) @@ -615,7 +633,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) - http-parser (1.2.1) + http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) httparty (0.16.4) mime-types (~> 3.0) @@ -669,7 +687,8 @@ GEM activerecord kaminari-core (= 1.2.1) kaminari-core (1.2.1) - kgio (2.11.3) + kas-grpc (0.0.2) + grpc (~> 1.0) knapsack (1.21.1) rake kramdown (2.3.1) @@ -683,7 +702,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.7.2) + lefthook (0.7.5) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (1.4.0) @@ -735,7 +754,7 @@ GEM mime-types-data (3.2020.0512) mini_histogram (0.3.1) mini_magick (4.10.1) - mini_mime (1.1.0) + mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.11.3) mixlib-cli (2.1.8) @@ -774,7 +793,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -896,7 +915,6 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) - pg_query (1.3.0) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -922,12 +940,12 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - pry-shell (0.4.0) + pry-shell (0.4.1) pry (~> 0.13.0) tty-markdown tty-prompt public_suffix (4.0.6) - puma (5.1.1) + puma (5.3.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) @@ -955,20 +973,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.6) - actioncable (= 6.0.3.6) - actionmailbox (= 6.0.3.6) - actionmailer (= 6.0.3.6) - actionpack (= 6.0.3.6) - actiontext (= 6.0.3.6) - actionview (= 6.0.3.6) - activejob (= 6.0.3.6) - activemodel (= 6.0.3.6) - activerecord (= 6.0.3.6) - activestorage (= 6.0.3.6) - activesupport (= 6.0.3.6) - bundler (>= 1.3.0) - railties (= 6.0.3.6) + rails (6.1.3.2) + actioncable (= 6.1.3.2) + actionmailbox (= 6.1.3.2) + actionmailer (= 6.1.3.2) + actionpack (= 6.1.3.2) + actiontext (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activemodel (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) + bundler (>= 1.15.0) + railties (= 6.1.3.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -982,14 +1000,13 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.6) - actionpack (= 6.0.3.6) - activesupport (= 6.0.3.6) + railties (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) + thor (~> 1.0) rainbow (3.0.0) - raindrops (0.19.1) rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) @@ -1001,7 +1018,6 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - rdoc (6.1.2) re2 (1.2.0) recaptcha (4.13.1) json @@ -1123,7 +1139,7 @@ GEM nokogiri (>= 1.10.5) rexml ruby-statistics (2.1.2) - ruby2_keywords (0.0.2) + ruby2_keywords (0.0.4) ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyntlm (0.6.2) @@ -1162,7 +1178,7 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-raven (3.0.4) + sentry-raven (3.1.2) faraday (>= 1.0) settingslogic (2.0.9) sexp_processor (4.15.1) @@ -1193,10 +1209,11 @@ GEM slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.40.4) - backport (~> 1.1) + solargraph (0.42.3) + backport (~> 1.2) benchmark bundler (>= 1.17.2) + diff-lcs (~> 1.4) e2mmap jaro_winkler (~> 1.5) kramdown (~> 2.3) @@ -1248,8 +1265,8 @@ GEM terser (1.0.2) execjs (>= 0.3.0, < 3) test-prof (0.12.0) - test_file_finder (0.1.3) - faraday (~> 1.0.1) + test_file_finder (0.1.4) + faraday (~> 1.0) text (1.3.1) thin (1.8.0) daemons (~> 1.0, >= 1.0.9) @@ -1298,8 +1315,8 @@ GEM tty-screen (~> 0.8) wisper (~> 2.0) tty-screen (0.8.1) - tzinfo (1.2.9) - thread_safe (~> 0.1) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) u2f (0.2.1) uber (0.1.0) unf (0.1.4) @@ -1307,12 +1324,6 @@ GEM unf_ext (0.0.7.7) unicode-display_width (1.7.0) unicode_utils (1.4.0) - unicorn (5.5.5) - kgio (~> 2.6) - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) uniform_notifier (1.13.0) unleash (0.1.5) murmurhash3 (~> 0.1.6) @@ -1449,9 +1460,9 @@ DEPENDENCIES faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) - flipper (~> 0.17.1) - flipper-active_record (~> 0.17.1) - flipper-active_support_cache_store (~> 0.17.1) + flipper (~> 0.21.0) + flipper-active_record (~> 0.21.0) + flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) fog-aws (~> 3.9) @@ -1465,26 +1476,28 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.12.0.pre.rc1) + gitaly (~> 14.0.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.0.0) + gitlab-dangerfiles (~> 2.1.2) gitlab-experiment (~> 0.5.4) - gitlab-fog-azure-rm (~> 1.0.1) + gitlab-fog-azure-rm (~> 1.1.1) gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.16.2) + gitlab-labkit (~> 0.18.0) gitlab-license (~> 1.5) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.4.0) + gitlab-pg_query (~> 2.0.4) + gitlab-rdoc (~> 6.3.2) gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.14.0) + google-protobuf (~> 3.17.1) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.9.0) @@ -1515,6 +1528,7 @@ DEPENDENCIES json_schemer (~> 0.2.12) jwt (~> 2.1.0) kaminari (~> 1.0) + kas-grpc (~> 0.0.2) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.1) @@ -1536,7 +1550,7 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.11.1) + nokogiri (~> 1.11.4) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1564,14 +1578,13 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) - pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.4.0) - puma (~> 5.1.1) + puma (~> 5.3.1) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) @@ -1579,14 +1592,12 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.0.3.6) + rails (~> 6.1.3.2) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) - raindrops (~> 0.18) rblineprof (~> 0.3.6) rbtrace (~> 0.4) - rdoc (~> 6.1.2) re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) @@ -1615,7 +1626,7 @@ DEPENDENCIES sassc-rails (~> 2.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) - sentry-raven (~> 3.0) + sentry-raven (~> 3.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) sidekiq (~> 5.2.7) @@ -1625,7 +1636,7 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.40.4) + solargraph (~> 0.42) spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) @@ -1644,8 +1655,6 @@ DEPENDENCIES truncato (~> 0.7.11) u2f (~> 0.2.1) unf (~> 0.1.4) - unicorn (~> 5.5) - unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) validates_hostname (~> 1.0.11) @@ -1658,4 +1667,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.1.4 + 2.2.20 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f9b174c43f1..215f1467fed 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -21,15 +21,15 @@ version = "2.0.6"; }; actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; + dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1543p34bfq7s4l83m0f84f0z5yr1ip1miyimv4gh2k136pgk23r9"; + sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -37,21 +37,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dnx7mhhzwr45lsxkd7y9ld9vazcadxzs7813jp19hk3wra4jvs3"; + sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cnsv97qx7708wg00lxcl7a6h8amxn85h40s8ngszhknh8wpwj3f"; + sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz"; + sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13i7x4zp991sq3zsagpzs01bhm81zgy63lamqrpsp68nv584n5sx"; + sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5"; + sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy9kyl7famlwrdw7gz6sy7azhkcsn1mjja44s44libcz3fl7jpc"; + sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15kq8ghmkav331dz1pak1bc8q1v5xajw6pkj20hqr8m5zl6czcld"; + sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a3hc2rammy4mfrjwzc9rsn497yq9xc0x89c00niiq45q3qs44vz"; + sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -131,15 +131,15 @@ version = "0.1.0"; }; activestorage = { - dependencies = ["actionpack" "activejob" "activerecord" "marcel"]; + dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwdfqn01g7v7ssrrf2q2pvc8k6rdqccp26qkyfxiraaz9d1la62"; + sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z"; + sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -465,10 +465,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc"; + sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i"; type = "gem"; }; - version = "1.1.2"; + version = "1.2.0"; }; base32 = { groups = ["default"]; @@ -1509,15 +1509,15 @@ version = "6.1.0"; }; faraday = { - dependencies = ["multipart-post"]; - groups = ["default" "development"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; type = "gem"; }; - version = "1.0.1"; + version = "1.4.2"; }; faraday-cookie_jar = { dependencies = ["faraday" "http-cookie"]; @@ -1530,6 +1530,36 @@ }; version = "0.0.7"; }; + faraday-em_http = { + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; faraday-http-cache = { dependencies = ["faraday"]; groups = ["default" "development"]; @@ -1541,6 +1571,26 @@ }; version = "2.2.0"; }; + faraday-net_http = { + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["danger" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + type = "gem"; + }; + version = "1.1.0"; + }; faraday_middleware = { dependencies = ["faraday"]; groups = ["default"]; @@ -1605,14 +1655,14 @@ version = "2.10.0"; }; ffi = { - groups = ["default" "development" "kerberos" "puma" "test" "unicorn"]; + groups = ["default" "development" "kerberos" "puma" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "15nn2v70rql15vb0pm9cg0f3xsaslwjkv6xgz0k5jh48idmfw9fi"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.1"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1641,10 +1691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7"; + sha256 = "00qjmmy4lx6cbyndpqgj330ys6pxi3chhqfaybd5c7m9y0kr6ck9"; type = "gem"; }; - version = "0.17.1"; + version = "0.21.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -1652,10 +1702,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg"; + sha256 = "06j6fg8qdxklml0qvindy8dghx3ilq2k3x5rwdxlr8vjl5hljqm5"; type = "gem"; }; - version = "0.17.1"; + version = "0.21.0"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; @@ -1663,10 +1713,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg"; + sha256 = "00rb87d1f7wl1n3idv8bvjv45v3j1n1j5wm2vswisayv7z8wqp6r"; type = "gem"; }; - version = "0.17.1"; + version = "0.21.0"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -1891,10 +1941,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l0zq04lhqbzg0grca1c0p3a5gb9jdlhy41dhlgnrsaf7k6xads6"; + sha256 = "1wpp1zdwjmglsycliag6v9844jnhpvkblry9i14a16gspqdsfam4"; type = "gem"; }; - version = "13.12.0.pre.rc1"; + version = "14.0.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1934,10 +1984,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h40p9v034jczialkh4brrv7karrx6a95mhrfpfs17p800lighzz"; + sha256 = "09vcxzbsvgis47ifgd82rjn12587qcw6q2q0n0y3cg5snag6fqdb"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.2"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store" "scientist"]; @@ -1956,10 +2006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05yc5fp45v7y6h838zrj4666ar1ddhn8i5bbdxm8j73yrn2kjnal"; + sha256 = "1k5f3vyy2jqv3zdkdqal6sgn447zakz8xcc04432qd806s7g9i89"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.1"; }; gitlab-fog-google = { dependencies = ["addressable" "fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; @@ -1973,15 +2023,15 @@ version = "1.13.0"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; + dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; + sha256 = "1d18fx54dq2a2ngdix3dchbk4xpxfpqz1rkr2hi1kvi6idq4k6qp"; type = "gem"; }; - version = "0.16.2"; + version = "0.18.0"; }; gitlab-license = { groups = ["default"]; @@ -2034,6 +2084,27 @@ }; version = "0.4.0"; }; + gitlab-pg_query = { + dependencies = ["google-protobuf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17whjbrmyh1wn3badapa1xhdcjpdrxgn7vz705fpi1p9r8q0a2vj"; + type = "gem"; + }; + version = "2.0.4"; + }; + gitlab-rdoc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9"; + type = "gem"; + }; + version = "6.3.2"; + }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; groups = ["default"]; @@ -2127,10 +2198,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; + sha256 = "00jm6b5gpzj99cngha3g70s0xnr0c58si7kx3g7jiaj9ipp26qj5"; type = "gem"; }; - version = "3.14.0"; + version = "3.17.1"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2503,10 +2574,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10wz818i7dq5zkcll0yf7pbjz1zqvs7mgh3xg3x6www2f2ccwxqj"; + sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; httparty = { dependencies = ["mime-types" "multi_xml"]; @@ -2740,15 +2811,16 @@ }; version = "1.2.1"; }; - kgio = { - groups = ["default" "unicorn"]; + kas-grpc = { + dependencies = ["grpc"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ai6bzlvxbzpdl466p1qi4dlhx8ri2wcrp6x1l19y3yfs3a29rng"; + sha256 = "05lsvxb6mpx5h3zmp3pgs3cp52r1kb3a8yr9j7s3ksajb58zf7qi"; type = "gem"; }; - version = "2.11.3"; + version = "0.0.2"; }; knapsack = { dependencies = ["rake"]; @@ -2810,10 +2882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17bv6zfdzwbbh8n0iw8zgjngsvyp2imrrfshj62yrlxpka9ka0z3"; + sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.5"; }; letter_opener = { dependencies = ["launchy"]; @@ -3065,10 +3137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih"; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; type = "gem"; }; - version = "1.1.0"; + version = "1.0.2"; }; mini_portile2 = { groups = ["default" "development" "test"]; @@ -3334,10 +3406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; + sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.4"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3810,16 +3882,6 @@ }; version = "1.2.3"; }; - pg_query = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; - type = "gem"; - }; - version = "1.3.0"; - }; plist = { groups = ["default"]; platforms = []; @@ -3947,10 +4009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1315j8klxd404xxmcw1c6rlx7j445dzx62q5sggzvd59sl1amkf5"; + sha256 = "1wyx2rz58lfys1h62h6inz7ggq8xckqyfxndk8jq2cbkkdi2n6d7"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; public_suffix = { groups = ["default" "development" "test"]; @@ -3968,10 +4030,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b"; + sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; type = "gem"; }; - version = "5.1.1"; + version = "5.3.2"; }; puma_worker_killer = { dependencies = ["get_process_mem" "puma"]; @@ -4117,10 +4179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01mwx4q9yz792dbi61j378iz6p7q63sxj3267jwwccjqmn6hf2kr"; + sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4172,10 +4234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i50vbscdk6wqxd2p0xwsyi07lwda612njqk8pn1f56snz5z0dcr"; + sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2"; type = "gem"; }; - version = "6.0.3.6"; + version = "6.1.3.2"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4187,16 +4249,6 @@ }; version = "3.0.0"; }; - raindrops = { - groups = ["metrics" "unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zjja00mzgx2lddb7qrn14k7qrnwhf4bpmnlqj78m1pfxh7svync"; - type = "gem"; - }; - version = "0.19.1"; - }; rake = { groups = ["default" "development" "test"]; platforms = []; @@ -4264,16 +4316,6 @@ }; version = "1.8.0"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb"; - type = "gem"; - }; - version = "6.1.2"; - }; re2 = { groups = ["default"]; platforms = []; @@ -4788,14 +4830,14 @@ version = "2.1.2"; }; ruby2_keywords = { - groups = ["default"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.4"; }; ruby_parser = { dependencies = ["sexp_processor"]; @@ -4983,10 +5025,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0"; + sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; type = "gem"; }; - version = "3.0.4"; + version = "3.1.2"; }; settingslogic = { groups = ["default"]; @@ -5136,15 +5178,15 @@ version = "0.6.1"; }; solargraph = { - dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xrad7amwf3nmdbif566qprk6xvwydxwz0s7arnzpvr01anc9gcl"; + sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi"; type = "gem"; }; - version = "0.40.4"; + version = "0.42.3"; }; spamcheck = { dependencies = ["grpc"]; @@ -5373,10 +5415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mbhiz7g7nd3v1ai4cgwzp2zr34k1h5am0vn9bny5qqn1408rlgi"; + sha256 = "1kgak2xqyp2wf7y1c1q1dpxw56iq9mgpqjji6vfbjkxckqrxhdmw"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; text = { groups = ["default" "development"]; @@ -5608,15 +5650,15 @@ version = "0.8.1"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "1.2.9"; + version = "2.0.4"; }; u2f = { groups = ["default"]; @@ -5679,28 +5721,6 @@ }; version = "1.4.0"; }; - unicorn = { - dependencies = ["kgio" "raindrops"]; - groups = ["unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cznkq0agsm7s66nbqbalmq5nlc5cdpd2h88r8jdzsc7wsi5a098"; - type = "gem"; - }; - version = "5.5.5"; - }; - unicorn-worker-killer = { - dependencies = ["get_process_mem" "unicorn"]; - groups = ["unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; - type = "gem"; - }; - version = "0.4.4"; - }; uniform_notifier = { groups = ["default" "development" "test"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 12a350c26ec..2af33d3184f 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,11 +778,11 @@ }; } { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; }; } { @@ -818,11 +818,11 @@ }; } { - name = "_gitlab_svgs___svgs_1.197.0.tgz"; + name = "_gitlab_svgs___svgs_1.199.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.197.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.197.0.tgz"; - sha1 = "70be3217b4c0c84b494615d0672734f40e3695d4"; + name = "_gitlab_svgs___svgs_1.199.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.199.0.tgz"; + sha1 = "0512a854018defc4e286b8ecb2143958bb535146"; }; } { @@ -834,11 +834,11 @@ }; } { - name = "_gitlab_ui___ui_29.27.0.tgz"; + name = "_gitlab_ui___ui_29.35.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_29.27.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.27.0.tgz"; - sha1 = "c5cbe1fee2164705ea6a431c85f6fdaa2ff7e166"; + name = "_gitlab_ui___ui_29.35.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.35.0.tgz"; + sha1 = "bb04d1e4f8796134bc406adaa869c1b5b1fdcaf2"; }; } { @@ -1002,11 +1002,11 @@ }; } { - name = "_nuxt_opencollective___opencollective_0.3.0.tgz"; + name = "_nuxt_opencollective___opencollective_0.3.2.tgz"; path = fetchurl { - name = "_nuxt_opencollective___opencollective_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.0.tgz"; - sha1 = "11d8944dcf2d526e31660bb69570be03f8fb72b7"; + name = "_nuxt_opencollective___opencollective_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz"; + sha1 = "83cb70cdb2bac5fad6f8c93529e7b11187d49c02"; }; } { @@ -1026,67 +1026,67 @@ }; } { - name = "_rails_actioncable___actioncable_6.1.0.tgz"; + name = "_rails_actioncable___actioncable_6.1.3_2.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.0.tgz"; - sha1 = "f336f25450b1bc43b99bc60557a70b6e6bb1d3d2"; + name = "_rails_actioncable___actioncable_6.1.3_2.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.3-2.tgz"; + sha1 = "de22e2d7474dcca051f7060829450412a17ecc04"; }; } { - name = "_rails_ujs___ujs_6.1.0.tgz"; + name = "_rails_ujs___ujs_6.1.3_2.tgz"; path = fetchurl { - name = "_rails_ujs___ujs_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz"; - sha1 = "9a48df6511cb2b472c9f596c1f37dc0af022e751"; + name = "_rails_ujs___ujs_6.1.3_2.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.3-2.tgz"; + sha1 = "5d7e161e7061654e738a116a7ec8b58b51721a11"; }; } { - name = "_sentry_browser___browser_5.30.0.tgz"; + name = "_sentry_browser___browser_5.26.0.tgz"; path = fetchurl { - name = "_sentry_browser___browser_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz"; - sha1 = "c28f49d551db3172080caef9f18791a7fd39e3b3"; + name = "_sentry_browser___browser_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.26.0.tgz"; + sha1 = "e90a197fb94c5f26c8e05d6a539c118f33c7d598"; }; } { - name = "_sentry_core___core_5.30.0.tgz"; + name = "_sentry_core___core_5.26.0.tgz"; path = fetchurl { - name = "_sentry_core___core_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz"; - sha1 = "6b203664f69e75106ee8b5a2fe1d717379b331f3"; + name = "_sentry_core___core_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.26.0.tgz"; + sha1 = "9b5fe4de8a869d733ebcc77f5ec9c619f8717a51"; }; } { - name = "_sentry_hub___hub_5.30.0.tgz"; + name = "_sentry_hub___hub_5.26.0.tgz"; path = fetchurl { - name = "_sentry_hub___hub_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.30.0.tgz"; - sha1 = "2453be9b9cb903404366e198bd30c7ca74cdc100"; + name = "_sentry_hub___hub_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.26.0.tgz"; + sha1 = "b2bbd8128cd5915f2ee59cbc29fff30272d74ec5"; }; } { - name = "_sentry_minimal___minimal_5.30.0.tgz"; + name = "_sentry_minimal___minimal_5.26.0.tgz"; path = fetchurl { - name = "_sentry_minimal___minimal_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.30.0.tgz"; - sha1 = "ce3d3a6a273428e0084adcb800bc12e72d34637b"; + name = "_sentry_minimal___minimal_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.26.0.tgz"; + sha1 = "851dea3644153ed3ac4837fa8ed5661d94e7a313"; }; } { - name = "_sentry_types___types_5.30.0.tgz"; + name = "_sentry_types___types_5.26.0.tgz"; path = fetchurl { - name = "_sentry_types___types_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.30.0.tgz"; - sha1 = "19709bbe12a1a0115bc790b8942917da5636f402"; + name = "_sentry_types___types_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.26.0.tgz"; + sha1 = "b0cbacb0b24cd86620fb296b46cf7277bb004a3e"; }; } { - name = "_sentry_utils___utils_5.30.0.tgz"; + name = "_sentry_utils___utils_5.26.0.tgz"; path = fetchurl { - name = "_sentry_utils___utils_5.30.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.30.0.tgz"; - sha1 = "9a5bd7ccff85ccfe7856d493bffa64cabc41e980"; + name = "_sentry_utils___utils_5.26.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.26.0.tgz"; + sha1 = "09a3d01d91747f38f796cafeb24f8fd86e4fa05f"; }; } { @@ -1154,203 +1154,203 @@ }; } { - name = "_tiptap_core___core_2.0.0_beta.54.tgz"; + name = "_tiptap_core___core_2.0.0_beta.75.tgz"; path = fetchurl { - name = "_tiptap_core___core_2.0.0_beta.54.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.54.tgz"; - sha1 = "3630c78aab0a72cff0ffa5dda7ff7a2623a307e5"; + name = "_tiptap_core___core_2.0.0_beta.75.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.75.tgz"; + sha1 = "8295dfa7ca4b22de61e9c68a102763343b26e03a"; }; } { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.11.tgz"; - sha1 = "ca0be20501506a5555f39c4ec61d0fb3fb8a1713"; + name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.13.tgz"; + sha1 = "72a26dd54e5edb9abc4488ad7c1f0a43d4089bd5"; }; } { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.11.tgz"; - sha1 = "d8ac973d2795fc46231e5969d922ce8c3f7404b8"; + name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.13.tgz"; + sha1 = "d6b8f3797a6f7932ae38b9d761cc1effa886b715"; }; } { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.15.tgz"; + name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz"; path = fetchurl { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.15.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.15.tgz"; - sha1 = "307f94785caa6d57cbc33dcb37128fc9e910e184"; + name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.20.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.20.tgz"; + sha1 = "248c70910bf232ed5fb9eb3a7c084bc592d2341d"; }; } { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.11.tgz"; - sha1 = "6d3ccc047120bdd7576f0d1d286ae61a03c8b96e"; + name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.13.tgz"; + sha1 = "8b2c4ec8decc5562ae9bb5d97b0a99e0b27f9794"; }; } { - name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.18.tgz"; + name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz"; path = fetchurl { - name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.18.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.18.tgz"; - sha1 = "f90e557f0b62761f104937b0d41a4c4dd5569ee8"; + name = "_tiptap_extension_code_block_lowlight___extension_code_block_lowlight_2.0.0_beta.25.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.0.0-beta.25.tgz"; + sha1 = "eb5f721fa8a4035244b7883e3cfc770f17fae27f"; }; } { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.13.tgz"; + name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz"; path = fetchurl { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.13.tgz"; - sha1 = "9a41d103ed5b5a4810564c67105a89725b12559a"; + name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.15.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.15.tgz"; + sha1 = "3fb0f04c38f8276195a1a958cc7d3399b52dc46a"; }; } { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.11.tgz"; - sha1 = "484d63cde6ad5951e9075e2a47ebe0f6b633742f"; + name = "_tiptap_extension_code___extension_code_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.13.tgz"; + sha1 = "fa2d14c61fe213c2c40b196e1b1b7a8862cec987"; }; } { - name = "_tiptap_extension_document___extension_document_2.0.0_beta.10.tgz"; + name = "_tiptap_extension_document___extension_document_2.0.0_beta.12.tgz"; path = fetchurl { - name = "_tiptap_extension_document___extension_document_2.0.0_beta.10.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.10.tgz"; - sha1 = "2ccf4e5496f6b15c6bfa4f720b89af74fb871df4"; + name = "_tiptap_extension_document___extension_document_2.0.0_beta.12.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.12.tgz"; + sha1 = "dfbc7e686075a38662a43708903cd2047cf7f4b2"; }; } { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.11.tgz"; - sha1 = "620120a7f95e7cf21e6a3362ba38b2eacfa98a88"; + name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.14.tgz"; + sha1 = "b5e4137d4be1afe14a8f67d932af5e6d3df7cb56"; }; } { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.12.tgz"; + name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz"; path = fetchurl { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.12.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.12.tgz"; - sha1 = "de38a4fc5e24c0f70caafeeece79e6623bd8a579"; + name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.16.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.16.tgz"; + sha1 = "109226c060351b83916441cd58d631eff47d6bb2"; }; } { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.15.tgz"; + name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz"; path = fetchurl { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.15.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.15.tgz"; - sha1 = "6bafbd095e8673449f976935200f22a623d4043c"; + name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.17.tgz"; + sha1 = "774037fddab50379b21a58cab91bfd988b9b793f"; }; } { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.11.tgz"; - sha1 = "b2d457bb5c4f97d052b2537a7624d9609822ef65"; + name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.13.tgz"; + sha1 = "36b5433e70e8eac121d6d26871ff60527b500442"; }; } { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.11.tgz"; - sha1 = "9da6864aeafaeed83551559932253c9ab16621fb"; + name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.13.tgz"; + sha1 = "7d6f4a0e28af47ad1a1e455af01dbd1997a9f948"; }; } { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.10.tgz"; + name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz"; path = fetchurl { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.10.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.10.tgz"; - sha1 = "bb14500e193118295eb8c55ae4c2ddc5f2ae5d72"; + name = "_tiptap_extension_history___extension_history_2.0.0_beta.12.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.12.tgz"; + sha1 = "a25607aab594998d6b46576724d56701a2833689"; }; } { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.14.tgz"; + name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz"; path = fetchurl { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.14.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.14.tgz"; - sha1 = "bc23541ab5885c25a804b6b6f3c0ed2e505f7327"; + name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.16.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.16.tgz"; + sha1 = "7f8a3e14de2fc8bbb52816a697450a61d8797689"; }; } { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.11.tgz"; - sha1 = "b7c2961118c9468fd4bdb8632663379f618978e9"; + name = "_tiptap_extension_image___extension_image_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.13.tgz"; + sha1 = "58a2e66533e2ef63e67aeb7980fe642b75fa17a0"; }; } { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.11.tgz"; - sha1 = "fa5668ede5dd5373277da4bafc26415a2771d7f6"; + name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.13.tgz"; + sha1 = "8b0810e41dc5c3bfb0640d638b0b40464cd81fea"; }; } { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.15.tgz"; + name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz"; path = fetchurl { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.15.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.15.tgz"; - sha1 = "bb9adad12c55688e220f7d8a15d8456fbad47116"; + name = "_tiptap_extension_link___extension_link_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.17.tgz"; + sha1 = "5a3c28762cf332bb4de0fb13ce6973b11496697a"; }; } { - name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.11.tgz"; - sha1 = "22639904f9fdee8b80e344fe142e9065e9451337"; + name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.13.tgz"; + sha1 = "49f32d70a554897ffa3b37b492ebaf5953f8a975"; }; } { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.11.tgz"; + name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz"; path = fetchurl { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.11.tgz"; - sha1 = "37dd6cbb8b271bf8902ffcbad2a2e282ea078f6e"; + name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.13.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.13.tgz"; + sha1 = "4df2264e1405f73848cd2fedcea95f3064911cd7"; }; } { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.12.tgz"; + name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz"; path = fetchurl { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.12.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.12.tgz"; - sha1 = "849aad4294a341abd93781174dbdc369d9b7570c"; + name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.14.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.14.tgz"; + sha1 = "6b8c64166f3b581a1f8e1ae415b895e5bd2952d1"; }; } { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.12.tgz"; + name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz"; path = fetchurl { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.12.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.12.tgz"; - sha1 = "0a7452e92d5042c8884eda38f6496a1ecc28e264"; + name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.15.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.15.tgz"; + sha1 = "c274ae85b1067f80d45a1cb30d0cad24733c9be7"; }; } { - name = "_tiptap_extension_text___extension_text_2.0.0_beta.10.tgz"; + name = "_tiptap_extension_text___extension_text_2.0.0_beta.12.tgz"; path = fetchurl { - name = "_tiptap_extension_text___extension_text_2.0.0_beta.10.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.10.tgz"; - sha1 = "50681ba2c8e8a54305a89efb1adb0e68d683e4eb"; + name = "_tiptap_extension_text___extension_text_2.0.0_beta.12.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.12.tgz"; + sha1 = "b857f36dda5e8cedd350f9bad7115e4060f8d9c0"; }; } { - name = "_tiptap_vue_2___vue_2_2.0.0_beta.27.tgz"; + name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz"; path = fetchurl { - name = "_tiptap_vue_2___vue_2_2.0.0_beta.27.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.27.tgz"; - sha1 = "f9e3242a75957d46f1a4707e4a1bb29ec1d19e46"; + name = "_tiptap_vue_2___vue_2_2.0.0_beta.34.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/vue-2/-/vue-2-2.0.0-beta.34.tgz"; + sha1 = "df9309eb812b50a85315c4623ac222db751fc97a"; }; } { @@ -1498,11 +1498,11 @@ }; } { - name = "_types_lowlight___lowlight_0.0.1.tgz"; + name = "_types_lowlight___lowlight_0.0.2.tgz"; path = fetchurl { - name = "_types_lowlight___lowlight_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.1.tgz"; - sha1 = "221bc67a6c517bae71e6f200fa1cad0feaeeb965"; + name = "_types_lowlight___lowlight_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/lowlight/-/lowlight-0.0.2.tgz"; + sha1 = "bb517f1486477a8c59dea11be0dfaf96d629d35d"; }; } { @@ -1650,11 +1650,11 @@ }; } { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.2.tgz"; + name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz"; path = fetchurl { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.2.tgz"; - sha1 = "fe883c19a5a9f1882346a294efd09d55c6764c7a"; + name = "_types_prosemirror_transform___prosemirror_transform_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz"; + sha1 = "cf30d275976978d1c0317d0659145426fc49ce6f"; }; } { @@ -1738,11 +1738,11 @@ }; } { - name = "_vue_test_utils___test_utils_1.1.2.tgz"; + name = "_vue_test_utils___test_utils_1.2.0.tgz"; path = fetchurl { - name = "_vue_test_utils___test_utils_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz"; - sha1 = "fdb487448dceefeaf3d01d465f7c836a3d666dbc"; + name = "_vue_test_utils___test_utils_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.2.0.tgz"; + sha1 = "3bc8c17ed549157275f0aec6b95da40887f7297f"; }; } { @@ -2058,11 +2058,11 @@ }; } { - name = "ajv___ajv_7.0.4.tgz"; + name = "ajv___ajv_8.5.0.tgz"; path = fetchurl { - name = "ajv___ajv_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz"; - sha1 = "827e5f5ae32f5e5c1637db61f253a112229b5e2f"; + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; }; } { @@ -2762,11 +2762,19 @@ }; } { - name = "bootstrap_vue___bootstrap_vue_2.17.3.tgz"; + name = "boolbase___boolbase_1.0.0.tgz"; path = fetchurl { - name = "bootstrap_vue___bootstrap_vue_2.17.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.17.3.tgz"; - sha1 = "3d78b7b4ff992a8ad69d2ed1c7413fcfdcefaec7"; + name = "boolbase___boolbase_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + } + { + name = "bootstrap_vue___bootstrap_vue_2.18.1.tgz"; + path = fetchurl { + name = "bootstrap_vue___bootstrap_vue_2.18.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.18.1.tgz"; + sha1 = "4378d26b713d4255b45b42b3f852f6fa0a11d400"; }; } { @@ -3154,6 +3162,22 @@ }; } { + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + path = fetchurl { + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz"; + sha1 = "3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"; + }; + } + { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + path = fetchurl { + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz"; + sha1 = "a3ae6b7ce7af80675302ff836f628e7cb786a67f"; + }; + } + { name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { name = "chokidar___chokidar_3.4.0.tgz"; @@ -3386,11 +3410,11 @@ }; } { - name = "colorette___colorette_1.2.1.tgz"; + name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { - name = "colorette___colorette_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; - sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; }; } { @@ -3554,11 +3578,11 @@ }; } { - name = "consola___consola_2.10.1.tgz"; + name = "consola___consola_2.15.3.tgz"; path = fetchurl { - name = "consola___consola_2.10.1.tgz"; - url = "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz"; - sha1 = "4693edba714677c878d520e4c7e4f69306b4b927"; + name = "consola___consola_2.15.3.tgz"; + url = "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz"; + sha1 = "2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"; }; } { @@ -3690,11 +3714,11 @@ }; } { - name = "core_js___core_js_3.12.1.tgz"; + name = "core_js___core_js_3.13.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.12.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.12.1.tgz"; - sha1 = "6b5af4ff55616c08a44d386f1f510917ff204112"; + name = "core_js___core_js_3.13.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz"; + sha1 = "58ca436bf01d6903aee3d364089868d0d89fe58d"; }; } { @@ -3826,6 +3850,14 @@ }; } { + name = "css_select___css_select_4.1.2.tgz"; + path = fetchurl { + name = "css_select___css_select_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz"; + sha1 = "8b52b6714ed3a80d8221ec971c543f3b12653286"; + }; + } + { name = "css_selector_parser___css_selector_parser_1.3.0.tgz"; path = fetchurl { name = "css_selector_parser___css_selector_parser_1.3.0.tgz"; @@ -3850,6 +3882,14 @@ }; } { + name = "css_what___css_what_5.0.0.tgz"; + path = fetchurl { + name = "css_what___css_what_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.0.0.tgz"; + sha1 = "f0bf4f8bac07582722346ab243f6a35b512cfc47"; + }; + } + { name = "css___css_2.2.4.tgz"; path = fetchurl { name = "css___css_2.2.4.tgz"; @@ -4234,11 +4274,11 @@ }; } { - name = "dateformat___dateformat_3.0.3.tgz"; + name = "dateformat___dateformat_4.5.1.tgz"; path = fetchurl { - name = "dateformat___dateformat_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz"; - sha1 = "a6e37499a4d9a9cf85ef5872044d62901c9889ae"; + name = "dateformat___dateformat_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/dateformat/-/dateformat-4.5.1.tgz"; + sha1 = "c20e7a9ca77d147906b6dc2261a8be0a5bd2173c"; }; } { @@ -4586,14 +4626,6 @@ }; } { - name = "document_register_element___document_register_element_1.14.3.tgz"; - path = fetchurl { - name = "document_register_element___document_register_element_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.14.3.tgz"; - sha1 = "3335d4578df6a1536a34595b91cca36dd5db61d7"; - }; - } - { name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz"; path = fetchurl { name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz"; @@ -4626,6 +4658,14 @@ }; } { + name = "dom_serializer___dom_serializer_1.3.1.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz"; + sha1 = "d845a1565d7c041a95e5dab62184ab41e3a519be"; + }; + } + { name = "dom_walk___dom_walk_0.1.2.tgz"; path = fetchurl { name = "dom_walk___dom_walk_0.1.2.tgz"; @@ -4650,11 +4690,11 @@ }; } { - name = "domelementtype___domelementtype_2.1.0.tgz"; + name = "domelementtype___domelementtype_2.2.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz"; - sha1 = "a851c080a6d1c3d94344aed151d99f669edf585e"; + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; }; } { @@ -4674,11 +4714,19 @@ }; } { - name = "dompurify___dompurify_2.2.8.tgz"; + name = "domhandler___domhandler_4.2.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz"; + sha1 = "f9768a5f034be60a89a27c2e4d0f74eba0d8b059"; + }; + } + { + name = "dompurify___dompurify_2.2.9.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.8.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.8.tgz"; - sha1 = "ce88e395f6d00b6dc53f80d6b2a6fdf5446873c6"; + name = "dompurify___dompurify_2.2.9.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz"; + sha1 = "4b42e244238032d9286a0d2c87b51313581d9624"; }; } { @@ -4690,6 +4738,14 @@ }; } { + name = "domutils___domutils_2.6.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz"; + sha1 = "2e15c04185d43fb16ae7057cb76433c6edb938b7"; + }; + } + { name = "dot_prop___dot_prop_5.2.0.tgz"; path = fetchurl { name = "dot_prop___dot_prop_5.2.0.tgz"; @@ -5026,6 +5082,14 @@ }; } { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { name = "escodegen___escodegen_1.14.3.tgz"; @@ -5194,11 +5258,11 @@ }; } { - name = "eslint___eslint_7.26.0.tgz"; + name = "eslint___eslint_7.28.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.26.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz"; - sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6"; + name = "eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; + sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; }; } { @@ -5938,11 +6002,11 @@ }; } { - name = "glob___glob_7.1.6.tgz"; + name = "glob___glob_7.1.7.tgz"; path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; }; } { @@ -6002,19 +6066,11 @@ }; } { - name = "globals___globals_12.3.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "globals___globals_12.3.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; - }; - } - { - name = "globals___globals_13.8.0.tgz"; - path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { @@ -6378,6 +6434,14 @@ }; } { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha1 = "c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"; + }; + } + { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; @@ -7634,11 +7698,11 @@ }; } { - name = "jquery___jquery_3.5.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; - sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha1 = "c72a09f15c1bdce142f49dbf1170bdf8adac2470"; }; } { @@ -8066,14 +8130,6 @@ }; } { - name = "lightercollective___lightercollective_0.3.0.tgz"; - path = fetchurl { - name = "lightercollective___lightercollective_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.3.0.tgz"; - sha1 = "1f07638642ec645d70bdb69ab2777676f35a28f0"; - }; - } - { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; path = fetchurl { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; @@ -8314,6 +8370,14 @@ }; } { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { name = "lodash.pick___lodash.pick_4.4.0.tgz"; path = fetchurl { name = "lodash.pick___lodash.pick_4.4.0.tgz"; @@ -8338,6 +8402,14 @@ }; } { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -8738,11 +8810,11 @@ }; } { - name = "mermaid___mermaid_8.9.2.tgz"; + name = "mermaid___mermaid_8.10.2.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.9.2.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.2.tgz"; - sha1 = "40bb2052cc6c4feaf5d93a5e527a8d06d0bacea7"; + name = "mermaid___mermaid_8.10.2.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.2.tgz"; + sha1 = "e039df2e42faba08743f167fff85bdccff241f76"; }; } { @@ -9082,6 +9154,14 @@ }; } { + name = "nanoid___nanoid_3.1.23.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; + }; + } + { name = "nanomatch___nanomatch_1.2.13.tgz"; path = fetchurl { name = "nanomatch___nanomatch_1.2.13.tgz"; @@ -9290,6 +9370,14 @@ }; } { + name = "nth_check___nth_check_2.0.0.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz"; + sha1 = "1bb4f6dac70072fc313e8c9cd1417b5074c0a125"; + }; + } + { name = "num2fraction___num2fraction_1.2.2.tgz"; path = fetchurl { name = "num2fraction___num2fraction_1.2.2.tgz"; @@ -9730,6 +9818,22 @@ }; } { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + path = fetchurl { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha1 = "2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"; + }; + } + { + name = "parse5___parse5_6.0.1.tgz"; + path = fetchurl { + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; + }; + } + { name = "parse5___parse5_5.1.1.tgz"; path = fetchurl { name = "parse5___parse5_5.1.1.tgz"; @@ -10130,6 +10234,14 @@ }; } { + name = "postcss___postcss_8.2.15.tgz"; + path = fetchurl { + name = "postcss___postcss_8.2.15.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz"; + sha1 = "9e66ccf07292817d226fc315cbbf9bc148fbca65"; + }; + } + { name = "prelude_ls___prelude_ls_1.2.1.tgz"; path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; @@ -10274,19 +10386,19 @@ }; } { - name = "prosemirror_commands___prosemirror_commands_1.1.7.tgz"; + name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz"; path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.7.tgz"; - sha1 = "5b31ae0fe82835d36d22c780641c0b651f27dd03"; + name = "prosemirror_commands___prosemirror_commands_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.8.tgz"; + sha1 = "61aec59ac101b7990ec59726199f2a31ef0cd8ca"; }; } { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.4.tgz"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; path = fetchurl { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.4.tgz"; - sha1 = "a7f799ff9ecb520d3e1dbb3cb39d27ce41066618"; + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.5.tgz"; + sha1 = "d2808c17089df0e441ad66016aecc2b6457c8a1f"; }; } { @@ -10370,11 +10482,11 @@ }; } { - name = "prosemirror_view___prosemirror_view_1.18.4.tgz"; + name = "prosemirror_view___prosemirror_view_1.18.7.tgz"; path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.18.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.4.tgz"; - sha1 = "179141df117cf414434ade08115f2e233d135f6d"; + name = "prosemirror_view___prosemirror_view_1.18.7.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.7.tgz"; + sha1 = "d9843337a1649f532401589899b724e7e87e83c0"; }; } { @@ -10482,6 +10594,22 @@ }; } { + name = "purgecss_from_html___purgecss_from_html_4.0.3.tgz"; + path = fetchurl { + name = "purgecss_from_html___purgecss_from_html_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/purgecss-from-html/-/purgecss-from-html-4.0.3.tgz"; + sha1 = "28d86d3dc8292581c4ab529a77a57daf7c2dd940"; + }; + } + { + name = "purgecss___purgecss_4.0.3.tgz"; + path = fetchurl { + name = "purgecss___purgecss_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/purgecss/-/purgecss-4.0.3.tgz"; + sha1 = "8147b429f9c09db719e05d64908ea8b672913742"; + }; + } + { name = "qjobs___qjobs_1.2.0.tgz"; path = fetchurl { name = "qjobs___qjobs_1.2.0.tgz"; @@ -12058,11 +12186,11 @@ }; } { - name = "table___table_6.0.7.tgz"; + name = "table___table_6.7.1.tgz"; path = fetchurl { - name = "table___table_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; - sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -12474,6 +12602,14 @@ }; } { + name = "tslib___tslib_2.2.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz"; + sha1 = "fb2c475977e35e241311ede2693cee1ec6698f5c"; + }; + } + { name = "tsutils___tsutils_3.17.1.tgz"; path = fetchurl { name = "tsutils___tsutils_3.17.1.tgz"; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 8dd2766ff0e..e9712a859d7 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : ${lib.makeBinPath [ git perl ]} + --prefix PATH : ${lib.makeBinPath [ git (perl.withPackages (p: [ p.JSON ])) ]} ''; installPhase = '' diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index 030a35212ec..0a76f7df970 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,21 +1,19 @@ { lib, stdenv, fetchurl, python2Packages, makeWrapper , 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; -in python2Packages.buildPythonApplication { +in python2Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "4.9.1"; - inherit (mercurialSrc.meta) name version; - src = mercurialSrc; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; + }; format = "other"; @@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication { ''; meta = { - inherit (mercurialSrc.meta) 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/"; @@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication { platforms = lib.platforms.unix; }; } - diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3caf499d31a..128b70c38e8 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,95 +1,157 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform -, guiSupport ? false, tk ? null +, fullBuild ? false +, gitSupport ? fullBuild +, guiSupport ? fullBuild, tk +, highlightSupport ? fullBuild , ApplicationServices }: let - inherit (python3Packages) docutils python fb-re2; + inherit (python3Packages) docutils python fb-re2 pygit2 pygments; -in python3Packages.buildPythonApplication rec { - pname = "mercurial"; - version = "5.8"; + self = python3Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "5.8"; - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; - }; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; + }; + + patches = [ + # https://phab.mercurial-scm.org/D10638, needed for below patch to apply + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84"; + sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g"; + }) + # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea"; + sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn"; + }) + ]; + + format = "other"; + + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git + + cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; + sourceRoot = "${pname}-${version}/rust"; + } else null; + cargoRoot = if rustSupport then "rust" else null; + + propagatedBuildInputs = lib.optional re2Support fb-re2 + ++ lib.optional gitSupport pygit2 + ++ lib.optional highlightSupport pygments; + nativeBuildInputs = [ makeWrapper gettext installShellFiles ] + ++ lib.optionals rustSupport (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + buildInputs = [ docutils ] + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - patches = [ - # https://phab.mercurial-scm.org/D10638, needed for below patch to apply - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/oymk4awh2dd7q6cwjbzu/PHID-FILE-bfcr7qrp5spg42wspxpd/D10638.diff"; - sha256 = "0mfi324is02l7cnd3j0gbmg5rpyyqn3afg3f73flnfwmz5njqa5f"; - }) - # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/re4uqdhtknjiacx2ogwu/PHID-FILE-4m26id65dno5gzix2ngh/D10639.diff"; - sha256 = "0h5ilrd2x1789fr6sf4k1mcvxdh0xdyr94yawdacw87v3x12c8cb"; - }) - ]; - - format = "other"; - - passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - - cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; - sourceRoot = "${pname}-${version}/rust"; - } else null; - cargoRoot = if rustSupport then "rust" else null; - - propagatedBuildInputs = lib.optional re2Support fb-re2; - nativeBuildInputs = [ makeWrapper gettext ] - ++ lib.optionals rustSupport (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); - buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional rustSupport "PURE=--rust"; - - postInstall = (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 - - # 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 = with lib; { - 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/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb ]; - updateWalker = true; - platforms = platforms.unix; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional rustSupport "PURE=--rust"; + + postInstall = (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 + + installShellCompletion --cmd hg \ + --bash contrib/bash_completion \ + --zsh contrib/zsh_completion + ''; + + passthru.tests = {}; + + meta = with lib; { + description = "A fast, lightweight SCM system for very large distributed projects"; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lukegb ]; + updateWalker = true; + platforms = platforms.unix; + }; }; -} +in + self.overridePythonAttrs (origAttrs: { + passthru = origAttrs.passthru // rec { + # withExtensions takes a function which takes the python packages set and + # returns a list of extensions to install. + # + # for instance: mercurial.withExtension (pm: [ pm.hg-evolve ]) + withExtensions = f: let + python = self.python; + mercurialHighPrio = ps: (ps.toPythonModule self).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + priority = 50; + }; + }); + plugins = (f python.pkgs) ++ [ (mercurialHighPrio python.pkgs) ]; + env = python.withPackages (ps: plugins); + in stdenv.mkDerivation { + pname = "${self.pname}-with-extensions"; + + inherit (self) src version meta; + + buildInputs = self.buildInputs ++ self.propagatedBuildInputs; + nativeBuildInputs = self.nativeBuildInputs; + + phases = [ "installPhase" "installCheckPhase" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do + for bin in $bindir/*; do + ln -s ${env}/bin/$(basename $bin) $out/bin/ + done + done + + ln -s ${self}/share $out/share + + runHook postInstall + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/hg help >/dev/null || exit 1 + + runHook postInstallCheck + ''; + }; + + tests = origAttrs.passthru.tests // { + withExtensions = withExtensions (pm: [ pm.hg-evolve ]); + }; + }; + }) diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index cfde0721baf..3c92a93851b 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Monotone ancestry visualiser"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 3bea6d89334..06a4b2c98a6 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -29,7 +29,6 @@ buildPythonApplication rec { ''; meta = { - inherit version; description = "Strip output from Jupyter and IPython notebooks"; homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a51e8c199bc..4c4cedd5a12 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.48"; + version = "1.0.0-alpha.52"; src = fetchCrate { inherit version pname; - sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig"; + sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; }; - cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn"; + cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ gal_bolle dywedir ]; + maintainers = with maintainers; [ gal_bolle dywedir fabianhjr ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index f8143711318..d814e0ca0a5 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,55 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }: stdenv.mkDerivation rec { - name = "rcs-5.9.4"; + pname = "rcs"; + version = "5.10.0"; src = fetchurl { - url = "mirror://gnu/rcs/${name}.tar.xz"; - sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"; + url = "mirror://gnu/rcs/${pname}-${version}.tar.xz"; + sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU"; }; - buildInputs = [ ed ]; + ac_cv_path_ED = "${ed}/bin/ed"; + DIFF = "${diffutils}/bin/diff"; + DIFF3 = "${diffutils}/bin/diff3"; - patches = lib.optionals stdenv.isDarwin [ - # This failure appears unrelated to the subject of the test. This - # test seems to rely on a bash bug where `test $x -nt $y` ignores - # subsecond values in timetamps. This bug has been fixed in Bash - # 5, and seemingly doesn't affect Darwin. - ./disable-t810.patch - - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch"; - extraPrefix = ""; - sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3"; - }) - - # Expected to appear in the next release - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch"; - sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx"; - }) - ]; - - doCheck = true; - - checkFlags = [ "VERBOSE=1" ]; - - checkPhase = '' - # If neither LOGNAME or USER are set, rcs will default to - # getlogin(), which is unreliable on macOS. It will often return - # things like `_spotlight`, or `_mbsetupuser`. macOS sets both - # environment variables in user sessions, so this is unlikely to - # affect regular usage. - - export LOGNAME=$(id -un) - - print_logs_and_fail() { - grep -nH -e . -r tests/*.d/{out,err} - return 1 - } - - make $checkFlags check || print_logs_and_fail - ''; + disallowedReferences = + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ buildPackages.diffutils buildPackages.ed ]; NIX_CFLAGS_COMPILE = "-std=c99"; diff --git a/pkgs/applications/version-management/rcs/disable-t810.patch b/pkgs/applications/version-management/rcs/disable-t810.patch deleted file mode 100644 index 745f1868a36..00000000000 --- a/pkgs/applications/version-management/rcs/disable-t810.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900 -+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900 -@@ -1372,7 +1372,6 @@ - t803 \ - t804 \ - t805 \ -- t810 \ - t900 \ - t999 - diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index c13a08a711c..11dbfc299a4 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, curl }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - nativeBuildInputs = [ cmake antlr ]; + nativeBuildInputs = [ cmake antlr2 ]; buildInputs = [ libxml2 libxslt boost libarchive python curl ]; meta = { diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index a0fa9318a13..73d8f3aa5ec 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,29 +1,18 @@ { lib, fetchurl, python3Packages , mercurial, qt5 -}@args: -let - tortoisehgSrc = fetchurl rec { - meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.6"; - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; - sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr"; - }; - - tortoiseMercurial = (mercurial.override { - rustSupport = false; - re2Support = lib.versionAtLeast tortoisehgSrc.meta.version "5.8"; - }).overridePythonAttrs (old: rec { - inherit (tortoisehgSrc.meta) version; +}: + +python3Packages.buildPythonApplication rec { + pname = "tortoisehg"; + version = "5.8"; + src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; }; - patches = []; - }); -in python3Packages.buildPythonApplication { - inherit (tortoisehgSrc.meta) name version; - src = tortoisehgSrc; + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; propagatedBuildInputs = with python3Packages; [ tortoiseMercurial qscintilla-qt5 iniparse @@ -49,7 +38,7 @@ in python3Packages.buildPythonApplication { meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; }; |