Merge master into staging-next
This commit is contained in:
commit
41c0da9107
@ -458,7 +458,7 @@ you of the correct hash.
|
||||
`maturinBuildFlags`.
|
||||
* `cargoCheckHook`: run tests using Cargo. The build type for checks
|
||||
can be set using `cargoCheckType`. Features can be specified with
|
||||
`cargoCheckNoDefaultFeaatures` and `cargoCheckFeatures`. Additional
|
||||
`cargoCheckNoDefaultFeatures` and `cargoCheckFeatures`. Additional
|
||||
flags can be passed to the tests using `checkFlags` and
|
||||
`checkFlagsArray`. By default, tests are run in parallel. This can
|
||||
be disabled by setting `dontUseCargoParallelTests`.
|
||||
|
@ -11570,6 +11570,12 @@
|
||||
fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C";
|
||||
}];
|
||||
};
|
||||
samlukeyes123 = {
|
||||
email = "samlukeyes123@gmail.com";
|
||||
github = "SamLukeYes";
|
||||
githubId = 12882091;
|
||||
name = "Sam L. Yes";
|
||||
};
|
||||
samrose = {
|
||||
email = "samuel.rose@gmail.com";
|
||||
github = "samrose";
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "praat";
|
||||
version = "6.2.17";
|
||||
version = "6.2.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-368Dq4UU1+NTlskQQ5t/nEmyjLvSfdW3rhqzwKoKjzE=";
|
||||
sha256 = "sha256-RE4QDK5x9xG1RsAWB6dgviu3V1ay/+r0vyHCPCu/qCU=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
@ -32,10 +32,10 @@
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v3.5.1",
|
||||
"sha256": "sha256-EJPf8jDANrjg+XPhFn6L7GPUya2WbrSUX8/hQldQmnQ=",
|
||||
"rev": "v3.6.0",
|
||||
"sha256": "sha256-FjCcUC06iDeKaHSlQPNuKdqEhA8ft4MQ+sY3YPlNY6E=",
|
||||
"vendorSha256": "sha256-X9AJM4OsJ2/zl2Mm6gaz5wA6hk9AfOlUFYYN9Ojirrc=",
|
||||
"version": "3.5.1"
|
||||
"version": "3.6.0"
|
||||
},
|
||||
"akamai": {
|
||||
"owner": "akamai",
|
||||
@ -51,10 +51,10 @@
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.182.0",
|
||||
"sha256": "sha256-syxmCEvNRUsVl4B9OuClKztlr9hqKIHTpeppcNPUJog=",
|
||||
"rev": "v1.183.0",
|
||||
"sha256": "sha256-+bjDSRsQ407um35Qz/xfCtEd4jAjzjROh4T4iYsapmM=",
|
||||
"vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=",
|
||||
"version": "1.182.0"
|
||||
"version": "1.183.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
@ -78,10 +78,10 @@
|
||||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.36.0",
|
||||
"sha256": "sha256-nKF5K+62Fc6MIrF7GagzLyp15aBpMKox6ZTS5csBfAU=",
|
||||
"vendorSha256": "sha256-HNHW6ePs1qbwPiU0Xc2AwWmsSqr7mWI7xtMvL9GW7L8=",
|
||||
"version": "0.36.0"
|
||||
"rev": "v0.37.0",
|
||||
"sha256": "sha256-2C5OHkRzYjhOH/snZ3CDWILaxusvG/7GYRtjpGUJljM=",
|
||||
"vendorSha256": "sha256-yV6gO0Hv7zYs+0Lxy4mAMRkHoVDSMG+D5d2ZWH6TqW8=",
|
||||
"version": "0.37.0"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
@ -105,28 +105,28 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.28.0",
|
||||
"sha256": "sha256-35z4a2pOoL78wGgfiKBjUXa4NORQNgPNgirHLX0N4gY=",
|
||||
"vendorSha256": "sha256-XlTrAj7LRFWse80KgMRGUnGNi0ri6XwAi1cuEqKqrBg=",
|
||||
"version": "4.28.0"
|
||||
"rev": "v4.29.0",
|
||||
"sha256": "sha256-hFvDQHiSr+UTSy2ikWM1BzRy139YZ5ulrbv738WQFrs=",
|
||||
"vendorSha256": "sha256-PiOBkvIQ3X921HDPjUcfy1hcePh8mVVc3np17BnjdhI=",
|
||||
"version": "4.29.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.28.0",
|
||||
"sha256": "sha256-4GEoJJoMi1gCdhrqb5IsPb2haht4vH1hyJx7Z4rin00=",
|
||||
"rev": "v2.28.1",
|
||||
"sha256": "sha256-r7trdPrlvZ5rW75L7AEkG1baQaLMXnZ48Axi552nPIM=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.28.0"
|
||||
"version": "2.28.1"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.20.0",
|
||||
"sha256": "sha256-CaiEFJrtcro3taVXpsHoe5vvXjUaLn+7d72V+5UmNtg=",
|
||||
"rev": "v3.21.1",
|
||||
"sha256": "sha256-Rsj1DGN3v6rwjSBVRa4bvXP67ZYkJMDoz5ANyYCgf/4=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.20.0"
|
||||
"version": "3.21.1"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -142,10 +142,10 @@
|
||||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.15.0",
|
||||
"sha256": "sha256-U5EvN13fKzpeWHSEwgxiESrXCQ0KS9R2HZ7XTrj10pc=",
|
||||
"rev": "v1.15.2",
|
||||
"sha256": "sha256-RQTb1bIDpD5jvAJTOWG+aEVpMrSnJAqG6ZRQ/dOLZ4I=",
|
||||
"vendorSha256": "sha256-dgcYdfManE48sYaRRMfYMxQ4qX4uqas0yx+bn60kPWU=",
|
||||
"version": "1.15.0"
|
||||
"version": "1.15.2"
|
||||
},
|
||||
"bigip": {
|
||||
"owner": "F5Networks",
|
||||
@ -307,10 +307,10 @@
|
||||
"owner": "digitalocean",
|
||||
"provider-source-address": "registry.terraform.io/digitalocean/digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.22.1",
|
||||
"sha256": "sha256-Sc2altZo/8Y1UYpZjT8beq3VUljJAdzyXexB9Yi5WQI=",
|
||||
"rev": "v2.22.2",
|
||||
"sha256": "sha256-aIfx/dtVgNoLCFz8rXJBQTsmZ6SPA1hm6uMbeQmWkKM=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.22.1"
|
||||
"version": "2.22.2"
|
||||
},
|
||||
"dme": {
|
||||
"owner": "DNSMadeEasy",
|
||||
@ -343,10 +343,10 @@
|
||||
"owner": "kreuzwerker",
|
||||
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
|
||||
"repo": "terraform-provider-docker",
|
||||
"rev": "v2.20.2",
|
||||
"sha256": "sha256-5xQRUHga83sIIyBiWhXLWkjsBuk/1n4cZg/Y+zYz7+o=",
|
||||
"vendorSha256": "sha256-aPt1y7UEL+Y4aRm0rfHr/yJ393NP2oAqgz7+fo/msQo=",
|
||||
"version": "2.20.2"
|
||||
"rev": "v2.20.3",
|
||||
"sha256": "sha256-9zYqZ1bKOz2B4INrJqSklztNAl2ol3NGYW2IjPJfFkM=",
|
||||
"vendorSha256": "sha256-G8gnEd7hT6XAC7cLOw711KsSFKjKvdd1BX/iaYV8a+U=",
|
||||
"version": "2.20.3"
|
||||
},
|
||||
"elasticsearch": {
|
||||
"owner": "phillbaker",
|
||||
@ -370,10 +370,10 @@
|
||||
"owner": "exoscale",
|
||||
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.40.0",
|
||||
"sha256": "sha256-CQd/wYY4XRmWPV77uwTQgqZOGqWVdtAgsG8sUNB7y4A=",
|
||||
"rev": "v0.40.1",
|
||||
"sha256": "sha256-K5Rj3DoT4TAXF6MGOXgLw30qZmHyUYSMf1Cn4TTmxQk=",
|
||||
"vendorSha256": null,
|
||||
"version": "0.40.0"
|
||||
"version": "0.40.1"
|
||||
},
|
||||
"external": {
|
||||
"owner": "hashicorp",
|
||||
@ -426,10 +426,10 @@
|
||||
"owner": "integrations",
|
||||
"provider-source-address": "registry.terraform.io/integrations/github",
|
||||
"repo": "terraform-provider-github",
|
||||
"rev": "v4.30.0",
|
||||
"sha256": "sha256-yLEh0RLDStle7K4hXYgsKIEYuZ5nwrY5dR574yRjRLw=",
|
||||
"rev": "v4.31.0",
|
||||
"sha256": "sha256-BKLY+ROxB35EQ37hlYGaNDdsAEggpGuRP7Uxoo7wFRc=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.30.0"
|
||||
"version": "4.31.0"
|
||||
},
|
||||
"gitlab": {
|
||||
"owner": "gitlabhq",
|
||||
@ -445,20 +445,20 @@
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.33.0",
|
||||
"sha256": "sha256-6mWSlTIVvbz7lid2+2T//vQf45ZNAEvD30qYG2Wd9yg=",
|
||||
"vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=",
|
||||
"version": "4.33.0"
|
||||
"rev": "v4.34.0",
|
||||
"sha256": "sha256-pyp12UM42+dubwbPx7L4qIOYW0OulZ1D5OSgbdOUJQU=",
|
||||
"vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
|
||||
"version": "4.34.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.33.0",
|
||||
"sha256": "sha256-PoNacRcv+w7ydIPkuvfOhSjvdgYAahdKOI5yBoD9tu0=",
|
||||
"vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=",
|
||||
"version": "4.33.0"
|
||||
"rev": "v4.34.0",
|
||||
"sha256": "sha256-1Ia2seissoXc98pGj4uvJcMP41eme1K/Tmnmtp8owLA=",
|
||||
"vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=",
|
||||
"version": "4.34.0"
|
||||
},
|
||||
"googleworkspace": {
|
||||
"owner": "hashicorp",
|
||||
@ -473,10 +473,10 @@
|
||||
"owner": "grafana",
|
||||
"provider-source-address": "registry.terraform.io/grafana/grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.27.0",
|
||||
"sha256": "sha256-ED97aYj71Zw89QCn19u4XP5pvfElKrQhFl3ESCYcafg=",
|
||||
"vendorSha256": "sha256-UFtjicPL8Dg5dxi5vjCmvD1egZnODmsXSUCx0q5TyZw=",
|
||||
"version": "1.27.0"
|
||||
"rev": "v1.28.0",
|
||||
"sha256": "sha256-j5kLmzPqEQkbn8ikjWs28gt8AXBW5/DAbnMZag0aP+Q=",
|
||||
"vendorSha256": "sha256-NkGMblM6JB0JLTQJkNQqV90LXI8bEbULcgwwytwCwW4=",
|
||||
"version": "1.28.0"
|
||||
},
|
||||
"gridscale": {
|
||||
"owner": "gridscale",
|
||||
@ -536,19 +536,19 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/http",
|
||||
"repo": "terraform-provider-http",
|
||||
"rev": "v3.0.1",
|
||||
"sha256": "sha256-oeHWuXiLQF4cnC2QKWmqfNS5abItAxpYCV9BAId1Ld0=",
|
||||
"vendorSha256": "sha256-fROMSbnav8BiUWD6qdwKi/fGEn4a2lmOuAXsnFTT3fQ=",
|
||||
"version": "3.0.1"
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "sha256-ZIV4OrfwUtWuQyp9Uw/sA7tW7JlG2+bAUu8TamyTPbs=",
|
||||
"vendorSha256": "sha256-LPd5TQbuauXKMXraHsJd5uIdn357CveRyaLmavtMHSA=",
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"huaweicloud": {
|
||||
"owner": "huaweicloud",
|
||||
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.40.0",
|
||||
"sha256": "sha256-2wwwEWChYJNbeonxBg/M6fSVcoHKup3z/sQ93iZd2hc=",
|
||||
"rev": "v1.40.1",
|
||||
"sha256": "sha256-ejzyyliMyOjwQAQCx07ysEO0FMlE9jZDcuS2Bcz8Dvs=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.40.0"
|
||||
"version": "1.40.1"
|
||||
},
|
||||
"huaweicloudstack": {
|
||||
"owner": "huaweicloud",
|
||||
@ -644,19 +644,19 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.13.0",
|
||||
"sha256": "sha256-QBuYxfuH4Fd/B3CBa6Rp7TujwgyfVaausctAYlEnJ1U=",
|
||||
"rev": "v2.13.1",
|
||||
"sha256": "sha256-2/7sSgLt/t5e9YWi9D5hOfirHDrfHnuK3w684KjKIWI=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.13.0"
|
||||
"version": "2.13.1"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "launchdarkly",
|
||||
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
|
||||
"repo": "terraform-provider-launchdarkly",
|
||||
"rev": "v2.9.1",
|
||||
"sha256": "sha256-y6rikCql7zt/Dwo6FLHR/MdnhdA/ZDEVdsYRza4+daE=",
|
||||
"rev": "v2.9.2",
|
||||
"sha256": "sha256-XseHo/PVNGV+TKR+DBOmNlwYozFPWDolQR6/mE/XwVQ=",
|
||||
"vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=",
|
||||
"version": "2.9.1"
|
||||
"version": "2.9.2"
|
||||
},
|
||||
"libvirt": {
|
||||
"owner": "dmacvicar",
|
||||
@ -753,10 +753,10 @@
|
||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.4.4",
|
||||
"sha256": "sha256-QFiaFxCg4pYgMkC2+HAxlyWv2DL1Riqk3nRZqI6ie1k=",
|
||||
"vendorSha256": "sha256-nBBr6Uqa2VHSaEWfvFVotlF9DvTApgztS/wAgbj9OL0=",
|
||||
"version": "1.4.4"
|
||||
"rev": "v1.4.5",
|
||||
"sha256": "sha256-uDpbsHJY6BXd1N/maHWfEpZy4tl81P0oI4F2rcJxvH8=",
|
||||
"vendorSha256": "sha256-2ChyCuFJQASobUZBOlbsw7nI4APYE+mdcfIvkr2EEN0=",
|
||||
"version": "1.4.5"
|
||||
},
|
||||
"namecheap": {
|
||||
"owner": "namecheap",
|
||||
@ -780,19 +780,19 @@
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.0.0",
|
||||
"sha256": "sha256-u2wOmdk9QH1husFTW1Fb3VW2+gFrjerqBL7sOwFUKkw=",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "sha256-pcY4SsElHVKHw8rh/ZYMsSqPOZ4XDlzLgwxgF9ivZmw=",
|
||||
"vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=",
|
||||
"version": "3.0.0"
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"nomad": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/nomad",
|
||||
"repo": "terraform-provider-nomad",
|
||||
"rev": "v1.4.17",
|
||||
"sha256": "sha256-xP0E2rJbsthLIzN0zxDo1eGMb8xBetT+uuCcegVvJUU=",
|
||||
"vendorSha256": "sha256-p+SCagP8Niuc4h1s8l1c7Dao78wnHPRz9vNbFH10BaA=",
|
||||
"version": "1.4.17"
|
||||
"rev": "v1.4.18",
|
||||
"sha256": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=",
|
||||
"vendorSha256": "sha256-jS0soOe8kVnsC8Aum1zuiqHColOZmKEpu7jP74AnXmM=",
|
||||
"version": "1.4.18"
|
||||
},
|
||||
"ns1": {
|
||||
"owner": "ns1-terraform",
|
||||
@ -826,19 +826,19 @@
|
||||
"owner": "nutanix",
|
||||
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
|
||||
"repo": "terraform-provider-nutanix",
|
||||
"rev": "v1.7.0",
|
||||
"sha256": "sha256-UWK5QGc/7IETQ+IBQA9uaCV1IBpgwSO24UKFflUw3CU=",
|
||||
"rev": "v1.7.1",
|
||||
"sha256": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=",
|
||||
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
|
||||
"version": "1.7.0"
|
||||
"version": "1.7.1"
|
||||
},
|
||||
"oci": {
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.90.0",
|
||||
"sha256": "sha256-IbYldkApgE+wuSEpDnF7YeRfonjWQfBNskd++bPvPeA=",
|
||||
"rev": "v4.91.0",
|
||||
"sha256": "sha256-WLmY/vL0r2fQD4OPcWc9Pqs6hV2Fc2dbuTg7ssvwyu0=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.90.0"
|
||||
"version": "4.91.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
@ -880,10 +880,10 @@
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.31.1",
|
||||
"sha256": "sha256-88xh0cXAhne8ruVy+Ak7HmMEOjRQ2H/RXNyyEkEGb40=",
|
||||
"vendorSha256": "sha256-mLroGI3X9nLufz4LT4KCbVoPUZimtMaQ3rI108SKURE=",
|
||||
"version": "1.31.1"
|
||||
"rev": "v1.31.2",
|
||||
"sha256": "sha256-wACJpaCQ/FeKFUVvzZGxe5BGogGSZFBI5CGWN456CdY=",
|
||||
"vendorSha256": "sha256-loqQELA5zeLs2860ui4klSkxPzquIQbybQ+MHEUAWAY=",
|
||||
"version": "1.31.2"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
@ -970,10 +970,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/random",
|
||||
"repo": "terraform-provider-random",
|
||||
"rev": "v3.3.2",
|
||||
"sha256": "sha256-izTx/uxe/SAsWSlN5husEWK64c9ugdg8BS7lScnWSX4=",
|
||||
"vendorSha256": "sha256-ofU1zZb/C2LFaRCt0NULi+9dQY02lKBlz3jV1/ZhfWU=",
|
||||
"version": "3.3.2"
|
||||
"rev": "v3.4.2",
|
||||
"sha256": "sha256-wLppAWv/pgsBUe4tEcP6CB4vHvYYAuugeF0Z+eKyEw8=",
|
||||
"vendorSha256": "sha256-FBjwsOMtpKk0UhvWam9+7vQB6pIRwEOPD0A9fdiuDN4=",
|
||||
"version": "3.4.2"
|
||||
},
|
||||
"remote": {
|
||||
"owner": "tenstad",
|
||||
@ -997,10 +997,10 @@
|
||||
"owner": "scaleway",
|
||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.2.8",
|
||||
"sha256": "sha256-UzgXZhVlPel6CQpMAQP2ca7/ur+y8ADkcF2q7pN+sfM=",
|
||||
"rev": "v2.2.9",
|
||||
"sha256": "sha256-bYy3bTn5mFbu0Y7hy7KY2ZkU2xMC0HgBRRh7cxT/A9s=",
|
||||
"vendorSha256": "sha256-Jg1FalV+WsKYOZpszeNYydP4Qtf2cdaZt7xz4O699wc=",
|
||||
"version": "2.2.8"
|
||||
"version": "2.2.9"
|
||||
},
|
||||
"secret": {
|
||||
"owner": "numtide",
|
||||
@ -1060,10 +1060,10 @@
|
||||
"owner": "Snowflake-Labs",
|
||||
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
|
||||
"repo": "terraform-provider-snowflake",
|
||||
"rev": "v0.42.1",
|
||||
"sha256": "sha256-/qQSMSF4Uxs5ZJj3S1LATs1Uima/FmXVMf41x8K2bQ8=",
|
||||
"rev": "v0.43.0",
|
||||
"sha256": "sha256-OTJRcFdudwO15GmciAtlz6/Z7JqOpfjbaANJXvP6Jxw=",
|
||||
"vendorSha256": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=",
|
||||
"version": "0.42.1"
|
||||
"version": "0.43.0"
|
||||
},
|
||||
"sops": {
|
||||
"owner": "carlpett",
|
||||
@ -1105,19 +1105,19 @@
|
||||
"owner": "SumoLogic",
|
||||
"provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
|
||||
"repo": "terraform-provider-sumologic",
|
||||
"rev": "v2.18.0",
|
||||
"sha256": "sha256-Ahj+twdryRx9EovytxEbm9e/s67/0YXBHdRkD8q3jnY=",
|
||||
"rev": "v2.18.2",
|
||||
"sha256": "sha256-d0g0iSPyQrMlll7DW09+9krTi7lkeszxE786vKtr6aQ=",
|
||||
"vendorSha256": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=",
|
||||
"version": "2.18.0"
|
||||
"version": "2.18.2"
|
||||
},
|
||||
"tencentcloud": {
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.77.4",
|
||||
"sha256": "sha256-RkrWJ16fouiINR8+6wW0BBV7lpGu/s32UYPSOUgVLl4=",
|
||||
"rev": "v1.77.6",
|
||||
"sha256": "sha256-1mdgrYbWy/PRIQ+o3UmTnSWhnP5p8k1D61Wz4U4N32A=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.77.4"
|
||||
"version": "1.77.6"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
@ -1150,10 +1150,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tls",
|
||||
"repo": "terraform-provider-tls",
|
||||
"rev": "v4.0.1",
|
||||
"sha256": "sha256-/yfSai1huhk+1OYN6DKspWBdfSDql53lxHWjALD5AV4=",
|
||||
"vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=",
|
||||
"version": "4.0.1"
|
||||
"rev": "v4.0.2",
|
||||
"sha256": "sha256-PerRBYTEY6ITLZ5cWifEQ+FAUvsqC6wUzslI/fa96Hc=",
|
||||
"vendorSha256": "sha256-7io1fQRX8+QABY0VRKex6W7fP5kDbij0qXrhzPbr/CY=",
|
||||
"version": "4.0.2"
|
||||
},
|
||||
"triton": {
|
||||
"deleteVendor": true,
|
||||
@ -1268,18 +1268,18 @@
|
||||
"owner": "vmware",
|
||||
"provider-source-address": "registry.terraform.io/vmware/wavefront",
|
||||
"repo": "terraform-provider-wavefront",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "sha256-Q9ikBBlqprdu4BheItrWBoWqODgMXLgbtSg9RHtejBE=",
|
||||
"vendorSha256": "sha256-sUzlDapp1smQ4lbgvsz22y3/fGkfJdHBlK7HNfihYpI=",
|
||||
"version": "3.1.0"
|
||||
"rev": "v3.2.0",
|
||||
"sha256": "sha256-6hqVAg3YwkEDBpkgPQZQyrjHfKfRc8+iTZqMg2vBwJI=",
|
||||
"vendorSha256": "sha256-0N2YWVnbGvD4YLdEtfdvAjhLY4zkj07GoXtFFPSD5Zk=",
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"yandex": {
|
||||
"owner": "yandex-cloud",
|
||||
"provider-source-address": "registry.terraform.io/yandex-cloud/yandex",
|
||||
"repo": "terraform-provider-yandex",
|
||||
"rev": "v0.77.0",
|
||||
"sha256": "sha256-jkFWEUHqsR//IqgFIyFyJBm5EoclD5ri23QrZ3tRG/w=",
|
||||
"vendorSha256": "sha256-08/Av6lrFdhTI0cH5cFbcHKOcDPrchC5wSWW83xHrfU=",
|
||||
"version": "0.77.0"
|
||||
"rev": "v0.78.0",
|
||||
"sha256": "sha256-Llp0o/+CtyoWhymgWxVMPncl4C+XT2/5mhXAN4hYDLY=",
|
||||
"vendorSha256": "sha256-QcFmk/kmhdhvO2HqpnLGDRIkOYu23A1g/mYKjzapIvc=",
|
||||
"version": "0.78.0"
|
||||
}
|
||||
}
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuifeed";
|
||||
version = "0.2.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-QMjMJVr+OI/5QQTwNVpUQdnYSWpWmZMuEcg5UgPpcAk=";
|
||||
sha256 = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-NPrROFV2Yx4p4CocVMY2dPAlgcdZrZQfa779beLAbcI=";
|
||||
cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "super-productivity";
|
||||
version = "7.11.6";
|
||||
version = "7.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage";
|
||||
sha256 = "sha256-BXRnc6c/PpFdF4gPemU6IzVQvr+Tl5Fbxz7mY6Z5u7o=";
|
||||
sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cbmc";
|
||||
version = "5.64.0";
|
||||
version = "5.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diffblue";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "sha256-FQoUNJV5eq/qGc6fdNlMHQADGipx9dxkb4EFRNX7h6w=";
|
||||
sha256 = "sha256-A2xMbRblDXyhUXGDVxNBxFbs9npQJpMUBCPAloF33M8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
Swaylock, with fancy effects
|
||||
'';
|
||||
mainProgram = "swaylock";
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
|
38
pkgs/development/misc/brev-cli/default.nix
Normal file
38
pkgs/development/misc/brev-cli/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "brev-cli";
|
||||
version = "0.6.95";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brevdev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09qhc38ycqs6vdyy1rxaxbihq0q59g2ffkmmlk6ipdlv2b3ywz0f";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
subPackages = [ "." ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${src.rev}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/brev-cli $out/bin/brev
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Connect your laptop to cloud computers";
|
||||
homepage = "https://github.com/brevdev/brev-cli";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
@ -7,12 +7,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "biliass";
|
||||
version = "1.3.5";
|
||||
version = "1.3.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU=";
|
||||
sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ protobuf ];
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "python-swiftclient";
|
||||
version = "4.0.1";
|
||||
version = "4.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-O2jHNpnF+8OKzXtvEUPWmSOz+vcQ82XZd6QQS9kni/8=";
|
||||
hash = "sha256-+CKY5KSPfL3WgPJjjIXRynrhp27b4wA20htM16KcCes=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,17 +1,17 @@
|
||||
{ stdenv, lib, fetchFromGitHub, ant, jdk }:
|
||||
{ stdenv, lib, fetchFromGitHub, ant, jdk, jre, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "javacc";
|
||||
version = "7.0.10";
|
||||
version = "7.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2";
|
||||
sha256 = "sha256-tDtstF3ivKjG01vOZ8Ga1zTjIZFSTWt5QPY1VQvyFMU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ant jdk ];
|
||||
nativeBuildInputs = [ ant jdk makeWrapper ];
|
||||
|
||||
buildPhase = ''
|
||||
ant jar
|
||||
@ -21,8 +21,15 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $out/target
|
||||
mv scripts $out/bin
|
||||
mv target/javacc.jar $out/target/
|
||||
find -L "$out/bin" -type f -executable -print0 \
|
||||
| while IFS= read -r -d ''' file; do
|
||||
wrapProgram "$file" --suffix PATH : ${jre}/bin
|
||||
done
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = "ant test";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://javacc.github.io/javacc";
|
||||
description = "A parser generator for building parsers from grammars";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file
|
||||
, curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick
|
||||
, openal , opusfile, libogg
|
||||
, Cocoa
|
||||
, Cocoa, libXext
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake imagemagick unzip zip file ];
|
||||
|
||||
buildInputs = [
|
||||
freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg
|
||||
freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg libXext
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Cocoa
|
||||
];
|
||||
@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/yvt/openspades/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
maintainers = with maintainers; [ abbradar azahi ];
|
||||
};
|
||||
}
|
||||
|
@ -1,6 +1,23 @@
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, SDL2, SDL2_image , curl
|
||||
, libogg, libvorbis, libGLU, libGL, openal, boost, glew
|
||||
, libpng, freetype, glm
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, boost
|
||||
, curl
|
||||
, SDL2
|
||||
, SDL2_image
|
||||
, libSM
|
||||
, libXext
|
||||
, libpng
|
||||
, freetype
|
||||
, libGLU
|
||||
, libGL
|
||||
, glew
|
||||
, glm
|
||||
, openal
|
||||
, libogg
|
||||
, libvorbis
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -14,8 +31,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU libGL openal boost glew
|
||||
libpng freetype glm
|
||||
buildInputs = [
|
||||
boost
|
||||
curl
|
||||
SDL2
|
||||
SDL2_image
|
||||
libSM
|
||||
libXext
|
||||
libpng
|
||||
freetype
|
||||
libGL
|
||||
libGLU
|
||||
glew
|
||||
glm
|
||||
openal
|
||||
libogg
|
||||
libvorbis
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ];
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pocketbase";
|
||||
version = "0.5.2";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocketbase";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ykjk2OJ1AFG4S8vQi5yb7JzQRh3hSbFm/6XqzqXNmt8=";
|
||||
sha256 = "sha256-sDq8i79Ndwi5hLidukqnuuShCRCE7kxaiOQy29bJQCw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-OGbfcKvPTSM9DGJ+u2fXBmHq0Sv/n8oMbHNoPZy854Q=";
|
||||
vendorSha256 = "sha256-Ty06TegTT4BILgH0MpnxINxBQMW0zi0ItptHmDqKW1k=";
|
||||
|
||||
# This is the released subpackage from upstream repo
|
||||
subPackages = [ "examples/base" ];
|
||||
|
@ -22,7 +22,7 @@ let
|
||||
);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.12.0"; # also update communityModules
|
||||
version = "0.12.1"; # also update communityModules
|
||||
pname = "prosody";
|
||||
# The following community modules are necessary for the nixos module
|
||||
# prosody module to comply with XEP-0423 and provide a working
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
src = fetchurl {
|
||||
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo=";
|
||||
sha256 = "sha256-p+y75B8BpCUYBVk6xtFdvGy3XZx6h2x2tFbPdP9LkOU=";
|
||||
};
|
||||
|
||||
# A note to all those merging automated updates: Please also update this
|
||||
@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
|
||||
# version.
|
||||
communityModules = fetchhg {
|
||||
url = "https://hg.prosody.im/prosody-modules";
|
||||
rev = "65438e4ba563";
|
||||
sha256 = "sha256-zHOrMzcgHOdBl7nObM+OauifbcmKEOfAuj81MDSoLMk=";
|
||||
rev = "cce12a660b98";
|
||||
sha256 = "sha256-dFWS1EFd2wtFnnuU4xKPnBisIdKkgMAvBtsfAEbdLjE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oil";
|
||||
version = "0.12.3";
|
||||
version = "0.12.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
|
||||
hash = "sha256-M8gklc9crdVkQk9vzxO4tG809O0uHOPvvq1l1tzoPt8=";
|
||||
hash = "sha256-g/j8WePzE23pixhq7w6E6PfoGLGLB9Rp9atThMlxkW8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, openssl, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, openssl, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stunnel";
|
||||
@ -10,6 +10,15 @@ stdenv.mkDerivation rec {
|
||||
# please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
|
||||
# not the output of `nix-prefetch-url`
|
||||
};
|
||||
patches = [
|
||||
# Fixes compilation on darwin, patch is from
|
||||
# https://github.com/mtrojnar/stunnel/pull/15.
|
||||
(fetchpatch {
|
||||
name = "stunnel_darwin_environ.patch";
|
||||
url = "https://github.com/mtrojnar/stunnel/commit/d41932f6d55f639cc921007c2e180a55ef88bf00.patch";
|
||||
sha256 = "sha256-d2K/BHE6GxvDCBIbttCHEVwH9SCu0jggNvhVHkC/qto=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
configureFlags = [
|
||||
|
@ -1,41 +1,102 @@
|
||||
{ stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2,
|
||||
xz, curl, runtimeShell }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, asciidoc
|
||||
, binutils
|
||||
, bzip2
|
||||
, coreutils
|
||||
, curl
|
||||
, gnupg
|
||||
, gpgme
|
||||
, installShellFiles
|
||||
, libarchive
|
||||
, makeWrapper
|
||||
, meson
|
||||
, ninja
|
||||
, openssl
|
||||
, perl
|
||||
, pkg-config
|
||||
, xz
|
||||
, zlib
|
||||
|
||||
# Tells pacman where to find ALPM hooks provided by packages.
|
||||
# This path is very likely to be used in an Arch-like root.
|
||||
, sysHookDir ? "/usr/share/libalpm/hooks/"
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pacman";
|
||||
version = "5.2.2";
|
||||
version = "6.0.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1829jcc300fxidr3cahx5kpnxkpg500daqgn2782hg5m5ygil85v";
|
||||
url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-DbYUVuVqpJ4mDokcCwJb4hAxnmKxVSHynT6TsA079zE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
# trying to build docs fails with a2x errors, unable to fix through asciidoc
|
||||
"--disable-doc"
|
||||
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--with-scriptlet-shell=${runtimeShell}"
|
||||
nativeBuildInputs = [
|
||||
asciidoc
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
|
||||
buildInputs = [
|
||||
bzip2
|
||||
curl
|
||||
gpgme
|
||||
libarchive
|
||||
openssl
|
||||
perl
|
||||
xz
|
||||
zlib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config m4 ];
|
||||
buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ];
|
||||
patches = [
|
||||
./dont-create-empty-dirs.patch
|
||||
# Add keyringdir meson option to configure the keyring directory
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch";
|
||||
hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM=";
|
||||
})
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/bin/repo-add \
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \
|
||||
--replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \
|
||||
--replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'"
|
||||
substituteInPlace doc/meson.build \
|
||||
--replace "/bin/true" "${coreutils}/bin/true"
|
||||
substituteInPlace scripts/repo-add.sh.in \
|
||||
--replace bsdtar "${libarchive}/bin/bsdtar"
|
||||
substituteInPlace scripts/pacman-key.sh.in \
|
||||
--replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \
|
||||
--subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \
|
||||
--replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures"
|
||||
''; # the line above should be removed once Arch migrates to gnupg 2.3.x
|
||||
|
||||
mesonFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash scripts/pacman --zsh scripts/_pacman
|
||||
wrapProgram $out/bin/makepkg \
|
||||
--prefix PATH : ${lib.makeBinPath [ binutils ]}
|
||||
wrapProgram $out/bin/pacman-key \
|
||||
--prefix PATH : ${lib.makeBinPath [ gnupg ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple library-based package manager";
|
||||
homepage = "https://www.archlinux.org/pacman/";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://archlinux.org/pacman/";
|
||||
changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mt-caret ];
|
||||
maintainers = with maintainers; [ samlukeyes123 ];
|
||||
};
|
||||
}
|
||||
|
@ -0,0 +1,20 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index c8ee42fd..610401ca 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -414,15 +414,6 @@ install_data(
|
||||
'proto/proto.install',
|
||||
install_dir : join_paths(DATAROOTDIR, 'pacman'))
|
||||
|
||||
-foreach path : [
|
||||
- join_paths(LOCALSTATEDIR, 'lib/pacman/'),
|
||||
- join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/'),
|
||||
- join_paths(DATAROOTDIR, 'makepkg-template/'),
|
||||
- join_paths(DATAROOTDIR, 'libalpm/hooks/'),
|
||||
- ]
|
||||
- meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path))
|
||||
-endforeach
|
||||
-
|
||||
TEST_ENV = environment()
|
||||
TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.project_source_root(), 'scripts/library/'))
|
||||
TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.project_build_root(), 'scripts/libmakepkg/'))
|
@ -304,6 +304,8 @@ with pkgs;
|
||||
|
||||
breakpad = callPackage ../development/misc/breakpad { };
|
||||
|
||||
brev-cli = callPackage ../development/misc/brev-cli { };
|
||||
|
||||
buf = callPackage ../development/tools/buf { };
|
||||
|
||||
buf-language-server = callPackage ../development/tools/buf-language-server { };
|
||||
@ -16510,7 +16512,10 @@ with pkgs;
|
||||
ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { };
|
||||
|
||||
javacc = callPackage ../development/tools/parsing/javacc {
|
||||
# Upstream doesn't support anything newer than Java 8.
|
||||
# https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source
|
||||
jdk = jdk8;
|
||||
jre = jre8;
|
||||
};
|
||||
|
||||
jbake = callPackage ../development/tools/jbake { };
|
||||
|
Loading…
Reference in New Issue
Block a user