diff options
141 files changed, 1900 insertions, 1003 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ac912b23a01f..d2519d68fb576 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -690,6 +690,12 @@ fingerprint = "AA4B 8EC3 F971 D350 482E 4E20 0299 AFF9 ECBB 5169"; }]; }; + anhduy = { + email = "vo@anhduy.io"; + github = "voanhduy1512"; + githubId = 1771266; + name = "Vo Anh Duy"; + }; ankhers = { email = "me@ankhers.dev"; github = "ankhers"; @@ -4285,6 +4291,12 @@ githubId = 1436960; name = "Christoph Hrdinka"; }; + hrhino = { + email = "hora.rhino@gmail.com"; + github = "hrhino"; + githubId = 28076058; + name = "Harrison Houghton"; + }; hschaeidt = { email = "he.schaeidt@gmail.com"; github = "hschaeidt"; @@ -9150,6 +9162,16 @@ githubId = 3280280; name = "Ryne Everett"; }; + rytone = { + email = "max@ryt.one"; + github = "rytone"; + githubId = 8082305; + name = "Maxwell Beck"; + keys = [{ + longkeyid = "rsa2048/0xBB3EFA303760A0DB"; + fingerprint = "D260 79E3 C2BC 2E43 905B D057 BB3E FA30 3760 A0DB"; + }]; + }; rzetterberg = { email = "richard.zetterberg@gmail.com"; github = "rzetterberg"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1cfbe7b4b8257..ab42a99486aa1 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -161,6 +161,7 @@ with lib.maintainers; { ekleog ralith mjlbach + dandellion ]; scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; }; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 50403cc319b5f..896a797cefbdd 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -318,13 +318,19 @@ </itemizedlist> </listitem> </itemizedlist> - <itemizedlist spacing="compact"> + <itemizedlist> <listitem> <para> The <literal>antlr</literal> package now defaults to the 4.x release instead of the old 2.7.7 version. </para> </listitem> + <listitem> + <para> + The <literal>libwnck</literal> package now defaults to the 3.x + release instead of the old 2.31.0 version. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index bff791bc85d96..afb1299604111 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -80,6 +80,9 @@ In addition to numerous new and upgraded packages, this release has the followin * The `antlr` package now defaults to the 4.x release instead of the old 2.7.7 version. +* The `libwnck` package now defaults to the 3.x release instead of the + old 2.31.0 version. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index b4fc4bf4b2cce..d5b328afc6cfa 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -10,7 +10,7 @@ let postgresqlPackage = if config.services.postgresql.enable then config.services.postgresql.package else - pkgs.postgresql; + pkgs.postgresql_12; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; @@ -841,6 +841,10 @@ in { assertion = cfg.secrets.jwsFile != null; message = "services.gitlab.secrets.jwsFile must be set!"; } + { + assertion = versionAtLeast postgresqlPackage.version "12.0.0"; + message = "PostgreSQL >=12 is required to run GitLab 14."; + } ]; environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e8c86394831db..a8e06a0cee1e7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -431,6 +431,7 @@ in trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; + txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; ucarp = handleTest ./ucarp.nix {}; diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 21900ee4c0145..01240ef572a68 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -104,6 +104,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : # Exit Sway and verify process exit status 0: machine.succeed("su - alice -c 'swaymsg exit || true'") + machine.wait_until_fails("pgrep -x sway") + # TODO: Sway currently segfaults after "swaymsg exit" but only in this VM test: # machine # [ 104.090032] sway[921]: segfault at 3f800008 ip 00007f7dbdc25f10 sp 00007ffe282182f8 error 4 in libwayland-server.so.0.1.0[7f7dbdc1f000+8000] # machine.wait_for_file("/tmp/sway-exit-ok") diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix new file mode 100644 index 0000000000000..bc3814a713750 --- /dev/null +++ b/nixos/tests/txredisapi.nix @@ -0,0 +1,27 @@ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "txredisapi"; + meta = with pkgs.lib.maintainers; { + maintainers = [ dandellion ]; + }; + + nodes = { + machine = + { pkgs, ... }: + + { + services.redis.enable = true; + services.redis.unixSocket = "/run/redis/redis.sock"; + + environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))]; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("redis") + machine.wait_for_open_port("6379") + + tests = machine.succeed("PYTHONPATH=\"${pkgs.python3Packages.txredisapi.src}\" python -m twisted.trial ${pkgs.python3Packages.txredisapi.src}/tests") + ''; +}) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index fc6c1d55e7060..1a83fe9931ff5 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio, vc, poppler, curl, ilmbase +, openjpeg, opencolorio_1, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras, quazip , python3Packages }: @@ -23,7 +23,7 @@ mkDerivation rec { karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash breeze-icons boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio poppler curl ilmbase + openjpeg opencolorio_1 poppler curl ilmbase qtmultimedia qtx11extras quazip python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index dbcf0fba2988e..1e9540ef95e10 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~martijnbraam"; repo = "megapixels"; rev = version; - sha256 = "0k9a5dpr5z0g7ngbhk4j22sbs1ffxiwg8wmbzgggdc9xvwmkgppr"; + sha256 = "0y56c6vchlzidfmp3a3bdc228vbhy7zaxvmhkyxchfb752yzr0n3"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 771af5133561c..8c9639e3fd52f 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -7,7 +7,7 @@ , libjpeg , libpng , libtiff -, opencolorio +, opencolorio_1 , openexr , robin-map , unzip @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - opencolorio + opencolorio_1 openexr robin-map fmt diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 2461fcc27657a..e5262ab98d0a9 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff -, opencolorio, openexr, unzip +, opencolorio_1, openexr, unzip }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip ]; buildInputs = [ boost ilmbase libjpeg libpng - libtiff opencolorio openexr + libtiff opencolorio_1 openexr ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 2d3c28b2d7150..b9d8b0f9797db 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config ]; - buildInputs = [ glib gtk lua libwnck3 ]; + buildInputs = [ glib gtk lua libwnck ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index cac6c363c3237..9471751844e0e 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -4,7 +4,7 @@ , gobject-introspection , gtk3 , keybinder3 -, libwnck3 +, libwnck , python3Packages , wrapGAppsHook }: @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 - libwnck3 + libwnck keybinder3 ]; diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 7f2b93f149568..16268bc76c735 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck3, libxklavier +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3, libwnck, libxklavier , appindicatorSupport ? true, libayatana-appindicator-gtk3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ gtk3 libwnck3 libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; + buildInputs = [ gtk3 libwnck libxklavier ] ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; configureFlags = lib.optional appindicatorSupport "--enable-appindicator=yes"; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9834e91309da6..bf5fe070cbfea 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.0"; + version = "0.84.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc="; + sha256 = "sha256-ULZa0tepq00v2VHDR3+aYYvRfbxYKcjcltRgRmbVmRA="; }; vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU="; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 07ff7c17f691c..47e310fb7658f 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -5,7 +5,7 @@ , gobject-introspection , gtk3 , itstool -, libwnck3 +, libwnck , keybinder3 , desktop-file-utils , shared-mime-info @@ -34,7 +34,7 @@ buildPythonApplication rec { desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info ]; - buildInputs = [ docutils libwnck3 keybinder3 ]; + buildInputs = [ docutils libwnck keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; # without strictDeps kupfer fails to build: Could not find the python module 'gi.repository.Gtk' diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 83356b9550a04..20648cf7a4c72 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.1.8"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01"; + sha256 = "uFINB8WXFbtI/WMFvqirAygzwK7I/8+8YPeyCd+xQ5w="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index b00ee18d5f331..820eceabb511f 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -5,7 +5,7 @@ , gnome , libnotify , libtool -, libwnck3 +, libwnck , makeWrapper , pkg-config , gsettings-desktop-schemas @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - glib libwnck3 libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib makeWrapper gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index d68601ca6ec76..005d0273466ca 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkg-config, glib, libwnck, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - glib libwnck3 libnotify dbus-glib makeWrapper + glib libwnck libnotify dbus-glib makeWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 2ca4e3203ac1e..71bab089601df 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.11"; + version = "2.3.13"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; rev = "release/${version}"; - sha256 = "sha256-0B41TkTs4sNGYzpMGbsgCLT2ThkP6foeuwLUIzKKGkU="; + sha256 = "sha256-Bi/Cz2T2NdtnJZHav8qvo+gErPsR8Ym7K3KcD5APt6Y="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 30d9533d45306..85e3bb48119c4 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -7,7 +7,7 @@ , glib , gnome , gtk3 -, libwnck3 +, libwnck , libX11 , libXfixes , libXi @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libXi libdbusmenu-gtk3 libgee - libwnck3 + libwnck pango ]; diff --git a/pkgs/development/libraries/libseat/default.nix b/pkgs/applications/misc/seatd/default.nix index bdefb51b50f4e..e07356d0c334d 100644 --- a/pkgs/development/libraries/libseat/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -3,12 +3,13 @@ , meson , ninja , pkg-config +, scdoc , stdenv , systemd }: stdenv.mkDerivation rec { - pname = "libseat"; + pname = "seatd"; version = "0.5.0"; src = fetchFromSourcehut { @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0="; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + outputs = [ "bin" "out" "dev" "man" ]; - buildInputs = [ - systemd - ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; - mesonFlags = [ "-Dserver=disabled" "-Dseatd=disabled" "-Dlogind=enabled"]; + buildInputs = [ systemd ]; + + mesonFlags = [ "-Dlogind=enabled" "-Dbuiltin=enabled" ]; meta = with lib; { description = "A universal seat management library"; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 5d3f2ee4df7e1..7d7df0ae8be87 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.2"; + version = "0.14.3"; src = fetchCrate { inherit pname version; - sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli"; + sha256 = "012wyl6qvwca5r8kqf8j7r50r1lbv802c90m13xb7rqyb6jjfv0m"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq"; + cargoSha256 = "1mgi7hxsn9wajxr78kr3n4g7fa0rwp4riah8dq06cqwjlh0pkfjd"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index 93e56f1df2d0c..c09c9329aab38 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, glib, libwnck3, procps }: +, glib, libwnck, procps }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ glib libwnck3 ]; + buildInputs = [ glib libwnck ]; postInstall = '' wrapProgram $out/bin/xsuspender \ diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 8b3cee86fdfd6..7d5b437b0acd5 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.25.73"; + version = "1.26.67"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "mSK3hT0Rp03Bq0k+NCYo6S5w+eA9SXXxO3Lo7QWrc9U="; + sha256 = "Kg6ExXZYdSkyBoivu9h4blytHN9hOc4bUSuFR+1YZOY="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 22fadca3cb3e6..289f631ee8fb1 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144"; + sha256 = "0qb10w7pn9hiczjjpc0xanmc83p22ngcqcrkjwji5rl0sh8v9ii4"; }; - cargoSha256 = "03g14npkisz159gibhfxj7l36vzm7cvg355hndzpxzvhf5r5yjqg"; + cargoSha256 = "0vhr8qyw4f3lc208mgl1m3z42igkbwly6wcv7g7jrq3c6dcwyhjn"; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 708b5713864f4..2189d1b0ba219 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.6.1"; # Please backport all updates to the stable channel. + version = "5.6.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "00q99r3p49fa5j54h1faxrzxfgz1pkx86b1jg3vi94hddlw3xm9c"; + sha256 = "0cdzww741l4s95n5gq5zx5l3zvxinxbqa9y6wf8wjq7rzn6bwqx3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index acdac346fd3ba..d2cdf20ab87c4 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.3"; + version = "3.2.3"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "1n4l8ks5808d99zj1vj0ck0v1lb9s7iv3ahww7ximbf9iha39pbm"; + sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -23,8 +23,8 @@ mkDerivation rec { meta = with lib; { description = "Free software for Hantek and compatible (Voltcraft/Darkwire/Protek/Acetech) USB digital signal oscilloscopes"; - homepage = "https://github.com/OpenHantek/OpenHantek6022"; - license = licenses.gpl3; + homepage = "https://github.com/OpenHantek/OpenHantek6022"; + license = licenses.gpl3; maintainers = with maintainers; [ baracoder ]; platforms = qtbase.meta.platforms; }; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 2652856511eaf..ba0c2530849a7 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.37"; + version = "1.8.39"; src = fetchPypi { inherit pname version; - sha256 = "0527c65b55652a130c44c131cce5644cc5ac00a3f85edb81899f79f5e3ee16fb"; + sha256 = "sha256-1RXuAiz9i5ZnLtDGQ+o3DNgWJ2FDJGIoelmlDmEzrts="; }; postPatch = '' diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 11bdeeb3bf624..588839b859da6 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , bamf -, libwnck3 +, libwnck , libgee , libgtop , wrapGAppsHook @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pantheon.wingpanel libgee libgtop - libwnck3 + libwnck ]; postPatch = '' diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix new file mode 100644 index 0000000000000..864a9e7c48764 --- /dev/null +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -0,0 +1,27 @@ +{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }: + +mkDerivation rec { + pname = "contour"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "christianparpart"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-P7t+M75ZWjFcGWngcbaurdit6e+pb0ILljimhYqW0NI="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ freetype libGL pcre ]; + + meta = with lib; { + description = "Modern C++ Terminal Emulator"; + homepage = "https://github.com/christianparpart/contour"; + changelog = "https://github.com/christianparpart/contour/blob/HEAD/Changelog.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fortuneteller2k ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 62cb6707c1b23..8c4c6b383d56d 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -9,7 +9,7 @@ , libnotify , libutempter , vte -, libwnck3 +, libwnck }: python3.pkgs.buildPythonApplication rec { @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 keybinder3 libnotify - libwnck3 + libwnck python3 vte ]; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index d23f28470499d..d9ebdbf531242 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/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index f642a7d9afb33..1afee7808978c 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.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8"; + sha256 = "sha256-YS4XuP5V7HLhz6PTwbz4mqVdzRDQvpwwL7oYeQW8Xcs="; }; - cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr"; + cargoSha256 = "sha256-wX7x6SbbEWFBo5HeXTjb3r4IJ2leP4T0nVqf43Bl94k="; nativeBuildInputs = [ installShellFiles ]; 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 210c0ca8c3e7b..3dd241840c702 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.2.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8"; + sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 60596eee4a9e0..87b5273853a5c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.4", - "repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i", + "version": "14.0.1", + "repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.4-ee", + "rev": "v14.0.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.4", - "GITLAB_PAGES_VERSION": "1.39.0", - "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.4" + "GITALY_SERVER_VERSION": "14.0.1", + "GITLAB_PAGES_VERSION": "1.40.0", + "GITLAB_SHELL_VERSION": "13.19.0", + "GITLAB_WORKHORSE_VERSION": "14.0.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index adee2020f6fa1..20f1034fc9083 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 a8e2f3f5a6777..af6a3ce81422e 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 8f189338e6133..4928fae80d9f8 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.4"; + version = "14.0.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0="; + sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY="; }; - 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 c3c742b66695a..91e5217c271d8 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 bdbde4dbde486..704d908033113 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 2eb1d14d0a45a..e9058778ceed3 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.4"; + version = "14.0.1"; 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 14dcc7ab4b170..c7ae514f63773 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' @@ -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 31f362c9f9b46..bbdd48e437e0c 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,8 @@ GEM addressable (~> 2.7) omniauth (~> 1.9) openid_connect (~> 1.2) + gitlab-pg_query (2.0.4) + google-protobuf (>= 3.17.1) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) gitlab-styles (6.2.0) @@ -509,7 +526,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 +632,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 +686,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 +701,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 +753,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) @@ -896,7 +914,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 +939,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 +972,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 +999,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) @@ -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,27 @@ 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-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 +1527,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) @@ -1564,14 +1577,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,11 +1591,10 @@ 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) @@ -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) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f9b174c43f1ce..4814a6f2a1ff6 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,17 @@ }; 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-sidekiq-fetcher = { dependencies = ["sidekiq"]; groups = ["default"]; @@ -2127,10 +2188,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 +2564,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 +2801,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 +2872,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 +3127,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"]; @@ -3810,16 +3872,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 +3999,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 +4020,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 +4169,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 +4224,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 +4239,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 = []; @@ -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 12a350c26ecb3..2af33d3184fcb 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/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 35b7d173257fc..f99b4930870ec 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, substituteAll, python3, gst_all_1, wrapGAppsHook, gobject-introspection -, gtk3, libwnck3, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio +, gtk3, libwnck, keybinder3, intltool, libcanberra-gtk3, libappindicator-gtk3, libpulseaudio , fetchpatch }: python3.pkgs.buildPythonApplication rec { @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.distutils_extra intltool wrapGAppsHook ]; buildInputs = [ - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gtk3 libwnck keybinder3 libappindicator-gtk3 ]; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index bbbcf3d76876b..ea8a801d19544 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, + poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -58,7 +58,7 @@ let sha256 = "tUb6myG03mRieUAfgRZfv5Ap+cLvbpNrLMYCGTiAq8c="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - pango librsvg librevenge libcdr opencolorio libxml2 libzip + pango librsvg librevenge libcdr opencolorio_1 libxml2 libzip poppler imagemagick ]; preConfigure = '' @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg_3 openexr opencolorio openimageio boost libGL + libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL seexpr libraw openjpeg libwebp ]; }) diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 7bacf4138c123..c63011eebc007 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, - qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, + qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { buildInputs = [ ffmpeg-full frei0r - opencolorio + opencolorio_1 qtmultimedia ] ++ lib.optional stdenv.isDarwin CoreFoundation; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix new file mode 100644 index 0000000000000..9ada3351728d8 --- /dev/null +++ b/pkgs/applications/virtualization/lima/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, qemu +, makeWrapper +}: + +buildGoModule rec { + pname = "lima"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "AkihiroSuda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vwAxVBy2SqghxJGscSZ1o1B8EMvQh1fz5CS1YG7Rq2g="; + }; + + vendorSha256 = "sha256-xM9LLh5c5QBrcIptdqiNNp1nU9GcdQvwrCnnyuXWYfE="; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + buildPhase = '' + runHook preBuild + make "VERSION=v${version}" binaries + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r _output/* $out + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + USER=nix $out/bin/limactl validate examples/default.yaml + ''; + + meta = with lib; { + homepage = "https://github.com/AkihiroSuda/lima"; + description = "Linux virtual machines (on macOS, in most cases)"; + license = licenses.asl20; + maintainers = with maintainers; [ anhduy ]; + }; +} + diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 47919c251af18..5a70bcbe3cf68 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -15,12 +15,12 @@ rec { name = last (builtins.split "/" nameOrPath); in - pkgs.runCommandLocal name (if (types.str.check content) then { - inherit content interpreter; - passAsFile = [ "content" ]; - } else { + pkgs.runCommandLocal name (if types.path.check content then { inherit interpreter; contentPath = content; + } else { + inherit content interpreter; + passAsFile = [ "content" ]; }) '' # On darwin a script cannot be used as an interpreter in a shebang but # there doesn't seem to be a limit to the size of shebang and multiple diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix new file mode 100644 index 0000000000000..e9691eaad7d68 --- /dev/null +++ b/pkgs/data/themes/whitesur/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, gnome-themes-extra +, libxml2 +, sassc +, util-linux +}: + +stdenv.mkDerivation rec { + pname = "whitesur-gtk-theme"; + version = "2021-06-23"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "075fw57mv6zadq4dryn8bg2b3vq8inmisq18s758cv53pprxh9hw"; + }; + + nativeBuildInputs = [ + glib + libxml2 + sassc + util-linux + ]; + + buildInputs = [ + gnome-themes-extra # adwaita engine for Gtk2 + ]; + + postPatch = '' + find -name "*.sh" -print0 | while IFS= read -r -d ''' file; do patchShebangs "$file"; done + + # Do not provide `sudo`, as it is not needed in our use case of the install script + substituteInPlace lib-core.sh --replace '$(which sudo)' false + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + ./install.sh --dest $out/share/themes --alt all --theme all + runHook postInstall + ''; + + meta = with lib; { + description = "MacOS Big Sur like theme for Gnome desktops"; + homepage = "https://github.com/vinceliuice/WhiteSur-gtk-theme"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 86d92adbea808..a350c224e8a67 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck, libgtop, pkg-config, python2, gtk2 }: +{ lib, stdenv, fetchurl, gnome_python, librsvg, libwnck2, libgtop, pkg-config, python2, gtk2 }: let inherit (python2.pkgs) python pygtk; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 librsvg libwnck libgtop python ]; + buildInputs = [ gtk2 librsvg libwnck2 libgtop python ]; propagatedBuildInputs = [ gnome_python pygtk ]; # gnome-python-desktop expects that .pth file is already installed by PyGTK diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 50222b386c8e2..7221686320620 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -74,7 +74,7 @@ lib.makeScope pkgs.newScope (self: with self; { glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk-doc gnome-doc-utils rarian + libsoup libwnck2 gtk-doc gnome-doc-utils rarian gvfs # added 2019-09-03 ; diff --git a/pkgs/desktops/gnome/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix index d81b846619417..9c099f65295b9 100644 --- a/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -11,7 +11,7 @@ , at-spi2-core , dbus , gettext -, libwnck3 +, libwnck , adwaita-icon-theme }: @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { adwaita-icon-theme at-spi2-core gtk3 - libwnck3 + libwnck ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 8906ebcddecaf..a777da990d830 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ etu ]; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index d414266a9d9e8..f581017dd5659 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -7,7 +7,7 @@ , gnome-panel , gtk3 , glib -, libwnck3 +, libwnck , libgtop , libnotify , upower @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk3 glib libxml2 - libwnck3 + libwnck libgtop libnotify upower diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 8ab1a87d01cef..2e33be766b86b 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -13,7 +13,7 @@ , itstool , libgweather , libsoup -, libwnck3 +, libwnck , libxml2 , pkg-config , polkit @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { gtk3 libgweather libsoup - libwnck3 + libwnck polkit systemd ]; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 548f893895991..1208f9cd64cfe 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -10,7 +10,7 @@ , gtk2 , libX11 , libfm -, libwnck +, libwnck2 , libXmu , libXpm , cairo @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { gtk2 libX11 libfm - libwnck + libwnck2 libXmu libXpm cairo diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index ccd20a6b875a0..3a34d7af71577 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3 +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { gtk3 gtksourceview3 gnome.gucharmap - libwnck3 + libwnck libgtop libxml2 libnotify diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 9b7a5ae67180f..de452f456a2ce 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libwnck3 + libwnck libfakekey libXtst mate.mate-panel diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 62181418fdfe3..ac5e5376a8e71 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: + libnotify, libwnck, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcanberra-gtk3 libnotify - libwnck3 + libwnck gtk3 ]; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 328fcfd20dee3..cd73408d4c800 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libwnck3 + libwnck librsvg libxml2 gtk3 diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 4527c91eed6b6..fed7dc12629c8 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { gtkmm3 libxml2 libgtop - libwnck3 + libwnck librsvg polkit systemd diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index db6633aa5bdbd..797f62cf8e2fa 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -7,7 +7,7 @@ , dconf , glib , gtk3 -, libwnck3 +, libwnck , libX11 , libXfixes , libXi @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { libXi libdbusmenu-gtk3 libgee - libwnck3 + libwnck pango ]; diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix new file mode 100644 index 0000000000000..b909f2472ad0a --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -0,0 +1,82 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, pkg-config +, meson +, ninja +, python3 +, vala +, desktop-file-utils +, gtk3 +, libxml2 +, libhandy +, webkitgtk +, folks +, libgdata +, sqlite +, granite +, elementary-icon-theme +, evolution-data-server +, appstream +, wrapGAppsHook +, libgee +}: + +stdenv.mkDerivation rec { + pname = "elementary-mail"; + version = "unstable-2021-06-21"; + + repoName = "mail"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = "c64c87fabb31dea8dc388152d5a835401993acf4"; + sha256 = "yEUg1IbYbzOJiklnqR23X+aGVE9j4F9iH8FkmlB15x4="; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + libxml2 + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + elementary-icon-theme + evolution-data-server + folks + granite + gtk3 + libgdata + libgee + libhandy + sqlite + webkitgtk + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with lib; { + description = "Mail app designed for elementary OS"; + homepage = "https://github.com/elementary/mail"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ]; + }; +} diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 82d6a87b10905..5ff368a642ed4 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -49,6 +49,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-feedback = callPackage ./apps/elementary-feedback { }; + elementary-mail = callPackage ./apps/elementary-mail { }; + elementary-music = callPackage ./apps/elementary-music { }; elementary-photos = callPackage ./apps/elementary-photos { }; diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 0c277f3a8439e..6c7e0b2968191 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: +{ mkXfceDerivation, exo, gtk3, libwnck, libXmu }: mkXfceDerivation { category = "apps"; @@ -8,7 +8,7 @@ mkXfceDerivation { sha256 = "sha256-jcICXPtG/7t0U0xqgvU52mjiA8wsyw7JQ0OmNjwA89A="; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libwnck3 libXmu ]; + buildInputs = [ gtk3 libwnck libXmu ]; meta = { description = "Easy to use task manager for Xfce"; diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 80e3b7ed791a9..493a70a75ed0f 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -4,7 +4,7 @@ , libXinerama , libXdamage , libX11 -, libwnck3 +, libwnck , libxfce4ui , libxfce4util , garcon @@ -33,7 +33,7 @@ mkXfceDerivation { libXcomposite libXdamage libXinerama - libwnck3 + libwnck libxfce4ui libxfce4util xfconf diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index 86c1789a1b0e7..417241235b956 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -5,7 +5,7 @@ , gobject-introspection , gtk3 , libdbusmenu-gtk3 -, libwnck3 +, libwnck , libxfce4ui , libxfce4util , tzdata @@ -30,7 +30,7 @@ mkXfceDerivation { garcon libdbusmenu-gtk3 libxfce4ui - libwnck3 + libwnck xfconf tzdata ]; diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index d47dbc9340a0d..27eaf94b25996 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xfce4-session }: +{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck, xfce4-session }: mkXfceDerivation { category = "xfce"; @@ -7,7 +7,7 @@ mkXfceDerivation { sha256 = "sha256-LIRAQ1YAkAHwIzC5NYV/0iFLkAP5V96wuTIrYTGbGy0="; - buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; + buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck xfconf polkit iceauth ]; configureFlags = [ "--with-xsession-prefix=${placeholder "out"}" ]; diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index d47d4769a5666..bc6a19346eceb 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf, libnotify, garcon, thunar }: +{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck, xfconf, libnotify, garcon, thunar }: mkXfceDerivation { category = "xfce"; @@ -12,7 +12,7 @@ mkXfceDerivation { gtk3 libxfce4ui libxfce4util - libwnck3 + libwnck xfconf libnotify garcon diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 179da89a52128..cc998487f1650 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -1,5 +1,5 @@ { mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage -, libstartup_notification, libxfce4ui, libxfce4util, libwnck3 +, libstartup_notification, libxfce4ui, libxfce4util, libwnck , libXpresent, xfconf }: mkXfceDerivation { @@ -19,7 +19,7 @@ mkXfceDerivation { libstartup_notification libxfce4ui libxfce4util - libwnck3 + libwnck libXpresent xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index a44e923d3563f..baba34212fdc2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_46 -, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: +, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { pname = "xfce4-namebar-plugin"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config vala_0_46 wafHook python3 ]; - buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; + buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index bcd43d328e339..8f4751b1737ba 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck3, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 imagemagick - libwnck3 + libwnck libxfce4ui xfce4-panel xfconf diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix index f24a38c82a3a7..8145f1a2af069 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix @@ -2,7 +2,7 @@ , mkXfceDerivation , gtk3 , librsvg -, libwnck3 +, libwnck , libxklavier , garcon , libxfce4ui @@ -25,7 +25,7 @@ mkXfceDerivation { libxfce4ui libxfce4util libxklavier - libwnck3 + libwnck xfce4-panel xfconf ]; diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ec0d8fe5c7271..ac0f3312414e8 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,22 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, clang, chez +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, clang +, chez +, gmp +, zsh }: +# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs + # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { pname = "idris2"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh"; + sha256 = "105jybjf5s0k6003qzfxchzsfcpsxip180bh3mdmi74d464d0h8g"; }; + # We do not add any propagatedNativeBuildInputs because we do not want the + # executables idris2 produces to depend on the nix-store. As such, it is left + # to the user to guarantee chez (or any other codgen dependency) is available + # in the path during compilation of programs with idris2. strictDeps = true; - nativeBuildInputs = [ makeWrapper clang chez ]; - buildInputs = [ chez ]; + nativeBuildInputs = [ makeWrapper clang chez ] + ++ lib.optional stdenv.isDarwin [ zsh ]; + buildInputs = [ gmp ]; prePatch = '' patchShebangs --build tests @@ -26,9 +39,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` - buildFlags = [ "bootstrap-build" "SCHEME=scheme" ]; + buildFlags = [ "bootstrap" "SCHEME=scheme" ]; - checkTarget = "bootstrap-test"; + checkTarget = "test"; # TODO: Move this into its own derivation, such that this can be changed # without having to recompile idris2 every time. @@ -72,7 +85,7 @@ stdenv.mkDerivation rec { description = "A purely functional programming language with first class types"; homepage = "https://github.com/idris-lang/Idris2"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ wchresta ]; + maintainers = with lib.maintainers; [ fabianhjr wchresta ]; inherit (chez.meta) platforms; }; } diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index a2021c836fec1..07d90f9e013eb 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.10"; + version = "1.5.20"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0kiwddq5b0dk63nlifb8bbaimh8inxsbk97nbw2m8qw17gby339g"; + sha256 = "12wa7blf7l4360rfm8fk5x36ij0x1m61wrjrxkvligdavmil5wzd"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 1bbbbd963f687..ef65827fbf2ff 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -21,8 +21,8 @@ let release_version = "13.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "643b6407faf460915679f304420cfbee87c47734"; # When using a Git commit - rev-version = "unstable-2021-06-11"; # When using a Git commit + rev = "1605fce6c3074f8d1dff5a917a1840ffa66abd86"; # When using a Git commit + rev-version = "unstable-2021-06-19"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0b06qqbks20m1cy9g1k8y4w8vh9zcbh9ag2bpk9xgg2xkmbq42az"; + sha256 = "1jf0b9vn4qv5gsvhyg6xsqdkdl4vzn7j4sfcldl8bggcgjmzp0q1"; }; llvm_meta = { diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix new file mode 100644 index 0000000000000..3120426210bfa --- /dev/null +++ b/pkgs/development/compilers/myrddin/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, bison +, binutils +, binutils-unwrapped +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "myrddin"; + version = "0.3.1"; + + src = fetchFromGitHub { + repo = "mc"; + owner = "oridb"; + rev = "r${version}"; + sha256 = "7ImjiG/rIKGPHq3Vh/mftY7pqw/vfOxD3LJeT87HmCk="; + }; + + nativeBuildInputs = [ + bison + pkg-config + makeWrapper + ]; + + postPatch = '' + substituteInPlace mk/c.mk \ + --replace "-Werror" "" + ''; + + buildPhase = '' + make bootstrap + make + ''; + + postInstall = '' + for b in $out/bin/*; do + wrapProgram $b --prefix PATH : $out/bin:${lib.makeBinPath [ binutils ]} + done + ''; + + checkPhase = '' + make check + ''; + + doCheck = true; + + meta = with lib; { + description = "Systems language that is both powerful and fun to use"; + homepage = "https://myrlang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/scala-runners/default.nix b/pkgs/development/compilers/scala-runners/default.nix new file mode 100644 index 0000000000000..e379bf4e38e94 --- /dev/null +++ b/pkgs/development/compilers/scala-runners/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, jre, coursier }: + +stdenv.mkDerivation rec { + pname = "scala-runners"; + version = "unstable-2020-02-02"; + + src = fetchFromGitHub { + repo = pname; + owner = "dwijnand"; + rev = "95e03c9f9de0fe0ab61eeb6dea2a364f9d081d31"; + sha256 = "0mvlc6fxsh5d6gsyak9n3g98g4r061n8pir37jpiqb7z00m9lfrx"; + }; + + installPhase = '' + mkdir -p $out/bin $out/lib + sed -ie "s| cs | ${coursier}/bin/coursier |" scala-runner + cp scala-runner $out/lib + ln -s $out/lib/scala-runner $out/bin/scala + ln -s $out/lib/scala-runner $out/bin/scalac + ln -s $out/lib/scala-runner $out/bin/scalap + ln -s $out/lib/scala-runner $out/bin/scaladoc + ''; + + meta = with lib; { + homepage = "https://github.com/dwijnand/scala-runners"; + description = "An alternative implementation of the Scala distribution's runners"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ hrhino ]; + }; +} diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index faee853808ccb..f1a7420fbce76 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -7,7 +7,7 @@ , which , fetchgit , libgtop -, libwnck3 +, libwnck , glib , vala , pkg-config @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { glib libgtop libstartup_notification - libwnck3 + libwnck ]; patches = [ diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index c431e6e2b3cf1..9018a1bfa218c 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.0"; + version = "2.4.1"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "0z1r0s5s3dr1g4f3ylxfcmy3xb0ax02rw9mg7z8hzh0gxazrpndx"; + sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM="; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; diff --git a/pkgs/development/libraries/libwnck/2.nix b/pkgs/development/libraries/libwnck/2.nix new file mode 100644 index 0000000000000..fd7d80574a7d5 --- /dev/null +++ b/pkgs/development/libraries/libwnck/2.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: + +stdenv.mkDerivation rec { + pname = "libwnck"; + version = "2.31.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; + }; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; + # ?another optional: startup-notification + + configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + + meta = { + description = "A library for creating task lists and pagers"; + homepage = "https://gitlab.gnome.org/GNOME/libwnck"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ johnazoidberg ]; + # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found + # #include <gdk/gdkx.h> + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix deleted file mode 100644 index 425a1bab35504..0000000000000 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, libX11 -, glib -, gtk3 -, pango -, cairo -, libXres -, libstartup_notification -, gettext -, gobject-introspection -, gnome -}: - -stdenv.mkDerivation rec { - pname = "libwnck"; - version = "3.36.0"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - gobject-introspection - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - ]; - - buildInputs = [ - libX11 - libstartup_notification - pango - cairo - libXres - ]; - - propagatedBuildInputs = [ - glib - gtk3 - ]; - - mesonFlags = [ - "-Dgtk_doc=true" - ]; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "${pname}${lib.versions.major version}"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = with lib; { - description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index fd7d80574a7d5..39a1d505b6521 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,30 +1,76 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: +{ lib, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, libX11 +, glib +, gtk3 +, pango +, cairo +, libXres +, libstartup_notification +, gettext +, gobject-introspection +, gnome +}: stdenv.mkDerivation rec { pname = "libwnck"; - version = "2.31.0"; + version = "3.36.0"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; + sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + libX11 + libstartup_notification + pango + cairo + libXres + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; - # ?another optional: startup-notification + propagatedBuildInputs = [ + glib + gtk3 + ]; - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}${lib.versions.major version}"; + versionPolicy = "odd-unstable"; + }; + }; - meta = { - description = "A library for creating task lists and pagers"; - homepage = "https://gitlab.gnome.org/GNOME/libwnck"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ johnazoidberg ]; - # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found - # #include <gdk/gdkx.h> - broken = stdenv.isDarwin; + meta = with lib; { + description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ liff ]; }; } diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix new file mode 100644 index 0000000000000..041ddf8e83710 --- /dev/null +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: + +stdenv.mkDerivation rec { + pname = "opencolorio"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "imageworks"; + repo = "OpenColorIO"; + rev = "v${version}"; + sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; + }; + + outputs = [ "bin" "out" "dev" ]; + + # TODO: Investigate whether git can be dropped: It's only used to apply patches + nativeBuildInputs = [ cmake pkg-config git ]; + + buildInputs = [ lcms2 tinyxml ] ++ lib.optional stdenv.isDarwin boost; + + postPatch = '' + substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" + substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" "" + ''; + + cmakeFlags = [ + "-DUSE_EXTERNAL_LCMS=ON" + "-DUSE_EXTERNAL_TINYXML=ON" + # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 + "-DUSE_EXTERNAL_YAML=OFF" + ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" + ++ lib.optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF"; + + postInstall = '' + mkdir -p $bin/bin; mv $out/bin $bin/ + ''; + + meta = with lib; { + homepage = "https://opencolorio.org"; + description = "A color management framework for visual effects and animation"; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 8908f4866156c..522c8cfa4a139 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,47 +1,49 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, pkg-config, lcms2, tinyxml, git }: +{ + stdenv, lib, fetchFromGitHub, + cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies + + glew, freeglut, # Only required on Linux + Carbon, GLUT, Cocoa, # Only required on Darwin + + pythonBindings ? true, # Python bindings + python3Packages, + + buildApps ? true, # Utility applications + lcms2, openimageio2, openexr, +}: with lib; stdenv.mkDerivation rec { pname = "opencolorio"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "imageworks"; + owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; + sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; }; - outputs = [ "bin" "out" "dev" ]; - - # TODO: Investigate whether git can be dropped: It's only used to apply patches - nativeBuildInputs = [ cmake pkg-config git ]; - - buildInputs = [ lcms2 tinyxml ] ++ optional stdenv.isDarwin boost; - - postPatch = '' - substituteInPlace src/core/CMakeLists.txt --replace "-Werror" "" - substituteInPlace src/pyglue/CMakeLists.txt --replace "-Werror" "" - ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat libyamlcpp ilmbase pystring ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] + ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] + ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; - cmakeFlags = [ - "-DUSE_EXTERNAL_LCMS=ON" - "-DUSE_EXTERNAL_TINYXML=ON" - # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 - "-DUSE_EXTERNAL_YAML=OFF" - ] ++ optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" - ++ optional (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isx86_64) "-DOCIO_USE_SSE=OFF"; + cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ] + ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; - postInstall = '' - mkdir -p $bin/bin; mv $out/bin $bin/ - ''; + # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 + # doCheck = true; meta = with lib; { homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.rytone ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/pystring/default.nix b/pkgs/development/libraries/pystring/default.nix new file mode 100644 index 0000000000000..3a1e64c0b0004 --- /dev/null +++ b/pkgs/development/libraries/pystring/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake }: + +stdenv.mkDerivation rec { + pname = "pystring"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "imageworks"; + repo = "pystring"; + rev = "v${version}"; + sha256 = "1w31pjiyshqgk6zd6m3ab3xfgb0ribi77r6fwrry2aw8w1adjknf"; + }; + + patches = [ + (fetchpatch { + name = "pystring-cmake-configuration.patch"; + url = "https://github.com/imageworks/pystring/commit/4f653fc35421129eae8a2c424901ca7170059370.patch"; + sha256 = "1hynzz76ff4vvmi6kwixsmjswkpyj6s4vv05d7nw0zscj4cdp8k3"; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/imageworks/pystring/"; + description = "A collection of C++ functions which match the interface and behavior of python's string class methods using std::string"; + license = licenses.bsd3; + maintainers = [ maintainers.rytone ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index d0596de443964..45c2fd228f2d4 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, xwayland, libseat +, libpng, ffmpeg, xcbutilrenderutil, xwayland, seatd }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil xwayland libseat + libpng ffmpeg xcbutilrenderutil xwayland seatd ]; postFixup = '' diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b18d1b290f845..92a931bd4bbaf 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -114043,7 +114043,7 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.6.4"; + version = "1.6.5"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.3" diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 5bd768e645103..d2090cda67693 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation { preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; installFlags = "BINDIR=$(out)/bin"; - # passthru.tests = { inherit dose3; }; # To-Do: To be enabled when Dose3 PR is accepted. - meta = with lib; { description = "A library for CUDF format"; homepage = "http://www.mancoosi.org/cudf/"; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix new file mode 100644 index 0000000000000..3397527fd63f3 --- /dev/null +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -0,0 +1,61 @@ +{ lib, buildDunePackage, fetchFromGitLab +, camlzip, ocamlgraph, parmap, re, stdlib-shims +, base64, bz2, ocaml_extlib, cudf +, dpkg, git, ocaml, ounit, python39, python39Packages +}: + +buildDunePackage rec { + pname = "dose3"; + version = "6.1"; + + src = fetchFromGitLab { + owner = "irill"; + repo = "dose3"; + rev = version; + sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI="; + }; + + minimalOCamlVersion = "4.03"; + useDune2 = true; + + buildInputs = [ + parmap + ]; + + propagatedBuildInputs = [ + base64 + bz2 + camlzip + cudf + ocaml_extlib + ocamlgraph + re + stdlib-shims + ]; + + checkInputs = [ + dpkg # Replaces: conf-dpkg + git + ounit + python39 # Replaces: conf-python-3 + python39Packages.pyyaml # Replaces: conf-python3-yaml + ]; + doCheck = false; # Tests are failing. + # To enable tests use: lib.versionAtLeast ocaml.version "4.04"; + + meta = with lib; { + description = "Dose library (part of Mancoosi tools)"; + downloadPage = "https://gitlab.com/irill/dose3/"; + homepage = "http://www.mancoosi.org/software/"; + license = licenses.lgpl3Plus; + longDescription = '' + The dose suite provides libraries for handling package meta-data, and various tools for analyzing package relationships in a large package repository. + * dose-builddebcheck checks, given a collection of source package stanzas and a collection of binary package stanzas of Debian packages, whether the build-dependencies of each source package can be satisfied by the binary packages. + * dose-distcheck checks for every package of a distribution whether it is possible to satisfy its dependencies and conflicts within this distribution. + * ceve, a general metadata parser supporting different input formats (Debian, rpm, and others) and different output formats. + * dose-outdated, a Debian-specific tool for finding packages that are not installable with respect to a package repository, and that can only be made installable again by fixing the package itself. + * dose-challenged, a Debian-specific tool for checking which packages will certainly become uninstallable when some existing package is upgraded to a newer version. + * dose-deb-coinstall, a Debian-specific tool for checking whether a set of packages can be installed all together. + ''; + }; +} diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index e83a791923872..2119474c7bcd2 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, python }: +{ lib +, buildPythonPackage +, fetchPypi +, python +}: buildPythonPackage rec { pname = "bitarray"; - version = "2.1.0"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lyJKGTJezuSaO/TfPuBTHTr5zyiLZ9CJp+9Eo8TqODk="; + sha256 = "1q4p592i3kv2yrgax1g03yz8316rzzydpyfsnmqrbc7ilxrgyjm2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/huisbaasje-client/default.nix b/pkgs/development/python-modules/huisbaasje-client/default.nix index 2ca1768342d4e..a8db5e2abc932 100644 --- a/pkgs/development/python-modules/huisbaasje-client/default.nix +++ b/pkgs/development/python-modules/huisbaasje-client/default.nix @@ -1,33 +1,37 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub , aiohttp +, pytestCheckHook }: buildPythonPackage rec { pname = "huisbaasje-client"; version = "0.1.0"; - disabled = pythonOlder "3.6"; # requires python version >=3.6 + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "6bc02384c37aba01719269b05882572050c80cd9abf98caa38519308e05b7db8"; + src = fetchFromGitHub { + owner = "dennisschroer"; + repo = "huisbaasje-client"; + rev = "v${version}"; + sha256 = "113aymffyz1nki3a43j5cyj87qa0762j38qlz0wd5px7diwjxsfl"; }; propagatedBuildInputs = [ aiohttp ]; - # no tests on PyPI, no tags on GitHub - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "huisbaasje.huisbaasje" ]; meta = with lib; { description = "Client for Huisbaasje"; - homepage = "https://github.com/denniss17/huisbaasje-client"; + homepage = "https://github.com/dennisschroer/huisbaasje-client"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 75de29b233db9..5d4e41c5e5f00 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.41.0"; + version = "0.42.0"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-gtfVZTHeiYamKkcu9n/CJ4O4X1YneY2QB3XZnvtNL3U="; + sha256 = "sha256-WNhhQ3iqqwyYyd+iOQVpsKAAfgJwJBaUR7rmYAEYUxw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix index 1825e1a40d8d2..c58b698a4a468 100644 --- a/pkgs/development/python-modules/imaplib2/default.nix +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -1,22 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "imaplib2"; - version = "2.45.0"; + version = "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "a35b6d88258696e80aabecfb784e08730b8558fcaaa3061ff2c7f8637afbd0b3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "imaplib2"; + rev = "v${version}"; + sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m"; }; - # No tests on PyPI and no tags on GitHub :( - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "imaplib2" ]; meta = with lib; { description = "A threaded Python IMAP4 client"; - homepage = "https://github.com/bcoe/imaplib2"; - # See https://github.com/bcoe/imaplib2/issues/25 - license = licenses.psfl; + homepage = "https://github.com/jazzband/imaplib2"; + license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix new file mode 100644 index 0000000000000..d29946a5685f3 --- /dev/null +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ndms2-client"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "foxel"; + repo = "python_ndms2_client"; + rev = version; + sha256 = "1sc39d10hm1y8xf3gdqzq1akrx94k590l106242j9bvfqyr8lrk9"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ndms2_client" ]; + + meta = with lib; { + description = "Keenetic NDMS 2.x and 3.x client"; + homepage = "https://github.com/foxel/python_ndms2_client"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index ca093ba8e8bb9..f115b2b5c6a7b 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.20"; + version = "0.0.21"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1NnTSO4vO3Ryt4vYD5ZTQGr241GqA2KsGRBVowSTCzM="; + sha256 = "1hf692w44dmalv7hlcpwzbnr6xhvnmdv5nl1jcy2jhiwp89lkhzv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix new file mode 100644 index 0000000000000..0af38e3f8beac --- /dev/null +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage, lib, fetchFromGitHub, libcint, libxc, xcfun, blas +, numpy, scipy, h5py +}: + +buildPythonPackage rec { + pname = "pyscf"; + version = "1.7.6.post1"; + + src = fetchFromGitHub { + owner = "pyscf"; + repo = pname; + rev = "f6c9c6654dd9609c5e467a1edd5c2c076f793acc"; + sha256 = "0xbwkjxxysfpqz72qn6n4a0zr2h6sprbcal8j7kzymh7swjy117w"; + }; + + buildInputs = [ + libcint + libxc + xcfun + blas + ]; + + propagatedBuildInputs = [ + numpy + scipy + h5py + ]; + + PYSCF_INC_DIR="${libcint}:${libxc}:${xcfun}"; + + doCheck = false; + pythonImportsCheck = [ "pyscf" ]; + + meta = with lib; { + description = "Python-based simulations of chemistry framework"; + homepage = "https://github.com/pyscf/pyscf"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix new file mode 100644 index 0000000000000..781363334e13d --- /dev/null +++ b/pkgs/development/python-modules/rflink/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, docopt +, pyserial +, pyserial-asyncio +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rflink"; + version = "0.0.58"; + + src = fetchFromGitHub { + owner = "aequitas"; + repo = "python-rflink"; + rev = version; + sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version=version_from_git()" "version='${version}'" + ''; + + propagatedBuildInputs = [ + async-timeout + docopt + pyserial + pyserial-asyncio + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "rflink.protocol" ]; + + meta = with lib; { + description = "Library and CLI tools for interacting with RFlink 433MHz transceiver"; + homepage = "https://github.com/aequitas/python-rflink"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/txredisapi/default.nix b/pkgs/development/python-modules/txredisapi/default.nix new file mode 100644 index 0000000000000..9d8b268b30b28 --- /dev/null +++ b/pkgs/development/python-modules/txredisapi/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nixosTests, six, twisted }: + +buildPythonPackage rec { + pname = "txredisapi"; + version = "1.4.7"; + + src = fetchFromGitHub { + owner = "IlyaSkriblovsky"; + repo = "txredisapi"; + rev = "1.4.7"; + sha256 = "1f7j3c5l7jcfphvsk7nqmgyb4jaydbzq081m555kw0f9xxak0pgq"; + }; + + propagatedBuildInputs = [ six twisted ]; + + doCheck = false; + pythonImportsCheck = [ "txredisapi" ]; + + passthru.tests.unit-tests = nixosTests.txredisapi; + + meta = with lib; { + homepage = "https://github.com/IlyaSkriblovsky/txredisapi"; + description = "non-blocking redis client for python"; + license = licenses.asl20; + maintainers = with maintainers; [ dandellion ]; + }; +} + diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix index f4741a390ed1f..1dd28af3bf4ce 100644 --- a/pkgs/development/tools/hobbes/default.nix +++ b/pkgs/development/tools/hobbes/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib, libxml2 }: +{ lib, stdenv, fetchFromGitHub, cmake, llvm_12, ncurses, readline, zlib, libxml2 }: stdenv.mkDerivation { - name = "hobbes"; - version = "unstable-2020-05-19"; + pname = "hobbes"; + version = "unstable-2021-04-28"; src = fetchFromGitHub { owner = "morgan-stanley"; repo = "hobbes"; - rev = "3d80a46b44a362a97a6b963a2bf788fd1f67ade1"; - sha256 = "03m915g3283z2nfdr03dj5k76wn917knfqxb0xj3qinbl4cka2p1"; + rev = "737c7ca63516f6b3dca0e659c3de75d4325472d6"; + sha256 = "0fjsmz1sbrp6464mrb9ha7p615w2l2pdldsc2ayvcrvxfyi1r4gj"; }; + # TODO: re-enable Python tests once they work on Python 3 + # currently failing with "I don't know how to decode the primitive type: b'bool'" + postPatch = '' + rm test/Python.C + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ - llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w. + llvm_12 ncurses readline zlib libxml2 ]; - doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R. + doCheck = true; checkTarget = "test"; meta = with lib; { @@ -32,7 +38,7 @@ stdenv.mkDerivation { Hobbes is a a language, embedded compiler, and runtime for efficient dynamic expression evaluation, data storage and analysis. ''; - homepage = "https://github.com/Morgan-Stanley/hobbes"; + homepage = "https://github.com/morganstanley/hobbes"; license = licenses.asl20; maintainers = with maintainers; [ kthielen thmzlt ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index a44b5ed8c767e..3db895f4de01f 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , gnome -, libwnck3 +, libwnck , gobject-introspection , gettext , itstool @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { glib gnome.adwaita-icon-theme gtk3 - libwnck3 + libwnck ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 7b06e720caabb..6ba4eecac480d 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { # Sourcetrail attempts to copy clang headers from the LLVM store path substituteInPlace CMakeLists.txt \ - --replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}' + --replace "\''${LLVM_BINARY_DIR}" '${lib.getLib llvmPackages.clang-unwrapped}' patchShebangs script ln -sf ${installJavaIndexer} script/update_java_indexer.sh diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 36b300b53b757..abaa3354e3748 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -889,16 +889,9 @@ let ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; - ms-python.python = - let - raw-package = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; - in - buildEnv { - name = "vscode-extension-ms-python-python-full"; - paths = [ raw-package self.ms-toolsai.jupyter ]; - }; + ms-python.python = callPackage ./python { + extractNuGet = callPackage ./python/extract-nuget.nix { }; + }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 1b1c61d642c24..86d7b1aa6fa41 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.4", + "version": "1.6.5", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 444f5a681216e..0ef98818dbd17 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,13 +5,15 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.4"; + version = "1.6.5"; + + vscodeExtUniqueId = "${publisher}.${pname}"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M="; + sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k="; }; lldb = callPackage ./lldb.nix {}; @@ -23,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU="; + cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U="; nativeBuildInputs = [ makeWrapper ]; @@ -41,10 +43,10 @@ let nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; -in stdenv.mkDerivation rec { - name = "vscode-extension-${pname}"; - inherit src; - vscodeExtUniqueId = "${publisher}.${pname}"; +in stdenv.mkDerivation { + pname = "vscode-extension-${publisher}-${pname}"; + inherit src version vscodeExtUniqueId; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 34bb5dbc33d53..8511ea3b12ede 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -30,6 +30,9 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) "$src/package.json" \ > build-deps/package.json +# FIXME: vsce@1.93.0 breaks the build. +sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json + # Regenerate nodePackages. cd "$nixpkgs/pkgs/development/node-packages" exec ./generate.sh diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index e925b989028da..300bb499f855a 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.61"; + version = "9.62"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "sha256-2hocOIfxC4OX6OAgE8qmEULg5yyw1zmXQhyi8vTfU0M="; + sha256 = "sha256-LA+ddc2+2pKKJaEozT0LcSBEXsCRDAsp1MEDjtG+d38="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index f510c03d99900..0640316b627a9 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.3"; + version = "2.1.4"; nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "14rcf4xmrmz522z57sm8bb3mn79dqsdwz84rl6id84fgjbwbsp6b"; + sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI="; }; DESTDIR = "$(out)"; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a54ba7d19e335..c17cb8d1714de 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -421,7 +421,7 @@ "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact - "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client + "keenetic_ndms2" = ps: with ps; [ ndms2-client ]; "kef" = ps: with ps; [ aiokef getmac ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput "keyboard_remote" = ps: with ps; [ aionotify evdev ]; @@ -695,7 +695,7 @@ "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; - "rflink" = ps: with ps; [ ]; # missing inputs: rflink + "rflink" = ps: with ps; [ rflink ]; "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e7c358fd74509..e00b355f0c325 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -489,6 +489,7 @@ in with py.pkgs; buildPythonApplication rec { "isy994" "izone" "jewish_calendar" + "keenetic_ndms2" "kira" "kmtronic" "knx" @@ -602,6 +603,7 @@ in with py.pkgs; buildPythonApplication rec { "remote" "rest" "rest_command" + "rflink" "ring" "risco" "rituals_perfume_genie" diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d5fb9e7ed6ee8..6f688996fb048 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, perl, pkg-config, systemd, openssl -, bzip2, zlib, lz4, inotify-tools, pam, libcap +, bzip2, zlib, lz4, inotify-tools, pam, libcap, coreutils , clucene_core_2, icu, openldap, libsodium, libstemmer, cyrus_sasl , nixosTests # Auth modules @@ -27,9 +27,20 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' + postPatch = '' + sed -i -E \ + -e 's!/bin/sh\b!${stdenv.shell}!g' \ + -e 's!([^[:alnum:]/_-])/bin/([[:alnum:]]+)\b!\1${coreutils}/bin/\2!g' \ + -e 's!([^[:alnum:]/_-])(head|sleep|cat)\b!\1${coreutils}/bin/\2!g' \ + src/lib-program-client/test-program-client-local.c + + patchShebangs src/lib-smtp/test-bin/*.sh + sed -i -s -E 's!\bcat\b!${coreutils}/bin/cat!g' src/lib-smtp/test-bin/*.sh + patchShebangs src/config/settings-get.pl - '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system"; + '' + lib.optionalString stdenv.isLinux '' + export systemdsystemunitdir=$out/etc/systemd/system + ''; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; @@ -81,6 +92,8 @@ stdenv.mkDerivation rec { ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; + doCheck = !stdenv.isDarwin; + meta = with lib; { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index c656273114399..1d8c2737b0122 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -60,7 +60,7 @@ buildPythonApplication rec { typing-extensions unpaddedbase64 ] ++ lib.optional enableSystemd systemd - ++ lib.optional enableRedis hiredis; + ++ lib.optionals enableRedis [ hiredis txredisapi ]; checkInputs = [ mock parameterized openssl ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index cc80acd422650..fe7e68566a8d9 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0mw0sizy30slgyd06syd9sqx22dxd08ncqx7srcinj1g7hxylm5z"; + sha256 = "00pd4hm8gj200xagc33a73kdbwykwj4nhi596lybji0k231wylz5"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 50ad9f1e25747..d321a3ca11e0e 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, writeText }: +{ lib, stdenv, fetchurl, writeText }: stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.35.2"; + version = "1.36.1"; src = with lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "07cch4j2lcncfjv71351c1fxh200p83g2ijb3c9x8rv6nzcmiymz"; + sha256 = "0ymda3x58a7ic4bwhbkxc7rskkwn164nplxzq9g4w9qnmwcqnsg6"; }; prePatch = '' diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index d8420d9913699..86c0a7f795b77 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -105,4 +105,18 @@ mkdir "$out" mv document*.svg "$out"/ ''; + + texdoc = runCommandNoCC "texlive-test-texdoc" { + nativeBuildInputs = [ + (with texlive; combine { + inherit scheme-infraonly luatex texdoc; + pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; + }) + ]; + } '' + texdoc --version + + texdoc --debug --list texdoc | tee "$out" + grep texdoc.pdf "$out" + ''; } diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 7b3aa397fc351..0939584fa9704 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.1.4"; + version = "2.2.1"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1nk46s1s8yrlqv37sc7la05nnn7sdgqhkrcdm98qin34llwkv70x"; + sha256 = "0whs1bqnn1fgzrq7y2w1d06ldvfafq6h2xzmcfncbwmyb4i0mhgw"; }; nativeBuildInputs = [ @@ -27,18 +27,6 @@ in stdenv.mkDerivation rec { ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; - patches = [ - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/blueman-project/blueman/commit/ae2be5a70cdea1d1aa0e3ab1c85c1d3a0c4affc6.patch"; - sha256 = "0nb6jzlxhgjvac52cjwi0pi40b8v4h6z6pwz5vkyfmaj86spygg3"; - excludes = [ - "meson.build" - "Dependencies.md" - ]; - }) - ]; - postPatch = lib.optionalString withPulseAudio '' sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py ''; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index a0d659efb3e86..1436aacad0995 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, guile, eigen, libpng, python, libGLU, qt4, openexr, openimageio, -opencolorio, xercesc, ilmbase, osl, seexpr, makeWrapper +opencolorio_1, xercesc, ilmbase, osl, seexpr, makeWrapper }: let boost_static = boost165.override { @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ boost_static guile eigen libpng python - libGLU qt4 openexr openimageio opencolorio xercesc + libGLU qt4 openexr openimageio opencolorio_1 xercesc osl seexpr ]; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 7da185050fb1a..4e278b8cc6201 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -1,4 +1,4 @@ -{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck3, +{fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 gobject-introspection wrapGAppsHook ]; + buildInputs = [ pythonEnv gtk3 libwnck gobject-introspection wrapGAppsHook ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 0c8bb068ca6e2..d0bd0c76a839b 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, util-linux, coreutils}: stdenv.mkDerivation rec { - version = "6.42"; + version = "6.44"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "1x47ydrwawkic5cgzp0ikd99g1hbpzc2aalq9z630vm13yw2adnp"; + sha256 = "sha256-+iQr7T99X/jYYgq0xNHLPCJG5mZU/6dN76Z1FB51Z54="; }; installPhase = '' diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index f5b0875e6ffb7..341e1c13335c3 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0ky4zfmxzgxidsizfj2lwm5z3zl666khw9cgsxfgbzn3cjgr33c3"; + sha256 = "1avbd0ldmzzkfay2pm6b88aln388cj8z7dzyw6i8m5k0lmmmmz9y"; }; - vendorSha256 = "0ddni8hl8fv0m9kinwfnhcj3k51fk8h61yksv7ws6agdx0bl1rwh"; + vendorSha256 = "0cd6h5d4yjn86q296qp6lgxcykci1233s4s2fp8m0l3ywss69fck"; doCheck = false; diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 18f87f8c1e141..7c3e58634275f 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-WUaDL1bMZ7rjlwyaqZraIKSrxj68PZiuIpgZN8l8nIo="; + sha256 = "sha256-selmBW6GlfzKbVHz7EgmUB8n567NS08gwkRB9Y+Px8s="; }; - vendorSha256 = "sha256-yk94jD8gwgmEroxg7vzfaISVakMv3+tUoq+Auas751w="; + vendorSha256 = "sha256-q0cTFYepq7odZSACNuUoz6kjT7sE38Pv6B113w2gpIQ="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index f42a1ec96f432..a45a57eff0bf1 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, bison, flex}: stdenv.mkDerivation rec { - version = "2.4.1"; + version = "2.4.2"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7"; + sha256 = "1s1prqdbxjrd1n3j4x8ggy9gl2j0ax6xhkzcvyzajw7awmvbfw17"; }; doCheck = true; diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/tools/system/cm-rgb/default.nix index 47fdba50c5e8a..3a6c7c6e57c50 100644 --- a/pkgs/tools/system/cm-rgb/default.nix +++ b/pkgs/tools/system/cm-rgb/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "cm-rgb"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "gfduszynski"; repo = pname; rev = "v${version}"; - sha256 = "04brldaa2zpvzkcg43i5hpbj03d1nqrgiplm5nh4shn12cif19ag"; + sha256 = "sha256-m0ZAjSLRzcjzygLEbvCiDd7krc1gRqTg1ZV4H/o2c68="; }; nativeBuildInputs = [ @@ -37,10 +37,6 @@ buildPythonApplication rec { ]; postInstall = '' - # Remove this line when/if this PR gets merged: - # https://github.com/gfduszynski/cm-rgb/pull/43 - install -m0755 scripts/cm-rgb-gui $out/bin/cm-rgb-gui - mkdir -p $out/etc/udev/rules.d echo 'SUBSYSTEM=="usb", ATTR{idVendor}=="2516", ATTR{idProduct}=="0051", TAG+="uaccess"' \ > $out/etc/udev/rules.d/60-cm-rgb.rules @@ -51,7 +47,7 @@ buildPythonApplication rec { longDescription = '' cm-rgb controls AMD Wraith Prism RGB LEDS. - To permit non-root accounts to change use this utility on + To permit non-root accounts to use this utility on NixOS, add this package to <literal>services.udev.packages</literal> in <filename>configuration.nix</filename>. ''; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index fc4ea8d6b3311..b108c9dd3d166 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.26"; + version = "3.27"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-/Si0McndJ6Xp3ifDr+BStv89LmZyAgof95QkHGT8MGQ="; + sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw="; }; buildInputs = [ python3 zlib ] diff --git a/pkgs/tools/system/plan9port/darwin-cfframework.patch b/pkgs/tools/system/plan9port/darwin-cfframework.patch deleted file mode 100644 index 01541af92e370..0000000000000 --- a/pkgs/tools/system/plan9port/darwin-cfframework.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d1f0bd3de7d3d54523aeefd9731ea850d20eaab4 Mon Sep 17 00:00:00 2001 -From: Jason Felice <jason.m.felice@gmail.com> -Date: Tue, 2 Jul 2019 13:19:23 -0400 -Subject: [PATCH] Need CoreFoundation - ---- - src/cmd/devdraw/cocoa-screen.m | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/cmd/devdraw/cocoa-screen.m b/src/cmd/devdraw/cocoa-screen.m -index 97128da2..0e380dd3 100644 ---- a/src/cmd/devdraw/cocoa-screen.m -+++ b/src/cmd/devdraw/cocoa-screen.m -@@ -56,6 +56,7 @@ - #endif - - AUTOFRAMEWORK(Cocoa) -+AUTOFRAMEWORK(CoreFoundation) - - #define LOG if(0)NSLog - #define panic sysfatal --- -2.21.0 - diff --git a/pkgs/tools/system/plan9port/darwin-sw_vers.patch b/pkgs/tools/system/plan9port/darwin-sw_vers.patch deleted file mode 100644 index 3e61c83e5403e..0000000000000 --- a/pkgs/tools/system/plan9port/darwin-sw_vers.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d21d082275f04f88eabcc8ecdb03ee932c71ebf1 Mon Sep 17 00:00:00 2001 -From: Jason Felice <jason.m.felice@gmail.com> -Date: Mon, 1 Jul 2019 15:23:19 -0400 -Subject: [PATCH 2/3] Build for 10.12 - ---- - bin/osxvers | 3 +-- - src/cmd/devdraw/mkwsysrules.sh | 4 ++-- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/bin/osxvers b/bin/osxvers -index 4af44da2..3be7e6e9 100755 ---- a/bin/osxvers -+++ b/bin/osxvers -@@ -2,6 +2,5 @@ - - u=`uname` - case "$u" in --Darwin) -- sw_vers | awk '$1 == "ProductVersion:" {print $2}' | awk -F. '{printf("CFLAGS=$CFLAGS -DOSX_VERSION=%d%02d%02d\n", $1, $2, $3)}' -+Darwin) printf 'CFLAGS=$CFLAGS -DOSX_VERSION=101200\n';; - esac -diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh -index e94afbd3..40e632db 100644 ---- a/src/cmd/devdraw/mkwsysrules.sh -+++ b/src/cmd/devdraw/mkwsysrules.sh -@@ -22,7 +22,7 @@ fi - - if [ "x$WSYSTYPE" = "x" ]; then - if [ "x`uname`" = "xDarwin" ]; then -- if sw_vers | grep 'ProductVersion: 10\.[0-5]\.' >/dev/null; then -+ if false; then - echo 1>&2 'OS X 10.5 and older are not supported' - exit 1 - else -@@ -54,7 +54,7 @@ if [ $WSYSTYPE = x11 ]; then - XO=`ls x11-*.c 2>/dev/null | sed 's/\.c$/.o/'` - echo 'WSYSOFILES=$WSYSOFILES '$XO - elif [ $WSYSTYPE = osx-cocoa ]; then -- if sw_vers|awk '/ProductVersion/{split($2,a,".");exit(a[2]<14)}' >/dev/null; then # 0 is true in sh. -+ if false; then - echo 'OBJCFLAGS=$OBJCFLAGS -fobjc-arc' - echo 'WSYSOFILES=$WSYSOFILES osx-draw.o cocoa-screen-metal-objc.o cocoa-srv.o cocoa-thread.o' - else --- -2.21.0 - diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 2b0df3c893ea8..78db6e2037eed 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -11,20 +11,15 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "2020-01-08"; + version = "2021-04-22"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e"; - sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g"; + rev = "70cc6e5ba7798b315c3fb3aae19620a01604a459"; + hash = "sha256-HCn8R9YSocHrpw/xK5n8gsCLSAbAQgw0NtjO9vYIbKo="; }; - patches = [ - ./darwin-sw_vers.patch - ./darwin-cfframework.patch - ]; - postPatch = '' #hardcoded path substituteInPlace src/cmd/acme/acme.c \ @@ -86,10 +81,16 @@ stdenv.mkDerivation { Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs from their native Plan 9 environment to Unix-like operating systems. ''; - license = licenses.lpl-102; - maintainers = with maintainers; [ AndersonTorres bbarker - ftrvxmtrx kovirobi ]; + license = licenses.mit; + maintainers = with maintainers; [ + AndersonTorres + bbarker + ehmry + ftrvxmtrx + kovirobi + ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } # TODO: investigate the mouse chording support patch diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index a0f3ad1c5e37f..93c2e64530998 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -27,6 +27,6 @@ buildPythonApplication rec { homepage = "https://www.transifex.com/"; license = licenses.gpl2; description = "Transifex translation service client"; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 3209ccf6029f5..9cbf9ac7e2f93 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -1,26 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform -, darwin, fontconfig, harfbuzz, openssl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +, fontconfig +, harfbuzz +, openssl +, pkg-config +, makeWrapper +, biber +}: rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; fetchSubmodules = true; - sha256 = "11q0vwgjlailkw4l9z7r54wkxi8dwh40pm7bd74dcvm0x4323fpd"; + sha256 = "sha256-CMvT9DouwERhDtBsLDesxN/QgEEfXLgtJaQLjq+SzOI="; }; - cargoSha256 = "1drfgrsfz44yqz15bcmb3dyyz7dr9zbs3idl1ssaiir24d4z1m9z"; + cargoSha256 = "sha256-zGsb49yt6SRFfvNHZY+RpjihGpV9ziLsg9BII7WTX2Y="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); - postInstall = lib.optionalString stdenv.isLinux '' + # Tectonic runs biber when it detects it needs to run it, see: + # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 + postInstall = '' + wrapProgram $out/bin/tectonic \ + --prefix PATH "${lib.getBin biber}/bin" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace dist/appimage/tectonic.desktop \ + --replace Exec=tectonic Exec=$out/bin/tectonic install -D dist/appimage/tectonic.desktop -t $out/share/applications/ install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/ ''; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index f7bd02d8af537..c21a5dda994ab 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -7,6 +7,7 @@ , makeWrapper, python3, ruby, perl , useFixedHashes ? true , recurseIntoAttrs +, fetchpatch }: let # various binaries (compiled) @@ -56,6 +57,37 @@ let collection-plaingeneric = orig.collection-plaingeneric // { deps = orig.collection-plaingeneric.deps // { inherit (tl) xdvi; }; }; + + texdoc = orig.texdoc // { + # build Data.tlpdb.lua (part of the 'tlType == "run"' package) + postUnpack = let + # commit that ensures reproducibility of Data.tlpdb.lua + # remove on the next texdoc update + reproPatch = fetchpatch { + name = "make-data-tlpdb-lua-reproducible.patch"; + url = "https://github.com/TeX-Live/texdoc/commit/82aff83d5453a887c1117b9e771a98bddd8a605a.patch"; + sha256 = "0y04y468i7db4p5bsyyhgzip8q4fi1756x9a15ndha9xfnasbf44"; + stripLen = 2; + extraPrefix = "scripts/texdoc/"; + }; + in '' + if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then + patch -p1 -d "$out" < "${reproPatch}" + + unxz --stdout "${tlpdb}" > texlive.tlpdb + + # create dummy doc file to ensure that texdoc does not return an error + mkdir -p support/texdoc + touch support/texdoc/NEWS + + TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$out" TEXDOCS=. TEXMFVAR=. \ + "${bin.luatex}"/bin/texlua "$out"/scripts/texdoc/texdoc.tlu \ + -c texlive_tlpdb=texlive.tlpdb -lM texdoc + + cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua + fi + ''; + }; }); # overrides # tl = @@ -93,6 +125,16 @@ let day = "08"; }; + tlpdb = fetchurl { + # use the same mirror(s) as urlPrefixes below + urls = [ + #"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/tlpkg/texlive.tlpdb.xz" + #"ftp://tug.org/texlive/historic/2019/tlnet-final/tlpkg/texlive.tlpdb.xz" + "https://texlive.info/tlnet-archive/${snapshot.year}/${snapshot.month}/${snapshot.day}/tlnet/tlpkg/texlive.tlpdb.xz" + ]; + sha512 = "1dsj4bza84g2f2z0w31yil3iwcnggcyg9f1xxwmp6ljk5xlzyr39cb556prx9691zbwpbrwbb5hnbqxqlnwsivgk0pmbl9mbjbk9cz0"; + }; + # create a derivation that contains an unpacked upstream TL package mkPkg = { pname, tlType, revision, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args: let diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix index 999f5cc93fc87..d7182086f9aee 100644 --- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix +++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix @@ -729,7 +729,7 @@ "texdiff.doc-0.4"="r9wsmivjyiwdnav7qc35kydk9b8pbcz8"; "texdirflatten-1.3"="135358h2mb608wg3ni93rrsvvqgxm4ya"; "texdirflatten.doc-1.3"="n9jxdwjiylvwy6n55vgci9a32qi10xhl"; -"texdoc-3.3"="3sjc6kp2l1p97qnhqqby5qcahcfj8irf"; +"texdoc-3.3"="zybis3ds27vzr62qsvkmph787jb12msz"; "texdoc.doc-3.3"="ri2jcsh0ja8wmjs9y9692m0zc0z8gxvi"; "texdoctk-0.6.0"="p6c2lakbnbg1wdc7i4iavscn9k0xamw5"; "texdoctk.doc-0.6.0"="xfl4g9m6d9nbn4f9hgxj58jg9g4laa7l"; diff --git a/pkgs/tools/wayland/kanshi/default.nix b/pkgs/tools/wayland/kanshi/default.nix index c661c98a24bbe..6373af70b2e88 100644 --- a/pkgs/tools/wayland/kanshi/default.nix +++ b/pkgs/tools/wayland/kanshi/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92"; + sha256 = "sha256-RVMeS2qEjTYK6r7IwMeFSqfRpKR8di2eQXhewfhTnYI="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cc4d33024b0bb..f820eef45d04e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -409,6 +409,7 @@ mapAliases ({ libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 librecad2 = librecad; # backwards compatibility alias, added 2015-10 + libseat = seatd; # added 2021-06-24 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 libtxc_dxtn = throw "libtxc_dxtn was removed 2020-03-16, now integrated in Mesa"; @@ -419,6 +420,7 @@ mapAliases ({ libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 + libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a005df9e60b46..7cb7d00ea09a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -622,6 +622,7 @@ in }; mkShell = callPackage ../build-support/mkshell { }; + mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; }; nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacs.pkgs) inherit-local; }; @@ -915,6 +916,8 @@ in archi = callPackage ../tools/misc/archi { }; + contour = libsForQt5.callPackage ../applications/terminal-emulators/contour { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; eterm = callPackage ../applications/terminal-emulators/eterm { }; @@ -8117,6 +8120,8 @@ in pywal = with python3Packages; toPythonApplication pywal; + pystring = callPackage ../development/libraries/pystring {}; + rbw = callPackage ../tools/security/rbw { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12014,6 +12019,10 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.x.nix { majorVersion = "2.13"; jre = jdk8; }; scala = scala_2_13; + scala-runners = callPackage ../development/compilers/scala-runners/default.nix { + coursier = coursier.override { jre = jdk8; }; + jre = jdk8; + }; metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; @@ -16853,8 +16862,6 @@ in libsearpc = callPackage ../development/libraries/libsearpc { }; - libseat = callPackage ../development/libraries/libseat { }; - libsigcxx = callPackage ../development/libraries/libsigcxx { }; libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { }; @@ -17070,9 +17077,8 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = libwnck2; - libwnck2 = callPackage ../development/libraries/libwnck { }; - libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; + libwnck = callPackage ../development/libraries/libwnck { }; + libwnck2 = callPackage ../development/libraries/libwnck/2.nix { }; libwpd = callPackage ../development/libraries/libwpd { }; @@ -17574,7 +17580,10 @@ in openldap = callPackage ../development/libraries/openldap { }; - opencolorio = callPackage ../development/libraries/opencolorio { }; + opencolorio = callPackage ../development/libraries/opencolorio { + inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; + }; + opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; opendmarc = callPackage ../development/libraries/opendmarc { }; @@ -22285,6 +22294,8 @@ in mustache-hpp = callPackage ../development/libraries/mustache-hpp { }; + myrddin = callPackage ../development/compilers/myrddin { }; + myrica = callPackage ../data/fonts/myrica { }; nafees = callPackage ../data/fonts/nafees { }; @@ -22666,6 +22677,8 @@ in weather-icons = callPackage ../data/fonts/weather-icons { }; + whitesur-gtk-theme = callPackage ../data/themes/whitesur { }; + whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; wireless-regdb = callPackage ../data/misc/wireless-regdb { }; @@ -26628,6 +26641,8 @@ in seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seatd = callPackage ../applications/misc/seatd { }; + secretscanner = callPackage ../tools/security/secretscanner { }; semiphemeral = callPackage ../tools/misc/semiphemeral { }; @@ -30742,6 +30757,8 @@ in idsk = callPackage ../tools/filesystems/idsk { }; + lima = callPackage ../applications/virtualization/lima {}; + logtop = callPackage ../tools/misc/logtop { }; igraph = callPackage ../development/libraries/igraph { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 43bc9ba031853..efe1808b9229e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -278,6 +278,8 @@ let domain-name = callPackage ../development/ocaml-modules/domain-name { }; + dose3 = callPackage ../development/ocaml-modules/dose3 { }; + dtoa = callPackage ../development/ocaml-modules/dtoa { }; duff = callPackage ../development/ocaml-modules/duff { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index db2359def2bd5..36efc12582cc0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8930,7 +8930,7 @@ let url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; - buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; + buildInputs = [ pkgs.libwnck2 pkgs.glib pkgs.gtk2 ]; propagatedBuildInputs = [ Gtk2 ]; meta = { description = "Perl interface to the Window Navigator Construction Kit"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b025b02f70d72..8a12c1556ab10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4684,6 +4684,8 @@ in { ndjson = callPackage ../development/python-modules/ndjson { }; + ndms2-client = callPackage ../development/python-modules/ndms2-client { }; + ndspy = callPackage ../development/python-modules/ndspy { }; ndtypes = callPackage ../development/python-modules/ndtypes { }; @@ -6459,6 +6461,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyscf = callPackage ../development/python-modules/pyscf { }; + pyschedule = callPackage ../development/python-modules/pyschedule { }; pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; @@ -7498,6 +7502,8 @@ in { rfcat = callPackage ../development/python-modules/rfcat { }; + rflink = callPackage ../development/python-modules/rflink { }; + rich = callPackage ../development/python-modules/rich { }; rig = callPackage ../development/python-modules/rig { }; @@ -8711,6 +8717,8 @@ in { txgithub = callPackage ../development/python-modules/txgithub { }; + txredisapi = callPackage ../development/python-modules/txredisapi { }; + txrequests = callPackage ../development/python-modules/txrequests { }; txtorcon = callPackage ../development/python-modules/txtorcon { }; |