From 0086b03be56c06569eb5524e3913196c8ed96325 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 13 Oct 2019 12:49:56 +0100 Subject: [PATCH 01/76] openmpt123: 0.4.1 -> 0.4.9 (security?) addressing CVE-2019-17113 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index c9d69b5c7f2..08c5c1a5c36 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.1"; + version = "0.4.9"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1k1m1adjh4s2q9lxgkf836k5243akxrzq1hsdjhrkg4idd3pxzp4"; + sha256 = "02kjwwh9d9i4rnfzqzr18pvcklc46yrs9mvdmjqx7kxg3c28hkqm"; }; enableParallelBuilding = true; From c43c6cbabf85908dc97c802fdad4657849157793 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:24:17 -0400 Subject: [PATCH 02/76] gnome3.gnome-online-accounts: 3.34.0 -> 3.34.1 --- pkgs/development/libraries/gnome-online-accounts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 82847853588..387a00876ed 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -6,13 +6,13 @@ let pname = "gnome-online-accounts"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mvz6wrw03zyp5sm46znkipncagb257xam29mfi06ixmxvjbqky4"; + sha256 = "0fkqckqkkah5k1xrfqjkk4345aq9c0a6yyvfczy9g96k927clcj8"; }; outputs = [ "out" "man" "dev" "devdoc" ]; From df4170f85347836b38fdb1315dde6c5bf63f8cfb Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:27:43 -0400 Subject: [PATCH 03/76] gnome-online-accounts: format, meta attributes --- .../gnome-online-accounts/default.nix | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 387a00876ed..bef4fbfe73d 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook -, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking -, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos +{ stdenv +, fetchurl +, pkgconfig +, vala +, glib +, libxslt +, gtk3 +, wrapGAppsHook +, webkitgtk +, json-glib +, librest +, libsecret +, gtk-doc +, gobject-introspection +, gettext +, icu +, glib-networking +, libsoup +, docbook_xsl +, docbook_xml_dtd_412 +, gnome3 +, gcr +, kerberos }: -let +stdenv.mkDerivation rec { pname = "gnome-online-accounts"; version = "3.34.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; @@ -26,15 +43,30 @@ in stdenv.mkDerivation rec { "--enable-documentation" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ - pkgconfig gobject-introspection vala gettext wrapGAppsHook - libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc + docbook_xml_dtd_412 + docbook_xsl + gettext + gobject-introspection + gtk-doc + libxslt + pkgconfig + vala + wrapGAppsHook ]; + buildInputs = [ - glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup - gcr kerberos + gcr + glib + glib-networking + gtk3 + icu + json-glib + kerberos + librest + libsecret + libsoup + webkitgtk ]; passthru = { @@ -45,7 +77,10 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Projects/GnomeOnlineAccounts"; + description = "Single sign-on framework for GNOME"; platforms = platforms.linux; + license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; }; } From 5366676eba2713a27c9854926d652cd731ffb1f2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 16 Oct 2019 16:52:33 -0400 Subject: [PATCH 04/76] gnome3.gnome-online-accounts: build with meson Have to fetch from gitlab as it's not distributed yet. See [0] and [1]. [0]: https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/2#note_271132 [1]: https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 --- .../gnome-online-accounts/default.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index bef4fbfe73d..adbb714c7b2 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -1,11 +1,13 @@ { stdenv -, fetchurl +, fetchFromGitLab , pkgconfig , vala , glib +, meson +, ninja +, python3 , libxslt , gtk3 -, wrapGAppsHook , webkitgtk , json-glib , librest @@ -21,36 +23,46 @@ , gnome3 , gcr , kerberos +, gvfs +, dbus +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gnome-online-accounts"; version = "3.34.1"; - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0fkqckqkkah5k1xrfqjkk4345aq9c0a6yyvfczy9g96k927clcj8"; + # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-online-accounts"; + rev = version; + sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm"; }; outputs = [ "out" "man" "dev" "devdoc" ]; - configureFlags = [ - "--enable-media-server" - "--enable-kerberos" - "--enable-lastfm" - "--enable-todoist" - "--enable-gtk-doc" - "--enable-documentation" + mesonFlags = [ + "-Dfedora=false" # not useful in NixOS or for NixOS users. + "-Dgtk_doc=true" + "-Dlastfm=true" + "-Dman=true" + "-Dmedia_server=true" ]; nativeBuildInputs = [ + dbus # used for checks and pkgconfig to install dbus service/s docbook_xml_dtd_412 docbook_xsl gettext gobject-introspection gtk-doc libxslt + meson + ninja pkgconfig + python3 vala wrapGAppsHook ]; @@ -60,6 +72,7 @@ stdenv.mkDerivation rec { glib glib-networking gtk3 + gvfs # OwnCloud, Google Drive icu json-glib kerberos @@ -69,6 +82,13 @@ stdenv.mkDerivation rec { webkitgtk ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; From 0cc52485e2b0dc497986385a8a1db0c119114e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 20 Oct 2019 21:57:53 +0200 Subject: [PATCH 05/76] gir-rs: init at 2019-10-16 --- pkgs/development/tools/gir/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/gir/default.nix diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix new file mode 100644 index 00000000000..b8dbda2a1f8 --- /dev/null +++ b/pkgs/development/tools/gir/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "gir"; + version = "2019-10-16"; + + src = fetchFromGitHub { + owner = "gtk-rs"; + repo = "gir"; + rev = "241d790085a712db7436c5c25b210ccb7d1a08d5"; + sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr"; + }; + + cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb"; + + meta = with stdenv.lib; { + description = "Tool to generate rust bindings and user API for glib-based libraries"; + homepage = https://github.com/gtk-rs/gir/; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 562ffa3c743..de5ec41d338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1697,6 +1697,8 @@ in gif-for-cli = callPackage ../tools/misc/gif-for-cli { }; + gir-rs = callPackage ../development/tools/gir { }; + gist = callPackage ../tools/text/gist { }; gixy = callPackage ../tools/admin/gixy { }; From 05ebf348bcbf728a5a30b402180a058fa82e41f0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 20:30:42 -0400 Subject: [PATCH 06/76] deepin.deepin-wm: remove Upstream has deprecated this package. And it's currently broken. --- pkgs/desktops/deepin/deepin-wm/default.nix | 75 ---------------------- pkgs/desktops/deepin/default.nix | 3 - 2 files changed, 78 deletions(-) delete mode 100644 pkgs/desktops/deepin/deepin-wm/default.nix diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix deleted file mode 100644 index 13b115e7042..00000000000 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - dbus, bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, - libwnck3, deepin-menu, deepin-mutter, deepin-wallpapers, - deepin-desktop-schemas, wrapGAppsHook, deepin }: - -stdenv.mkDerivation rec { - pname = "deepin-wm"; - version = "1.9.38"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1qhdnv4x78f0gkr94q0j8x029fk9ji4m9jdipgrdm83pnahib80g"; - }; - - nativeBuildInputs = [ - pkgconfig - intltool - libtool - vala - gnome3.gnome-common - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - bamf - clutter-gtk - dbus - deepin-desktop-schemas - deepin-menu - deepin-mutter - deepin-wallpapers - gnome3.gnome-desktop - libcanberra-gtk3 - libgee - libwnck3 - pantheon.granite - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # fix background path - fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala - sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala - - # fix executable paths in desktop files - sed -i -e "s,Exec=dbus-send,Exec=${dbus}/bin/dbus-send," data/gala-multitaskingview.desktop.in - sed -i -e "s,Exec=deepin-wm,Exec=$out/bin/deepin-wm," data/gala.desktop - ''; - - NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; - - meta = with stdenv.lib; { - description = "Deepin Window Manager"; - homepage = https://github.com/linuxdeepin/deepin-wm; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 61db4ca0571..85db81aedab 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -38,9 +38,6 @@ let }; deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; - deepin-wm = callPackage ./deepin-wm { - vala = pkgs.vala_0_40; - }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; From a18702f37f40d7a5326ec44ba1e2f0ab26a451d9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 20:34:24 -0400 Subject: [PATCH 07/76] deepin.deepin-metacity: remove Also obsolete. --- .../deepin/deepin-metacity/default.nix | 65 ------------------- pkgs/desktops/deepin/default.nix | 1 - 2 files changed, 66 deletions(-) delete mode 100644 pkgs/desktops/deepin/deepin-metacity/default.nix diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix deleted file mode 100644 index 18f54223301..00000000000 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, - gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, - libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, - deepin, wrapGAppsHook }: - -stdenv.mkDerivation rec { - pname = "deepin-metacity"; - version = "3.22.24"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx"; - }; - - nativeBuildInputs = [ - pkgconfig - intltool - libtool - glib.dev - gnome3.gnome-common - wrapGAppsHook - ]; - - buildInputs = [ - gnome3.dconf - gtk3 - libgtop - gnome3.zenity - bamf - json-glib - libcanberra-gtk3 - libstartup_notification - libxkbcommon - deepin-wallpapers - deepin-desktop-schemas - ]; - - postPatch = '' - sed -i src/ui/deepin-background-cache.c \ - -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' - ''; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - configureFlags = [ "--disable-themes-documentation" ]; - - preConfigure = '' - HOME=$TMP - NOCONFIGURE=1 ./autogen.sh - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; - - meta = with stdenv.lib; { - description = "2D window manager for Deepin"; - homepage = https://github.com/linuxdeepin/deepin-metacity; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 85db81aedab..24dc7212948 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -27,7 +27,6 @@ let deepin-icon-theme = callPackage ./deepin-icon-theme { }; deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; - deepin-metacity = callPackage ./deepin-metacity { }; deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; deepin-mutter = callPackage ./deepin-mutter { }; deepin-screenshot = callPackage ./deepin-screenshot { }; From d797361cc70e3a31b5190cea3b744a245052902d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 20:34:58 -0400 Subject: [PATCH 08/76] deepin.deepin-mutter: remove Also obsolete. --- .../deepin-mutter.plugins-dir.patch | 41 ---------- .../desktops/deepin/deepin-mutter/default.nix | 79 ------------------- pkgs/desktops/deepin/default.nix | 1 - 3 files changed, 121 deletions(-) delete mode 100644 pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch delete mode 100644 pkgs/desktops/deepin/deepin-mutter/default.nix diff --git a/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch b/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch deleted file mode 100644 index 4a57b501e01..00000000000 --- a/pkgs/desktops/deepin/deepin-mutter/deepin-mutter.plugins-dir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8eeb4febcae517080d6638f8953e02335df79f01 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Sat, 20 Apr 2019 00:28:47 -0300 -Subject: [PATCH] Get plugins dir from environment variable - ---- - src/compositor/meta-plugin-manager.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c -index ac5716db..d000100b 100644 ---- a/src/compositor/meta-plugin-manager.c -+++ b/src/compositor/meta-plugin-manager.c -@@ -56,14 +56,22 @@ meta_plugin_manager_set_plugin_type (GType gtype) - void - meta_plugin_manager_load (const gchar *plugin_name) - { -- const gchar *dpath = MUTTER_PLUGIN_DIR "/"; -+ const gchar *env_var; -+ const gchar *dpath; - gchar *path; - MetaModule *module; - -+ env_var = g_getenv ("DEEPIN_MUTTER_PLUGINS_DIR"); -+ g_debug ("$DEEPIN_MUTTER_PLUGINS_DIR: %s\n", env_var); -+ -+ dpath = env_var == NULL || strlen (env_var) == 0 ? MUTTER_PLUGIN_DIR : env_var; -+ g_debug ("dpath: %s\n", dpath); -+ - if (g_path_is_absolute (plugin_name)) - path = g_strdup (plugin_name); - else -- path = g_strconcat (dpath, plugin_name, ".so", NULL); -+ path = g_strconcat (dpath, "/", plugin_name, ".so", NULL); -+ g_debug ("path: %s\n", path); - - module = g_object_new (META_TYPE_MODULE, "path", path, NULL); - if (!module || !g_type_module_use (G_TYPE_MODULE (module))) --- -2.21.0 - diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix deleted file mode 100644 index 9f2e8068d55..00000000000 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, - xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, libgudev, cogl, clutter, systemd, - gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook, - deepin }: - -stdenv.mkDerivation rec { - pname = "deepin-mutter"; - version = "3.20.38"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31"; - }; - - nativeBuildInputs = [ - pkgconfig - intltool - libtool - gnome3.gnome-common - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - clutter - cogl - deepin-desktop-schemas - gnome3.gnome-desktop - gnome3.zenity - gsettings-desktop-schemas - gtk3 - libcanberra-gtk3 - libgudev - libinput - libstartup_notification - libxkbcommon - systemd - upower - xkeyboard_config - xorg.libxkbfile - ]; - - patches = [ - ./deepin-mutter.plugins-dir.patch - ]; - - postPatch = '' - searchHardCodedPaths # debugging - sed -i -e "s,Exec=deepin-mutter,Exec=$out/bin/deepin-mutter," data/mutter.desktop.in - ''; - - configureFlags = [ - "--enable-native-backend" - "--enable-compile-warnings=minimum" - ]; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; - - meta = with stdenv.lib; { - description = "Base window manager for deepin, fork of gnome mutter"; - homepage = https://github.com/linuxdeepin/deepin-mutter; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 24dc7212948..cec6abca40b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -28,7 +28,6 @@ let deepin-image-viewer = callPackage ./deepin-image-viewer { }; deepin-menu = callPackage ./deepin-menu { }; deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; - deepin-mutter = callPackage ./deepin-mutter { }; deepin-screenshot = callPackage ./deepin-screenshot { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; From 69e90bd1a7c2bd65307b1db2192c621cbc0734be Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 21 Oct 2019 22:19:43 -0400 Subject: [PATCH 09/76] deepin.dde-kwin: init at 5.0.0 --- pkgs/desktops/deepin/dde-kwin/default.nix | 124 ++++++++++++++++++ .../deepin/dde-kwin/plugin-paths.patch | 16 +++ pkgs/desktops/deepin/default.nix | 1 + 3 files changed, 141 insertions(+) create mode 100644 pkgs/desktops/deepin/dde-kwin/default.nix create mode 100644 pkgs/desktops/deepin/dde-kwin/plugin-paths.patch diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix new file mode 100644 index 00000000000..002971ca077 --- /dev/null +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -0,0 +1,124 @@ +{ stdenv +, mkDerivation +, pkgconfig +, fetchFromGitHub +, deepin +, cmake +, extra-cmake-modules +, qtbase +, libxcb +, kglobalaccel +, kwindowsystem +, kcoreaddons +, kwin +, dtkcore +, gsettings-qt +, fontconfig +, deepin-desktop-schemas +, glib +, libXrender +, mtdev +, qttools +, deepin-gettext-tools +, kwayland +, qtx11extras +, qtquickcontrols2 +, epoxy +, qt5integration +, dde-session-ui +, dbus +, wrapGAppsHook +}: + +mkDerivation rec { + pname = "dde-kwin"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "0bvkx9h5ygj46a0j76kfyq3gvk6zn4fx6clhrmcr40hbi2k33cbl"; + }; + + nativeBuildInputs = [ + cmake + deepin-gettext-tools + deepin.setupHook + extra-cmake-modules + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + deepin-desktop-schemas + dtkcore + epoxy + fontconfig + glib + gsettings-qt + kcoreaddons + kglobalaccel + kwayland + kwin + kwindowsystem + libXrender + libxcb + mtdev + qtbase + qtquickcontrols2 + qttools + qtx11extras + qt5integration + ]; + + NIX_CFLAGS_COMPILE = "-I${kwayland.dev}/include/KF5"; + + cmakeFlags = [ + "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" + ]; + + patches = [ + ./plugin-paths.patch + ]; + + postPatch = '' + searchHardCodedPaths + + patchShebangs translate_ts2desktop.sh \ + translate_generation.sh \ + translate_desktop2ts.sh \ + plugins/kwin-xcb/plugin/translate_generation.sh + + fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert translate_desktop2ts.sh translate_ts2desktop.sh + + fixPath $out /etc/xdg configures/CMakeLists.txt deepin-wm-dbus/deepinwmfaker.cpp + + # Need environmental patch + fixPath /run/current-system/sw /usr/lib plugins/kwin-xcb/plugin/main.cpp + + substituteInPlace configures/kwin-wm-multitaskingview.desktop \ + --replace "dbus-send" "${dbus}/bin/dbus-send" + + fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-warning-dialog deepin-wm-dbus/deepinwmfaker.cpp + + substituteInPlace CMakeLists.txt \ + --subst-var-by plugin_path "$out/$qtPluginPrefix" + ''; + + postFixup = '' + chmod +x $out/bin/kwin_no_scale + ''; + + enableParallelBuilding = true; + + passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + + meta = with stdenv.lib; { + description = "KWin configures on DDE"; + homepage = "https://github.com/linuxdeepin/dde-kwin"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo worldofpeace ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-kwin/plugin-paths.patch b/pkgs/desktops/deepin/dde-kwin/plugin-paths.patch new file mode 100644 index 00000000000..1bf576e5c1a --- /dev/null +++ b/pkgs/desktops/deepin/dde-kwin/plugin-paths.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feef49d..ecb7ed2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,9 +26,9 @@ macro(query_qmake args output) + endif() + endmacro() + +-query_qmake("QT_INSTALL_PLUGINS" QT_INSTALL_PLUGINS) ++set(QT_INSTALL_PLUGINS @plugin_path@) + +-set(PLUGIN_INSTALL_PATH ${QT_INSTALL_PLUGINS}/platforms) ++set(PLUGIN_INSTALL_PATH @plugin_path@/platforms) + # Find includes in corresponding build directories + set(CMAKE_INCLUDE_CURRENT_DIR ON) + # Instruct CMake to run moc automatically when needed diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index cec6abca40b..5d4b6f73244 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -13,6 +13,7 @@ let dde-daemon = callPackage ./dde-daemon { }; dde-dock = callPackage ./dde-dock { }; dde-file-manager = callPackage ./dde-file-manager { }; + dde-kwin = callPackage ./dde-kwin { }; dde-launcher = callPackage ./dde-launcher { }; dde-network-utils = callPackage ./dde-network-utils { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; From 11a0602b3d95d9ed8a88a095867d43f4cca1f101 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 22 Oct 2019 17:36:39 -0400 Subject: [PATCH 10/76] fixup! deepin.dde-kwin: init at 5.0.0 --- ...0001-dde-kwin.pc-make-paths-relative.patch | 56 +++++++++++++++++++ pkgs/desktops/deepin/dde-kwin/default.nix | 24 ++++++-- .../{plugin-paths.patch => fix-paths.patch} | 0 3 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch rename pkgs/desktops/deepin/dde-kwin/{plugin-paths.patch => fix-paths.patch} (100%) diff --git a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch b/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch new file mode 100644 index 00000000000..707eb207409 --- /dev/null +++ b/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch @@ -0,0 +1,56 @@ +From c4edb65554f90a5abfc2ecbf63587b8c6ef2653d Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Tue, 22 Oct 2019 17:20:24 -0400 +Subject: [PATCH] dde-kwin.pc: make paths relative + +Values like libdir should be relative to the literal ${prefix}. +We also use @ONLY so we don't substitute values like ${prefix} +with CMake resulting in an unintentional replacement. +--- + plugins/kwin-xcb/lib/CMakeLists.txt | 2 +- + plugins/kwin-xcb/lib/dde-kwin.pc.in | 18 +++++++++--------- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/plugins/kwin-xcb/lib/CMakeLists.txt b/plugins/kwin-xcb/lib/CMakeLists.txt +index 0189b74..62e5553 100644 +--- a/plugins/kwin-xcb/lib/CMakeLists.txt ++++ b/plugins/kwin-xcb/lib/CMakeLists.txt +@@ -61,7 +61,7 @@ install_files( + kwinutils.h + ) + +-configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc) ++configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) + if (CMAKE_INSTALL_LIBDIR) + install_files("/${CMAKE_INSTALL_LIBDIR}/pkgconfig" FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) + elseif (CMAKE_LIBRARY_OUTPUT_DIRECTORY) +diff --git a/plugins/kwin-xcb/lib/dde-kwin.pc.in b/plugins/kwin-xcb/lib/dde-kwin.pc.in +index 9b1d813..1179761 100644 +--- a/plugins/kwin-xcb/lib/dde-kwin.pc.in ++++ b/plugins/kwin-xcb/lib/dde-kwin.pc.in +@@ -1,13 +1,13 @@ +-prefix=${CMAKE_INSTALL_PREFIX} +-exec_prefix=${CMAKE_INSTALL_PREFIX} +-libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} +-includedir=${INCLUDE_OUTPUT_PATH} ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=@INCLUDE_OUTPUT_PATH@ + + +-Name: ${PROJECT_NAME} ++Name: @PROJECT_NAME@ + Description: DDE KWin plugin library +-Version: ${PROJECT_VERSION} +-Libs: -l${PROJECT_NAME} +-Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread +-Cflags: -I${INCLUDE_OUTPUT_PATH} ++Version: @PROJECT_VERSION@ ++Libs: -l$@PROJECT_NAME@ ++Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread ++Cflags: -I@INCLUDE_OUTPUT_PATH@ + +-- +2.23.0 + diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index 002971ca077..850186953f6 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -72,6 +72,8 @@ mkDerivation rec { qt5integration ]; + # Need to add kwayland around: + # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 NIX_CFLAGS_COMPILE = "-I${kwayland.dev}/include/KF5"; cmakeFlags = [ @@ -79,7 +81,8 @@ mkDerivation rec { ]; patches = [ - ./plugin-paths.patch + ./0001-dde-kwin.pc-make-paths-relative.patch + ./fix-paths.patch ]; postPatch = '' @@ -94,7 +97,7 @@ mkDerivation rec { fixPath $out /etc/xdg configures/CMakeLists.txt deepin-wm-dbus/deepinwmfaker.cpp - # Need environmental patch + # TODO: Need environmental patch fixPath /run/current-system/sw /usr/lib plugins/kwin-xcb/plugin/main.cpp substituteInPlace configures/kwin-wm-multitaskingview.desktop \ @@ -102,20 +105,33 @@ mkDerivation rec { fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-warning-dialog deepin-wm-dbus/deepinwmfaker.cpp + # Correct qt plugin installation path to be within dde-kwin prefix. substituteInPlace CMakeLists.txt \ --subst-var-by plugin_path "$out/$qtPluginPrefix" ''; - postFixup = '' + postInstall = '' + # Correct invalid path in .pc + substituteInPlace $out/lib/pkgconfig/dde-kwin.pc \ + --replace "-L/usr/X11R6/lib64" "" + chmod +x $out/bin/kwin_no_scale ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + enableParallelBuilding = true; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; meta = with stdenv.lib; { - description = "KWin configures on DDE"; + description = "KWin configuration for Deepin Desktop Environment"; homepage = "https://github.com/linuxdeepin/dde-kwin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/dde-kwin/plugin-paths.patch b/pkgs/desktops/deepin/dde-kwin/fix-paths.patch similarity index 100% rename from pkgs/desktops/deepin/dde-kwin/plugin-paths.patch rename to pkgs/desktops/deepin/dde-kwin/fix-paths.patch From b83908f1ed2ba67edbccb9eba4ba761794a441a3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 25 Oct 2019 16:30:29 +0200 Subject: [PATCH 11/76] neomutt: 20180716 -> 2019-10-25 https://github.com/neomutt/neomutt/releases/tag/2019-10-25 --- .../applications/networking/mailreaders/neomutt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 615b810d002..d3a3e8143af 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20180716"; + version = "2019-10-25"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; - rev = "neomutt-${version}"; - sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8"; + rev = version; + sha256 = "0hy6rxgm3acjqxpf4ss7391kps4g06fbjhbpgv1jdrj1y9kv0rm1"; }; buildInputs = [ From b53710e19ebc2900d295e9631ceb59bb96838d1e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 23 Jun 2019 12:36:23 -0500 Subject: [PATCH 12/76] caddy: disable telemetry Co-authored-by: Franz Pletz --- pkgs/servers/caddy/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 56fa95391cc..bb1f4ac8538 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -16,9 +16,15 @@ buildGoModule rec { }; modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q"; - buildFlagsArray = '' - -ldflags= - -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version} + preBuild = '' + cat << EOF > caddy/main.go + package main + import "github.com/caddyserver/caddy/caddy/caddymain" + func main() { + caddymain.EnableTelemetry = false + caddymain.Run() + } + EOF ''; meta = with stdenv.lib; { From a260b9a4846ae894281dbc98308bb7576f50d183 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 26 Oct 2019 12:59:05 -0700 Subject: [PATCH 13/76] pythonPackages.jedi: 0.14.1 -> 0.15.1 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index ae359493905..2340d5142b5 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.14.1"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0dmgx9c0f7yx897bf13nrp5gbgal192y44y5dhqcvkyklzqm1j2k"; + sha256 = "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds"; }; postPatch = '' From b754310a688ffb1a2e224ef18910cf4c762cd8e5 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 26 Oct 2019 12:59:39 -0700 Subject: [PATCH 14/76] pythonPackages.python-language-server: 0.28.3 -> 0.29.1 Fixes a failing test due to a pylint update. --- .../python-modules/python-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 4bf482b9ae4..b029373bdca 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 -, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server +, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytest, mock, pytestcov, coverage, setuptools , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] @@ -21,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.28.3"; + version = "0.29.1"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "16d8i43r75h0cijggkkmmpnycn29wlbjp63mgg3s4nbrxfa96x2k"; + sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv"; }; # The tests require all the providers, disable otherwise. @@ -44,7 +44,7 @@ buildPythonPackage rec { HOME=$TEMPDIR pytest ''; - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ] + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ] ++ stdenv.lib.optional (withProvider "autopep8") autopep8 ++ stdenv.lib.optional (withProvider "mccabe") mccabe ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle From eaa53f737ec8d1a75f13355e584a280780ae9955 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 26 Oct 2019 13:55:05 -0700 Subject: [PATCH 15/76] minecraft: 2.1.5965 -> 2.1.7658 --- pkgs/games/minecraft/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 7abd6c162e0..0de2268c1af 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -15,6 +15,7 @@ , cups , dbus , atk +, gtk3-x11 , gtk2-x11 , gdk-pixbuf , glib @@ -58,6 +59,7 @@ let glib gnome2.GConf gnome2.pango + gtk3-x11 gtk2-x11 nspr nss @@ -82,11 +84,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.5965"; + version = "2.1.7658"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "0wlc49s541li4cbxdmlw8fp34hp1q9m6ngr7l5hfdhv1i13s5845"; + sha256 = "10sng7l0q9r98zwifjmy50nyh65ny4djmacz8158hffcsfcx93px"; }; icon = fetchurl { From 698dfed2e629a4d1bd0a0f7348071d32b5c41639 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 27 Oct 2019 12:06:18 +0100 Subject: [PATCH 16/76] nixos/znapzend: Add options for features --- nixos/modules/services/backup/znapzend.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index f317078ddda..18743752abc 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -34,6 +34,8 @@ let description = "string of the form number{b|k|M|G}"; }; + enabledFeatures = concatLists (mapAttrsToList (name: enabled: optional enabled name) cfg.features); + # Type for a string that must contain certain other strings (the list parameter). # Note that these would need regex escaping. stringContainingStrings = list: let @@ -354,6 +356,22 @@ in ''; default = false; }; + + features.recvu = mkEnableOption '' + recvu feature which uses -u on the receiving end to keep the destination + filesystem unmounted. + ''; + features.compressed = mkEnableOption '' + compressed feature which adds the options -Lce to + the zfs send command. When this is enabled, make + sure that both the sending and receiving pool have the same relevant + features enabled. Using -c will skip unneccessary + decompress-compress stages, -L is for large block + support and -e is for embedded data support. see + znapzend1 + and zfs8 + for more info. + ''; }; }; @@ -387,6 +405,8 @@ in "--loglevel=${cfg.logLevel}" (optionalString cfg.noDestroy "--nodestroy") (optionalString cfg.autoCreation "--autoCreation") + (optionalString (enabledFeatures != []) + "--features=${concatStringsSep "," enabledFeatures}") ]; in "${pkgs.znapzend}/bin/znapzend ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-failure"; From f124b7addcc4925ec58861b2369cd9357d9550bd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 27 Oct 2019 12:29:31 +0100 Subject: [PATCH 17/76] nixos/znapzend: Increase starting timeout --- nixos/modules/services/backup/znapzend.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 18743752abc..203631a577f 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -399,6 +399,14 @@ in ''; serviceConfig = { + # znapzendzetup --import apparently tries to connect to the backup + # host 3 times with a timeout of 30 seconds, leading to a startup + # delay of >90s when the host is down, which is just above the default + # service timeout of 90 seconds. Increase the timeout so it doesn't + # make the service fail in that case. + TimeoutStartSec = 180; + # Needs to have write access to ZFS + User = "root"; ExecStart = let args = concatStringsSep " " [ "--logto=${cfg.logTo}" From afd38ea1ee03a9287bbe3350a4c289544daf1a74 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 27 Oct 2019 14:44:26 +0100 Subject: [PATCH 18/76] stop using hardeningDisable = [ "fortify" ]; for Go packages it seems that the issue #25959 is not present anymore --- pkgs/applications/blockchains/go-ethereum.nix | 3 --- pkgs/applications/virtualization/containerd/default.nix | 2 -- pkgs/applications/virtualization/docker/default.nix | 5 ----- pkgs/applications/virtualization/podman/default.nix | 2 -- pkgs/servers/livepeer/default.nix | 5 ----- pkgs/servers/trezord/default.nix | 3 --- pkgs/tools/networking/flannel/default.nix | 2 -- 7 files changed, 22 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index a59cffb4b1d..07d16494646 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -10,9 +10,6 @@ buildGoPackage rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { owner = "ethereum"; repo = pname; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index b770c6ed0a5..70865ea848b 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -16,8 +16,6 @@ buildGoPackage rec { goPackagePath = "github.com/containerd/containerd"; outputs = [ "bin" "out" "man" ]; - hardeningDisable = [ "fortify" ]; - buildInputs = [ btrfs-progs go-md2man utillinux ]; buildFlags = "VERSION=v${version}"; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9902ae2140c..0a61149cafc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -37,8 +37,6 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; - - hardeningDisable = [ "fortify" ]; }); docker-tini = tini.overrideAttrs (oldAttrs: { @@ -82,9 +80,6 @@ rec { sha256 = sha256; }; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 59a0f00e7c6..fa48c8b5e5e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -18,8 +18,6 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - # Optimizations break compilation of libseccomp c bindings - hardeningDisable = [ "fortify" ]; nativeBuildInputs = [ pkgconfig go-md2man ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 798bda8e306..64edcb2ef4f 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -18,11 +18,6 @@ buildGoPackage rec { buildInputs = [ pkgconfig ffmpeg ]; - # XXX This removes the -O2 flag, to avoid errors like: - # cgo-dwarf-inference:2:8: error: enumerator value for '__cgo_enum__0' is not an integer constant - # This is a workaround for nixpkgs+golang BUG https://github.com/NixOS/nixpkgs/issues/25959 - hardeningDisable = [ "fortify" ]; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 84b7b325b46..38fefd041bd 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -4,9 +4,6 @@ buildGoPackage rec { pname = "trezord-go"; version = "2.0.27"; - # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) - hardeningDisable = [ "fortify" ]; - goPackagePath = "github.com/trezor/trezord-go"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index f16fcc7048c..d2f0ec2ec63 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -9,8 +9,6 @@ buildGoPackage rec { goPackagePath = "github.com/coreos/flannel"; - hardeningDisable = [ "fortify" ]; - src = fetchFromGitHub { inherit rev; owner = "coreos"; From 794396755238058bffc224cfe68299122be71267 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 27 Oct 2019 17:02:34 +0100 Subject: [PATCH 19/76] fbterm: fix cross-build --- pkgs/os-specific/linux/fbterm/default.nix | 4 +++- pkgs/os-specific/linux/fbterm/select.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/fbterm/select.patch diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index c8fc633f8bd..d56b254d382 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ncurses ]; inherit buildInputs; preConfigure = '' @@ -31,6 +31,7 @@ stdenv.mkDerivation { preBuild = '' mkdir -p "$out/share/terminfo" tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm + makeFlagsArray+=("AR=$AR") ''; patches = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/glitsj16/fbterm-patched/d1fe03313be4654dd0a1c0bb5f51530732345134/miscoloring-fix.patch"; sha256 = "1mjszji0jgs2jsagjp671fv0d1983wmxv009ff1jfhi9pbay6jd0"; }) + ./select.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/fbterm/select.patch b/pkgs/os-specific/linux/fbterm/select.patch new file mode 100644 index 00000000000..549674047a9 --- /dev/null +++ b/pkgs/os-specific/linux/fbterm/select.patch @@ -0,0 +1,12 @@ +diff --git a/src/fbio.cpp b/src/fbio.cpp +index e5afc44..2485227 100644 +--- a/src/fbio.cpp ++++ b/src/fbio.cpp +@@ -18,6 +18,7 @@ + * + */ + ++#include + #include + #include + #include "config.h" From 3eff8b1ba97d2e2127a90409dffe365730e642cd Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 27 Oct 2019 17:13:58 +0100 Subject: [PATCH 20/76] atlassian-jira: 8.4.2 -> 8.5.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 18c838a0b21..1d3e3e4f027 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.4.2"; + version = "8.5.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh"; + sha256 = "093706cpaw1a1vwvzpa85j7n338d748w372vsk8c9lvagaskiwh2"; }; buildPhase = '' From 2e6c509429e9fff786ca2735030c7b8734fab028 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Oct 2019 21:09:59 +0100 Subject: [PATCH 21/76] tev: init at 1.13 --- pkgs/applications/graphics/tev/default.nix | 53 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/graphics/tev/default.nix diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix new file mode 100644 index 00000000000..47da0b749df --- /dev/null +++ b/pkgs/applications/graphics/tev/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub +, cmake, wrapGAppsHook +, libX11, xorg, libzip, glfw, gnome3 +}: + +stdenv.mkDerivation rec { + pname = "tev"; + version = "1.13"; + + src = fetchFromGitHub { + owner = "Tom94"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0c8md6yv1q449aszs05xfby6a2aiw8pac7x0zs169i5mpqrrbfa9"; + }; + + nativeBuildInputs = [ cmake wrapGAppsHook ]; + buildInputs = [ libX11 libzip glfw ] + ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm ]); + + dontWrapGApps = true; # We also need zenity (see below) + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "/usr/" "''${out}/" + ''; + + postInstall = '' + wrapProgram $out/bin/tev \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH ":" "${gnome3.zenity}/bin" + ''; + + meta = with stdenv.lib; { + description = "A high dynamic range (HDR) image comparison tool"; + longDescription = '' + A high dynamic range (HDR) image comparison tool for graphics people. tev + allows viewing images through various tonemapping operators and inspecting + the values of individual pixels. Often, it is important to find exact + differences between pairs of images. For this purpose, tev allows rapidly + switching between opened images and visualizing various error metrics (L1, + L2, and relative versions thereof). To avoid clutter, opened images and + their layers can be filtered by keywords. + While the predominantly supported file format is OpenEXR certain other + types of images can also be loaded. + ''; + inherit (src.meta) homepage; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236e2f290ac..8b70931515c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21105,6 +21105,8 @@ in tetraproc = callPackage ../applications/audio/tetraproc { }; + tev = callPackage ../applications/graphics/tev { }; + thinkingRock = callPackage ../applications/misc/thinking-rock { }; thonny = callPackage ../applications/editors/thonny { }; From 58311d9fc9260e6d6d5bf3375deda0cb1f51666c Mon Sep 17 00:00:00 2001 From: Americo Date: Sun, 27 Oct 2019 17:16:29 -0700 Subject: [PATCH 22/76] solargraph: 0.35.2 -> 0.37.2 --- .../ruby-modules/solargraph/Gemfile.lock | 17 ++++---- .../ruby-modules/solargraph/gemset.nix | 42 +++++++------------ 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index 042c0366ffb..edd946d9285 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -5,17 +5,16 @@ GEM backport (1.1.2) htmlentities (4.3.4) jaro_winkler (1.5.3) - kramdown (1.17.0) mini_portile2 (2.4.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.18.0) + parser (2.6.5.0) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.1.0) + reverse_markdown (1.3.0) nokogiri - rubocop (0.74.0) + rubocop (0.75.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) @@ -23,12 +22,12 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.35.2) + solargraph (0.37.2) backport (~> 1.1) bundler (>= 1.17.2) htmlentities (~> 4.3, >= 4.3.4) jaro_winkler (~> 1.5) - kramdown (~> 1.16) + nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) @@ -36,7 +35,7 @@ GEM tilt (~> 2.0) yard (~> 0.9) thor (0.20.3) - tilt (2.0.9) + tilt (2.0.10) unicode-display_width (1.6.0) yard (0.9.20) diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index 2f0c60404bc..aa28f666e5a 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -39,16 +39,6 @@ }; version = "1.5.3"; }; - kramdown = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; - type = "gem"; - }; - version = "1.17.0"; - }; mini_portile2 = { groups = ["default"]; platforms = []; @@ -65,20 +55,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + sha256 = "091p5zrzzyg3fg48jhdz9lzjf2r9r3akra2cd46yd4nza3xgxshz"; type = "gem"; }; - version = "1.17.0"; + version = "1.18.0"; }; parser = { dependencies = ["ast"]; @@ -86,10 +76,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; type = "gem"; }; - version = "2.6.3.0"; + version = "2.6.5.0"; }; rainbow = { groups = ["default"]; @@ -107,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg"; + sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2"; type = "gem"; }; - version = "1.1.0"; + version = "1.3.0"; }; rubocop = { dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; @@ -118,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk"; + sha256 = "0s5q1i7776yklkcwwx6ibm2mwnjky6wv7rpa3xhn8448854is31n"; type = "gem"; }; - version = "0.74.0"; + version = "0.75.1"; }; ruby-progressbar = { groups = ["default"]; @@ -134,15 +124,15 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "htmlentities" "jaro_winkler" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "htmlentities" "jaro_winkler" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r0a7nfb0cwg2d7awbmvzk14594w7vkx844sshl9jpzkjx1asa9n"; + sha256 = "0w20g68i6djc2vyx3awzvn15brdfpcwbna27r0903h5djcmnr8a0"; type = "gem"; }; - version = "0.35.2"; + version = "0.37.2"; }; thor = { groups = ["default"]; @@ -159,10 +149,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; type = "gem"; }; - version = "2.0.9"; + version = "2.0.10"; }; unicode-display_width = { groups = ["default"]; @@ -184,4 +174,4 @@ }; version = "0.9.20"; }; -} \ No newline at end of file +} From 3c3ac19c43ef1b8b7459f9da1d0d5bd8fcc42fda Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Thu, 24 Jan 2019 15:44:34 +1100 Subject: [PATCH 23/76] dvc: init at 0.24.3 --- .../version-management/dvc/default.nix | 65 +++++++++++++++++++ .../version-management/dvc/dvc-daemon.patch | 21 ++++++ pkgs/top-level/all-packages.nix | 9 +++ 3 files changed, 95 insertions(+) create mode 100644 pkgs/applications/version-management/dvc/default.nix create mode 100644 pkgs/applications/version-management/dvc/dvc-daemon.patch diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix new file mode 100644 index 00000000000..fe10551771c --- /dev/null +++ b/pkgs/applications/version-management/dvc/default.nix @@ -0,0 +1,65 @@ +{ lib +, python3Packages +, fetchFromGitHub +, enableGoogle ? false +, enableAWS ? false +, enableAzure ? false +, enableSSH ? false +}: + +with python3Packages; +buildPythonApplication rec { + pname = "dvc"; + version = "0.24.3"; + + # PyPi only has wheel + src = fetchFromGitHub { + owner = "iterative"; + repo = "dvc"; + rev = version; + sha256 = "1wqq4i23hppilp20fx5a5nj93xwf3wwwr2f8aasvn6jkv2l22vpl"; + }; + + propagatedBuildInputs = [ + ply + configparser + zc_lockfile + future + colorama + configobj + networkx + pyyaml + GitPython + setuptools + nanotime + pyasn1 + schema + jsonpath_rw + requests + grandalf + asciimatics + distro + appdirs + ] + ++ lib.optional enableGoogle google_cloud_storage + ++ lib.optional enableAWS boto3 + ++ lib.optional enableAzure azure-storage-blob + ++ lib.optional enableSSH paramiko; + + # tests require access to real cloud services + # nix build tests have to be isolated and run locally + doCheck = false; + + patches = [ ./dvc-daemon.patch ]; + + postPatch = '' + substituteInPlace dvc/daemon.py --subst-var-by dvc "$out/bin/dcv" + ''; + + meta = with lib; { + description = "Version Control System for Machine Learning Projects"; + license = licenses.asl20; + homepage = https://dvc.org; + maintainers = with maintainers; [ cmcdragonkai ]; + }; +} diff --git a/pkgs/applications/version-management/dvc/dvc-daemon.patch b/pkgs/applications/version-management/dvc/dvc-daemon.patch new file mode 100644 index 00000000000..5c2d363b17f --- /dev/null +++ b/pkgs/applications/version-management/dvc/dvc-daemon.patch @@ -0,0 +1,21 @@ +diff --git a/dvc/daemon.py b/dvc/daemon.py +index 1d67a37..7ce6fde 100644 +--- a/dvc/daemon.py ++++ b/dvc/daemon.py +@@ -67,14 +67,8 @@ def daemon(args): + Args: + args (list): list of arguments to append to `dvc daemon` command. + """ +- cmd = [sys.executable] +- if not is_binary(): +- cmd += ['-m', 'dvc'] +- cmd += ['daemon', '-q'] + args +- +- env = fix_env() +- file_path = os.path.abspath(inspect.stack()[0][1]) +- env['PYTHONPATH'] = os.path.dirname(os.path.dirname(file_path)) ++ cmd = [ "@dvc@" , "daemon", "-q"] + args ++ env = None + + logger.debug("Trying to spawn '{}' with env '{}'".format(cmd, env)) + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ff80a526e4..85eac3acca8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1345,6 +1345,15 @@ in duperemove = callPackage ../tools/filesystems/duperemove { }; + dvc = callPackage ../applications/version-management/dvc { }; + + dvc-with-remotes = callPackage ../applications/version-management/dvc { + enableGoogle = true; + enableAWS = true; + enableAzure = true; + enableSSH = true; + }; + dylibbundler = callPackage ../tools/misc/dylibbundler { }; dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; From a2d83bf8b9deb31ff64e3f339eee092f0a7e8490 Mon Sep 17 00:00:00 2001 From: Alex Brandt Date: Sun, 27 Oct 2019 22:03:21 -0700 Subject: [PATCH 24/76] nixos/zfs: add autoReplication to module list --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5214126ff7e..8c3613503cf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -227,6 +227,7 @@ ./services/backup/rsnapshot.nix ./services/backup/tarsnap.nix ./services/backup/tsm.nix + ./services/backup/zfs-replication.nix ./services/backup/znapzend.nix ./services/cluster/hadoop/default.nix ./services/cluster/kubernetes/addons/dns.nix From 549303466ef44837ec3653a90d240cdf5c41dd2a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 28 Oct 2019 03:00:00 -0500 Subject: [PATCH 25/76] ripgrep-all: 0.9.2 -> 0.9.3 --- pkgs/tools/text/ripgrep-all/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index a9253b02ddd..521b123d878 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; rev = version; - sha256 = "1knv0gpanrid9i9mxg7zwqh9igdksp1623wl9iwmysiyaajlbif2"; + sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9"; }; - cargoSha256 = "0xwsx0x9n766bxamhnpzibrnvnqsxz3wh1f0rj29kbl32xl8yyfg"; + cargoSha256 = "1jcwipsb7sl65ky78cypl4qvjvxvv4sjlwcg1pirgmqikcyiiy2l"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; From 460e2d2f7f630b69ea619bbaaf6f93a18e96171b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 28 Oct 2019 03:00:00 -0500 Subject: [PATCH 26/76] watchexec: 1.10.3 -> 1.11.1 Changelog: - https://github.com/watchexec/watchexec/releases/tag/1.11.0 - https://github.com/watchexec/watchexec/releases/tag/1.11.1 --- pkgs/tools/misc/watchexec/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 848a5858b91..dea4478581b 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,17 +1,17 @@ -{ stdenv, rustPlatform, fetchFromGitHub, CoreServices, darwin }: +{ stdenv, rustPlatform, fetchFromGitHub, CoreServices }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0iaxicghvfy85hrxn151hz8frgfknk3s1z0ngjn7cv5x5zvfxspf"; + sha256 = "1iaib7yvxyn3l9kiys9x7wziixj13fmx1z3wgdy6h8c7jv6fpc0j"; }; - cargoSha256 = "1sqwplvpg0n9j0h9j94m7a6ylgqi4y4wyx489y09z9gm7aqgrsjc"; + cargoSha256 = "101p0qj7ydfhqfz402mxy4bs48vq3rzgj513f1kwv0ba4hn1sxkv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; From b27bdf4ec8a02c1c956b15c344069f492b4babc6 Mon Sep 17 00:00:00 2001 From: Benedikt Hunger Date: Tue, 22 Oct 2019 09:49:50 +0200 Subject: [PATCH 27/76] pythonPackages.qscintilla-qt5: fix build --- pkgs/development/python-modules/qscintilla-qt5/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 963ee82feda..96485bd1f06 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -27,6 +27,8 @@ buildPythonPackage { lndir ${pyqt5} $out rm -rf "$out/nix-support" cd Python + substituteInPlace configure.py \ + --replace "qmake = {'CONFIG': 'qscintilla2'}" "qmake = {'CONFIG': 'qscintilla2', 'QT': 'widgets printsupport'}" ${python.executable} ./configure.py \ --pyqt=PyQt5 \ --destdir=$out/${python.sitePackages}/PyQt5 \ @@ -45,6 +47,5 @@ buildPythonPackage { license = licenses.lgpl21Plus; maintainers = with maintainers; [ lsix ]; homepage = https://www.riverbankcomputing.com/software/qscintilla/; - broken = true; }; } From 5d22f7afe1365188fe45f61cd14cc1f2f8b737c3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 28 Oct 2019 10:11:41 +0100 Subject: [PATCH 28/76] nixos/acme: fix staging endpoint url fixes #72067 --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index e08c7e965ee..cbeb99cfcef 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -198,7 +198,7 @@ in ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) - ++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"]; + ++ optionals (!cfg.production) ["--server" "https://acme-staging-v02.api.letsencrypt.org/directory"]; acmeService = { description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; From ea1af6937457cd64ac579dca43e9ed52b2336b0c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 28 Oct 2019 10:30:51 +0100 Subject: [PATCH 29/76] clipman: 1.1.0 -> 1.2.0 https://github.com/yory8/clipman/releases/tag/v1.2.0 --- pkgs/tools/misc/clipman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 42db25f9573..861d384f1f8 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clipman"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "083wd9wqsvxsf3w72jqh36php3c85273n3c6j7j997w47k069m32"; + sha256 = "0266qb8p5l8j25nn51ajsbiij8bh5r7ywphf2x1l7wfhbzgxz12d"; }; - modSha256 = "0r7bx2vxnjqs4lx17w7q75spdjh3dz4560d62bj6fb5n71hc5mgv"; + modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv"; nativeBuildInputs = [ makeWrapper ]; From 443f1a43ef629f1d0394641d769ef0c97f583404 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Sun, 27 Oct 2019 18:44:30 +0000 Subject: [PATCH 30/76] pythonPackages.pylint: add setuptools Previously it was missing a runtime dependency on setuptools: [kier@saelli:~/checkouts/nixpkgs]$ $(nix-build -A python27Packages.pylint --no-out-link)/bin/pylint Traceback (most recent call last): File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/bin/.pylint-wrapped", line 6, in from pylint import run_pylint File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/lib/python2.7/site-packages/pylint/__init__.py", line 11, in from .__pkginfo__ import version as __version__ File "/nix/store/0k8h6n6nxjcs2j5jp54mfppjbx37hrrg-python2.7-pylint-1.9.5/lib/python2.7/site-packages/pylint/__pkginfo__.py", line 25, in from pkg_resources import parse_version ImportError: No module named pkg_resources With this change, the same command now correctly prints pylint's help text. This only applies to Python 2. --- pkgs/development/python-modules/pylint/1.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 571a9446e11..b1253c65b33 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, pyenchant }: + pytest, pytestrunner, pyenchant, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pyenchant ]; - propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch ]; + propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; postPatch = lib.optionalString stdenv.isDarwin '' # Remove broken darwin test From 22b2ccf87641a52299d18296e5a24ef4e5b35a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 28 Oct 2019 10:30:12 +0000 Subject: [PATCH 31/76] passExtensions.pass-import: 2.3 -> 2.6 --- .../tools/security/pass/extensions/import.nix | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 9d9d36fd0d9..90e3105bbd8 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,34 +1,51 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }: let - pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]); + pythonEnv = pythonPackages.python.withPackages (p: [ + p.defusedxml + p.setuptools + p.pyaml + ]); in stdenv.mkDerivation rec { pname = "pass-import"; - version = "2.3"; + version = "2.6"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-import"; rev = "v${version}"; - sha256 = "1209aqkiqqbir5yzwk5jvyk8c1fyrsj9igr3n4banf347rlwmzfv"; + sha256 = "1q8rln4djh2z8j2ycm654df5y6anm5iv2r19spgy07c3fnisxlac"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pythonEnv ]; - patchPhase = '' + patches = [ + # https://github.com/roddhjav/pass-import/pull/91 + (fetchpatch { + url = "https://github.com/roddhjav/pass-import/commit/6ccaf639e92df45bd400503757ae4aa2c5c030d7.patch"; + sha256 = "0lw9vqvbqcy96s7v7nz0i1bdx93x7qr13azymqypcdhjwmq9i63h"; + }) + ]; + + postPatch = '' sed -i -e 's|$0|${pass}/bin/pass|' import.bash ''; dontBuild = true; - installFlags = [ "PREFIX=$(out)" ]; + installFlags = [ + "PREFIX=$(out)" + "BASHCOMPDIR=$(out)/etc/bash_completion.d" + ]; postFixup = '' + install -D pass_import.py $out/${pythonPackages.python.sitePackages}/pass_import.py wrapProgram $out/lib/password-store/extensions/import.bash \ --prefix PATH : "${pythonEnv}/bin" \ + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" \ --run "export PREFIX" ''; From e807b32ee49c7fbcc0a28d288ff0845f313c821e Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 27 Oct 2019 11:40:21 +0100 Subject: [PATCH 32/76] opensc: CVE-2019-15945 (cherry picked from commit e4258001a1566ebaec0f79f6a71960363e19b1dc) --- pkgs/tools/security/opensc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index e5611f8b267..3ac564f2c08 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; }) + (fetchpatch { + name = "CVE-2019-15945.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; + sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 4bd324935ca4de60c99700f801f57d4ab2d0bb1b Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 27 Oct 2019 11:41:44 +0100 Subject: [PATCH 33/76] opensc: CVE-2019-15946 (cherry picked from commit 80c90b48c2df2e53ea2a72ce79fe5f4c6f2a25da) --- pkgs/tools/security/opensc/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 3ac564f2c08..4f220ee7717 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; }) + (fetchpatch { + name = "CVE-2019-15946.patch"; + url = "https://github.com/OpenSC/OpenSC/commit/a3fc7693f3a035a8a7921cffb98432944bb42740.patch"; + sha256 = "1qr9n8cbarrdn4kr5z0ys7flq50hfmcbm8584mhw7r39p08qwmvq"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 3abe87d6b871b2b19b3b68a190eaaccfa26da228 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 26 Oct 2019 15:14:13 +0200 Subject: [PATCH 34/76] minio: 2019-02-26T19-51-46Z -> 2019-10-12T01-39-57Z --- pkgs/servers/minio/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index b6a70864cc5..e1f4d16b0b8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "minio"; - version = "2019-02-26T19-51-46Z"; + version = "2019-10-12T01-39-57Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "1f2c7wzcb47msb0iqrcc0idz39wdm9fz61q835ks1nx4qs6hi2db"; + sha256 = "14rqwdhk2awdpcavkaqndf85c6aww5saarbfa2skc9z76ccq6114"; }; - goPackagePath = "github.com/minio/minio"; + modSha256 = "1cnccmmqb63l78rnjwh9bivyfr79ixjg106fbgcrn3pwghfag7ma"; subPackages = [ "." ]; From 5081a6cd56af8f560bac3fd82f6975264f3967ac Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 23 Oct 2019 22:47:24 +0200 Subject: [PATCH 35/76] gitlab: 12.3.5 -> 12.4.0 - gitlab-shell no longer requires ruby for anything else than the install script, so the bundlerEnv stuff could be dropped - gitlab-shell and gitlab-workhorse now report their versions correctly --- .../version-management/gitlab/data.json | 14 +- .../gitlab/gitaly/default.nix | 4 +- .../version-management/gitlab/gitaly/deps.nix | 31 +- .../gitlab/gitlab-shell/Gemfile | 12 - .../gitlab/gitlab-shell/Gemfile.lock | 109 -- .../gitlab/gitlab-shell/default.nix | 64 +- .../gitlab/gitlab-shell/deps.nix | 326 +++- .../gitlab/gitlab-shell/gemset.nix | 451 ----- .../remove-hardcoded-locations-go.patch | 42 - .../remove-hardcoded-locations-ruby.patch | 27 - .../remove-hardcoded-locations.patch | 57 + .../gitlab/gitlab-workhorse/default.nix | 7 +- .../gitlab/remove-hardcoded-locations.patch | 11 + .../version-management/gitlab/rubyEnv/Gemfile | 16 +- .../gitlab/rubyEnv/Gemfile.lock | 58 +- .../gitlab/rubyEnv/gemset.nix | 80 +- .../version-management/gitlab/update.py | 5 - .../version-management/gitlab/yarnPkgs.nix | 1632 ++++++++--------- 18 files changed, 1217 insertions(+), 1729 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch delete mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 94d5be62db5..e78643fecc9 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.3.5", - "repo_hash": "12ywspgnbwm232vmzbqhkqmwmcrb9pvihsayzmw0cxvhlfwq6995", + "version": "12.4.0", + "repo_hash": "0z2jykjv9sa4akq2qd4bl5ngqk3gpy2xfhxmcbd4d61w6l2jw00f", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.3.5-ee", + "rev": "v12.4.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.65.1", - "GITLAB_PAGES_VERSION": "1.9.0", - "GITLAB_SHELL_VERSION": "10.0.0", - "GITLAB_WORKHORSE_VERSION": "8.10.0" + "GITALY_SERVER_VERSION": "1.67.0", + "GITLAB_PAGES_VERSION": "1.11.0", + "GITLAB_SHELL_VERSION": "10.2.0", + "GITLAB_WORKHORSE_VERSION": "8.14.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 500ae97faee..b07c3590d3d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.65.1"; + version = "1.67.0"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1a39i723na2xk4363a7v48ba23vi04qpg0119dw09g13m0k5hjc3"; + sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 3bca67fe312..34c30f71054 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -270,33 +270,6 @@ sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; }; } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } { goPackagePath = "github.com/libgit2/git2go"; fetch = { @@ -644,8 +617,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile deleted file mode 100644 index cabe4079df1..00000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile +++ /dev/null @@ -1,12 +0,0 @@ -source 'https://rubygems.org' - -group :development, :test do - gem 'listen', '~> 0.5.0' - gem 'pry', '~> 0.12.2' - gem 'rspec', '~> 3.8.0' - gem 'rspec-parameterized', '~> 0.4.0' - gem 'rubocop', '0.49.1', require: false - gem 'simplecov', '~> 0.9.0', require: false - gem 'vcr', '~> 4.0.0' - gem 'webmock', '~> 3.4.0' -end diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock deleted file mode 100644 index b178b2c07ad..00000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock +++ /dev/null @@ -1,109 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - abstract_type (0.0.7) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - ast (2.4.0) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - coderay (1.1.2) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - crack (0.4.3) - safe_yaml (~> 1.0.0) - debug_inspector (0.0.3) - diff-lcs (1.3) - docile (1.1.5) - equalizer (0.0.11) - hashdiff (0.3.7) - ice_nine (0.11.2) - listen (0.5.3) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - method_source (0.9.2) - multi_json (1.13.1) - parallel (1.12.1) - parser (2.5.1.2) - ast (~> 2.4.0) - powerpack (0.1.2) - proc_to_ast (0.1.0) - coderay - parser - unparser - procto (0.0.3) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - public_suffix (3.0.3) - rainbow (2.2.2) - rake - rake (12.3.3) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-parameterized (0.4.0) - binding_of_caller - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser - rspec-support (3.8.0) - rubocop (0.49.1) - parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) - safe_yaml (1.0.4) - simplecov (0.9.2) - docile (~> 1.1.0) - multi_json (~> 1.0) - simplecov-html (~> 0.9.0) - simplecov-html (0.9.0) - thread_safe (0.3.6) - unicode-display_width (1.4.0) - unparser (0.2.8) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) - diff-lcs (~> 1.3) - equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.6) - procto (~> 0.0.2) - vcr (4.0.0) - webmock (3.4.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff - -PLATFORMS - ruby - -DEPENDENCIES - listen (~> 0.5.0) - pry (~> 0.12.2) - rspec (~> 3.8.0) - rspec-parameterized (~> 0.4.0) - rubocop (= 0.49.1) - simplecov (~> 0.9.0) - vcr (~> 4.0.0) - webmock (~> 3.4.0) - -BUNDLED WITH - 1.16.3 diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cdc77024a60..03aad8c02c3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,65 +1,25 @@ -{ stdenv, ruby, bundler, fetchFromGitLab, buildGoPackage, bundlerEnv }: +{ stdenv, fetchFromGitLab, buildGoPackage, ruby }: -let - version = "10.0.0"; +buildGoPackage rec { + pname = "gitlab-shell-go"; + version = "10.2.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0n1llkb0jrqxm10l9wqmqxjycydqphgz0chbbf395d8pywyz826x"; + sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj"; }; - rubyEnv = bundlerEnv { - name = "gitlab-shell-env"; - inherit ruby; - gemdir = ./.; - }; - goPackage = buildGoPackage { - pname = "gitlab-shell-go"; - inherit src version; - patches = [ ./remove-hardcoded-locations-go.patch ]; + buildInputs = [ ruby ]; - goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; - goDeps = ./deps.nix; + patches = [ ./remove-hardcoded-locations.patch ]; - # gitlab-shell depends on an older version of gitaly which - # contains old, vendored versions of some packages; gitlab-shell - # also explicitly depends on newer versions of these libraries, - # but buildGoPackage exposes the vendored versions instead, - # leading to compilation errors. Since the vendored libraries - # aren't used here anyway, we'll just remove them. - postConfigure = '' - rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/gitaly/vendor/" - ''; - }; -in -stdenv.mkDerivation { - pname = "gitlab-shell"; - inherit src version; + goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; + goDeps = ./deps.nix; - patches = [ ./remove-hardcoded-locations-ruby.patch ]; - - # gitlab-shell will try to read its config relative to the source - # code by default which doesn't work in nixos because it's a - # read-only filesystem - postPatch = '' - substituteInPlace lib/gitlab_config.rb --replace \ - "File.join(ROOT_PATH, 'config.yml')" \ - "'/run/gitlab/shell-config.yml'" - ''; - - buildInputs = [ rubyEnv.wrappedRuby ]; - - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -R . $out/ - cp ${goPackage.bin}/bin/* $out/bin/ - - runHook postInstall + postInstall = '' + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index 55faacc41cd..5b5d0b99bcf 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -18,6 +18,42 @@ sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; }; } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } { goPackagePath = "github.com/certifi/gocertifi"; fetch = { @@ -36,6 +72,15 @@ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; }; } + { + goPackagePath = "github.com/cloudflare/tableflip"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/tableflip"; + rev = "8392f1641731"; + sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + }; + } { goPackagePath = "github.com/codahale/hdrhistogram"; fetch = { @@ -68,10 +113,37 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.0"; + rev = "v0.1.2"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } { goPackagePath = "github.com/gogo/protobuf"; fetch = { @@ -90,15 +162,6 @@ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } { goPackagePath = "github.com/golang/mock"; fetch = { @@ -113,8 +176,26 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; }; } { @@ -126,6 +207,15 @@ sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; }; } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "v1.2.0"; + sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; + }; + } { goPackagePath = "github.com/hpcloud/tail"; fetch = { @@ -136,12 +226,57 @@ }; } { - goPackagePath = "github.com/kisielk/gotool"; + goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "v1.3.0"; + sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "ecaeb7a21d47"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; }; } { @@ -162,6 +297,42 @@ sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; }; } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -243,13 +414,58 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.5"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; }; } { @@ -257,8 +473,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { @@ -266,8 +482,8 @@ fetch = { type = "git"; url = "https://github.com/tinylib/msgp"; - rev = "v1.0.2"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; + rev = "v1.1.0"; + sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; }; } { @@ -302,17 +518,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitaly.git"; - rev = "v1.7.0"; - sha256 = "1hhiyw1ag22mgn6chp8lf29y2fgj90xyb7wjd6s30hayqja7knh1"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitaly-proto"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; - rev = "v1.12.0"; - sha256 = "02aqw1q8n84v4f3rc0x7hsg0gkmbqkznp9cl6vrhjvsisv38v695"; + rev = "v1.68.0"; + sha256 = "06w2qx9r7wxhpk6a3icqa0l6hr7x2j2k11kni1ksdx1m1100myjb"; }; } { @@ -338,8 +545,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "182114d58262"; - sha256 = "0dhagsjpk3wn2f7w148v0h9i651jpk4c0mlsy5sihcnmqz8s764l"; + rev = "20be4c3c3ed5"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; }; } { @@ -347,8 +554,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; }; } { @@ -356,8 +563,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "10aee1819953"; - sha256 = "1rd6y0fr2gqhx3bsy0ahnacqzbxijkx8wyfmamrb3wbzc01091rl"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; }; } { @@ -374,8 +581,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; }; } { @@ -383,8 +590,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "70b957f3b65e"; - sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; + rev = "953cdadca894"; + sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; }; } { @@ -401,8 +608,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; }; } { @@ -428,8 +635,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + rev = "v1.24.0"; + sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; }; } { @@ -442,12 +649,12 @@ }; } { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; fetch = { type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { @@ -468,15 +675,6 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } { goPackagePath = "gopkg.in/tomb.v1"; fetch = { @@ -491,8 +689,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } { @@ -500,8 +698,8 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } ] diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix deleted file mode 100644 index 665c21feb1b..00000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix +++ /dev/null @@ -1,451 +0,0 @@ -{ - abstract_type = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; - type = "gem"; - }; - version = "0.0.7"; - }; - adamantium = { - dependencies = ["ice_nine" "memoizable"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; - type = "gem"; - }; - version = "0.2.0"; - }; - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; - type = "gem"; - }; - version = "2.5.2"; - }; - ast = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; - type = "gem"; - }; - version = "2.4.0"; - }; - binding_of_caller = { - dependencies = ["debug_inspector"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; - type = "gem"; - }; - version = "0.8.0"; - }; - coderay = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; - type = "gem"; - }; - version = "1.1.2"; - }; - concord = { - dependencies = ["adamantium" "equalizer"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; - type = "gem"; - }; - version = "0.1.5"; - }; - crack = { - dependencies = ["safe_yaml"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; - debug_inspector = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; - type = "gem"; - }; - version = "0.0.3"; - }; - diff-lcs = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; - type = "gem"; - }; - version = "1.3"; - }; - docile = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; - type = "gem"; - }; - version = "1.1.5"; - }; - equalizer = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; - type = "gem"; - }; - version = "0.0.11"; - }; - hashdiff = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; - type = "gem"; - }; - version = "0.3.7"; - }; - ice_nine = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - listen = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; - type = "gem"; - }; - version = "0.5.3"; - }; - memoizable = { - dependencies = ["thread_safe"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; - type = "gem"; - }; - version = "0.4.2"; - }; - method_source = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; - type = "gem"; - }; - version = "0.9.2"; - }; - multi_json = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; - parallel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; - type = "gem"; - }; - version = "1.12.1"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; - type = "gem"; - }; - version = "2.5.1.2"; - }; - powerpack = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; - type = "gem"; - }; - version = "0.1.2"; - }; - proc_to_ast = { - dependencies = ["coderay" "parser" "unparser"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; - type = "gem"; - }; - version = "0.1.0"; - }; - procto = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; - type = "gem"; - }; - version = "0.0.3"; - }; - pry = { - dependencies = ["coderay" "method_source"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; - type = "gem"; - }; - version = "0.12.2"; - }; - public_suffix = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; - rainbow = { - dependencies = ["rake"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; - type = "gem"; - }; - version = "2.2.2"; - }; - rake = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; - type = "gem"; - }; - version = "12.3.3"; - }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vfqqcjmhdq25jrc8rd7nx4n8xid7s1ynv65ph06bk2xafn3rgll"; - type = "gem"; - }; - version = "3.8.1"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-parameterized = { - dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; - type = "gem"; - }; - version = "0.4.0"; - }; - rspec-support = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; - type = "gem"; - }; - version = "3.8.0"; - }; - rubocop = { - dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; - type = "gem"; - }; - version = "0.49.1"; - }; - ruby-progressbar = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; - type = "gem"; - }; - version = "1.9.0"; - }; - safe_yaml = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - simplecov = { - dependencies = ["docile" "multi_json" "simplecov-html"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; - type = "gem"; - }; - version = "0.9.2"; - }; - simplecov-html = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; - type = "gem"; - }; - version = "0.9.0"; - }; - thread_safe = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; - unicode-display_width = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; - type = "gem"; - }; - version = "1.4.0"; - }; - unparser = { - dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z"; - type = "gem"; - }; - version = "0.2.8"; - }; - vcr = { - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; - type = "gem"; - }; - version = "4.0.0"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; - type = "gem"; - }; - version = "3.4.2"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch deleted file mode 100644 index a4a1a979b24..00000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index f951fe6..b422fe3 100644 ---- a/go/internal/config/config.go -+++ b/go/internal/config/config.go -@@ -3,7 +3,6 @@ package config - import ( - "io/ioutil" - "net/url" -- "os" - "path" - "strings" - -@@ -44,16 +43,13 @@ type Config struct { - } - - func New() (*Config, error) { -- dir, err := os.Getwd() -- if err != nil { -- return nil, err -- } -+ dir := "/run/gitlab" - - return NewFromDir(dir) - } - - func NewFromDir(dir string) (*Config, error) { -- return newFromFile(path.Join(dir, configFile)) -+ return newFromFile("/run/gitlab/shell-config.yml") - } - - func (c *Config) FeatureEnabled(featureName string) bool { -diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go -index 2cb76a8..f59ad5e 100644 ---- a/go/internal/command/fallback/fallback.go -+++ b/go/internal/command/fallback/fallback.go -@@ -53,5 +53,5 @@ - func (c *Command) fallbackProgram() string { - fileName := fmt.Sprintf("%s-ruby", c.Executable.Name) - -- return filepath.Join(c.RootDir, "bin", fileName) -+ return filepath.Join("/run/current-system/sw/bin", fileName) - } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch deleted file mode 100644 index 64623ae310c..00000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..c46f2d7 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -2,7 +2,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) -diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 2cb76a8..f59ad5e 100644 ---- a/lib/gitlab_shell.rb -+++ b/lib/gitlab_shell.rb -@@ -195,7 +195,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength - - args = [executable, gitaly_address, json_args] - # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) -+ # Except we don't, because we're already in the right directory on nixos! -+ Kernel.exec(env, *args, unsetenv_others: true) - end - - def api diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch new file mode 100644 index 00000000000..515a41ad34e --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -0,0 +1,57 @@ +diff --git a/go/internal/config/config.go b/go/internal/config/config.go +index 2231851..c869930 100644 +--- a/go/internal/config/config.go ++++ b/go/internal/config/config.go +@@ -3,7 +3,6 @@ package config + import ( + "io/ioutil" + "net/url" +- "os" + "path" + "path/filepath" + +@@ -38,16 +37,13 @@ type Config struct { + } + + func New() (*Config, error) { +- dir, err := os.Getwd() +- if err != nil { +- return nil, err +- } ++ dir := "/run/gitlab" + + return NewFromDir(dir) + } + + func NewFromDir(dir string) (*Config, error) { +- return newFromFile(path.Join(dir, configFile)) ++ return newFromFile("/run/gitlab/shell-config.yml") + } + + func newFromFile(filename string) (*Config, error) { +diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go +index f92f50b..160e287 100644 +--- a/go/internal/keyline/key_line.go ++++ b/go/internal/keyline/key_line.go +@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi + } + + func (k *KeyLine) ToString() string { +- command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) ++ command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) + + return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) + } +diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb +index 1416488..90a5f79 100644 +--- a/support/gitlab_config.rb ++++ b/support/gitlab_config.rb +@@ -4,7 +4,7 @@ class GitlabConfig + attr_reader :config + + def initialize +- @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml')) ++ @config = YAML.load_file('/run/gitlab/shell-config.yml') + end + + def auth_file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 09a3cee195d..b8364c1efeb 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,20 +3,19 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.10.0"; + version = "8.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "11cfhh48dga5ghfcijb68gbx0nfr5bs3vvp2j1gam9ac37fpvk0x"; + sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; goDeps = ./deps.nix; buildInputs = [ git ]; - - makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ]; + buildFlagsArray = "-ldflags=-X main.Version=${version}"; # gitlab-workhorse depends on an older version of labkit which # contains old, vendored versions of some packages; gitlab-workhorse diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 7a2bfea0c10..846bdeff48d 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -150,3 +150,14 @@ index b276a81eac..070e3ebd81 100644 end end end +--- a/lib/gitlab/authorized_keys.rb ++++ b/lib/gitlab/authorized_keys.rb +@@ -157,7 +157,7 @@ + raise KeyError, "Invalid ID: #{id.inspect}" + end + +- "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}" ++ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" + end + + def strip(key) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 864e514ae0d..920f778c053 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -87,9 +87,9 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.9.11' -# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293 +# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: -# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 +# https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -148,7 +148,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.9' -gem 'rouge', '~> 3.7' +gem 'rouge', '~> 3.11.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.4' @@ -311,7 +311,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996 +# https://gitlab.com/gitlab-org/gitlab/issues/13996 gem 'gitlab-peek', '~> 0.0.1', require: 'peek' # Snowplow events tracking @@ -355,7 +355,7 @@ group :development, :test do gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 4.8.2' + gem 'factory_bot_rails', '~> 5.1.0' gem 'rspec-rails', '~> 3.8.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.5' @@ -405,7 +405,7 @@ group :test do gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.2.5' + gem 'test-prof', '~> 0.10.0' gem 'rspec_junit_formatter' end @@ -446,7 +446,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.58.0' +gem 'gitaly', '~> 1.65.0' gem 'grpc', '~> 1.19.0' @@ -465,7 +465,7 @@ gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' # DNS Lookup -gem 'net-dns', '~> 0.9.0' +gem 'gitlab-net-dns', '~> 0.9.1' # Countries list gem 'countries', '~> 3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index fec34622be3..18160932c56 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -108,7 +108,7 @@ GEM binding_ninja (0.2.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.4) + bootsnap (1.4.5) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -209,10 +209,10 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) - devise (4.6.2) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) + railties (>= 4.1.0) responders warden (~> 1.2.3) devise-two-factor (3.0.0) @@ -254,7 +254,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) equalizer (0.0.11) - erubi (1.8.0) + erubi (1.9.0) escape_utils (1.2.1) et-orbi (1.2.1) tzinfo @@ -264,11 +264,11 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (4.8.2) - activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) - railties (>= 3.0.0) + factory_bot (5.1.0) + activesupport (>= 4.2.0) + factory_bot_rails (5.1.0) + factory_bot (~> 5.1.0) + railties (>= 4.2.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) @@ -358,7 +358,7 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.58.0) + gitaly (1.65.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-labkit (0.5.2) @@ -370,6 +370,7 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-markup (1.7.0) + gitlab-net-dns (0.9.1) gitlab-peek (0.0.1) railties (>= 4.0.0) gitlab-sidekiq-fetcher (0.5.2) @@ -487,7 +488,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -565,7 +566,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.2.3) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -586,7 +587,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.3.0) + msgpack (1.3.1) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -596,7 +597,6 @@ GEM mustermann (~> 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) - net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) @@ -770,8 +770,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.2.0) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-i18n (5.1.1) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) @@ -783,7 +783,7 @@ GEM thor (>= 0.19.0, < 2.0) rainbow (3.0.0) raindrops (0.19.0) - rake (12.3.2) + rake (12.3.3) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -824,9 +824,9 @@ GEM declarative-option (< 0.2.0) uber (< 0.2.0) request_store (1.3.1) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) @@ -834,7 +834,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.7.0) + rouge (3.11.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -994,7 +994,7 @@ GEM temple (0.8.1) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - test-prof (0.2.5) + test-prof (0.10.0) text (1.3.1) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) @@ -1058,8 +1058,8 @@ GEM descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) webfinger (1.1.0) activesupport httpclient (>= 2.4) @@ -1144,7 +1144,7 @@ DEPENDENCIES email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) escape_utils (~> 1.1) - factory_bot_rails (~> 4.8.2) + factory_bot_rails (~> 5.1.0) faraday (~> 0.12) faraday_middleware-aws-signers-v4 fast_blank @@ -1168,11 +1168,12 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.58.0) + gitaly (~> 1.65.0) github-markup (~> 1.7.0) gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) + gitlab-net-dns (~> 0.9.1) gitlab-peek (~> 0.0.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) @@ -1222,7 +1223,6 @@ DEPENDENCIES mini_magick minitest (~> 5.11.0) nakayoshi_fork (~> 0.0.4) - net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.2) @@ -1276,7 +1276,7 @@ DEPENDENCIES redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.7) + rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.8.0) @@ -1314,7 +1314,7 @@ DEPENDENCIES stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) - test-prof (~> 0.2.5) + test-prof (~> 0.10.0) thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 4e71ea72ed9..84a984ea2b3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -482,10 +482,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av"; + sha256 = "0dyjk2irr0d3d3am2dzipg1zyv2nz69a16g8xkprxfa0na07wvs0"; type = "gem"; }; - version = "1.4.4"; + version = "1.4.5"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -975,10 +975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf"; + sha256 = "0a64xq0dj6p0firpg4mrrfmlakpv17hky5yfrjhchs2sybmymr9i"; type = "gem"; }; - version = "4.6.2"; + version = "4.7.1"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -1175,10 +1175,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; escape_utils = { groups = ["default" "development" "test"]; @@ -1258,10 +1258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; + sha256 = "04mvwcdh1056r79vq969vlncrcy53fkhw0iixpqvp8gnx5ajbsv6"; type = "gem"; }; - version = "4.8.2"; + version = "5.1.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1269,10 +1269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; + sha256 = "02q7lwfdilwahza2jz0p0kc2rragv617q9r2yy72syv6lfy923sx"; type = "gem"; }; - version = "4.8.2"; + version = "5.1.0"; }; faraday = { dependencies = ["multipart-post"]; @@ -1645,10 +1645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf"; + sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j"; type = "gem"; }; - version = "1.58.0"; + version = "1.65.0"; }; github-markup = { groups = ["default"]; @@ -1691,6 +1691,16 @@ }; version = "1.7.0"; }; + gitlab-net-dns = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jylfc47477imjmzc4jq7zsxklhrws6q4bb0zzl33drirf6s1ldw"; + type = "gem"; + }; + version = "0.9.1"; + }; gitlab-peek = { dependencies = ["railties"]; groups = ["default"]; @@ -2127,10 +2137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; + sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; i18n_data = { groups = ["default"]; @@ -2467,10 +2477,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; + sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; mail = { dependencies = ["mini_mime"]; @@ -2625,10 +2635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; multi_json = { groups = ["default"]; @@ -2711,16 +2721,6 @@ }; version = "1.1.0"; }; - net-dns = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; - type = "gem"; - }; - version = "0.9.0"; - }; net-ldap = { groups = ["default"]; platforms = []; @@ -3480,10 +3480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; + sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -3532,10 +3532,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; type = "gem"; }; - version = "12.3.2"; + version = "12.3.3"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -3758,10 +3758,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn"; + sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; @@ -3809,10 +3809,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv"; + sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; type = "gem"; }; - version = "3.7.0"; + version = "3.11.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4513,10 +4513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; + sha256 = "0ag33hv8ky8nxpsra9jkam9npi1jjwb7f7zmvi2najci5mdr10nr"; type = "gem"; }; - version = "0.2.5"; + version = "0.10.0"; }; text = { groups = ["default" "development"]; @@ -4839,10 +4839,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; + sha256 = "1fr9n9i9r82xb6i61fdw4xgc7zjv7fsdrr4k0njchy87iw9fl454"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; webfinger = { dependencies = ["activesupport" "httpclient"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 38acf41c6f2..1aeb459f64c 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -193,15 +193,10 @@ def update_gitlab_shell(): repo = GitLabRepo(repo='gitlab-shell') gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - for fn in ['Gemfile.lock', 'Gemfile']: - with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) - for fn in ['go.mod', 'go.sum']: with open(gitlab_shell_dir / fn, 'w') as f: f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}")) - subprocess.check_output(['bundix'], cwd=gitlab_shell_dir) subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) for fn in ['go.mod', 'go.sum']: diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 350d8a1ab0d..cff2603129d 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -10,19 +10,19 @@ }; } { - name = "_babel_core___core_7.5.5.tgz"; + name = "_babel_core___core_7.6.2.tgz"; path = fetchurl { - name = "_babel_core___core_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; - sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + name = "_babel_core___core_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.2.tgz"; + sha1 = "069a776e8d5e9eefff76236bc8845566bd31dd91"; }; } { - name = "_babel_generator___generator_7.5.5.tgz"; + name = "_babel_generator___generator_7.6.2.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; - sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + name = "_babel_generator___generator_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.2.tgz"; + sha1 = "dac8a3c2df118334c2a29ff3446da1636a8f8c03"; }; } { @@ -58,11 +58,11 @@ }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz"; + sha1 = "769711acca889be371e9bc2eb68641d55218021f"; }; } { @@ -194,11 +194,11 @@ }; } { - name = "_babel_helpers___helpers_7.5.5.tgz"; + name = "_babel_helpers___helpers_7.6.2.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; - sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + name = "_babel_helpers___helpers_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz"; + sha1 = "681ffe489ea4dcc55f23ce469e58e59c1c045153"; }; } { @@ -218,11 +218,11 @@ }; } { - name = "_babel_parser___parser_7.5.5.tgz"; + name = "_babel_parser___parser_7.6.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; - sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + name = "_babel_parser___parser_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.2.tgz"; + sha1 = "205e9c95e16ba3b8b96090677a67c9d6075b70a1"; }; } { @@ -330,11 +330,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz"; + sha1 = "8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"; }; } { @@ -362,11 +362,11 @@ }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.4.4.tgz"; - sha1 = "307b7db29d8ae2d259e7c0e6e665b1922d7ac856"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.6.0.tgz"; + sha1 = "19ddc493c7b5d47afdd4291e740c609a83c9fae4"; }; } { @@ -378,11 +378,11 @@ }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; - sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz"; + sha1 = "05413762894f41bfe42b9a5e80919bd575dcc802"; }; } { @@ -570,11 +570,11 @@ }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz"; + sha1 = "96c33ab97a9ae500cc6f5b19e04a7e6553360a79"; }; } { @@ -594,19 +594,19 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz"; + sha1 = "44bbe08b57f4480094d57d9ffbcd96d309075ba6"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; - sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz"; + sha1 = "44abb948b88f0199a627024e1508acaf8dc9b2f9"; }; } { @@ -674,11 +674,11 @@ }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz"; + sha1 = "39dfe957de4420445f1fcf88b68a2e4aa4515486"; }; } { @@ -698,11 +698,11 @@ }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz"; + sha1 = "c1ca0bb84b94f385ca302c3932e870b0fb0e522b"; }; } { @@ -794,11 +794,11 @@ }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; - sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz"; + sha1 = "fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"; }; } { @@ -826,19 +826,19 @@ }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; - sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz"; + sha1 = "b692aad888a7e8d8b1b214be6b9dc03d5031f698"; }; } { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; + name = "_babel_preset_env___preset_env_7.6.2.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + name = "_babel_preset_env___preset_env_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.2.tgz"; + sha1 = "abbb3ed785c7fe4220d4c82a53621d71fc0c75d3"; }; } { @@ -874,27 +874,27 @@ }; } { - name = "_babel_template___template_7.4.4.tgz"; + name = "_babel_template___template_7.6.0.tgz"; path = fetchurl { - name = "_babel_template___template_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; - sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + name = "_babel_template___template_7.6.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz"; + sha1 = "7f0159c7f5012230dad64cca42ec9bdb5c9536e6"; }; } { - name = "_babel_traverse___traverse_7.5.5.tgz"; + name = "_babel_traverse___traverse_7.6.2.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; - sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + name = "_babel_traverse___traverse_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.2.tgz"; + sha1 = "b0e2bfd401d339ce0e6c05690206d1e11502ce2c"; }; } { - name = "_babel_types___types_7.5.5.tgz"; + name = "_babel_types___types_7.6.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; - sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + name = "_babel_types___types_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz"; + sha1 = "53abf3308add3ac2a2884d539151c57c4b3ac648"; }; } { @@ -938,27 +938,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.73.0.tgz"; + name = "_gitlab_svgs___svgs_1.78.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.73.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.73.0.tgz"; - sha1 = "e44b347e4be77b94474c80cf5c2ee26ca0325c2f"; + name = "_gitlab_svgs___svgs_1.78.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz"; + sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4"; }; } { - name = "_gitlab_ui___ui_5.25.2.tgz"; + name = "_gitlab_ui___ui_5.36.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_5.25.2.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.25.2.tgz"; - sha1 = "599954fefcc228d31a398dbe3c1e2287a0fcdb3e"; + name = "_gitlab_ui___ui_5.36.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz"; + sha1 = "3087b23c138ad1c222f6b047e533f253371bc618"; }; } { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; path = fetchurl { - name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.1.tgz"; - sha1 = "7e588328ed018d91560633d56865d65b72c3a11b"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz"; + sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14"; }; } { @@ -1073,14 +1073,6 @@ sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e"; }; } - { - name = "_sindresorhus_is___is_0.7.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz"; - sha1 = "9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"; - }; - } { name = "_types_anymatch___anymatch_1.3.0.tgz"; path = fetchurl { @@ -1281,6 +1273,14 @@ sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b"; }; } + { + name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; + path = fetchurl { + name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz"; + sha1 = "d16fa26b836c06df5baaeb45f3d80afc47e35634"; + }; + } { name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; path = fetchurl { @@ -1290,147 +1290,147 @@ }; } { - name = "_webassemblyjs_ast___ast_1.7.11.tgz"; + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_ast___ast_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz"; - sha1 = "b988582cafbb2b095e8b556526f30c90d057cace"; + name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz"; + sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359"; }; } { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz"; - sha1 = "a69f0af6502eb9a3c045555b1a6129d3d3f2e313"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; + sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721"; }; } { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz"; - sha1 = "c7b6bb8105f84039511a2b39ce494f193818a32a"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; + sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7"; }; } { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz"; - sha1 = "3122d48dcc6c9456ed982debe16c8f37101df39b"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; + sha1 = "fea93e429863dd5e4338555f42292385a653f204"; }; } { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz"; - sha1 = "cf8f106e746662a0da29bdef635fcd3d1248364b"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; + sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e"; }; } { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz"; - sha1 = "df38882a624080d03f7503f93e3f17ac5ac01181"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; + sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452"; }; } { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz"; - sha1 = "d874d722e51e62ac202476935d649c802fa0e209"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; + sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"; }; } { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz"; - sha1 = "dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; + sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61"; }; } { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz"; - sha1 = "9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; + sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"; }; } { - name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz"; - sha1 = "c95839eb63757a31880aaec7b6512d4191ac640b"; + name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; + sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e"; }; } { - name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz"; - sha1 = "d7267a1ee9c4594fd3f7e37298818ec65687db63"; + name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; + sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10"; }; } { - name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz"; - sha1 = "06d7218ea9fdc94a6793aa92208160db3d26ee82"; + name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; + sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"; }; } { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz"; - sha1 = "8c74ca474d4f951d01dbae9bd70814ee22a82005"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; + sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a"; }; } { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz"; - sha1 = "9bbba942f22375686a6fb759afcd7ac9c45da1a8"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; + sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc"; }; } { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz"; - sha1 = "b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; + sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264"; }; } { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz"; - sha1 = "6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; + sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d"; }; } { - name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz"; - sha1 = "25bd117562ca8c002720ff8116ef9072d9ca869c"; + name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; + sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"; }; } { - name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz"; - sha1 = "c4245b6de242cb50a2cc950174fdbf65c78d7813"; + name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; + sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc"; }; } { @@ -1442,11 +1442,11 @@ }; } { - name = "_xtuc_long___long_4.2.1.tgz"; + name = "_xtuc_long___long_4.2.2.tgz"; path = fetchurl { - name = "_xtuc_long___long_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz"; - sha1 = "5c85d662f76fa1d34575766c5dcd6615abcd30d8"; + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; }; } { @@ -1482,19 +1482,11 @@ }; } { - name = "accepts___accepts_1.3.5.tgz"; + name = "accepts___accepts_1.3.7.tgz"; path = fetchurl { - name = "accepts___accepts_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz"; - sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; - }; - } - { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - path = fetchurl { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; - sha1 = "482210140582a36b83c3e342e1cfebcaa9240948"; + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; }; } { @@ -1530,11 +1522,11 @@ }; } { - name = "acorn___acorn_6.2.1.tgz"; + name = "acorn___acorn_6.3.0.tgz"; path = fetchurl { - name = "acorn___acorn_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz"; - sha1 = "3ed8422d6dec09e6121cc7a843ca86a330a86b51"; + name = "acorn___acorn_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; + sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; }; } { @@ -1554,11 +1546,11 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; - sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; + name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; }; } { @@ -1938,11 +1930,11 @@ }; } { - name = "async_each___async_each_1.0.1.tgz"; + name = "async_each___async_each_1.0.3.tgz"; path = fetchurl { - name = "async_each___async_each_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz"; - sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + name = "async_each___async_each_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; + sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; }; } { @@ -2082,11 +2074,11 @@ }; } { - name = "babel_loader___babel_loader_8.0.5.tgz"; + name = "babel_loader___babel_loader_8.0.6.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.5.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz"; - sha1 = "225322d7509c2157655840bba52e46b6c2f2fe33"; + name = "babel_loader___babel_loader_8.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; + sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; }; } { @@ -2298,11 +2290,11 @@ }; } { - name = "body_parser___body_parser_1.18.2.tgz"; + name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz"; - sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; }; } { @@ -2489,6 +2481,14 @@ sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; } + { + name = "buffer_json___buffer_json_2.0.0.tgz"; + path = fetchurl { + name = "buffer_json___buffer_json_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz"; + sha1 = "f73e13b1e42f196fe2fd67d001c7d7107edd7c23"; + }; + } { name = "buffer_shims___buffer_shims_1.0.0.tgz"; path = fetchurl { @@ -2537,6 +2537,14 @@ sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } { name = "cacache___cacache_11.3.3.tgz"; path = fetchurl { @@ -2545,6 +2553,14 @@ sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"; }; } + { + name = "cacache___cacache_12.0.3.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; + sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + }; + } { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { @@ -2554,19 +2570,11 @@ }; } { - name = "cache_loader___cache_loader_2.0.1.tgz"; + name = "cache_loader___cache_loader_4.1.0.tgz"; path = fetchurl { - name = "cache_loader___cache_loader_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz"; - sha1 = "5758f41a62d7c23941e3c3c7016e6faeb03acb07"; - }; - } - { - name = "cacheable_request___cacheable_request_2.1.4.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + name = "cache_loader___cache_loader_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz"; + sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e"; }; } { @@ -2745,14 +2753,6 @@ sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"; }; } - { - name = "chalk___chalk_1.1.3.tgz"; - path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - } { name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { @@ -2761,6 +2761,14 @@ sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } { name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; path = fetchurl { @@ -2842,11 +2850,11 @@ }; } { - name = "chokidar___chokidar_2.0.4.tgz"; + name = "chokidar___chokidar_2.1.8.tgz"; path = fetchurl { - name = "chokidar___chokidar_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz"; - sha1 = "356ff4e2b0e8e43e322d18a372460bbcf3accd26"; + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; }; } { @@ -2866,11 +2874,11 @@ }; } { - name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; - sha1 = "45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"; + name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; }; } { @@ -2977,6 +2985,14 @@ sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; }; } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } { name = "clone_buffer___clone_buffer_1.0.0.tgz"; path = fetchurl { @@ -3001,14 +3017,6 @@ sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f"; }; } - { - name = "clone_response___clone_response_1.0.2.tgz"; - path = fetchurl { - name = "clone_response___clone_response_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - } { name = "clone_stats___clone_stats_1.0.0.tgz"; path = fetchurl { @@ -3145,14 +3153,6 @@ sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; }; } - { - name = "commander___commander_2.17.1.tgz"; - path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; - }; - } { name = "commander___commander_2.9.0.tgz"; path = fetchurl { @@ -3202,27 +3202,27 @@ }; } { - name = "compressible___compressible_2.0.15.tgz"; + name = "compressible___compressible_2.0.17.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.15.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz"; - sha1 = "857a9ab0a7e5a07d8d837ed43fe2defff64fe212"; + name = "compressible___compressible_2.0.17.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; + sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; }; } { - name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; path = fetchurl { - name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz"; - sha1 = "46476350c1eb27f783dccc79ac2f709baa2cffbc"; + name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz"; + sha1 = "097d2e4d95c3a14cb5c8ed20899009ab5b9bbca0"; }; } { - name = "compression___compression_1.7.3.tgz"; + name = "compression___compression_1.7.4.tgz"; path = fetchurl { - name = "compression___compression_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz"; - sha1 = "27e0e176aaf260f7f2c2813c3e440adb9f1993db"; + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; }; } { @@ -3266,11 +3266,11 @@ }; } { - name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; path = fetchurl { - name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz"; - sha1 = "e51d17f8f0ef0db90a64fdb47de3051556e9f169"; + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; }; } { @@ -3330,11 +3330,11 @@ }; } { - name = "content_disposition___content_disposition_0.5.2.tgz"; + name = "content_disposition___content_disposition_0.5.3.tgz"; path = fetchurl { - name = "content_disposition___content_disposition_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; }; } { @@ -3377,6 +3377,14 @@ sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { @@ -3426,11 +3434,11 @@ }; } { - name = "core_js___core_js_3.1.3.tgz"; + name = "core_js___core_js_3.2.1.tgz"; path = fetchurl { - name = "core_js___core_js_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz"; - sha1 = "95700bca5f248f5f78c0ec63e784eca663ec4138"; + name = "core_js___core_js_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz"; + sha1 = "cd41f38534da6cc59f7db050fe67307de9868b09"; }; } { @@ -3497,6 +3505,14 @@ sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562"; }; } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } { name = "cross_spawn___cross_spawn_3.0.1.tgz"; path = fetchurl { @@ -3513,14 +3529,6 @@ sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } { name = "crypt___crypt_0.0.2.tgz"; path = fetchurl { @@ -3570,11 +3578,11 @@ }; } { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz"; path = fetchurl { - name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz"; - sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86"; + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz"; + sha1 = "a177271a8bca5019172f4f891fc6eed9cbf68d5d"; }; } { @@ -4057,14 +4065,6 @@ sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; } - { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } { name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; path = fetchurl { @@ -4081,14 +4081,6 @@ sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; } - { - name = "decompress_response___decompress_response_3.3.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - } { name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { @@ -4122,11 +4114,11 @@ }; } { - name = "default_gateway___default_gateway_2.7.2.tgz"; + name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { - name = "default_gateway___default_gateway_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz"; - sha1 = "b7ef339e5e024b045467af403d50348db4642d0f"; + name = "default_gateway___default_gateway_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; + sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; }; } { @@ -4186,11 +4178,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -4865,6 +4857,14 @@ sha1 = "a10f10dedfc92def774ec9bb5bfbd2fb8e1c96d2"; }; } + { + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; + path = fetchurl { + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.1.0.tgz"; + sha1 = "d03b74224c5cfbc7fc0bdd12ce4eb400d09e0c0b"; + }; + } { name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; path = fetchurl { @@ -4898,11 +4898,11 @@ }; } { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz"; - sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; }; } { @@ -5010,11 +5010,11 @@ }; } { - name = "eventemitter3___eventemitter3_1.2.0.tgz"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; }; } { @@ -5025,6 +5025,14 @@ sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; }; } + { + name = "events___events_3.0.0.tgz"; + path = fetchurl { + name = "events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; + sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + }; + } { name = "eventsource___eventsource_1.0.7.tgz"; path = fetchurl { @@ -5049,14 +5057,6 @@ sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; }; } - { - name = "execa___execa_0.10.0.tgz"; - path = fetchurl { - name = "execa___execa_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz"; - sha1 = "ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"; - }; - } { name = "execa___execa_0.7.0.tgz"; path = fetchurl { @@ -5122,11 +5122,11 @@ }; } { - name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; + name = "express___express_4.17.1.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; - url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; }; } { @@ -5226,11 +5226,11 @@ }; } { - name = "fastparse___fastparse_1.1.1.tgz"; + name = "fastparse___fastparse_1.1.2.tgz"; path = fetchurl { - name = "fastparse___fastparse_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz"; - sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8"; + name = "fastparse___fastparse_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz"; + sha1 = "91728c5a5942eced8531283c79441ee4122c35a9"; }; } { @@ -5298,11 +5298,11 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.2.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_loader___file_loader_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz"; + sha1 = "5fb124d2369d7075d70a9a5abecd12e60a95215e"; }; } { @@ -5346,11 +5346,11 @@ }; } { - name = "finalhandler___finalhandler_1.1.1.tgz"; + name = "finalhandler___finalhandler_1.1.2.tgz"; path = fetchurl { - name = "finalhandler___finalhandler_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz"; - sha1 = "eebf4ed840079c83f4249038c9d703008301b105"; + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; }; } { @@ -5361,6 +5361,14 @@ sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; }; } + { + name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz"; + sha1 = "cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"; + }; + } { name = "find_root___find_root_1.1.0.tgz"; path = fetchurl { @@ -5394,11 +5402,19 @@ }; } { - name = "findup_sync___findup_sync_2.0.0.tgz"; + name = "find_up___find_up_4.1.0.tgz"; path = fetchurl { - name = "findup_sync___findup_sync_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz"; - sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "findup_sync___findup_sync_3.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; + sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; }; } { @@ -5625,6 +5641,14 @@ sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; }; } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } { name = "get_port___get_port_4.2.0.tgz"; path = fetchurl { @@ -5802,11 +5826,11 @@ }; } { - name = "global_modules_path___global_modules_path_2.3.1.tgz"; + name = "global_modules___global_modules_2.0.0.tgz"; path = fetchurl { - name = "global_modules_path___global_modules_path_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz"; - sha1 = "e541f4c800a1a8514a990477b267ac67525b9931"; + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; }; } { @@ -5817,14 +5841,6 @@ sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; }; } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; - }; - } { name = "global_prefix___global_prefix_1.0.2.tgz"; path = fetchurl { @@ -5929,14 +5945,6 @@ sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; }; } - { - name = "got___got_8.3.0.tgz"; - path = fetchurl { - name = "got___got_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz"; - sha1 = "6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533"; - }; - } { name = "graceful_fs___graceful_fs_4.2.0.tgz"; path = fetchurl { @@ -6057,14 +6065,6 @@ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; } - { - name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; - path = fetchurl { - name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.3.0.tgz"; - sha1 = "588bd6927eaa0e296afae24160659167fc2be4f8"; - }; - } { name = "has_symbols___has_symbols_1.0.0.tgz"; path = fetchurl { @@ -6073,14 +6073,6 @@ sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; }; } - { - name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; - path = fetchurl { - name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.3.0.tgz"; - sha1 = "78e3d98c3c0ec9413e970eb8d766249a1e13058f"; - }; - } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -6266,11 +6258,11 @@ }; } { - name = "html_entities___html_entities_1.2.0.tgz"; + name = "html_entities___html_entities_1.2.1.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz"; - sha1 = "41948caf85ce82fed36e4e6a0ed371a6664379e2"; + name = "html_entities___html_entities_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; } { @@ -6305,14 +6297,6 @@ sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464"; }; } - { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; - }; - } { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { @@ -6321,6 +6305,14 @@ sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; }; } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } { name = "http_errors___http_errors_1.6.2.tgz"; path = fetchurl { @@ -6330,19 +6322,19 @@ }; } { - name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz"; - sha1 = "0987e6bb5a5606e5a69168d8f967a87f15dd8aab"; + name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; }; } { - name = "http_proxy___http_proxy_1.16.2.tgz"; + name = "http_proxy___http_proxy_1.18.0.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.16.2.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz"; - sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + name = "http_proxy___http_proxy_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; + sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; }; } { @@ -6369,14 +6361,6 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } - { - name = "iconv_lite___iconv_lite_0.4.19.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.19.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz"; - sha1 = "f7468f60135f5e5dad3399c0a81be9a1603a082b"; - }; - } { name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; path = fetchurl { @@ -6553,6 +6537,14 @@ sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -6594,27 +6586,19 @@ }; } { - name = "internal_ip___internal_ip_3.0.1.tgz"; + name = "internal_ip___internal_ip_4.3.0.tgz"; path = fetchurl { - name = "internal_ip___internal_ip_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz"; - sha1 = "df5c99876e1d2eb2ea2d74f520e3f669a00ece27"; + name = "internal_ip___internal_ip_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; + sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; }; } { - name = "interpret___interpret_1.1.0.tgz"; + name = "interpret___interpret_1.2.0.tgz"; path = fetchurl { - name = "interpret___interpret_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz"; - sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; - }; - } - { - name = "into_stream___into_stream_3.1.0.tgz"; - path = fetchurl { - name = "into_stream___into_stream_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz"; - sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + name = "interpret___interpret_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz"; + sha1 = "d5061a6224be58e8083985f5014d844359576296"; }; } { @@ -6658,11 +6642,19 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; - sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; + name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + }; + } + { + name = "is_absolute_url___is_absolute_url_3.0.2.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.2.tgz"; + sha1 = "554f2933e7385cc46e94351977ca2081170a206e"; }; } { @@ -6969,14 +6961,6 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } - { - name = "is_object___is_object_1.0.1.tgz"; - path = fetchurl { - name = "is_object___is_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz"; - sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; - }; - } { name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; path = fetchurl { @@ -6985,6 +6969,14 @@ sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; }; } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } { name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; path = fetchurl { @@ -6993,6 +6985,14 @@ sha1 = "6477582b8214d602346094567003be8a9eac04dc"; }; } + { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } { name = "is_path_inside___is_path_inside_1.0.0.tgz"; path = fetchurl { @@ -7001,6 +7001,14 @@ sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; }; } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + }; + } { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { @@ -7289,14 +7297,6 @@ sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53"; }; } - { - name = "isurl___isurl_1.0.0.tgz"; - path = fetchurl { - name = "isurl___isurl_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz"; - sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"; - }; - } { name = "iterall___iterall_1.2.2.tgz"; path = fetchurl { @@ -7729,14 +7729,6 @@ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; }; } - { - name = "json_buffer___json_buffer_3.0.0.tgz"; - path = fetchurl { - name = "json_buffer___json_buffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; - }; - } { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; path = fetchurl { @@ -7914,19 +7906,11 @@ }; } { - name = "keyv___keyv_3.0.0.tgz"; + name = "killable___killable_1.0.1.tgz"; path = fetchurl { - name = "keyv___keyv_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz"; - sha1 = "44923ba39e68b12a7cec7df6c3268c031f2ef373"; - }; - } - { - name = "killable___killable_1.0.0.tgz"; - path = fetchurl { - name = "killable___killable_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz"; - sha1 = "da8b84bd47de5395878f95d64d02f2449fe05e6b"; + name = "killable___killable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; + sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; }; } { @@ -8114,11 +8098,11 @@ }; } { - name = "loader_runner___loader_runner_2.3.0.tgz"; + name = "loader_runner___loader_runner_2.4.0.tgz"; path = fetchurl { - name = "loader_runner___loader_runner_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz"; - sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + name = "loader_runner___loader_runner_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; + sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; }; } { @@ -8145,6 +8129,14 @@ sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; }; } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; path = fetchurl { @@ -8161,14 +8153,6 @@ sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; } - { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; - }; - } { name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz"; path = fetchurl { @@ -8274,11 +8258,11 @@ }; } { - name = "loglevel___loglevel_1.4.1.tgz"; + name = "loglevel___loglevel_1.6.4.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz"; - sha1 = "95b383f91a3c2756fd4ab093667e4309161f2bcd"; + name = "loglevel___loglevel_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz"; + sha1 = "f408f4f006db8354d0577dcf6d33485b3cb90d56"; }; } { @@ -8369,6 +8353,14 @@ sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; }; } + { + name = "make_dir___make_dir_3.0.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz"; + sha1 = "1b5f39f6b9270ed33f9f054c5c0f84304989f801"; + }; + } { name = "make_error___make_error_1.3.5.tgz"; path = fetchurl { @@ -8385,6 +8377,14 @@ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; } + { + name = "mamacro___mamacro_0.0.3.tgz"; + path = fetchurl { + name = "mamacro___mamacro_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz"; + sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; + }; + } { name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; path = fetchurl { @@ -8682,27 +8682,27 @@ }; } { - name = "mime_db___mime_db_1.37.0.tgz"; + name = "mime_db___mime_db_1.40.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.37.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz"; - sha1 = "0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"; + name = "mime_db___mime_db_1.40.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; + sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; }; } { - name = "mime_types___mime_types_2.1.21.tgz"; + name = "mime_types___mime_types_2.1.24.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.21.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz"; - sha1 = "28995aa1ecb770742fe6ae7e58f9181c744b3f96"; + name = "mime_types___mime_types_2.1.24.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; + sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; }; } { - name = "mime___mime_1.4.1.tgz"; + name = "mime___mime_1.6.0.tgz"; path = fetchurl { - name = "mime___mime_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz"; - sha1 = "121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"; + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; }; } { @@ -8729,14 +8729,6 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } - { - name = "mimic_response___mimic_response_1.0.0.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz"; - sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; - }; - } { name = "minify___minify_4.1.2.tgz"; path = fetchurl { @@ -8970,11 +8962,11 @@ }; } { - name = "negotiator___negotiator_0.6.1.tgz"; + name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { - name = "negotiator___negotiator_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; }; } { @@ -9018,11 +9010,11 @@ }; } { - name = "node_forge___node_forge_0.6.33.tgz"; + name = "node_forge___node_forge_0.8.2.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.6.33.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz"; - sha1 = "463811879f573d45155ad6a9f43dc296e8e85ebc"; + name = "node_forge___node_forge_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.2.tgz"; + sha1 = "b4bcc59fb12ce77a8825fc6a783dfe3182499c5a"; }; } { @@ -9042,11 +9034,11 @@ }; } { - name = "node_libs_browser___node_libs_browser_2.1.0.tgz"; + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; path = fetchurl { - name = "node_libs_browser___node_libs_browser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; - sha1 = "5f94263d404f6e44767d726901fff05478d600df"; + name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; }; } { @@ -9161,14 +9153,6 @@ sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03"; }; } - { - name = "normalize_url___normalize_url_2.0.1.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz"; - sha1 = "835a9da1551fa26f70e92329069a23aa6574d7e6"; - }; - } { name = "normalize_url___normalize_url_1.9.1.tgz"; path = fetchurl { @@ -9338,11 +9322,11 @@ }; } { - name = "on_headers___on_headers_1.0.1.tgz"; + name = "on_headers___on_headers_1.0.2.tgz"; path = fetchurl { - name = "on_headers___on_headers_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; }; } { @@ -9370,11 +9354,11 @@ }; } { - name = "opn___opn_5.2.0.tgz"; + name = "opn___opn_5.5.0.tgz"; path = fetchurl { - name = "opn___opn_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz"; - sha1 = "71fdf934d6827d676cecbea1531f95d354641225"; + name = "opn___opn_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; + sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; }; } { @@ -9473,14 +9457,6 @@ sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; }; } - { - name = "p_cancelable___p_cancelable_0.4.1.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha1 = "35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"; - }; - } { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { @@ -9505,14 +9481,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_1.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; - }; - } { name = "p_is_promise___p_is_promise_2.1.0.tgz"; path = fetchurl { @@ -9554,11 +9522,19 @@ }; } { - name = "p_map___p_map_1.1.1.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz"; - sha1 = "05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"; + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; }; } { @@ -9570,11 +9546,11 @@ }; } { - name = "p_timeout___p_timeout_2.0.1.tgz"; + name = "p_retry___p_retry_3.0.1.tgz"; path = fetchurl { - name = "p_timeout___p_timeout_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz"; - sha1 = "d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"; + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; }; } { @@ -9730,11 +9706,11 @@ }; } { - name = "parseurl___parseurl_1.3.2.tgz"; + name = "parseurl___parseurl_1.3.3.tgz"; path = fetchurl { - name = "parseurl___parseurl_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz"; - sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; }; } { @@ -9746,11 +9722,11 @@ }; } { - name = "path_browserify___path_browserify_0.0.0.tgz"; + name = "path_browserify___path_browserify_0.0.1.tgz"; path = fetchurl { - name = "path_browserify___path_browserify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz"; - sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + name = "path_browserify___path_browserify_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; + sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; }; } { @@ -9777,6 +9753,14 @@ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; }; } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -9969,6 +9953,14 @@ sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; }; } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } { name = "pluralize___pluralize_7.0.0.tgz"; path = fetchurl { @@ -10018,11 +10010,11 @@ }; } { - name = "portfinder___portfinder_1.0.13.tgz"; + name = "portfinder___portfinder_1.0.24.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.13.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz"; - sha1 = "bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"; + name = "portfinder___portfinder_1.0.24.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.24.tgz"; + sha1 = "11efbc6865f12f37624b6531ead1d809ed965cfa"; }; } { @@ -10202,11 +10194,11 @@ }; } { - name = "postcss___postcss_7.0.17.tgz"; + name = "postcss___postcss_7.0.18.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.17.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; - sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + name = "postcss___postcss_7.0.18.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz"; + sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233"; }; } { @@ -10225,14 +10217,6 @@ sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; }; } - { - name = "prepend_http___prepend_http_2.0.0.tgz"; - path = fetchurl { - name = "prepend_http___prepend_http_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - } { name = "prettier___prettier_1.16.3.tgz"; path = fetchurl { @@ -10458,11 +10442,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.4.tgz"; + name = "proxy_addr___proxy_addr_2.0.5.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz"; - sha1 = "ecfc733bf22ff8c6f407fa275327b9ab67e48b93"; + name = "proxy_addr___proxy_addr_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; }; } { @@ -10562,11 +10546,11 @@ }; } { - name = "qs___qs_6.5.1.tgz"; + name = "qs___qs_6.7.0.tgz"; path = fetchurl { - name = "qs___qs_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz"; - sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"; + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; }; } { @@ -10585,14 +10569,6 @@ sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; }; } - { - name = "query_string___query_string_5.1.1.tgz"; - path = fetchurl { - name = "query_string___query_string_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz"; - sha1 = "a78c012b71c17e05f2e3fa2319dd330682efb3cb"; - }; - } { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { @@ -10666,11 +10642,11 @@ }; } { - name = "raw_body___raw_body_2.3.2.tgz"; + name = "raw_body___raw_body_2.4.0.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; }; } { @@ -10682,11 +10658,11 @@ }; } { - name = "raw_loader___raw_loader_1.0.0.tgz"; + name = "raw_loader___raw_loader_3.1.0.tgz"; path = fetchurl { - name = "raw_loader___raw_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz"; - sha1 = "3f9889e73dadbda9a424bce79809b4133ad46405"; + name = "raw_loader___raw_loader_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz"; + sha1 = "5e9d399a5a222cc0de18f42c3bc5e49677532b3f"; }; } { @@ -10802,11 +10778,11 @@ }; } { - name = "readdirp___readdirp_2.1.0.tgz"; + name = "readdirp___readdirp_2.2.1.tgz"; path = fetchurl { - name = "readdirp___readdirp_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz"; - sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + name = "readdirp___readdirp_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; + sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; }; } { @@ -10873,14 +10849,6 @@ sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; }; } - { - name = "regexp_tree___regexp_tree_0.1.11.tgz"; - path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.11.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz"; - sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"; - }; - } { name = "regexpp___regexpp_2.0.1.tgz"; path = fetchurl { @@ -10898,11 +10866,11 @@ }; } { - name = "regexpu_core___regexpu_core_4.5.4.tgz"; + name = "regexpu_core___regexpu_core_4.6.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.5.4.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz"; - sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae"; + name = "regexpu_core___regexpu_core_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; + sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; }; } { @@ -11145,6 +11113,14 @@ sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; }; } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } { name = "require_uncached___require_uncached_1.0.3.tgz"; path = fetchurl { @@ -11177,6 +11153,14 @@ sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; }; } + { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + path = fetchurl { + name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; + sha1 = "0e9020dd3d21024458d4ebd27e23e40269810464"; + }; + } { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { @@ -11249,14 +11233,6 @@ sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e"; }; } - { - name = "responselike___responselike_1.0.2.tgz"; - path = fetchurl { - name = "responselike___responselike_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - } { name = "restore_cursor___restore_cursor_2.0.0.tgz"; path = fetchurl { @@ -11273,6 +11249,14 @@ sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; }; } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } { name = "rfdc___rfdc_1.1.4.tgz"; path = fetchurl { @@ -11345,14 +11329,6 @@ sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1"; }; } - { - name = "safe_buffer___safe_buffer_5.1.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz"; - sha1 = "893312af69b2123def71f57889001671eeb2c853"; - }; - } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -11441,6 +11417,14 @@ sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; }; } + { + name = "schema_utils___schema_utils_2.2.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; + sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + }; + } { name = "scope_css___scope_css_1.2.1.tgz"; path = fetchurl { @@ -11482,11 +11466,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.1.tgz"; + name = "selfsigned___selfsigned_1.10.6.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz"; - sha1 = "bf8cb7b83256c4551e31347c6311778db99eec52"; + name = "selfsigned___selfsigned_1.10.6.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.6.tgz"; + sha1 = "7b3cd37ed9c2034261a173af1a1aae27d8169b67"; }; } { @@ -11506,11 +11490,11 @@ }; } { - name = "semver___semver_6.2.0.tgz"; + name = "semver___semver_6.3.0.tgz"; path = fetchurl { - name = "semver___semver_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz"; - sha1 = "4d813d9590aaf8a9192693d6c85b9344de5901db"; + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } { @@ -11522,11 +11506,11 @@ }; } { - name = "send___send_0.16.2.tgz"; + name = "send___send_0.17.1.tgz"; path = fetchurl { - name = "send___send_0.16.2.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz"; - sha1 = "6ecca1e0f8c156d141597559848df64730a6bbc1"; + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; }; } { @@ -11546,11 +11530,11 @@ }; } { - name = "serve_static___serve_static_1.13.2.tgz"; + name = "serve_static___serve_static_1.14.1.tgz"; path = fetchurl { - name = "serve_static___serve_static_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz"; - sha1 = "095e8472fd5b46237db50ce486a43f4b86c6cec1"; + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; }; } { @@ -11561,14 +11545,6 @@ sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; } - { - name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; - path = fetchurl { - name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; - sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; - }; - } { name = "set_value___set_value_0.4.3.tgz"; path = fetchurl { @@ -11602,11 +11578,11 @@ }; } { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; }; } { @@ -11786,11 +11762,11 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; }; } { @@ -11809,14 +11785,6 @@ sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; }; } - { - name = "sort_keys___sort_keys_2.0.0.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz"; - sha1 = "658535584861ec97d730d6cf41822e1f56684128"; - }; - } { name = "sortablejs___sortablejs_1.10.0.tgz"; path = fetchurl { @@ -11825,14 +11793,6 @@ sha1 = "0ebc054acff2486569194a2f975b2b145dd5e7d6"; }; } - { - name = "sortablejs___sortablejs_1.9.0.tgz"; - path = fetchurl { - name = "sortablejs___sortablejs_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.9.0.tgz"; - sha1 = "2d1e74ae6bac2cb4ad0622908f340848969eb88d"; - }; - } { name = "source_list_map___source_list_map_2.0.0.tgz"; path = fetchurl { @@ -11850,11 +11810,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.12.tgz"; + name = "source_map_support___source_map_support_0.5.13.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.12.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz"; - sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599"; + name = "source_map_support___source_map_support_0.5.13.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; + sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; }; } { @@ -11946,11 +11906,11 @@ }; } { - name = "spdy___spdy_4.0.0.tgz"; + name = "spdy___spdy_4.0.1.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz"; - sha1 = "81f222b5a743a329aa12cea6a390e60e9b613c52"; + name = "spdy___spdy_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; + sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; }; } { @@ -12034,11 +11994,11 @@ }; } { - name = "statuses___statuses_1.4.0.tgz"; + name = "statuses___statuses_1.5.0.tgz"; path = fetchurl { - name = "statuses___statuses_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz"; - sha1 = "bb73d446da2796106efcc1b601a253d6c46bd087"; + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; } { @@ -12170,11 +12130,11 @@ }; } { - name = "string_width___string_width_3.0.0.tgz"; + name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { - name = "string_width___string_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz"; - sha1 = "5a1690a57cc78211fffd9bf24bbe24d090604eb1"; + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; }; } { @@ -12290,11 +12250,11 @@ }; } { - name = "style_loader___style_loader_0.23.1.tgz"; + name = "style_loader___style_loader_1.0.0.tgz"; path = fetchurl { - name = "style_loader___style_loader_0.23.1.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; - sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; + name = "style_loader___style_loader_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; + sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; }; } { @@ -12345,6 +12305,14 @@ sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"; }; } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -12361,14 +12329,6 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } - { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } { name = "svg_tags___svg_tags_1.0.0.tgz"; path = fetchurl { @@ -12426,11 +12386,11 @@ }; } { - name = "tapable___tapable_1.1.0.tgz"; + name = "tapable___tapable_1.1.3.tgz"; path = fetchurl { - name = "tapable___tapable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz"; - sha1 = "0d076a172e3d9ba088fd2272b2668fb8d194b78c"; + name = "tapable___tapable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; + sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; }; } { @@ -12458,27 +12418,19 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz"; - sha1 = "7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; + sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; }; } { - name = "terser___terser_3.14.1.tgz"; + name = "terser___terser_4.3.1.tgz"; path = fetchurl { - name = "terser___terser_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz"; - sha1 = "cc4764014af570bc79c79742358bd46926018a32"; - }; - } - { - name = "terser___terser_4.0.0.tgz"; - path = fetchurl { - name = "terser___terser_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz"; - sha1 = "ef356f6f359a963e2cc675517f21c1c382877374"; + name = "terser___terser_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz"; + sha1 = "09820bcb3398299c4b48d9a86aefc65127d0ed65"; }; } { @@ -12753,6 +12705,14 @@ sha1 = "6e45b1263f2017fa0acc7d89d78b15b8bf77da32"; }; } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } { name = "touch___touch_3.1.0.tgz"; path = fetchurl { @@ -12801,14 +12761,6 @@ sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; }; } - { - name = "trim_right___trim_right_1.0.1.tgz"; - path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - } { name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; path = fetchurl { @@ -12930,11 +12882,11 @@ }; } { - name = "type_is___type_is_1.6.16.tgz"; + name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { - name = "type_is___type_is_1.6.16.tgz"; - url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz"; - sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194"; + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; }; } { @@ -13242,11 +13194,11 @@ }; } { - name = "upath___upath_1.1.0.tgz"; + name = "upath___upath_1.2.0.tgz"; path = fetchurl { - name = "upath___upath_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz"; - sha1 = "35256597e46a581db4793d0ce47fa9aebfc9fabd"; + name = "upath___upath_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; + sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; }; } { @@ -13282,11 +13234,11 @@ }; } { - name = "url_loader___url_loader_1.1.2.tgz"; + name = "url_loader___url_loader_2.1.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz"; - sha1 = "b971d191b83af693c5e3fea4064be9e1f2d7f8d8"; + name = "url_loader___url_loader_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; + sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; }; } { @@ -13297,14 +13249,6 @@ sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; }; } - { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - path = fetchurl { - name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - } { name = "url_parse___url_parse_1.4.4.tgz"; path = fetchurl { @@ -13321,14 +13265,6 @@ sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b"; }; } - { - name = "url_to_options___url_to_options_1.0.1.tgz"; - path = fetchurl { - name = "url_to_options___url_to_options_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; - }; - } { name = "url___url_0.10.3.tgz"; path = fetchurl { @@ -13385,6 +13321,14 @@ sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; }; } + { + name = "util___util_0.11.1.tgz"; + path = fetchurl { + name = "util___util_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; + sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; + }; + } { name = "utils_merge___utils_merge_1.0.1.tgz"; path = fetchurl { @@ -13402,11 +13346,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz"; - sha1 = "a428b28bb26790734c4fc8bc9fa106fccebf6a6c"; + name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; + sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"; }; } { @@ -13546,11 +13490,11 @@ }; } { - name = "vm_browserify___vm_browserify_0.0.4.tgz"; + name = "vm_browserify___vm_browserify_1.1.0.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz"; - sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + name = "vm_browserify___vm_browserify_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; + sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; }; } { @@ -13610,19 +13554,11 @@ }; } { - name = "vue_loader___vue_loader_15.7.0.tgz"; + name = "vue_loader___vue_loader_15.7.1.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.7.0.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz"; - sha1 = "27275aa5a3ef4958c5379c006dd1436ad04b25b3"; - }; - } - { - name = "vue_resource___vue_resource_1.5.1.tgz"; - path = fetchurl { - name = "vue_resource___vue_resource_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/vue-resource/-/vue-resource-1.5.1.tgz"; - sha1 = "0f3d685e3254d21800bebd966edcf56c34b3b6e4"; + name = "vue_loader___vue_loader_15.7.1.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz"; + sha1 = "6ccacd4122aa80f69baaac08ff295a62e3aefcfd"; }; } { @@ -13714,11 +13650,11 @@ }; } { - name = "watchpack___watchpack_1.5.0.tgz"; + name = "watchpack___watchpack_1.6.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz"; - sha1 = "231e783af830a22f8966f65c4c4bacc814072eed"; + name = "watchpack___watchpack_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; + sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; }; } { @@ -13738,43 +13674,35 @@ }; } { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.5.1.tgz"; path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz"; - sha1 = "3da733a900f515914e729fcebcd4c40dde71fc6f"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.1.tgz"; + sha1 = "84aabb1547178d842ebb4ccc7324084b6c3b0ea9"; }; } { - name = "webpack_cli___webpack_cli_3.2.1.tgz"; + name = "webpack_cli___webpack_cli_3.3.9.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.1.tgz"; - sha1 = "779c696c82482491f0803907508db2e276ed3b61"; + name = "webpack_cli___webpack_cli_3.3.9.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.9.tgz"; + sha1 = "79c27e71f94b7fe324d594ab64a8e396b9daa91a"; }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz"; - sha1 = "1132fecc9026fd90f0ecedac5cbff75d1fb45890"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; + sha1 = "1167aea02afa034489869b8368fe9fed1aea7d09"; }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.8.1.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz"; - sha1 = "ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"; - }; - } - { - name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; - path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz"; - sha1 = "60fb229b997fc5a0a1fc6237421030180959d469"; + name = "webpack_dev_server___webpack_dev_server_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.1.tgz"; + sha1 = "485b64c4aadc23f601e72114b40c1b1fea31d9f1"; }; } { @@ -13786,27 +13714,27 @@ }; } { - name = "webpack_sources___webpack_sources_1.3.0.tgz"; + name = "webpack_sources___webpack_sources_1.4.3.tgz"; path = fetchurl { - name = "webpack_sources___webpack_sources_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz"; - sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"; + name = "webpack_sources___webpack_sources_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; }; } { - name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; + name = "webpack_stats_plugin___webpack_stats_plugin_0.3.0.tgz"; path = fetchurl { - name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.2.1.tgz"; - sha1 = "1f5bac13fc25d62cbb5fd0ff646757dc802b8595"; + name = "webpack_stats_plugin___webpack_stats_plugin_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.3.0.tgz"; + sha1 = "6952f63feb9a5393a328d774fb3eccac78d2f51b"; }; } { - name = "webpack___webpack_4.29.0.tgz"; + name = "webpack___webpack_4.40.2.tgz"; path = fetchurl { - name = "webpack___webpack_4.29.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz"; - sha1 = "f2cfef83f7ae404ba889ff5d43efd285ca26e750"; + name = "webpack___webpack_4.40.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.40.2.tgz"; + sha1 = "d21433d250f900bf0facbabe8f50d585b2dc30a7"; }; } { @@ -13914,11 +13842,11 @@ }; } { - name = "worker_farm___worker_farm_1.5.2.tgz"; + name = "worker_farm___worker_farm_1.7.0.tgz"; path = fetchurl { - name = "worker_farm___worker_farm_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz"; - sha1 = "32b312e5dc3d5d45d79ef44acc2587491cd729ae"; + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; }; } { @@ -13937,6 +13865,14 @@ sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; }; } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -13978,11 +13914,11 @@ }; } { - name = "ws___ws_6.0.0.tgz"; + name = "ws___ws_6.2.1.tgz"; path = fetchurl { - name = "ws___ws_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.0.0.tgz"; - sha1 = "eaa494aded00ac4289d455bac8d84c7c651cef35"; + name = "ws___ws_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; + sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; }; } { @@ -14073,14 +14009,6 @@ sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; }; } - { - name = "xregexp___xregexp_4.0.0.tgz"; - path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; - }; - } { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { @@ -14145,6 +14073,14 @@ sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; }; } + { + name = "yargs_parser___yargs_parser_13.1.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + }; + } { name = "yargs_parser___yargs_parser_5.0.0.tgz"; path = fetchurl { @@ -14153,14 +14089,6 @@ sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; }; } - { - name = "yargs___yargs_12.0.2.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; - }; - } { name = "yargs___yargs_12.0.5.tgz"; path = fetchurl { @@ -14169,6 +14097,14 @@ sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; }; } + { + name = "yargs___yargs_13.2.4.tgz"; + path = fetchurl { + name = "yargs___yargs_13.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz"; + sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83"; + }; + } { name = "yargs___yargs_7.1.0.tgz"; path = fetchurl { From 041cbd860df7c72bd3272784caad9ab8b373e084 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 27 Oct 2019 12:04:09 +0100 Subject: [PATCH 36/76] nixos/gitlab: Abort on error and use of unset variables Default behavior is to continue executing the script even when one or multiple steps fail. We want to abort early if any part of the initialization fails to not run with a partially initialized state. Default behavior also allows dereferencing non-existent variables, potentially resulting in hard-to-find bugs. --- nixos/modules/services/misc/gitlab.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 6ee35aaca56..dd92eb99940 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -608,6 +608,8 @@ in { # objects owners and extensions; for now we tack on what's needed # here. systemd.services.postgresql.postStart = mkAfter (optionalString databaseActuallyCreateLocally '' + set -eu + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then @@ -781,10 +783,14 @@ in { ExecStartPre = let preStartFullPrivileges = '' shopt -s dotglob nullglob + set -eu + chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/config/* ''; preStart = '' + set -eu + cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION rm -rf ${cfg.statePath}/db/* rm -rf ${cfg.statePath}/config/initializers/* From d5db11ccbd6dce1d04835a17ef46098137c0b77e Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 27 Oct 2019 12:37:10 +0100 Subject: [PATCH 37/76] nixos/gitlab: Remove the old lib symlink in the state directory Also, remove the old and unused PermissionsStartOnly definition in the gitlab-workhorse systemd service. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index dd92eb99940..07ea9c45843 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -741,7 +741,6 @@ in { gitlab-workhorse ]; serviceConfig = { - PermissionsStartOnly = true; # preStart must be run as root Type = "simple"; User = cfg.user; Group = cfg.group; @@ -794,6 +793,7 @@ in { cp -f ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION rm -rf ${cfg.statePath}/db/* rm -rf ${cfg.statePath}/config/initializers/* + rm -f ${cfg.statePath}/lib cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db From b72984e7a3a7eb44300897c7909e103a8fdb1670 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Oct 2019 13:09:32 -0400 Subject: [PATCH 38/76] dbus: enable building with musl When building dbus with musl, it must not take systemd as a buildInput, because systemd is not able to be build with musl. --- pkgs/development/libraries/dbus/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 804f0e7fc85..014ccb48971 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,6 +3,7 @@ , fetchurl , pkgconfig , expat +, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl , systemd , libX11 ? null , libICE ? null @@ -15,6 +16,8 @@ assert x11Support -> libX11 != null && libICE != null && libSM != null; +assert enableSystemd -> systemd != null; + stdenv.mkDerivation rec { pname = "dbus"; version = "1.12.16"; @@ -50,11 +53,12 @@ stdenv.mkDerivation rec { expat ]; - buildInputs = lib.optionals x11Support [ - libX11 - libICE - libSM - ] ++ lib.optional stdenv.isLinux systemd; + buildInputs = + lib.optionals x11Support [ + libX11 + libICE + libSM + ] ++ lib.optional enableSystemd systemd; # ToDo: optional selinux? configureFlags = [ From 370d483a0d347bcc2455c61a2ba425d01d5483b4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Oct 2019 13:45:34 -0400 Subject: [PATCH 39/76] libusb1: enable compiling with musl libusb1 can't depend on systemd in order to be compiling with musl, because systemd can't be built with musl. Since systemd provides udev, udev support needs to be disabled when building libusb1. --- .../development/libraries/libusb1/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 19a8025359a..9a08a7756c8 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,4 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, withStatic ? false }: +{ stdenv +, fetchurl +, pkgconfig +, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl +, systemd ? null +, libobjc +, IOKit +, withStatic ? false +}: + +assert enableSystemd -> systemd != null; stdenv.mkDerivation (rec { pname = "libusb"; @@ -13,12 +23,17 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - stdenv.lib.optional stdenv.isLinux systemd ++ + stdenv.lib.optional enableSystemd systemd ++ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - preFixup = stdenv.lib.optionalString stdenv.isLinux '' + configureFlags = + # We use `isLinux` here only to avoid mass rebuilds for Darwin, where + # disabling udev happens automatically. Remove `isLinux` at next big change! + stdenv.lib.optional (stdenv.isLinux && !enableSystemd) "--disable-udev"; + + preFixup = stdenv.lib.optionalString enableSystemd '' sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; From fc265d98c7ca877a669777c9a4aaa5c1bf2ea847 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Oct 2019 15:30:02 -0400 Subject: [PATCH 40/76] vte: enable building with musl VTE requires a small patch to be able to be built with musl. --- pkgs/development/libraries/vte/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0d5686ccc0a..c1774e2c828 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -1,5 +1,7 @@ { stdenv +, lib , fetchurl +, fetchpatch , gettext , pkgconfig , meson @@ -58,6 +60,17 @@ stdenv.mkDerivation rec { pango ]; + patches = + # VTE needs a small patch to work with musl: + # https://gitlab.gnome.org/GNOME/vte/issues/72 + lib.optional + stdenv.hostPlatform.isMusl + (fetchpatch { + name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; + url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"; + sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r"; + }); + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh From 59dbb005556e5bdc0d342ddb1f3801ebcea02413 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 28 Oct 2019 14:54:37 +0000 Subject: [PATCH 41/76] symlinkJoin: fix cross --- pkgs/top-level/stage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 4fe067694dc..9e07d2bf061 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -71,7 +71,7 @@ let trivialBuilders = self: super: import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; + inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir; inherit (self) runtimeShell; }; From 028dacdcfb4a9a5154f988756640c495d5158e54 Mon Sep 17 00:00:00 2001 From: caadar Date: Wed, 23 Oct 2019 19:57:01 +0300 Subject: [PATCH 42/76] cups: fix misleading comment --- nixos/modules/services/printing/cupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 3fcae611dc7..1071c05d514 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -31,7 +31,7 @@ let # part of CUPS itself, e.g. the SMB backend is part of Samba. Since # we can't update ${cups.out}/lib/cups itself, we create a symlink tree # here and add the additional programs. The ServerBin directive in - # cupsd.conf tells cupsd to use this tree. + # cups-files.conf tells cupsd to use this tree. bindir = pkgs.buildEnv { name = "cups-progs"; paths = From d0b8d591e7aa4131ba4b704ecd2ae2503b4a94ae Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Sun, 27 Oct 2019 11:30:06 +0100 Subject: [PATCH 43/76] tpm2-tools: 3.2.0 -> 4.0 --- pkgs/tools/security/tpm2-tools/default.nix | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 1a6c8aaaa5d..e2bbf1037d8 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,24 +1,36 @@ { stdenv, fetchurl, lib -, cmocka, curl, pandoc, pkgconfig, openssl, tpm2-tss }: +, pandoc, pkgconfig, makeWrapper, curl, openssl, tpm2-tss +, abrmdSupport ? true, tpm2-abrmd ? null }: stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "3.2.0"; + version = "4.0"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "057gg84zly6gjp6ypj6bv6zzmnr77cqsygl8x0147cylwa1ywydd"; + sha256 = "02p0wj87fnrpsijd2zaqcxqxicqs36q7vakp6y8and920x36jb0y"; }; - nativeBuildInputs = [ pandoc pkgconfig ]; + nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; buildInputs = [ curl openssl tpm2-tss - # For unit tests. - cmocka ]; - configureFlags = [ "--enable-unit" ]; - doCheck = true; + preFixup = let + ldLibraryPath = lib.makeLibraryPath ([ + tpm2-tss + ] ++ (lib.optional abrmdSupport tpm2-abrmd)); + in '' + for bin in $out/bin/*; do + wrapProgram $bin \ + --suffix LD_LIBRARY_PATH : "${ldLibraryPath}" + done + ''; + + + # Unit tests disabled, as they rely on a dbus session + #configureFlags = [ "--enable-unit" ]; + doCheck = false; meta = with lib; { description = "Command line tools that provide access to a TPM 2.0 compatible device"; From b60a1b6cfdd329694f44cfd0781a10a6e1afad1d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Oct 2019 12:48:57 +0100 Subject: [PATCH 44/76] xob: init at 0.1.1 --- pkgs/tools/X11/xob/default.nix | 35 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/X11/xob/default.nix diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix new file mode 100644 index 00000000000..164802470e5 --- /dev/null +++ b/pkgs/tools/X11/xob/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkg-config, xorg, libconfig }: + +stdenv.mkDerivation rec { + pname = "xob"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "florentc"; + repo = pname; + rev = "v${version}"; + sha256 = "0i163avpij8iy04a0wsds237sjqi5dfvi6ny2z8zicnl4crp34xg"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ xorg.libX11 libconfig ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "A lightweight overlay bar for the X Window System"; + longDescription = '' + A lightweight configurable overlay volume/backlight/progress/anything bar + for the X Window System. Each time a new value is read on the standard + input, it is displayed as a tv-like bar over other windows. It then + vanishes after a configurable amount of time. A value followed by a bang + '!' is displayed using an alternate color to account for special states + (e.g. muted audio). There is also support for overflows (when the value + exceeds the maximum). + ''; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 007253b9677..f0072dfe459 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2880,6 +2880,8 @@ in wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; + xob = callPackage ../tools/X11/xob { }; + z-lua = callPackage ../tools/misc/z-lua { }; zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; From d8cfa95b76527ed2ec03cd962b6d6898ea238e5a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Oct 2019 16:03:42 +0100 Subject: [PATCH 45/76] wob: init at 0.2 --- pkgs/tools/misc/wob/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/wob/default.nix diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix new file mode 100644 index 00000000000..12e76be9658 --- /dev/null +++ b/pkgs/tools/misc/wob/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub +, meson, ninja, pkg-config, wayland # wayland-scanner +, wayland-protocols +}: + +stdenv.mkDerivation rec { + pname = "wob"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "francma"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "1jyia4166lp4cc8gmjmgcyz6prshhfjriam8w8mz2c5h77990fr9"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ wayland-protocols ]; + + meta = with stdenv.lib; { + description = "A lightweight overlay bar for Wayland"; + longDescription = '' + A lightweight overlay volume/backlight/progress/anything bar for Wayland, + inspired by xob. + ''; + inherit (src.meta) homepage; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0072dfe459..76388c04db1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2880,6 +2880,8 @@ in wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; + wob = callPackage ../tools/misc/wob { }; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; From 97f4d0d345235f1271153ed916ccce426c3fdb75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 28 Oct 2019 14:29:42 +0100 Subject: [PATCH 46/76] drawio: 12.1.0 -> 12.1.7 Changes: - Updates to draw.io 12.1.7 - Updates to Electron 7 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index f29f2a92705..4142310b705 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.1.0"; + version = "12.1.7"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "02gwhnbl9fzgf1z8c9bkm3rxzyncp7v57yqc322r85vg0wxir3f8"; + sha256 = "1vac0cz99yjlz7b186wyy4wk4sxkvlirpjmh3vw65xaxamn8spn3"; }; nativeBuildInputs = [ From 3e639196de915247f71f3395c53ee2f52d472d34 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 28 Oct 2019 03:00:00 -0500 Subject: [PATCH 47/76] nfpm: 1.0.0 -> 1.1.0 https://github.com/goreleaser/nfpm/releases/tag/v1.1.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 9198e6d5ab6..d5f855e44cb 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0d92wwmvyk6sn3z61y1n9w4wydafra941s0cpbnkc7c9qkxiwwnb"; + sha256 = "16wyn6dx7cs32a704zcyr6v26b9iw4b506nymgljghvqw4bhysr1"; }; - modSha256 = "04hcg1n8f1wxz7n1k91nfspkd1ca7v5xf4hjj3wiw55vmykzcsm5"; + modSha256 = "0a4r4msfniya6pby4bs3qvgammn95sr5nmjp4vv0cm74n81rk051"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; From 97a5c413a04c36097cb58a1d12e84795ad22855c Mon Sep 17 00:00:00 2001 From: Renaud Date: Mon, 28 Oct 2019 17:27:33 +0100 Subject: [PATCH 48/76] perlPackages.Po4a: fix build (#72170) Fixes #71296 (Po4a build get stuck in a loop) Term::ReadKey is an optional dependency. From upstream: > This module is used to retrieve the terminal's line width. > If it is not present, the line width can be specified with the COLUMN environment variable. --- pkgs/development/perl-modules/Po4a/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 338baea389f..94d83845e29 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -9,7 +9,8 @@ buildPerlPackage rec { sha256 = "1qss4q5df3nsydsbggb7gg50bn0kdxq5wn8riqm9zwkiq6a4bifg"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; LC_ALL = "en_US.UTF-8"; SGML_CATALOG_FILES = "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml"; From 664823c11c0c3ac20d498c57911b98e85e64f8b8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Oct 2019 15:11:29 -0400 Subject: [PATCH 49/76] cups: enable compiling with musl When compiling `cups` with `pkgsMusl`, `cups` can't depend on `systemd` because `systemd` is not able to be built with musl. --- pkgs/misc/cups/default.nix | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c7df3f333b6..ffac9a97b28 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,9 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, removeReferencesTo -, zlib, libjpeg, libpng, libtiff, pam, dbus, systemd, acl, gmp, darwin -, libusb ? null, gnutls ? null, avahi ? null, libpaper ? null +{ stdenv +, fetchurl +, pkgconfig +, removeReferencesTo +, zlib +, libjpeg +, libpng +, libtiff +, pam +, dbus +, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl +, systemd ? null +, acl +, gmp +, darwin +, libusb ? null +, gnutls ? null +, avahi ? null +, libpaper ? null , coreutils }: +assert enableSystemd -> systemd != null; + ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test ### works at least for your platform. @@ -33,7 +51,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] + ++ optionals stdenv.isLinux [ avahi pam dbus ] + ++ optional enableSystemd systemd + # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change. + ++ optionals stdenv.isLinux [ acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); From fa4f091ac0c57cce20b05ce8df1c202923c51e37 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 13:00:54 -0500 Subject: [PATCH 50/76] liburing: 0.2pre252_a9bb08db -> 0.2 Signed-off-by: Austin Seipp --- pkgs/development/libraries/liburing/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index d02016e87e6..ad8c08b3cce 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.2pre252_${builtins.substring 0 8 src.rev}"; + version = "0.2"; src = fetchgit { - url = "http://git.kernel.dk/liburing"; - rev = "a9bb08db3f8795eb58239d5dbb888e9c1d424011"; - sha256 = "0gv06fcgqhfkqgiqzjb4qzpxh3h595ypw01a0kmhqnmsnvmb624n"; + url = "http://git.kernel.dk/${pname}"; + rev = "refs/tags/${pname}-${version}"; + sha256 = "0dxq7qjrwndgavrrc6y2wg54ia3y5wkmcyhpdk4l5pvh7hw6kpdz"; }; separateDebugInfo = true; From bdc3697b8e50abb9fc1ac65cc9d443d45d94e3f3 Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Mon, 28 Oct 2019 18:49:17 +0100 Subject: [PATCH 51/76] Fix link in CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 07eddc80c25..4577cea2225 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -51,4 +51,4 @@ For package version upgrades and such a one-line commit message is usually suffi ## Reviewing contributions -See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#sec-reviewing-contributions). +See the nixpkgs manual for more details on how to [Review contributions](https://nixos.org/nixpkgs/manual/#chap-reviewing-contributions). From 3c5f5b1cde15fd8e0dfffbacfd40c26833262cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Oct 2019 19:05:22 +0100 Subject: [PATCH 52/76] Fix link in PULL_REQUEST_TEMPLATE.md (the same link) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a4f1c61e8f5..c6d50d9cb77 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ - + ###### Motivation for this change From 2d8dc891aa36904ba1bc76252fc0d831a0bf03be Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 28 Oct 2019 20:17:53 +0100 Subject: [PATCH 53/76] python.pkgs.acoustics: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/acoustics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index eb56cfc1fa0..94ec1557a26 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.1"; + version = "0.2.2"; checkInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; src = fetchPypi { inherit pname version; - sha256 = "d7cec62d3e7a7eb26026f2aacc726fb1dd0b044574cbdee83da654b847543c20"; + sha256 = "00981908c7cf54be58c0bfe902d7743225554ecf3432b30723e9300d9f3a0b0e"; }; checkPhase = '' From 47724fc77c7b53def3ecb66bf8c925cd17b8f069 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 28 Oct 2019 20:51:17 +0100 Subject: [PATCH 54/76] nixos/networkd: add `ipv4-fallback` and `fallback` as valid options to `LinkLocalAddressing` Both options were introduced in systemd v243[1]. Those options can be used to ensure that LinkLocalAddressing is only configured for a given interface if DHCPv4 fails. To quote `systemd.network(5)`: ``` If "fallback" or "ipv4-fallback" is specified, then an IPv4 link-local address is configured only when DHCPv4 fails. If "fallback", an IPv6 link-local address is always configured, and if "ipv4-fallback", the address is not configured. Note that, the fallback mechanism works only when DHCPv4 client is enabled, that is, it requires "DHCP=yes" or "DHCP=ipv4". ``` [1] https://github.com/systemd/systemd/commit/8bc17bb3f707c99b6c9ad295563c92b38141a1f4 --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f2060e21509..85a106527fe 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -187,7 +187,7 @@ let # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) - (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "ipv4-fallback" "fallback"]) (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" ["yes" "resolve" "no"]) (assertValueOneOf "MulticastDNS" ["yes" "resolve" "no"]) From f86361d186354167ff09f8aa163e70f7c5685503 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 00:35:02 -0500 Subject: [PATCH 55/76] vector: init at 0.5.0 Signed-off-by: Austin Seipp --- pkgs/tools/misc/vector/default.nix | 41 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/misc/vector/default.nix diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix new file mode 100644 index 00000000000..8c5ba4100c6 --- /dev/null +++ b/pkgs/tools/misc/vector/default.nix @@ -0,0 +1,41 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform +, openssl, pkgconfig, protobuf +, Security, libiconv + +, features ? + (if stdenv.isAarch64 + then [ "jemallocator" ] + else [ "leveldb" "jemallocator" ]) +}: + +rustPlatform.buildRustPackage rec { + pname = "vector"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "timberio"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "0niyxlvphn3awrpfh1hbqy767cckgjzyjrkqjxj844czxhh1hhff"; + }; + + cargoSha256 = "0bdgan891hrah54g6aaysqizkxrfsbidnxihai0i7h7knzq9gsk5"; + buildInputs = [ openssl pkgconfig protobuf ] + ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; + + # needed for internal protobuf c wrapper library + PROTOC="${protobuf}/bin/protoc"; + PROTOC_INCLUDE="${protobuf}/include"; + + # rdkafka fails to build, for some reason... + cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; + checkPhase = ":"; # skip tests, too -- they don't respect the rdkafka flag... + + meta = with stdenv.lib; { + description = "A high-performance logs, metrics, and events router"; + homepage = "https://github.com/timberio/vector"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ thoughtpolice ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76388c04db1..d66a70dbb2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24201,6 +24201,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + vector = callPackage ../tools/misc/vector { + inherit (darwin.apple_sdk.frameworks) Security; + }; + epkowa = callPackage ../misc/drivers/epkowa { }; utsushi = callPackage ../misc/drivers/utsushi { }; From 479f75d1e5dda7c95e56d6af4fdad1513fbc4764 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 28 Oct 2019 19:03:10 +0100 Subject: [PATCH 56/76] reuse: 0.5.0 -> 0.5.2 --- pkgs/tools/package-management/reuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 58987f3965c..0f8a6f19127 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "1w17g6jvs715rjc93nnnqnfdphijq4ymj9jjkr3ccc286ywvn3ih"; + sha256 = "17qvsa2qnm767yv7x0v626np0kiyqpb0al7sjqmccarq2wnw8w90"; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; - license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3 ]; + license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3Plus ]; maintainers = [ maintainers.FlorianFranzen ]; }; } From 6597ad2ae53bb86316190aef2399f34db23902b7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Oct 2019 20:47:50 +0100 Subject: [PATCH 57/76] libcef: update to cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131 I chose that version because [1] suggested that CEF versions before 75.x worked, whereas newer versions don't compile due to API changes. [1] https://github.com/bazukas/obs-linuxbrowser/issues/108#issuecomment-513544091 --- pkgs/development/libraries/libcef/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index e01142c12ef..be418125dfb 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig , GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver -, libXtst, nspr, nss, pango, libpulseaudio, systemd }: +, libXtst, nspr, nss, pango, libpulseaudio, systemd, at-spi2-atk, at-spi2-core +}: let libPath = @@ -9,20 +10,24 @@ let alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2 libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio - systemd + systemd at-spi2-core at-spi2-atk ]; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "3.3497.1833.g13f506f"; + version = "74.1.14-g50c3c5c"; + src = fetchurl { - url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2"; - sha256 = "02v22yx1ga2yxagjblzkfw0ax7zkrdpc959l1a15m8nah3y7xf9p"; + name = "cef_binary_74.1.14+g50c3c5c+chromium-74.0.3729.131_linux64_minimal.tar.bz2"; + url = "http://opensource.spotify.com/cefbuilds/cef_binary_74.1.19%2Bgb62bacf%2Bchromium-74.0.3729.157_linux64_minimal.tar.bz2"; + sha256 = "0v3540kq4y68gq7mb4d8a9issm363lm5ngrd6d96pcc7vckkw4wn"; }; + nativeBuildInputs = [ cmake ]; makeFlags = "libcef_dll_wrapper"; dontStrip = true; dontPatchELF = true; + installPhase = '' mkdir -p $out/lib/ $out/share/cef/ cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/ @@ -39,6 +44,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; - broken = true; }; } From fadb0090e04d3cb6a032f730562526f44e27aa85 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Oct 2019 20:50:20 +0100 Subject: [PATCH 58/76] obs-linuxbrowser: update to latest 'master' version from Github The version number corresponds to "git describe --tags". --- pkgs/applications/video/obs-studio/linuxbrowser.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 4761cd0e50a..134e0cb8a9e 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -5,18 +5,19 @@ # mkdir -p ~/.config/obs-studio/plugins # ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef -}: +{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef }: stdenv.mkDerivation rec { pname = "obs-linuxbrowser"; - version = "0.6.1"; + version = "0.6.1-6-gf86dba6"; + src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1mi9pchy07ipnx1m2767n29d53v822yajcf6c3705dhz882z21zq"; + sha256 = "08d7qz0721va88bcyia8p0ycw50f6x3yk97s3vzhsc9xpq691kpi"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; postUnpack = '' @@ -44,6 +45,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh ]; license = licenses.gpl2; platforms = with platforms; linux; - broken = true; }; } From f661393aa43a012c54ac8e9e1fb0c50a7cd53adc Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 28 Oct 2019 14:44:58 +0100 Subject: [PATCH 59/76] skawarePackages: bump to release 2019-10 --- pkgs/development/libraries/nsss/default.nix | 4 ++-- pkgs/development/libraries/skalibs/default.nix | 4 ++-- pkgs/development/libraries/utmps/default.nix | 4 ++-- pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++-- pkgs/tools/misc/execline/default.nix | 4 ++-- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- pkgs/tools/networking/s6-networking/default.nix | 4 ++-- pkgs/tools/system/s6-rc/default.nix | 4 ++-- pkgs/tools/system/s6/default.nix | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index cd1205e2c7d..5c8bf8dedc1 100644 --- a/pkgs/development/libraries/nsss/default.nix +++ b/pkgs/development/libraries/nsss/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "nsss"; - version = "0.0.1.1"; - sha256 = "14y1vl7n8vd5fh9bwiwwxxslisli8pz3a2f1sfv12l0p8ngpgm57"; + version = "0.0.2.1"; + sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index c885f00a33c..474073f30e4 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.8.1.0"; - sha256 = "1fk6n402ywn4kpy6ng7sfnnqcg0mp6wq2hrv8sv3kxd0nh3na723"; + version = "2.9.1.0"; + sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk"; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 16d4a8fa40b..073674f8571 100644 --- a/pkgs/development/libraries/utmps/default.nix +++ b/pkgs/development/libraries/utmps/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "utmps"; - version = "0.0.2.1"; - sha256 = "1q90mcn50irhhrzl3h9bvhsn7hac0zgg67b6hfhmc5yvh4c8wnr4"; + version = "0.0.3.1"; + sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h"; description = "A secure utmpx and wtmp implementation"; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index bd6b84ea73c..200e66cb4d8 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.0.1"; - sha256 = "0bpcaah3rbz4i013bkarr7wxmfvisjyxg0z78xg5zfbgajpgjxx1"; + version = "2.5.1.1"; + sha256 = "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5"; description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index a1907434181..d06798e5d6d 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -13,8 +13,8 @@ let execline = buildPackage { pname = "execline"; - version = "2.5.1.0"; - sha256 = "0xr6yb50wm6amj1wc7jmxyv7hvlx2ypbnww1vc288j275625d9xi"; + version = "2.5.3.0"; + sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index dcdc6dde2ca..18813531033 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -7,8 +7,8 @@ let in buildPackage { pname = pname; - version = "2.2.1.3"; - sha256 = "1ibjns1slyg1p7jl9irzlrjz8b01f506iw87g3s7db5arhf17vv2"; + version = "2.2.2.1"; + sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy"; description = "A set of tiny general Unix utilities optimized for simplicity and small size"; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 36c539a40b4..66bdcbbba54 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-dns"; - version = "2.3.0.2"; - sha256 = "1y9bhvx8bqsb2xq5lmlfnc1hw2b3jyqg11i9r4lj0n6vvaqwh1j8"; + version = "2.3.1.1"; + sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1"; description = "A suite of DNS client programs and libraries for Unix systems"; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 8dfaae63ffa..1551d6da97b 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.0.4"; - sha256 = "00kqp0mcp8c7f0z5s4399rd1haxasxkqgd6ds0j0607hvi56mqqa"; + version = "2.3.1.1"; + sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 4f6fdd16dca..95d4b376d0a 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.0.0"; - sha256 = "0p97p49i8m44lfiffycgn7xi08yzxkrs5dyb03svdhd6clwh6zyb"; + version = "0.5.1.1"; + sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5"; description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 8b6393caff1..efdf173a22c 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6"; - version = "2.8.0.1"; - sha256 = "1n1i3jm3kp9ii54cxj1sgh89m6nyna7vhy8714ma6py1frdqzq6v"; + version = "2.9.0.1"; + sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"; description = "skarnet.org's small & secure supervision software suite"; From 055715822e66a614d05c1fa46ee24823607fdc94 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 17:44:56 -0400 Subject: [PATCH 60/76] lollypop: 1.2.1 -> 1.2.2 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index bd23b1ae117..f8a2aa8db76 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.1"; + version = "1.2.2"; format = "other"; doCheck = false; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "0wmgs28ph9959lr6zhd2j7z2c3kpl64rng6s1xgzyhsgrcyvv4cd"; + sha256 = "02dgp3b10yaw0yqzdzd15msjgxayvjkg9m652is0d7rwgjq1pk6v"; }; nativeBuildInputs = [ From 69653b4889e68eb22fdaba7c09eeb45a7a664478 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 28 Oct 2019 23:53:58 +0100 Subject: [PATCH 61/76] xonsh: 0.9.11 -> 0.9.13 https://github.com/xonsh/xonsh/releases/tag/0.9.12 https://github.com/xonsh/xonsh/releases/tag/0.9.13 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 7a2cba4b2c8..58dd629929f 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.11"; + version = "0.9.13"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "0kvq1hlmlb8k9z6z385924fcqq3sf36pmi3aqczlb90m37rwzb6d"; + sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv"; }; LC_ALL = "en_US.UTF-8"; From 5cfc0aa7f4d091d324fdb79e6672a5b54d7856b2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 20:39:51 -0400 Subject: [PATCH 62/76] dbus: add worldofpeace to maintainers --- pkgs/development/libraries/dbus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 014ccb48971..5024ea3ef24 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { description = "Simple interprocess messaging system"; homepage = http://www.freedesktop.org/wiki/Software/dbus/; license = licenses.gpl2Plus; # most is also under AFL-2.1 + maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.unix; }; } From 0cf598c3d9ac39de07581e9b37394e4d942c57b7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 20:37:34 -0400 Subject: [PATCH 63/76] glib: add worldofpeace to maintainers --- pkgs/development/libraries/glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4f8b289b084..7c7d0aca75c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -200,7 +200,7 @@ stdenv.mkDerivation rec { description = "C library of programming buildings blocks"; homepage = https://www.gtk.org/; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 raskin ]; + maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; platforms = platforms.unix; longDescription = '' From 3410525d32c2aef42e13d1876685a03bd519271f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 20:37:40 -0400 Subject: [PATCH 64/76] gtk3: add worldofpeace to maintainers --- pkgs/development/libraries/gtk/3.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index e0810766ee5..15c3ab2daf8 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gtk.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman ]; + maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; }; } From 81220cff1eb5866548840907d96144fe7c131a64 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 20:40:34 -0400 Subject: [PATCH 65/76] polkit: add worldofpeace to maintainers --- pkgs/development/libraries/polkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index a04e67e0fd1..03dcffd046e 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ worldofpeace ]; }; } From cfaa8b865215e22f2d094f79fa509b268ca73d97 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 28 Oct 2019 20:37:52 -0400 Subject: [PATCH 66/76] vte: add worldofpeace to maintainers --- pkgs/development/libraries/vte/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index c1774e2c828..b4fc0e33459 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -18,6 +18,7 @@ , pcre2 , fribidi , zlib +, gnome3 }: stdenv.mkDerivation rec { @@ -88,7 +89,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; + maintainers = with maintainers; [ astsmtl antono lethalman ] ++ gnome3.maintainers; platforms = platforms.unix; }; } From a5a1b86ab1446e53ec33effd5159acccdd65ffe0 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 19:52:42 -0500 Subject: [PATCH 67/76] vte: remove duplicated gnome3 argument This was added on accident in cfaa8b865215e22f2d094f79fa509b268ca73d97, as the gnome3 parameter is already specified. This unbreaks Borg evaluation. Signed-off-by: Austin Seipp --- pkgs/development/libraries/vte/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index b4fc0e33459..8b19e1ee9ae 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -18,7 +18,6 @@ , pcre2 , fribidi , zlib -, gnome3 }: stdenv.mkDerivation rec { From 610a6fc20b26186567937c9404f2ee5c03ee1ea4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 19:36:14 -0500 Subject: [PATCH 68/76] firecracker: 0.18.0 -> 0.19.0, some cleanups Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 53ace1b5d8b..991925ff34b 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.18.0"; + version = "0.19.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,20 +9,33 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh"; - jailer-bin = fetchbin "jailer" "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd"; + firecracker-bin = fetchbin "firecracker" "0yjhw77xc2nc96p36jhf0va95gf6hwi9n270g4iiwakycdy048mx"; + jailer-bin = fetchbin "jailer" "1q792b4bl1q3ach8nc8l0fbcil44knv3wa542xrskndzdz28lhsp"; in stdenv.mkDerivation { - name = "firecracker-${version}"; + pname = "firecracker"; inherit version; - srcs = [ firecracker-bin jailer-bin ]; - phases = [ "installPhase" ]; + + unpackPhase = ":"; + configurePhase = ":"; + + buildPhase = '' + cp ${firecracker-bin} firecracker + cp ${jailer-bin} jailer + chmod +x firecracker jailer + ''; + + doCheck = true; + checkPhase = '' + ./firecracker --version + ./jailer --version + ''; installPhase = '' mkdir -p $out/bin - install -D ${firecracker-bin} $out/bin/firecracker - install -D ${jailer-bin} $out/bin/jailer + install -D firecracker $out/bin/firecracker + install -D jailer $out/bin/jailer ''; meta = with stdenv.lib; { From 4be9fcd1840861dd2c59a21eaf28e9ef5d63d046 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 19:43:21 -0500 Subject: [PATCH 69/76] firecracker: support on aarch64-linux Signed-off-by: Austin Seipp --- .../virtualization/firecracker/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 991925ff34b..9fa06f5bf0b 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -2,15 +2,28 @@ let version = "0.19.0"; - baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; + suffix = { + x86_64-linux = ""; + aarch64-linux = "-aarch64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { - url = "${baseurl}/v${version}/${name}-v${version}"; - inherit sha256; + url = "${baseurl}/v${version}/${name}-v${version}${suffix}"; + sha256 = sha256."${stdenv.hostPlatform.system}"; + }; + + firecracker-bin = fetchbin "firecracker" { + x86_64-linux = "0yjhw77xc2nc96p36jhf0va95gf6hwi9n270g4iiwakycdy048mx"; + aarch64-linux = "165yca7pcwpqw3x6dihcjz1xcwjh37sdi9qrrjk9zasxx7xcniym"; + }; + + jailer-bin = fetchbin "jailer" { + x86_64-linux = "1q792b4bl1q3ach8nc8l0fbcil44knv3wa542xrskndzdz28lhsp"; + aarch64-linux = "1cnwlpy5bswjprk7fcjgf6lxidhp7z00qx691nkwhzjkby80j490"; }; - firecracker-bin = fetchbin "firecracker" "0yjhw77xc2nc96p36jhf0va95gf6hwi9n270g4iiwakycdy048mx"; - jailer-bin = fetchbin "jailer" "1q792b4bl1q3ach8nc8l0fbcil44knv3wa542xrskndzdz28lhsp"; in stdenv.mkDerivation { pname = "firecracker"; @@ -42,7 +55,7 @@ stdenv.mkDerivation { description = "Secure, fast, minimal micro-container virtualization"; homepage = http://firecracker-microvm.io; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; } From daa242095010c54e848ff1b98d2f74b8a1929ab5 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 16:20:23 -0500 Subject: [PATCH 70/76] libnats-c: init at 2.1.0 Signed-off-by: Austin Seipp --- .../libraries/libnats-c/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libnats-c/default.nix diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix new file mode 100644 index 00000000000..3916ff35f69 --- /dev/null +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub +, cmake, protobuf, protobufc +, libsodium, openssl +}: + +stdenv.mkDerivation rec { + pname = "libnats"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "nats-io"; + repo = "nats.c"; + rev = "refs/tags/v${version}"; + sha256 = "16a0f0gvrmyrqvmh6vinqny3qhm6wyzw5ijnn3r82b1gqlpws0fz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libsodium openssl protobuf protobufc ]; + + separateDebugInfo = true; + enableParallelBuilding = true; + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "C API for the NATS messaging system"; + homepage = "https://github.com/nats-io/nats.c"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b813f2f57c2..4d4965fbb7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12036,6 +12036,10 @@ in libinjection = callPackage ../development/libraries/libinjection { }; + libnats-c = callPackage ../development/libraries/libnats-c { + openssl = openssl_1_0_2; + }; + liburing = callPackage ../development/libraries/liburing { }; librseq = callPackage ../development/libraries/librseq { }; From 291fb1e84584c3a37d07cb187df1c914e35112d2 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 16:24:02 -0500 Subject: [PATCH 71/76] nats-streaming-server: 0.11.2 -> 0.16.2 Signed-off-by: Austin Seipp --- pkgs/servers/nats-streaming-server/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 079c877ab7a..29f0f29a1bc 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -3,17 +3,15 @@ with lib; buildGoPackage rec { - pname = "nats-streaming-server"; - version = "0.11.2"; - rev = "v${version}"; - - goPackagePath = "github.com/nats-io/nats-streaming-server"; + pname = "nats-streaming-server"; + version = "0.16.2"; + goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { - inherit rev; - owner = "nats-io"; - repo = "nats-streaming-server"; - sha256 = "1jd9c5yw3xxp5hln1g8w48l4cslhxbv0k2af47g6pya09kwknqkq"; + rev = "v${version}"; + owner = "nats-io"; + repo = pname; + sha256 = "0xrgwsw4xrn6fjy1ra4ycam50kdhyqqsms4yxblj5c5z7w4hnlmk"; }; meta = { From 21c0cc1eeefa7834e13787d248c37331fb18b55c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Oct 2019 16:24:23 -0500 Subject: [PATCH 72/76] nats-server: rename (from gnatsd), 1.4.0 -> 2.1.0 Signed-off-by: Austin Seipp --- pkgs/servers/{gnatsd => nats-server}/default.nix | 15 +++++++-------- pkgs/top-level/aliases.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) rename pkgs/servers/{gnatsd => nats-server}/default.nix (57%) diff --git a/pkgs/servers/gnatsd/default.nix b/pkgs/servers/nats-server/default.nix similarity index 57% rename from pkgs/servers/gnatsd/default.nix rename to pkgs/servers/nats-server/default.nix index 1bb2ebc4f86..7f75579b51c 100644 --- a/pkgs/servers/gnatsd/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -3,17 +3,16 @@ with lib; buildGoPackage rec { - pname = "gnatsd"; - version = "1.4.0"; - rev = "v${version}"; + pname = "nats-server"; + version = "2.1.0"; - goPackagePath = "github.com/nats-io/gnatsd"; + goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { - inherit rev; - owner = "nats-io"; - repo = "gnatsd"; - sha256 = "0wxdvaxl273kd3wcas634hx1wx5piljgbfr6vhf669b1frkgrh2b"; + rev = "v${version}"; + owner = "nats-io"; + repo = pname; + sha256 = "1zp43v69cawbp6bpby1vx51z6nyv8gxnnl2qkhwr9zrgnhlcflnl"; }; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b455d62914..02f2d18ad35 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -463,4 +463,8 @@ mapAliases ({ ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; ocaml_4_02 = ocamlPackages_4_02.ocaml; ocaml_4_03 = ocamlPackages_4_03.ocaml; -})) +}) // { + + # added 2019-10-28 + gnatsd = nats-server; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d4965fbb7a..f2a80fdc0b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14854,7 +14854,7 @@ in glabels = callPackage ../applications/graphics/glabels { }; - gnatsd = callPackage ../servers/gnatsd { }; + nats-server = callPackage ../servers/nats-server { }; gofish = callPackage ../servers/gopher/gofish { }; From 8fc1bd6ec352c8304fdbf0eba9ad420fe9e8e477 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 29 Oct 2019 02:59:32 +0000 Subject: [PATCH 73/76] pythonPackages.html2text: freeze at 2018.1.9 I was unable tp build calibre at the current git master as it relies on pytthon27Packages.html2text. Python 2.7 support was removed in the latest version. This PR downgrades html2text when using an unsupported Python version. This PR does not fix building python37Packages.html2text and python38Packages.html2text, which were broken at master due to what seems to be a problem in buildPythonPackage. --- .../python-modules/html2text/2018.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/html2text/2018.nix diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix new file mode 100644 index 00000000000..cac88c55794 --- /dev/null +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "html2text"; + version = "2018.1.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4"; + }; + + meta = with stdenv.lib; { + description = "Turn HTML into equivalent Markdown-structured text"; + homepage = https://github.com/Alir3z4/html2text/; + license = licenses.gpl3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f97de31c64d..d723bdb2b63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5800,7 +5800,8 @@ in { termcolor = callPackage ../development/python-modules/termcolor { }; - html2text = callPackage ../development/python-modules/html2text { }; + html2text = if isPy3k then callPackage ../development/python-modules/html2text { } + else callPackage ../development/python-modules/html2text/2018.nix { }; pychart = callPackage ../development/python-modules/pychart {}; From 753ab3ce84bbd9e6e957be4c1fa5c70f9e2ff90f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 28 Oct 2019 22:30:21 -0700 Subject: [PATCH 74/76] python3Packages.html2text: fix build --- .../python-modules/html2text/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index 3659d3368be..9b289032514 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -1,21 +1,28 @@ -{ stdenv -, buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pytest }: buildPythonPackage rec { pname = "html2text"; version = "2019.9.26"; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "6f56057c5c2993b5cc5b347cb099bdf6d095828fef1b53ef4e2a2bf2a1be9b4f"; + src = fetchFromGitHub { + owner = "Alir3z4"; + repo = pname; + rev = version; + sha256 = "1gzcx4n6q71plq4zvb1z0fy3brrln0qqrd6jc89iiqn7r1ix8h87"; }; - meta = with stdenv.lib; { + # python setup.py test is broken, use pytest + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = https://github.com/Alir3z4/html2text/; license = licenses.gpl3; }; - } From 94a80621ac1d12671593074de88f1ee8012a7f82 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Tue, 29 Oct 2019 11:13:54 +1100 Subject: [PATCH 75/76] pythonPackages.isort: Add explicit setuptools dep and bin test --- .../python-modules/isort/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 6cc2570ab36..8e292ba7cd5 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools, isPy27, futures +, backports_functools_lru_cache, mock, pytest +}: let skipTests = [ "test_requirements_finder" "test_pipfile_finder" ] ++ lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; @@ -12,13 +14,24 @@ in buildPythonPackage rec { sha256 = "54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1"; }; - propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; + propagatedBuildInputs = [ + setuptools + ] ++ lib.optionals isPy27 [ futures backports_functools_lru_cache ]; checkInputs = [ mock pytest ]; - # isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/ checkPhase = '' + # isort excludes paths that contain /build/, so test fixtures don't work + # with TMPDIR=/build/ PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} + + # Confirm that the produced executable script is wrapped correctly and runs + # OK, by launching it in a subshell without PYTHONPATH + ( + unset PYTHONPATH + echo "Testing that `isort --version-number` returns OK..." + $out/bin/isort --version-number + ) ''; meta = with lib; { From a25381b0191ef939ec5c929709803846e1b30c9f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 22 Oct 2019 05:47:54 +0000 Subject: [PATCH 76/76] =?UTF-8?q?ocamlPackages.ctypes:=200.13.1=20?= =?UTF-8?q?=E2=86=92=200.15.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.integers: 0.2.2 → 0.3.0 --- .../ocaml-modules/ctypes/default.nix | 22 ++++++++++--------- .../ocaml-modules/integers/default.nix | 22 ++++++++----------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 567defea7d2..bc76cfcd64c 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,28 +1,29 @@ -{ stdenv, buildOcaml, fetchzip, libffi, pkgconfig, ncurses, integers }: +{ stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: -buildOcaml { - name = "ctypes"; - version = "0.13.1"; +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "ctypes is not available for OCaml ${ocaml.version}" +else - minimumSupportedOcamlVersion = "4"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ctypes-${version}"; + version = "0.15.1"; src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/67e711ec891e087fbe1e0b4665aa525af4eaa409.tar.gz"; - sha256 = "1z84s5znr3lj84rzv6m37xxj9h7fwx4qiiykx3djf52qgk1rb2xb"; + url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; + sha256 = "0adas974bwinn8jidb6chljkpd70s041h2a969dicsj0xsg6wys6"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses ]; + buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi ]; - hasSharedObjects = true; - buildPhase = '' make XEN=false libffi.config ctypes-base ctypes-stubs make XEN=false ctypes-foreign ''; installPhase = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs make install XEN=false ''; @@ -31,5 +32,6 @@ buildOcaml { description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index bf2d2dd1e8b..14d6506ad13 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, fetchzip, buildDunePackage }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-integers-0.2.2"; +buildDunePackage rec { + pname = "integers"; + version = "0.3.0"; - src = fetchurl { - url = https://github.com/ocamllabs/ocaml-integers/releases/download/v0.2.2/integers-0.2.2.tbz; - sha256 = "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"; + src = fetchzip { + url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; + sha256 = "1yhif5zh4srh63mhimfx3p5ljpb3lixjdd3i9pjnbj2qgpzlqj8p"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; - - inherit (topkg) buildPhase installPhase; - meta = { description = "Various signed and unsigned integer types for OCaml"; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; homepage = https://github.com/ocamllabs/ocaml-integers; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + maintainers = [ lib.maintainers.vbgl ]; }; }