From b316cec9b66fa79f89a36decf669a8f2978e0af8 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 5 Mar 2020 09:53:12 +0100 Subject: standardnotes: 3.0.15 -> 3.3.3 --- pkgs/applications/editors/standardnotes/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 5a13d91aef2cc..d076cfe343a35 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,16 +1,16 @@ { stdenv, appimage-run, fetchurl, runtimeShell }: let - version = "3.0.15"; + version = "3.3.3"; plat = { - i386-linux = "i386"; - x86_64-linux = "x86_64"; + i386-linux = "-i386"; + x86_64-linux = ""; }.${stdenv.hostPlatform.system}; sha256 = { - i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; - x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; + i386-linux = "2ccdf23588b09d645811e562d4fd7e02ac0e367bf2b34e373d8470d48544036d"; + x86_64-linux = "6366d0a37cbf2cf51008a666e40bada763dd1539173de01e093bcbe4146a6bd8"; }.${stdenv.hostPlatform.system}; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; + url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}${plat}.AppImage"; inherit sha256; }; -- cgit 1.4.1 From e01ce7f91f050c0a0cefc6b5f759b9944f6f9a85 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Thu, 5 Mar 2020 11:23:11 +0100 Subject: standardnotes: refactoring to use appimageTools instead of appimage-run --- .../applications/editors/standardnotes/default.nix | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index d076cfe343a35..cd62c8bf65da7 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,7 +1,10 @@ -{ stdenv, appimage-run, fetchurl, runtimeShell }: +{ stdenv, appimageTools, autoPatchelfHook, desktop-file-utils + , fetchurl, runtimeShell }: let version = "3.3.3"; + pname = "standardnotes"; + name = "${pname}-${version}"; plat = { i386-linux = "-i386"; @@ -12,27 +15,33 @@ let i386-linux = "2ccdf23588b09d645811e562d4fd7e02ac0e367bf2b34e373d8470d48544036d"; x86_64-linux = "6366d0a37cbf2cf51008a666e40bada763dd1539173de01e093bcbe4146a6bd8"; }.${stdenv.hostPlatform.system}; -in - -stdenv.mkDerivation { - pname = "standardnotes"; - inherit version; src = fetchurl { url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}${plat}.AppImage"; inherit sha256; }; - buildInputs = [ appimage-run ]; + appimageContents = appimageTools.extract { + inherit name src; + }; + + nativeBuildInputs = [ autoPatchelfHook desktop-file-utils ]; + +in appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + # directory in /nix/store so readonly + cp -r ${appimageContents}/* $out + cd $out + chmod -R +w $out + mv $out/bin/${name} $out/bin/${pname} - dontUnpack = true; + # fixup and install desktop file + ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value ${pname} standard-notes.desktop - installPhase = '' - mkdir -p $out/{bin,share} - cp $src $out/share/standardNotes.AppImage - echo "#!${runtimeShell}" > $out/bin/standardnotes - echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes - chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage + rm usr/lib/* AppRun standard-notes.desktop .so* ''; meta = with stdenv.lib; { -- cgit 1.4.1 From d9beb0b9ba38c38aef7e54e34e55e3777dcf654d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 18:19:05 +0000 Subject: quilter: 2.1.2 -> 2.2.2 --- pkgs/applications/editors/quilter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 338708e3f82ed..9bc8e1bc920fb 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1nk6scn98kb43h056ajycpj71jkx7b9p5g05khgl6bwj9hvjvcbw"; + sha256 = "1bgsbcx09ca063kdqfc7nigly99d7xgx2cbkpk1nkhr0hvkyg9l9"; }; nativeBuildInputs = [ -- cgit 1.4.1 From f92600b406982e871dcd28ca0259357f57fa562b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 6 Apr 2020 15:02:13 +0200 Subject: update versions in Gemfile.lock --- pkgs/applications/audio/tree-from-tags/Gemfile.lock | 2 +- pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock | 2 +- pkgs/applications/graphics/image_optim/Gemfile.lock | 2 +- pkgs/applications/misc/doing/Gemfile.lock | 2 +- pkgs/applications/misc/gollum/Gemfile.lock | 2 +- pkgs/applications/misc/jekyll/basic/Gemfile.lock | 2 +- pkgs/applications/misc/jekyll/full/Gemfile.lock | 2 +- pkgs/applications/misc/pt/Gemfile.lock | 2 +- pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock | 2 +- pkgs/applications/misc/taskjuggler/Gemfile.lock | 2 +- pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock | 2 +- pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock | 2 +- pkgs/applications/office/ledger-web/Gemfile.lock | 2 +- pkgs/applications/office/timetrap/Gemfile.lock | 2 +- .../version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock | 2 +- .../applications/version-management/git-and-tools/git-fame/Gemfile.lock | 2 +- pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock | 2 +- pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock | 2 +- pkgs/applications/version-management/redmine/Gemfile.lock | 2 +- pkgs/development/compilers/matter-compiler/Gemfile.lock | 2 +- pkgs/development/mobile/cocoapods/Gemfile.lock | 2 +- pkgs/development/ruby-modules/solargraph/Gemfile.lock | 2 +- pkgs/development/tools/build-managers/drake/Gemfile.lock | 2 +- pkgs/development/tools/build-managers/rake/Gemfile.lock | 2 +- pkgs/development/tools/cadre/Gemfile.lock | 2 +- pkgs/development/tools/cbor-diag/Gemfile.lock | 2 +- pkgs/development/tools/cddl/Gemfile.lock | 2 +- pkgs/development/tools/chefdk/Gemfile.lock | 2 +- pkgs/development/tools/compass/Gemfile.lock | 2 +- pkgs/development/tools/corundum/Gemfile.lock | 2 +- pkgs/development/tools/cucumber/Gemfile.lock | 2 +- pkgs/development/tools/ejson/Gemfile.lock | 2 +- pkgs/development/tools/github-changelog-generator/Gemfile.lock | 2 +- pkgs/development/tools/jazzy/Gemfile.lock | 2 +- pkgs/development/tools/jsduck/Gemfile.lock | 2 +- pkgs/development/tools/misc/mdl/Gemfile.lock | 2 +- pkgs/development/tools/misc/one_gadget/Gemfile.lock | 2 +- pkgs/development/tools/misc/travis/Gemfile.lock | 2 +- pkgs/development/tools/misc/watson-ruby/Gemfile.lock | 2 +- pkgs/development/tools/overcommit/Gemfile.lock | 2 +- pkgs/development/tools/pry/Gemfile.lock | 2 +- pkgs/development/tools/puppet/puppet-lint/Gemfile.lock | 2 +- pkgs/development/tools/redis-dump/Gemfile.lock | 2 +- pkgs/development/tools/ronn/Gemfile.lock | 2 +- pkgs/development/tools/rubocop/Gemfile.lock | 2 +- pkgs/development/tools/sass/Gemfile.lock | 2 +- pkgs/development/tools/scss-lint/Gemfile.lock | 2 +- pkgs/development/tools/sqlint/Gemfile.lock | 2 +- pkgs/development/tools/xcpretty/Gemfile.lock | 2 +- pkgs/development/web/mailcatcher/Gemfile.lock | 2 +- pkgs/servers/http/showoff/Gemfile.lock | 2 +- pkgs/servers/monitoring/riemann-dash/Gemfile.lock | 2 +- pkgs/servers/monitoring/sensu/Gemfile.lock | 2 +- pkgs/tools/admin/fastlane/Gemfile.lock | 2 +- pkgs/tools/admin/oxidized/Gemfile.lock | 2 +- pkgs/tools/audio/mpdcron/Gemfile.lock | 2 +- pkgs/tools/backup/lvmsync/Gemfile.lock | 2 +- pkgs/tools/inputmethods/fusuma/Gemfile.lock | 2 +- pkgs/tools/misc/3llo/Gemfile.lock | 2 +- pkgs/tools/misc/docker-sync/Gemfile.lock | 2 +- pkgs/tools/misc/fluentd/Gemfile.lock | 2 +- pkgs/tools/misc/homesick/Gemfile.lock | 2 +- pkgs/tools/misc/html-proofer/Gemfile.lock | 2 +- pkgs/tools/misc/lolcat/Gemfile.lock | 2 +- pkgs/tools/misc/pws/Gemfile.lock | 2 +- pkgs/tools/misc/riemann-tools/Gemfile.lock | 2 +- pkgs/tools/misc/t/Gemfile.lock | 2 +- pkgs/tools/misc/td/Gemfile.lock | 2 +- pkgs/tools/misc/teamocil/Gemfile.lock | 2 +- pkgs/tools/networking/hue-cli/Gemfile.lock | 2 +- pkgs/tools/networking/maphosts/Gemfile.lock | 2 +- pkgs/tools/package-management/elm-github-install/Gemfile.lock | 2 +- pkgs/tools/package-management/fpm/Gemfile.lock | 2 +- pkgs/tools/security/bundler-audit/Gemfile.lock | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 2 +- pkgs/tools/security/wpscan/Gemfile.lock | 2 +- pkgs/tools/system/colorls/Gemfile.lock | 2 +- pkgs/tools/system/foreman/Gemfile.lock | 2 +- pkgs/tools/system/hiera-eyaml/Gemfile.lock | 2 +- pkgs/tools/system/procodile/Gemfile.lock | 2 +- pkgs/tools/system/r10k/Gemfile.lock | 2 +- pkgs/tools/text/bcat/Gemfile.lock | 2 +- pkgs/tools/text/kramdown-rfc2629/Gemfile.lock | 2 +- pkgs/tools/text/papertrail/Gemfile.lock | 2 +- pkgs/tools/text/reckon/Gemfile.lock | 2 +- pkgs/tools/typesetting/asciidoctor/Gemfile.lock | 2 +- pkgs/tools/typesetting/docbookrx/Gemfile.lock | 2 +- pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock | 2 +- 88 files changed, 88 insertions(+), 88 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/applications/audio/tree-from-tags/Gemfile.lock index 2ef77caa6f69e..0ae90c1aebbea 100644 --- a/pkgs/applications/audio/tree-from-tags/Gemfile.lock +++ b/pkgs/applications/audio/tree-from-tags/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES taglib-ruby BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 6a3f581c4e812..d0827bf2a7ff9 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock index 20c9772ce4648..3ffadb5acbe31 100644 --- a/pkgs/applications/graphics/image_optim/Gemfile.lock +++ b/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES image_optim BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/applications/misc/doing/Gemfile.lock index 4d266827415f9..1b969869f76c2 100644 --- a/pkgs/applications/misc/doing/Gemfile.lock +++ b/pkgs/applications/misc/doing/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES doing (= 1.0.10pre) BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 6a705b6a9d82d..b7f94a63fb792 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -63,4 +63,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 332f1bbf1977a..b421ea7179539 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -98,4 +98,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index ebde3c93e2153..51a835e4b9f0d 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -149,4 +149,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/applications/misc/pt/Gemfile.lock index 501fae0ef0a24..dfaa018d3724d 100644 --- a/pkgs/applications/misc/pt/Gemfile.lock +++ b/pkgs/applications/misc/pt/Gemfile.lock @@ -66,4 +66,4 @@ DEPENDENCIES pt BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock index d1642e76fa652..8831993117d24 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.10.5 + 2.1.4 diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index dcc46e370e719..0f05c496173f6 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock index b801fad546dfa..7307d8a33f3c1 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES terraform_landscape BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock index 86e064347b65c..4534beb20c393 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES wayback_machine_downloader! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/applications/office/ledger-web/Gemfile.lock index f18460420c5d3..b12a8600ed204 100644 --- a/pkgs/applications/office/ledger-web/Gemfile.lock +++ b/pkgs/applications/office/ledger-web/Gemfile.lock @@ -58,4 +58,4 @@ DEPENDENCIES ledger_web BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index c97fb170324a6..30e48b7febbe5 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock index 61159eb3ee9e8..27a6e2c8dd03a 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES atlassian-stash BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock index 0ac7907fe55d8..12c58d72103ac 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock @@ -23,4 +23,4 @@ DEPENDENCIES git_fame BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index e3f7865226a21..b41c78f3a3dcb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -242,4 +242,4 @@ DEPENDENCIES webmock (~> 3.4.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 9735b9be9358b..a808e85e43379 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1404,4 +1404,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 806847a298e9f..66326b282358d 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -225,4 +225,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/pkgs/development/compilers/matter-compiler/Gemfile.lock index ab1833b3cfe9c..230b99d91a637 100644 --- a/pkgs/development/compilers/matter-compiler/Gemfile.lock +++ b/pkgs/development/compilers/matter-compiler/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES matter_compiler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9aa7dfbf23016..b8db94ca06afc 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 70a3afb6e57b4..d9438a799565e 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -52,4 +52,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock index 52060a0e6254c..466133010e04d 100644 --- a/pkgs/development/tools/build-managers/drake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES drake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock index 992a0bc8929fa..f89ceae934420 100644 --- a/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock index c14df9cffa614..5d22e69f31c0f 100644 --- a/pkgs/development/tools/cadre/Gemfile.lock +++ b/pkgs/development/tools/cadre/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES cadre (= 1.0.4) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 9f9a160c587f7..8bebc81ebd9fb 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index cd4e1407637a3..796a7743cac5e 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -27,4 +27,4 @@ DEPENDENCIES cddl BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 47346c1bc45a5..ce23018bd738d 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -723,4 +723,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock index 43790d9e7a1e1..ecae8fdd7f624 100644 --- a/pkgs/development/tools/compass/Gemfile.lock +++ b/pkgs/development/tools/compass/Gemfile.lock @@ -28,4 +28,4 @@ DEPENDENCIES compass! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/development/tools/corundum/Gemfile.lock index 40ad1948394f9..596a689e3a2d2 100644 --- a/pkgs/development/tools/corundum/Gemfile.lock +++ b/pkgs/development/tools/corundum/Gemfile.lock @@ -53,4 +53,4 @@ DEPENDENCIES corundum (= 0.6.2) BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index a9a2d073de4ea..82a972144938f 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -31,4 +31,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock index 52c82545bf36f..d0a51c0a06238 100644 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ b/pkgs/development/tools/ejson/Gemfile.lock @@ -51,4 +51,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock index b1b955cba9403..d1f67ddd4747c 100644 --- a/pkgs/development/tools/github-changelog-generator/Gemfile.lock +++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -46,4 +46,4 @@ DEPENDENCIES github_changelog_generator (= 1.14.3) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 210dc101a2458..f703cb707e623 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -100,4 +100,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index 2a95d72c94650..d8331181652ba 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES jsduck BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index aabcd784d8675..04268d3306c24 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES mdl BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index ea31cc3704fa8..db20c8b0ffdce 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index c13c9646393a3..e26b31cbaf0c7 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -54,4 +54,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock index fa157d794f73a..9e3c166400f36 100644 --- a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES watson-ruby BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock index bf88c1bb14832..9a6441e76b896 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock index e6025f50ca153..d76845bc05a76 100644 --- a/pkgs/development/tools/pry/Gemfile.lock +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES pry BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 8c5d369fb3712..870652b567a40 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock index 364bdb778f51f..f789ae87d8d21 100644 --- a/pkgs/development/tools/redis-dump/Gemfile.lock +++ b/pkgs/development/tools/redis-dump/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES redis-dump BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index c2b90f634948d..ff71ebd7a01c2 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 9d166f0fad53a..0e6e3a7f3610d 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 1b99dd3a1361f..9882e1efcc4f7 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock index 546dfabe4d760..08e2fe4e64db5 100644 --- a/pkgs/development/tools/scss-lint/Gemfile.lock +++ b/pkgs/development/tools/scss-lint/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES scss_lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 6fc638615fbfd..a4bb07b76ab55 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index 6f1ba7545a823..c0b9676d27bd2 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.16.4 + 2.1.4 diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 560213897c91f..69cc56a0029aa 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -38,4 +38,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/servers/http/showoff/Gemfile.lock index ccf0415d440b6..34b90b3fd2f73 100644 --- a/pkgs/servers/http/showoff/Gemfile.lock +++ b/pkgs/servers/http/showoff/Gemfile.lock @@ -70,4 +70,4 @@ DEPENDENCIES showoff BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index ed780f6ce4b60..51e1bcc794830 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -35,4 +35,4 @@ DEPENDENCIES riemann-dash (= 0.2.14) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index 2d0b31e999fc7..9b36bb090f62d 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -159,4 +159,4 @@ DEPENDENCIES sensu-plugins-systemd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index e3cfc580fab9f..c8c7a0117e575 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -156,4 +156,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 0832bce6d2eeb..64bc02cafc3cb 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -77,4 +77,4 @@ DEPENDENCIES oxidized-web (= 0.13.1) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/tools/audio/mpdcron/Gemfile.lock index 39df4ddec9f7d..603a9cfdafb12 100644 --- a/pkgs/tools/audio/mpdcron/Gemfile.lock +++ b/pkgs/tools/audio/mpdcron/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock index 1fe903f15088b..5faac2356799f 100644 --- a/pkgs/tools/backup/lvmsync/Gemfile.lock +++ b/pkgs/tools/backup/lvmsync/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lvmsync BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/tools/inputmethods/fusuma/Gemfile.lock index c35e7658d635f..1ca313c6cd54a 100644 --- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ b/pkgs/tools/inputmethods/fusuma/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES fusuma BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock index 0696ba341651d..45a37b5e1ca63 100644 --- a/pkgs/tools/misc/3llo/Gemfile.lock +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES 3llo (= 0.3.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/pkgs/tools/misc/docker-sync/Gemfile.lock index ff7aa6b3f9fc9..4f14b77d0ef08 100644 --- a/pkgs/tools/misc/docker-sync/Gemfile.lock +++ b/pkgs/tools/misc/docker-sync/Gemfile.lock @@ -26,4 +26,4 @@ DEPENDENCIES docker-sync! BUNDLED WITH - 1.16.2 + 2.1.4 diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index e86371aed3ba7..c3e3cb24e83a8 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -129,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock index 42ab916db3e34..accc917e240fa 100644 --- a/pkgs/tools/misc/homesick/Gemfile.lock +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 615eea5a7831d..c3ff0fd210fe9 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -34,4 +34,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index ed48cc5921b03..e01cf81c61e86 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/tools/misc/pws/Gemfile.lock index c9cf6a3157c1d..cad7909e406dd 100644 --- a/pkgs/tools/misc/pws/Gemfile.lock +++ b/pkgs/tools/misc/pws/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES pws BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock index 881b8aefcdf8c..a3e1ea62a8c56 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES riemann-tools BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock index 0aa9ef4e6da8e..9555e08f9715d 100644 --- a/pkgs/tools/misc/t/Gemfile.lock +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES twitter (~> 6.1.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/td/Gemfile.lock b/pkgs/tools/misc/td/Gemfile.lock index 5726611b9af72..b777a8b411aa1 100644 --- a/pkgs/tools/misc/td/Gemfile.lock +++ b/pkgs/tools/misc/td/Gemfile.lock @@ -37,4 +37,4 @@ DEPENDENCIES td BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock index 419c2ae49d31b..aeca8cadf8692 100644 --- a/pkgs/tools/misc/teamocil/Gemfile.lock +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES teamocil BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock index 8109cd96ac23d..0600d6b7eca67 100644 --- a/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/pkgs/tools/networking/maphosts/Gemfile.lock index c456210217e59..3e2332f75ccf8 100644 --- a/pkgs/tools/networking/maphosts/Gemfile.lock +++ b/pkgs/tools/networking/maphosts/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES maphosts BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/pkgs/tools/package-management/elm-github-install/Gemfile.lock index a551368eade1d..5b586256278b9 100644 --- a/pkgs/tools/package-management/elm-github-install/Gemfile.lock +++ b/pkgs/tools/package-management/elm-github-install/Gemfile.lock @@ -36,4 +36,4 @@ DEPENDENCIES elm_install BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index 1045c7b495a04..c8bb7d364132a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -44,4 +44,4 @@ DEPENDENCIES fpm BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock index 28cbcf5a9a667..107e425bc5790 100644 --- a/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 2eaf8aa6c715c..17d160c8dcb0f 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -362,4 +362,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 7a29a18b7c33c..f3ece99b36563 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -56,4 +56,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock index 583fd3b12028a..ebbcd0fdb037a 100644 --- a/pkgs/tools/system/colorls/Gemfile.lock +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES colorls BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock index 8fa9a213ab28c..a2a7824f7aa8a 100644 --- a/pkgs/tools/system/foreman/Gemfile.lock +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES foreman BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/tools/system/hiera-eyaml/Gemfile.lock index 259c2e170b0e9..918df753a3825 100644 --- a/pkgs/tools/system/hiera-eyaml/Gemfile.lock +++ b/pkgs/tools/system/hiera-eyaml/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES hiera-eyaml BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/tools/system/procodile/Gemfile.lock index 7989b7bf1f7f5..f53a07d6657cc 100644 --- a/pkgs/tools/system/procodile/Gemfile.lock +++ b/pkgs/tools/system/procodile/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES procodile BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock index 3ff9b64621563..9f55e273ef258 100644 --- a/pkgs/tools/system/r10k/Gemfile.lock +++ b/pkgs/tools/system/r10k/Gemfile.lock @@ -45,4 +45,4 @@ DEPENDENCIES r10k BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/pkgs/tools/text/bcat/Gemfile.lock index 09108977c7186..cbff494fe8674 100644 --- a/pkgs/tools/text/bcat/Gemfile.lock +++ b/pkgs/tools/text/bcat/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES bcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock index f4f16580c0cc1..b50dc2fdbca02 100644 --- a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock +++ b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES kramdown-rfc2629 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock index 0d1b2a6fbe6d1..37cd23eab6f5b 100644 --- a/pkgs/tools/text/papertrail/Gemfile.lock +++ b/pkgs/tools/text/papertrail/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock index 0ede7e2a25647..94f0f8f506c2c 100644 --- a/pkgs/tools/text/reckon/Gemfile.lock +++ b/pkgs/tools/text/reckon/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES reckon BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 02081e117d6ea..c928e95487547 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -93,4 +93,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock index e1fbc2c944641..423fac6c30a9f 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile.lock +++ b/pkgs/tools/typesetting/docbookrx/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri (~> 1.8.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock index f47f401367c8c..c975e23f323c2 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock +++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES kramdown-asciidoc BUNDLED WITH - 1.17.3 + 2.1.4 -- cgit 1.4.1 From a05f67ea0acdec8bb0fc950a6f15e22486c43de9 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 6 Apr 2020 10:36:42 -0400 Subject: vscode: 1.43.0 -> 1.43.2 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 306bb115ef430..70ba6762b7452 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0i8dmh9w7xgzfjii4m116lavydpfpcp7fxs4bcykf0a779pzwv87"; - x86_64-darwin = "0z0r0dmmzk3k095g7jbrrk9gl1jpb3cai973xrjw17ank1lddcjf"; + x86_64-linux = "1vaga9ykib8b1rp502wpkq5hhsj6a0f0a4akkd3bs6wc4m74ff4g"; + x86_64-darwin = "1dql0pnkqrsdhyz00flksb7mx4ryk7rzgwn359sg55bf8yhyrbfn"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.43.0"; + version = "1.43.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; -- cgit 1.4.1 From 3f75bc2660bc606fad37984cf0512281746c07f5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 6 Apr 2020 10:36:50 -0400 Subject: vscodium: 1.43.0 -> 1.43.2 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ae40a0187def0..390bca4af656c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "139sqaixlcqlpcrn2vkcp9fxvcjgnhn2dwxclxq3bnb814pw7rba"; - x86_64-darwin = "0jkd3p1jqg38z9l22k5w7b45fdnxwrhzlgyhinw7wlqz7zvflkn1"; + x86_64-linux = "1w7vry3lvjf847qbjqc4xv6hcyspki366k8wmyfvzyw6c9m7yzwm"; + x86_64-darwin = "13wg015qsh4qayamd9jppk2abqpnakx2mhf41z3nyb3zfng62pza"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.43.0"; + version = "1.43.2"; pname = "vscodium"; executableName = "codium"; -- cgit 1.4.1 From 20fd05448d5f3b9b149ca38329701939c7448da1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 8 Apr 2020 11:49:27 +0200 Subject: androidStudioPackages.beta: 4.0.0.12 -> 4.0.0.13 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b10ef9513daa5..1134b67a24a67 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; }; betaVersion = { - version = "4.0.0.12"; # "Android Studio 4.0 Beta 3" - build = "193.6296804"; - sha256Hash = "072rvh20xkn7izh6f2r2bspy06jrvcibj2hc12hz76m8cwzf4v0m"; + version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" + build = "193.6348893"; + sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; }; latestVersion = { # canary & dev version = "4.1.0.4"; # "Android Studio 4.1 Canary 4" -- cgit 1.4.1 From 939041bce41291161b90a0b633d82449cc1404aa Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 9 Apr 2020 13:45:38 +0200 Subject: vscode, vscodium: 1.43.2 -> 1.44.0 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 70ba6762b7452..765520ea9a4c5 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1vaga9ykib8b1rp502wpkq5hhsj6a0f0a4akkd3bs6wc4m74ff4g"; - x86_64-darwin = "1dql0pnkqrsdhyz00flksb7mx4ryk7rzgwn359sg55bf8yhyrbfn"; + x86_64-linux = "0q1fk5a4ymndnyxzps8960y1rl657q95i2rydbqyjl37y79wmllx"; + x86_64-darwin = "02ybgp6v1ray4a867hihp2fvc872ilqla6z52qv90dfjx69g77ib"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.43.2"; + version = "1.44.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 390bca4af656c..23a320ccce93f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1w7vry3lvjf847qbjqc4xv6hcyspki366k8wmyfvzyw6c9m7yzwm"; - x86_64-darwin = "13wg015qsh4qayamd9jppk2abqpnakx2mhf41z3nyb3zfng62pza"; + x86_64-linux = "1prv4rzr5z905s6jnmkmd97zr5kz8nn4m9bil483bnx4wqr2k10g"; + x86_64-darwin = "1p0a94i80s7fq6ars01bvr41qxiq35s0r6crfv857ma01g9ia7k3"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.43.2"; + version = "1.44.0"; pname = "vscodium"; executableName = "codium"; -- cgit 1.4.1 From 6fac063e095bdc00cb8642f33dba966ff5ac4a82 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 9 Apr 2020 09:14:40 -0400 Subject: emacsPackages: Add standalone agda-input package that doesn't require building Agda. --- pkgs/applications/editors/emacs-modes/manual-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index c3c21b40a6595..f04319f23de3e 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -52,6 +52,19 @@ }; }; + agda-input = self.trivialBuild { + pname = "agda-input"; + + inherit (external.Agda) src version; + + postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot"; + + meta = { + description = "Standalone package providing the agda-input method without building Agda."; + inherit (external.Agda.meta) homepage license; + }; + }; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; -- cgit 1.4.1 From cdda61ab6938f0a5aa422a34930989e6697214ae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Apr 2020 15:42:03 +0000 Subject: dit: 0.5 -> 0.6 --- pkgs/applications/editors/dit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 2f83b0b8d992a..f973e67599c28 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dit"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc"; + sha256 = "0ryvm54xxkg2gcgz4r8zdxrl6j2h8mgg9nfqmdmdr31qkcj8wjsq"; }; buildInputs = [ ncurses lua ] @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console text editor for Unix that you already know how to use"; - homepage = https://hisham.hm/dit/; + homepage = "https://hisham.hm/dit/"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ davidak ]; -- cgit 1.4.1 From 8f86e3c1a3d6de7a4a6b12fc74c48958d425aade Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Mar 2020 04:23:50 +0000 Subject: leo-editor: 5.7.3 -> 6.2 --- pkgs/applications/editors/leo-editor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index bd433436eb023..40fe3de68655d 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "leo-editor"; - version = "5.7.3"; + version = "6.2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0ri6l6cxwva450l05af5vs1lsgrz6ciwd02njdgphs9pm1vwxbl9"; + sha256 = "07f10qwvi3p7bskzxnx5rlhlfrh7rx8v0xdlc4vs2271438j1j2z"; }; dontBuild = true; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://leoeditor.com; + homepage = "http://leoeditor.com"; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; -- cgit 1.4.1 From e8f668185e472cc1264f338eb3dddefa19e06523 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 9 Apr 2020 10:25:18 -0700 Subject: leo-editor: add qt support --- pkgs/applications/editors/leo-editor/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 40fe3de68655d..971829ab31da6 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,6 +1,6 @@ -{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ lib, mkDerivation, python3, fetchFromGitHub, makeWrapper, wrapQtAppsHook, makeDesktopItem }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "leo-editor"; version = "6.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontBuild = true; - nativeBuildInputs = [ makeWrapper python3 ]; + nativeBuildInputs = [ wrapQtAppsHook makeWrapper python3 ]; propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; desktopItem = makeDesktopItem { @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Leo"; genericName = "Text Editor"; - categories = stdenv.lib.concatStringsSep ";" [ + categories = lib.concatStringsSep ";" [ "Application" "Development" "IDE" "QT" ]; startupNotify = "false"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/html" "application/inf" "text/x-java-source" "application/x-javascript" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" @@ -53,9 +53,11 @@ stdenv.mkDerivation rec { makeWrapper ${python3.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" + + wrapQtApp $out/bin/leo ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://leoeditor.com"; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10d1171b7e16a..8aac6f96ee9e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20286,7 +20286,7 @@ in legit = gitAndTools.legit; - leo-editor = callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; -- cgit 1.4.1 From 63575456aef4aa7781b35022c9c595556b596309 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 9 Apr 2020 10:32:40 -0700 Subject: leo-editor: fix makeDesktopItem categories --- pkgs/applications/editors/leo-editor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/editors') diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 971829ab31da6..f7c6d80dbf1a1 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { desktopName = "Leo"; genericName = "Text Editor"; categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" "QT" + "Application" "Development" "IDE" ]; startupNotify = "false"; mimeType = lib.concatStringsSep ";" [ -- cgit 1.4.1