diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 74bcf3483b2a..099fd803ee24 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -64,6 +64,13 @@
this version for the entire lifecycle of the 21.11 release.
+
+
+ Those making use of buildBazelPackage will
+ need to regenerate the fetch hashes (preferred), or set
+ fetchConfigured = false;.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 451d25a6ed98..cd942d2f7309 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -28,4 +28,7 @@ In addition to numerous new and upgraded packages, this release has the followin
* PHP 7.3 is no longer supported due to upstream not supporting this
version for the entire lifecycle of the 21.11 release.
+* Those making use of `buildBazelPackage` will need to regenerate the fetch
+ hashes (preferred), or set `fetchConfigured = false;`.
+
## Other Notable Changes
diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix
index 3c82ed4fc593..33d15e08f4aa 100644
--- a/nixos/modules/services/system/self-deploy.nix
+++ b/nixos/modules/services/system/self-deploy.nix
@@ -37,7 +37,9 @@ in
};
nixAttribute = lib.mkOption {
- type = lib.types.str;
+ type = with lib.types; nullOr str;
+
+ default = null;
description = ''
Attribute of `nixFile` that builds the current system.
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 2b2ee019aeb2..b0859321a525 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -180,7 +180,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Enable Gnome 3 desktop manager.";
+ description = "Enable GNOME desktop manager.";
};
sessionPath = mkOption {
@@ -283,7 +283,7 @@ in
(mkIf (cfg.enable || flashbackEnabled) {
# Seed our configuration into nixos-generate-config
system.nixos-generate-config.desktopConfiguration = [''
- # Enable the GNOME 3 Desktop Environment.
+ # Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
''];
diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix
index e1a83537a6a0..728c60b2e86f 100644
--- a/pkgs/applications/audio/bshapr/default.nix
+++ b/pkgs/applications/audio/bshapr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bshapr";
- version = "0.12";
+ version = "0.13";
src = fetchFromGitHub {
owner = "sjaehn";
repo = "BShapr";
rev = "v${version}";
- sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0=";
+ sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index f862a1ae8a54..7ccd96a9ca08 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -3,20 +3,25 @@
elisp-ffi = melpaBuild rec {
pname = "elisp-ffi";
version = "1.0.0";
+
src = pkgs.fetchFromGitHub {
owner = "skeeto";
repo = "elisp-ffi";
rev = version;
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
};
+
buildInputs = [ pkgs.libffi ];
+
preBuild = "make";
+
recipe = pkgs.writeText "recipe" ''
(elisp-ffi
:repo "skeeto/elisp-ffi"
:fetcher github
:files ("ffi-glue" "ffi.el"))
'';
+
meta = {
description = "Emacs Lisp Foreign Function Interface";
longDescription = ''
@@ -65,27 +70,22 @@
};
};
- apheleia = callPackage ./apheleia {};
-
- emacspeak = callPackage ./emacspeak {};
-
- ess-R-object-popup =
- callPackage ./ess-R-object-popup { };
-
- evil-markdown = callPackage ./evil-markdown { };
-
- font-lock-plus = callPackage ./font-lock-plus { };
-
ghc-mod = melpaBuild {
pname = "ghc";
version = pkgs.haskellPackages.ghc-mod.version;
+
src = pkgs.haskellPackages.ghc-mod.src;
+
packageRequires = [ haskell-mode ];
+
propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ];
+
recipe = pkgs.writeText "recipe" ''
(ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el"))
'';
+
fileSpecs = [ "elisp/*.el" ];
+
meta = {
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
license = bsd3;
@@ -97,32 +97,28 @@
haskell-unicode-input-method = melpaBuild {
pname = "emacs-haskell-unicode-input-method";
version = "20110905.2307";
+
src = pkgs.fetchFromGitHub {
owner = "roelvandijk";
repo = "emacs-haskell-unicode-input-method";
rev = "d8d168148c187ed19350bb7a1a190217c2915a63";
sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";
};
+
recipe = pkgs.writeText "recipe" ''
(emacs-haskell-unicode-input-method
:repo "roelvandijk/emacs-haskell-unicode-input-method"
:fetcher github)
'';
+
packageRequires = [];
+
meta = {
homepage = "https://melpa.org/#haskell-unicode-input-method/";
license = lib.licenses.free;
};
};
- helm-words = callPackage ./helm-words { };
-
- isearch-plus = callPackage ./isearch-plus { };
-
- isearch-prop = callPackage ./isearch-prop { };
-
- jam-mode = callPackage ./jam-mode { };
-
llvm-mode = trivialBuild {
pname = "llvm-mode";
inherit (pkgs.llvmPackages.llvm) src version;
@@ -150,6 +146,7 @@
};
patches = [
+ # Fix: avatar loading when imagemagick support is not available
(pkgs.fetchpatch {
url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch";
sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm";
@@ -187,11 +184,6 @@
};
- mu4e-patch = callPackage ./mu4e-patch { };
-
- org-mac-link =
- callPackage ./org-mac-link { };
-
ott-mode = self.trivialBuild {
pname = "ott-mod";
@@ -205,11 +197,28 @@
};
};
- perl-completion =
- callPackage ./perl-completion { };
+ # Packages made the classical callPackage way
+
+ emacspeak = callPackage ./emacspeak { };
+
+ ess-R-object-popup = callPackage ./ess-R-object-popup { };
+
+ font-lock-plus = callPackage ./font-lock-plus { };
+
+ helm-words = callPackage ./helm-words { };
+
+ jam-mode = callPackage ./jam-mode { };
+
+ nano-theme = callPackage ./nano-theme { };
+
+ org-mac-link = callPackage ./org-mac-link { };
+
+ perl-completion = callPackage ./perl-completion { };
pod-mode = callPackage ./pod-mode { };
+ power-mode = callPackage ./power-mode { };
+
railgun = callPackage ./railgun { };
structured-haskell-mode = self.shm;
@@ -243,34 +252,34 @@
# closer to the old outdated package infra.
#
# Ideally this should be dropped some time during/after 20.03
+
+ autoComplete = self.melpaStablePackages.auto-complete;
bbdb3 = self.melpaStablePackages.bbdb;
- jade = self.jade-mode;
- # scalaMode2 = null; # No clear mapping as of now
- flymakeCursor = self.melpaStablePackages.flymake-cursor;
+ colorTheme = self.color-theme;
cryptol = self.melpaStablePackages.cryptol-mode;
+ d = self.melpaStablePackages.d-mode;
+ emacsw3m = self.w3m;
+ erlangMode = self.melpaStablePackages.erlang;
+ flymakeCursor = self.melpaStablePackages.flymake-cursor;
+ graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
+ haskellMode = self.melpaStablePackages.haskell-mode;
+ hsc3Mode = self.hsc3-mode;
+ idris = self.melpaStablePackages.idris-mode;
+ jade = self.jade-mode;
+ js2 = self.melpaStablePackages.js2-mode;
+ loremIpsum = self.lorem-ipsum;
+ markdownMode = self.melpaStablePackages.markdown-mode;
maudeMode = self.maude-mode;
phpMode = self.melpaStablePackages.php-mode;
- idris = self.melpaStablePackages.idris-mode;
- rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
- colorTheme = self.color-theme;
- sbtMode = self.melpaStablePackages.sbt-mode;
- markdownMode = self.melpaStablePackages.markdown-mode;
- scalaMode1 = self.melpaStablePackages.scala-mode;
prologMode = self.prolog-mode;
- hsc3Mode = self.hsc3-mode;
- graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
- proofgeneral_HEAD = self.proof-general;
proofgeneral = self.melpaStablePackages.proof-general;
- haskellMode = self.melpaStablePackages.haskell-mode;
- writeGood = self.melpaStablePackages.writegood-mode;
- erlangMode = self.melpaStablePackages.erlang;
- d = self.melpaStablePackages.d-mode;
- autoComplete = self.melpaStablePackages.auto-complete;
- tuaregMode = self.melpaStablePackages.tuareg;
+ proofgeneral_HEAD = self.proof-general;
+ rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
+ sbtMode = self.melpaStablePackages.sbt-mode;
+ scalaMode1 = self.melpaStablePackages.scala-mode;
+ # scalaMode2 = null; # No clear mapping as of now
structuredHaskellMode = self.melpaStablePackages.shm;
+ tuaregMode = self.melpaStablePackages.tuareg;
+ writeGood = self.melpaStablePackages.writegood-mode;
xmlRpc = self.melpaStablePackages.xml-rpc;
- emacsw3m = self.w3m;
- loremIpsum = self.lorem-ipsum;
- js2 = self.melpaStablePackages.js2-mode;
-
}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
new file mode 100644
index 000000000000..8034f41a72d6
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, emacs
+}:
+
+stdenv.mkDerivation rec {
+ pname = "nano-theme";
+ version = "2021-06-05";
+
+ src = fetchFromGitHub {
+ owner = "rougier";
+ repo = pname;
+ rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7";
+ hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/emacs/site-lisp
+ install *.el $out/share/emacs/site-lisp
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/rougier/nano-theme";
+ description = "GNU Emacs / N Λ N O Theme";
+ inherit (emacs.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
new file mode 100644
index 000000000000..035c906c8ab3
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, emacs
+}:
+
+stdenv.mkDerivation rec {
+ pname = "power-mode";
+ version = "2021-06-06";
+
+ src = fetchFromGitHub {
+ owner = "elizagamedev";
+ repo = "power-mode.el";
+ rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb";
+ hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/share/emacs/site-lisp
+ install *.el $out/share/emacs/site-lisp
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://github.com/rougier/nano-theme";
+ description = "Imbue Emacs with power!";
+ inherit (emacs.meta) platforms;
+ };
+}
diff --git a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix
index 237c05c5fa76..72dbf7a0f476 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix
@@ -1,16 +1,28 @@
-{ lib, stdenv, fetchurl, emacs, texinfo }:
+{ lib
+, stdenv
+, fetchurl
+, emacs
+, texinfo
+}:
stdenv.mkDerivation rec {
- name = "tramp-2.4.2";
+ pname = "tramp";
+ version = "2.5.0";
+
src = fetchurl {
- url = "mirror://gnu/tramp/${name}.tar.gz";
- sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61";
+ url = "mirror://gnu/tramp/${pname}-${version}.tar.gz";
+ sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY=";
};
- buildInputs = [ emacs texinfo ];
+
+ buildInputs = [
+ emacs
+ texinfo
+ ];
+
meta = {
- description = "Transparently access remote files from Emacs. Newer versions than built-in.";
homepage = "https://www.gnu.org/software/tramp";
+ description = "Transparently access remote files from Emacs. Newer versions than built-in.";
license = lib.licenses.gpl3Plus;
- platforms = lib.platforms.all;
+ inherit (emacs.meta) platforms;
};
}
diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index 6af4f67d8c65..08d5524fc3a5 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -21,11 +21,11 @@
buildPythonApplication rec {
pname = "archivy";
- version = "1.1.4";
+ version = "1.3.1";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-oSmwQcKvp9RABmc7aq6fdLOZapMauIi6+7azVTXVb30=";
+ sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM=";
};
# Relax some dependencies
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index d07b7d2912a3..d4332c0265c5 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -18,24 +18,15 @@
stdenv.mkDerivation rec {
pname = "dino";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
- sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw";
+ sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8";
};
- patches = [
- # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument)
- (fetchpatch {
- name = "dino-vala-boxing.patch";
- url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch";
- sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm";
- })
- ];
-
nativeBuildInputs = [
vala
cmake
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 901e056025be..5293c55f1278 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.29",
+ "version": "1.7.30",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -47,8 +47,9 @@
"electron-builder-squirrel-windows": "22.10.5",
"electron-devtools-installer": "^3.1.1",
"electron-notarize": "^1.0.0",
- "eslint": "7.3.1",
- "eslint-config-matrix-org": "^0.1.2",
+ "eslint": "7.18.0",
+ "eslint-config-google": "^0.14.0",
+ "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
@@ -67,7 +68,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "12.0.2",
+ "electronVersion": "12.0.9",
"files": [
"package.json",
{
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
index 7d26fbbbff76..258f5cb2dade 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
@@ -25,14 +25,6 @@
sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d";
};
}
- {
- name = "_babel_code_frame___code_frame_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_code_frame___code_frame_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz";
- sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a";
- };
- }
{
name = "_babel_code_frame___code_frame_7.12.13.tgz";
path = fetchurl {
@@ -41,14 +33,6 @@
sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658";
};
}
- {
- name = "_babel_generator___generator_7.10.5.tgz";
- path = fetchurl {
- name = "_babel_generator___generator_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz";
- sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69";
- };
- }
{
name = "_babel_generator___generator_7.13.16.tgz";
path = fetchurl {
@@ -57,14 +41,6 @@
sha1 = "0befc287031a201d84cdfc173b46b320ae472d14";
};
}
- {
- name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";
- sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a";
- };
- }
{
name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz";
path = fetchurl {
@@ -73,14 +49,6 @@
sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a";
};
}
- {
- name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";
- sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2";
- };
- }
{
name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz";
path = fetchurl {
@@ -89,14 +57,6 @@
sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583";
};
}
- {
- name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz";
- sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1";
- };
- }
{
name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz";
path = fetchurl {
@@ -105,14 +65,6 @@
sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05";
};
}
- {
- name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz";
- sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2";
- };
- }
{
name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz";
path = fetchurl {
@@ -129,14 +81,6 @@
sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
};
}
- {
- name = "_babel_highlight___highlight_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_highlight___highlight_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz";
- sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143";
- };
- }
{
name = "_babel_highlight___highlight_7.13.10.tgz";
path = fetchurl {
@@ -145,14 +89,6 @@
sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1";
};
}
- {
- name = "_babel_parser___parser_7.10.5.tgz";
- path = fetchurl {
- name = "_babel_parser___parser_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz";
- sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b";
- };
- }
{
name = "_babel_parser___parser_7.13.16.tgz";
path = fetchurl {
@@ -169,14 +105,6 @@
sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736";
};
}
- {
- name = "_babel_template___template_7.10.4.tgz";
- path = fetchurl {
- name = "_babel_template___template_7.10.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz";
- sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278";
- };
- }
{
name = "_babel_template___template_7.12.13.tgz";
path = fetchurl {
@@ -193,22 +121,6 @@
sha1 = "c85415e0c7d50ac053d758baec98b28b2ecfeea3";
};
}
- {
- name = "_babel_traverse___traverse_7.10.5.tgz";
- path = fetchurl {
- name = "_babel_traverse___traverse_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz";
- sha1 = "77ce464f5b258be265af618d8fddf0536f20b564";
- };
- }
- {
- name = "_babel_types___types_7.10.5.tgz";
- path = fetchurl {
- name = "_babel_types___types_7.10.5.tgz";
- url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz";
- sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15";
- };
- }
{
name = "_babel_types___types_7.13.17.tgz";
path = fetchurl {
@@ -233,6 +145,14 @@
sha1 = "231ac246c39d45b80e159bd21c3f9027dcaa10f5";
};
}
+ {
+ name = "_eslint_eslintrc___eslintrc_0.3.0.tgz";
+ path = fetchurl {
+ name = "_eslint_eslintrc___eslintrc_0.3.0.tgz";
+ url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz";
+ sha1 = "d736d6963d7003b6514e6324bec9c602ac340318";
+ };
+ }
{
name = "_iarna_cli___cli_1.2.0.tgz";
path = fetchurl {
@@ -529,14 +449,6 @@
sha1 = "b14efa8852b7768d898906613c23f688713e02cd";
};
}
- {
- name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
- path = fetchurl {
- name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
- sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d";
- };
- }
{
name = "_types_fs_extra___fs_extra_9.0.9.tgz";
path = fetchurl {
@@ -553,22 +465,6 @@
sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183";
};
}
- {
- name = "_types_json_schema___json_schema_7.0.5.tgz";
- path = fetchurl {
- name = "_types_json_schema___json_schema_7.0.5.tgz";
- url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz";
- sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd";
- };
- }
- {
- name = "_types_json5___json5_0.0.29.tgz";
- path = fetchurl {
- name = "_types_json5___json5_0.0.29.tgz";
- url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz";
- sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee";
- };
- }
{
name = "_types_minimatch___minimatch_3.0.4.tgz";
path = fetchurl {
@@ -625,54 +521,6 @@
sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc";
};
}
- {
- name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz";
- sha1 = "0f91aa3c83d019591719e597fbdb73a59595a263";
- };
- }
- {
- name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz";
- sha1 = "0ee21f6c48b2b30c63211da23827725078d5169a";
- };
- }
- {
- name = "_typescript_eslint_parser___parser_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_parser___parser_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz";
- sha1 = "3e9cd9df9ea644536feb6e5acdb8279ecff96ce9";
- };
- }
- {
- name = "_typescript_eslint_types___types_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_types___types_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz";
- sha1 = "09897fab0cb95479c01166b10b2c03c224821077";
- };
- }
- {
- name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz";
- sha1 = "66872e6da120caa4b64e6b4ca5c8702afc74738d";
- };
- }
- {
- name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz";
- path = fetchurl {
- name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz";
- url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz";
- sha1 = "ac0417d382a136e4571a0b0dcfe52088cb628177";
- };
- }
{
name = "JSONStream___JSONStream_1.3.5.tgz";
path = fetchurl {
@@ -690,19 +538,19 @@
};
}
{
- name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
path = fetchurl {
- name = "acorn_jsx___acorn_jsx_5.2.0.tgz";
- url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz";
- sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe";
+ name = "acorn_jsx___acorn_jsx_5.3.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz";
+ sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b";
};
}
{
- name = "acorn___acorn_7.3.1.tgz";
+ name = "acorn___acorn_7.4.1.tgz";
path = fetchurl {
- name = "acorn___acorn_7.3.1.tgz";
- url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz";
- sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd";
+ name = "acorn___acorn_7.4.1.tgz";
+ url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz";
+ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa";
};
}
{
@@ -745,14 +593,6 @@
sha1 = "18c5af38a111ddeb4f2697bd78d68abc1cabd706";
};
}
- {
- name = "ajv___ajv_6.10.2.tgz";
- path = fetchurl {
- name = "ajv___ajv_6.10.2.tgz";
- url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz";
- sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
- };
- }
{
name = "ajv___ajv_6.12.2.tgz";
path = fetchurl {
@@ -777,6 +617,22 @@
sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da";
};
}
+ {
+ name = "ajv___ajv_6.10.2.tgz";
+ path = fetchurl {
+ name = "ajv___ajv_6.10.2.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz";
+ sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
+ };
+ }
+ {
+ name = "ajv___ajv_8.5.0.tgz";
+ path = fetchurl {
+ name = "ajv___ajv_8.5.0.tgz";
+ url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz";
+ sha1 = "695528274bcb5afc865446aa275484049a18ae4b";
+ };
+ }
{
name = "ansi_align___ansi_align_2.0.0.tgz";
path = fetchurl {
@@ -801,14 +657,6 @@
sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348";
};
}
- {
- name = "ansi_escapes___ansi_escapes_4.3.1.tgz";
- path = fetchurl {
- name = "ansi_escapes___ansi_escapes_4.3.1.tgz";
- url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
- sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61";
- };
- }
{
name = "ansi_regex___ansi_regex_2.1.1.tgz";
path = fetchurl {
@@ -969,30 +817,6 @@
sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38";
};
}
- {
- name = "array_includes___array_includes_3.1.1.tgz";
- path = fetchurl {
- name = "array_includes___array_includes_3.1.1.tgz";
- url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz";
- sha1 = "cdd67e6852bdf9c1215460786732255ed2459348";
- };
- }
- {
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
- path = fetchurl {
- name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
- sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
- };
- }
- {
- name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz";
- path = fetchurl {
- name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz";
- url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz";
- sha1 = "1c13f84a178566042dd63de4414440db9222e443";
- };
- }
{
name = "asap___asap_2.0.6.tgz";
path = fetchurl {
@@ -1034,11 +858,11 @@
};
}
{
- name = "astral_regex___astral_regex_1.0.0.tgz";
+ name = "astral_regex___astral_regex_2.0.0.tgz";
path = fetchurl {
- name = "astral_regex___astral_regex_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz";
- sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9";
+ name = "astral_regex___astral_regex_2.0.0.tgz";
+ url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz";
+ sha1 = "483143c567aeed4785759c0865786dc77d7d2e31";
};
}
{
@@ -1113,14 +937,6 @@
sha1 = "24390e6ad61386b0a747265754d2a17219de862c";
};
}
- {
- name = "babel_eslint___babel_eslint_10.1.0.tgz";
- path = fetchurl {
- name = "babel_eslint___babel_eslint_10.1.0.tgz";
- url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz";
- sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232";
- };
- }
{
name = "balanced_match___balanced_match_1.0.0.tgz";
path = fetchurl {
@@ -1409,14 +1225,6 @@
sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a";
};
}
- {
- name = "chardet___chardet_0.7.0.tgz";
- path = fetchurl {
- name = "chardet___chardet_0.7.0.tgz";
- url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz";
- sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
- };
- }
{
name = "chownr___chownr_1.1.4.tgz";
path = fetchurl {
@@ -1489,14 +1297,6 @@
sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e";
};
}
- {
- name = "cli_cursor___cli_cursor_3.1.0.tgz";
- path = fetchurl {
- name = "cli_cursor___cli_cursor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz";
- sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307";
- };
- }
{
name = "cli_table3___cli_table3_0.5.1.tgz";
path = fetchurl {
@@ -1513,14 +1313,6 @@
sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086";
};
}
- {
- name = "cli_width___cli_width_3.0.0.tgz";
- path = fetchurl {
- name = "cli_width___cli_width_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz";
- sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6";
- };
- }
{
name = "cliui___cliui_3.2.0.tgz";
path = fetchurl {
@@ -1729,14 +1521,6 @@
sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
};
}
- {
- name = "contains_path___contains_path_0.1.0.tgz";
- path = fetchurl {
- name = "contains_path___contains_path_0.1.0.tgz";
- url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz";
- sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a";
- };
- }
{
name = "copy_concurrently___copy_concurrently_1.0.5.tgz";
path = fetchurl {
@@ -1801,14 +1585,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 = "cross_spawn___cross_spawn_7.0.3.tgz";
path = fetchurl {
@@ -1881,14 +1657,6 @@
sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
};
}
- {
- name = "debug___debug_2.6.9.tgz";
- path = fetchurl {
- name = "debug___debug_2.6.9.tgz";
- url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz";
- sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
- };
- }
{
name = "debug___debug_3.2.6.tgz";
path = fetchurl {
@@ -2065,22 +1833,6 @@
sha1 = "d52e234815f1a07a59706e5f2a2fea71991cf784";
};
}
- {
- name = "doctrine___doctrine_1.5.0.tgz";
- path = fetchurl {
- name = "doctrine___doctrine_1.5.0.tgz";
- url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz";
- sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa";
- };
- }
- {
- name = "doctrine___doctrine_2.1.0.tgz";
- path = fetchurl {
- name = "doctrine___doctrine_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz";
- sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d";
- };
- }
{
name = "doctrine___doctrine_3.0.0.tgz";
path = fetchurl {
@@ -2321,14 +2073,6 @@
sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
};
}
- {
- name = "es_abstract___es_abstract_1.17.6.tgz";
- path = fetchurl {
- name = "es_abstract___es_abstract_1.17.6.tgz";
- url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz";
- sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a";
- };
- }
{
name = "es_abstract___es_abstract_1.16.3.tgz";
path = fetchurl {
@@ -2385,14 +2129,6 @@
sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
};
}
- {
- name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz";
- path = fetchurl {
- name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz";
- sha1 = "8695b858fcf40d28c1aedca181f700528c7b60c6";
- };
- }
{
name = "eslint_config_google___eslint_config_google_0.14.0.tgz";
path = fetchurl {
@@ -2402,115 +2138,19 @@
};
}
{
- name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz";
+ name = "53000626a9256811f6b355de4eafeb5575bda7fc";
path = fetchurl {
- name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz";
- sha1 = "b5d7e193e4f3fc5041905967b53c5ddd6924c793";
+ name = "53000626a9256811f6b355de4eafeb5575bda7fc";
+ url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/53000626a9256811f6b355de4eafeb5575bda7fc";
+ sha1 = "12617a8105ab0ea2e7df2567928260a41ebffd58";
};
}
{
- name = "eslint_config_node___eslint_config_node_4.1.0.tgz";
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
path = fetchurl {
- name = "eslint_config_node___eslint_config_node_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz";
- sha1 = "fc1f13946d83766d6b83b0e67699e2071a56f417";
- };
- }
- {
- name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz";
- path = fetchurl {
- name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz";
- sha1 = "63e9401c7fac146804785f609e7df8f15b3e04eb";
- };
- }
- {
- name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz";
- path = fetchurl {
- name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz";
- sha1 = "1adff90e0716d439be471d192977f233de171a46";
- };
- }
- {
- name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
- path = fetchurl {
- name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz";
- url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz";
- sha1 = "85ffa81942c25012d8231096ddf679c03042c717";
- };
- }
- {
- name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
- path = fetchurl {
- name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz";
- sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6";
- };
- }
- {
- name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz";
- path = fetchurl {
- name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz";
- sha1 = "75a2413ffbf17e7be57458301c60291f2cfbf560";
- };
- }
- {
- name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz";
- path = fetchurl {
- name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz";
- sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e";
- };
- }
- {
- name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz";
- path = fetchurl {
- name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz";
- sha1 = "ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2";
- };
- }
- {
- name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz";
- path = fetchurl {
- name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz";
- sha1 = "92811e37191ecb0d29c0f0a0c9e5c943ee573821";
- };
- }
- {
- name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz";
- path = fetchurl {
- name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz";
- url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz";
- sha1 = "0590525e7eb83890ce71f73c2cf836284ad8c2f1";
- };
- }
- {
- name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz";
- path = fetchurl {
- name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz";
- sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9";
- };
- }
- {
- name = "eslint_scope___eslint_scope_5.1.0.tgz";
- path = fetchurl {
- name = "eslint_scope___eslint_scope_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz";
- sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5";
- };
- }
- {
- name = "eslint_utils___eslint_utils_1.4.3.tgz";
- path = fetchurl {
- name = "eslint_utils___eslint_utils_1.4.3.tgz";
- url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
- sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
+ name = "eslint_scope___eslint_scope_5.1.1.tgz";
+ url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz";
+ sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c";
};
}
{
@@ -2538,35 +2178,27 @@
};
}
{
- name = "eslint___eslint_7.3.1.tgz";
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz";
path = fetchurl {
- name = "eslint___eslint_7.3.1.tgz";
- url = "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz";
- sha1 = "76392bd7e44468d046149ba128d1566c59acbe19";
+ name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz";
+ sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303";
};
}
{
- name = "eslint___eslint_6.8.0.tgz";
+ name = "eslint___eslint_7.18.0.tgz";
path = fetchurl {
- name = "eslint___eslint_6.8.0.tgz";
- url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz";
- sha1 = "62262d6729739f9275723824302fb227c8c93ffb";
+ name = "eslint___eslint_7.18.0.tgz";
+ url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz";
+ sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67";
};
}
{
- name = "espree___espree_6.2.1.tgz";
+ name = "espree___espree_7.3.1.tgz";
path = fetchurl {
- name = "espree___espree_6.2.1.tgz";
- url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz";
- sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a";
- };
- }
- {
- name = "espree___espree_7.2.0.tgz";
- path = fetchurl {
- name = "espree___espree_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz";
- sha1 = "1c263d5b513dbad0ac30c4991b93ac354e948d69";
+ name = "espree___espree_7.3.1.tgz";
+ url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz";
+ sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6";
};
}
{
@@ -2577,14 +2209,6 @@
sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71";
};
}
- {
- name = "esquery___esquery_1.0.1.tgz";
- path = fetchurl {
- name = "esquery___esquery_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
- sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
- };
- }
{
name = "esquery___esquery_1.3.1.tgz";
path = fetchurl {
@@ -2594,11 +2218,11 @@
};
}
{
- name = "esrecurse___esrecurse_4.2.1.tgz";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
path = fetchurl {
- name = "esrecurse___esrecurse_4.2.1.tgz";
- url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz";
- sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf";
+ name = "esrecurse___esrecurse_4.3.0.tgz";
+ url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz";
+ sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921";
};
}
{
@@ -2617,6 +2241,14 @@
sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642";
};
}
+ {
+ name = "estraverse___estraverse_5.2.0.tgz";
+ path = fetchurl {
+ name = "estraverse___estraverse_5.2.0.tgz";
+ url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz";
+ sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880";
+ };
+ }
{
name = "esutils___esutils_2.0.3.tgz";
path = fetchurl {
@@ -2665,14 +2297,6 @@
sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa";
};
}
- {
- name = "external_editor___external_editor_3.1.0.tgz";
- path = fetchurl {
- name = "external_editor___external_editor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz";
- sha1 = "cb03f740befae03ea4d283caed2741a83f335495";
- };
- }
{
name = "extsprintf___extsprintf_1.3.0.tgz";
path = fetchurl {
@@ -2730,19 +2354,11 @@
};
}
{
- name = "figures___figures_3.2.0.tgz";
+ name = "file_entry_cache___file_entry_cache_6.0.1.tgz";
path = fetchurl {
- name = "figures___figures_3.2.0.tgz";
- url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz";
- sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af";
- };
- }
- {
- name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
- path = fetchurl {
- name = "file_entry_cache___file_entry_cache_5.0.1.tgz";
- url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz";
- sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c";
+ name = "file_entry_cache___file_entry_cache_6.0.1.tgz";
+ url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz";
+ sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027";
};
}
{
@@ -2786,19 +2402,19 @@
};
}
{
- name = "flat_cache___flat_cache_2.0.1.tgz";
+ name = "flat_cache___flat_cache_3.0.4.tgz";
path = fetchurl {
- name = "flat_cache___flat_cache_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz";
- sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0";
+ name = "flat_cache___flat_cache_3.0.4.tgz";
+ url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz";
+ sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11";
};
}
{
- name = "flatted___flatted_2.0.1.tgz";
+ name = "flatted___flatted_3.1.1.tgz";
path = fetchurl {
- name = "flatted___flatted_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz";
- sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08";
+ name = "flatted___flatted_3.1.1.tgz";
+ url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz";
+ sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469";
};
}
{
@@ -3369,6 +2985,14 @@
sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
};
}
+ {
+ name = "import_fresh___import_fresh_3.3.0.tgz";
+ path = fetchurl {
+ name = "import_fresh___import_fresh_3.3.0.tgz";
+ url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz";
+ sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b";
+ };
+ }
{
name = "import_lazy___import_lazy_2.1.0.tgz";
path = fetchurl {
@@ -3441,22 +3065,6 @@
sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe";
};
}
- {
- name = "inquirer___inquirer_7.3.2.tgz";
- path = fetchurl {
- name = "inquirer___inquirer_7.3.2.tgz";
- url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz";
- sha1 = "25245d2e32dc9f33dbe26eeaada231daa66e9c7c";
- };
- }
- {
- name = "internal_slot___internal_slot_1.0.2.tgz";
- path = fetchurl {
- name = "internal_slot___internal_slot_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz";
- sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3";
- };
- }
{
name = "invert_kv___invert_kv_1.0.0.tgz";
path = fetchurl {
@@ -3497,14 +3105,6 @@
sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
};
}
- {
- name = "is_callable___is_callable_1.2.0.tgz";
- path = fetchurl {
- name = "is_callable___is_callable_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz";
- sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb";
- };
- }
{
name = "is_ci___is_ci_1.2.1.tgz";
path = fetchurl {
@@ -3673,14 +3273,6 @@
sha1 = "5517489b547091b0930e095654ced25ee97e9491";
};
}
- {
- name = "is_regex___is_regex_1.1.0.tgz";
- path = fetchurl {
- name = "is_regex___is_regex_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz";
- sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff";
- };
- }
{
name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz";
path = fetchurl {
@@ -3697,14 +3289,6 @@
sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
};
}
- {
- name = "is_string___is_string_1.0.5.tgz";
- path = fetchurl {
- name = "is_string___is_string_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
- sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
- };
- }
{
name = "is_symbol___is_symbol_1.0.3.tgz";
path = fetchurl {
@@ -3857,6 +3441,14 @@
sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660";
};
}
+ {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ path = fetchurl {
+ name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz";
+ sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2";
+ };
+ }
{
name = "json_schema_typed___json_schema_typed_7.0.3.tgz";
path = fetchurl {
@@ -3889,14 +3481,6 @@
sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
};
}
- {
- name = "json5___json5_1.0.1.tgz";
- path = fetchurl {
- name = "json5___json5_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz";
- sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
- };
- }
{
name = "json5___json5_2.1.3.tgz";
path = fetchurl {
@@ -3937,14 +3521,6 @@
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
}
- {
- name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz";
- path = fetchurl {
- name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz";
- url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz";
- sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e";
- };
- }
{
name = "jszip___jszip_3.5.0.tgz";
path = fetchurl {
@@ -4009,14 +3585,6 @@
sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
};
}
- {
- name = "levn___levn_0.3.0.tgz";
- path = fetchurl {
- name = "levn___levn_0.3.0.tgz";
- url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz";
- sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
- };
- }
{
name = "levn___levn_0.4.1.tgz";
path = fetchurl {
@@ -4225,6 +3793,14 @@
sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
};
}
+ {
+ name = "lodash.truncate___lodash.truncate_4.4.2.tgz";
+ path = fetchurl {
+ name = "lodash.truncate___lodash.truncate_4.4.2.tgz";
+ url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz";
+ sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193";
+ };
+ }
{
name = "lodash.union___lodash.union_4.6.0.tgz";
path = fetchurl {
@@ -4250,27 +3826,11 @@
};
}
{
- name = "lodash___lodash_4.17.15.tgz";
+ name = "lodash___lodash_4.17.21.tgz";
path = fetchurl {
- name = "lodash___lodash_4.17.15.tgz";
- url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz";
- sha1 = "b447f6670a0455bbfeedd11392eff330ea097548";
- };
- }
- {
- name = "lodash___lodash_4.17.19.tgz";
- path = fetchurl {
- name = "lodash___lodash_4.17.19.tgz";
- url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz";
- sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b";
- };
- }
- {
- name = "loose_envify___loose_envify_1.4.0.tgz";
- path = fetchurl {
- name = "loose_envify___loose_envify_1.4.0.tgz";
- url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz";
- sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf";
+ name = "lodash___lodash_4.17.21.tgz";
+ url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz";
+ sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c";
};
}
{
@@ -4593,14 +4153,6 @@
sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0";
};
}
- {
- name = "nice_try___nice_try_1.0.5.tgz";
- path = fetchurl {
- name = "nice_try___nice_try_1.0.5.tgz";
- url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz";
- sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366";
- };
- }
{
name = "node_addon_api___node_addon_api_1.7.2.tgz";
path = fetchurl {
@@ -4881,30 +4433,6 @@
sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e";
};
}
- {
- name = "object.assign___object.assign_4.1.0.tgz";
- path = fetchurl {
- name = "object.assign___object.assign_4.1.0.tgz";
- url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz";
- sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da";
- };
- }
- {
- name = "object.entries___object.entries_1.1.2.tgz";
- path = fetchurl {
- name = "object.entries___object.entries_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz";
- sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add";
- };
- }
- {
- name = "object.fromentries___object.fromentries_2.0.2.tgz";
- path = fetchurl {
- name = "object.fromentries___object.fromentries_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz";
- sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9";
- };
- }
{
name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
path = fetchurl {
@@ -4913,14 +4441,6 @@
sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
};
}
- {
- name = "object.values___object.values_1.1.1.tgz";
- path = fetchurl {
- name = "object.values___object.values_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz";
- sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e";
- };
- }
{
name = "omggif___omggif_1.0.10.tgz";
path = fetchurl {
@@ -4953,14 +4473,6 @@
sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598";
};
}
- {
- name = "optionator___optionator_0.8.3.tgz";
- path = fetchurl {
- name = "optionator___optionator_0.8.3.tgz";
- url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz";
- sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
- };
- }
{
name = "optionator___optionator_0.9.1.tgz";
path = fetchurl {
@@ -5249,14 +4761,6 @@
sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854";
};
}
- {
- name = "pkg_dir___pkg_dir_2.0.0.tgz";
- path = fetchurl {
- name = "pkg_dir___pkg_dir_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz";
- sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
- };
- }
{
name = "pkg_up___pkg_up_3.1.0.tgz";
path = fetchurl {
@@ -5305,14 +4809,6 @@
sha1 = "debc6489d7a6e6b0e7611888cec880337d316396";
};
}
- {
- name = "prelude_ls___prelude_ls_1.1.2.tgz";
- path = fetchurl {
- name = "prelude_ls___prelude_ls_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz";
- sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
- };
- }
{
name = "prepend_http___prepend_http_1.0.4.tgz";
path = fetchurl {
@@ -5385,14 +4881,6 @@
sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
};
}
- {
- name = "prop_types___prop_types_15.7.2.tgz";
- path = fetchurl {
- name = "prop_types___prop_types_15.7.2.tgz";
- url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz";
- sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5";
- };
- }
{
name = "proto_list___proto_list_1.2.4.tgz";
path = fetchurl {
@@ -5529,14 +5017,6 @@
sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed";
};
}
- {
- name = "react_is___react_is_16.13.1.tgz";
- path = fetchurl {
- name = "react_is___react_is_16.13.1.tgz";
- url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz";
- sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4";
- };
- }
{
name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz";
path = fetchurl {
@@ -5649,22 +5129,6 @@
sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55";
};
}
- {
- name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
- path = fetchurl {
- name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
- url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
- sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75";
- };
- }
- {
- name = "regexpp___regexpp_2.0.1.tgz";
- path = fetchurl {
- name = "regexpp___regexpp_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz";
- sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
- };
- }
{
name = "regexpp___regexpp_3.1.0.tgz";
path = fetchurl {
@@ -5729,6 +5193,14 @@
sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
};
}
+ {
+ name = "require_from_string___require_from_string_2.0.2.tgz";
+ path = fetchurl {
+ name = "require_from_string___require_from_string_2.0.2.tgz";
+ url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz";
+ sha1 = "89a7fdd938261267318eafe14f9c32e598c36909";
+ };
+ }
{
name = "require_main_filename___require_main_filename_1.0.1.tgz";
path = fetchurl {
@@ -5761,14 +5233,6 @@
sha1 = "be0aa4c06acd53083505abb35f4d66932ab35d16";
};
}
- {
- name = "resolve___resolve_1.17.0.tgz";
- path = fetchurl {
- name = "resolve___resolve_1.17.0.tgz";
- url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz";
- sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444";
- };
- }
{
name = "resolve___resolve_1.20.0.tgz";
path = fetchurl {
@@ -5785,14 +5249,6 @@
sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
};
}
- {
- name = "restore_cursor___restore_cursor_3.1.0.tgz";
- path = fetchurl {
- name = "restore_cursor___restore_cursor_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz";
- sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e";
- };
- }
{
name = "retry___retry_0.10.1.tgz";
path = fetchurl {
@@ -5809,14 +5265,6 @@
sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
};
}
- {
- name = "rimraf___rimraf_2.6.3.tgz";
- path = fetchurl {
- name = "rimraf___rimraf_2.6.3.tgz";
- url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz";
- sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
- };
- }
{
name = "rimraf___rimraf_2.7.1.tgz";
path = fetchurl {
@@ -5833,14 +5281,6 @@
sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a";
};
}
- {
- name = "run_async___run_async_2.4.1.tgz";
- path = fetchurl {
- name = "run_async___run_async_2.4.1.tgz";
- url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz";
- sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455";
- };
- }
{
name = "run_queue___run_queue_1.0.3.tgz";
path = fetchurl {
@@ -5849,14 +5289,6 @@
sha1 = "e848396f057d223f24386924618e25694161ec47";
};
}
- {
- name = "rxjs___rxjs_6.6.0.tgz";
- path = fetchurl {
- name = "rxjs___rxjs_6.6.0.tgz";
- url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz";
- sha1 = "af2901eedf02e3a83ffa7f886240ff9018bbec84";
- };
- }
{
name = "safe_buffer___safe_buffer_5.2.0.tgz";
path = fetchurl {
@@ -6009,14 +5441,6 @@
sha1 = "ae16f1644d873ecad843b0307b143362d4c42172";
};
}
- {
- name = "side_channel___side_channel_1.0.2.tgz";
- path = fetchurl {
- name = "side_channel___side_channel_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz";
- sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947";
- };
- }
{
name = "signal_exit___signal_exit_3.0.2.tgz";
path = fetchurl {
@@ -6034,11 +5458,11 @@
};
}
{
- name = "slice_ansi___slice_ansi_2.1.0.tgz";
+ name = "slice_ansi___slice_ansi_4.0.0.tgz";
path = fetchurl {
- name = "slice_ansi___slice_ansi_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz";
- sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636";
+ name = "slice_ansi___slice_ansi_4.0.0.tgz";
+ url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz";
+ sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b";
};
}
{
@@ -6257,22 +5681,6 @@
sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5";
};
}
- {
- name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
- path = fetchurl {
- name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz";
- sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e";
- };
- }
- {
- name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
- path = fetchurl {
- name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz";
- sha1 = "85812a6b847ac002270f5808146064c995fb6913";
- };
- }
{
name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
path = fetchurl {
@@ -6289,14 +5697,6 @@
sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
};
}
- {
- name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
- path = fetchurl {
- name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz";
- sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54";
- };
- }
{
name = "string_decoder___string_decoder_1.3.0.tgz";
path = fetchurl {
@@ -6410,11 +5810,11 @@
};
}
{
- name = "table___table_5.4.6.tgz";
+ name = "table___table_6.7.1.tgz";
path = fetchurl {
- name = "table___table_5.4.6.tgz";
- url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz";
- sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e";
+ name = "table___table_6.7.1.tgz";
+ url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz";
+ sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2";
};
}
{
@@ -6537,14 +5937,6 @@
sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877";
};
}
- {
- name = "tmp___tmp_0.0.33.tgz";
- path = fetchurl {
- name = "tmp___tmp_0.0.33.tgz";
- url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz";
- sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9";
- };
- }
{
name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
path = fetchurl {
@@ -6585,38 +5977,6 @@
sha1 = "405923909592d56f78a5818434b0b78489ca5f2b";
};
}
- {
- name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
- path = fetchurl {
- name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz";
- url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz";
- sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b";
- };
- }
- {
- name = "tslib___tslib_1.13.0.tgz";
- path = fetchurl {
- name = "tslib___tslib_1.13.0.tgz";
- url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz";
- sha1 = "c881e13cc7015894ed914862d276436fa9a47043";
- };
- }
- {
- name = "tslib___tslib_1.10.0.tgz";
- path = fetchurl {
- name = "tslib___tslib_1.10.0.tgz";
- url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz";
- sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a";
- };
- }
- {
- name = "tsutils___tsutils_3.17.1.tgz";
- path = fetchurl {
- name = "tsutils___tsutils_3.17.1.tgz";
- url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz";
- sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759";
- };
- }
{
name = "tunnel_agent___tunnel_agent_0.6.0.tgz";
path = fetchurl {
@@ -6641,22 +6001,6 @@
sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1";
};
}
- {
- name = "type_check___type_check_0.3.2.tgz";
- path = fetchurl {
- name = "type_check___type_check_0.3.2.tgz";
- url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz";
- sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
- };
- }
- {
- name = "type_fest___type_fest_0.11.0.tgz";
- path = fetchurl {
- name = "type_fest___type_fest_0.11.0.tgz";
- url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz";
- sha1 = "97abf0872310fed88a5c466b25681576145e33f1";
- };
- }
{
name = "type_fest___type_fest_0.16.0.tgz";
path = fetchurl {
@@ -6697,14 +6041,6 @@
sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
};
}
- {
- name = "typescript___typescript_3.9.7.tgz";
- path = fetchurl {
- name = "typescript___typescript_3.9.7.tgz";
- url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz";
- sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa";
- };
- }
{
name = "uid_number___uid_number_0.0.6.tgz";
path = fetchurl {
@@ -7097,14 +6433,6 @@
sha1 = "558328352e673b5bb192cf86500d60b230667d4b";
};
}
- {
- name = "write___write_1.0.3.tgz";
- path = fetchurl {
- name = "write___write_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz";
- sha1 = "0800e14523b923a387e415123c865616aae0f5c3";
- };
- }
{
name = "xdg_basedir___xdg_basedir_3.0.0.tgz";
path = fetchurl {
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 6642d4ca0249..6424972cbf74 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.29";
+ version = "1.7.30";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
- sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s=";
+ sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 92f9fa0ab19e..5baed75ba529 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.29";
+ version = "1.7.30";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
- sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE=";
+ sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay";
};
installPhase = ''
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index e6b83286c00d..4cd043d4eb6d 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -1,6 +1,8 @@
{ lib
, buildBazelPackage
, fetchFromGitHub
+, callPackage
+, bash
, cacert
, git
, glibcLocales
@@ -9,6 +11,7 @@
, iptables
, makeWrapper
, procps
+, protobuf
, python3
}:
@@ -16,9 +19,12 @@ let
preBuild = ''
patchShebangs .
+ substituteInPlace tools/defs.bzl \
+ --replace "#!/bin/bash" "#!${bash}/bin/bash"
+
# Tell rules_go to use the Go binary found in the PATH
sed -E -i \
- -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \
+ -e 's|go_version\s*=\s*"[^"]+"|go_version = "host"|g' \
WORKSPACE
# The gazelle Go tooling needs CA certs
@@ -31,20 +37,37 @@ let
export GOPATH=
'';
+ # Patch the protoc alias so that it always builds from source.
+ rulesProto = fetchFromGitHub {
+ owner = "bazelbuild";
+ repo = "rules_proto";
+ rev = "f7a30f6f80006b591fa7c437fe5a951eb10bcbcf";
+ sha256 = "10bcw0ir0skk7h33lmqm38n9w4nfs24mwajnngkbs6jb5wsvkqv8";
+ extraPostFetch = ''
+ sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release
+ cat <>$out/proto/private/BUILD.release
+ alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"])
+ EOF
+ '';
+ };
+
in buildBazelPackage rec {
name = "gvisor-${version}";
- version = "2019-11-14";
+ version = "20210518.0";
src = fetchFromGitHub {
owner = "google";
repo = "gvisor";
- rev = "release-20191114.0";
- sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1";
+ rev = "release-${version}";
+ sha256 = "15a6mlclnyfc9mx3bjksnnf4vla0xh0rv9kxdp34la4gw3c4hksn";
};
nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ];
bazelTarget = "//runsc:runsc";
+ bazelFlags = [
+ "--override_repository=rules_proto=${rulesProto}"
+ ];
# gvisor uses the Starlark implementation of rules_cc, not the built-in one,
# so we shouldn't delete it from our dependencies.
@@ -76,14 +99,14 @@ in buildBazelPackage rec {
rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
'';
- sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34";
+ sha256 = "13pahppm431m198v5bffrzq5iw8m79riplbfqp0afh384ln669hb";
};
buildAttrs = {
inherit preBuild;
installPhase = ''
- install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc
+ install -Dm755 bazel-out/*/bin/runsc/runsc_/runsc $out/bin/runsc
# Needed for the 'runsc do' subcomand
wrapProgram $out/bin/runsc \
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 988298ac72bf..198b9c3f617f 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -35,7 +35,7 @@ args@{
# required for the build as configured, rather than fetching all the dependencies
# which may not work in some situations (e.g. Java code which ends up relying on
# Debian-specific /usr/share/java paths, but doesn't in the configured build).
-, fetchConfigured ? false
+, fetchConfigured ? true
# Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE /
# NIX_LDFLAGS. This is necessary when using a custom toolchain which
@@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
find $bazelOut/external -maxdepth 1 -type l | while read symlink; do
name="$(basename "$symlink")"
rm "$symlink"
- test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker"
+ test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || true
done
# Patching symlinks to remove build directory reference
diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix
index 03325d2fd606..cb2410ba06a4 100644
--- a/pkgs/development/compilers/cc65/default.nix
+++ b/pkgs/development/compilers/cc65/default.nix
@@ -1,8 +1,6 @@
-{ lib, stdenv
-, fetchFromGitHub
-}:
+{ lib, gccStdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
pname = "cc65";
version = "2.19";
@@ -13,10 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
};
- makeFlags = [
- "PREFIX=${placeholder "out"}"
- "CC=${stdenv.cc.targetPrefix}cc"
- ];
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ enableParallelBuilding = true;
meta = with lib; {
homepage = "https://cc65.github.io/";
@@ -56,6 +53,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.zlib;
maintainers = with maintainers; [ AndersonTorres ];
- platforms = with platforms; unix;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
index 64fd89008e33..2edeaf9e4e87 100644
--- a/pkgs/development/interpreters/clips/default.nix
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "6.31";
+ version = "6.40";
pname = "clips";
src = fetchurl {
url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${
builtins.replaceStrings [ "." ] [ "" ] version
}.tar.gz";
- sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6";
+ sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d";
};
postPatch = ''
diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix
index 0c668525e927..03573716fa35 100644
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -21,13 +21,13 @@
stdenv.mkDerivation rec {
pname = "igraph";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "igraph";
repo = pname;
rev = version;
- sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE=";
+ sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk=";
};
# Normally, igraph wants us to call bootstrap.sh, which will call
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 11f1c7fd9c67..363140b5f58f 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "leptonica";
- version = "1.80.0";
+ version = "1.81.0";
src = fetchurl {
url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz";
- sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c";
+ sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 19e9f9d9ec86..143f72541b4d 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, python2, makeWrapper }:
+{ lib, stdenv, fetchurl, python, makeWrapper }:
stdenv.mkDerivation rec {
pname = "lhapdf";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ python2 ];
+ buildInputs = [ python ];
enableParallelBuilding = true;
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index c71c8f35f4ba..a4124df66640 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -1,24 +1,25 @@
-{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml }:
-if !lib.versionAtLeast ocaml.version "4.03"
-then throw "octavius is not available for OCaml ${ocaml.version}" else
+buildDunePackage rec {
+ pname = "octavius";
+ version = "1.2.2";
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-octavius-0.2.0";
- src = fetchurl {
- url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
- sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
+ src = fetchFromGitHub {
+ owner = "ocaml-doc";
+ repo = "octavius";
+ rev = "v${version}";
+ sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
};
- buildInputs = [ ocaml findlib ocamlbuild topkg ];
+ minimumOCamlVersion = "4.03";
+ useDune2 = lib.versionAtLeast ocaml.version "4.08";
- inherit (topkg) buildPhase installPhase;
+ doCheck = true;
- meta = {
+ meta = with lib; {
description = "Ocamldoc comment syntax parser";
homepage = "https://github.com/ocaml-doc/octavius";
- license = lib.licenses.isc;
- maintainers = [ lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
+ license = licenses.isc;
+ maintainers = with maintainers; [ vbgl ];
};
}
diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix
index 75894aa0e7a7..6b6d295f8b86 100644
--- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix
+++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix
@@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "aio-georss-gdacs";
- version = "0.4";
+ version = "0.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-aio-georss-gdacs";
rev = "v${version}";
- sha256 = "0rcrhdpgj84hfifx9rzxz15ajzsk069iknb28gicw1cm1qv4vfxm";
+ sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix
index 6699050035d0..1a68e7474af0 100644
--- a/pkgs/development/python-modules/dwdwfsapi/default.nix
+++ b/pkgs/development/python-modules/dwdwfsapi/default.nix
@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "dwdwfsapi";
- version = "1.0.3";
+ version = "1.0.4";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk=";
+ sha256 = "sha256-JOIg6rLrU8v39z1I6smIPEeiUPdSdJcD2avUsTQq+bU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
index f95e0a4702bf..954e4a6237fb 100644
--- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
+++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "georss-qld-bushfire-alert-client";
- version = "0.4";
+ version = "0.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "exxamalte";
repo = "python-georss-qld-bushfire-alert-client";
rev = "v${version}";
- sha256 = "14k7q0ynray1fj0lhxvgxpbdh4pmsqqk9gzmv38p9i7ijx8h1sc8";
+ sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index b23d264f72db..fdbcf09534b2 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -1,38 +1,53 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi
+{ lib
+, buildPythonPackage
+, certifi
, configparser
, faker
+, fetchFromGitHub
, future
, mock
, nose
-, python-dateutil
-, pytz
, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, pytz
, urllib3
-, certifi
}:
buildPythonPackage rec {
pname = "minio";
- version = "7.0.2";
- disabled = !isPy3k;
+ version = "7.0.3";
+ disabled = pythonOlder "3.6";
- src = fetchPypi {
- inherit pname version;
- sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8";
+ src = fetchFromGitHub {
+ owner = "minio";
+ repo = "minio-py";
+ rev = version;
+ sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc";
};
propagatedBuildInputs = [
+ certifi
configparser
future
python-dateutil
pytz
urllib3
- certifi
];
- checkInputs = [ faker mock nose pytestCheckHook ];
+ checkInputs = [
+ faker
+ mock
+ nose
+ pytestCheckHook
+ ];
+
# example credentials aren't present
- pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ];
+ disabledTestPaths = [
+ "tests/unit/credentials_test.py"
+ ];
+
+ pythonImportsCheck = [ "minio" ];
meta = with lib; {
description = "Simple APIs to access any Amazon S3 compatible object storage server";
diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix
index 977fbcd323cf..9603964ca481 100644
--- a/pkgs/development/python-modules/pyialarm/default.nix
+++ b/pkgs/development/python-modules/pyialarm/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyialarm";
- version = "1.7";
+ version = "1.8.1";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "RyuzakiKK";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Gk5kWOqsPyq/0Vc+jdRRyj+ko3CpmqQ6/McvJYAGjLY=";
+ sha256 = "sha256-Hig1BlgZX2FBh+wx7qz9lmkBIFn/IHActf9FXDU6Yz8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix
index 8e90ce5190f6..d196cf6e7478 100644
--- a/pkgs/development/python-modules/python-igraph/default.nix
+++ b/pkgs/development/python-modules/python-igraph/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "python-igraph";
- version = "0.9.1";
+ version = "0.9.4";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "igraph";
repo = "python-igraph";
rev = version;
- sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw";
+ sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 522fd7301271..bbdecc8bdcdf 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -288,9 +288,9 @@ let
fetchAttrs = {
# cudaSupport causes fetch of ncclArchive, resulting in different hashes
sha256 = if cudaSupport then
- "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4"
+ "10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234"
else
- "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45";
+ "04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68";
};
buildAttrs = {
diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 657704a653c7..e10a455c0906 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -56,7 +56,7 @@ buildBazelPackage rec {
sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
'';
- sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg";
+ sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46";
};
buildAttrs = {
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 1163f5dd9f0e..5ca3aef23588 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -184,7 +184,7 @@ let
rtpPath = "share/vim-plugins";
- nativeImpl = packages: lib.optionalString (packages != null)
+ nativeImpl = packages:
(let
link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
packageLinks = (packageName: {start ? [], opt ? []}:
@@ -340,8 +340,8 @@ let
entries = [
beforePlugins
vamImpl
- (nativeImpl packages)
]
+ ++ lib.optional (packages != null && packages != []) (nativeImpl packages)
++ lib.optional (pathogen != null) pathogenImpl
++ lib.optional (plug != null) plugImpl
++ [ customRC ];
diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix
index 9d21b057c8a2..d9ac9f19f375 100644
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -668,6 +668,18 @@ let
};
};
+ johnpapa.vscode-peacock = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-peacock";
+ publisher = "johnpapa";
+ version = "3.9.1";
+ sha256 = "1g7apzzgfm8s9sjavhwr8jpf9slhq8b9jfkww3q5n41mzzx8m94p";
+ };
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-styled-components";
@@ -1173,6 +1185,18 @@ let
};
};
+ wix.vscode-import-cost = buildVscodeMarketplaceExtension {
+ mktplcRef = {
+ name = "vscode-import-cost";
+ publisher = "wix";
+ version = "2.15.0";
+ sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc";
+ };
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
xaver.clang-format = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "clang-format";
diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index 57c0e22d8aff..d26782560a47 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -3,7 +3,9 @@
, fetchFromGitHub
, stdenv
, cmake
+, gn
, go
+, jdk
, ninja
, python3
, nixosTests
@@ -15,8 +17,8 @@ let
# However, the version string is more useful for end-users.
# These are contained in a attrset of their own to make it obvious that
# people should update both.
- version = "1.16.2";
- commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3";
+ version = "1.17.3";
+ commit = "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4";
};
in
buildBazelPackage rec {
@@ -26,7 +28,7 @@ buildBazelPackage rec {
owner = "envoyproxy";
repo = "envoy";
rev = srcVer.commit;
- hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ=";
+ hash = "sha256:09zzr4h3zjsb2rkxrvlazpx0jy33yn9j65ilxiqbvv0ckaralqfc";
extraPostFetch = ''
chmod -R +w $out
@@ -36,29 +38,29 @@ buildBazelPackage rec {
'';
};
- patches = [
- # Quiche needs to be updated to compile under newer GCC.
- # This is a manual backport of https://github.com/envoyproxy/envoy/pull/13949.
- ./0001-quiche-update-QUICHE-tar-13949.patch
-
- # upb needs to be updated to compile under newer GCC.
- # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020.
- ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch
- ];
postPatch = ''
sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch
+ sed -i '/javabase=/d' .bazelrc
+ # Patch paths to build tools, and disable gold because it just segfaults.
+ substituteInPlace bazel/external/wee8.genrule_cmd \
+ --replace '"''$$gn"' '"''$$(command -v gn)"' \
+ --replace '"''$$ninja"' '"''$$(command -v ninja)"' \
+ --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"'
'';
nativeBuildInputs = [
cmake
python3
+ gn
go
+ jdk
ninja
];
fetchAttrs = {
- sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0";
+ sha256 = "sha256:1cy2b73x8jzczq9z9c1kl7zrg5iasvsakb50zxn4mswpmajkbj5h";
dontUseCmakeConfigure = true;
+ dontUseGnConfigure = true;
preInstall = ''
# Strip out the path to the build location (by deleting the comment line).
find $bazelOut/external -name requirements.bzl | while read requirements; do
@@ -78,10 +80,14 @@ buildBazelPackage rec {
>$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
>$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl
>$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl
+
+ # Remove Unix timestamps from go cache.
+ rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb}
'';
};
buildAttrs = {
dontUseCmakeConfigure = true;
+ dontUseGnConfigure = true;
dontUseNinjaInstall = true;
preConfigure = ''
sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl
@@ -98,7 +104,6 @@ buildBazelPackage rec {
'';
};
- fetchConfigured = true;
removeRulesCC = false;
removeLocalConfigCc = true;
removeLocal = false;
diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix
index 0605a12eca47..036e44ca621e 100644
--- a/pkgs/servers/http/pomerium/default.nix
+++ b/pkgs/servers/http/pomerium/default.nix
@@ -11,15 +11,15 @@ let
in
buildGoModule rec {
pname = "pomerium";
- version = "0.13.3";
+ version = "0.14.4";
src = fetchFromGitHub {
owner = "pomerium";
repo = "pomerium";
rev = "v${version}";
- hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w=";
+ hash = "sha256:097csr8f43cn0iq030ajvvpwnwcfmjxyyk6pcisdy937axlrzska";
};
- vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg=";
+ vendorSha256 = "sha256:0n45xvwjiqyh41dsm4z1rnkgkycf5wfmacm804hqnd5rz7xk2shf";
subPackages = [
"cmd/pomerium"
"cmd/pomerium-cli"
diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix
index 61f9e7262c92..e07989198868 100644
--- a/pkgs/tools/misc/nvimpager/default.nix
+++ b/pkgs/tools/misc/nvimpager/default.nix
@@ -1,36 +1,43 @@
{ fetchFromGitHub
, lib, stdenv
, ncurses, neovim, procps
-, pandoc, lua51Packages, util-linux
+, scdoc, lua51Packages, util-linux
}:
stdenv.mkDerivation rec {
pname = "nvimpager";
- version = "0.9";
+ version = "0.10";
src = fetchFromGitHub {
owner = "lucc";
repo = pname;
rev = "v${version}";
- sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va";
+ sha256 = "sha256-okYnPwuxU/syxcKIMUBc25r791D6Bug2w2axH4vvmAY=";
};
buildInputs = [
ncurses # for tput
procps # for nvim_get_proc() which uses ps(1)
];
- nativeBuildInputs = [ pandoc ];
+ nativeBuildInputs = [ scdoc ];
makeFlags = [ "PREFIX=$(out)" ];
- buildFlags = [ "nvimpager.configured" ];
+ buildFlags = [ "nvimpager.configured" "nvimpager.1" ];
preBuild = ''
patchShebangs nvimpager
substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim'
+ # remove git command from makefile as we run from a tarball
+ # replace with actual timestamp of the commit
+ substituteInPlace makefile --replace '$(shell git log -1 --no-show-signature --pretty="%ct")' 1623019602
'';
doCheck = true;
checkInputs = [ lua51Packages.busted util-linux neovim ];
- checkPhase = ''script -c "busted --lpath './?.lua' test"'';
+ checkPhase = ''
+ runHook preCheck
+ script -c "busted --lpath './?.lua' test"
+ runHook postCheck
+ '';
meta = with lib; {
description = "Use neovim as pager";
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index f6263f187bf5..666e19ca81ae 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "isync";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
- sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd";
+ sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r";
};
nativeBuildInputs = [ pkg-config perl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8d808916884..3d74f8a1d3b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19100,7 +19100,10 @@ in
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };
- envoy = callPackage ../servers/http/envoy { };
+ envoy = callPackage ../servers/http/envoy {
+ go = go_1_15;
+ jdk = openjdk11;
+ };
etcd = callPackage ../servers/etcd { };
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
@@ -24165,7 +24168,7 @@ in
gv = callPackage ../applications/misc/gv { };
gvisor = callPackage ../applications/virtualization/gvisor {
- go = go_1_14;
+ go = go_1_16;
};
gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { };
@@ -30209,7 +30212,9 @@ in
herwig = callPackage ../development/libraries/physics/herwig { };
- lhapdf = callPackage ../development/libraries/physics/lhapdf { };
+ lhapdf = callPackage ../development/libraries/physics/lhapdf {
+ python = python3;
+ };
mela = callPackage ../development/libraries/physics/mela { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35935450e2a9..c6d4128719f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3840,6 +3840,10 @@ in {
lexid = callPackage ../development/python-modules/lexid { };
+ lhapdf = toPythonModule (pkgs.lhapdf.override {
+ inherit python;
+ });
+
libagent = callPackage ../development/python-modules/libagent { };
pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };