mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-20 12:42:24 +00:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7d786912ce
|
|
@ -142,6 +142,16 @@
|
|||
using the PyPy interpreter were added.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>influxdb2</literal> package was split into
|
||||
<literal>influxdb2-server</literal> and
|
||||
<literal>influxdb2-cli</literal>, matching the split that took
|
||||
place upstream. A combined <literal>influxdb2</literal>
|
||||
package is still provided in this release for backwards
|
||||
compatibilty, but will be removed at a later date.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -58,3 +58,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
through the Unix socket `/run/redis-${serverName}/redis.sock`.
|
||||
|
||||
- The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added.
|
||||
|
||||
- The `influxdb2` package was split into `influxdb2-server` and
|
||||
`influxdb2-cli`, matching the split that took place upstream. A
|
||||
combined `influxdb2` package is still provided in this release for
|
||||
backwards compatibilty, but will be removed at a later date.
|
||||
|
|
|
|||
|
|
@ -54,12 +54,12 @@ let
|
|||
# tcp json rpc
|
||||
++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ]
|
||||
++ optionals cfg.tcp.enable [
|
||||
"--tcp.address ${cfg.tcp.listenAddress}"
|
||||
"--tcp.bind_to_address ${cfg.tcp.listenAddress}"
|
||||
"--tcp.port ${toString cfg.tcp.port}" ]
|
||||
# http json rpc
|
||||
++ [ "--http.enabled ${toString cfg.http.enable}" ]
|
||||
++ optionals cfg.http.enable [
|
||||
"--http.address ${cfg.http.listenAddress}"
|
||||
"--http.bind_to_address ${cfg.http.listenAddress}"
|
||||
"--http.port ${toString cfg.http.port}"
|
||||
] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\"");
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ in
|
|||
services.influxdb2 = {
|
||||
enable = mkEnableOption "the influxdb2 server";
|
||||
package = mkOption {
|
||||
default = pkgs.influxdb2;
|
||||
default = pkgs.influxdb2-server;
|
||||
defaultText = literalExpression "pkgs.influxdb2";
|
||||
description = "influxdb2 derivation to use.";
|
||||
type = types.package;
|
||||
|
|
|
|||
|
|
@ -74,6 +74,8 @@ in {
|
|||
TTYVTDisallocate = "yes";
|
||||
# Fail to start if not controlling the virtual terminal.
|
||||
StandardInput = "tty-fail";
|
||||
StandardOutput = "journal";
|
||||
StandardError = "journal";
|
||||
# Set up a full (custom) user session for the user, required by Cage.
|
||||
PAMName = "cage";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ in {
|
|||
};
|
||||
};
|
||||
};
|
||||
environment.systemPackages = [ pkgs.snapcast ];
|
||||
};
|
||||
client = {
|
||||
environment.systemPackages = [ pkgs.snapcast ];
|
||||
|
|
@ -71,6 +72,13 @@ in {
|
|||
"curl --fail http://localhost:${toString httpPort}/jsonrpc -d '{json.dumps(get_rpc_version)}'"
|
||||
)
|
||||
|
||||
with subtest("test a ipv6 connection"):
|
||||
server.execute("systemd-run --unit=snapcast-local-client snapclient -h ::1 -p ${toString port}")
|
||||
server.wait_until_succeeds(
|
||||
"journalctl -o cat -u snapserver.service | grep -q 'Hello from'"
|
||||
)
|
||||
server.wait_until_succeeds("journalctl -o cat -u snapcast-local-client | grep -q 'buffer: ${toString bufferSize}'")
|
||||
|
||||
with subtest("test a connection"):
|
||||
client.execute("systemd-run --unit=snapcast-client snapclient -h server -p ${toString port}")
|
||||
server.wait_until_succeeds(
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ mkChromiumDerivation (base: rec {
|
|||
installPhase = ''
|
||||
mkdir -p "$libExecPath"
|
||||
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
|
||||
cp -v "$buildPath/libvulkan.so.1" "$libExecPath/"
|
||||
cp -v "$buildPath/vk_swiftshader_icd.json" "$libExecPath/"
|
||||
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
|
||||
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "97.0.4692.45",
|
||||
"sha256": "1x55hys3340inrwwp4lzw5vq3vrg56288m746d4p2ligvsy19byp",
|
||||
"sha256bin64": "1jyhq27fb4pzbxlg0ssfz66hza9g8cbsqyx70ydkjqs9sf4yqqcw",
|
||||
"version": "97.0.4692.56",
|
||||
"sha256": "19i572z02hp7n7j7k5i38jr60jfli5jk5qnydfzxavwx9vjqjwgf",
|
||||
"sha256bin64": "1im2dq2p5cdy6hj6n2lvn2nzwb5mgy57hyskhwhfm1fz5xzjzc3g",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-11-03",
|
||||
|
|
|
|||
|
|
@ -362,16 +362,14 @@ if [ "$action" = edit ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
ORIGIN_PWD="$PWD"
|
||||
|
||||
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
|
||||
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
|
||||
cd "$tmpDir"
|
||||
|
||||
cleanup() {
|
||||
for ctrl in "$tmpDir"/ssh-*; do
|
||||
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
|
||||
done
|
||||
cd "$ORIGIN_PWD"
|
||||
rm -rf "$tmpDir"
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
|
|
|||
33
pkgs/servers/nosql/influxdb2/cli.nix
Normal file
33
pkgs/servers/nosql/influxdb2/cli.nix
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
{ buildGoModule
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influx-cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-9FUchI93xLpQwtpbr5S3GfVrApHaemwbnRPIfAWmG6Y=";
|
||||
};
|
||||
|
||||
in buildGoModule {
|
||||
pname = "influx-cli";
|
||||
version = version;
|
||||
src = src;
|
||||
|
||||
vendorSha256 = "sha256-Boz1G8g0fjjlflxZh4V8sd/v0bE9Oy3DpqywOpKxjd0=";
|
||||
subPackages = [ "cmd/influx" ];
|
||||
|
||||
ldflags = [ "-X main.commit=v${version}" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for managing resources in InfluxDB v2";
|
||||
license = licenses.mit;
|
||||
homepage = "https://influxdata.com/";
|
||||
maintainers = with maintainers; [ abbradar danderson ];
|
||||
};
|
||||
}
|
||||
12
pkgs/servers/nosql/influxdb2/combined.nix
Normal file
12
pkgs/servers/nosql/influxdb2/combined.nix
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
buildEnv,
|
||||
influxdb2-server,
|
||||
influxdb2-cli,
|
||||
}:
|
||||
buildEnv {
|
||||
name = "influxdb2";
|
||||
paths = [
|
||||
influxdb2-server
|
||||
influxdb2-cli
|
||||
];
|
||||
}
|
||||
|
|
@ -1,35 +1,31 @@
|
|||
{ buildGoModule
|
||||
, buildGoPackage
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, go-bindata
|
||||
, lib
|
||||
, llvmPackages
|
||||
, perl
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
# Note for maintainers: use ./update-influxdb2.sh to update the Yarn
|
||||
# dependencies nix expression.
|
||||
|
||||
let
|
||||
version = "2.0.8";
|
||||
shorthash = "e91d41810f"; # git rev-parse HEAD with 2.0.8 checked out
|
||||
libflux_version = "0.124.0";
|
||||
version = "2.1.1";
|
||||
ui_version = "2.1.2";
|
||||
libflux_version = "0.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "influxdata";
|
||||
repo = "influxdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hbinnja13xr9ziyynjsnsbrxmyrvag7xdgfwq2ya28g07lw5wgq";
|
||||
sha256 = "sha256-wf01DhB1ampZuWPkHUEOf3KJK4GjeOAPL3LG2+g4NGY=";
|
||||
};
|
||||
|
||||
ui = fetchurl {
|
||||
url = "https://github.com/influxdata/ui/releases/download/OSS-v${version}/build.tar.gz";
|
||||
# https://github.com/influxdata/ui/releases/download/OSS-v${version}/sha256.txt
|
||||
sha256 = "94965ae999a1098c26128141fbb849be3da9a723d509118eb6e0db4384ee01fc";
|
||||
url = "https://github.com/influxdata/ui/releases/download/OSS-${ui_version}/build.tar.gz";
|
||||
sha256 = "sha256-fXjShNJfKN/ZQNQHoX9/Ou4XBrXavCN+rcO+8AMc5Ug=";
|
||||
};
|
||||
|
||||
flux = rustPlatform.buildRustPackage {
|
||||
|
|
@ -39,10 +35,10 @@ let
|
|||
owner = "influxdata";
|
||||
repo = "flux";
|
||||
rev = "v${libflux_version}";
|
||||
sha256 = "1g1qilfzxqbbjbfvgkf7k7spcnhzvlmrqacpqdl05418ywkp3v29";
|
||||
sha256 = "sha256-cELeWZXGVLFoPYfBoBP8NeLBVFIb5o+lWyto42BLyXY=";
|
||||
};
|
||||
sourceRoot = "source/libflux";
|
||||
cargoSha256 = "0farcjwnwwgfvcgbs5r6vsdrsiwq2mp82sjxkqb1pzqfls4ixcxj";
|
||||
cargoSha256 = "sha256-wFgawxgqZqoPnOXJD3r5t2n7Y2bTAkBbBxeBtFEF7N4=";
|
||||
nativeBuildInputs = [ llvmPackages.libclang ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
|
@ -63,6 +59,7 @@ let
|
|||
install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
|
||||
'';
|
||||
};
|
||||
|
||||
in buildGoModule {
|
||||
pname = "influxdb";
|
||||
version = version;
|
||||
|
|
@ -70,34 +67,42 @@ in buildGoModule {
|
|||
|
||||
nativeBuildInputs = [ go-bindata pkg-config ];
|
||||
|
||||
vendorSha256 = "1kar88vlm6px7smlnajpyf8qx6d481xk979qafpfb1xy8931781m";
|
||||
subPackages = [ "cmd/influxd" "cmd/influx" ];
|
||||
vendorSha256 = "sha256-GVLAzVJzSsC10ZWDZPP8upydwZG21E+zQ6sMKm1lCY0=";
|
||||
subPackages = [ "cmd/influxd" "cmd/telemetryd" ];
|
||||
|
||||
PKG_CONFIG_PATH = "${flux}/pkgconfig";
|
||||
# We have to run a bunch of go:generate commands to embed the UI
|
||||
# assets into the source code. Ideally we'd run `make generate`, but
|
||||
# that ends up running a ton of non-hermetic stuff. Instead, we find
|
||||
# the relevant go:generate directives, and run them by hand without
|
||||
# breaking hermeticity.
|
||||
# Check that libflux and the UI are at the right version, and embed
|
||||
# the UI assets into the Go source tree.
|
||||
preBuild = ''
|
||||
tar -xzf ${ui} -C static/data
|
||||
(
|
||||
flux_ver=$(grep github.com/influxdata/flux go.mod | awk '{print $2}')
|
||||
if [ "$flux_ver" != "v${libflux_version}" ]; then
|
||||
echo "go.mod wants libflux $flux_ver, but nix derivation provides ${libflux_version}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep -RI -e 'go:generate.*go-bindata' | cut -f1 -d: | while read -r filename; do
|
||||
sed -i -e 's/go:generate.*go-bindata/go:generate go-bindata/' $filename
|
||||
pushd $(dirname $filename)
|
||||
go generate
|
||||
popd
|
||||
done
|
||||
ui_ver=$(grep influxdata/ui/releases scripts/fetch-ui-assets.sh | ${perl}/bin/perl -pe 's#.*/OSS-([^/]+)/.*#$1#')
|
||||
if [ "$ui_ver" != "${ui_version}" ]; then
|
||||
echo "scripts/fetch-ui-assets.sh wants UI $ui_ver, but nix derivation provides ${ui_version}"
|
||||
exit 1
|
||||
fi
|
||||
)
|
||||
|
||||
mkdir -p static/data
|
||||
tar -xzf ${ui} -C static/data
|
||||
pushd static
|
||||
go generate
|
||||
popd
|
||||
'';
|
||||
|
||||
tags = [ "assets" ];
|
||||
|
||||
ldflags = [ "-X main.commit=${shorthash}" "-X main.version=${version}" ];
|
||||
ldflags = [ "-X main.commit=v${version}" "-X main.version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An open-source distributed time series database";
|
||||
license = licenses.mit;
|
||||
homepage = "https://influxdata.com/";
|
||||
maintainers = with maintainers; [ danderson ];
|
||||
maintainers = with maintainers; [ abbradar danderson ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,201 +0,0 @@
|
|||
{
|
||||
"name": "influxdb-ui",
|
||||
"version": "2.0.5",
|
||||
"private": false,
|
||||
"license": "MIT",
|
||||
"description": "",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "github:influxdata/ui"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.5.0",
|
||||
"yarn": ">=1.16.0"
|
||||
},
|
||||
"alias": {
|
||||
"src": "./src"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "yarn install && yarn generate && cross-env TS_NODE_PROJECT=\"webpack.tsconfig.json\" && yarn run build:vendor && yarn run start:dev",
|
||||
"start:cloud": "yarn install && yarn generate && cross-env TS_NODE_PROJECT=\"webpack.tsconfig.json\" && yarn run build:vendor && yarn run start:dev-cloud",
|
||||
"start:dev": "webpack-dev-server --config ./webpack.dev.ts --progress false",
|
||||
"start:dev-cloud": "cross-env CLOUD_LOGOUT_URL=http://localhost:8080/api/v2/signout CLOUD_URL=http://localhost:4000 webpack-dev-server --config ./webpack.dev.ts",
|
||||
"start:docker": "yarn generate && yarn build:vendor && yarn run start:dev",
|
||||
"build": "yarn install --silent && yarn build:ci",
|
||||
"build:ci": "yarn generate && yarn build:vendor && webpack --config webpack.prod.ts --bail",
|
||||
"build:vendor": "webpack --config webpack.vendor.ts",
|
||||
"clean": "rm -rf ./build && rm -rf ./.cache && rm -rf node_modules && rm -rf cypress/screenshots && rm -rf cypress/videos && rm -f junit-results/* ",
|
||||
"test": "jest --maxWorkers=2",
|
||||
"test:watch": "jest --watch --verbose false",
|
||||
"test:update": "jest --updateSnapshot",
|
||||
"test:debug": "node --inspect-brk $(npm bin)/jest --runInBand --watch --verbose false",
|
||||
"test:e2e": "CYPRESS_baseUrl=http://localhost:8086 cypress run --browser chrome --reporter junit --reporter-options 'mochaFile=junit-results/test-output-[hash].xml'",
|
||||
"test:e2e:report": "junit-viewer --results=junit-results --save-file=cypress/site/junit-report.html",
|
||||
"test:e2e:clean": "rm junit-results/*.xml",
|
||||
"test:e2e:all": "yarn test:e2e:clean && yarn test:e2e; yarn test:e2e:report;",
|
||||
"test:circleci": "yarn run test:ci --maxWorkers=2",
|
||||
"test:ci": "JEST_JUNIT_OUTPUT_DIR=\"./coverage\" jest --ci --coverage",
|
||||
"lint": "yarn tsc && yarn prettier && yarn eslint",
|
||||
"eslint": "eslint '{src,cypress}/**/*.{ts,tsx}'",
|
||||
"eslint:circleci": "eslint",
|
||||
"eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'",
|
||||
"prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'",
|
||||
"prettier:circleci": "prettier --config .prettierrc.json --check",
|
||||
"prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'",
|
||||
"tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck",
|
||||
"tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck",
|
||||
"cy": "CYPRESS_baseUrl=http://localhost:8086 cypress open",
|
||||
"cy:dev": "CYPRESS_baseUrl=http://localhost:8080 cypress open",
|
||||
"generate": "oats ../http/swagger.yml > ./src/client/generatedRoutes.ts"
|
||||
},
|
||||
"author": "",
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.5.5",
|
||||
"@babel/preset-env": "^7.5.5",
|
||||
"@influxdata/oats": "0.5.0",
|
||||
"@testing-library/react": "^10.2.1",
|
||||
"@types/chroma-js": "^1.3.4",
|
||||
"@types/codemirror": "^0.0.56",
|
||||
"@types/d3-color": "^1.2.1",
|
||||
"@types/d3-scale": "^2.0.1",
|
||||
"@types/enzyme": "^3.1.14",
|
||||
"@types/history": "4.7.6",
|
||||
"@types/jest": "^23.3.2",
|
||||
"@types/lodash": "^4.14.116",
|
||||
"@types/memoize-one": "^4.0.2",
|
||||
"@types/node": "^12.6.8",
|
||||
"@types/papaparse": "^4.5.9",
|
||||
"@types/prop-types": "^15.5.2",
|
||||
"@types/qs": "^6.5.1",
|
||||
"@types/react": "^16.8.3",
|
||||
"@types/react-datepicker": "^2.8.1",
|
||||
"@types/react-dom": "^16.8.1",
|
||||
"@types/react-grid-layout": "^0.16.5",
|
||||
"@types/react-redux": "^7.1.9",
|
||||
"@types/react-router-dom": "^5.1.5",
|
||||
"@types/react-virtualized": "^9.18.3",
|
||||
"@types/text-encoding": "^0.0.32",
|
||||
"@types/uuid": "^3.4.3",
|
||||
"@types/webpack": "^4.4.35",
|
||||
"@types/webpack-env": "^1.15.2",
|
||||
"@typescript-eslint/eslint-plugin": "^2.6.0",
|
||||
"@typescript-eslint/parser": "^2.6.0",
|
||||
"acorn": "^6.0.6",
|
||||
"ajv": "^6.7.0",
|
||||
"autoprefixer": "^6.3.1",
|
||||
"babel-loader": "^8.0.6",
|
||||
"clean-webpack-plugin": "^3.0.0",
|
||||
"cross-env": "^5.2.0",
|
||||
"css-loader": "^3.1.0",
|
||||
"cypress": "4.12.1",
|
||||
"cypress-file-upload": "^4.0.7",
|
||||
"cypress-pipe": "^1.5.0",
|
||||
"cypress-plugin-tab": "^1.0.5",
|
||||
"enzyme": "^3.6.0",
|
||||
"enzyme-adapter-react-16": "^1.6.0",
|
||||
"enzyme-to-json": "^3.3.4",
|
||||
"eslint": "^6.6.0",
|
||||
"eslint-config-prettier": "^6.5.0",
|
||||
"eslint-plugin-jest": "^23.0.2",
|
||||
"eslint-plugin-react": "^7.16.0",
|
||||
"eslint-plugin-react-hooks": "^4.0.5",
|
||||
"express": "^4.14.0",
|
||||
"file-loader": "^4.1.0",
|
||||
"fork-ts-checker-webpack-plugin": "^1.4.3",
|
||||
"html-webpack-plugin": "^3.2.0",
|
||||
"http-proxy-middleware": "^0.18.0",
|
||||
"identity-obj-proxy": "^3.0.0",
|
||||
"jest": "^24.8.0",
|
||||
"jest-fetch-mock": "^3.0.3",
|
||||
"jest-junit": "^10.0.0",
|
||||
"jsdom": "^9.0.0",
|
||||
"junit-viewer": "^4.11.1",
|
||||
"mini-css-extract-plugin": "^0.8.0",
|
||||
"mocha": "^5.2.0",
|
||||
"mocha-junit-reporter": "^1.18.0",
|
||||
"mutation-observer": "^1.0.3",
|
||||
"optimize-css-assets-webpack-plugin": "^5.0.3",
|
||||
"prettier": "^1.19.1",
|
||||
"raw-loader": "^4.0.1",
|
||||
"sass": "^1.22.7",
|
||||
"sass-loader": "^7.1.0",
|
||||
"source-map-loader": "^0.2.4",
|
||||
"style-loader": "^0.23.1",
|
||||
"terser-webpack-plugin": "2.2.1",
|
||||
"ts-jest": "^24.0.0",
|
||||
"ts-loader": "^5.3.3",
|
||||
"ts-node": "^8.3.0",
|
||||
"tslib": "^1.9.0",
|
||||
"typescript": "3.8.3",
|
||||
"webpack": "^4.41.4",
|
||||
"webpack-cli": "^3.3.10",
|
||||
"webpack-dev-server": "^3.7.2",
|
||||
"webpack-merge": "^4.2.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@influxdata/clockface": "2.3.4",
|
||||
"@influxdata/flux": "^0.5.1",
|
||||
"@influxdata/flux-lsp-browser": "^0.5.41",
|
||||
"@influxdata/giraffe": "0.29.0",
|
||||
"@influxdata/influx": "0.5.5",
|
||||
"@influxdata/influxdb-templates": "0.9.0",
|
||||
"@influxdata/react-custom-scrollbars": "4.3.8",
|
||||
"abortcontroller-polyfill": "^1.3.0",
|
||||
"auth0-js": "^9.12.2",
|
||||
"axios": "^0.19.0",
|
||||
"babel-polyfill": "^6.26.0",
|
||||
"bignumber.js": "^4.0.2",
|
||||
"calculate-size": "^1.1.1",
|
||||
"chroma-js": "^1.3.6",
|
||||
"classnames": "^2.2.3",
|
||||
"codemirror": "^5.36.0",
|
||||
"connected-react-router": "^6.8.0",
|
||||
"d3-format": "^1.3.2",
|
||||
"d3-scale": "^2.1.0",
|
||||
"fast.js": "^0.1.1",
|
||||
"history": "^4.7.2",
|
||||
"honeybadger-js": "^1.0.2",
|
||||
"immer": "^1.9.3",
|
||||
"immutable": "^3.8.1",
|
||||
"intersection-observer": "^0.7.0",
|
||||
"jsonlint-mod": "^1.7.5",
|
||||
"lodash": "^4.3.0",
|
||||
"memoize-one": "^4.0.2",
|
||||
"moment": "^2.13.0",
|
||||
"monaco-editor": "^0.19.2",
|
||||
"monaco-editor-textmate": "^2.2.1",
|
||||
"monaco-editor-webpack-plugin": "^1.8.2",
|
||||
"monaco-languageclient": "^0.11.0",
|
||||
"monaco-textmate": "^3.0.1",
|
||||
"normalizr": "^3.4.1",
|
||||
"onigasm": "^2.2.4",
|
||||
"papaparse": "^5.2.0",
|
||||
"prop-types": "^15.6.1",
|
||||
"qs": "^6.5.2",
|
||||
"react": "^16.11.0",
|
||||
"react-codemirror2": "^4.2.1",
|
||||
"react-copy-to-clipboard": "^5.0.1",
|
||||
"react-datepicker": "^2.1.0",
|
||||
"react-dimensions": "^1.2.0",
|
||||
"react-dnd": "^9.3.2",
|
||||
"react-dnd-html5-backend": "^9.3.2",
|
||||
"react-dom": "^16.8.2",
|
||||
"react-grid-layout": "^0.16.6",
|
||||
"react-loadable": "^5.5.0",
|
||||
"react-markdown": "^4.0.3",
|
||||
"react-monaco-editor": "^0.33.0",
|
||||
"react-redux": "^7.2.0",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scrollbars-custom": "^4.0.0-alpha.8",
|
||||
"react-virtualized": "^9.18.5",
|
||||
"redux": "^4.0.0",
|
||||
"redux-auth-wrapper": "^1.0.0",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"reselect": "^4.0.0",
|
||||
"rome": "^2.1.22",
|
||||
"seamless-immutable": "^7.1.3",
|
||||
"use-persisted-state": "^0.3.0",
|
||||
"uuid": "^3.2.1",
|
||||
"webpack-bundle-analyzer": "^3.6.0"
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,17 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../ -i bash -p wget yarn2nix
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then
|
||||
echo "Regenerates the Yarn dependency lock files for the influxdb UI."
|
||||
echo "Usage: $0 <git release tag>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
INFLUXDB_SRC="https://raw.githubusercontent.com/influxdata/influxdb/$1"
|
||||
|
||||
wget "$INFLUXDB_SRC/ui/package.json" -O influx-ui-package.json
|
||||
wget "$INFLUXDB_SRC/ui/yarn.lock" -O influx-ui-yarndeps.lock
|
||||
yarn2nix --lockfile=influx-ui-yarndeps.lock > influx-ui-yarndeps.nix
|
||||
rm influx-ui-yarndeps.lock
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediawiki";
|
||||
version = "1.37.0";
|
||||
version = "1.37.1";
|
||||
|
||||
src = with lib; fetchurl {
|
||||
url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-3RrSJ8W7vIM9hRwBcn7ocGo55Kox4PSc5F5QJX75uX8=";
|
||||
sha256 = "sha256-U0NuktwwrbFLZ5fYE50gaWpUYVJfOKN1yD5DXPBC4uc=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -21366,7 +21366,16 @@ with pkgs;
|
|||
};
|
||||
|
||||
influxdb = callPackage ../servers/nosql/influxdb { };
|
||||
influxdb2 = callPackage ../servers/nosql/influxdb2 { };
|
||||
influxdb2-server = callPackage ../servers/nosql/influxdb2 {
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix {
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
# For backwards compatibility with older versions of influxdb2,
|
||||
# which bundled the server and CLI into the same derivation. Will be
|
||||
# removed in a few releases.
|
||||
influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { };
|
||||
|
||||
mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
|
||||
inherit (darwin) cctools developer_cmds;
|
||||
|
|
|
|||
Loading…
Reference in a new issue