Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
0b21b8d8a6
@ -534,7 +534,7 @@ let
|
||||
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
|
||||
${poolName} = {
|
||||
inherit (cfg) user;
|
||||
phpPackage = pkgs.php80;
|
||||
phpPackage = pkgs.php81;
|
||||
settings = mapAttrs (name: mkDefault) {
|
||||
"listen.owner" = "nginx";
|
||||
"listen.group" = "nginx";
|
||||
|
||||
@ -12,6 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
machine.wait_for_open_port(8080)
|
||||
# Test basic funcionality
|
||||
machine.succeed("headscale namespaces create test")
|
||||
machine.succeed("headscale preauthkeys -n test create")
|
||||
machine.succeed("headscale preauthkeys -u test create")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/package-lock.json b/package-lock.json
|
||||
index 5a84fbe7..562051c7 100644
|
||||
--- a/package-lock.json
|
||||
+++ b/package-lock.json
|
||||
@@ -12425,7 +12425,7 @@
|
||||
"node_modules/pkg-up/node_modules/path-exists": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
|
||||
- "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
|
||||
+ "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=4"
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ${pname} $out/bin
|
||||
cp ${type}-Edit $out/bin/${pname}
|
||||
'';
|
||||
preFixup = let
|
||||
# we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
|
||||
|
||||
@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec {
|
||||
brand = "Midas";
|
||||
type = "M32";
|
||||
version = "4.1";
|
||||
url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
|
||||
url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
sha256 = "0aqhdrxqa49liyvbbw5x32kwk0h1spzvmizmdxklrfs64vvr9bvh";
|
||||
homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I";
|
||||
})
|
||||
|
||||
@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec {
|
||||
brand = "Behringer";
|
||||
type = "X32";
|
||||
version = "4.1";
|
||||
url = "https://mediadl.musictribe.com/download/software/behringer/${type}/${type}-Edit_LINUX_64-Bit_${version}.tar.gz";
|
||||
url = "https://mediadl.musictribe.com/download/software/behringer/${type}/${type}-Edit_LINUX_${version}.tar.gz";
|
||||
sha256 = "0zsw7qfmcci87skkpq8vx5zxk35phn8y4byispvki9ascifnnb33";
|
||||
homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF";
|
||||
})
|
||||
|
||||
1621
pkgs/applications/misc/break-time/Cargo.lock
generated
Normal file
1621
pkgs/applications/misc/break-time/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -20,7 +20,9 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
@ -34,6 +36,11 @@ rustPlatform.buildRustPackage rec {
|
||||
openssl
|
||||
];
|
||||
|
||||
# update Cargo.lock to work with openssl
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Break timer that forces you to take a break";
|
||||
homepage = "https://github.com/cdepillabout/break-time";
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gremlin-console";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
src = fetchzip {
|
||||
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
|
||||
sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E=";
|
||||
sha256 = "sha256-+IzTCaRlYW1i4ZzEgOpEA0rXN45A2q1iddrqU9up2IA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "terminal-stocks";
|
||||
version = "1.0.15";
|
||||
version = "1.0.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shweshi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8n+Wpkiy+XTaIBO7nuxO2m3EkkaHsmYNqtUqMin6leg=";
|
||||
hash = "sha256-tu6SKeTVEqIqDJXimoSkMK9+l0uGqWSrlIO0KHoROSQ=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-M9a33v1R/cAgUJJLHwPs8hpPtjzzKkMps/ACnWLqUZE=";
|
||||
npmDepsHash = "sha256-13RiEBLhmKW04Tesg1s7c9rCYtRGOd/prnVARb6jpGQ=";
|
||||
dontNpmBuild = true;
|
||||
|
||||
passthru.updateScript = nix-update-script {};
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, flutter
|
||||
, flutter37
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, pcre2
|
||||
@ -8,7 +8,7 @@
|
||||
, removeReferencesTo
|
||||
}:
|
||||
|
||||
flutter.buildFlutterApplication rec {
|
||||
flutter37.buildFlutterApplication rec {
|
||||
pname = "yubioath-flutter";
|
||||
version = "6.1.0";
|
||||
|
||||
@ -62,7 +62,7 @@ flutter.buildFlutterApplication rec {
|
||||
--replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png"
|
||||
|
||||
# Remove unnecessary references to Flutter.
|
||||
remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag
|
||||
remove-references-to -t ${flutter37.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -75,8 +75,8 @@ flutter.buildFlutterApplication rec {
|
||||
];
|
||||
|
||||
disallowedReferences = [
|
||||
flutter
|
||||
flutter.unwrapped
|
||||
flutter37
|
||||
flutter37.unwrapped
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"packageVersion": "113.0-1",
|
||||
"packageVersion": "113.0-3",
|
||||
"source": {
|
||||
"rev": "113.0-1",
|
||||
"sha256": "0cqb9lphaqvmf443ha6fhd8q7qyy09bsg923rq8jy8cjmhkq2n6i"
|
||||
"rev": "113.0-3",
|
||||
"sha256": "0pqjchkpdgsxdsylawsnbszjmx4aybyvlsc2a8qdnck5rpnxl1p2"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "113.0",
|
||||
|
||||
@ -46,11 +46,11 @@
|
||||
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-8jtZ+uhCpktt1e99j2I1C/sE69uOv911qbuaKTjv2DM=",
|
||||
"hash": "sha256-qacbj6xquC87cLAuKlI4NzPtqfR8gbLrTfeVN5VSuMI=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.204.0",
|
||||
"rev": "v1.204.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -101,38 +101,38 @@
|
||||
"vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw="
|
||||
},
|
||||
"aviatrix": {
|
||||
"hash": "sha256-DjdA4kvOtPO4x1MY+lJjX+KNuQTxSZQvisSfokQk5Sg=",
|
||||
"hash": "sha256-63bYxeYhjTeBZG8Q+Qx99LSPDxy+gkA8/g5Yx2ocX6Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix",
|
||||
"owner": "AviatrixSystems",
|
||||
"repo": "terraform-provider-aviatrix",
|
||||
"rev": "v3.0.5",
|
||||
"rev": "v3.1.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"aws": {
|
||||
"hash": "sha256-bJScfyTNDW0cKGp93cffDcZ/PZQ8trNbemHT5OoCkvg=",
|
||||
"hash": "sha256-pU0FFIXe/Z0/0UVOyheEBwbWNeo+BdKD/6iacI8SP60=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/aws",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.66.1",
|
||||
"rev": "v4.67.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-tetNRSjQTgFzFLSdmRL6f+UlwKp62zr00JzFXJs8nMs="
|
||||
"vendorHash": "sha256-yVtxoIuID5nwrEiac/7lMBEm4iAisyEUK+4zDC0bksI="
|
||||
},
|
||||
"azuread": {
|
||||
"hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=",
|
||||
"hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.38.0",
|
||||
"rev": "v2.39.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"azurerm": {
|
||||
"hash": "sha256-frIlEojIK/6KhPquliQPveP279bFHvLAy830bx6Yd2c=",
|
||||
"hash": "sha256-nNA2jBRMN5JV2i92dZaK5ZFzs44t9zZpusPw+Qnhby0=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.55.0",
|
||||
"rev": "v3.56.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -209,13 +209,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"cloudamqp": {
|
||||
"hash": "sha256-z7SE69j+9qlwO53xbvSvBQd41zL+1jDDhJ0ByfVEqqo=",
|
||||
"hash": "sha256-1INYBqZcv7IRqhbt5Q/aZ2MYMwH7A0h1UzF4KZ9AK3U=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
|
||||
"owner": "cloudamqp",
|
||||
"repo": "terraform-provider-cloudamqp",
|
||||
"rev": "v1.26.1",
|
||||
"rev": "v1.26.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-IXhs9fSrIKuhLUwamaSd8vY4ePK8DAre9crvonpUvys="
|
||||
"vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q="
|
||||
},
|
||||
"cloudflare": {
|
||||
"hash": "sha256-0bHKQe4wIieKdxPF0S7Qv8QLlg+AZzBOG8n2qiMOM0g=",
|
||||
@ -227,13 +227,13 @@
|
||||
"vendorHash": "sha256-cXnaUHqJrPplLO61u20UscSjo0aOnrJyIvGh8+TfqE0="
|
||||
},
|
||||
"cloudfoundry": {
|
||||
"hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",
|
||||
"hash": "sha256-SFA0rG80BWaJHwvAWEugdVd3nR+YGflyYONOuoS++P8=",
|
||||
"homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry",
|
||||
"owner": "cloudfoundry-community",
|
||||
"repo": "terraform-provider-cloudfoundry",
|
||||
"rev": "v0.50.7",
|
||||
"rev": "v0.50.8",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE="
|
||||
"vendorHash": "sha256-QVfzSmB/2neQcw+OJbX71Z06oFw4Gc3YQ1RpchAOY7Q="
|
||||
},
|
||||
"cloudinit": {
|
||||
"hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=",
|
||||
@ -354,20 +354,20 @@
|
||||
"vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
|
||||
},
|
||||
"equinix": {
|
||||
"hash": "sha256-wuOgnliqwA8huZHmFuegbtuFbpTpe1VgQ53Z+XcgHjw=",
|
||||
"hash": "sha256-mMkwJyZL1ll26ZfJ7Whk/upyfh1xNl+5S1mtVM1ZMuM=",
|
||||
"homepage": "https://registry.terraform.io/providers/equinix/equinix",
|
||||
"owner": "equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v1.14.1",
|
||||
"rev": "v1.14.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k="
|
||||
},
|
||||
"exoscale": {
|
||||
"hash": "sha256-u/2ePkENpx8Q7WcmtNxXR4GIsr2TnIHyOA8CnzTFTnk=",
|
||||
"hash": "sha256-wWGqEwo8dMD+2UeaHSzoo+uXrsHNZRDrGhgneACScPM=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.47.0",
|
||||
"rev": "v0.48.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -381,11 +381,11 @@
|
||||
"vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
|
||||
},
|
||||
"fastly": {
|
||||
"hash": "sha256-OXPU4p8PIfL4jvyolNSSIicVJ/gWpwXcyHuSMFIkR7k=",
|
||||
"hash": "sha256-pqH8Swv7shB//ipldyU43zWs+YuRE1gBnUdtkA5HJhg=",
|
||||
"homepage": "https://registry.terraform.io/providers/fastly/fastly",
|
||||
"owner": "fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v4.3.2",
|
||||
"rev": "v4.3.3",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -466,13 +466,13 @@
|
||||
"vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
|
||||
},
|
||||
"grafana": {
|
||||
"hash": "sha256-XY3nAaAB3h50IGE0Gp2xsqDppk6fmDIxHVJWstESMkM=",
|
||||
"hash": "sha256-3vFFwCbSOimKitayrbVWyTyWQcI+lYJOtI50ZI7+q+g=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v1.39.0",
|
||||
"rev": "v1.40.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-+g8Ryb1SgtI074R5vttd2CUneHRv64OvEFgbve+7xL4="
|
||||
"vendorHash": "sha256-w6xyEqdHmKsAqT8X7wE48pWtcGWZO8rkidjse62L/EM="
|
||||
},
|
||||
"gridscale": {
|
||||
"hash": "sha256-61LZyXqb+1kWHBk1/lw5C5hmeL4aHwSSS++9/9L/tDw=",
|
||||
@ -669,7 +669,7 @@
|
||||
"homepage": "https://registry.terraform.io/providers/linode/linode",
|
||||
"owner": "linode",
|
||||
"repo": "terraform-provider-linode",
|
||||
"rev": "v2.1.0",
|
||||
"rev": "v2.1.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-om6Onp+Go74YfA8J2DALhJy1c+s5GbXYMpUM9a28bdI="
|
||||
},
|
||||
@ -728,11 +728,11 @@
|
||||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-1VO0ofT+6JU8pMSfrSfgEJlTb5GM64AVYQ1hvbWPzCw=",
|
||||
"hash": "sha256-drPKdj5mAs1eoocZELq3SIKwlobdTe8xBFPh5UMUFn8=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.15.1",
|
||||
"rev": "v1.15.2",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-Xz6WxAxzvLfgJTD2oDgZoeHffcdA7dyfgwY1g6lFkbk="
|
||||
},
|
||||
@ -1098,11 +1098,11 @@
|
||||
"vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-ZwThN4kqScXumJXrw2s3NoWY/ZgCOrb0JAwiZWX3GIQ=",
|
||||
"hash": "sha256-eHv6rqVwWxYcQmoYlkKbOFqJ2BG3KMurn2u8rim/mN0=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.80.6",
|
||||
"rev": "v1.81.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1162,11 +1162,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"ucloud": {
|
||||
"hash": "sha256-onsIA/cROImSgdU9PfnkmXbTtEd6OZ4ka+e+DSzOOlY=",
|
||||
"hash": "sha256-ccQwHQlJTqNRNdcz1gd58rzauBcCgV3bGpoKIThruDQ=",
|
||||
"homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
|
||||
"owner": "ucloud",
|
||||
"repo": "terraform-provider-ucloud",
|
||||
"rev": "v1.36.0",
|
||||
"rev": "v1.36.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.45.9";
|
||||
version = "0.45.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-51py2Z/uA7Et3jvic/SUCkTQ+LPq4+xXjl/Ed6Yj4qg=";
|
||||
hash = "sha256-3CmaCNF8HM+vACbvjbFHZAxKnwDu1FKHJZ7YatT4bpc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "zarf";
|
||||
version = "0.26.2";
|
||||
version = "0.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defenseunicorns";
|
||||
repo = "zarf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-45ZGHw/u0IkDJSlNaNg9At4rvBU9+CVix8Bp58hE6gk=";
|
||||
hash = "sha256-gJpXdT0Uj+7UecPPuRphbtbh8v80UztKmiOAP+U7Tpc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5k2NnQ18bL0v7YHTvw2nz5H5n5DQOmozkUhyf97eKl8=";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib
|
||||
, fetchFromGitLab
|
||||
, imagemagick
|
||||
, flutter
|
||||
, flutter37
|
||||
, makeDesktopItem
|
||||
}:
|
||||
|
||||
flutter.buildFlutterApplication rec {
|
||||
flutter37.buildFlutterApplication rec {
|
||||
version = "1.11.0";
|
||||
name = "fluffychat";
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||
signal-desktop = {
|
||||
dir = "Signal";
|
||||
version = "6.17.0";
|
||||
hash = "sha256-CSyFkO06yeExZAQBKQNGIwc3KEFcpibm5UM3ij2k+G8=";
|
||||
version = "6.17.1";
|
||||
hash = "sha256-9m9+waQgQQk/7T7d4UZY3PqgPEhseaXmI8lZ5oiI92A=";
|
||||
};
|
||||
signal-desktop-beta = {
|
||||
dir = "Signal Beta";
|
||||
version = "6.17.0-beta.1";
|
||||
hash = "sha256-8Ae+IrwDRxcF5JhrDqEhimQqyCtDYWm/pOrcpKgAo2w=";
|
||||
version = "6.18.0-beta.2";
|
||||
hash = "sha256-qfBc1+XwHbD/FAGLezmgOJsAYn4ZTuGU4w1aR8g/2U0=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,38 +1,35 @@
|
||||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, desktop-file-utils
|
||||
, python3
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, wrapGAppsHook4
|
||||
, evolution-data-server
|
||||
, libical
|
||||
, libgee
|
||||
, json-glib
|
||||
, glib
|
||||
, glib-networking
|
||||
, gtk4
|
||||
, json-glib
|
||||
, libadwaita
|
||||
, libgee
|
||||
, libical
|
||||
, pantheon
|
||||
, sqlite
|
||||
, libsoup
|
||||
, libgdata
|
||||
, gtk3
|
||||
, pantheon /* granite, icons, maintainers */
|
||||
, webkitgtk
|
||||
, libpeas
|
||||
, libhandy
|
||||
, curl
|
||||
, webkitgtk_6_0
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-planner";
|
||||
version = "2.7";
|
||||
version = "unstable-2023-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alainm23";
|
||||
repo = "planner";
|
||||
rev = version;
|
||||
sha256 = "sha256-3eFPGRcZWhzFYi52TbHmpFNLI0pWYcHbbBI7efqZwYE=";
|
||||
rev = "97c0f1c30d087e2ac459241bfdb9b606a12a77ce";
|
||||
sha256 = "sha256-W4Hfa9zgKpGKfd7QSTLF2FT0vSJ5mQMV+W9WWltZlL4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,64 +39,40 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
glib
|
||||
glib-networking
|
||||
gtk3
|
||||
gtk4
|
||||
json-glib
|
||||
libadwaita
|
||||
libgee
|
||||
libical
|
||||
libpeas
|
||||
libsoup
|
||||
pantheon.elementary-icon-theme
|
||||
pantheon.granite
|
||||
pantheon.granite7
|
||||
sqlite
|
||||
webkitgtk
|
||||
libhandy
|
||||
curl
|
||||
webkitgtk_6_0
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dproduction=true"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# The GTK theme has been renamed in elementary OS 6
|
||||
# https://github.com/elementary/flatpak-platform/blob/6.1.0/io.elementary.Sdk.json#L182
|
||||
# Remove this in https://github.com/NixOS/nixpkgs/pull/159249
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace '"gtk-theme-name", "elementary"' '"gtk-theme-name", "io.elementary.stylesheet.blueberry"'
|
||||
|
||||
# Fix build with vala 0.56
|
||||
# https://github.com/alainm23/planner/pull/884
|
||||
substituteInPlace src/Application.vala \
|
||||
--replace "public const OptionEntry[] PLANNER_OPTIONS" "private const OptionEntry[] PLANNER_OPTIONS"
|
||||
|
||||
chmod +x build-aux/meson/post_install.py
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# The GTK theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share"
|
||||
# The icon theme is hardcoded.
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"
|
||||
)
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
ln -s $out/bin/com.github.alainm23.planner $out/bin/planner
|
||||
substituteInPlace build-aux/meson/post_install.py \
|
||||
--replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Task manager with Todoist support designed for GNU/Linux 🚀️";
|
||||
homepage = "https://planner-todo.web.app";
|
||||
license = licenses.gpl3;
|
||||
description = "Task manager with Todoist support designed for GNU/Linux";
|
||||
homepage = "https://useplanner.com";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "com.github.alainm23.planner";
|
||||
broken = true; # https://github.com/alainm23/planner/issues/928
|
||||
mainProgram = "com.github.alainm23.task-planner";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "eigenmath";
|
||||
version = "unstable-2023-04-07";
|
||||
version = "unstable-2023-05-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "georgeweigt";
|
||||
repo = pname;
|
||||
rev = "dd6a01da6e7f52a15af5bd584e93edf1a77bc04b";
|
||||
hash = "sha256-GZkC/Tvep7fL5nJyz0ZN7z0lUhGX4EJlXVswwAyegUE=";
|
||||
rev = "a6de473ad8eb7cd7c2fba6a738881764dc2c5f83";
|
||||
hash = "sha256-1fdGx6pYWnoyJ5ei1qZlXZG2mUEdjrRI7+X352XE/7A=";
|
||||
};
|
||||
|
||||
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
|
||||
|
||||
@ -109,10 +109,10 @@ let
|
||||
|
||||
xgandalf = stdenv.mkDerivation rec {
|
||||
pname = "xgandalf";
|
||||
version = "c15afa2381d5f87d4aefcc8181a15b4a6fd3a955";
|
||||
version = "c6c5003ff1086e8c0fb5313660b4f02f3a3aab7b";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "11i1w57a3rpnb4x5y4n8d3iffn5m9w1zydl69syzljdk3aqg2pv8";
|
||||
hash = "sha256-/uZlBwAINSoYqgLQFTMz8rS1Rpadu79JkO6Bu/+Nx9E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
@ -121,10 +121,10 @@ let
|
||||
|
||||
pinkIndexer = stdenv.mkDerivation rec {
|
||||
pname = "pinkindexer";
|
||||
version = "8a828788f8272a89d484b00afbd2500c2c1ff974";
|
||||
version = "5d4e016941eb2a9e50a10df96ded7ff1e2464503";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/thomas.white/${pname}/-/archive/${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1mkgf1xd91ay0z0632kzxm0z3wcxf0cayjvs6a3znds72dkhfsyh";
|
||||
hash = "sha256-VnJOJJ247dNoBlos4Fu3GQBlAnTk9el+yZDRiicJtu0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||
@ -133,10 +133,10 @@ let
|
||||
|
||||
fdip = stdenv.mkDerivation rec {
|
||||
pname = "fdip";
|
||||
version = "29da626f17f66d5c0780fc59b1eafb7c85b81dd6";
|
||||
version = "5628fedddd79323b4b26df9b85e9543d83286d4c";
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.desy.de/philipp.middendorf/fdip/-/archive/${version}/fdip-${version}.tar.gz";
|
||||
sha256 = "184l76r4fgznq54rnhgjk7dg41kqdl0d1da02vr5y4cs2fyqppky";
|
||||
url = "https://gitlab.desy.de/thomas.white/fdip/-/archive/${version}/fdip-${version}.tar.gz";
|
||||
hash = "sha256-EaihnW7p//ecgMn+KKlfmBeXrnAqs+HdhN+ovuSrtiQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
||||
|
||||
1966
pkgs/applications/version-management/git-backup/Cargo.lock
generated
Normal file
1966
pkgs/applications/version-management/git-backup/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,12 +11,19 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj";
|
||||
};
|
||||
|
||||
cargoSha256 = "0lb53sk7rikmj365gvcvn1hq70d6dmhp0aj2dyipb2qasypqz5l3";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jsdw/git-backup";
|
||||
description = "A tool to help you backup your git repositories from services like GitHub";
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.3.12";
|
||||
version = "1.3.13";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit pname version;
|
||||
@ -15,7 +15,7 @@ buildGoModule rec {
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-M0FwFDtZazVjj/IUEN8vo2PcgpnGSIKRPc8jHfGE9t8=";
|
||||
hash = "sha256-zEY8iFF3SyZrIWveUWW3dvWnZL4h7rQ8EcMNIcWJ5g8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-UMT39If9Oa7vgpkW2oltCUkaNQ0Qf1nCO5Z8F8SaajA=";
|
||||
|
||||
@ -18,20 +18,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "video-trimmer";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "YaLTeR";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0zhQoxzU1GikYP5OwqMl34RsnefJtdZox5EuTqOFnas=";
|
||||
hash = "sha256-nr0PAvp4wlswQBNN2LLyYQMpk3IIleHf3+978XhUGGQ=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-kH9AfEskh7TTXF+PZwOZNWVJmnEeMJrSEEuDGyP5A5o=";
|
||||
hash = "sha256-YFbLMpQbHUtxRrBVarcoIeDsvc26NWc1YhMeCaLgJAc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerd";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = "containerd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-OHgakSNqIbXYDC7cTw2fy0HlElQMilDbSD5SSjbYJhc=";
|
||||
hash = "sha256-WwedtcsrDQwMQcKFO5nnPiHyGJpl5hXZlmpbBe1/ftY=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -4,7 +4,7 @@ dartConfigHook() {
|
||||
echo "Executing dartConfigHook"
|
||||
|
||||
echo "Installing dependencies"
|
||||
eval "$pubGetScript" --offline
|
||||
eval doPubGet "$pubGetScript" --offline
|
||||
|
||||
echo "Finished dartConfigHook"
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenvNoCC
|
||||
, lib
|
||||
, makeSetupHook
|
||||
, writeShellScriptBin
|
||||
, dart
|
||||
, git
|
||||
, cacert
|
||||
@ -159,7 +160,7 @@ let
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
dart pub get --offline
|
||||
doPubGet dart pub get --offline
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
@ -168,14 +169,28 @@ let
|
||||
dart pub deps --json | jq .packages > $out
|
||||
runHook postBuild
|
||||
'';
|
||||
} // buildDrvInheritArgs);
|
||||
} // (removeAttrs buildDrvInheritArgs [ "name" "pname" ]));
|
||||
|
||||
# As of Dart 3.0.0, Pub checks the revision of cached Git-sourced packages.
|
||||
# Git must be wrapped to return a positive result, as the real .git directory is wiped
|
||||
# to produce a deteministic dependency derivation output.
|
||||
# https://github.com/dart-lang/pub/pull/3791/files#diff-1639c4669c428c26e68cfebd5039a33f87ba568795f2c058c303ca8528f62b77R631
|
||||
gitSourceWrapper = writeShellScriptBin "git" ''
|
||||
args=("$@")
|
||||
if [[ "''${args[0]}" == "rev-list" && "''${args[1]}" == "--max-count=1" ]]; then
|
||||
revision="''${args[''${#args[@]}-1]}"
|
||||
echo "$revision"
|
||||
else
|
||||
${git}/bin/git "''${args[@]}"
|
||||
fi
|
||||
'';
|
||||
|
||||
hook = (makeSetupHook {
|
||||
# The setup hook should not be part of the fixed-output derivation.
|
||||
# Updates to the hook script should not change vendor hashes, and it won't
|
||||
# work at all anyway due to https://github.com/NixOS/nix/issues/6660.
|
||||
name = "${name}-dart-deps-setup-hook";
|
||||
substitutions = { inherit deps; };
|
||||
substitutions = { inherit gitSourceWrapper deps; };
|
||||
propagatedBuildInputs = [ dart git ];
|
||||
passthru = {
|
||||
files = deps.outPath;
|
||||
|
||||
@ -39,3 +39,8 @@ _setupPubCache() {
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Performs the given pub get command with an appropriate environment.
|
||||
doPubGet() {
|
||||
PATH="@gitSourceWrapper@/bin:$PATH" "$@"
|
||||
}
|
||||
|
||||
@ -76,7 +76,7 @@ let
|
||||
|
||||
mkdir -p build/flutter_assets/fonts
|
||||
|
||||
flutter packages get --offline -v
|
||||
doPubGet flutter pub get --offline -v
|
||||
flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)}
|
||||
|
||||
runHook postBuild
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
let version = "2.19.6"; in
|
||||
let version = "3.0.0"; in
|
||||
{ fetchurl }: {
|
||||
versionUsed = version;
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
|
||||
sha256 = "1nlmzappjk1f85iajlvqkvkqfd8ka7svsmglbh57ivvssvb6d6lr";
|
||||
sha256 = "0aav696x5p6zq6vfmv7zpy9v701dpbk0xwkyv2c2qdmrbb8wljb0";
|
||||
};
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
|
||||
sha256 = "1dpd8czllsxqly7hrcazp8g9b5zj6ibs93l5qyykijjbyjv58srw";
|
||||
sha256 = "1l06qk4w03qrrmnflb7a9jcm8ssx0p7b95jkhyvdg878d79zrpb7";
|
||||
};
|
||||
"${version}-aarch64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = "170bzz4505fffz4lbaxif9ryaw8pl8ylgkbjsd0w32xpng0bf4v9";
|
||||
sha256 = "0p15njnry0kp9878lmg86p01bbvin8xm6131r8barzclcj5v3msd";
|
||||
};
|
||||
"${version}-x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "0kvhvwd2q8s7mnjgvhl6gr3y73agcd0y79sm844xd8ybd9gg5pqg";
|
||||
sha256 = "0r96frjcqinhyzq809hv9yggm09clyc712ln3caqxfybcr552mm2";
|
||||
};
|
||||
"${version}-i686-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip";
|
||||
sha256 = "02iyzdz9grm3rc2dg7l1clww6n5n4kncv0gg6mlkgvmhk4hn9w1r";
|
||||
sha256 = "16qdcc6ssgh3158fpqld6sai3lxvyimvasjmgqrhfh7h8p0inzfw";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,43 +6,46 @@ let
|
||||
let files = builtins.attrNames (builtins.readDir dir);
|
||||
in map (f: dir + ("/" + f)) files;
|
||||
mkFlutter = { version, engineVersion, dartVersion, hash, dartHash, patches }:
|
||||
let args = {
|
||||
inherit version engineVersion patches;
|
||||
let
|
||||
args = {
|
||||
inherit version engineVersion patches;
|
||||
|
||||
dart = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = dartHash.x86_64-linux;
|
||||
};
|
||||
"${dartVersion}-aarch64-linux" = fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = dartHash.aarch64-linux;
|
||||
dart = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = dartHash.x86_64-linux;
|
||||
};
|
||||
"${dartVersion}-aarch64-linux" = fetchzip {
|
||||
url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
|
||||
sha256 = dartHash.aarch64-linux;
|
||||
};
|
||||
};
|
||||
};
|
||||
src = fetchzip {
|
||||
url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
|
||||
sha256 = hash;
|
||||
};
|
||||
};
|
||||
src = fetchzip {
|
||||
url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz";
|
||||
sha256 = hash;
|
||||
in
|
||||
(mkCustomFlutter args).overrideAttrs (prev: next: {
|
||||
passthru = next.passthru // rec {
|
||||
inherit wrapFlutter mkCustomFlutter mkFlutter;
|
||||
buildFlutterApplication = callPackage ../../../build-support/flutter {
|
||||
# Package a minimal version of Flutter that only uses Linux desktop release artifacts.
|
||||
flutter = wrapFlutter
|
||||
(mkCustomFlutter (args // {
|
||||
includedEngineArtifacts = {
|
||||
common = [ "flutter_patched_sdk_product" ];
|
||||
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
|
||||
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
|
||||
(architecture: [ "release" ]));
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
}; in (mkCustomFlutter args).overrideAttrs (prev: next: {
|
||||
passthru = next.passthru // rec {
|
||||
inherit wrapFlutter mkCustomFlutter mkFlutter;
|
||||
buildFlutterApplication = callPackage ../../../build-support/flutter {
|
||||
# Package a minimal version of Flutter that only uses Linux desktop release artifacts.
|
||||
flutter = wrapFlutter
|
||||
(mkCustomFlutter (args // {
|
||||
includedEngineArtifacts = {
|
||||
common = [ "flutter_patched_sdk_product" ];
|
||||
platform.linux = lib.optionals stdenv.hostPlatform.isLinux
|
||||
(lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64"))
|
||||
(architecture: [ "release" ]));
|
||||
};
|
||||
}));
|
||||
};
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
flutter2Patches = getPatches ./patches/flutter2;
|
||||
flutter3Patches = getPatches ./patches/flutter3;
|
||||
@ -50,6 +53,18 @@ in
|
||||
{
|
||||
inherit wrapFlutter;
|
||||
stable = mkFlutter {
|
||||
version = "3.10.0";
|
||||
engineVersion = "d44b5a94c976fbb65815374f61ab5392a220b084";
|
||||
dartVersion = "3.0.0";
|
||||
hash = "sha256-3cRVPNrph9QUUnAdQhd5TOp2i1zFRxJ+OhqxXrJ+ncU=";
|
||||
dartHash = {
|
||||
x86_64-linux = "sha256-AhvAt2c0URzL+MSIXlwbkuWNuhKbWvUpoyiYf1vXfcc=";
|
||||
aarch64-linux = "sha256-bo4kZtNpj91JaCW8+GD4bQ60oOWQ7daj4C7cAHwLMtw=";
|
||||
};
|
||||
patches = flutter3Patches;
|
||||
};
|
||||
|
||||
v37 = mkFlutter {
|
||||
version = "3.7.12";
|
||||
engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314";
|
||||
dartVersion = "2.19.6";
|
||||
|
||||
@ -56,22 +56,23 @@ let
|
||||
{
|
||||
base = [
|
||||
({ archive = "artifacts.zip"; } // lib.optionalAttrs (arch == "arm64") {
|
||||
# For some reason, the arm64 artifacts are missing shader code.
|
||||
# For some reason, the arm64 artifacts are missing shader code in Flutter < 3.10.0.
|
||||
postPatch = ''
|
||||
if [ -d shader_lib ]; then
|
||||
The shader_lib directory has been included in the artifact archive.
|
||||
This patch should be removed.
|
||||
if [ ! -d shader_lib ]; then
|
||||
ln -s ${lib.findSingle
|
||||
(pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts")
|
||||
(throw "Could not find the x64 artifact archive.")
|
||||
(throw "Could not find the correct x64 artifact archive.")
|
||||
artifactDerivations.platform.linux.x64.base
|
||||
}/shader_lib .
|
||||
fi
|
||||
ln -s ${lib.findSingle
|
||||
(pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts")
|
||||
(throw "Could not find the x64 artifact archive.")
|
||||
(throw "Could not find the correct x64 artifact archive.")
|
||||
artifactDerivations.platform.linux.x64.base
|
||||
}/shader_lib .
|
||||
'';
|
||||
})
|
||||
{ archive = "font-subset.zip"; }
|
||||
linux-flutter-gtk
|
||||
(linux-flutter-gtk // {
|
||||
# https://github.com/flutter/flutter/commit/9d94a51b607600a39c14470c35c676eb3e30eed6
|
||||
variant = "debug";
|
||||
})
|
||||
];
|
||||
variants = lib.genAttrs [ "debug" "profile" "release" ] (variant: [
|
||||
linux-flutter-gtk
|
||||
|
||||
@ -1,4 +1,73 @@
|
||||
{
|
||||
"d44b5a94c976fbb65815374f61ab5392a220b084" = {
|
||||
"flutter_patched_sdk.zip" = "sha256-uLMzCF3dsBeSZnoY9YQ2bBQhw+hUAksoDKEWr3TCnhk=";
|
||||
"flutter_patched_sdk_product.zip" = "sha256-0NbvAGSK0VgU6jSyboyhviP9H+wID7JoTS6xMqbZs2w=";
|
||||
"android-arm" = {
|
||||
"artifacts.zip" = "sha256-NZde8sVeknhR6bxchb/RURNIlKnJw6j5PZAWmmjiZvM=";
|
||||
};
|
||||
"android-arm-profile" = {
|
||||
"artifacts.zip" = "sha256-BTs1tuSdjVP8zAGCxV+uQ7sAAbCt0dML4g7/85IOFEs=";
|
||||
"linux-x64.zip" = "sha256-GpjP5omeAjHBLZjJQdUMUnPoEgYBLppicLPUTY0fHqM=";
|
||||
};
|
||||
"android-arm-release" = {
|
||||
"artifacts.zip" = "sha256-ip2GnYkKq8aLWjVPk9no3aOf0c3k1h9foznhgLpZ17U=";
|
||||
"linux-x64.zip" = "sha256-mGnmbraE98rqKRdO6keoITOaNCP0K3iYNRadihwOpxc=";
|
||||
};
|
||||
"android-arm64" = {
|
||||
"artifacts.zip" = "sha256-Sl7S/TNZWrlM4Z9UGN5rgGfpKk4UWKz6CKlQbz1qcZ4=";
|
||||
};
|
||||
"android-arm64-profile" = {
|
||||
"artifacts.zip" = "sha256-zNZtTxM8254y+KKSVYlBUYyIV2J04XN1cmnSjkQLJs8=";
|
||||
"linux-x64.zip" = "sha256-M8AbEwFV2zedeqMoNeb+2UbR7i9I9rGh6LXBQcPO4iA=";
|
||||
};
|
||||
"android-arm64-release" = {
|
||||
"artifacts.zip" = "sha256-PdnAIcYccdRs3r6M8rwmgl2x+TsBPMRF/iAEgwLbt/4=";
|
||||
"linux-x64.zip" = "sha256-kmLkKXBj/70B3v5GJ50trTlV8epj16jOlQrh1U4/pVA=";
|
||||
};
|
||||
"android-x86" = {
|
||||
"artifacts.zip" = "sha256-J1kgvNvdWo05HMHJMlVFECLMVnoCqUm1oP4K394w+xc=";
|
||||
};
|
||||
"android-x86-jit-release" = {
|
||||
"artifacts.zip" = "sha256-Tz/veYh/73px0eH0FOXbN4G8fVjXmEHv7G8lRm3YLtY=";
|
||||
};
|
||||
"android-x64" = {
|
||||
"artifacts.zip" = "sha256-+WT7oT31XwE+ykLbiAUvnKw+WVR0VeFXPGpcMUHbsTg=";
|
||||
};
|
||||
"android-x64-profile" = {
|
||||
"artifacts.zip" = "sha256-f298VAJoZ2x+w0bxma7wu5h7Bn6+kCdrHh5qtjhhhhc=";
|
||||
"linux-x64.zip" = "sha256-73Br9XgafwmagxAf61NSHn4BHn4q90pHJYEXCfAG8qY=";
|
||||
};
|
||||
"android-x64-release" = {
|
||||
"artifacts.zip" = "sha256-63hQCvObPmIxTcKyBQlXgGY6FfKp9PrbBY0RkSr1D/U=";
|
||||
"linux-x64.zip" = "sha256-i5WQeePNxUNAbVR06Lz2XCXvZZTJxaFB6txtpVn2h9I=";
|
||||
};
|
||||
"linux-arm64" = {
|
||||
"artifacts.zip" = "sha256-LTdVexuy7cL6dJqdM14YteI7Jo/z5wYOHakbX/BiV38=";
|
||||
"font-subset.zip" = "sha256-cqLjvl3maO6NpN47/e718xyuSL8L8cHqU6ybuwlD+fA=";
|
||||
};
|
||||
"linux-arm64-debug" = {
|
||||
"linux-arm64-flutter-gtk.zip" = "sha256-SRlKQllg5UWHk2kOIQ6ZwbqG5FoeFGCl2F9tTI+XVOE=";
|
||||
};
|
||||
"linux-arm64-profile" = {
|
||||
"linux-arm64-flutter-gtk.zip" = "sha256-4wERBO+eimsSKFt8/P6mQqgzv+HURK+O/YFHAUHpklA=";
|
||||
};
|
||||
"linux-arm64-release" = {
|
||||
"linux-arm64-flutter-gtk.zip" = "sha256-1XHdFiW//1Yd+qOLrRlk0vma99HlGDC/RA0An8db/oY=";
|
||||
};
|
||||
"linux-x64" = {
|
||||
"artifacts.zip" = "sha256-Bl0BRxUfVqNX6y7HdUXu5lIFzMLB2GUJauhOLEeInEE=";
|
||||
"font-subset.zip" = "sha256-v02HV8QOqwdv30RiHpKu8ujTXOQmupGr9HCfpBUvrKM=";
|
||||
};
|
||||
"linux-x64-debug" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-xjScsvWgPO8qeccw5BGzNrMLNzn5O+CvOpoPkvlrX0o=";
|
||||
};
|
||||
"linux-x64-profile" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-52nMjoHQZ/ve7yJW9d8YK02U8mowe9xHZpkTwbGq9vU=";
|
||||
};
|
||||
"linux-x64-release" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-SA7Th1Qasaj4Q5wFr89Rv8PNQx6s6zvHsDxT1EKKZV0=";
|
||||
};
|
||||
};
|
||||
"1a65d409c7a1438a34d21b60bf30a6fd5db59314" = {
|
||||
"flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k=";
|
||||
"flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA=";
|
||||
@ -44,7 +113,6 @@
|
||||
"linux-arm64" = {
|
||||
"artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw=";
|
||||
"font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU=";
|
||||
"linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg=";
|
||||
};
|
||||
"linux-arm64-debug" = {
|
||||
"linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg=";
|
||||
@ -58,7 +126,6 @@
|
||||
"linux-x64" = {
|
||||
"artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8=";
|
||||
"font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY=";
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";
|
||||
};
|
||||
"linux-x64-debug" = {
|
||||
"linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M=";
|
||||
|
||||
@ -101,9 +101,9 @@ in
|
||||
mkdir -p $out/bin
|
||||
makeWrapper '${immutableFlutter}' $out/bin/flutter \
|
||||
--set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
|
||||
--prefix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
|
||||
--prefix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
|
||||
--prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
|
||||
--suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \
|
||||
--suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \
|
||||
--suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \
|
||||
--prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \
|
||||
--prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \
|
||||
--prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}'
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.45.2";
|
||||
version = "3.46.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-bHrFOf6Qb1z3uB5HpTq4T+TWl7YYVL849pDycHekynk=";
|
||||
hash = "sha256-d8RhnMcTeHFDpVS+c5lETRz75vFPOMIaqbqPGVG4vHY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-iot";
|
||||
version = "8.52.0";
|
||||
version = "8.53.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ztuOTjWBlmTS9IvHqNW+mBi1AT0YW3RjwCZTwEcddpE=";
|
||||
hash = "sha256-dRNrbdFASkh1wWa1Z2VaUPijbyqUyIlVYSKvqR9N1js=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.19.12";
|
||||
version = "0.19.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "mautrix";
|
||||
repo = "python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XG2uAG5sKGGtnCTQJ2gsAm7jxtvMg+1MXPJLkb+2cPQ=";
|
||||
hash = "sha256-nmsYe/iDKW4dUSuxSoUz2NpAGLPOTzrBNy6AwYMVs8k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyqt6-sip";
|
||||
version = "13.4.0";
|
||||
version = "13.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyQt6_sip";
|
||||
inherit version;
|
||||
hash = "sha256-bYej7lhy11EbdpV9aKMhCTUsrzt6QqAdnuIAMrNQ2Xk=";
|
||||
hash = "sha256-0ekUF1KWZmlXbQSze6CxIqu8QcycNUk3UQKNfZHE3Uk=";
|
||||
};
|
||||
|
||||
# There is no test code and the check phase fails with:
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.9.8";
|
||||
version = "0.9.9";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-lamd33oHWNhTZ5XGE7g8ztV6Mgh+Gjh2KfoyFjkGmXc=";
|
||||
hash = "sha256-N3BHIec1j4G5bVQu5KKTzmxr4fFjTWIZdmtp1pSfdSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "pytweening";
|
||||
version = "1.0.4";
|
||||
version = "1.0.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hTMoLPcLMd6KBJnhz0IJMLABPHhxGIcrLsiZOCeS4uY=";
|
||||
hash = "sha256-dnE08b9Xt2wc6faS3Rz8d22aJ53mck6NBIVFCP1+3ts=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "pytweening" ];
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schwifty";
|
||||
version = "2023.2.0";
|
||||
version = "2023.3.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YEBBrU+Xcl5zFPEt/EvPD5eFPUYSpGJ3ZoIK6PRVwlc=";
|
||||
hash = "sha256-Un9J1Yzt080vZ3rzoVURNpMcAObBS8Jsn5kEQKUVxf0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -54,7 +54,7 @@ let
|
||||
LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "sha256-kEiwwYAUABcINdSaAyRDSFKtKLPj3axdNvXvkI1k0Uo=";
|
||||
sha256 = "sha256-tMiZsX5OyVw6VVImn4nWwEFdBw+TKKbE7oACibQC0oA=";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
||||
@ -24,12 +24,12 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "6.1.2";
|
||||
version = "6.2.0";
|
||||
sourceRoot = ".";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
|
||||
hash = "sha256-b7PuIv6fqG2C4XNXLVBMCJ8Qgl10lyVZJibgkLOMlnk=";
|
||||
hash = "sha256-8ej3iGN6xXTUcdYZ0glrqsoEoZtXoDQ5ngeWM9tEGUU=";
|
||||
};
|
||||
|
||||
# Update with
|
||||
|
||||
@ -538,36 +538,44 @@
|
||||
"https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz"
|
||||
]
|
||||
},
|
||||
"java_tools-v11.9.zip": {
|
||||
"name": "java_tools-v11.9.zip",
|
||||
"sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",
|
||||
"java_tools-v12.3.zip": {
|
||||
"name": "java_tools-v12.3.zip",
|
||||
"sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_darwin-v11.9.zip": {
|
||||
"name": "java_tools_darwin-v11.9.zip",
|
||||
"sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4",
|
||||
"java_tools_darwin_arm64-v12.3.zip": {
|
||||
"name": "java_tools_darwin_arm64-v12.3.zip",
|
||||
"sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_linux-v11.9.zip": {
|
||||
"name": "java_tools_linux-v11.9.zip",
|
||||
"sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",
|
||||
"java_tools_darwin_x86_64-v12.3.zip": {
|
||||
"name": "java_tools_darwin_x86_64-v12.3.zip",
|
||||
"sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_windows-v11.9.zip": {
|
||||
"name": "java_tools_windows-v11.9.zip",
|
||||
"sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a",
|
||||
"java_tools_linux-v12.3.zip": {
|
||||
"name": "java_tools_linux-v12.3.zip",
|
||||
"sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"java_tools_windows-v12.3.zip": {
|
||||
"name": "java_tools_windows-v12.3.zip",
|
||||
"sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": {
|
||||
@ -772,11 +780,11 @@
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_darwin_aarch64_archive",
|
||||
"name": "openjdk17_darwin_aarch64_archive",
|
||||
"sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64",
|
||||
"sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk17_darwin_archive": {
|
||||
@ -784,11 +792,11 @@
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_darwin_archive",
|
||||
"name": "openjdk17_darwin_archive",
|
||||
"sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64",
|
||||
"sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk17_linux_archive": {
|
||||
@ -796,11 +804,11 @@
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_linux_archive",
|
||||
"name": "openjdk17_linux_archive",
|
||||
"sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64",
|
||||
"sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"openjdk17_windows_archive": {
|
||||
@ -808,11 +816,11 @@
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_windows_archive",
|
||||
"name": "openjdk17_windows_archive",
|
||||
"sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64",
|
||||
"sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk17_windows_arm64_archive": {
|
||||
@ -820,11 +828,11 @@
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "openjdk17_windows_arm64_archive",
|
||||
"name": "openjdk17_windows_arm64_archive",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
|
||||
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk18_darwin_aarch64_archive": {
|
||||
@ -1030,10 +1038,10 @@
|
||||
"generator_function": "dist_http_file",
|
||||
"generator_name": "openjdk_win_arm64_vanilla",
|
||||
"name": "openjdk_win_arm64_vanilla",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"openjdk_win_minimal": {
|
||||
@ -1139,10 +1147,10 @@
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_darwin_for_testing": {
|
||||
"remote_java_tools_darwin_arm64_for_testing": {
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remote_java_tools_darwin_for_testing",
|
||||
"name": "remote_java_tools_darwin_for_testing",
|
||||
"generator_name": "remote_java_tools_darwin_arm64_for_testing",
|
||||
"name": "remote_java_tools_darwin_arm64_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
@ -1151,10 +1159,28 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4",
|
||||
"sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_darwin_x86_64_for_testing": {
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remote_java_tools_darwin_x86_64_for_testing",
|
||||
"name": "remote_java_tools_darwin_x86_64_for_testing",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_for_testing": {
|
||||
@ -1169,10 +1195,10 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",
|
||||
"sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_linux": {
|
||||
@ -1197,10 +1223,10 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",
|
||||
"sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_test": {
|
||||
@ -1215,16 +1241,16 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",
|
||||
"sha256": "cbb62ecfef61568ded46260a8e8e8430755db7ec9638c0c7ff668a656f6c042f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_test_darwin": {
|
||||
"remote_java_tools_test_darwin_arm64": {
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remote_java_tools_test_darwin",
|
||||
"name": "remote_java_tools_test_darwin",
|
||||
"generator_name": "remote_java_tools_test_darwin_arm64",
|
||||
"name": "remote_java_tools_test_darwin_arm64",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
@ -1233,10 +1259,28 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4",
|
||||
"sha256": "29aa0c2de4e3cf45bc55d2995ba803ecbd1173a8d363860abbc309551db7931b",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_arm64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_arm64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_test_darwin_x86_64": {
|
||||
"generator_function": "dist_http_archive",
|
||||
"generator_name": "remote_java_tools_test_darwin_x86_64",
|
||||
"name": "remote_java_tools_test_darwin_x86_64",
|
||||
"patch_cmds": [
|
||||
"test -f BUILD && chmod u+w BUILD || true",
|
||||
"echo >> BUILD",
|
||||
"echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD"
|
||||
],
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "3c3fb1967a0f35c73ff509505de53ca4611518922a6b7c8c22a468aa7503132c",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_darwin_x86_64-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_darwin_x86_64-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_test_linux": {
|
||||
@ -1251,10 +1295,10 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",
|
||||
"sha256": "32157b5218b151009f5b99bf5e2f65e28823d269dfbba8cd57e7da5e7cdd291d",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_linux-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_linux-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_test_windows": {
|
||||
@ -1269,10 +1313,10 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a",
|
||||
"sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remote_java_tools_windows": {
|
||||
@ -1297,10 +1341,10 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a",
|
||||
"sha256": "ec6f91387d2353eacb0ca0492f35f68c5c7b0e7a80acd1fb825088b4b069fab1",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip"
|
||||
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.3/java_tools_windows-v12.3.zip",
|
||||
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.3/java_tools_windows-v12.3.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk11_linux": {
|
||||
@ -1594,11 +1638,11 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "73d5c4bae20325ca41b606f7eae64669db3aac638c5b3ead4a975055846ad6de",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-linux_x64",
|
||||
"sha256": "20c91a922eec795f3181eaa70def8b99d8eac56047c9a14bfb257c85b991df1b",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-linux_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_x64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk17_macos": {
|
||||
@ -1638,11 +1682,11 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "54247dde248ffbcd3c048675504b1c503b81daf2dc0d64a79e353c48d383c977",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_aarch64",
|
||||
"sha256": "515dd56ec99bb5ae8966621a2088aadfbe72631818ffbba6e4387b7ee292ab09",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_aarch64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk17_macos_for_testing": {
|
||||
@ -1658,11 +1702,11 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "89d04b2d99b05dcb25114178e65f6a1c5ca742e125cab0a63d87e7e42f3fcb80",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-macosx_x64",
|
||||
"sha256": "e6317cee4d40995f0da5b702af3f04a6af2bbd55febf67927696987d11113b53",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-macosx_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-macosx_x64.tar.gz"
|
||||
]
|
||||
},
|
||||
"remotejdk17_win": {
|
||||
@ -1702,11 +1746,11 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"strip_prefix": "zulu17.30.15-ca-jdk17.0.1-win_aarch64",
|
||||
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_aarch64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk17_win_for_testing": {
|
||||
@ -1722,11 +1766,11 @@
|
||||
"patch_cmds_win": [
|
||||
"Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force"
|
||||
],
|
||||
"sha256": "e965aa0ea7a0661a3446cf8f10ee00684b851f883b803315289f26b4aa907fdb",
|
||||
"strip_prefix": "zulu17.32.13-ca-jdk17.0.2-win_x64",
|
||||
"sha256": "9972c5b62a61b45785d3d956c559e079d9e91f144ec46225f5deeda214d48f27",
|
||||
"strip_prefix": "zulu17.38.21-ca-jdk17.0.5-win_x64",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-win_x64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"remotejdk18_linux": {
|
||||
@ -2158,20 +2202,20 @@
|
||||
"https://cdn.azul.com/zulu/bin/zulu11.56.19-ca-jdk11.0.15-win_x64.zip"
|
||||
]
|
||||
},
|
||||
"zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip": {
|
||||
"name": "zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"sha256": "811d7e7591bac4f081dfb00ba6bd15b6fc5969e1f89f0f327ef75147027c3877",
|
||||
"zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz": {
|
||||
"name": "zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
|
||||
"sha256": "dbc6ae9163e7ff469a9ab1f342cd1bc1f4c1fb78afc3c4f2228ee3b32c4f3e43",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-linux_aarch64.tar.gz"
|
||||
]
|
||||
},
|
||||
"zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz": {
|
||||
"name": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
|
||||
"sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06",
|
||||
"zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip": {
|
||||
"name": "zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
|
||||
"sha256": "bc3476f2161bf99bc9a243ff535b8fc033b34ce9a2fa4b62fb8d79b6bfdc427f",
|
||||
"urls": [
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz"
|
||||
"https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip",
|
||||
"https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-jdk17.0.5-win_aarch64.zip"
|
||||
]
|
||||
},
|
||||
"zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kube-linter";
|
||||
version = "0.6.1";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stackrox";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-86qLCQH85GSP194nH6lUBvEfuCFs6671dne2zYDwoGc=";
|
||||
sha256 = "sha256-REUjvIiHASiFQyzU/4n9wPkvaVGmaU/2MBqIBjtWhdY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-yPB2t5Sj14uA3QU6OulwQ03LLBZzCfsilBMk1EqAv08=";
|
||||
vendorHash = "sha256-ATGSIwjmqRuqn+6VTBvjdfXbcABEdaf5HEsaS2o2V3o=";
|
||||
|
||||
ldflags = [
|
||||
"-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}"
|
||||
@ -19,6 +19,8 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkFlags = [ "-skip=TestCreateContextsWithIgnorePaths" ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd kube-linter \
|
||||
--bash <($out/bin/kube-linter completion bash) \
|
||||
@ -36,7 +38,7 @@ buildGoModule rec {
|
||||
homepage = "https://kubelinter.io";
|
||||
changelog = "https://github.com/stackrox/kube-linter/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ mtesseract stehessel ];
|
||||
maintainers = with maintainers; [ mtesseract stehessel Intuinewin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-update";
|
||||
version = "13.0.1";
|
||||
version = "13.0.2";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-152tOUzFwkxR8B06PcnfYbrn0uLMUCOKNWh9b9LG3K0=";
|
||||
sha256 = "sha256-WaVxPfklQnd0XSsBRkSoJ/SQW3vp/0BTOtVPz25CjWg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-QN1K/Hsy0kDQUi7D22+k5fa+LqlVFa4G5BG5Ckrouhs=";
|
||||
cargoHash = "sha256-DC5NANbGaaGOZ36NpUSqKEd2bctbYB9YLoKYAZ4x67I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
1669
pkgs/development/tools/rust/rustup-toolchain-install-master/Cargo.lock
generated
Normal file
1669
pkgs/development/tools/rust/rustup-toolchain-install-master/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,12 +1,13 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, stdenv
|
||||
, patchelf
|
||||
, zlib
|
||||
, pkg-config
|
||||
, openssl
|
||||
, xz
|
||||
, Security
|
||||
}:
|
||||
|
||||
@ -21,6 +22,10 @@ rustPlatform.buildRustPackage rec {
|
||||
hash = "sha256-J25ER/g8Kylw/oTIEl4Gl8i1xmhR+4JM5M5EHpl1ras=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
patches =
|
||||
let
|
||||
patchelfPatch = runCommand "0001-dynamically-patchelf-binaries.patch" {
|
||||
@ -41,11 +46,15 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
openssl
|
||||
xz
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
cargoSha256 = "n7t8Ap9hdhrjmtKjfdyozf26J7yhu57pedm19CunLF4=";
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Install a rustc master toolchain usable from rustup";
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typeshare";
|
||||
version = "1.5.1";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1password";
|
||||
repo = "typeshare";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PjIKxX1xIALyWD8NyDeoIZMMfsS4/w/AweAcYOcsLNs=";
|
||||
hash = "sha256-vKjSpjbjTY9YxJGtqyoat6qI9ipmou+HQt35Dhpgk4E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-3vF7bgN2qhzgYIjH1rSfEwOLqR4VR4IQvVtNjwBS6+M=";
|
||||
cargoHash = "sha256-dnQttsI6v90TJD8MekaLV63ltl147zBCe3mmfWj6cxs=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
2212
pkgs/development/tools/tarmac/Cargo.lock
generated
Normal file
2212
pkgs/development/tools/tarmac/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl_1_1
|
||||
, openssl
|
||||
, stdenv
|
||||
, Security
|
||||
}:
|
||||
|
||||
@ -18,18 +18,25 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "sha256-O6qrAzGiAxiE56kpuvH/jDKHRXxHZ2SlDL5nwOOd4EU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-QnpowYv/TBXjPHK8z6KAzN3gSsfNOf9POybqsyugeWc=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl_1_1
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
];
|
||||
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Resource compiler and asset manager for Roblox";
|
||||
longDescription = ''
|
||||
|
||||
@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
dart pub get --offline
|
||||
doPubGet dart pub get --offline
|
||||
mkdir build
|
||||
ln -s ${embedded-protocol} build/embedded-protocol
|
||||
runHook postConfigure
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, flutter
|
||||
, flutter37
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
flutter.buildFlutterApplication {
|
||||
flutter37.buildFlutterApplication {
|
||||
pname = "firmware-updater";
|
||||
version = "unstable-2023-04-30";
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "microcode-intel";
|
||||
version = "20230214";
|
||||
version = "20230512";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "Intel-Linux-Processor-Microcode-Data-Files";
|
||||
rev = "microcode-${version}";
|
||||
hash = "sha256-SwdE1c7OEg5nncs5QqaTKCL77KddeHw7ZilctQ4L9RA=";
|
||||
hash = "sha256-Ay907cXbT+LlE4foK4TODcDB5Rx/Zo7HY17erem71rw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ iucode-tool libarchive ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "etcd";
|
||||
version = "3.4.25";
|
||||
version = "3.4.26";
|
||||
|
||||
vendorHash = "sha256-duqOIMIXAuJjvKDM15mDdi+LZUZm0uK0MjTv2Dsl3FA=";
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoModule rec {
|
||||
owner = "etcd-io";
|
||||
repo = "etcd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CReSNWoRN2cBrhVujlAsOaI1gUfws962oLIVGWnLTAQ=";
|
||||
sha256 = "sha256-EobwFYdFVCal7V1KyODuIry3ZBvRUG1/XYZkVQoibkg=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "martin";
|
||||
version = "0.8.1";
|
||||
version = "0.8.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maplibre";
|
||||
repo = "martin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-gMIdUqX872TMAS8tyLoKJVWBBAphikhz/s6P+vbZSCw=";
|
||||
hash = "sha256-8Kdvwu8KLEMEYoRgkcgYYyX60am+P6jEF7e2W2/lICk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Jt5e4ULLIEta0QwvAkHRx891tMUhbj4eAvnPOXAb9CM=";
|
||||
cargoHash = "sha256-XCKLi9m/MZXeBpzLFaxPtEsKQYw1wJlWQdspaRFR6Ug=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@ -80,8 +80,8 @@ buildBazelPackage rec {
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-jx8RavJKlBtZQtZf4GrUkOlhM6qI4LO5lK3HRgn1vzE=";
|
||||
aarch64-linux = "sha256-toEPrGVh61sHsVbhsideMmnX8uXIN+2x8LuZpczTEdw=";
|
||||
x86_64-linux = "sha256-mw3k2r4heoAcBdcc7uYdnotUBrF1nM5Vmqbay+2DkjI=";
|
||||
aarch64-linux = "sha256-2gSxzm7SXvrGEgwZnp5KdEpbV/+zdosf8Z5lrkK3QiI=";
|
||||
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
|
||||
dontUseCmakeConfigure = true;
|
||||
dontUseGnConfigure = true;
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "grafana-agent";
|
||||
version = "0.33.1";
|
||||
version = "0.33.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "agent";
|
||||
sha256 = "sha256-iE7LNm0Nur0eo7AjTDl9sq3oxm6SdIUoSfT8h2C4jOA=";
|
||||
hash = "sha256-9/1EzRIuWpXbEVA6WIy5WAHFkJgPoqABLfvgA7DB/oU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-NqsUeTxTYQrVMJ4LYA5NC8A/PpVuy6fnKptxK+ieZAU=";
|
||||
vendorHash = "sha256-ZeSK5sTU/ey0pe303Y5eZi7D25lTXaQHJsPLDQ/tB+s=";
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
ldflags = let
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss";
|
||||
version = "unstable-2022-10-15";
|
||||
version = "unstable-2023-04-13";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.tt-rss.org/fox/tt-rss.git";
|
||||
rev = "602e8684258062937d7f554ab7889e8e02318c96";
|
||||
sha256 = "sha256-vgRaxo998Gx9rVeZZl52jppK1v11jpEK0J0NoDMT44I=";
|
||||
rev = "0578bf802571781a0a7e3debbbec66437a7d28b4";
|
||||
hash = "sha256-j6R1QoH8SzUtyI3rGE6rHriboAfApAo/Guw8WbJ7LqU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# see the code of Config::get_version(). you can check that the version in
|
||||
# the footer of the preferences pages is not UNKNOWN
|
||||
echo "22.10" > $out/version_static.txt
|
||||
echo "23.04" > $out/version_static.txt
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fuse-overlayfs";
|
||||
version = "1.11";
|
||||
version = "1.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-BrZ+af5WmIEFC1NwpcVqxol4b4aFxj1wnvxDGx20SBA=";
|
||||
hash = "sha256-k9ws3m0stPqzmi3WOAWH3RfQywlOa6l5SFvloanf5e0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -2,28 +2,45 @@
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, systemdMinimal
|
||||
, withSystemd ? false
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector-contrib";
|
||||
version = "0.66.0";
|
||||
version = "0.76.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FT5AoqCHNf2sdKyejALOsL/zHrrxP7vdntagR9vA00I=";
|
||||
sha256 = "sha256-Aeiq9IJReUxJUpeq5mSReK5foC5aY4fMSZli0ZUjYPc=";
|
||||
};
|
||||
# proxy vendor to avoid hash missmatches between linux and macOS
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-65bfTCMRJ8iL5ABGPqvkayw4zSn4KkCriEkWYa0Pe68=";
|
||||
vendorSha256 = "sha256-vLbx/qmSZuteuvChnyA/wcEcIjU3zWkxSjfk8VBdgU4=";
|
||||
|
||||
subPackages = [ "cmd/otelcontribcol" ];
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcontribcol";
|
||||
|
||||
# CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0"
|
||||
# https://github.com/shirou/gopsutil/issues/976
|
||||
CGO_ENABLED = if stdenv.isLinux then 1 else 0;
|
||||
|
||||
# journalctl is required in-$PATH for the journald receiver tests.
|
||||
nativeCheckInputs = lib.optionals stdenv.isLinux [ systemdMinimal ];
|
||||
|
||||
# We don't inject the package into propagatedBuildInputs unless
|
||||
# asked to avoid hard-requiring a large package. For the journald
|
||||
# receiver to work, journalctl will need to be available in-$PATH,
|
||||
# so expose this as an option for those who want more control over
|
||||
# it instead of trusting the global $PATH.
|
||||
propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ];
|
||||
|
||||
# This test fails on darwin for mysterious reasons.
|
||||
checkFlags = lib.optionals stdenv.isDarwin
|
||||
[ "-skip" "TestDefaultExtensions/memory_ballast" ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@ -38,6 +38,14 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];
|
||||
|
||||
# relax lints to fix an error caused by invalid macro_export
|
||||
# error: `log_error` isn't a valid `#[macro_export]` argument
|
||||
# note: `#[deny(invalid_macro_export_arguments)]` implied by `#[deny(warnings)]`
|
||||
postPatch = ''
|
||||
substituteInPlace src/lib.rs \
|
||||
--replace '#![deny(' '#![warn('
|
||||
'';
|
||||
|
||||
# TODO export TREMOR_PATH($out/lib) variable
|
||||
postInstall = ''
|
||||
# Copy the standard library to $out/lib
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trillian";
|
||||
version = "1.5.1";
|
||||
vendorSha256 = "sha256-L2aZYwlJq9yVaaKgxa9NoqXTKD/pUq2OMiFftP364Kw=";
|
||||
version = "1.5.2";
|
||||
vendorHash = "sha256-DlqezeMZsOaCoqvGMiU+fHMq+p3tZ+XBulB/G3BJESM=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v5feUTiK6ql0YcRR6RDAj+pS/PZ7vDnSf0ue2rtWb8k=";
|
||||
sha256 = "sha256-m+22UK37IBCo48AgzINxKvudhEwvStz6fLWjE49saIg=";
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
|
||||
@ -24,14 +24,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xrootd";
|
||||
version = "5.5.4";
|
||||
version = "5.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xrootd";
|
||||
repo = "xrootd";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-6yjZ50ZTXfKcfYwuuAwqXOWsVucpNRWEC9F3rcYSRXQ=";
|
||||
hash = "sha256-SLmxv8opN7z4V07S9kLGo8HG7Ql62iZQLtf3zGemwA8=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "man" ];
|
||||
|
||||
1682
pkgs/tools/security/rucredstash/Cargo.lock
generated
Normal file
1682
pkgs/tools/security/rucredstash/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,10 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "1jwsj2y890nxpgmlfbr9hms2raspp5h89ykzsh014mf7lb3yxzwg";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
@ -19,7 +23,10 @@ rustPlatform.buildRustPackage rec {
|
||||
# presence of certain AWS infrastructure
|
||||
doCheck = false;
|
||||
|
||||
cargoSha256 = "0qnfrwpdvjksc97iiwn1r6fyqaqn0q3ckbdzswf9flvwshqzb6ih";
|
||||
# update Cargo.lock to work with openssl 3
|
||||
postPatch = ''
|
||||
ln -sf ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Rust port for credstash. Manages credentials securely in AWS cloud";
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "slsa-verifier";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slsa-framework";
|
||||
repo = "slsa-verifier";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5TILEYrnXNDxtRkCaFHUYAI0w5KSzlUAKovTnJcll90=";
|
||||
hash = "sha256-qhBMWYyd2S8ZKAqwMkXWTP84kLt3f4471JOPrfScFek=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xpYXA/j/ClcJl80yh/tbG5jIfL7jdmG+k95Lipr2+RA=";
|
||||
vendorHash = "sha256-9EY7zhvDgZsNQA7iNu1zueJxpTA6cLwjpQYjUdUy6do=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
GO111MODULE = "on";
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hcledit";
|
||||
version = "0.2.7";
|
||||
version = "0.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minamijoyo";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hunM29K6RgeVkY8nNNIYigCh2sTCR1OyPE+k3cmIJTU=";
|
||||
hash = "sha256-Y1v4VqbF23ah1MeBeFEjmNVfmA9DkMJZvulmy2kVdUI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KwoauyXeDMMTUgtLvz6m28nvFSl5fptZzEvwFVC3n8g=";
|
||||
|
||||
@ -1,20 +1,30 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "nerdfix";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loichyan";
|
||||
repo = "nerdfix";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-2YmlwHTll5BI1mV9/zEw86g302U203vpSNrN6q0x+es=";
|
||||
hash = "sha256-71P0ESPLTUq8z0mSU4v8KmS069DNUi5fPHz01Kg3aKg=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hza+Vuxg9iIcXaYlPuhxZsxJ3EnYrjHzdWthXyCnEYc=";
|
||||
cargoHash = "sha256-XAelHpTVvz+jsDzfB+jsEuUdB0hN7c+hVDvCyOixx9E=";
|
||||
|
||||
patches = [
|
||||
# fixes failing tests due to outdated snapshots
|
||||
(fetchpatch {
|
||||
name = "test-cli-udpate-stdout.patch";
|
||||
url = "https://github.com/loichyan/nerdfix/commit/4070f9e894337ca7d3f7641258428ad6d7cd6332.patch";
|
||||
hash = "sha256-oDuHKgoMcOaO1mtBbT1Uwn5ZUp/FvqsD4S+A1LdOhcE=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nerdfix helps you to find/fix obsolete nerd font icons in your project";
|
||||
|
||||
@ -1890,7 +1890,6 @@ with pkgs;
|
||||
git-archive-all = python3.pkgs.callPackage ../applications/version-management/git-archive-all { };
|
||||
|
||||
git-backup = callPackage ../applications/version-management/git-backup {
|
||||
openssl = openssl_1_1;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
@ -13662,7 +13661,6 @@ with pkgs;
|
||||
|
||||
tremor-rs = callPackage ../tools/misc/tremor-rs {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
tremor-language-server = callPackage ../tools/misc/tremor-rs/ls.nix { };
|
||||
@ -14748,8 +14746,10 @@ with pkgs;
|
||||
flutterPackages =
|
||||
recurseIntoAttrs (callPackage ../development/compilers/flutter { });
|
||||
flutter-unwrapped = flutterPackages.stable;
|
||||
flutter37-unwrapped = flutterPackages.v37;
|
||||
flutter2-unwrapped = flutterPackages.v2;
|
||||
flutter = flutterPackages.wrapFlutter flutter-unwrapped;
|
||||
flutter37 = flutterPackages.wrapFlutter flutter37-unwrapped;
|
||||
flutter2 = flutterPackages.wrapFlutter flutter2-unwrapped;
|
||||
|
||||
fnm = callPackage ../development/tools/fnm {
|
||||
@ -16379,7 +16379,6 @@ with pkgs;
|
||||
};
|
||||
rustup-toolchain-install-master = callPackage ../development/tools/rust/rustup-toolchain-install-master {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
rusty-man = callPackage ../development/tools/rust/rusty-man { };
|
||||
typeshare = callPackage ../development/tools/rust/typeshare { };
|
||||
@ -29352,9 +29351,7 @@ with pkgs;
|
||||
|
||||
brave = callPackage ../applications/networking/browsers/brave { };
|
||||
|
||||
break-time = callPackage ../applications/misc/break-time {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
break-time = callPackage ../applications/misc/break-time { };
|
||||
|
||||
breezy = with python3Packages; toPythonApplication breezy;
|
||||
|
||||
@ -33680,7 +33677,6 @@ with pkgs;
|
||||
|
||||
rucredstash = callPackage ../tools/security/rucredstash {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
|
||||
runc = callPackage ../applications/virtualization/runc { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user