mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 19:23:50 +00:00
Merge master into staging-next
This commit is contained in:
commit
1bdff1c212
@ -951,10 +951,10 @@
|
||||
elpaBuild {
|
||||
pname = "devdocs";
|
||||
ename = "devdocs";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.3.tar";
|
||||
sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7";
|
||||
url = "https://elpa.gnu.org/packages/devdocs-0.4.tar";
|
||||
sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1176,10 +1176,10 @@
|
||||
elpaBuild {
|
||||
pname = "ebdb";
|
||||
ename = "ebdb";
|
||||
version = "0.8.10";
|
||||
version = "0.8.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar";
|
||||
sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad";
|
||||
url = "https://elpa.gnu.org/packages/ebdb-0.8.12.tar";
|
||||
sha256 = "1k53crdmaw6lzvprsmpdfvg96ck54bzs4z1d4q9x890anglxq5m6";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
@ -3220,10 +3220,10 @@
|
||||
elpaBuild {
|
||||
pname = "phps-mode";
|
||||
ename = "phps-mode";
|
||||
version = "0.4.16";
|
||||
version = "0.4.17";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar";
|
||||
sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j";
|
||||
url = "https://elpa.gnu.org/packages/phps-mode-0.4.17.tar";
|
||||
sha256 = "1j3whjxhjawl1i5449yf56ljbazx90272gr8zfr36s8h8rijfjn9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -4309,10 +4309,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.5.2.1";
|
||||
version = "2.5.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar";
|
||||
sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar";
|
||||
sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
@ -49,10 +49,10 @@
|
||||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar";
|
||||
sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar";
|
||||
sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2210,10 +2210,10 @@
|
||||
elpaBuild {
|
||||
pname = "web-mode";
|
||||
ename = "web-mode";
|
||||
version = "17.0.4";
|
||||
version = "17.1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar";
|
||||
sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1";
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.1.4.tar";
|
||||
sha256 = "0863p8ikc8yqw0dahswi5s9q7v7rg1hasdxz5jwkd796fh1ih78n";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -251,12 +251,12 @@ in
|
||||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2021.3.2"; /* updated by script */
|
||||
version = "2021.3.3"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "029xim3a6ijqdbzwxan189ydcy5b0ry2qqc70fipp8ic5z5iai3b"; /* updated by script */
|
||||
sha256 = "03gil00srq3jljc13iyb7v1yc6l6yhdhqm9d1ld2j2pympl6p61m"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
@ -316,13 +316,13 @@ in
|
||||
|
||||
mps = buildMps rec {
|
||||
name = "mps-${version}";
|
||||
version = "2021.2.3"; /* updated by script */
|
||||
versionMajorMinor = "2021.2"; /* updated by script */
|
||||
version = "2021.3"; /* updated by script */
|
||||
versionMajorMinor = "2021.3"; /* updated by script */
|
||||
description = "Create your own domain-specific language";
|
||||
license = lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz";
|
||||
sha256 = "1j33b48ki1xw7xb1hr8k2jz7d78h0qcr1b5gql7i40d7szq0iy10"; /* updated by script */
|
||||
sha256 = "0zw5xqdlhjfg0smfjl8xy7drf9spiwqbmqq8z22x4zb61lpvdbp9"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-mps";
|
||||
update-channel = "MPS RELEASE";
|
||||
@ -330,12 +330,12 @@ in
|
||||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2021.3.1"; /* updated by script */
|
||||
version = "2021.3.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "011i3jgfnb2h64ikbm3wi1vfhzm50mwwy9nksl71nzllj3kz111x"; /* updated by script */
|
||||
sha256 = "1qi0zq3gzcfnikky37g2dqgmzm7r1883k6asris8nph389qk86vn"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PhpStorm RELEASE";
|
||||
@ -395,12 +395,12 @@ in
|
||||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2021.3.1"; /* updated by script */
|
||||
version = "2021.3.2"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1f918cj76b79x0d2hhv78mvmki5d1dps8nsx7i50wn2qzdml4kc6"; /* updated by script */
|
||||
sha256 = "0q2hn48499hv7licpl84ly0bhiizya8a69dl2vjvgscj3cdkr98q"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WebStorm RELEASE";
|
||||
|
@ -40,10 +40,10 @@
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.157.0",
|
||||
"sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1",
|
||||
"vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",
|
||||
"version": "1.157.0"
|
||||
"rev": "v1.158.0",
|
||||
"sha256": "0q5c9sdpjycrh61khc840l14h5r16kj9vf0nlsqffi9wi8k1i2zr",
|
||||
"vendorSha256": "05vkn52s0x6kcyxxs0p7w6z1nclmvvla7rjv1ippzw7fgn2s19m0",
|
||||
"version": "1.158.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
@ -112,10 +112,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v2.97.0",
|
||||
"sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg",
|
||||
"rev": "v2.98.0",
|
||||
"sha256": "0cfdw70q1kh6f50gsc94mh1xi7s4z47wfsmskp1ahx7av7wpz1p6",
|
||||
"vendorSha256": null,
|
||||
"version": "2.97.0"
|
||||
"version": "2.98.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -157,10 +157,10 @@
|
||||
"owner": "brightbox",
|
||||
"provider-source-address": "registry.terraform.io/brightbox/brightbox",
|
||||
"repo": "terraform-provider-brightbox",
|
||||
"rev": "v2.1.1",
|
||||
"sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm",
|
||||
"vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k",
|
||||
"version": "2.1.1"
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n",
|
||||
"vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"checkly": {
|
||||
"owner": "checkly",
|
||||
@ -176,10 +176,10 @@
|
||||
"owner": "CheckPointSW",
|
||||
"provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
|
||||
"repo": "terraform-provider-checkpoint",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf",
|
||||
"vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7",
|
||||
"version": "1.6.0"
|
||||
"rev": "v1.7.0",
|
||||
"sha256": "1msd3qjrrhl0v3m7n9ybkwxki5wpchzjswd2dcifbif4k8pcs470",
|
||||
"vendorSha256": "0yaxgyzwja5dl4p7w8q77ash75xwsf05kq88nvmdf94lvspfnwlq",
|
||||
"version": "1.7.0"
|
||||
},
|
||||
"ciscoasa": {
|
||||
"owner": "CiscoDevNet",
|
||||
@ -230,10 +230,10 @@
|
||||
"owner": "Constellix",
|
||||
"provider-source-address": "registry.terraform.io/Constellix/constellix",
|
||||
"repo": "terraform-provider-constellix",
|
||||
"rev": "v0.3.11",
|
||||
"sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c",
|
||||
"rev": "v0.4.0",
|
||||
"sha256": "1z23nri0xk6y1xvrz89hda4ssnbgx6dfzq0fc4nywl6naf2nybyw",
|
||||
"vendorSha256": null,
|
||||
"version": "0.3.11"
|
||||
"version": "0.4.0"
|
||||
},
|
||||
"consul": {
|
||||
"owner": "hashicorp",
|
||||
@ -248,10 +248,10 @@
|
||||
"owner": "poseidon",
|
||||
"provider-source-address": "registry.terraform.io/poseidon/ct",
|
||||
"repo": "terraform-provider-ct",
|
||||
"rev": "v0.9.2",
|
||||
"sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc",
|
||||
"rev": "v0.10.0",
|
||||
"sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z",
|
||||
"vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk",
|
||||
"version": "0.9.2"
|
||||
"version": "0.10.0"
|
||||
},
|
||||
"datadog": {
|
||||
"owner": "DataDog",
|
||||
@ -356,10 +356,10 @@
|
||||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v1.0.0",
|
||||
"sha256": "0rpggjsnxwz3rd93nxqr0w2addscxw498mf1mjp3mvkj1f3r9afi",
|
||||
"rev": "v1.1.0",
|
||||
"sha256": "02ymg29fmx23hgsifb8dr28yxl3h2d93cn4k6x8cx763nyfd5aqf",
|
||||
"vendorSha256": null,
|
||||
"version": "1.0.0"
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "FlexibleEngineCloud",
|
||||
@ -401,10 +401,10 @@
|
||||
"owner": "gitlabhq",
|
||||
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v3.9.1",
|
||||
"sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca",
|
||||
"vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87",
|
||||
"version": "3.9.1"
|
||||
"rev": "v3.10.0",
|
||||
"sha256": "1grmsjnr3af95qiwygmxnyij90bn89kd781s556yiq40qa776nql",
|
||||
"vendorSha256": "04dqjcxx2z43p8c0z8hwr3xw7g4sggxgclqpk83rapprvbmh33dj",
|
||||
"version": "3.10.0"
|
||||
},
|
||||
"google": {
|
||||
"owner": "hashicorp",
|
||||
@ -430,10 +430,10 @@
|
||||
"owner": "grafana",
|
||||
"provider-source-address": "registry.terraform.io/grafana/grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.19.0",
|
||||
"sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn",
|
||||
"vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a",
|
||||
"version": "1.19.0"
|
||||
"rev": "v1.20.1",
|
||||
"sha256": "1hl1dplb59hssdlq0j83mix9abfgzkbpqpsfirwd8pv4z47s055j",
|
||||
"vendorSha256": "157y4fwfd2l822ass7v2sa3vn3kxrfhiapg5rwsm8q3lg1g42f2m",
|
||||
"version": "1.20.1"
|
||||
},
|
||||
"gridscale": {
|
||||
"owner": "gridscale",
|
||||
@ -448,10 +448,10 @@
|
||||
"owner": "hetznercloud",
|
||||
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.32.2",
|
||||
"sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f",
|
||||
"rev": "v1.33.1",
|
||||
"sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg",
|
||||
"vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv",
|
||||
"version": "1.32.2"
|
||||
"version": "1.33.1"
|
||||
},
|
||||
"helm": {
|
||||
"owner": "hashicorp",
|
||||
@ -466,10 +466,10 @@
|
||||
"owner": "heroku",
|
||||
"provider-source-address": "registry.terraform.io/heroku/heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.0.0",
|
||||
"sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy",
|
||||
"rev": "v5.0.1",
|
||||
"sha256": "13nsqvcbb9ydzsgri090ddw2y5gcxa2a07i1hfzm78mf5hflp4rb",
|
||||
"vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy",
|
||||
"version": "5.0.0"
|
||||
"version": "5.0.1"
|
||||
},
|
||||
"http": {
|
||||
"owner": "hashicorp",
|
||||
@ -674,28 +674,28 @@
|
||||
"owner": "equinix",
|
||||
"provider-source-address": "registry.terraform.io/equinix/metal",
|
||||
"repo": "terraform-provider-metal",
|
||||
"rev": "v3.2.2",
|
||||
"sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi",
|
||||
"vendorSha256": null,
|
||||
"version": "3.2.2"
|
||||
"rev": "v3.3.0-alpha.1",
|
||||
"sha256": "0lihzid312q8qh1bl9x1wqslshq7pb0q4m8dgbww1cszzg6xb5aq",
|
||||
"vendorSha256": "0aniiiysh6iq20fcqvdgs6a4l3prbxzpqpp2ixpfaxhg4z5l8zrf",
|
||||
"version": "3.3.0-alpha.1"
|
||||
},
|
||||
"minio": {
|
||||
"owner": "aminueza",
|
||||
"provider-source-address": "registry.terraform.io/aminueza/minio",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.3.0",
|
||||
"sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000",
|
||||
"vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b",
|
||||
"version": "1.3.0"
|
||||
"rev": "v1.4.0",
|
||||
"sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z",
|
||||
"vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac",
|
||||
"version": "1.4.0"
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"owner": "mongodb",
|
||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.2.0",
|
||||
"sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi",
|
||||
"vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks",
|
||||
"version": "1.2.0"
|
||||
"rev": "v1.3.0",
|
||||
"sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn",
|
||||
"vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz",
|
||||
"version": "1.3.0"
|
||||
},
|
||||
"ncloud": {
|
||||
"owner": "NaverCloudPlatform",
|
||||
@ -774,10 +774,10 @@
|
||||
"owner": "terraform-providers",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.64.0",
|
||||
"sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd",
|
||||
"rev": "v4.65.0",
|
||||
"sha256": "19np5x4swc5k8zjg4rjhx85x7xr4jzyvbcpsgfqaqgdg99hjcmjq",
|
||||
"vendorSha256": null,
|
||||
"version": "4.64.0"
|
||||
"version": "4.65.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
@ -829,10 +829,10 @@
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.27.5",
|
||||
"sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa",
|
||||
"vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg",
|
||||
"version": "1.27.5"
|
||||
"rev": "v1.27.6",
|
||||
"sha256": "1vq2h4ldvskw874fdnjqh1np5z09dh3q3lrqjmfand8ksrzacjjm",
|
||||
"vendorSha256": "0bkya9ckh82bacaksqbb6010fwclz9wh1b5k1s9z9d0d6bgvf60m",
|
||||
"version": "1.27.6"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
@ -1045,10 +1045,10 @@
|
||||
"owner": "SumoLogic",
|
||||
"provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
|
||||
"repo": "terraform-provider-sumologic",
|
||||
"rev": "v2.12.0",
|
||||
"sha256": "04rrs6x9grkqqqrz3l3nqzp3vy03jw24l1grx2nbw8srpgw1pcwl",
|
||||
"rev": "v2.13.0",
|
||||
"sha256": "1jg6jdmxi60v8gsqycnq7jy89l2zls37zvl317vhp8f93si2hr2d",
|
||||
"vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc",
|
||||
"version": "2.12.0"
|
||||
"version": "2.13.0"
|
||||
},
|
||||
"template": {
|
||||
"owner": "hashicorp",
|
||||
@ -1063,10 +1063,10 @@
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.61.8",
|
||||
"sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz",
|
||||
"rev": "v1.61.13",
|
||||
"sha256": "1g1y9x9xfhyjksn7wb60vddli9fwga5r7snvrsa7sh8fkwvpfs0s",
|
||||
"vendorSha256": null,
|
||||
"version": "1.61.8"
|
||||
"version": "1.61.13"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
@ -1136,10 +1136,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vault",
|
||||
"repo": "terraform-provider-vault",
|
||||
"rev": "v3.3.0",
|
||||
"sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk",
|
||||
"rev": "v3.3.1",
|
||||
"sha256": "1mxy44dl1wr99v6b0gvzcf9d5nfky0avmx4fq83h9vfnvq7rmrhn",
|
||||
"vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x",
|
||||
"version": "3.3.0"
|
||||
"version": "3.3.1"
|
||||
},
|
||||
"vcd": {
|
||||
"owner": "vmware",
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.9.2";
|
||||
version = "4.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
rev = version;
|
||||
sha256 = "sha256-93qMSOnCl18dRZQB8v2Cxv21vsdFzHefQ7zttQAuPKk=";
|
||||
sha256 = "sha256-paj1QFSHQw7MfOor1yYwb2vkF9b5RPj6R6dRstK24gA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py3status";
|
||||
version = "3.40";
|
||||
version = "3.41";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c";
|
||||
sha256 = "sha256-2G+5lKkLtgZ/2ghU0xVTDqIXbTNykYIKRiwZiagusoc=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyisy";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "automicus";
|
||||
repo = "PyISY";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ad3hVs0B3uBHj/LVWwAXAkUMbjHPtyaeKueRPcmIMFg=";
|
||||
hash = "sha256-zQ0IBfbWEGv5t+b3EKF+6tEpmwfAWFMndPqSNSQZ5b4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.3.8";
|
||||
version = "1.3.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U/Yf+PZdggqfd9b/fuPoLKOACooobjSaqhsXcIcOKSU=";
|
||||
hash = "sha256-3jL9qu4kKpjLoNboMRSp8w/8K2jf+7z8BZsvzYVUjPc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-hosts";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8f827da4a1bf69d4f4f881f7d7ebc8b378967b60924aa4baea2c9d1debedf5fc";
|
||||
sha256 = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0=";
|
||||
};
|
||||
|
||||
# win_inet_pton is required for windows support
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "spacy-legacy";
|
||||
version = "3.0.8";
|
||||
version = "3.0.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f";
|
||||
sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM=";
|
||||
};
|
||||
|
||||
# checkInputs = [ pytestCheckHook spacy ];
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4i1pSpCydU/SzoMSkW5NN5rOVd9J09/cBOLE6WQCUE0=";
|
||||
sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "willow";
|
||||
version = "1.4";
|
||||
version = "1.4.1";
|
||||
disabled = pythonOlder "2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Willow";
|
||||
inherit version;
|
||||
sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d";
|
||||
sha256 = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six pillow ];
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
let ccache = stdenv.mkDerivation rec {
|
||||
pname = "ccache";
|
||||
version = "4.5.1";
|
||||
version = "4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs=";
|
||||
sha256 = "sha256-h1lhR8P4aNM6tQCodhpEIXwA0bUQ26B3aoiQeX2siCU=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "texlab";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o=";
|
||||
sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q=";
|
||||
cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA=";
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
|
||||
# Therefore we put it into `/run/netdata`, which is owned
|
||||
# by netdata only.
|
||||
./ipc-socket-in-run.patch
|
||||
# This is only needed for 1.33.1, remove on the next release
|
||||
./fix-protobuf.patch
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||
|
23
pkgs/tools/system/netdata/fix-protobuf.patch
Normal file
23
pkgs/tools/system/netdata/fix-protobuf.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c
|
||||
index b64a78f29..ccd1c884d 100644
|
||||
--- a/daemon/buildinfo.c
|
||||
+++ b/daemon/buildinfo.c
|
||||
@@ -60,7 +60,6 @@
|
||||
// Optional libraries
|
||||
|
||||
#ifdef HAVE_PROTOBUF
|
||||
-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE)
|
||||
#define FEAT_PROTOBUF 1
|
||||
#ifdef BUNDLED_PROTOBUF
|
||||
#define FEAT_PROTOBUF_BUNDLED " (bundled)"
|
||||
@@ -71,10 +70,6 @@
|
||||
#define FEAT_PROTOBUF 0
|
||||
#define FEAT_PROTOBUF_BUNDLED ""
|
||||
#endif
|
||||
-#else
|
||||
-#define FEAT_PROTOBUF 0
|
||||
-#define FEAT_PROTOBUF_BUNDLED ""
|
||||
-#endif
|
||||
|
||||
#ifdef ENABLE_JSONC
|
||||
#define FEAT_JSONC 1
|
@ -1,19 +1,19 @@
|
||||
{ stdenv, lib, makeWrapper, fetchFromGitHub
|
||||
, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }:
|
||||
{ lib
|
||||
, resholvePackage
|
||||
, fetchFromGitHub
|
||||
, bc
|
||||
, coreutils
|
||||
, file
|
||||
, gawk
|
||||
, ghostscript
|
||||
, gnused
|
||||
, imagemagick
|
||||
, zip
|
||||
, bash
|
||||
, findutils
|
||||
}:
|
||||
|
||||
let
|
||||
path = lib.makeBinPath [
|
||||
bc
|
||||
coreutils
|
||||
file
|
||||
gawk
|
||||
ghostscript
|
||||
gnused
|
||||
imagemagick
|
||||
zip
|
||||
];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
resholvePackage rec {
|
||||
pname = "pdf2odt";
|
||||
version = "20170207";
|
||||
|
||||
@ -24,8 +24,6 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patches = [ ./use_mktemp.patch ];
|
||||
|
||||
installPhase = ''
|
||||
@ -33,10 +31,24 @@ in stdenv.mkDerivation rec {
|
||||
install -Dm0644 README.md LICENSE -t $out/share/doc/pdf2odt
|
||||
|
||||
ln -rs $out/bin/pdf2odt $out/bin/pdf2ods
|
||||
|
||||
wrapProgram $out/bin/pdf2odt \
|
||||
--prefix PATH : ${path}
|
||||
'';
|
||||
solutions = {
|
||||
default = {
|
||||
scripts = [ "bin/pdf2odt" ];
|
||||
interpreter = "${bash}/bin/bash";
|
||||
inputs = [
|
||||
coreutils
|
||||
bc
|
||||
file
|
||||
imagemagick
|
||||
gawk
|
||||
gnused
|
||||
ghostscript
|
||||
zip
|
||||
findutils
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "PDF to ODT format converter";
|
||||
|
Loading…
Reference in New Issue
Block a user