JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar 2021-02-04 15:02:14 +01:00
commit 91109ce94a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
97 changed files with 8125 additions and 7417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/system/boot/kernel.nix
View File

@ -37,10 +37,12 @@ in
boot.kernelPackages = mkOption {
default = pkgs.linuxPackages;
type = types.unspecified // { merge = mergeEqualOption; };
apply = kernelPackages: pkgs.linuxPackagesFor (kernelPackages.kernel.override {
inherit randstructSeed;
kernelPatches = kernelPackages.kernel.kernelPatches ++ kernelPatches;
features = lib.recursiveUpdate kernelPackages.kernel.features features;
apply = kernelPackages: kernelPackages.extend (self: super: {
kernel = super.kernel.override {
inherit randstructSeed;
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
features = lib.recursiveUpdate super.kernel.features features;
};
});
# We don't want to evaluate all of linuxPackages for the manual
# - some of it might not even evaluate correctly.

4
pkgs/applications/audio/musikcube/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "musikcube";
version = "0.96.4";
version = "0.96.5";
src = fetchFromGitHub {
owner = "clangen";
repo = pname;
rev = version;
sha256 = "sha256-DYLLnmRHEK2nJUbJfJUDcA8qHZq+qZpHS5ei8qUGmFA=";
sha256 = "sha256-GxMQPP8i/NWvduf10f+xVyuG666pChj9RsiF4jfygyY=";
};
nativeBuildInputs = [

6
pkgs/applications/audio/ncspot/default.nix
View File

@ -14,16 +14,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
sha256 = "1dfq6ickx24cq8zhhm0a8x5ycd0iygw065qd2blcgl0fim350zw9";
sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g=";
};
cargoSha256 = "0z4af575rx6ggjxsw1q18kwsb4cvyy1kzfkp32v9n74krmy0fk8p";
cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ=";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];

4
pkgs/applications/misc/mob/default.nix
View File

@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "mob";
version = "1.1.0";
version = "1.2.0";
goPackagePath = "github.com/remotemobprogramming/mob";
src = fetchFromGitHub {
rev = "v${version}";
owner = "remotemobprogramming";
repo = pname;
sha256 = "sha256-C63tGMd+kGQc99k7L8SKlijlEBaBCiksAghsg6WC8Bw=";
sha256 = "sha256-hBzSf3UUW2FUp1jG1sPt7vN1iDybdMox/h6xHVrM7DY=";
};
meta = with lib; {

8
pkgs/applications/misc/reddsaver/default.nix
View File

@ -7,23 +7,23 @@
}:
rustPlatform.buildRustPackage rec {
version = "0.2.2";
version = "0.2.3";
pname = "reddsaver";
src = fetchFromGitHub {
owner = "manojkarthick";
repo = "reddsaver";
rev = "v${version}";
sha256 = "0802jz503jhyz5q6mg1fj2bvkl4nggvs8y03zddd298ymplx5dbx";
sha256 = "sha256-K6SyfYx8VG0t6yogHwd80AxQuj3TXofHLEqZcDsRs1s=";
};
cargoSha256 = "0z8q187331j3rxj8hzym25pwrikxbd0r829v29y8w6v5n0hb47fs";
cargoSha256 = "sha256-VDr7fcE13Wy7KoGG3U1GSbWqF5Oad4EobgzOL7dtJDo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optional stdenv.isDarwin Security;
# package does not contain tests as of v0.2.2
# package does not contain tests as of v0.2.3
docCheck = false;
meta = with lib; {

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -18,9 +18,9 @@
}
},
"beta": {
"version": "89.0.4389.23",
"sha256": "1d5pv4bhskh4l8x5ygccxwiryf05mwr1qzq1dzn6q82damr6dpq5",
"sha256bin64": "0swyx2a1gh9mi2jayymcvzwm9cb265ks43wg823abss4q3rskg84",
"version": "89.0.4389.40",
"sha256": "1da7l8i8hhsjnziyapynnwzfxjrj6m4p8076hg8bjqqv8alhg2zq",
"sha256bin64": "17f9yhz1w0r7panvzavmx7zyaw0i8yarlxx4zb5ghxl8hs37sasr",
"deps": {
"gn": {
"version": "2021-01-07",

6
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "2.12.6";
version = "2.12.7";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-28vePb/2CsDLNFYMqtsoptAaOgh4YdPSHzGTO+HLGLs=";
sha256 = "sha256-bMbfFAI4oGZc7FOlU8LczbjAq1cYmJg5WTXkQKS9vgo=";
};
vendorSha256 = "sha256-CcSR2TZldeAbBE0yTR+4oa8mDCIx33pu9h8NE1LkRFQ=";
vendorSha256 = "sha256-4XPMixVNj6PUKobNLwpsOBT7Zs/7pkhDtQacLIB5EfE=";
doCheck = false;

15
pkgs/applications/networking/cluster/spacegun/default.nix
View File

@ -1,16 +1,21 @@
{ pkgs, nodejs, stdenv, lib, ... }:
{ pkgs, fetchFromGitHub, nodejs, stdenv, lib, ... }:
let
packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
src = fetchFromGitHub {
owner = "dvallin";
repo = "spacegun";
rev = "v0.3.3";
sha256 = "0cd9yzms44dj9ix8lrhbkby5zsyb8wambs24j6c3ibr67sggr6sq";
};
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
in
nodePackages."${packageName}".override {
nativeBuildInputs = [ pkgs.makeWrapper ];
nodePackages.package.override {
inherit src;
nativeBuildInputs = [ pkgs.makeWrapper pkgs.nodePackages.node-gyp-build ];
postInstall = ''
# Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems

7
pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
View File

@ -1,10 +1,17 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v0.3.3 release
curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package.json -o package.json
curl https://raw.githubusercontent.com/dvallin/spacegun/f88cfd1cf653995a301ef4db4a1e387ef3ca01a1/package-lock.json -o package-lock.json
node2nix \
--nodejs-10 \
--node-env ../../../../development/node-packages/node-env.nix \
--development \
--input package.json \
--lock package-lock.json \
--output node-packages.nix \
--composition node-composition.nix
rm -f package.json package-lock.json

8
pkgs/applications/networking/cluster/spacegun/node-composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

3990
pkgs/applications/networking/cluster/spacegun/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

3
pkgs/applications/networking/cluster/spacegun/package.json
View File

@ -1,3 +0,0 @@
[
{ "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" }
]

2
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.19",
"version": "1.7.20",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -8,12 +8,12 @@
let
executableName = "element-desktop";
version = "1.7.19";
version = "1.7.20";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-al49O13biReX1pCkmljUPLdV1uP//L3fdTLLsay0V1A=";
sha256 = "sha256-kQMswcEGsefQ8HCWxYPgvxOKP5cgvXx8oCl5Inh6sOg=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.19";
version = "1.7.20";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-rHxHP3KneB9SrXRMvcq0pmFj6YnLmazw/pRxMsP2o/k=";
sha256 = "sha256-8R7l/Pmymd5+/Fri7z2/TDj1h2FL0QgLICoXajePing=";
};
installPhase = ''

8
pkgs/applications/networking/n8n/node-composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

39
pkgs/applications/networking/n8n/node-env.nix
View File

@ -1,8 +1,11 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@ -242,8 +245,8 @@ let
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(packageLock.lockfileVersion !== 1) {
process.stderr.write("Sorry, I only understand lock file version 1!\n");
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
@ -445,8 +448,8 @@ let
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
# Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies =
{ name
, packageName
, version
@ -465,8 +468,8 @@ let
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
nodeDependencies = stdenv.mkDerivation ({
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
@ -512,6 +515,27 @@ let
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
{ name
, packageName
, version
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
nodeDependencies = buildNodeDependencies args;
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
@ -538,5 +562,6 @@ in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
buildNodeShell = lib.makeOverridable buildNodeShell;
}

1618
pkgs/applications/networking/n8n/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/networking/seaweedfs/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "2.14";
version = "2.23";
src = fetchFromGitHub {
owner = "chrislusf";
repo = "seaweedfs";
rev = version;
sha256 = "1sfchh5qiylxxmph0hgjfaj80mv5pnrm1s34g5lx0vj64jxr5nzb";
sha256 = "sha256-MMFVJoiVrA0zy4RM2nyhlu/JfnzIRpxrA3N1jm2R0jI=";
};
vendorSha256 = "0g344dj325d35i0myrzhg5chspqnly40qp910ml6zrmp7iszc1mw";
vendorSha256 = "sha256-UucbEBjIKRbZFd99BsnG6AAEIQ13+vzKe61k6ZPvE0A=";
subPackages = [ "weed" ];

6
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "rclone";
version = "1.53.4";
version = "1.54.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "1w6dsf8hw0wap4090ixl01p64yn53xidfdbpy6rc3xaifypj185d";
sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk=";
};
vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88";
vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M=";
subPackages = [ "." ];

4
pkgs/applications/virtualization/conmon/default.nix
View File

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "conmon";
version = "2.0.25";
version = "2.0.26";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-u22irZ9AC1W2AVJ1OD1gLzTH4NOgRkZekZ78rNKXnps=";
sha256 = "sha256-q2lh02iZ7FDBPjtoKY5p3c6Vcn9Ey8DCMn/Oe7/74ug=";
};
nativeBuildInputs = [ pkg-config ];

10
pkgs/applications/virtualization/runc/default.nix
View File

@ -16,13 +16,13 @@
buildGoPackage rec {
pname = "runc";
version = "1.0.0-rc92";
version = "1.0.0-rc93";
src = fetchFromGitHub {
owner = "opencontainers";
repo = "runc";
rev = "v${version}";
sha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
sha256 = "008d5wkznic80n5q1vwx727qn5ifalc7cydq68hc1gk9wrhna4v4";
};
goPackagePath = "github.com/opencontainers/runc";
@ -30,15 +30,13 @@ buildGoPackage rec {
nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ];
buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
buildInputs = [ libselinux libseccomp libapparmor ];
makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ];
makeFlags = [ "BUILDTAGS+=seccomp" ];
buildPhase = ''
cd go/src/${goPackagePath}
patchShebangs .
substituteInPlace libcontainer/apparmor/apparmor.go \
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser
make ${toString makeFlags} runc man
'';

4
pkgs/desktops/enlightenment/evisum/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "evisum";
version = "0.5.9";
version = "0.5.10";
src = fetchurl {
url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
sha256 = "sha256-ao5b4Mhr+fhY19X1g0gupcU8LayR55/kgHSwhGUAfys=";
sha256 = "sha256-kCO55UvQnRQhXLRqeJr6SN9FiTeKkh3P7QFkJe+GXjY=";
};
nativeBuildInputs = [

10
pkgs/development/libraries/glfw/3.x.nix
View File

@ -22,11 +22,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
preConfigure = lib.optional (!stdenv.isDarwin) ''
substituteInPlace src/glx_context.c --replace "libGL.so.1" "${lib.getLib libGL}/lib/libGL.so.1"
'';
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
] ++ lib.optional (!stdenv.isDarwin) [
"-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'"
];
meta = with lib; {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";

6
pkgs/development/libraries/protolock/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protolock";
version = "0.15.0";
version = "0.15.1";
src = fetchFromGitHub {
owner = "nilslice";
repo = "protolock";
rev = "v${version}";
sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
sha256 = "sha256-rnsHVJHFE/8JIOfMWqGBfIbIuOFyHtT54Vu/DaRY9js=";
};
vendorSha256 = "0ap1iwcapvvvmwgdc4zbsp8mglrhbswkdgm4dw8baw8qk0nlci6y";
vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So=";
doCheck = false;

8
pkgs/development/misc/google-clasp/google-clasp.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

834
pkgs/development/misc/google-clasp/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/development/node-packages/composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

53
pkgs/development/node-packages/node-env.nix
View File

@ -1,8 +1,11 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@ -242,8 +245,8 @@ let
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(packageLock.lockfileVersion !== 1) {
process.stderr.write("Sorry, I only understand lock file version 1!\n");
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
@ -388,16 +391,15 @@ let
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@ -444,15 +446,10 @@ let
# Run post install hook, if provided
runHook postInstall
'';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs);
# Builds a development shell
buildNodeShell =
# Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies =
{ name
, packageName
, version
@ -471,12 +468,12 @@ let
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
nodeDependencies = stdenv.mkDerivation ({
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@ -518,11 +515,32 @@ let
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
{ name
, packageName
, version
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
nodeDependencies = buildNodeDependencies args;
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
@ -544,5 +562,6 @@ in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
buildNodeShell = lib.makeOverridable buildNodeShell;
}

2566
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/python-modules/aresponses/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aresponses";
version = "2.1.2";
version = "2.1.4";
disabled = !isPy3k;
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "CircleUp";
repo = pname;
rev = version;
sha256 = "007wrk4wdy97a81imgzxd6sm5dly9v7abmxh9fyfi0vp1p7s75bw";
sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4=";
};
propagatedBuildInputs = [

34
pkgs/development/python-modules/asyncio_mqtt/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, async_generator
, paho-mqtt
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "asyncio_mqtt";
version = "0.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "0hwfgww1ywhjvkpnvafbk2hxlqkrngfdz0sx5amzw68srzazvl6g";
};
propagatedBuildInputs = [
paho-mqtt
] ++ lib.optional (pythonOlder "3.7") async_generator;
doCheck = false; # no tests
pythonImportsCheck = [ "asyncio_mqtt" ];
meta = with lib; {
description = "Idomatic asyncio wrapper around paho-mqtt";
homepage = "https://github.com/sbtinstruments/asyncio-mqtt";
license = licenses.bsd3;
changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/master/CHANGELOG.md";
maintainers = with maintainers; [ hexa ];
};
}

17
pkgs/development/python-modules/canmatrix/default.nix
View File

@ -13,19 +13,19 @@
, xlrd
, XlsxWriter
, pyyaml
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "canmatrix";
version = "0.9.1";
version = "0.9.3";
# uses fetchFromGitHub as PyPi release misses test/ dir
src = fetchFromGitHub {
owner = "ebroecker";
repo = pname;
rev = version;
sha256 = "129lcchq45h8wqjvvn0rwpbmih4m0igass2cx7a21z94li97hcia";
sha256 = "sha256-9FupG1VmROgsxYhsafQYPPqG0xEOAYYK8QDOIBNzE0Y=";
};
propagatedBuildInputs = [
@ -48,14 +48,11 @@ buildPythonPackage rec {
--replace "version = versioneer.get_version()" "version = \"${version}\""
'';
checkInputs = [
pytest
];
checkInputs = [ pytestCheckHook ];
# long_envvar_name_imports requires stable key value pair ordering
checkPhase = ''
pytest -s src/canmatrix -k 'not long_envvar_name_imports'
'';
pytestFlagsArray = [ "-s src/canmatrix" ];
disabledTests = [ "long_envvar_name_imports" ];
pythonImportsCheck = [ "canmatrix" ];
meta = with lib; {
homepage = "https://github.com/ebroecker/canmatrix";

26
pkgs/development/python-modules/canopen/default.nix
View File

@ -1,9 +1,11 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, setuptools-scm
, can
, canmatrix }:
, canmatrix
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "canopen";
@ -14,17 +16,25 @@ buildPythonPackage rec {
sha256 = "15d49f1f71e9989dde6e3b75fb8445c76bd223064dfc0ac629fe9ecb0e21fba9";
};
propagatedBuildInputs =
[ can
canmatrix
];
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [ nose ];
propagatedBuildInputs = [
can
canmatrix
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "canopen" ];
meta = with lib; {
homepage = "https://github.com/christiansandberg/canopen/";
description = "CANopen stack implementation";
license = licenses.lgpl3;
license = licenses.mit;
maintainers = with maintainers; [ sorki ];
};
}

4
pkgs/development/python-modules/certbot/default.nix
View File

@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "certbot";
version = "1.11.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-IGXiIOLP/Uq6HdXAschp1jFYq52ohRK4VLtkjF4Tb44=";
sha256 = "sha256-lMQkVc2UzC5GqEy88rcaJ74CaT3+YWveNDCXql/McRM=";
};
sourceRoot = "source/${pname}";

21
pkgs/development/python-modules/convertdate/default.nix
View File

@ -1,18 +1,31 @@
{ lib, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, pymeeus
, pytz
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "convertdate";
version = "2.2.1";
version = "2.3.0";
# Tests are not available in the PyPI tarball so use GitHub instead.
src = fetchFromGitHub {
owner = "fitnr";
repo = pname;
rev = "v${version}";
sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5";
sha256 = "17j188zlp46zmq8qyy4z4f9v25l3zibkwzj8wp4fxqgimjnfj2nr";
};
propagatedBuildInputs = [ pymeeus pytz ];
propagatedBuildInputs = [
pymeeus
pytz
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
homepage = "https://github.com/fitnr/convertdate";

24
pkgs/development/python-modules/hijri-converter/default.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "hijri-converter";
version = "2.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "08gv6ypn2zd0i8yrv24m448xkic492qrgxj349slp1achhg9p7ln";
};
checkInputs = [ pytestCheckHook ];
meta = with lib; {
description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar";
homepage = "https://github.com/dralshehri/hijri-converter";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

25
pkgs/development/python-modules/holidays/default.nix
View File

@ -3,25 +3,46 @@
, fetchPypi
, convertdate
, dateutil
, hijri-converter
, korean-lunar-calendar
, six
, python
, flake8
}:
buildPythonPackage rec {
pname = "holidays";
version = "0.10.3";
version = "0.10.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "839281f2b1ae7ac576da7951472482f6e714818296853107ea861fa60f5013cc";
sha256 = "0g4hqbb94cwxlcwsjzrzxzlann1ks2r4mgnfzqz74a2rg1nih5zd";
};
postPatch = ''
# ignore too long line issues
# https://github.com/dr-prodigy/python-holidays/issues/423
substituteInPlace tests.py \
--replace "flake8.get_style_guide(ignore=[" "flake8.get_style_guide(ignore=['E501', "
'';
propagatedBuildInputs = [
convertdate
dateutil
hijri-converter
korean-lunar-calendar
six
];
checkInputs = [
flake8
];
checkPhase = ''
${python.interpreter} -m unittest
'';
pythonImportsCheck = [ "holidays" ];
meta = with lib; {

4
pkgs/development/python-modules/plexauth/default.nix
View File

@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "plexauth";
version = "0.0.5";
version = "0.0.6";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jjlawren";
repo = "python-plexauth";
rev = "v${version}";
sha256 = "1wbrn22iywl4ccz64r3w3f17k0r7vi2cqkqd2mrdkx5xqhscn9hz";
sha256 = "1wy6syz3cgfw28zvigh2br4jabg8rzpi5l0bhfb6vjjc7aam13ag";
};
propagatedBuildInputs = [ aiohttp ];

26
pkgs/development/python-modules/praw/default.nix
View File

@ -1,12 +1,12 @@
{ lib, buildPythonPackage, fetchFromGitHub
{ lib
, buildPythonPackage
, fetchFromGitHub
, betamax
, betamax-serializers
, betamax-matchers
, mock
, six
, pytestrunner
, prawcore
, pytest
, pytestCheckHook
, requests-toolbelt
, update_checker
, websocket_client
@ -14,19 +14,15 @@
buildPythonPackage rec {
pname = "praw";
version = "7.1.0";
version = "7.1.2";
src = fetchFromGitHub {
owner = "praw-dev";
repo = "praw";
repo = pname;
rev = "v${version}";
sha256 = "07wyn2pa80ps55kk66rvf4daqyn3y5lzxhx6qh1lpn3p2bacbw9h";
sha256 = "sha256-aEx0swjfyBrSu1fgIiAwdwWmk9v5o7sbT5HTVp7L3R4=";
};
nativeBuildInputs = [
pytestrunner
];
propagatedBuildInputs = [
mock
prawcore
@ -38,16 +34,16 @@ buildPythonPackage rec {
betamax
betamax-serializers
betamax-matchers
mock
pytest
pytestCheckHook
requests-toolbelt
six
];
pythonImportsCheck = [ "praw" ];
meta = with lib; {
description = "Python Reddit API wrapper";
homepage = "https://praw.readthedocs.org/";
license = licenses.bsd2;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ fab ];
};
}

18
pkgs/development/python-modules/pyipp/default.nix
View File

@ -6,7 +6,7 @@
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pytestcov
, pytest-cov
, yarl
}:
@ -30,24 +30,10 @@ buildPythonPackage rec {
checkInputs = [
aresponses
pytest-asyncio
pytestcov
pytest-cov
pytestCheckHook
];
# Some tests are failing due to encoding issues
# https://github.com/ctalkington/python-ipp/issues/121
disabledTests = [
"test_internal_session"
"test_request_port"
"est_http_error426"
"test_unexpected_response"
"test_printer"
"test_raw"
"test_ipp_request"
"test_request_tls"
"test_ipp_error_0x0503"
];
pythonImportsCheck = [ "pyipp" ];
meta = with lib; {

4
pkgs/development/python-modules/pyqtwebengine/default.nix
View File

@ -14,12 +14,12 @@ let
in buildPythonPackage rec {
pname = "PyQtWebEngine";
version = "5.15.0";
version = "5.15.2";
format = "other";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237";
sha256 = "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd";
};
inherit patches;

46
pkgs/development/python-modules/pytest-httpserver/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, pytest-asyncio
, pytest-cov
, pytestCheckHook
, requests
, werkzeug
}:
buildPythonPackage rec {
pname = "pytest-httpserver";
version = "0.3.6";
src = fetchPypi {
pname = "pytest_httpserver";
inherit version;
sha256 = "1wdhbzv6x2v4qsqwgsc5660c4lxplh9b61vfj1zqhbhs36y96vl9";
};
patches = [
(fetchpatch {
name = "remove-pytest-runner.patch";
url = "https://github.com/csernazs/pytest-httpserver/commit/c9752018bc2f13d141dd52c92df75c19ea388836.patch";
sha256 = "0b76ywzl2gwddbqqlb662mfv5j42l88l5hffm7jbxzvqbz94mx3k";
})
];
propagatedBuildInputs = [ werkzeug ];
checkInputs = [
pytest-cov
pytestCheckHook
requests
];
pythonImportsCheck = [ "pytest_httpserver" ];
meta = with lib; {
description = "HTTP server for pytest to test HTTP clients";
homepage = "https://www.github.com/csernazs/pytest-httpserver";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

33
pkgs/development/python-modules/python-openzwave-mqtt/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, asyncio-mqtt
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "python-openzwave-mqtt";
version = "1.4.0";
src = fetchFromGitHub {
owner = "cgarwood";
repo = pname;
rev = "v${version}";
sha256 = "0zqx00dacs59y4gjr4swrn46c7hrp8a1167bcl270333284m8mqm";
};
propagatedBuildInputs = [
asyncio-mqtt
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Python wrapper for OpenZWave's MQTT daemon";
homepage = "https://github.com/cgarwood/python-openzwave-mqtt";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

4
pkgs/development/python-modules/python-tado/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "python-tado";
version = "0.9.0";
version = "0.11.0";
disabled = pythonOlder "3.5";
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "wmalgadey";
repo = "PyTado";
rev = version;
sha256 = "0cr5sxdvjgdrrlhl32rs8pwyay8liyi6prm37y66dn00b41cb5l3";
sha256 = "0fw4f9gqnhxwpxyb34qi8bl5pmzz13h4x3mdk903hhjyccanqncr";
};
propagatedBuildInputs = [ requests ];

4
pkgs/development/python-modules/sentry-sdk/default.nix
View File

@ -29,11 +29,11 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "0.19.4";
version = "0.19.5";
src = fetchPypi {
inherit pname version;
sha256 = "1052f0ed084e532f66cb3e4ba617960d820152aee8b93fc6c05bd53861768c1c";
sha256 = "0grba3rpgg20sqhrh8mxcjwmwgbwrybrxymavh7xsad59570jykk";
};
checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond

41
pkgs/development/python-modules/solax/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, pytest-asyncio
, pytest-cov
, pytest-httpserver
, pytestCheckHook
, setuptools-scm
, voluptuous
}:
buildPythonPackage rec {
pname = "solax";
version = "0.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "0h7q6y2cdkj9dqxw0k7pgz7a7vbpq1qw50pmy9rajphhv2600cbc";
};
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [ aiohttp voluptuous ];
checkInputs = [
pytest-asyncio
pytest-cov
pytest-httpserver
pytestCheckHook
];
pythonImportsCheck = [ "solax" ];
meta = with lib; {
description = "Python wrapper for the Solax Inverter API";
homepage = "https://github.com/squishykid/solax";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/volkszaehler/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "volkszaehler";
version = "0.2.0";
version = "0.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "087gw1k3f81lm859r0j65cjia8c2dcy4cx8c7s3mb5msb1csdh0x";
sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l";
};
propagatedBuildInputs = [

31
pkgs/development/python-modules/xboxapi/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "xboxapi";
version = "2.0.1";
src = fetchFromGitHub {
owner = "mKeRix";
repo = "xboxapi-python";
rev = version;
sha256 = "10mhvallkwf5lw91hj5rv16sziqhhjq7sgcgr28sqqnlgjnyazdd";
};
propagatedBuildInputs = [ requests ];
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "xboxapi" ];
meta = with lib; {
description = "Python XBOX One API wrapper";
homepage = "https://github.com/mKeRix/xboxapi-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/tools/ginkgo/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
version = "1.14.2";
version = "1.15.0";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
sha256 = "1pvslbfrpzc8n99x33gyvk9aaz6lvdyyg6cj3axjzkyjxmh6d5kc";
sha256 = "sha256-NvScoKnLr0herVrjEnij45yN0MxC/MoRJJHcy59rOuA=";
};
vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx";
vendorSha256 = "sha256-xBa2n2BV+aXPCZ3G+rFIqHtjcXfs1rDjKbmRzjaDSb8=";
doCheck = false;
meta = with lib; {

6
pkgs/development/tools/misc/editorconfig-checker/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "editorconfig-checker";
version = "2.3.1";
version = "2.3.3";
src = fetchFromGitHub {
owner = "editorconfig-checker";
repo = "editorconfig-checker";
rev = version;
sha256 = "0c7mainlwn3pd9q6i1f82m5znv8m6fs15zq7nrbm04fy554h0pzz";
sha256 = "sha256-u3gTzsAoV4fgQjsnONIIGFE/Y02bKbCTg30O9FTI2/w=";
};
vendorSha256 = "1z4j8vm9mnhjhhmhlj0ycs8b1wpm7lhsfqjnk7w8gfapvj3yfk6h";
vendorSha256 = "sha256-0Eznh9xXuYf4mVZipyE99fKwkGYeSAorhBLamupGkvw=";
doCheck = false;

2
pkgs/development/tools/rubocop/Gemfile.lock
View File

@ -8,7 +8,7 @@ GEM
rainbow (3.0.0)
regexp_parser (2.0.3)
rexml (3.2.4)
rubocop (1.9.0)
rubocop (1.9.1)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)

4
pkgs/development/tools/rubocop/gemset.nix
View File

@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wz0prg4kx36smbk7fib4a8cdxrj5b5b31c8bavm082vgcpfk759";
sha256 = "06npybjypxsrz09z8ivxqfcwzpbgif6z3hwpp0ls8znqlgp3m922";
type = "gem";
};
version = "1.9.0";
version = "1.9.1";
};
rubocop-ast = {
dependencies = ["parser"];

8
pkgs/development/web/newman/node-composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

45
pkgs/development/web/newman/node-env.nix
View File

@ -1,8 +1,11 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
let
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@ -242,8 +245,8 @@ let
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(packageLock.lockfileVersion !== 1) {
process.stderr.write("Sorry, I only understand lock file version 1!\n");
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
@ -396,7 +399,7 @@ let
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@ -445,8 +448,8 @@ let
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
# Builds a node environment (a node_modules folder and a set of binaries)
buildNodeDependencies =
{ name
, packageName
, version
@ -465,12 +468,12 @@ let
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
nodeDependencies = stdenv.mkDerivation ({
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@ -512,11 +515,32 @@ let
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
# Builds a development shell
buildNodeShell =
{ name
, packageName
, version
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
nodeDependencies = buildNodeDependencies args;
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
@ -538,5 +562,6 @@ in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
buildNodeShell = lib.makeOverridable buildNodeShell;
}

791
pkgs/development/web/newman/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

2058
pkgs/development/web/remarkjs/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/development/web/remarkjs/nodepkgs.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

335
pkgs/misc/base16-builder/node-packages-generated.nix
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -10,7 +10,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
"ansi-regex-2.1.1" = {
@ -46,7 +46,7 @@ let
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
};
};
"are-we-there-yet-1.1.5" = {
@ -55,7 +55,7 @@ let
version = "1.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
};
};
"argparse-1.0.10" = {
@ -64,7 +64,7 @@ let
version = "1.0.10";
src = fetchurl {
url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
sha512 = "17fhywmdjcp8g0ys089i5xg26yajkkg9zg8hyry3fghz75b2pq5vdx997dk5p2sc15r9nsj8rmf4f27g81hi92kzj5q86sdmg5ni553";
sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
};
};
"array-find-index-1.0.2" = {
@ -100,7 +100,7 @@ let
version = "1.1.11";
src = fetchurl {
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
};
};
"bulk-replace-0.0.1" = {
@ -136,7 +136,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
sha512 = "2mv8dgq8fr86zs5mam6bkp0j241lpb5rbwpq8zc5gkj7f8zir1cd71m0yyy8zy46hvf86b9k7pbhvkz08ii4mhxh14xshkrgik0p14r";
sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
};
};
"chalk-1.1.3" = {
@ -154,7 +154,7 @@ let
version = "1.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
};
};
"code-point-at-1.1.0" = {
@ -229,13 +229,13 @@ let
sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
};
};
"debug-3.2.6" = {
"debug-3.2.7" = {
name = "debug";
packageName = "debug";
version = "3.2.6";
version = "3.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
};
};
"decamelize-1.2.0" = {
@ -253,7 +253,7 @@ let
version = "0.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
"delegates-1.0.0" = {
@ -298,7 +298,7 @@ let
version = "2.7.4";
src = fetchurl {
url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
sha512 = "2ad39acbba96hqbgf714pacri515xjn8jd43bkfb1wwp04vflpjj0qhnnmsq074g7d1kycyj1bmf620s43qb3x74hrfb4ky3v5axygf";
sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
};
};
"error-ex-1.3.2" = {
@ -307,7 +307,7 @@ let
version = "1.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
sha512 = "3igrl2amb9mpa9d2z6qghz3ljqd7amjla8ahfs5fdgl0w52pw6gz3y32q5fk229yvfyg3x9kpfygadcm2w0lv4hv4nj25cyd8v4glgd";
sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
};
};
"escape-string-regexp-1.0.5" = {
@ -325,7 +325,7 @@ let
version = "4.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
sha512 = "3h999di4dnwxb22lxlb7cbz42nalrv8g8sqdvrkkl5c27gnwhp1rva4039hmq6g1i0y4mfjgx6p4i2vwxxl0zlahfzdd9fl1qbqasvq";
sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
};
};
"filled-array-1.1.0" = {
@ -352,7 +352,7 @@ let
version = "1.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
};
};
"fs-promise-0.3.1" = {
@ -373,6 +373,15 @@ let
sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
};
};
"function-bind-1.1.1" = {
name = "function-bind";
packageName = "function-bind";
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
};
};
"gauge-2.7.4" = {
name = "gauge";
packageName = "gauge";
@ -397,7 +406,7 @@ let
version = "7.1.6";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
};
};
"got-5.7.1" = {
@ -409,13 +418,22 @@ let
sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
};
};
"graceful-fs-4.2.3" = {
"graceful-fs-4.2.4" = {
name = "graceful-fs";
packageName = "graceful-fs";
version = "4.2.3";
version = "4.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
sha512 = "12xdl6ai5jdxcpcavw2hk4zpiknz7g7f2cvgawzwlzv7cy7qf7riq8ymkgqdqxjkpl1mg627dxa65zc9b0yqhflsmqlfg5q3481azbb";
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz";
sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
};
};
"has-1.0.3" = {
name = "has";
packageName = "has";
version = "1.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
};
};
"has-ansi-2.0.0" = {
@ -436,13 +454,13 @@ let
sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
};
};
"hepburn-1.1.1" = {
"hepburn-1.2.0" = {
name = "hepburn";
packageName = "hepburn";
version = "1.1.1";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz";
sha512 = "3vc0v8438m2a8yw40nfhqw4ldddxkzjsimpq24c9la9ik0mnr5g8wbhnxpvlf1j39m2x5fin2d82kzjdpzf22shb0wfkpadqacdjk9s";
url = "https://registry.npmjs.org/hepburn/-/hepburn-1.2.0.tgz";
sha512 = "xWjHb03dN/ivNcqG2vqA//sHQ0oapYGZ9QV/2TR7m2+cggxzoVpbDxZn9s/Zm1tF88/7a1IpdZyn00tNP5oABA==";
};
};
"hosted-git-info-2.8.8" = {
@ -451,7 +469,7 @@ let
version = "2.8.8";
src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
sha512 = "19a25b4xb3hg00d1nsirc3xfcc07rplbh6msa49rgc8xg5rg38y1z8rfrf0dmll8k4jaml8z337bi6y2cgah66jnwxinn0sch5k7z3z";
sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
};
};
"iconv-lite-0.4.24" = {
@ -460,7 +478,7 @@ let
version = "0.4.24";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
"ignore-walk-3.0.3" = {
@ -469,7 +487,7 @@ let
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
};
};
"imurmurhash-0.1.4" = {
@ -505,16 +523,16 @@ let
version = "2.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
};
};
"ini-1.3.5" = {
"ini-1.3.8" = {
name = "ini";
packageName = "ini";
version = "1.3.5";
version = "1.3.8";
src = fetchurl {
url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
};
};
"is-arrayish-0.2.1" = {
@ -526,13 +544,22 @@ let
sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
};
};
"is-core-module-2.2.0" = {
name = "is-core-module";
packageName = "is-core-module";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz";
sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==";
};
};
"is-finite-1.1.0" = {
name = "is-finite";
packageName = "is-finite";
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
sha512 = "3gj0k3vlpbc7zg5xkl8yjnilqs2dmk3ks67shchrfmnzkj6r4aad994xwfczx99ccjx6cixdqg4sawk2m92lqhh6jmfl17zlnv8rp3i";
sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
};
};
"is-fullwidth-code-point-1.0.0" = {
@ -577,7 +604,7 @@ let
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
sha512 = "134jdgzg4p15g5jvwsmb0bmglmymn1pyk6r2w8q1fm728f15l7k12sqmfngn0mg3vs34gzg12v684fp9c99l6jnv737b6rgmiwd8ij5";
sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
};
};
"is-stream-1.1.0" = {
@ -607,13 +634,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
};
"js-yaml-3.13.1" = {
"js-yaml-3.14.1" = {
name = "js-yaml";
packageName = "js-yaml";
version = "3.13.1";
version = "3.14.1";
src = fetchurl {
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
sha512 = "0kkjjrr0znm2ka89ywc5518c8dw0210z91fm94c7v11l8c96mkjh0ddld5mb7jmmnpzap7vn0fhvr29lma63c9is2ixq3fpp0xxrxk1";
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz";
sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==";
};
};
"keypress-0.1.0" = {
@ -640,7 +667,7 @@ let
version = "1.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz";
sha512 = "1y0l6pib2v3nrpa6n9axb2mmjd5s50a2kqbvm7jp2zhr7dpdz0ym73kvi7h1g9i9fw6jqaiwxkas7av1fn7qjk2rgmrnkwpag50ddw9";
sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA==";
};
};
"load-json-file-1.1.0" = {
@ -667,7 +694,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
sha512 = "1a7qa1zn5zl1nf7i6w3299lc3biabfb0w2c30cl770l2dbldvi72nwvjdlinhx7j0ldip82sj710aprdjbmbg782i2pa3jpbgmy6qhv";
sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
};
};
"map-obj-1.0.1" = {
@ -694,16 +721,7 @@ let
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
};
};
"minimist-0.0.8" = {
name = "minimist";
packageName = "minimist";
version = "0.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
};
};
"minimist-1.2.5" = {
@ -712,7 +730,7 @@ let
version = "1.2.5";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
};
};
"minipass-2.9.0" = {
@ -721,7 +739,7 @@ let
version = "2.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
};
};
"minizlib-1.3.3" = {
@ -730,43 +748,43 @@ let
version = "1.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
"mkdirp-0.5.1" = {
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.1";
version = "0.5.5";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
};
};
"ms-2.1.2" = {
"ms-2.1.3" = {
name = "ms";
packageName = "ms";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
};
};
"nan-2.14.0" = {
name = "nan";
packageName = "nan";
version = "2.14.0";
src = fetchurl {
url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
sha512 = "115f4m91pjscflwskc29clsspd2z02gdbz0dbj63ja8bf67nraw14gvppl4872y9z2f5vbjlkpg1i4625zvalx3gp04vvn2gs7qblr0";
};
};
"needle-2.4.0" = {
"needle-2.6.0" = {
name = "needle";
packageName = "needle";
version = "2.4.0";
version = "2.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
};
};
"node-addon-api-3.1.0" = {
name = "node-addon-api";
packageName = "node-addon-api";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz";
sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==";
};
};
"node-pre-gyp-0.14.0" = {
@ -775,7 +793,7 @@ let
version = "0.14.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
};
};
"node-status-codes-1.0.0" = {
@ -787,13 +805,13 @@ let
sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
};
};
"nodejieba-2.4.1" = {
"nodejieba-2.5.1" = {
name = "nodejieba";
packageName = "nodejieba";
version = "2.4.1";
version = "2.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz";
sha512 = "2w90xh2sxyp6mkyr4jp6pp72q6vv95ly3a12fzyfv5rc0xinivplz98vnpb8fx92pdxf9aj7wavl9qcl1kl6rva0s1vdrcfhsb5a6bz";
url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.5.1.tgz";
sha512 = "VnJBQSl2G8swDf3ZAXMbXrMCrGFO+kVKbkB93OaBthGbEG5BrxfD8I2m7auaRX8E5C1t+hlwo3HCmQOWKkiZ9A==";
};
};
"nopt-4.0.3" = {
@ -802,7 +820,7 @@ let
version = "4.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
};
};
"normalize-package-data-2.5.0" = {
@ -811,7 +829,7 @@ let
version = "2.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
sha512 = "1wbwhlsm965n61y23wrm50ric9l7rig90wvx7hjdl34np6n1bbqcc67wgm494z303s6y5aj4xjyism3n6kikp40iz9qaizlfhvqr47z";
sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
};
};
"npm-bundled-1.1.1" = {
@ -820,7 +838,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
};
};
"npm-normalize-package-bin-1.0.1" = {
@ -829,7 +847,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
};
};
"npm-packlist-1.4.8" = {
@ -838,7 +856,7 @@ let
version = "1.4.8";
src = fetchurl {
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
};
};
"npmlog-4.1.2" = {
@ -847,7 +865,7 @@ let
version = "4.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
};
};
"number-is-nan-1.0.1" = {
@ -910,7 +928,7 @@ let
version = "0.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
};
};
"package-json-2.4.0" = {
@ -955,7 +973,7 @@ let
version = "1.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
sha512 = "37qw5986wccpwwqckqky509s4nd6zwv200s9r2v6mcf5nsyxgf2x00m4yp918mkkz84sdh4q0kjbg0hhfq4flpz0l6v47hvc57qwa8r";
sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
};
};
"path-type-1.1.0" = {
@ -994,13 +1012,13 @@ let
sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
};
};
"pinyin-2.9.0" = {
"pinyin-2.9.1" = {
name = "pinyin";
packageName = "pinyin";
version = "2.9.0";
version = "2.9.1";
src = fetchurl {
url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.0.tgz";
sha512 = "3fjgppnlcvcbx314q2q32amxyvda5xzj8bgi7s131n15r8wwi94w5bnb7q2lbgag0qc4d5fhg0a14ipwvh0j7si1fmndmw4dgxi15jd";
url = "https://registry.npmjs.org/pinyin/-/pinyin-2.9.1.tgz";
sha512 = "U7kHlVP6yUYl2DV2bX4brlYWdgaAlwtqJrdkboiyri9ixRDVqVO3LD98te3PT5deN5EA9W8ywuG9GaYZfiiIlw==";
};
};
"prepend-http-1.0.4" = {
@ -1018,7 +1036,7 @@ let
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
};
};
"rc-1.2.8" = {
@ -1027,7 +1045,7 @@ let
version = "1.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
};
};
"read-all-stream-3.1.0" = {
@ -1063,7 +1081,7 @@ let
version = "2.3.7";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
};
};
"redent-1.0.0" = {
@ -1081,7 +1099,7 @@ let
version = "3.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
sha512 = "3w8zjx5s044i7wr9bqqgjfkjawg0cajc9j9gmzkqs0i420algjvkd5k27j9pvhx1yq7nvdchsl96zcyjf64n14765q0f18y1wbkmcz0";
sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
};
};
"registry-url-3.1.0" = {
@ -1102,13 +1120,13 @@ let
sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
};
};
"resolve-1.15.1" = {
"resolve-1.19.0" = {
name = "resolve";
packageName = "resolve";
version = "1.15.1";
version = "1.19.0";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
sha512 = "3pr5zjp8nh6qfllxnpqx531srx1igzdm28j4zg1y53yzc8qxp16yx01pw8cp7y4frla90gnpv622d6bi6aayi03iqlkb8gdjklji2pk";
url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz";
sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==";
};
};
"rimraf-2.7.1" = {
@ -1117,7 +1135,7 @@ let
version = "2.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
};
};
"safe-buffer-5.1.2" = {
@ -1126,7 +1144,7 @@ let
version = "5.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
};
};
"safer-buffer-2.1.2" = {
@ -1135,7 +1153,7 @@ let
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"sax-1.2.4" = {
@ -1144,7 +1162,7 @@ let
version = "1.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
};
};
"semver-5.7.1" = {
@ -1153,7 +1171,7 @@ let
version = "5.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
};
};
"semver-diff-2.1.0" = {
@ -1174,13 +1192,13 @@ let
sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
};
};
"signal-exit-3.0.2" = {
"signal-exit-3.0.3" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
};
};
"slide-1.1.6" = {
@ -1192,40 +1210,40 @@ let
sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
};
};
"spdx-correct-3.1.0" = {
"spdx-correct-3.1.1" = {
name = "spdx-correct";
packageName = "spdx-correct";
version = "3.1.0";
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
sha512 = "3qslnh3c2x2g8lar94rladm2rz692d5ds1bp1cpl223jf67jnazl9ipy4n17n7vqvgwimij36gz740nfqr5pyxq8x6n02rd4xj89gcn";
url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz";
sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==";
};
};
"spdx-exceptions-2.2.0" = {
"spdx-exceptions-2.3.0" = {
name = "spdx-exceptions";
packageName = "spdx-exceptions";
version = "2.2.0";
version = "2.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
sha512 = "12c442riig2hk7014ahh40chwirmmsl9dr4cnm2dr2bdbv1lnal8xxwsfx403pqkx7ib06gm2hyyd98kn30kxanjm92yai5y44h0x6r";
url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz";
sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==";
};
};
"spdx-expression-parse-3.0.0" = {
"spdx-expression-parse-3.0.1" = {
name = "spdx-expression-parse";
packageName = "spdx-expression-parse";
version = "3.0.0";
version = "3.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
sha512 = "351djgqvsgqmfg6h764c2k09dmixczw5073jirm8km6i1yym4xjrzc7g5ckwkidi3gls7s910m4ahl8sh37dsb478j8j3sigbfq63k2";
url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz";
sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==";
};
};
"spdx-license-ids-3.0.5" = {
"spdx-license-ids-3.0.7" = {
name = "spdx-license-ids";
packageName = "spdx-license-ids";
version = "3.0.5";
version = "3.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
sha512 = "3sk6sk6r05ikn5qslbh04h54mv4a34wn4d76s800h94padnjydfvvq73ij6jh81yrigspyr50ay878jjwpj2mcq38br371jkb6mdq97";
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz";
sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==";
};
};
"speakingurl-14.0.1" = {
@ -1234,7 +1252,7 @@ let
version = "14.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz";
sha512 = "2nmh1645i59b0ij75rjrps837iipz5m67bwbv5hfn34wjcvzwsrysvdwd1ykdbd1njwazh8prbqsm0dm4lh8sb1r3l0bnmgpfzriwyl";
sha512 = "1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==";
};
};
"sprintf-js-1.0.3" = {
@ -1261,7 +1279,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
};
};
"strip-ansi-3.0.1" = {
@ -1315,7 +1333,7 @@ let
version = "4.4.13";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
};
};
"timed-out-3.1.3" = {
@ -1387,7 +1405,7 @@ let
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
sha512 = "09vn7gn5jp2c07pxplc11lvk7ybfaz0rp3qzflyiyhnahkfgh76bij31ll5rg01ranlmljrky2q25d1f6bbd0h23pzxxi5z93csd4hf";
sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
};
};
"wide-align-1.1.3" = {
@ -1396,7 +1414,7 @@ let
version = "1.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
};
};
"widest-line-1.0.0" = {
@ -1441,7 +1459,7 @@ let
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
};
};
};
@ -1481,7 +1499,7 @@ in
sources."core-util-is-1.0.2"
sources."create-error-class-3.0.2"
sources."currently-unhandled-0.4.1"
sources."debug-3.2.6"
sources."debug-3.2.7"
sources."decamelize-1.2.0"
sources."deep-extend-0.6.0"
sources."delegates-1.0.0"
@ -1497,14 +1515,16 @@ in
sources."fs-minipass-1.2.7"
sources."fs-promise-0.3.1"
sources."fs.realpath-1.0.0"
sources."function-bind-1.1.1"
sources."gauge-2.7.4"
sources."get-stdin-4.0.1"
sources."glob-7.1.6"
sources."got-5.7.1"
sources."graceful-fs-4.2.3"
sources."graceful-fs-4.2.4"
sources."has-1.0.3"
sources."has-ansi-2.0.0"
sources."has-unicode-2.0.1"
sources."hepburn-1.1.1"
sources."hepburn-1.2.0"
sources."hosted-git-info-2.8.8"
sources."iconv-lite-0.4.24"
sources."ignore-walk-3.0.3"
@ -1512,8 +1532,9 @@ in
sources."indent-string-2.1.0"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
sources."ini-1.3.8"
sources."is-arrayish-0.2.1"
sources."is-core-module-2.2.0"
sources."is-finite-1.1.0"
sources."is-fullwidth-code-point-1.0.0"
sources."is-npm-1.0.0"
@ -1523,7 +1544,7 @@ in
sources."is-stream-1.1.0"
sources."is-utf8-0.2.1"
sources."isarray-1.0.0"
sources."js-yaml-3.13.1"
sources."js-yaml-3.14.1"
sources."keypress-0.1.0"
sources."latest-version-2.0.0"
sources."limax-1.7.0"
@ -1531,22 +1552,18 @@ in
sources."loud-rejection-1.6.0"
sources."lowercase-keys-1.0.1"
sources."map-obj-1.0.1"
(sources."meow-3.7.0" // {
dependencies = [
sources."minimist-1.2.5"
];
})
sources."meow-3.7.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."minimist-1.2.5"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.1"
sources."ms-2.1.2"
sources."nan-2.14.0"
sources."needle-2.4.0"
sources."mkdirp-0.5.5"
sources."ms-2.1.3"
sources."needle-2.6.0"
sources."node-addon-api-3.1.0"
sources."node-pre-gyp-0.14.0"
sources."node-status-codes-1.0.0"
sources."nodejieba-2.4.1"
sources."nodejieba-2.5.1"
sources."nopt-4.0.3"
sources."normalize-package-data-2.5.0"
sources."npm-bundled-1.1.1"
@ -1569,14 +1586,10 @@ in
sources."pify-2.3.0"
sources."pinkie-2.0.4"
sources."pinkie-promise-2.0.1"
sources."pinyin-2.9.0"
sources."pinyin-2.9.1"
sources."prepend-http-1.0.4"
sources."process-nextick-args-2.0.1"
(sources."rc-1.2.8" // {
dependencies = [
sources."minimist-1.2.5"
];
})
sources."rc-1.2.8"
sources."read-all-stream-3.1.0"
sources."read-pkg-1.1.0"
sources."read-pkg-up-1.0.1"
@ -1585,7 +1598,7 @@ in
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
sources."repeating-2.0.1"
sources."resolve-1.15.1"
sources."resolve-1.19.0"
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
@ -1593,12 +1606,12 @@ in
sources."semver-5.7.1"
sources."semver-diff-2.1.0"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."slide-1.1.6"
sources."spdx-correct-3.1.0"
sources."spdx-exceptions-2.2.0"
sources."spdx-expression-parse-3.0.0"
sources."spdx-license-ids-3.0.5"
sources."spdx-correct-3.1.1"
sources."spdx-exceptions-2.3.0"
sources."spdx-expression-parse-3.0.1"
sources."spdx-license-ids-3.0.7"
sources."speakingurl-14.0.1"
sources."sprintf-js-1.0.3"
sources."string-width-1.0.2"

10
pkgs/misc/base16-builder/node-packages.nix generated
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -7,15 +7,15 @@
let
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
inherit nodeEnv;
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) stdenv lib nix-gitignore fetchurl fetchgit;
});
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv globalBuildInputs;
}

153
pkgs/misc/base16-builder/supplement.nix
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -10,7 +10,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
sha512 = "38s4f3id97wsb0rg9nm9zvxyq0nvwrmrpa5dzvrkp36mf5ibs98b4z6lvsbrwzzs0sbcank6c7gpp06vcwp9acfhp41rzlhi3ybsxwy";
sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
};
};
"ansi-regex-2.1.1" = {
@ -28,7 +28,7 @@ let
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
sha512 = "13mgnbmdhdq0qncijvpip1l39q1a8labcvj3hc3n1yl2zch106mdkn7p7bd5knvmfkkn1js9nd47nzyjk1himbm8ry8i8gd6mk7mlk3";
sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
};
};
"are-we-there-yet-1.1.5" = {
@ -37,7 +37,7 @@ let
version = "1.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
sha512 = "3mizm1yfxynlhaavbimv7n9qljrbhni22v4fch6zr89x6ps0gpjcxm5yfvv05n8vc3r17hmglyswgq9w0s598xv70nnyw358q11s5p6";
sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
};
};
"balanced-match-1.0.0" = {
@ -55,7 +55,7 @@ let
version = "1.1.11";
src = fetchurl {
url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
sha512 = "248cnpbbf0p32h53rd3g8wzpgrkaj4p078ra1g6l16f82i6bzkvmhwqan5rk88apbll9ly1476kngd7f7z27i3b3zxpbb3064f8yaw8";
sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
};
};
"chownr-1.1.4" = {
@ -64,7 +64,7 @@ let
version = "1.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
sha512 = "1b03acmav1awkygrda5h64pn8msd6wda119q553hik728i1j72bfqyq7yzn1x7nmw28hvg9mcyh7krsj8vwsq3karnn55mj6smip7cc";
sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
};
};
"code-point-at-1.1.0" = {
@ -103,13 +103,13 @@ let
sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
};
};
"debug-3.2.6" = {
"debug-3.2.7" = {
name = "debug";
packageName = "debug";
version = "3.2.6";
version = "3.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
sha512 = "1cyv14044rfh792n1hhsa44kk8dk95zk14w96i49gwq6g9wi6h9vn90xaragfy7rvggqvj178l5f16c78g47xgrwhjx3bp7zs6pxscr";
url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
};
};
"deep-extend-0.6.0" = {
@ -118,7 +118,7 @@ let
version = "0.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
sha512 = "0wc0sqg1aqx864bxf8xa4j8ncrc8rcvmiaj1sp3x1np2i8hdjybzjfd0w9gbf1yasmwycwzzg1mz6smr3q42hhv4pjx2qcgwqhg3q9c";
sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
};
};
"delegates-1.0.0" = {
@ -145,7 +145,7 @@ let
version = "1.2.7";
src = fetchurl {
url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
sha512 = "1644yfnzfqikaff5s68dm4qfrblxrz68ynigkyzyixjqazxlli0svj1nxkawz35sv2vb3vjh41f1rhg0j4nr770a53fzqbjc4j94r0r";
sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
};
};
"fs.realpath-1.0.0" = {
@ -172,7 +172,7 @@ let
version = "7.1.6";
src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
sha512 = "020qv13jbi1v4y5xavf6fw08h9svy4q9p67m4avkrrhgdjmk0c5k3h19bv7k6yn1vfxljpjw9kg81fbdg9v83cjplxvkn3v4v1v21ig";
sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
};
};
"has-unicode-2.0.1" = {
@ -190,7 +190,7 @@ let
version = "0.4.24";
src = fetchurl {
url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
sha512 = "2n3ygx6km56rdcd5kq52bs2113xqm3vlw2kb9r7pnmxd2qhxrfahp2ngc4w7x8x76fyfpapnixnbjq1i24nc11mj6q7rghwj2fifwxz";
sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
};
};
"ignore-walk-3.0.3" = {
@ -199,7 +199,7 @@ let
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
sha512 = "0mlk9s23jc3avly1bv6s5j7hs0aafxabmgn7iqi0bjag4b03nqckvcdrgnarpmysdq8yr1rgxh6k7p82vzjj1z6hnm5ckwswg33mflv";
sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
};
};
"inflight-1.0.6" = {
@ -217,16 +217,16 @@ let
version = "2.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
sha512 = "30rw2i1k63pbf0n5dbwly05h95cdp1kj8c9r15gv1cwha141g61k56fx4qwsvhpm1ksnf7agch1wxirs3s0m31wbfvmcqizgrlwdywk";
sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
};
};
"ini-1.3.5" = {
"ini-1.3.8" = {
name = "ini";
packageName = "ini";
version = "1.3.5";
version = "1.3.8";
src = fetchurl {
url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
sha512 = "1rjbvf1rg5ywhnba08sgagn2qf23lab330qrqmh7d891zap3xpxcyfyj1cblpf0f0rypglcfacybzyrpd4996aa1mbc820awa33k5j5";
url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz";
sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==";
};
};
"is-fullwidth-code-point-1.0.0" = {
@ -253,16 +253,7 @@ let
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
};
};
"minimist-0.0.8" = {
name = "minimist";
packageName = "minimist";
version = "0.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
};
};
"minimist-1.2.5" = {
@ -271,7 +262,7 @@ let
version = "1.2.5";
src = fetchurl {
url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
sha512 = "0pif0kjsr0cdm73cyicn9xdx9zkly45w4akmyfa39lkaf6lzysfr8kr145p54wjk26pbsk0w0qfdds3k4bxy4wl5l210i1b8qsngkql";
sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
};
};
"minipass-2.9.0" = {
@ -280,7 +271,7 @@ let
version = "2.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
sha512 = "1x0k2ycn1r5fig2zy7jj5vjsc7sxdl2a8lidvzsfyhcbrmvyvlbkmb3ga6l8njclvhjz2yrcx57jn26bckzrms017zb2yan1y7d85y3";
sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
};
};
"minizlib-1.3.3" = {
@ -289,34 +280,34 @@ let
version = "1.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
sha512 = "3slcgy5kqasjl8k1n2indaaw0k6j2ipapzxrcqyy2zrwpv8z9w2im5i8c2c73pqdgkd31rwf5bajgv4pm2i6m9jg51cfmp694w0r5p9";
sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
};
};
"mkdirp-0.5.1" = {
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.1";
version = "0.5.5";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
};
};
"ms-2.1.2" = {
"ms-2.1.3" = {
name = "ms";
packageName = "ms";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz";
sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
};
};
"needle-2.4.0" = {
"needle-2.6.0" = {
name = "needle";
packageName = "needle";
version = "2.4.0";
version = "2.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
sha512 = "1k9220dhvc3m78hzd1xh2135p19z15y964hmhsajayvj11j2p3rv5w0gii7lmgr8w57bqkjg0xby5f1gkcph60kxvyr52z6pp7g0yg0";
url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz";
sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==";
};
};
"nopt-4.0.3" = {
@ -325,7 +316,7 @@ let
version = "4.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
sha512 = "0mb9va0ag1n8v5c2lhza37prcw4iyrmbw5n6yglk1kcg95xwqi9ng5dqwr17h63sl5dba2rnwwrzz7dnfvkx5z75h4j7d9kag0qdxha";
sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
};
};
"npm-bundled-1.1.1" = {
@ -334,7 +325,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
sha512 = "1yb9l8jnxwicz0fsdv434y395b0x11mlc1mgbbhnx21pvs58a4p43f0swvi6q0rakdgzdiyf0yylnmb3i41hb052903m1cgcy01zac2";
sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
};
};
"npm-normalize-package-bin-1.0.1" = {
@ -343,7 +334,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
sha512 = "149ypqf1mxqw0gcjr4xf4h65q6vx41z1abm27cwbsj7fn07wsx588f9gsykjzfybwrn4mmr6lyaj825w3yyhbgaagmrybw9brzdmxqh";
sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
};
};
"npm-packlist-1.4.8" = {
@ -352,7 +343,7 @@ let
version = "1.4.8";
src = fetchurl {
url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
sha512 = "3s585jx92awjb52bs1jwq8r4swv8mgfl685if5wwpbsigwb362adizzpi58a5kgqfpf605mf6a0v7074mc9qpcn2ypqgr7f1a1ikq77";
sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
};
};
"npmlog-4.1.2" = {
@ -361,7 +352,7 @@ let
version = "4.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
sha512 = "2967mavp7zw0aawf5fadqf4pmn7vy5gya1yx2s9wwppvivhd9q4mpdnszfqvd7p6yks649bwbpj8iviw86g0hpp4f93d5ca7dmjmrfs";
sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
};
};
"number-is-nan-1.0.1" = {
@ -415,7 +406,7 @@ let
version = "0.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
sha512 = "3ddw0y41pxv08ls5xhmq1bi81hppjbr45k78cjfx99vznh5znrj5g1b1wab9caj1mqlsvmfms0zm9cfb47ygm0d8wv5fccx8049q9fh";
sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
};
};
"path-is-absolute-1.0.1" = {
@ -433,7 +424,7 @@ let
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
sha512 = "1mgan8li4i2l4y7lsr7snks85n6xg5x693cqmzpid3fkk9br7v5xzgvh1zlfs08zkxn6s0n6qhykr64mszjfyxd77dhmdi1jhx992yy";
sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
};
};
"rc-1.2.8" = {
@ -442,7 +433,7 @@ let
version = "1.2.8";
src = fetchurl {
url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
sha512 = "0xhy1n9n3y6cp28f8f0f2mi0xzc7ay1g5nhbp64fyvcwv9q30zq2zvyc5q2d0al8aa0hx101yq2y6d2ln4r5jxnqifh1pd3la1ccxnb";
sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
};
};
"readable-stream-2.3.7" = {
@ -451,7 +442,7 @@ let
version = "2.3.7";
src = fetchurl {
url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
sha512 = "0zrh6gjjzwwycwydra51xcrgjgzyqv6dq38bfpwzmlqn702mwb4nj4sjjn499rycqndfk6rby0dksnq72x8pcbvqv0b2893mvq6if0i";
sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
};
};
"rimraf-2.7.1" = {
@ -460,7 +451,7 @@ let
version = "2.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
sha512 = "3ixwnv4h7x38jd12vyzhx6m6adnfhz1zv881allalyqs8sy3q3zgwldngk4cqslnn2d46l0g91yz8wprmzcsvas9573vp8al9ldns5r";
sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
};
};
"safe-buffer-5.1.2" = {
@ -469,7 +460,7 @@ let
version = "5.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
};
};
"safer-buffer-2.1.2" = {
@ -478,7 +469,7 @@ let
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"sax-1.2.4" = {
@ -487,7 +478,7 @@ let
version = "1.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
sha512 = "1dn291mjsda42w8kldlbmngk6dhjxfbvvd5lckyqmwbjaj6069iq3wx0nvcfglwnpddz2qa93lzf4hv77iz43bd2qixa079sjzl799n";
sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
};
};
"semver-5.7.1" = {
@ -496,7 +487,7 @@ let
version = "5.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
sha512 = "0cl68vp0ymkjpvim4s24v3awyk37d1bfbqrqv4ybwfi8yxga3d8fma2d6bh8dd4i2dsfwca324vaxm5dms61kdlmihdarfgzw6rmaxi";
sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
};
};
"set-blocking-2.0.0" = {
@ -508,13 +499,13 @@ let
sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
};
};
"signal-exit-3.0.2" = {
"signal-exit-3.0.3" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
};
};
"string-width-1.0.2" = {
@ -532,7 +523,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
};
};
"strip-ansi-3.0.1" = {
@ -559,7 +550,7 @@ let
version = "4.4.13";
src = fetchurl {
url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
sha512 = "10gwhmgx7fh619zv48r2lnm42qr7rw4qa9ph7142rizcn8in9dpi49jbmmv8ism60rcg1a7b4103r598jngi1rcn50sw7b8n1570rf3";
sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
};
};
"util-deprecate-1.0.2" = {
@ -577,7 +568,7 @@ let
version = "1.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
sha512 = "2224a32flpf40nhq6rj4idzkcdz0vx65bfxp90hd06db18l6fiqgxz1xnaygm3pbfb1a6v73hl8ryq4996b09zwwins0bqprx0hwsa0";
sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
};
};
"wrappy-1.0.2" = {
@ -595,7 +586,7 @@ let
version = "3.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
sha512 = "3ig31a6zfbdlrs3l77a8avpp17hajryhyq2xk4h3ayc4dmxch146rdk7q1s1jgx9qvmxq125r0xq2bvnq0rq63m75k9y7wglm0hd1bb";
sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
};
};
};
@ -604,10 +595,10 @@ in
node-pre-gyp = nodeEnv.buildNodePackage {
name = "node-pre-gyp";
packageName = "node-pre-gyp";
version = "0.14.0";
version = "0.17.0";
src = fetchurl {
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
sha512 = "32drv6q9sh4i2ff2djd1dhxxxiaiymmgycbm12wpkz9vxspnldxgmppf9sazp3c72771a1p5s4kkzgwn4w1csyz9bn4zdbdnq5w6azq";
url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.17.0.tgz";
sha512 = "abzZt1hmOjkZez29ppg+5gGqdPLUuJeAEwVPtHYEJgx0qzttCbcKFpxrCQn2HYbwCv2c+7JwH4BgEzFkUGpn4A==";
};
dependencies = [
sources."abbrev-1.1.1"
@ -621,7 +612,7 @@ in
sources."concat-map-0.0.1"
sources."console-control-strings-1.1.0"
sources."core-util-is-1.0.2"
sources."debug-3.2.6"
sources."debug-3.2.7"
sources."deep-extend-0.6.0"
sources."delegates-1.0.0"
sources."detect-libc-1.0.3"
@ -634,16 +625,16 @@ in
sources."ignore-walk-3.0.3"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
sources."ini-1.3.5"
sources."ini-1.3.8"
sources."is-fullwidth-code-point-1.0.0"
sources."isarray-1.0.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."minimist-1.2.5"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.1"
sources."ms-2.1.2"
sources."needle-2.4.0"
sources."mkdirp-0.5.5"
sources."ms-2.1.3"
sources."needle-2.6.0"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
@ -657,11 +648,7 @@ in
sources."osenv-0.1.5"
sources."path-is-absolute-1.0.1"
sources."process-nextick-args-2.0.1"
(sources."rc-1.2.8" // {
dependencies = [
sources."minimist-1.2.5"
];
})
sources."rc-1.2.8"
sources."readable-stream-2.3.7"
sources."rimraf-2.7.1"
sources."safe-buffer-5.1.2"
@ -669,7 +656,7 @@ in
sources."sax-1.2.4"
sources."semver-5.7.1"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"

4
pkgs/os-specific/linux/pcm/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "202011";
version = "202101";
pname = "pcm";
src = fetchFromGitHub {
owner = "opcm";
repo = "pcm";
rev = version;
sha256 = "09p8drp9xvvs5bahgnr9xx6987fryz27xs2zaf1mr7a9wsh5j912";
sha256 = "sha256-xiC9XDuFcAzD2lVuzBWUvHy1Z1shEXM2KPFabKvgh1Y=";
};
installPhase = ''

6
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737";
sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8";
})
# P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/)
(fetchurl {
name = "CVE-2021-0326.patch";
url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch";
sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4";
})
];
# TODO: Patch epoll so that the dbus actually responds

28
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.1.5";
version = "2021.2.0";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@ -16,6 +16,7 @@
"agent_dvr" = ps: with ps; [ agent-py ];
"air_quality" = ps: with ps; [ ];
"airly" = ps: with ps; [ airly ];
"airnow" = ps: with ps; [ ]; # missing inputs: pyairnow
"airvisual" = ps: with ps; [ pyairvisual ];
"aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect
"alarm_control_panel" = ps: with ps; [ ];
@ -107,7 +108,7 @@
"calendar" = ps: with ps; [ aiohttp-cors ];
"camera" = ps: with ps; [ aiohttp-cors ];
"canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary
"cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast pysonos zeroconf ];
"cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ];
"cert_expiry" = ps: with ps; [ ];
"channels" = ps: with ps; [ ]; # missing inputs: pychannels
"circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook
@ -153,7 +154,7 @@
"deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
"decora" = ps: with ps; [ bluepy ]; # missing inputs: decora
"decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
"default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow sqlalchemy zeroconf ];
"default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ];
"delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
"deluge" = ps: with ps; [ deluge-client ];
"demo" = ps: with ps; [ aiohttp-cors ];
@ -166,6 +167,7 @@
"device_tracker" = ps: with ps; [ ];
"devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api zeroconf ];
"dexcom" = ps: with ps; [ pydexcom ];
"dhcp" = ps: with ps; [ scapy ];
"dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
"dialogflow" = ps: with ps; [ aiohttp-cors ];
"digital_ocean" = ps: with ps; [ digital-ocean ];
@ -242,7 +244,7 @@
"familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local
"fan" = ps: with ps; [ ];
"fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom
"feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant
"feedreader" = ps: with ps; [ feedparser ];
"ffmpeg" = ps: with ps; [ ha-ffmpeg ];
"ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
"ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
@ -364,6 +366,7 @@
"huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api
"huawei_router" = ps: with ps; [ ];
"hue" = ps: with ps; [ aiohue ];
"huisbaasje" = ps: with ps; [ ]; # missing inputs: huisbaasje-client
"humidifier" = ps: with ps; [ ];
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
"hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti
@ -460,7 +463,7 @@
"luftdaten" = ps: with ps; [ luftdaten ];
"lupusec" = ps: with ps; [ ]; # missing inputs: lupupy
"lutron" = ps: with ps; [ pylutron ];
"lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta
"lutron_caseta" = ps: with ps; [ ]; # missing inputs: aiolip pylutron-caseta
"lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
"lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
"magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed
@ -573,6 +576,7 @@
"ombi" = ps: with ps; [ ]; # missing inputs: pyombi
"omnilogic" = ps: with ps; [ ]; # missing inputs: omnilogic
"onboarding" = ps: with ps; [ aiohttp-cors pillow ];
"ondilo_ico" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ondilo
"onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet
"onkyo" = ps: with ps; [ onkyo-eiscp ];
"onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async
@ -599,7 +603,7 @@
"otp" = ps: with ps; [ pyotp ];
"ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy
"owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ];
"ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt[mqtt-client]
"ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ];
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
"pandora" = ps: with ps; [ pexpect ];
@ -620,7 +624,7 @@
"pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
"plaato" = ps: with ps; [ aiohttp-cors ];
"plant" = ps: with ps; [ sqlalchemy ];
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
"plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ];
"plugwise" = ps: with ps; [ plugwise ];
"plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
"pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts
@ -636,7 +640,6 @@
"proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer
"proxy" = ps: with ps; [ pillow ];
"ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen
"ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd
"pulseaudio_loopback" = ps: with ps; [ pulsectl ];
"push" = ps: with ps; [ aiohttp-cors ];
"pushbullet" = ps: with ps; [ pushbullet ];
@ -758,13 +761,13 @@
"solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge
"solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
"solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
"solax" = ps: with ps; [ ]; # missing inputs: solax
"solax" = ps: with ps; [ solax ];
"soma" = ps: with ps; [ pysoma ];
"somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy
"somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
"sonarr" = ps: with ps; [ ]; # missing inputs: sonarr
"songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
"sonos" = ps: with ps; [ pysonos ];
"sonos" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ];
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
"soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ];
"spaceapi" = ps: with ps; [ aiohttp-cors ];
@ -941,7 +944,7 @@
"x10" = ps: with ps; [ ];
"xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
"xbox" = ps: with ps; [ aiohttp-cors ]; # missing inputs: xbox-webapi
"xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
"xbox_live" = ps: with ps; [ xboxapi ];
"xeoma" = ps: with ps; [ pyxeoma ];
"xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
"xiaomi" = ps: with ps; [ ha-ffmpeg ];
@ -970,6 +973,7 @@
"zodiac" = ps: with ps; [ ];
"zone" = ps: with ps; [ ];
"zoneminder" = ps: with ps; [ zm-py ];
"zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
"zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ];
"zwave_js" = ps: with ps; [ aiohttp-cors ]; # missing inputs: zwave-js-server-python
};
}

46
pkgs/servers/home-assistant/default.nix
View File

@ -9,8 +9,7 @@
# Override Python packages using
# self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }
# Applied after defaultOverrides
, packageOverrides ? self: super: {
}
, packageOverrides ? self: super: {}
# Skip pip install of required packages on startup
, skipPip ? true }:
@ -57,7 +56,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.1.5";
hassVersion = "2021.2.0";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -76,7 +75,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "sha256-xi5rHZlhwgEHll3TFlRu7D963tdcQNMmWcoXVjEFLXo=";
sha256 = "116aq683wy7sxdbxr43li90irpfbsz0dv8w0r1fghcjpwlj7ihwa";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -88,8 +87,9 @@ in with py.pkgs; buildPythonApplication rec {
--replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
--replace "cryptography==3.2" "cryptography" \
--replace "pip>=8.0.3,<20.3" "pip" \
--replace "pyyaml==5.3.1" "pyyaml>=5.3.1" \
--replace "requests==2.25.0" "requests>=2.24.0" \
--replace "pytz>=2020.5" "pytz>=2020.4" \
--replace "pyyaml==5.4.1" "pyyaml" \
--replace "requests==2.25.1" "requests>=2.25.0" \
--replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100"
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'
'';
@ -99,10 +99,10 @@ in with py.pkgs; buildPythonApplication rec {
aiohttp astral async-timeout attrs bcrypt certifi ciso8601 httpx jinja2
pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
setuptools voluptuous voluptuous-serialize yarl
# From default_config. frontend, http, image, mobile_app and recorder components as well as
# the auth.mfa_modules.totp module
aiohttp-cors defusedxml distro emoji hass-frontend pynacl pillow pyotp
pyqrcode sqlalchemy
# From default_config. dhcp, frontend, http, image, mobile_app and
# recorder components as well as the auth.mfa_modules.totp module
aiohttp-cors aiohue defusedxml distro emoji hass-frontend pynacl pillow pyotp
pyqrcode scapy sqlalchemy python-openzwave-mqtt
] ++ componentBuildInputs ++ extraBuildInputs;
# upstream only tests on Linux, so do we.
@ -114,13 +114,16 @@ in with py.pkgs; buildPythonApplication rec {
# We cannot test all components, since they'd introduce lots of dependencies, some of which are unpackaged,
# but we should test very common stuff, like what's in `default_config`.
# https://github.com/home-assistant/core/commits/dev/homeassistant/components/default_config/manifest.json
componentTests = [
"api"
"automation"
"config"
"configurator"
"counter"
"default_config"
"demo"
"dhcp"
"discovery"
"frontend"
"group"
@ -145,6 +148,8 @@ in with py.pkgs; buildPythonApplication rec {
"system_health"
"system_log"
"tag"
"timer"
"webhook"
"websocket_api"
"zeroconf"
"zone"
@ -156,31 +161,26 @@ in with py.pkgs; buildPythonApplication rec {
"--ignore tests/components"
# prone to race conditions due to parallel file access
"--ignore tests/test_config.py"
# tries to import unpackaged dependencies
"--ignore tests/test_loader.py"
# pyotp since v2.4.0 complains about the short mock keys, hass pins v2.3.0
"--ignore tests/auth/mfa_modules/test_notify.py"
"tests"
] ++ map (component: "tests/components/" + component) componentTests;
disabledTests = [
# AssertionError: merge_log_err.call_count != 0
"test_merge"
# ModuleNotFoundError: No module named 'pyqwikswitch'
"test_merge_id_schema"
# AssertionError: assert 'unknown' == 'not_home'
"test_device_tracker_not_home"
# Racy https://github.com/home-assistant/core/issues/41425
"test_cached_event_message"
# ValueError: count must be a positive integer (got 0)
"test_media_view"
# AssertionError: len(events) == 1
"test_error_posted_as_event"
# keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails"
"test_secrets_credstash"
# AssertionError: Expected 'start' to have been called once. Called 0 times.
"test_setup_and_stop"
# AssertionError: assert {} == {'test': <ANY...ckage': <ANY>}
"test_get_custom_components_internal"
# assert 0 == 1 where 0 = len([])
"test_error_posted_as_event"
# RuntimeError: Event loop is closed
"test_remove_older_logs"
"test_config_path"
"test_info_endpoint_register_callback_timeout"
];
preCheck = ''

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20201229.1";
version = "20210127.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3JMWugAiVDq/NBgX8ft2Bchim2g493jy7wZvvXrX+Ws=";
sha256 = "sha256-N+n1DI1oZ/j+GydH+Du21zTNA6leW4YBri7cAMvAac4=";
};
# there is nothing to strip in this package

14
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
View File

@ -1,15 +1,21 @@
{ pkgs, nodejs, stdenv, lib, ... }:
{ pkgs, nodejs, stdenv, fetchFromGitHub, lib, ... }:
let
packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-slack";
rev = "1.4.0";
sha256 = "1xm75rgg7yrz40y2w1njiwfwz17a8wwlvr7a6zyxvkl8cqrgzp6d";
};
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit (stdenv.hostPlatform) system;
};
in
nodePackages."${packageName}".override {
nodePackages.package.override {
inherit src;
nativeBuildInputs = [ pkgs.makeWrapper ];
postInstall = ''

14
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh Normal file → Executable file
View File

@ -1,11 +1,17 @@
#!/usr/bin/env bash
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
# Download package.json and package-lock.json from the v1.4.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/9462a75715ea9afba23b757ec90554f10f457a96/package-lock.json -o package-lock.json
$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
node2nix \
--nodejs-12 \
--node-env ../../../development/node-packages/node-env.nix \
--development \
--input package.json \
--lock package-lock.json \
--output node-packages.nix \
--composition node-composition.nix
--composition node-composition.nix \
rm -f package.json package-lock.json

8
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

1265
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

3
pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
View File

@ -1,3 +0,0 @@
[
{"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.4.0" }
]

6
pkgs/servers/plex/raw.nix
View File

@ -12,16 +12,16 @@
# server, and the FHS userenv and corresponding NixOS module should
# automatically pick up the changes.
stdenv.mkDerivation rec {
version = "1.21.1.3876-3c3adfcb4";
version = "1.21.2.3943-a91458577";
pname = "plexmediaserver";
# Fetch the source
src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
sha256 = "1xpsmk5l0f0blqp5ba9n1w0npsk692p07hp4ipkq7yz3mfag50p0";
sha256 = "1wgv37z1j8yh0jck8nawq8qk6vjvc2cap2dj2vdid9dafy9fl7yw";
} else fetchurl {
url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
sha256 = "0dyw84x9h295428l7r8iqfb2vxkv0f1d68z1j2ka3wsw7cj1yq78";
sha256 = "0bjxb2kmq43fi8026jvdbqn14lg33k2520n59l497la56l5d0h37";
};
outputs = [ "out" "basedb" ];

40
pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -49,13 +49,13 @@ let
sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
};
};
"chainpad-crypto-0.2.4" = {
"chainpad-crypto-0.2.5" = {
name = "chainpad-crypto";
packageName = "chainpad-crypto";
version = "0.2.4";
version = "0.2.5";
src = fetchurl {
url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz";
sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==";
url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.5.tgz";
sha512 = "K9vRsAspuX+uU1goXPz0CawpLIaOHq+1JP3WfDLqaz67LbCX/MLIUt9aMcSeIJcwZ9uMpqnbMGRktyVPoz6MCA==";
};
};
"chainpad-server-4.0.9" = {
@ -337,22 +337,22 @@ let
sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
};
};
"mime-db-1.44.0" = {
"mime-db-1.45.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.44.0";
version = "1.45.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
};
};
"mime-types-2.1.27" = {
"mime-types-2.1.28" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.27";
version = "2.1.28";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
};
};
"ms-2.0.0" = {
@ -562,12 +562,12 @@ let
sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
};
};
"tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
"tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
name = "tweetnacl";
packageName = "tweetnacl";
version = "0.12.2";
src = fetchgit {
url = "git://github.com/dchest/tweetnacl-js.git";
url = "https://github.com/dchest/tweetnacl-js.git";
rev = "8a21381d696acdc4e99c9f706f1ad23285795f79";
sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31";
};
@ -662,9 +662,9 @@ in
sources."async-limiter-1.0.1"
sources."body-parser-1.18.3"
sources."bytes-3.0.0"
(sources."chainpad-crypto-0.2.4" // {
(sources."chainpad-crypto-0.2.5" // {
dependencies = [
sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2"
sources."tweetnacl-git+https://github.com/dchest/tweetnacl-js.git#v0.12.2"
];
})
sources."chainpad-server-4.0.9"
@ -698,8 +698,8 @@ in
sources."merge-descriptors-1.0.1"
sources."methods-1.1.2"
sources."mime-1.4.1"
sources."mime-db-1.44.0"
sources."mime-types-2.1.27"
sources."mime-db-1.45.0"
sources."mime-types-2.1.28"
sources."ms-2.0.0"
sources."negotiator-0.6.2"
sources."netflux-websocket-0.1.20"

8
pkgs/servers/web-apps/cryptpad/node-packages.nix generated
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

164
pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -22,31 +22,31 @@ let
sha512 = "g6MJ5tVszip1wAOq41yk8Z0WJqjfpu3hKaos/IaechYC4RqIn8bTanNR/EGD6oeOdJ9/fTPbQQX5/3ZQwSTXtQ==";
};
};
"@formatjs/ecma402-abstract-1.5.0" = {
"@formatjs/ecma402-abstract-1.5.1" = {
name = "_at_formatjs_slash_ecma402-abstract";
packageName = "@formatjs/ecma402-abstract";
version = "1.5.0";
version = "1.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.0.tgz";
sha512 = "wXv36yo+mfWllweN0Fq7sUs7PUiNopn7I0JpLTe3hGu6ZMR4CV7LqK1llhB18pndwpKoafQKb1et2DCJAOW20Q==";
url = "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.5.1.tgz";
sha512 = "io9XhgIpEbc6jSdn4QVnJeFaUzy6gS5fGiIRCUJ7QKqCNp69JS8EJPW8gCtvwz+JQtx2SJvhaMJbzz3rGkTXBA==";
};
};
"@formatjs/intl-datetimeformat-3.2.2" = {
"@formatjs/intl-datetimeformat-3.2.3" = {
name = "_at_formatjs_slash_intl-datetimeformat";
packageName = "@formatjs/intl-datetimeformat";
version = "3.2.2";
version = "3.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.2.tgz";
sha512 = "wIqe4dPzbYB6SrJWNPKBnXkPj1pR68qtGCzHkPo8JGRpWQcVpHh3Cigw1cQs2I9M1F9dOtFHQP6gi+xsb1kAiA==";
url = "https://registry.npmjs.org/@formatjs/intl-datetimeformat/-/intl-datetimeformat-3.2.3.tgz";
sha512 = "KnQUVuctlozQHULnBi+WLZDAGznFYviVU2HqgCYin2ZEz45IJ9dIZH9gqwsIgiLDgudptHfbj98I3JeKJhprcg==";
};
};
"@formatjs/intl-displaynames-4.0.3" = {
"@formatjs/intl-displaynames-4.0.4" = {
name = "_at_formatjs_slash_intl-displaynames";
packageName = "@formatjs/intl-displaynames";
version = "4.0.3";
version = "4.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.3.tgz";
sha512 = "wNJZzIzlA88oyHZAFdAnLKV/srtIrU//md9SU2Bo0LKXKIukz/g5LmJlyhq6uF1oYoJzVvvTxoVXscBJmKcJmg==";
url = "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-4.0.4.tgz";
sha512 = "oNeLM0vZDFNZSqrz70XhxbMGtjfQ7T/UUcA9K4DvjWX6vmgCbpw5rdwEddhTotY3EmTyUJueK+14e2gIwfCbBA==";
};
};
"@formatjs/intl-getcanonicallocales-1.5.3" = {
@ -58,49 +58,49 @@ let
sha512 = "QVBnSPZ32Y80wkXbf36hP9VbyklbOb8edppxFcgO9Lbd47zagllw65Y81QOHEn/j11JcTn2OhW0vea95LHvQmA==";
};
};
"@formatjs/intl-listformat-5.0.3" = {
"@formatjs/intl-listformat-5.0.4" = {
name = "_at_formatjs_slash_intl-listformat";
packageName = "@formatjs/intl-listformat";
version = "5.0.3";
version = "5.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.3.tgz";
sha512 = "IaW428RI5RpwXr/+doYT1H4ZHL3mYLU3nzR7ZaTkk5dBi1PKKGk1sDwymEzVxyrELT0WHhqhqLKdLjXAqxCz9g==";
url = "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-5.0.4.tgz";
sha512 = "0DQ2NF1PmO3+mvZp4V/SPNk7kUaLDcZR3eWbN8cGvSafWOrcv1iEcTXOd8ow8u9OA0gBTWwgPDcQFn7W0mU8kw==";
};
};
"@formatjs/intl-locale-2.4.12" = {
"@formatjs/intl-locale-2.4.13" = {
name = "_at_formatjs_slash_intl-locale";
packageName = "@formatjs/intl-locale";
version = "2.4.12";
version = "2.4.13";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.12.tgz";
sha512 = "40khHPYtZRdqjQs1fItNj94eMoiGwJJOAKN//9qUhAsHrXvGxseFVBSg+mItV0Orwb3wqItUj3hu6evrouhstw==";
url = "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.13.tgz";
sha512 = "hrglCuFjRpMrutmuL+Ck84KBxeHhouk7d5B/G9kqHL4zmrW6AsBwU+0KeyvareiY3MWzYZhQj1Nm3JEGulQRUQ==";
};
};
"@formatjs/intl-numberformat-6.1.2" = {
"@formatjs/intl-numberformat-6.1.3" = {
name = "_at_formatjs_slash_intl-numberformat";
packageName = "@formatjs/intl-numberformat";
version = "6.1.2";
version = "6.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.2.tgz";
sha512 = "td0XggQKu8dlPUlP2f322NW0WY58zWLlOoiUVh4eolcWqOs4maKL8tjmFBPXSQt55JiKy14ZrDw1dljyNHLB0g==";
url = "https://registry.npmjs.org/@formatjs/intl-numberformat/-/intl-numberformat-6.1.3.tgz";
sha512 = "bLVEt4G7IfacLpiBKg2VfHKnPrzWOWX/jxEi+OIUk6M2bEfYj8Vi1nYGb8+D7ZHCbuj/L7+lnlL4bItPTXT8JA==";
};
};
"@formatjs/intl-pluralrules-4.0.2" = {
"@formatjs/intl-pluralrules-4.0.5" = {
name = "_at_formatjs_slash_intl-pluralrules";
packageName = "@formatjs/intl-pluralrules";
version = "4.0.2";
version = "4.0.5";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.2.tgz";
sha512 = "Oh4zmA3odkXBCPAGVhZuAnP3IfCPy8DyizA9s4QkYptVICX38RbUvXwzr2a9DVpKNiZ7i2TnV4Qkeo06N/6b7Q==";
url = "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.5.tgz";
sha512 = "mWsCpc/SZ6rk0Qb3zpv5bUz6uJysW6qap0qJJz6d0MJpszN3GNsk8CbP5q62oUaWvBmHoeXBvAG9VVEu1TUexw==";
};
};
"@formatjs/intl-relativetimeformat-8.0.2" = {
"@formatjs/intl-relativetimeformat-8.0.3" = {
name = "_at_formatjs_slash_intl-relativetimeformat";
packageName = "@formatjs/intl-relativetimeformat";
version = "8.0.2";
version = "8.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.2.tgz";
sha512 = "RBO+4zxJuIYtYGfxv1GuZJQDtrA+fZlgcHjSVoo5HwznWdfg5vVTe8qdbSDbdyFobbB2OYqwj4mcRO2M5P1oNw==";
url = "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.0.3.tgz";
sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw==";
};
};
"@juggle/resize-observer-3.2.0" = {
@ -139,13 +139,13 @@ let
sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg==";
};
};
"@types/node-14.14.20" = {
"@types/node-14.14.22" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "14.14.20";
version = "14.14.22";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz";
sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==";
url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz";
sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==";
};
};
"@webcomponents/template-1.4.4" = {
@ -265,13 +265,13 @@ let
sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
};
};
"cldr-core-38.0.0" = {
"cldr-core-38.1.0" = {
name = "cldr-core";
packageName = "cldr-core";
version = "38.0.0";
version = "38.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.0.0.tgz";
sha512 = "WkjA4zo5rLT/BWTZAxHJ0lJXwI33gCYucEz1+CpoI8Wu+rr5IrC57wyNXyrNNMdxfDE5RsWi/JCQ9qnG8sHTiw==";
url = "https://registry.npmjs.org/cldr-core/-/cldr-core-38.1.0.tgz";
sha512 = "Da9xKjDp4qGGIX0VDsBqTan09iR5nuYD2a/KkfEaUyqKhu6wFVNRiCpPDXeRbpVwPBY6PgemV8WiHatMhcpy4A==";
};
};
"cliui-2.1.0" = {
@ -427,13 +427,13 @@ let
sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
};
};
"engine.io-4.0.6" = {
"engine.io-4.1.1" = {
name = "engine.io";
packageName = "engine.io";
version = "4.0.6";
version = "4.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.6.tgz";
sha512 = "rf7HAVZpcRrcKEKddgIzYUnwg0g5HE1RvJaTLwkcfJmce4g+po8aMuE6vxzp6JwlK8FEq/vi0KWN6tA585DjaA==";
url = "https://registry.npmjs.org/engine.io/-/engine.io-4.1.1.tgz";
sha512 = "t2E9wLlssQjGw0nluF6aYyfX8LwYU8Jj0xct+pAhfWfv/YrBn6TSNtEYsgxHIfaMqfrLx07czcMg9bMN6di+3w==";
};
};
"engine.io-parser-4.0.2" = {
@ -886,13 +886,13 @@ let
sha512 = "JDdx+3i4fs2pkqwWZJgGEM2vFWsq+01YsQFT9CKPGuv2Q0xSdrQZoxi9XwyNARTgxiOdgoAwWQRluLRe/JQX2g==";
};
};
"polyfill-library-3.101.0" = {
"polyfill-library-3.103.0" = {
name = "polyfill-library";
packageName = "polyfill-library";
version = "3.101.0";
version = "3.103.0";
src = fetchurl {
url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.101.0.tgz";
sha512 = "o/ln6GpYGf1Tn8wJiTkoZ3vEtf6oWrcqM9YC61CW4KaHawVm36R/wN+6ZAv7JoAsPFm0J7PsroukpJVlVxPRjQ==";
url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.103.0.tgz";
sha512 = "z6DMbqDGO87IeG/sjN/PGPgGLzhKftVj6OeRujxgQn+Kz7x+E8uzFvdB3X8dqoE4xaY6aX3ar0UzRxRlYPH9yg==";
};
};
"process-nextick-args-2.0.1" = {
@ -1012,31 +1012,31 @@ let
sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
};
};
"socket.io-3.0.5" = {
"socket.io-3.1.0" = {
name = "socket.io";
packageName = "socket.io";
version = "3.0.5";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.5.tgz";
sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw==";
url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz";
sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww==";
};
};
"socket.io-adapter-2.0.3" = {
"socket.io-adapter-2.1.0" = {
name = "socket.io-adapter";
packageName = "socket.io-adapter";
version = "2.0.3";
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.0.3.tgz";
sha512 = "2wo4EXgxOGSFueqvHAdnmi5JLZzWqMArjuP4nqC26AtLh5PoCPsaRbRdah2xhcwTAMooZfjYiNVNkkmmSMaxOQ==";
url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz";
sha512 = "+vDov/aTsLjViYTwS9fPy5pEtTkrbEKsw2M+oVSoFGw6OD1IpvlV1VPhUzNbofCQ8oyMbdYJqDtGdmHQK6TdPg==";
};
};
"socket.io-parser-4.0.3" = {
"socket.io-parser-4.0.4" = {
name = "socket.io-parser";
packageName = "socket.io-parser";
version = "4.0.3";
version = "4.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.3.tgz";
sha512 = "m4ybFiP4UYVORRt7jcdqf8UWx+ywVdAqqsJyruXxAdD3Sv6MDemijWij34mOWdMJ55bEdIb9jACBhxUgNK6sxw==";
url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
};
};
"source-map-0.5.7" = {
@ -1147,13 +1147,13 @@ let
sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
};
};
"uglify-js-3.12.4" = {
"uglify-js-3.12.6" = {
name = "uglify-js";
packageName = "uglify-js";
version = "3.12.4";
version = "3.12.6";
src = fetchurl {
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.4.tgz";
sha512 = "L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==";
url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz";
sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==";
};
};
"uglify-to-browserify-1.0.2" = {
@ -1315,20 +1315,20 @@ in
dependencies = [
sources."@financial-times/polyfill-useragent-normaliser-1.9.0"
sources."@financial-times/useragent_parser-1.5.1"
sources."@formatjs/ecma402-abstract-1.5.0"
sources."@formatjs/intl-datetimeformat-3.2.2"
sources."@formatjs/intl-displaynames-4.0.3"
sources."@formatjs/ecma402-abstract-1.5.1"
sources."@formatjs/intl-datetimeformat-3.2.3"
sources."@formatjs/intl-displaynames-4.0.4"
sources."@formatjs/intl-getcanonicallocales-1.5.3"
sources."@formatjs/intl-listformat-5.0.3"
sources."@formatjs/intl-locale-2.4.12"
sources."@formatjs/intl-numberformat-6.1.2"
sources."@formatjs/intl-pluralrules-4.0.2"
sources."@formatjs/intl-relativetimeformat-8.0.2"
sources."@formatjs/intl-listformat-5.0.4"
sources."@formatjs/intl-locale-2.4.13"
sources."@formatjs/intl-numberformat-6.1.3"
sources."@formatjs/intl-pluralrules-4.0.5"
sources."@formatjs/intl-relativetimeformat-8.0.3"
sources."@juggle/resize-observer-3.2.0"
sources."@types/component-emitter-1.2.10"
sources."@types/cookie-0.4.0"
sources."@types/cors-2.8.9"
sources."@types/node-14.14.20"
sources."@types/node-14.14.22"
sources."@webcomponents/template-1.4.4"
sources."Base64-1.1.0"
sources."abort-controller-3.0.0"
@ -1342,7 +1342,7 @@ in
sources."brace-expansion-1.1.11"
sources."camelcase-1.2.1"
sources."center-align-0.1.3"
sources."cldr-core-38.0.0"
sources."cldr-core-38.1.0"
(sources."cliui-2.1.0" // {
dependencies = [
sources."wordwrap-0.0.2"
@ -1362,7 +1362,7 @@ in
sources."diff-4.0.2"
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
(sources."engine.io-4.0.6" // {
(sources."engine.io-4.1.1" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@ -1415,7 +1415,7 @@ in
sources."parseurl-1.3.3"
sources."path-is-absolute-1.0.1"
sources."picturefill-3.0.3"
(sources."polyfill-library-3.101.0" // {
(sources."polyfill-library-3.103.0" // {
dependencies = [
sources."source-map-0.5.7"
sources."uglify-js-2.8.29"
@ -1443,14 +1443,14 @@ in
})
sources."serve-static-1.14.1"
sources."setprototypeof-1.1.1"
(sources."socket.io-3.0.5" // {
(sources."socket.io-3.1.0" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
];
})
sources."socket.io-adapter-2.0.3"
(sources."socket.io-parser-4.0.3" // {
sources."socket.io-adapter-2.1.0"
(sources."socket.io-parser-4.0.4" // {
dependencies = [
sources."debug-4.3.2"
sources."ms-2.1.2"
@ -1466,7 +1466,7 @@ in
sources."toidentifier-1.0.0"
sources."toposort-2.0.2"
sources."tslib-2.1.0"
sources."uglify-js-3.12.4"
sources."uglify-js-3.12.6"
sources."uglify-to-browserify-1.0.2"
sources."unorm-1.6.0"
sources."usertiming-0.1.8"

8
pkgs/servers/web-apps/whitebophir/node-packages.nix generated
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-generated.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

548
pkgs/servers/zigbee2mqtt/node-env.nix Normal file
View File

@ -0,0 +1,548 @@
# This file originates from node2nix
{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
let
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
tarWrapper = runCommand "tarWrapper" {} ''
mkdir -p $out/bin
cat > $out/bin/tar <<EOF
#! ${stdenv.shell} -e
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
EOF
chmod +x $out/bin/tar
'';
# Function that generates a TGZ file from a NPM project
buildNodeSourceDist =
{ name, version, src, ... }:
stdenv.mkDerivation {
name = "node-tarball-${name}-${version}";
inherit src;
buildInputs = [ nodejs ];
buildPhase = ''
export HOME=$TMPDIR
tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
'';
installPhase = ''
mkdir -p $out/tarballs
mv $tgzFile $out/tarballs
mkdir -p $out/nix-support
echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
'';
};
includeDependencies = {dependencies}:
lib.optionalString (dependencies != [])
(lib.concatMapStrings (dependency:
''
# Bundle the dependencies of the package
mkdir -p node_modules
cd node_modules
# Only include dependencies if they don't exist. They may also be bundled in the package.
if [ ! -e "${dependency.name}" ]
then
${composePackage dependency}
fi
cd ..
''
) dependencies);
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
DIR=$(pwd)
cd $TMPDIR
unpackFile ${src}
# Make the base dir in which the target dependency resides first
mkdir -p "$(dirname "$DIR/${packageName}")"
if [ -f "${src}" ]
then
# Figure out what directory has been unpacked
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
# Restore write permissions to make building work
find "$packageDir" -type d -exec chmod u+x {} \;
chmod -R u+w "$packageDir"
# Move the extracted tarball into the output folder
mv "$packageDir" "$DIR/${packageName}"
elif [ -d "${src}" ]
then
# Get a stripped name (without hash) of the source directory.
# On old nixpkgs it's already set internally.
if [ -z "$strippedName" ]
then
strippedName="$(stripHash ${src})"
fi
# Restore write permissions to make building work
chmod -R u+w "$strippedName"
# Move the extracted directory into the output folder
mv "$strippedName" "$DIR/${packageName}"
fi
# Unset the stripped name to not confuse the next unpack step
unset strippedName
# Include the dependencies of the package
cd "$DIR/${packageName}"
${includeDependencies { inherit dependencies; }}
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
pinpointDependencies = {dependencies, production}:
let
pinpointDependenciesFromPackageJSON = writeTextFile {
name = "pinpointDependencies.js";
text = ''
var fs = require('fs');
var path = require('path');
function resolveDependencyVersion(location, name) {
if(location == process.env['NIX_STORE']) {
return null;
} else {
var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
if(fs.existsSync(dependencyPackageJSON)) {
var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
if(dependencyPackageObj.name == name) {
return dependencyPackageObj.version;
}
} else {
return resolveDependencyVersion(path.resolve(location, ".."), name);
}
}
}
function replaceDependencies(dependencies) {
if(typeof dependencies == "object" && dependencies !== null) {
for(var dependency in dependencies) {
var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
if(resolvedVersion === null) {
process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
} else {
dependencies[dependency] = resolvedVersion;
}
}
}
}
/* Read the package.json configuration */
var packageObj = JSON.parse(fs.readFileSync('./package.json'));
/* Pinpoint all dependencies */
replaceDependencies(packageObj.dependencies);
if(process.argv[2] == "development") {
replaceDependencies(packageObj.devDependencies);
}
replaceDependencies(packageObj.optionalDependencies);
/* Write the fixed package.json file */
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
'';
};
in
''
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
${lib.optionalString (dependencies != [])
''
if [ -d node_modules ]
then
cd node_modules
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
cd ..
fi
''}
'';
# Recursively traverses all dependencies of a package and pinpoints all
# dependencies in the package.json file to the versions that are actually
# being used.
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
''
if [ -d "${packageName}" ]
then
cd "${packageName}"
${pinpointDependencies { inherit dependencies production; }}
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
fi
'';
# Extract the Node.js source code which is used to compile packages with
# native bindings
nodeSources = runCommand "node-sources" {} ''
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
mv node-* $out
'';
# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
addIntegrityFieldsScript = writeTextFile {
name = "addintegrityfields.js";
text = ''
var fs = require('fs');
var path = require('path');
function augmentDependencies(baseDir, dependencies) {
for(var dependencyName in dependencies) {
var dependency = dependencies[dependencyName];
// Open package.json and augment metadata fields
var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
var packageJSONPath = path.join(packageJSONDir, "package.json");
if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
console.log("Adding metadata fields to: "+packageJSONPath);
var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
if(dependency.integrity) {
packageObj["_integrity"] = dependency.integrity;
} else {
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
}
if(dependency.resolved) {
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
} else {
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
}
if(dependency.from !== undefined) { // Adopt from property if one has been provided
packageObj["_from"] = dependency.from;
}
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
}
// Augment transitive dependencies
if(dependency.dependencies !== undefined) {
augmentDependencies(packageJSONDir, dependency.dependencies);
}
}
}
if(fs.existsSync("./package-lock.json")) {
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(packageLock.lockfileVersion !== 1) {
process.stderr.write("Sorry, I only understand lock file version 1!\n");
process.exit(1);
}
if(packageLock.dependencies !== undefined) {
augmentDependencies(".", packageLock.dependencies);
}
}
'';
};
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
reconstructPackageLock = writeTextFile {
name = "addintegrityfields.js";
text = ''
var fs = require('fs');
var path = require('path');
var packageObj = JSON.parse(fs.readFileSync("package.json"));
var lockObj = {
name: packageObj.name,
version: packageObj.version,
lockfileVersion: 1,
requires: true,
dependencies: {}
};
function augmentPackageJSON(filePath, dependencies) {
var packageJSON = path.join(filePath, "package.json");
if(fs.existsSync(packageJSON)) {
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
dependencies[packageObj.name] = {
version: packageObj.version,
integrity: "sha1-000000000000000000000000000=",
dependencies: {}
};
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
}
}
function processDependencies(dir, dependencies) {
if(fs.existsSync(dir)) {
var files = fs.readdirSync(dir);
files.forEach(function(entry) {
var filePath = path.join(dir, entry);
var stats = fs.statSync(filePath);
if(stats.isDirectory()) {
if(entry.substr(0, 1) == "@") {
// When we encounter a namespace folder, augment all packages belonging to the scope
var pkgFiles = fs.readdirSync(filePath);
pkgFiles.forEach(function(entry) {
if(stats.isDirectory()) {
var pkgFilePath = path.join(filePath, entry);
augmentPackageJSON(pkgFilePath, dependencies);
}
});
} else {
augmentPackageJSON(filePath, dependencies);
}
}
});
}
}
processDependencies("node_modules", lockObj.dependencies);
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
'';
};
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
let
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
in
''
# Pinpoint the versions of all dependencies to the ones that are actually being used
echo "pinpointing versions of dependencies..."
source $pinpointDependenciesScriptPath
# Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible
patchShebangs .
# Deploy the Node.js package by running npm install. Since the
# dependencies have been provided already by ourselves, it should not
# attempt to install them again, which is good, because we want to make
# it Nix's responsibility. If it needs to install any dependencies
# anyway (e.g. because the dependency parameters are
# incomplete/incorrect), it fails.
#
# The other responsibilities of NPM are kept -- version checks, build
# steps, postprocessing etc.
export HOME=$TMPDIR
cd "${packageName}"
runHook preRebuild
${lib.optionalString bypassCache ''
${lib.optionalString reconstructLock ''
if [ -f package-lock.json ]
then
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
rm package-lock.json
else
echo "No package-lock.json file found, reconstructing..."
fi
node ${reconstructPackageLock}
''}
node ${addIntegrityFieldsScript}
''}
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
if [ "''${dontNpmInstall-}" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
fi
'';
# Builds and composes an NPM package including all its dependencies
buildNodePackage =
{ name
, packageName
, version
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, preRebuild ? ""
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, meta ? {}
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit nodejs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
compositionScript = composePackage args;
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
installPhase = ''
# Create and enter a root node_modules/ folder
mkdir -p $out/lib/node_modules
cd $out/lib/node_modules
# Compose the package and all its dependencies
source $compositionScriptPath
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Create symlink to the deployed executable folder, if applicable
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
fi
# Create symlinks to the deployed manual page folders, if applicable
if [ -d "$out/lib/node_modules/${packageName}/man" ]
then
mkdir -p $out/share
for dir in "$out/lib/node_modules/${packageName}/man/"*
do
mkdir -p $out/share/man/$(basename "$dir")
for page in "$dir"/*
do
ln -s $page $out/share/man/$(basename "$dir")
done
done
fi
# Run post install hook, if provided
runHook postInstall
'';
meta = {
# default to Node.js' platforms
platforms = nodejs.meta.platforms;
} // meta;
} // extraArgs);
# Builds a development shell
buildNodeShell =
{ name
, packageName
, version
, src
, dependencies ? []
, buildInputs ? []
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
, bypassCache ? false
, reconstructLock ? false
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
, ... }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
nodeDependencies = stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) util-linux
++ lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
inherit dontStrip; # Stripping may fail a build for some package deployments
inherit dontNpmInstall unpackPhase buildPhase;
includeScript = includeDependencies { inherit dependencies; };
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
installPhase = ''
mkdir -p $out/${packageName}
cd $out/${packageName}
source $includeScriptPath
# Create fake package.json to make the npm commands work properly
cp ${src}/package.json .
chmod 644 package.json
${lib.optionalString bypassCache ''
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
fi
''}
# Go to the parent folder to make sure that all packages are pinpointed
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
# Expose the executables that were installed
cd ..
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
mv ${packageName} lib
ln -s $out/lib/node_modules/.bin $out/bin
'';
} // extraArgs);
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
#! ${stdenv.shell} -e
$shellHook
exec ${stdenv.shell}
EOF
chmod +x $out/bin/shell
'';
# Provide the dependencies in a development shell through the NODE_PATH environment variable
inherit nodeDependencies;
shellHook = lib.optionalString (dependencies != []) ''
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
};
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
buildNodePackage = lib.makeOverridable buildNodePackage;
buildNodeShell = lib.makeOverridable buildNodeShell;
}

2
pkgs/servers/zigbee2mqtt/node.nix
View File

@ -5,7 +5,7 @@
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {
nodeEnv = import ./node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;

8
pkgs/tools/graphics/ldgallery/viewer/generate.sh
View File

@ -24,11 +24,7 @@ node2nix \
--input ./package.json \
--lock ./package-lock.json \
--output node-packages.nix \
--composition node-composition.nix
--composition node-composition.nix \
--no-copy-node-env
rm package.json package-lock.json
# Temporary quickfix to accomodate for the util-linux package rename.
# See https://github.com/svanderburg/node2nix/issues/213
git restore :/pkgs/development/node-packages/node-env.nix
sed -i 's/utillinux/util-linux/g' node-composition.nix

8
pkgs/tools/graphics/ldgallery/viewer/node-composition.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

18
pkgs/tools/graphics/ldgallery/viewer/node-packages.nix generated
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -13252,7 +13252,7 @@ let
];
buildInputs = globalBuildInputs;
meta = {
homepage = https://ldgallery.pacien.org/;
homepage = "https://ldgallery.pacien.org/";
license = "AGPL-3";
};
production = false;
@ -13266,4 +13266,16 @@ in
tarball = nodeEnv.buildNodeSourceDist args;
package = nodeEnv.buildNodePackage args;
shell = nodeEnv.buildNodeShell args;
nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args {
src = stdenv.mkDerivation {
name = args.name + "-package-json";
src = nix-gitignore.gitignoreSourcePure [
"*"
"!package.json"
"!package-lock.json"
] args.src;
dontBuild = true;
installPhase = "mkdir -p $out; cp -r ./* $out;";
};
});
}

6
pkgs/tools/graphics/resvg/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "resvg";
version = "0.12.0";
version = "0.13.1";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "0iqlg0wmx9y81ncbw4ihd6pr7ddpfsvk35zmhzsq4plwzbxgp0w1";
sha256 = "sha256-Jo+dx4+3GpEwOoE8HH0YahBmPvT9Oy2qXMvCJ/NZhF0=";
};
cargoSha256 = "0jgczhvm5rsv4vwd5wx6gshy6322im4c3wi79klk249czr6vlwsg";
cargoSha256 = "sha256-8Es9NZYsC/9PZ6ytWZTAH42U3vxZtJERPSsno1s4TEc=";
doCheck = false;

4
pkgs/tools/misc/entr/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "entr";
version = "4.6";
version = "4.7";
src = fetchurl {
url = "http://entrproject.org/code/${pname}-${version}.tar.gz";
sha256 = "0vcflgagna2gdlpjsd6748c73j2829xlhm276mi838zl1n121phn";
sha256 = "sha256-tsGrdkTYO7Kiadx0Fghno74PXfEWx+tFPCUFMXNTRCk=";
};
postPatch = ''

15
pkgs/tools/misc/licensor/default.nix
View File

@ -1,22 +1,17 @@
{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "licensor";
version = "2.1.0";
version = "unstable-2021-02-03";
src = fetchFromGitHub {
owner = "raftario";
repo = pname;
rev = "v${version}";
sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
rev = "1897882a708ec6ed65a9569ae0e07d6ea576c652";
sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32";
};
patches = [ (fetchpatch {
url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch";
sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3";
})];
cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa";
cargoSha256 = "1yix40351yasg7mjmz7qwvwh1dq292dv47gy2a3bwkzhcn6whyjf";
meta = with lib; {
description = "Write licenses to stdout";

6
pkgs/tools/misc/lokalise2-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lokalise2-cli";
version = "2.6.2";
version = "2.6.3";
src = fetchFromGitHub {
owner = "lokalise";
repo = "lokalise-cli-2-go";
rev = "v${version}";
sha256 = "1iizyr6bv17dpv05whcx34498wbrs0q3gn8s50srvdqrdk9hs4gj";
sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4=";
};
vendorSha256 = "17nykcx47h1q55msh43mmf092y5cigarz5486yp6sqp79p6lbjk3";
vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8=";
doCheck = false;

4
pkgs/tools/misc/youtube-dl/default.nix
View File

@ -18,11 +18,11 @@ buildPythonPackage rec {
# The websites youtube-dl deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
version = "2021.01.24.1";
version = "2021.02.04.1";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
sha256 = "001hs73fpm4nxcgn60n9wlsdmiv40f4b1k6hkl4g4wyywv9ic9fy";
sha256 = "0rn8plld2bzmwbcvxxgz3hn24kjyal5kkwbpb5nd4w84mdjkhjqa";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];

174
pkgs/tools/networking/airfield/node-packages.nix generated
View File

@ -1,16 +1,16 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
"ajv-6.12.0" = {
"ajv-6.12.6" = {
name = "ajv";
packageName = "ajv";
version = "6.12.0";
version = "6.12.6";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
sha512 = "0gkcic96nmpcq311i2jfwbaa961x0mj7mkl7iwk213hyn4jgxbl0a472lcpg9dr7ybacn3i45fj6q0dz3g8rqmva7r14i9la240ba0g";
url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz";
sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==";
};
};
"asn1-0.2.4" = {
@ -19,7 +19,7 @@ let
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
sha512 = "1v2z1ll0l8rif8hh0d03jc49kz3p8hym63q8ixbas48w4a8akl413hwn08nx83m89sj3mxl06aa0grp7n8hj6hcbsb2k3fhj913674g";
sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
};
};
"assert-plus-1.0.0" = {
@ -49,13 +49,13 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
};
};
"aws4-1.9.1" = {
"aws4-1.11.0" = {
name = "aws4";
packageName = "aws4";
version = "1.9.1";
version = "1.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
sha512 = "2x4b6c0ny64yv6ljfs6sv82akh200klmnh1m1i18hdj28ksxkr9c0szphnwcasy3g5y3l1wn858wcxnc2gi9q5wql8s678fc61xbhf0";
url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz";
sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==";
};
};
"bcrypt-pbkdf-1.0.2" = {
@ -100,7 +100,7 @@ let
version = "1.0.8";
src = fetchurl {
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
sha512 = "1v09nkip7zpn3k3prkkg53w331rhczpfgcqb0q42i97nafra43l2khl5zvhd4ar0qmh145nmw7944jy8p108ny0xpgy29gf2wqph0qm";
sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
};
};
"commander-0.6.1" = {
@ -166,13 +166,13 @@ let
sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
};
};
"debug-4.1.1" = {
"debug-4.3.2" = {
name = "debug";
packageName = "debug";
version = "4.1.1";
version = "4.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
sha512 = "1kmf9j5pka2rsljg5x6shniwmgs9444ksgdn0d3fjmis7yghxxn2zj526s36ip8rmpfni9zpj8z74w7irax32a67j59xw38wk6hi055";
url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz";
sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
};
};
"delayed-stream-1.0.0" = {
@ -184,13 +184,13 @@ let
sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
};
};
"denque-1.4.1" = {
"denque-1.5.0" = {
name = "denque";
packageName = "denque";
version = "1.4.1";
version = "1.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
sha512 = "2spb0s12jkarfiydj4sj4iw1yfjzaplakzw7bma0pwnbra23l1b85rsyzc25szlfdl3bm5bb42fmy4xhf1xdpxaywmwh6aa4swwzz1r";
url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz";
sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==";
};
};
"ecc-jsbn-0.1.2" = {
@ -208,7 +208,7 @@ let
version = "3.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
sha512 = "3zad2109w3q3gh46s5msrnzfy2nl581sqpy20b52fs7v5pdjh3irpg7szl3xvh4sfy63218jy8ry6qlnir3baxbbfrb03swkw5swfky";
sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
};
};
"extsprintf-1.3.0" = {
@ -220,13 +220,13 @@ let
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
};
"fast-deep-equal-3.1.1" = {
"fast-deep-equal-3.1.3" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "3.1.1";
version = "3.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
sha512 = "1j7wq3vqvfgnpd2sjblnlgryxlic2fsy343fx8w4ywb2mngj1w5afq8fmly8cp9fi66dhz1fhcfpn23g5zasnzs6n1snb83qkkilhgi";
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz";
sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
};
};
"fast-json-stable-stringify-2.1.0" = {
@ -235,7 +235,7 @@ let
version = "2.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
sha512 = "0gz06zkjlqc4r59ka14n3vwqjdgn40zd8r115ql3rkwqb7j42frmnsj3axr7p2md8ik52nqjn3myyv8ddavdhl4cq3xz4wbbz07y5wn";
sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
};
};
"forever-agent-0.6.1" = {
@ -253,7 +253,7 @@ let
version = "2.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
sha512 = "0jj3hgqp9pmxmfavx6rvdfl3r4yf98clpsarqadz3hq0dxhjlh2ppd9x8bvmaq3nwjdqpdvqx25pwyin4ipixhgsn7s3p9fcc3wllnn";
sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
};
};
"formidable-1.0.11" = {
@ -292,13 +292,13 @@ let
sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
};
};
"har-validator-5.1.3" = {
"har-validator-5.1.5" = {
name = "har-validator";
packageName = "har-validator";
version = "5.1.3";
version = "5.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
sha512 = "3kaldgfsh3lfvgvw31s8b7q345zf7ixjahllncdckcw6qfs3gnbsamdxgs9kfigq7rwmja7v51ghh7y0rsp6q7jmvmbydhh645wxnxh";
url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz";
sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==";
};
};
"http-signature-1.2.0" = {
@ -352,7 +352,7 @@ let
version = "0.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
sha512 = "1bbgxs4777gn3q3yxi0n792cgz9pimf85pypr0w4wzpb22nr8fl9xi98pkcqd3n4fn7lnzffpq7qwpcl4dqc15py19lwqa2jwgw5dn5";
sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
};
};
"json-stringify-safe-5.0.1" = {
@ -391,22 +391,22 @@ let
sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
};
};
"mime-db-1.43.0" = {
"mime-db-1.45.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.43.0";
version = "1.45.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
sha512 = "36x3p6lll5v1g7na92kbba0bpcl36i1argsqn8iy4mgz3zh3llnqhzhfw0l26jqcb0mh9rhhmrx718kvqzchga6y79qdg9884c6r5zv";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz";
sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==";
};
};
"mime-types-2.1.26" = {
"mime-types-2.1.28" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.26";
version = "2.1.28";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
sha512 = "1cxsgrndjg6jyfqzm74hv6cmy9lil52f1kzkq2niknaiqz20p3yiw0fpgsyld2zrbxr9abpdabz1q6nqa50xr9a0cmbjbi0cqymlnnk";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz";
sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==";
};
};
"mkdirp-0.3.3" = {
@ -424,7 +424,7 @@ let
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
sha512 = "3dqfiiw6nxvvi24fndbzlccnjcas99bsd1kz5m2r78lzgpp6vx57jzbmxq3k1m7bsw88rwra0n4848l720fxxn5x20djck3wp3hysdh";
sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
};
};
"oauth-sign-0.9.0" = {
@ -433,7 +433,7 @@ let
version = "0.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
sha512 = "1jz644r7ybsq688ifahm64ih3ljqjjskm533bgir20pvc350f9cl0z162scih0r1idx8lpw5f8hxa2pkf0lhbdhr5y6ak2ga5863v3x";
sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
};
};
"pause-0.0.1" = {
@ -454,13 +454,13 @@ let
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
};
"psl-1.7.0" = {
"psl-1.8.0" = {
name = "psl";
packageName = "psl";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
sha512 = "0whj0m29370fn3imrlj2dw0xmr33j2gn30kn96xpxckz7i1b21pj6vlgsn4ggxl79mz2ckng5mdxbkczcwkjry497s8xkgw7c815nz4";
url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
};
};
"punycode-2.1.1" = {
@ -469,7 +469,7 @@ let
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
sha512 = "381vqgh5xkqzrr6cxbzfykgnnk83m7qgpx3wjwj1hddn3sg2aibjxyr30rajpgv4js0cqknrbzwbfk5ryhiiyigzfjrk3zysy6i26sx";
sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
};
};
"qs-0.5.1" = {
@ -487,7 +487,7 @@ let
version = "6.5.2";
src = fetchurl {
url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
};
};
"range-parser-0.0.4" = {
@ -499,13 +499,13 @@ let
sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
};
};
"redis-commands-1.5.0" = {
"redis-commands-1.6.0" = {
name = "redis-commands";
packageName = "redis-commands";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz";
sha512 = "0kdmbh04hif6g8qr3zcwjkjg1v3rjgss0dq3sy144l5ja5vp4ndb5hdn2acrx57w01swbwpkskmy788lr2nxdq0g46azqsrmad5mb78";
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz";
sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==";
};
};
"redis-errors-1.2.0" = {
@ -526,13 +526,13 @@ let
sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
};
};
"safe-buffer-5.2.0" = {
"safe-buffer-5.2.1" = {
name = "safe-buffer";
packageName = "safe-buffer";
version = "5.2.0";
version = "5.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
sha512 = "1pb164cfv1ip3s1rp008433rak88mdcch24q84cbfndg0dzky2ij8vjvsiyx2qf3rg4dgs82zk7vnrd9hkqqdcvp4lbk5ymcr8314bx";
url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
};
};
"safer-buffer-2.1.2" = {
@ -541,7 +541,7 @@ let
version = "2.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
};
};
"send-0.1.0" = {
@ -559,7 +559,7 @@ let
version = "1.16.1";
src = fetchurl {
url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
sha512 = "0i4jnrxh6i17qij2vfki7qxmk435cnacvg363qg0hya5incfj57akgbas8zcx2cl5pds9jfgfyhqm8wlqz6damsg059gymv99aylx8x";
sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
};
};
"tough-cookie-2.5.0" = {
@ -568,7 +568,7 @@ let
version = "2.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
sha512 = "3xgcny117pqhfncr4gbmagzlnjiqqgq0lrvmljdfcdy64nc0xjfcbf1r08dmp1v1m3s51kq0yxc18nl3j9lbpr5bp5lgmi6719yqlly";
sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
};
};
"tunnel-agent-0.6.0" = {
@ -589,22 +589,22 @@ let
sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
};
};
"underscore-1.9.2" = {
"underscore-1.12.0" = {
name = "underscore";
packageName = "underscore";
version = "1.9.2";
version = "1.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
};
};
"uri-js-4.2.2" = {
"uri-js-4.4.1" = {
name = "uri-js";
packageName = "uri-js";
version = "4.2.2";
version = "4.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
sha512 = "2fz60s71ghl56ddfiiaws81xpiidlbjk69jyjmahz190d2advy9zdbcwh5if4rgg5hxdbfxhkwiipjrnjy8w834bxsmzambd2p4b3r9";
url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz";
sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==";
};
};
"uuid-3.4.0" = {
@ -613,7 +613,7 @@ let
version = "3.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
sha512 = "3y9pcli1v8nqryqd2c4pxj9kcv92mjc22z4smg08pdjzrbwda19xmjbzms1dwr04995h4carz9s8mldbiqb8708694lwr501r3q6d0y";
sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
};
};
"verror-1.10.0" = {
@ -644,7 +644,7 @@ in
sources."cookie-0.0.5"
sources."cookie-signature-0.0.1"
sources."crc-0.2.0"
sources."debug-4.1.1"
sources."debug-4.3.2"
sources."formidable-1.0.11"
sources."fresh-0.1.0"
sources."methods-0.0.1"
@ -673,7 +673,7 @@ in
sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
};
dependencies = [
sources."underscore-1.9.2"
sources."underscore-1.12.0"
];
buildInputs = globalBuildInputs;
meta = {
@ -706,11 +706,11 @@ in
version = "3.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz";
sha512 = "26lf40x7al63vywd96j6idqbn8fagv4jp6ar9cc80aili5d59sy14hvb3haw8xhjqxc3481dkmbvza8x3p1dcn3p2az5snlp054pn1w";
sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==";
};
dependencies = [
sources."denque-1.4.1"
sources."redis-commands-1.5.0"
sources."denque-1.5.0"
sources."redis-commands-1.6.0"
sources."redis-errors-1.2.0"
sources."redis-parser-3.0.0"
];
@ -727,10 +727,10 @@ in
connect-redis = nodeEnv.buildNodePackage {
name = "connect-redis";
packageName = "connect-redis";
version = "4.0.4";
version = "5.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz";
sha512 = "014p1jjd7bzdsd81v0918ac5j4k1qs4qi2nzzndyn50rznd04hx85l23jpicznwc2j3nkz5bj15zbi98ld3akxb5rwl46r5sdp3nyb9";
url = "https://registry.npmjs.org/connect-redis/-/connect-redis-5.0.0.tgz";
sha512 = "R4nTW5uXeG5s6zr/q4abmtcdloglZrL/A3cpa0JU0RLFJU4mTR553HUY8OZ0ngeySkGDclwQ5xmCcjjKkxdOSg==";
};
buildInputs = globalBuildInputs;
meta = {
@ -748,7 +748,7 @@ in
version = "3.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
sha512 = "1kwiqca4ql149ywfzbp1lpmqixnh1y9i5aizcd0fvndrq9sn31j0cr38wdgbr5xqvlxgjfs3jwryg7ddnwc8n1b5nlksfjmj48sc7ad";
sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
};
buildInputs = globalBuildInputs;
meta = {
@ -766,15 +766,15 @@ in
version = "2.88.2";
src = fetchurl {
url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
sha512 = "23hm71jcxrwvp33azx8mx3w6dg21fr4w6lwvkvxyf6ckvhk3hz9dk8lzgkbiyzfl9ylhp4n807xp88ppq4gj5h07cmrgxf6nwxfvjrj";
sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
};
dependencies = [
sources."ajv-6.12.0"
sources."ajv-6.12.6"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.9.1"
sources."aws4-1.11.0"
sources."bcrypt-pbkdf-1.0.2"
sources."caseless-0.12.0"
sources."combined-stream-1.0.8"
@ -784,13 +784,13 @@ in
sources."ecc-jsbn-0.1.2"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-3.1.1"
sources."fast-deep-equal-3.1.3"
sources."fast-json-stable-stringify-2.1.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
sources."getpass-0.1.7"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."har-validator-5.1.5"
sources."http-signature-1.2.0"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
@ -799,20 +799,20 @@ in
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.43.0"
sources."mime-types-2.1.26"
sources."mime-db-1.45.0"
sources."mime-types-2.1.28"
sources."oauth-sign-0.9.0"
sources."performance-now-2.1.0"
sources."psl-1.7.0"
sources."psl-1.8.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."safe-buffer-5.2.0"
sources."safe-buffer-5.2.1"
sources."safer-buffer-2.1.2"
sources."sshpk-1.16.1"
sources."tough-cookie-2.5.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."uri-js-4.2.2"
sources."uri-js-4.4.1"
sources."uuid-3.4.0"
sources."verror-1.10.0"
];

8
pkgs/tools/networking/airfield/node.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

4
pkgs/tools/networking/isync/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "isync";
version = "1.3.3";
version = "1.3.4";
src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
sha256 = "10n8ykag0q3ws6fc15xqyg3v980v5nq3kzpablly2rh2z7vkn8gj";
sha256 = "0w9fqz1qsdm1zfpv9jp5v2dav6pyigf1n6x7asxi0fg58sf49sz8";
};
nativeBuildInputs = [ pkg-config perl ];

4
pkgs/tools/networking/rcon/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rcon";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "n0la";
repo = "rcon";
rev = version;
sha256 = "1jsnmsm2qkiv8dan1yncx0qp6zfkcbyvf81c7xwpv6r499ijw1nb";
sha256 = "sha256-bHm6JeWmpg42VZQXikHl+BMx9zimRLBQWemTqOxyLhw=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/tools/networking/tcpreplay/default.nix
View File

@ -31,5 +31,9 @@ stdenv.mkDerivation rec {
license = with licenses; [ bsd3 gpl3 ];
maintainers = with maintainers; [ eleanor ];
platforms = platforms.unix;
knownVulnerabilities = [
"CVE-2020-24265" # https://github.com/appneta/tcpreplay/issues/616
"CVE-2020-24266" # https://github.com/appneta/tcpreplay/issues/617
];
};
}

4
pkgs/tools/networking/zerotierone/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zerotierone";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "0lky68fjrqjsd62g97jkn5a9hzj53g8wb6d2ncx8s21rknpncdar";
sha256 = "0a9sjcri96pv4pvvi94g7jyldwfhqqsi1k58maymm0jnqnj91z25";
};
preConfigure = ''

8
pkgs/tools/package-management/nixui/nixui.nix
View File

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
@ -6,12 +6,12 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
inherit nodeEnv;
}

24
pkgs/tools/package-management/nixui/node-packages.nix generated
View File

@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.8.0. Do not edit!
# This file has been generated by node2nix 1.9.0. Do not edit!
{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
@ -49,6 +49,15 @@ let
sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593";
};
};
"underscore-1.12.0" = {
name = "underscore";
packageName = "underscore";
version = "1.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz";
sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==";
};
};
"underscore-1.4.4" = {
name = "underscore";
packageName = "underscore";
@ -58,15 +67,6 @@ let
sha1 = "61a6a32010622afa07963bf325203cf12239d604";
};
};
"underscore-1.9.2" = {
name = "underscore";
packageName = "underscore";
version = "1.9.2";
src = fetchurl {
url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
sha512 = "0fpcm4n2qlycl50j6k3fv7baybnzf1wbsm2ng0vwfsdi40fyvsvvl0k1i427hgpknhj5hbcwff3swckw6wx96kw4dgwvldi56v6lzqg";
};
};
};
in
{
@ -93,7 +93,7 @@ in
sources."underscore-1.4.4"
];
})
sources."underscore-1.9.2"
sources."underscore-1.12.0"
];
buildInputs = globalBuildInputs;
meta = {

6
pkgs/tools/virtualization/shipyard/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "shipyard";
version = "0.1.17";
version = "0.1.18";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shipyard-run";
repo = pname;
sha256 = "13cp7qpxchnyxdm26xwdcp557nj16f4h8vlj0p4h79z5g7pcklln";
sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc=";
};
vendorSha256 = "0gib9s09lz91wawbms9zq4wc5k6bdxfzpxm8q92h0bsjw1bj1hzs";
vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w=";
buildFlagsArray = [
"-ldflags=-s -w -X main.version=${version}"

4
pkgs/top-level/all-packages.nix
View File

@ -19103,10 +19103,10 @@ in
for a specific kernel. This function can then be called for
whatever kernel you're using. */
linuxPackagesFor = kernel: lib.makeExtensible (self: with self; {
linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; {
callPackage = newScope self;
inherit kernel;
kernel = kernel_;
inherit (kernel) stdenv; # in particular, use the same compiler by default
# to help determine module compatibility

12
pkgs/top-level/python-packages.nix
View File

@ -484,6 +484,8 @@ in {
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { };
asyncpg = callPackage ../development/python-modules/asyncpg { };
@ -2926,6 +2928,8 @@ in {
hieroglyph = callPackage ../development/python-modules/hieroglyph { };
hijri-converter = callPackage ../development/python-modules/hijri-converter { };
hiredis = callPackage ../development/python-modules/hiredis { };
hiro = callPackage ../development/python-modules/hiro { };
@ -4901,6 +4905,8 @@ in {
python-openems = callPackage ../development/python-modules/python-openems { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };
python-tado = callPackage ../development/python-modules/python-tado { };
pkutils = callPackage ../development/python-modules/pkutils { };
@ -6100,6 +6106,8 @@ in {
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { };
pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
pytest-isort = callPackage ../development/python-modules/pytest-isort { };
@ -7267,6 +7275,8 @@ in {
softlayer = callPackage ../development/python-modules/softlayer { };
solax = callPackage ../development/python-modules/solax { };
solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });
somajo = callPackage ../development/python-modules/somajo { };
@ -8329,6 +8339,8 @@ in {
xattr = callPackage ../development/python-modules/xattr { };
xboxapi = callPackage ../development/python-modules/xboxapi { };
xcaplib = callPackage ../development/python-modules/xcaplib { };
xcffib = callPackage ../development/python-modules/xcffib { };