git.iko.soy/typeable/nixpkgs
on master help sign in
influxdb2: 2.0.2 -> 2.0.6

* update libflux to version 0.115.0 * chronograf-ui has been renamed to influxdb-ui

commit329ec3d17cd8392a3e01e5ac35dbbe114a719e5c authorClaudio Bley <cbley@exa-online.de> dateFri 14 May 2021, 10:37 (6 years ago) parent04aa238
3 files changed+18−17
pkgs/servers/nosql/influxdb2/default.nix+8−8 pkgs/servers/nosql/influxdb2/influx-ui-package.json+6−5 pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix+4−4
pkgs/servers/nosql/influxdb2/default.nix+8−8
@@ -13,15 +13,15 @@
1313# dependencies nix expression.
1414
1515let
16− version = "2.0.2";
17− shorthash = "84496e507a"; # git rev-parse HEAD with 2.0.2 checked out
18− libflux_version = "0.95.0";
16+ version = "2.0.6";
17+ shorthash = "4db98b4c9a"; # git rev-parse HEAD with 2.0.6 checked out
18+ libflux_version = "0.115.0";
1919
2020 src = fetchFromGitHub {
2121 owner = "influxdata";
2222 repo = "influxdb";
2323 rev = "v${version}";
24− sha256 = "05s09crqgbyfdck33zwax5l47jpc4wh04yd8zsm658iksdgzpmnn";
24+ sha256 = "1x74p87csx4m4cgijk57xs75nikv3bnh7skgnzk30ab1ar13iirw";
2525 };
2626
2727 ui = mkYarnPackage {
@@ -31,7 +31,7 @@ let
3131 yarnNix = ./influx-ui-yarndeps.nix;
3232 configurePhase = ''
3333 cp -r $node_modules ui/node_modules
34− rsync -r $node_modules/../deps/chronograf-ui/node_modules/ ui/node_modules
34+ rsync -r $node_modules/../deps/influxdb-ui/node_modules/ ui/node_modules
3535 '';
3636 INFLUXDB_SHA = shorthash;
3737 buildPhase = ''
@@ -52,10 +52,10 @@ let
5252 owner = "influxdata";
5353 repo = "flux";
5454 rev = "v${libflux_version}";
55− sha256 = "07jz2nw3zswg9f4p5sb5r4hpg3n4qibjcgs9sk9csns70h5rp9j3";
55+ sha256 = "0zplwsk9xidv8l9sqbxqivy6q20ryd31fhrzspn1mjn4i45kkwz1";
5656 };
5757 sourceRoot = "source/libflux";
58− cargoSha256 = "0y5xjkqpaxp9qq1qj39zw3mnvkbbb9g4fa5cli77nhfwz288xx6h";
58+ cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq";
5959 nativeBuildInputs = [ llvmPackages.libclang ];
6060 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
6161 pkgcfg = ''
@@ -80,7 +80,7 @@ in buildGoModule {
8080
8181 nativeBuildInputs = [ go-bindata pkg-config ];
8282
83− vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a";
83+ vendorSha256 = "03pabm0h9q0v5dfdq9by2l2n32bz9imwalz0aw897vsrfhci0ldf";
8484 subPackages = [ "cmd/influxd" "cmd/influx" ];
8585
8686 PKG_CONFIG_PATH = "${flux}/pkgconfig";
pkgs/servers/nosql/influxdb2/influx-ui-package.json+6−5
@@ -1,12 +1,12 @@
11{
2− "name": "chronograf-ui",
3− "version": "2.0.2",
2+ "name": "influxdb-ui",
3+ "version": "2.0.5",
44 "private": false,
5− "license": "AGPL-3.0",
5+ "license": "MIT",
66 "description": "",
77 "repository": {
88 "type": "git",
9− "url": "github:influxdata/chronograf"
9+ "url": "github:influxdata/ui"
1010 },
1111 "engines": {
1212 "node": ">=10.5.0",
@@ -40,6 +40,7 @@
4040 "eslint:circleci": "eslint",
4141 "eslint:fix": "eslint --fix '{src,cypress}/**/*.{ts,tsx}'",
4242 "prettier": "prettier --config .prettierrc.json --check '{src,cypress}/**/*.{ts,tsx}'",
43+ "prettier:circleci": "prettier --config .prettierrc.json --check",
4344 "prettier:fix": "prettier --config .prettierrc.json --write '{src,cypress}/**/*.{ts,tsx}'",
4445 "tsc": "tsc -p ./tsconfig.json --noEmit --pretty --skipLibCheck",
4546 "tsc:cypress": "tsc -p ./cypress/tsconfig.json --noEmit --pretty --skipLibCheck",
@@ -134,7 +135,7 @@
134135 "dependencies": {
135136 "@influxdata/clockface": "2.3.4",
136137 "@influxdata/flux": "^0.5.1",
137− "@influxdata/flux-lsp-browser": "^0.5.23",
138+ "@influxdata/flux-lsp-browser": "^0.5.41",
138139 "@influxdata/giraffe": "0.29.0",
139140 "@influxdata/influx": "0.5.5",
140141 "@influxdata/influxdb-templates": "0.9.0",
pkgs/servers/nosql/influxdb2/influx-ui-yarndeps.nix+4−4
@@ -666,11 +666,11 @@
666666 };
667667 }
668668 {
669− name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";
669+ name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz";
670670 path = fetchurl {
671− name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.23.tgz";
672− url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.23.tgz";
673− sha1 = "b3d1579e26ff21a11771003cbcaebe5fef82d73c";
671+ name = "_influxdata_flux_lsp_browser___flux_lsp_browser_0.5.41.tgz";
672+ url = "https://registry.yarnpkg.com/@influxdata/flux-lsp-browser/-/flux-lsp-browser-0.5.41.tgz";
673+ sha1 = "abf6c5ad253317f34a9217ecfd250d78fe625a83";
674674 };
675675 }
676676 {