mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-03 13:30:36 +00:00
Merge release-21.11 into staging-next-21.11
This commit is contained in:
github-actions[bot]
@@ -22,7 +22,7 @@ rec {
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||
|
||||
qemuBinary = qemuPkg: {
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64";
|
||||
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
|
||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
|
||||
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
|
||||
@@ -79,6 +79,11 @@ let
|
||||
# we use a list of mime types from the mailcap package, which is also
|
||||
# used by most other Linux distributions by default.
|
||||
include ${pkgs.mailcap}/etc/nginx/mime.types;
|
||||
# When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database
|
||||
# contains 1026 enries and the default is only 1024. Setting to a higher number to remove the need to
|
||||
# overwrite it because nginx does not allow duplicated settings.
|
||||
types_hash_max_size 4096;
|
||||
|
||||
include ${cfg.package}/conf/fastcgi.conf;
|
||||
include ${cfg.package}/conf/uwsgi_params;
|
||||
|
||||
@@ -113,7 +118,6 @@ let
|
||||
tcp_nopush on;
|
||||
tcp_nodelay on;
|
||||
keepalive_timeout 65;
|
||||
types_hash_max_size 4096;
|
||||
''}
|
||||
|
||||
ssl_protocols ${cfg.sslProtocols};
|
||||
|
||||
406
nixos/modules/virtualisation/amazon-ec2-amis.nix
Normal file
406
nixos/modules/virtualisation/amazon-ec2-amis.nix
Normal file
@@ -0,0 +1,406 @@
|
||||
let self = {
|
||||
"14.04".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-71c6f470";
|
||||
"14.04".ap-northeast-1.x86_64-linux.pv-ebs = "ami-4dcbf84c";
|
||||
"14.04".ap-northeast-1.x86_64-linux.pv-s3 = "ami-8fc4f68e";
|
||||
"14.04".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-da280888";
|
||||
"14.04".ap-southeast-1.x86_64-linux.pv-ebs = "ami-7a9dbc28";
|
||||
"14.04".ap-southeast-1.x86_64-linux.pv-s3 = "ami-c4290996";
|
||||
"14.04".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-ab523e91";
|
||||
"14.04".ap-southeast-2.x86_64-linux.pv-ebs = "ami-6769055d";
|
||||
"14.04".ap-southeast-2.x86_64-linux.pv-s3 = "ami-15533f2f";
|
||||
"14.04".eu-central-1.x86_64-linux.hvm-ebs = "ami-ba0234a7";
|
||||
"14.04".eu-west-1.x86_64-linux.hvm-ebs = "ami-96cb63e1";
|
||||
"14.04".eu-west-1.x86_64-linux.pv-ebs = "ami-b48c25c3";
|
||||
"14.04".eu-west-1.x86_64-linux.pv-s3 = "ami-06cd6571";
|
||||
"14.04".sa-east-1.x86_64-linux.hvm-ebs = "ami-01b90e1c";
|
||||
"14.04".sa-east-1.x86_64-linux.pv-ebs = "ami-69e35474";
|
||||
"14.04".sa-east-1.x86_64-linux.pv-s3 = "ami-61b90e7c";
|
||||
"14.04".us-east-1.x86_64-linux.hvm-ebs = "ami-58ba3a30";
|
||||
"14.04".us-east-1.x86_64-linux.pv-ebs = "ami-9e0583f6";
|
||||
"14.04".us-east-1.x86_64-linux.pv-s3 = "ami-9cbe3ef4";
|
||||
"14.04".us-west-1.x86_64-linux.hvm-ebs = "ami-0bc3d74e";
|
||||
"14.04".us-west-1.x86_64-linux.pv-ebs = "ami-8b1703ce";
|
||||
"14.04".us-west-1.x86_64-linux.pv-s3 = "ami-27ccd862";
|
||||
"14.04".us-west-2.x86_64-linux.hvm-ebs = "ami-3bf1bf0b";
|
||||
"14.04".us-west-2.x86_64-linux.pv-ebs = "ami-259bd515";
|
||||
"14.04".us-west-2.x86_64-linux.pv-s3 = "ami-07094037";
|
||||
|
||||
"14.12".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-24435f25";
|
||||
"14.12".ap-northeast-1.x86_64-linux.pv-ebs = "ami-b0425eb1";
|
||||
"14.12".ap-northeast-1.x86_64-linux.pv-s3 = "ami-fed3c6ff";
|
||||
"14.12".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-6c765d3e";
|
||||
"14.12".ap-southeast-1.x86_64-linux.pv-ebs = "ami-6a765d38";
|
||||
"14.12".ap-southeast-1.x86_64-linux.pv-s3 = "ami-d1bf9183";
|
||||
"14.12".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-af86f395";
|
||||
"14.12".ap-southeast-2.x86_64-linux.pv-ebs = "ami-b386f389";
|
||||
"14.12".ap-southeast-2.x86_64-linux.pv-s3 = "ami-69c5ae53";
|
||||
"14.12".eu-central-1.x86_64-linux.hvm-ebs = "ami-4a497a57";
|
||||
"14.12".eu-central-1.x86_64-linux.pv-ebs = "ami-4c497a51";
|
||||
"14.12".eu-central-1.x86_64-linux.pv-s3 = "ami-60f2c27d";
|
||||
"14.12".eu-west-1.x86_64-linux.hvm-ebs = "ami-d126a5a6";
|
||||
"14.12".eu-west-1.x86_64-linux.pv-ebs = "ami-0126a576";
|
||||
"14.12".eu-west-1.x86_64-linux.pv-s3 = "ami-deda5fa9";
|
||||
"14.12".sa-east-1.x86_64-linux.hvm-ebs = "ami-2d239e30";
|
||||
"14.12".sa-east-1.x86_64-linux.pv-ebs = "ami-35239e28";
|
||||
"14.12".sa-east-1.x86_64-linux.pv-s3 = "ami-81e3519c";
|
||||
"14.12".us-east-1.x86_64-linux.hvm-ebs = "ami-0c463a64";
|
||||
"14.12".us-east-1.x86_64-linux.pv-ebs = "ami-ac473bc4";
|
||||
"14.12".us-east-1.x86_64-linux.pv-s3 = "ami-00e18a68";
|
||||
"14.12".us-west-1.x86_64-linux.hvm-ebs = "ami-ca534a8f";
|
||||
"14.12".us-west-1.x86_64-linux.pv-ebs = "ami-3e534a7b";
|
||||
"14.12".us-west-1.x86_64-linux.pv-s3 = "ami-2905196c";
|
||||
"14.12".us-west-2.x86_64-linux.hvm-ebs = "ami-fb9dc3cb";
|
||||
"14.12".us-west-2.x86_64-linux.pv-ebs = "ami-899dc3b9";
|
||||
"14.12".us-west-2.x86_64-linux.pv-s3 = "ami-cb7f2dfb";
|
||||
|
||||
"15.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-58cac236";
|
||||
"15.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-39c8c057";
|
||||
"15.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-5ac9c134";
|
||||
"15.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-03cec66d";
|
||||
"15.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-2fc2094c";
|
||||
"15.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-9ec308fd";
|
||||
"15.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-95c00bf6";
|
||||
"15.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-bfc00bdc";
|
||||
"15.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-996c4cfa";
|
||||
"15.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3f6e4e5c";
|
||||
"15.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-066d4d65";
|
||||
"15.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-cc6e4eaf";
|
||||
"15.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-3f8c6b50";
|
||||
"15.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-5b836434";
|
||||
"15.09".eu-central-1.x86_64-linux.pv-ebs = "ami-118c6b7e";
|
||||
"15.09".eu-central-1.x86_64-linux.pv-s3 = "ami-2c977043";
|
||||
"15.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-9cf04aef";
|
||||
"15.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-2bea5058";
|
||||
"15.09".eu-west-1.x86_64-linux.pv-ebs = "ami-c9e852ba";
|
||||
"15.09".eu-west-1.x86_64-linux.pv-s3 = "ami-c6f64cb5";
|
||||
"15.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-6e52df02";
|
||||
"15.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-1852df74";
|
||||
"15.09".sa-east-1.x86_64-linux.pv-ebs = "ami-4368e52f";
|
||||
"15.09".sa-east-1.x86_64-linux.pv-s3 = "ami-f15ad79d";
|
||||
"15.09".us-east-1.x86_64-linux.hvm-ebs = "ami-84a6a0ee";
|
||||
"15.09".us-east-1.x86_64-linux.hvm-s3 = "ami-06a7a16c";
|
||||
"15.09".us-east-1.x86_64-linux.pv-ebs = "ami-a4a1a7ce";
|
||||
"15.09".us-east-1.x86_64-linux.pv-s3 = "ami-5ba8ae31";
|
||||
"15.09".us-west-1.x86_64-linux.hvm-ebs = "ami-22c8bb42";
|
||||
"15.09".us-west-1.x86_64-linux.hvm-s3 = "ami-a2ccbfc2";
|
||||
"15.09".us-west-1.x86_64-linux.pv-ebs = "ami-10cebd70";
|
||||
"15.09".us-west-1.x86_64-linux.pv-s3 = "ami-fa30429a";
|
||||
"15.09".us-west-2.x86_64-linux.hvm-ebs = "ami-ce57b9ae";
|
||||
"15.09".us-west-2.x86_64-linux.hvm-s3 = "ami-2956b849";
|
||||
"15.09".us-west-2.x86_64-linux.pv-ebs = "ami-005fb160";
|
||||
"15.09".us-west-2.x86_64-linux.pv-s3 = "ami-cd55bbad";
|
||||
|
||||
"16.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-40619d21";
|
||||
"16.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-ce629eaf";
|
||||
"16.03".ap-northeast-1.x86_64-linux.pv-ebs = "ami-ef639f8e";
|
||||
"16.03".ap-northeast-1.x86_64-linux.pv-s3 = "ami-a1609cc0";
|
||||
"16.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-deca00b0";
|
||||
"16.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-a3b77dcd";
|
||||
"16.03".ap-northeast-2.x86_64-linux.pv-ebs = "ami-7bcb0115";
|
||||
"16.03".ap-northeast-2.x86_64-linux.pv-s3 = "ami-a2b77dcc";
|
||||
"16.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0dff9562";
|
||||
"16.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-13f69c7c";
|
||||
"16.03".ap-south-1.x86_64-linux.pv-ebs = "ami-0ef39961";
|
||||
"16.03".ap-south-1.x86_64-linux.pv-s3 = "ami-e0c8a28f";
|
||||
"16.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-5e964a3d";
|
||||
"16.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-4d964a2e";
|
||||
"16.03".ap-southeast-1.x86_64-linux.pv-ebs = "ami-ec9b478f";
|
||||
"16.03".ap-southeast-1.x86_64-linux.pv-s3 = "ami-999b47fa";
|
||||
"16.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-9f7359fc";
|
||||
"16.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-987359fb";
|
||||
"16.03".ap-southeast-2.x86_64-linux.pv-ebs = "ami-a2705ac1";
|
||||
"16.03".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a3705ac0";
|
||||
"16.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-17a45178";
|
||||
"16.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-f9a55096";
|
||||
"16.03".eu-central-1.x86_64-linux.pv-ebs = "ami-c8a550a7";
|
||||
"16.03".eu-central-1.x86_64-linux.pv-s3 = "ami-6ea45101";
|
||||
"16.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-b5b3d5c6";
|
||||
"16.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-c986e0ba";
|
||||
"16.03".eu-west-1.x86_64-linux.pv-ebs = "ami-b083e5c3";
|
||||
"16.03".eu-west-1.x86_64-linux.pv-s3 = "ami-3c83e54f";
|
||||
"16.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-f6eb7f9a";
|
||||
"16.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-93e773ff";
|
||||
"16.03".sa-east-1.x86_64-linux.pv-ebs = "ami-cbb82ca7";
|
||||
"16.03".sa-east-1.x86_64-linux.pv-s3 = "ami-abb82cc7";
|
||||
"16.03".us-east-1.x86_64-linux.hvm-ebs = "ami-c123a3d6";
|
||||
"16.03".us-east-1.x86_64-linux.hvm-s3 = "ami-bc25a5ab";
|
||||
"16.03".us-east-1.x86_64-linux.pv-ebs = "ami-bd25a5aa";
|
||||
"16.03".us-east-1.x86_64-linux.pv-s3 = "ami-a325a5b4";
|
||||
"16.03".us-west-1.x86_64-linux.hvm-ebs = "ami-748bcd14";
|
||||
"16.03".us-west-1.x86_64-linux.hvm-s3 = "ami-a68dcbc6";
|
||||
"16.03".us-west-1.x86_64-linux.pv-ebs = "ami-048acc64";
|
||||
"16.03".us-west-1.x86_64-linux.pv-s3 = "ami-208dcb40";
|
||||
"16.03".us-west-2.x86_64-linux.hvm-ebs = "ami-8263a0e2";
|
||||
"16.03".us-west-2.x86_64-linux.hvm-s3 = "ami-925c9ff2";
|
||||
"16.03".us-west-2.x86_64-linux.pv-ebs = "ami-5e61a23e";
|
||||
"16.03".us-west-2.x86_64-linux.pv-s3 = "ami-734c8f13";
|
||||
|
||||
# 16.09.1508.3909827
|
||||
"16.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-68453b0f";
|
||||
"16.09".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-f9bec09e";
|
||||
"16.09".ap-northeast-1.x86_64-linux.pv-ebs = "ami-254a3442";
|
||||
"16.09".ap-northeast-1.x86_64-linux.pv-s3 = "ami-ef473988";
|
||||
"16.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-18ae7f76";
|
||||
"16.09".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-9eac7df0";
|
||||
"16.09".ap-northeast-2.x86_64-linux.pv-ebs = "ami-57aa7b39";
|
||||
"16.09".ap-northeast-2.x86_64-linux.pv-s3 = "ami-5cae7f32";
|
||||
"16.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-b3f98fdc";
|
||||
"16.09".ap-south-1.x86_64-linux.hvm-s3 = "ami-98e690f7";
|
||||
"16.09".ap-south-1.x86_64-linux.pv-ebs = "ami-aef98fc1";
|
||||
"16.09".ap-south-1.x86_64-linux.pv-s3 = "ami-caf88ea5";
|
||||
"16.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-80fb51e3";
|
||||
"16.09".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-2df3594e";
|
||||
"16.09".ap-southeast-1.x86_64-linux.pv-ebs = "ami-37f05a54";
|
||||
"16.09".ap-southeast-1.x86_64-linux.pv-s3 = "ami-27f35944";
|
||||
"16.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-57ece834";
|
||||
"16.09".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-87f4f0e4";
|
||||
"16.09".ap-southeast-2.x86_64-linux.pv-ebs = "ami-d8ede9bb";
|
||||
"16.09".ap-southeast-2.x86_64-linux.pv-s3 = "ami-a6ebefc5";
|
||||
"16.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-9f863bfb";
|
||||
"16.09".ca-central-1.x86_64-linux.hvm-s3 = "ami-ea85388e";
|
||||
"16.09".ca-central-1.x86_64-linux.pv-ebs = "ami-ce8a37aa";
|
||||
"16.09".ca-central-1.x86_64-linux.pv-s3 = "ami-448a3720";
|
||||
"16.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-1b884774";
|
||||
"16.09".eu-central-1.x86_64-linux.hvm-s3 = "ami-b08c43df";
|
||||
"16.09".eu-central-1.x86_64-linux.pv-ebs = "ami-888946e7";
|
||||
"16.09".eu-central-1.x86_64-linux.pv-s3 = "ami-06874869";
|
||||
"16.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-1ed3e76d";
|
||||
"16.09".eu-west-1.x86_64-linux.hvm-s3 = "ami-73d1e500";
|
||||
"16.09".eu-west-1.x86_64-linux.pv-ebs = "ami-44c0f437";
|
||||
"16.09".eu-west-1.x86_64-linux.pv-s3 = "ami-f3d8ec80";
|
||||
"16.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-2c9c9648";
|
||||
"16.09".eu-west-2.x86_64-linux.hvm-s3 = "ami-6b9e940f";
|
||||
"16.09".eu-west-2.x86_64-linux.pv-ebs = "ami-f1999395";
|
||||
"16.09".eu-west-2.x86_64-linux.pv-s3 = "ami-bb9f95df";
|
||||
"16.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-a11882cd";
|
||||
"16.09".sa-east-1.x86_64-linux.hvm-s3 = "ami-7726bc1b";
|
||||
"16.09".sa-east-1.x86_64-linux.pv-ebs = "ami-9725bffb";
|
||||
"16.09".sa-east-1.x86_64-linux.pv-s3 = "ami-b027bddc";
|
||||
"16.09".us-east-1.x86_64-linux.hvm-ebs = "ami-854ca593";
|
||||
"16.09".us-east-1.x86_64-linux.hvm-s3 = "ami-2241a834";
|
||||
"16.09".us-east-1.x86_64-linux.pv-ebs = "ami-a441a8b2";
|
||||
"16.09".us-east-1.x86_64-linux.pv-s3 = "ami-e841a8fe";
|
||||
"16.09".us-east-2.x86_64-linux.hvm-ebs = "ami-3f41645a";
|
||||
"16.09".us-east-2.x86_64-linux.hvm-s3 = "ami-804065e5";
|
||||
"16.09".us-east-2.x86_64-linux.pv-ebs = "ami-f1466394";
|
||||
"16.09".us-east-2.x86_64-linux.pv-s3 = "ami-05426760";
|
||||
"16.09".us-west-1.x86_64-linux.hvm-ebs = "ami-c2efbca2";
|
||||
"16.09".us-west-1.x86_64-linux.hvm-s3 = "ami-d71042b7";
|
||||
"16.09".us-west-1.x86_64-linux.pv-ebs = "ami-04e8bb64";
|
||||
"16.09".us-west-1.x86_64-linux.pv-s3 = "ami-31e9ba51";
|
||||
"16.09".us-west-2.x86_64-linux.hvm-ebs = "ami-6449f504";
|
||||
"16.09".us-west-2.x86_64-linux.hvm-s3 = "ami-344af654";
|
||||
"16.09".us-west-2.x86_64-linux.pv-ebs = "ami-6d4af60d";
|
||||
"16.09".us-west-2.x86_64-linux.pv-s3 = "ami-de48f4be";
|
||||
|
||||
# 17.03.885.6024dd4067
|
||||
"17.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-dbd0f7bc";
|
||||
"17.03".ap-northeast-1.x86_64-linux.hvm-s3 = "ami-7cdff81b";
|
||||
"17.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-c59a48ab";
|
||||
"17.03".ap-northeast-2.x86_64-linux.hvm-s3 = "ami-0b944665";
|
||||
"17.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-4f413220";
|
||||
"17.03".ap-south-1.x86_64-linux.hvm-s3 = "ami-864033e9";
|
||||
"17.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-e08c3383";
|
||||
"17.03".ap-southeast-1.x86_64-linux.hvm-s3 = "ami-c28f30a1";
|
||||
"17.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-fca9a69f";
|
||||
"17.03".ap-southeast-2.x86_64-linux.hvm-s3 = "ami-3daaa55e";
|
||||
"17.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-9b00bdff";
|
||||
"17.03".ca-central-1.x86_64-linux.hvm-s3 = "ami-e800bd8c";
|
||||
"17.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-5450803b";
|
||||
"17.03".eu-central-1.x86_64-linux.hvm-s3 = "ami-6e2efe01";
|
||||
"17.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-10754c76";
|
||||
"17.03".eu-west-1.x86_64-linux.hvm-s3 = "ami-11734a77";
|
||||
"17.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-ff1d099b";
|
||||
"17.03".eu-west-2.x86_64-linux.hvm-s3 = "ami-fe1d099a";
|
||||
"17.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-d95d3eb5";
|
||||
"17.03".sa-east-1.x86_64-linux.hvm-s3 = "ami-fca2c190";
|
||||
"17.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0940c61f";
|
||||
"17.03".us-east-1.x86_64-linux.hvm-s3 = "ami-674fc971";
|
||||
"17.03".us-east-2.x86_64-linux.hvm-ebs = "ami-afc2e6ca";
|
||||
"17.03".us-east-2.x86_64-linux.hvm-s3 = "ami-a1cde9c4";
|
||||
"17.03".us-west-1.x86_64-linux.hvm-ebs = "ami-587b2138";
|
||||
"17.03".us-west-1.x86_64-linux.hvm-s3 = "ami-70411b10";
|
||||
"17.03".us-west-2.x86_64-linux.hvm-ebs = "ami-a93daac9";
|
||||
"17.03".us-west-2.x86_64-linux.hvm-s3 = "ami-5139ae31";
|
||||
|
||||
# 17.09.2681.59661f21be6
|
||||
"17.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-a30192da";
|
||||
"17.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-295a414d";
|
||||
"17.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-8c0eb9f1";
|
||||
"17.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-266cfe49";
|
||||
"17.09".us-east-1.x86_64-linux.hvm-ebs = "ami-40bee63a";
|
||||
"17.09".us-east-2.x86_64-linux.hvm-ebs = "ami-9d84aff8";
|
||||
"17.09".us-west-1.x86_64-linux.hvm-ebs = "ami-d14142b1";
|
||||
"17.09".us-west-2.x86_64-linux.hvm-ebs = "ami-3eb40346";
|
||||
"17.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-ca8207ae";
|
||||
"17.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-84bccff8";
|
||||
"17.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0dc5386f";
|
||||
"17.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-89b921ef";
|
||||
"17.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-179b3b79";
|
||||
"17.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-4762202b";
|
||||
"17.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-4e376021";
|
||||
|
||||
# 18.03.132946.1caae7247b8
|
||||
"18.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-065c46ec";
|
||||
"18.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-64f31903";
|
||||
"18.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-5a8d3d27";
|
||||
"18.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-09faf9e2";
|
||||
"18.03".us-east-1.x86_64-linux.hvm-ebs = "ami-8b3538f4";
|
||||
"18.03".us-east-2.x86_64-linux.hvm-ebs = "ami-150b3170";
|
||||
"18.03".us-west-1.x86_64-linux.hvm-ebs = "ami-ce06ebad";
|
||||
"18.03".us-west-2.x86_64-linux.hvm-ebs = "ami-586c3520";
|
||||
"18.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-aca72ac8";
|
||||
"18.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-aa0b4d40";
|
||||
"18.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-d0f254b2";
|
||||
"18.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-456511a8";
|
||||
"18.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-3366d15d";
|
||||
"18.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-163e1f7a";
|
||||
"18.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-6a390b05";
|
||||
|
||||
# 18.09.910.c15e342304a
|
||||
"18.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0f412186fb8a0ec97";
|
||||
"18.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0dada3805ce43c55e";
|
||||
"18.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-074df85565f2e02e2";
|
||||
"18.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-07c9b884e679df4f8";
|
||||
"18.09".us-east-1.x86_64-linux.hvm-ebs = "ami-009c9c3f1af480ff3";
|
||||
"18.09".us-east-2.x86_64-linux.hvm-ebs = "ami-08199961085ea8bc6";
|
||||
"18.09".us-west-1.x86_64-linux.hvm-ebs = "ami-07aa7f56d612ddd38";
|
||||
"18.09".us-west-2.x86_64-linux.hvm-ebs = "ami-01c84b7c368ac24d1";
|
||||
"18.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-04f66113f76198f6c";
|
||||
"18.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0892c7e24ebf2194f";
|
||||
"18.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-010730f36424b0a2c";
|
||||
"18.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0cdba8e998f076547";
|
||||
"18.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0400a698e6a9f4a15";
|
||||
"18.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-0e4a8a47fd6db6112";
|
||||
"18.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0880a678d3f555313";
|
||||
|
||||
# 19.03.172286.8ea36d73256
|
||||
"19.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-0fe40176548ff0940";
|
||||
"19.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-03a40fd3a02fe95ba";
|
||||
"19.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-0436f9da0f20a638e";
|
||||
"19.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0022b8ea9efde5de4";
|
||||
"19.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0efc58fb70ae9a217";
|
||||
"19.03".us-east-2.x86_64-linux.hvm-ebs = "ami-0abf711b1b34da1af";
|
||||
"19.03".us-west-1.x86_64-linux.hvm-ebs = "ami-07d126e8838c40ec5";
|
||||
"19.03".us-west-2.x86_64-linux.hvm-ebs = "ami-03f8a737546e47fb0";
|
||||
"19.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-03f9fd0ef2e035ede";
|
||||
"19.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0cff66114c652c262";
|
||||
"19.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-054c73a7f8d773ea9";
|
||||
"19.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-00db62688900456a4";
|
||||
"19.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0485cdd1a5fdd2117";
|
||||
"19.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
|
||||
"19.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0303deb1b5890f878";
|
||||
|
||||
# 19.09.2243.84af403f54f
|
||||
"19.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-071082f0fa035374f";
|
||||
"19.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
|
||||
"19.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-09566799591d1bfed";
|
||||
"19.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-015f8efc2be419b79";
|
||||
"19.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-07fc0a32d885e01ed";
|
||||
"19.09".us-east-1.x86_64-linux.hvm-ebs = "ami-03330d8b51287412f";
|
||||
"19.09".us-east-2.x86_64-linux.hvm-ebs = "ami-0518b4c84972e967f";
|
||||
"19.09".us-west-1.x86_64-linux.hvm-ebs = "ami-06ad07e61a353b4a6";
|
||||
"19.09".us-west-2.x86_64-linux.hvm-ebs = "ami-0e31e30925cf3ce4e";
|
||||
"19.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-07df50fc76702a36d";
|
||||
"19.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f71ae5d4b0b78d95";
|
||||
"19.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-057bbf2b4bd62d210";
|
||||
"19.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-02a62555ca182fb5b";
|
||||
"19.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0219dde0e6b7b7b93";
|
||||
"19.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-066f7f2a895c821a1";
|
||||
"19.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-055b2348db2827ff1";
|
||||
"19.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-018aab68377227e06";
|
||||
|
||||
# 20.03.1554.94e39623a49
|
||||
"20.03".eu-west-1.x86_64-linux.hvm-ebs = "ami-02c34db5766cc7013";
|
||||
"20.03".eu-west-2.x86_64-linux.hvm-ebs = "ami-0e32bd8c7853883f1";
|
||||
"20.03".eu-west-3.x86_64-linux.hvm-ebs = "ami-061edb1356c1d69fd";
|
||||
"20.03".eu-central-1.x86_64-linux.hvm-ebs = "ami-0a1a94722dcbff94c";
|
||||
"20.03".eu-north-1.x86_64-linux.hvm-ebs = "ami-02699abfacbb6464b";
|
||||
"20.03".us-east-1.x86_64-linux.hvm-ebs = "ami-0c5e7760748b74e85";
|
||||
"20.03".us-east-2.x86_64-linux.hvm-ebs = "ami-030296bb256764655";
|
||||
"20.03".us-west-1.x86_64-linux.hvm-ebs = "ami-050be818e0266b741";
|
||||
"20.03".us-west-2.x86_64-linux.hvm-ebs = "ami-06562f78dca68eda2";
|
||||
"20.03".ca-central-1.x86_64-linux.hvm-ebs = "ami-02365684a173255c7";
|
||||
"20.03".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0dbf353e168d155f7";
|
||||
"20.03".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-04c0f3a75f63daddd";
|
||||
"20.03".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-093d9cc49c191eb6c";
|
||||
"20.03".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0087df91a7b6ebd45";
|
||||
"20.03".ap-south-1.x86_64-linux.hvm-ebs = "ami-0a1a6b569af04af9d";
|
||||
"20.03".ap-east-1.x86_64-linux.hvm-ebs = "ami-0d18fdd309cdefa86";
|
||||
"20.03".sa-east-1.x86_64-linux.hvm-ebs = "ami-09859378158ae971d";
|
||||
# 20.03.2351.f8248ab6d9e-aarch64-linux
|
||||
"20.03".eu-west-1.aarch64-linux.hvm-ebs = "ami-0a4c46dfdfe921aab";
|
||||
"20.03".eu-west-2.aarch64-linux.hvm-ebs = "ami-0b47871912b7d36f9";
|
||||
"20.03".eu-west-3.aarch64-linux.hvm-ebs = "ami-01031e1aa505b8935";
|
||||
"20.03".eu-central-1.aarch64-linux.hvm-ebs = "ami-0bb4669de1f477fd1";
|
||||
# missing "20.03".eu-north-1.aarch64-linux.hvm-ebs = "ami-";
|
||||
"20.03".us-east-1.aarch64-linux.hvm-ebs = "ami-01d2de16a1878271c";
|
||||
"20.03".us-east-2.aarch64-linux.hvm-ebs = "ami-0eade0158b1ff49c0";
|
||||
"20.03".us-west-1.aarch64-linux.hvm-ebs = "ami-0913bf30cb9a764a4";
|
||||
"20.03".us-west-2.aarch64-linux.hvm-ebs = "ami-073449580ff8e82b5";
|
||||
"20.03".ca-central-1.aarch64-linux.hvm-ebs = "ami-050f2e923c4d703c0";
|
||||
"20.03".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-0d11ef6705a9a11a7";
|
||||
"20.03".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-05446a2f818cd3263";
|
||||
"20.03".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0c057f010065d2453";
|
||||
"20.03".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-0e90eda7f24eb33ab";
|
||||
"20.03".ap-south-1.aarch64-linux.hvm-ebs = "ami-03ba7e9f093f568bc";
|
||||
"20.03".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a8344c6ce6d0c902";
|
||||
|
||||
# 20.09.2016.19db3e5ea27
|
||||
"20.09".eu-west-1.x86_64-linux.hvm-ebs = "ami-0057cb7d614329fa2";
|
||||
"20.09".eu-west-2.x86_64-linux.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
|
||||
"20.09".eu-west-3.x86_64-linux.hvm-ebs = "ami-0e8985c3ea42f87fe";
|
||||
"20.09".eu-central-1.x86_64-linux.hvm-ebs = "ami-0eed77c38432886d2";
|
||||
"20.09".eu-north-1.x86_64-linux.hvm-ebs = "ami-0be5bcadd632bea14";
|
||||
"20.09".us-east-1.x86_64-linux.hvm-ebs = "ami-0a2cce52b42daccc8";
|
||||
"20.09".us-east-2.x86_64-linux.hvm-ebs = "ami-09378bf487b07a4d8";
|
||||
"20.09".us-west-1.x86_64-linux.hvm-ebs = "ami-09b4337b2a9e77485";
|
||||
"20.09".us-west-2.x86_64-linux.hvm-ebs = "ami-081d3bb5fbee0a1ac";
|
||||
"20.09".ca-central-1.x86_64-linux.hvm-ebs = "ami-020c24c6c607e7ac7";
|
||||
"20.09".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-08f648d5db009e67d";
|
||||
"20.09".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0be390efaccbd40f9";
|
||||
"20.09".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-0c3311601cbe8f927";
|
||||
"20.09".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0020146701f4d56cf";
|
||||
"20.09".ap-south-1.x86_64-linux.hvm-ebs = "ami-0117e2bd876bb40d1";
|
||||
"20.09".ap-east-1.x86_64-linux.hvm-ebs = "ami-0c42f97e5b1fda92f";
|
||||
"20.09".sa-east-1.x86_64-linux.hvm-ebs = "ami-021637976b094959d";
|
||||
# 20.09.2016.19db3e5ea27-aarch64-linux
|
||||
"20.09".eu-west-1.aarch64-linux.hvm-ebs = "ami-00a02608ff45ff8f9";
|
||||
"20.09".eu-west-2.aarch64-linux.hvm-ebs = "ami-0e991d0f8dca21e20";
|
||||
"20.09".eu-west-3.aarch64-linux.hvm-ebs = "ami-0d18eec4dc48c6f3b";
|
||||
"20.09".eu-central-1.aarch64-linux.hvm-ebs = "ami-01691f25d08f48c9e";
|
||||
"20.09".eu-north-1.aarch64-linux.hvm-ebs = "ami-09bb5aabe567ec6f4";
|
||||
"20.09".us-east-1.aarch64-linux.hvm-ebs = "ami-0504bd006f9eaae42";
|
||||
"20.09".us-east-2.aarch64-linux.hvm-ebs = "ami-00f0f8f2ab2d695ad";
|
||||
"20.09".us-west-1.aarch64-linux.hvm-ebs = "ami-02d147d2cb992f878";
|
||||
"20.09".us-west-2.aarch64-linux.hvm-ebs = "ami-07f40006cf4d4820e";
|
||||
"20.09".ca-central-1.aarch64-linux.hvm-ebs = "ami-0e5f563919a987894";
|
||||
"20.09".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-083e35d1acecae5c1";
|
||||
"20.09".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-052cdc008b245b067";
|
||||
"20.09".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-05e137f373bd72c0c";
|
||||
"20.09".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-020791fe4c32f851a";
|
||||
"20.09".ap-south-1.aarch64-linux.hvm-ebs = "ami-0285bb96a0f2c3955";
|
||||
"20.09".sa-east-1.aarch64-linux.hvm-ebs = "ami-0a55ab650c32be058";
|
||||
|
||||
|
||||
# 21.05.740.aa576357673
|
||||
"21.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-048dbc738074a3083";
|
||||
"21.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-0234cf81fec68315d";
|
||||
"21.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-020e459baf709107d";
|
||||
"21.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0857d5d1309ab8b77";
|
||||
"21.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-05403e3ae53d3716f";
|
||||
"21.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0d3002ba40b5b9897";
|
||||
"21.05".us-east-2.x86_64-linux.hvm-ebs = "ami-069a0ca1bde6dea52";
|
||||
"21.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0b415460a84bcf9bc";
|
||||
"21.05".us-west-2.x86_64-linux.hvm-ebs = "ami-093cba49754abd7f8";
|
||||
"21.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-065c13e1d52d60b33";
|
||||
"21.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-04f570c70ff9b665e";
|
||||
"21.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-02a3d1df595df5ef6";
|
||||
"21.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-027836fddb5c56012";
|
||||
"21.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0edacd41dc7700c39";
|
||||
"21.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-0b279b5bb55288059";
|
||||
"21.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06dc98082bc55c1fc";
|
||||
"21.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-04737dd49b98936c6";
|
||||
|
||||
latest = self."21.05";
|
||||
}; in self
|
||||
@@ -1,371 +1,9 @@
|
||||
let self = {
|
||||
"14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470";
|
||||
"14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c";
|
||||
"14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e";
|
||||
"14.04".ap-southeast-1.hvm-ebs = "ami-da280888";
|
||||
"14.04".ap-southeast-1.pv-ebs = "ami-7a9dbc28";
|
||||
"14.04".ap-southeast-1.pv-s3 = "ami-c4290996";
|
||||
"14.04".ap-southeast-2.hvm-ebs = "ami-ab523e91";
|
||||
"14.04".ap-southeast-2.pv-ebs = "ami-6769055d";
|
||||
"14.04".ap-southeast-2.pv-s3 = "ami-15533f2f";
|
||||
"14.04".eu-central-1.hvm-ebs = "ami-ba0234a7";
|
||||
"14.04".eu-west-1.hvm-ebs = "ami-96cb63e1";
|
||||
"14.04".eu-west-1.pv-ebs = "ami-b48c25c3";
|
||||
"14.04".eu-west-1.pv-s3 = "ami-06cd6571";
|
||||
"14.04".sa-east-1.hvm-ebs = "ami-01b90e1c";
|
||||
"14.04".sa-east-1.pv-ebs = "ami-69e35474";
|
||||
"14.04".sa-east-1.pv-s3 = "ami-61b90e7c";
|
||||
"14.04".us-east-1.hvm-ebs = "ami-58ba3a30";
|
||||
"14.04".us-east-1.pv-ebs = "ami-9e0583f6";
|
||||
"14.04".us-east-1.pv-s3 = "ami-9cbe3ef4";
|
||||
"14.04".us-west-1.hvm-ebs = "ami-0bc3d74e";
|
||||
"14.04".us-west-1.pv-ebs = "ami-8b1703ce";
|
||||
"14.04".us-west-1.pv-s3 = "ami-27ccd862";
|
||||
"14.04".us-west-2.hvm-ebs = "ami-3bf1bf0b";
|
||||
"14.04".us-west-2.pv-ebs = "ami-259bd515";
|
||||
"14.04".us-west-2.pv-s3 = "ami-07094037";
|
||||
|
||||
"14.12".ap-northeast-1.hvm-ebs = "ami-24435f25";
|
||||
"14.12".ap-northeast-1.pv-ebs = "ami-b0425eb1";
|
||||
"14.12".ap-northeast-1.pv-s3 = "ami-fed3c6ff";
|
||||
"14.12".ap-southeast-1.hvm-ebs = "ami-6c765d3e";
|
||||
"14.12".ap-southeast-1.pv-ebs = "ami-6a765d38";
|
||||
"14.12".ap-southeast-1.pv-s3 = "ami-d1bf9183";
|
||||
"14.12".ap-southeast-2.hvm-ebs = "ami-af86f395";
|
||||
"14.12".ap-southeast-2.pv-ebs = "ami-b386f389";
|
||||
"14.12".ap-southeast-2.pv-s3 = "ami-69c5ae53";
|
||||
"14.12".eu-central-1.hvm-ebs = "ami-4a497a57";
|
||||
"14.12".eu-central-1.pv-ebs = "ami-4c497a51";
|
||||
"14.12".eu-central-1.pv-s3 = "ami-60f2c27d";
|
||||
"14.12".eu-west-1.hvm-ebs = "ami-d126a5a6";
|
||||
"14.12".eu-west-1.pv-ebs = "ami-0126a576";
|
||||
"14.12".eu-west-1.pv-s3 = "ami-deda5fa9";
|
||||
"14.12".sa-east-1.hvm-ebs = "ami-2d239e30";
|
||||
"14.12".sa-east-1.pv-ebs = "ami-35239e28";
|
||||
"14.12".sa-east-1.pv-s3 = "ami-81e3519c";
|
||||
"14.12".us-east-1.hvm-ebs = "ami-0c463a64";
|
||||
"14.12".us-east-1.pv-ebs = "ami-ac473bc4";
|
||||
"14.12".us-east-1.pv-s3 = "ami-00e18a68";
|
||||
"14.12".us-west-1.hvm-ebs = "ami-ca534a8f";
|
||||
"14.12".us-west-1.pv-ebs = "ami-3e534a7b";
|
||||
"14.12".us-west-1.pv-s3 = "ami-2905196c";
|
||||
"14.12".us-west-2.hvm-ebs = "ami-fb9dc3cb";
|
||||
"14.12".us-west-2.pv-ebs = "ami-899dc3b9";
|
||||
"14.12".us-west-2.pv-s3 = "ami-cb7f2dfb";
|
||||
|
||||
"15.09".ap-northeast-1.hvm-ebs = "ami-58cac236";
|
||||
"15.09".ap-northeast-1.hvm-s3 = "ami-39c8c057";
|
||||
"15.09".ap-northeast-1.pv-ebs = "ami-5ac9c134";
|
||||
"15.09".ap-northeast-1.pv-s3 = "ami-03cec66d";
|
||||
"15.09".ap-southeast-1.hvm-ebs = "ami-2fc2094c";
|
||||
"15.09".ap-southeast-1.hvm-s3 = "ami-9ec308fd";
|
||||
"15.09".ap-southeast-1.pv-ebs = "ami-95c00bf6";
|
||||
"15.09".ap-southeast-1.pv-s3 = "ami-bfc00bdc";
|
||||
"15.09".ap-southeast-2.hvm-ebs = "ami-996c4cfa";
|
||||
"15.09".ap-southeast-2.hvm-s3 = "ami-3f6e4e5c";
|
||||
"15.09".ap-southeast-2.pv-ebs = "ami-066d4d65";
|
||||
"15.09".ap-southeast-2.pv-s3 = "ami-cc6e4eaf";
|
||||
"15.09".eu-central-1.hvm-ebs = "ami-3f8c6b50";
|
||||
"15.09".eu-central-1.hvm-s3 = "ami-5b836434";
|
||||
"15.09".eu-central-1.pv-ebs = "ami-118c6b7e";
|
||||
"15.09".eu-central-1.pv-s3 = "ami-2c977043";
|
||||
"15.09".eu-west-1.hvm-ebs = "ami-9cf04aef";
|
||||
"15.09".eu-west-1.hvm-s3 = "ami-2bea5058";
|
||||
"15.09".eu-west-1.pv-ebs = "ami-c9e852ba";
|
||||
"15.09".eu-west-1.pv-s3 = "ami-c6f64cb5";
|
||||
"15.09".sa-east-1.hvm-ebs = "ami-6e52df02";
|
||||
"15.09".sa-east-1.hvm-s3 = "ami-1852df74";
|
||||
"15.09".sa-east-1.pv-ebs = "ami-4368e52f";
|
||||
"15.09".sa-east-1.pv-s3 = "ami-f15ad79d";
|
||||
"15.09".us-east-1.hvm-ebs = "ami-84a6a0ee";
|
||||
"15.09".us-east-1.hvm-s3 = "ami-06a7a16c";
|
||||
"15.09".us-east-1.pv-ebs = "ami-a4a1a7ce";
|
||||
"15.09".us-east-1.pv-s3 = "ami-5ba8ae31";
|
||||
"15.09".us-west-1.hvm-ebs = "ami-22c8bb42";
|
||||
"15.09".us-west-1.hvm-s3 = "ami-a2ccbfc2";
|
||||
"15.09".us-west-1.pv-ebs = "ami-10cebd70";
|
||||
"15.09".us-west-1.pv-s3 = "ami-fa30429a";
|
||||
"15.09".us-west-2.hvm-ebs = "ami-ce57b9ae";
|
||||
"15.09".us-west-2.hvm-s3 = "ami-2956b849";
|
||||
"15.09".us-west-2.pv-ebs = "ami-005fb160";
|
||||
"15.09".us-west-2.pv-s3 = "ami-cd55bbad";
|
||||
|
||||
"16.03".ap-northeast-1.hvm-ebs = "ami-40619d21";
|
||||
"16.03".ap-northeast-1.hvm-s3 = "ami-ce629eaf";
|
||||
"16.03".ap-northeast-1.pv-ebs = "ami-ef639f8e";
|
||||
"16.03".ap-northeast-1.pv-s3 = "ami-a1609cc0";
|
||||
"16.03".ap-northeast-2.hvm-ebs = "ami-deca00b0";
|
||||
"16.03".ap-northeast-2.hvm-s3 = "ami-a3b77dcd";
|
||||
"16.03".ap-northeast-2.pv-ebs = "ami-7bcb0115";
|
||||
"16.03".ap-northeast-2.pv-s3 = "ami-a2b77dcc";
|
||||
"16.03".ap-south-1.hvm-ebs = "ami-0dff9562";
|
||||
"16.03".ap-south-1.hvm-s3 = "ami-13f69c7c";
|
||||
"16.03".ap-south-1.pv-ebs = "ami-0ef39961";
|
||||
"16.03".ap-south-1.pv-s3 = "ami-e0c8a28f";
|
||||
"16.03".ap-southeast-1.hvm-ebs = "ami-5e964a3d";
|
||||
"16.03".ap-southeast-1.hvm-s3 = "ami-4d964a2e";
|
||||
"16.03".ap-southeast-1.pv-ebs = "ami-ec9b478f";
|
||||
"16.03".ap-southeast-1.pv-s3 = "ami-999b47fa";
|
||||
"16.03".ap-southeast-2.hvm-ebs = "ami-9f7359fc";
|
||||
"16.03".ap-southeast-2.hvm-s3 = "ami-987359fb";
|
||||
"16.03".ap-southeast-2.pv-ebs = "ami-a2705ac1";
|
||||
"16.03".ap-southeast-2.pv-s3 = "ami-a3705ac0";
|
||||
"16.03".eu-central-1.hvm-ebs = "ami-17a45178";
|
||||
"16.03".eu-central-1.hvm-s3 = "ami-f9a55096";
|
||||
"16.03".eu-central-1.pv-ebs = "ami-c8a550a7";
|
||||
"16.03".eu-central-1.pv-s3 = "ami-6ea45101";
|
||||
"16.03".eu-west-1.hvm-ebs = "ami-b5b3d5c6";
|
||||
"16.03".eu-west-1.hvm-s3 = "ami-c986e0ba";
|
||||
"16.03".eu-west-1.pv-ebs = "ami-b083e5c3";
|
||||
"16.03".eu-west-1.pv-s3 = "ami-3c83e54f";
|
||||
"16.03".sa-east-1.hvm-ebs = "ami-f6eb7f9a";
|
||||
"16.03".sa-east-1.hvm-s3 = "ami-93e773ff";
|
||||
"16.03".sa-east-1.pv-ebs = "ami-cbb82ca7";
|
||||
"16.03".sa-east-1.pv-s3 = "ami-abb82cc7";
|
||||
"16.03".us-east-1.hvm-ebs = "ami-c123a3d6";
|
||||
"16.03".us-east-1.hvm-s3 = "ami-bc25a5ab";
|
||||
"16.03".us-east-1.pv-ebs = "ami-bd25a5aa";
|
||||
"16.03".us-east-1.pv-s3 = "ami-a325a5b4";
|
||||
"16.03".us-west-1.hvm-ebs = "ami-748bcd14";
|
||||
"16.03".us-west-1.hvm-s3 = "ami-a68dcbc6";
|
||||
"16.03".us-west-1.pv-ebs = "ami-048acc64";
|
||||
"16.03".us-west-1.pv-s3 = "ami-208dcb40";
|
||||
"16.03".us-west-2.hvm-ebs = "ami-8263a0e2";
|
||||
"16.03".us-west-2.hvm-s3 = "ami-925c9ff2";
|
||||
"16.03".us-west-2.pv-ebs = "ami-5e61a23e";
|
||||
"16.03".us-west-2.pv-s3 = "ami-734c8f13";
|
||||
|
||||
# 16.09.1508.3909827
|
||||
"16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f";
|
||||
"16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e";
|
||||
"16.09".ap-northeast-1.pv-ebs = "ami-254a3442";
|
||||
"16.09".ap-northeast-1.pv-s3 = "ami-ef473988";
|
||||
"16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76";
|
||||
"16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0";
|
||||
"16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39";
|
||||
"16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32";
|
||||
"16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc";
|
||||
"16.09".ap-south-1.hvm-s3 = "ami-98e690f7";
|
||||
"16.09".ap-south-1.pv-ebs = "ami-aef98fc1";
|
||||
"16.09".ap-south-1.pv-s3 = "ami-caf88ea5";
|
||||
"16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3";
|
||||
"16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e";
|
||||
"16.09".ap-southeast-1.pv-ebs = "ami-37f05a54";
|
||||
"16.09".ap-southeast-1.pv-s3 = "ami-27f35944";
|
||||
"16.09".ap-southeast-2.hvm-ebs = "ami-57ece834";
|
||||
"16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4";
|
||||
"16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb";
|
||||
"16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5";
|
||||
"16.09".ca-central-1.hvm-ebs = "ami-9f863bfb";
|
||||
"16.09".ca-central-1.hvm-s3 = "ami-ea85388e";
|
||||
"16.09".ca-central-1.pv-ebs = "ami-ce8a37aa";
|
||||
"16.09".ca-central-1.pv-s3 = "ami-448a3720";
|
||||
"16.09".eu-central-1.hvm-ebs = "ami-1b884774";
|
||||
"16.09".eu-central-1.hvm-s3 = "ami-b08c43df";
|
||||
"16.09".eu-central-1.pv-ebs = "ami-888946e7";
|
||||
"16.09".eu-central-1.pv-s3 = "ami-06874869";
|
||||
"16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d";
|
||||
"16.09".eu-west-1.hvm-s3 = "ami-73d1e500";
|
||||
"16.09".eu-west-1.pv-ebs = "ami-44c0f437";
|
||||
"16.09".eu-west-1.pv-s3 = "ami-f3d8ec80";
|
||||
"16.09".eu-west-2.hvm-ebs = "ami-2c9c9648";
|
||||
"16.09".eu-west-2.hvm-s3 = "ami-6b9e940f";
|
||||
"16.09".eu-west-2.pv-ebs = "ami-f1999395";
|
||||
"16.09".eu-west-2.pv-s3 = "ami-bb9f95df";
|
||||
"16.09".sa-east-1.hvm-ebs = "ami-a11882cd";
|
||||
"16.09".sa-east-1.hvm-s3 = "ami-7726bc1b";
|
||||
"16.09".sa-east-1.pv-ebs = "ami-9725bffb";
|
||||
"16.09".sa-east-1.pv-s3 = "ami-b027bddc";
|
||||
"16.09".us-east-1.hvm-ebs = "ami-854ca593";
|
||||
"16.09".us-east-1.hvm-s3 = "ami-2241a834";
|
||||
"16.09".us-east-1.pv-ebs = "ami-a441a8b2";
|
||||
"16.09".us-east-1.pv-s3 = "ami-e841a8fe";
|
||||
"16.09".us-east-2.hvm-ebs = "ami-3f41645a";
|
||||
"16.09".us-east-2.hvm-s3 = "ami-804065e5";
|
||||
"16.09".us-east-2.pv-ebs = "ami-f1466394";
|
||||
"16.09".us-east-2.pv-s3 = "ami-05426760";
|
||||
"16.09".us-west-1.hvm-ebs = "ami-c2efbca2";
|
||||
"16.09".us-west-1.hvm-s3 = "ami-d71042b7";
|
||||
"16.09".us-west-1.pv-ebs = "ami-04e8bb64";
|
||||
"16.09".us-west-1.pv-s3 = "ami-31e9ba51";
|
||||
"16.09".us-west-2.hvm-ebs = "ami-6449f504";
|
||||
"16.09".us-west-2.hvm-s3 = "ami-344af654";
|
||||
"16.09".us-west-2.pv-ebs = "ami-6d4af60d";
|
||||
"16.09".us-west-2.pv-s3 = "ami-de48f4be";
|
||||
|
||||
# 17.03.885.6024dd4067
|
||||
"17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc";
|
||||
"17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b";
|
||||
"17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab";
|
||||
"17.03".ap-northeast-2.hvm-s3 = "ami-0b944665";
|
||||
"17.03".ap-south-1.hvm-ebs = "ami-4f413220";
|
||||
"17.03".ap-south-1.hvm-s3 = "ami-864033e9";
|
||||
"17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383";
|
||||
"17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1";
|
||||
"17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f";
|
||||
"17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e";
|
||||
"17.03".ca-central-1.hvm-ebs = "ami-9b00bdff";
|
||||
"17.03".ca-central-1.hvm-s3 = "ami-e800bd8c";
|
||||
"17.03".eu-central-1.hvm-ebs = "ami-5450803b";
|
||||
"17.03".eu-central-1.hvm-s3 = "ami-6e2efe01";
|
||||
"17.03".eu-west-1.hvm-ebs = "ami-10754c76";
|
||||
"17.03".eu-west-1.hvm-s3 = "ami-11734a77";
|
||||
"17.03".eu-west-2.hvm-ebs = "ami-ff1d099b";
|
||||
"17.03".eu-west-2.hvm-s3 = "ami-fe1d099a";
|
||||
"17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5";
|
||||
"17.03".sa-east-1.hvm-s3 = "ami-fca2c190";
|
||||
"17.03".us-east-1.hvm-ebs = "ami-0940c61f";
|
||||
"17.03".us-east-1.hvm-s3 = "ami-674fc971";
|
||||
"17.03".us-east-2.hvm-ebs = "ami-afc2e6ca";
|
||||
"17.03".us-east-2.hvm-s3 = "ami-a1cde9c4";
|
||||
"17.03".us-west-1.hvm-ebs = "ami-587b2138";
|
||||
"17.03".us-west-1.hvm-s3 = "ami-70411b10";
|
||||
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
|
||||
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
|
||||
|
||||
# 17.09.2681.59661f21be6
|
||||
"17.09".eu-west-1.hvm-ebs = "ami-a30192da";
|
||||
"17.09".eu-west-2.hvm-ebs = "ami-295a414d";
|
||||
"17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1";
|
||||
"17.09".eu-central-1.hvm-ebs = "ami-266cfe49";
|
||||
"17.09".us-east-1.hvm-ebs = "ami-40bee63a";
|
||||
"17.09".us-east-2.hvm-ebs = "ami-9d84aff8";
|
||||
"17.09".us-west-1.hvm-ebs = "ami-d14142b1";
|
||||
"17.09".us-west-2.hvm-ebs = "ami-3eb40346";
|
||||
"17.09".ca-central-1.hvm-ebs = "ami-ca8207ae";
|
||||
"17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8";
|
||||
"17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f";
|
||||
"17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef";
|
||||
"17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79";
|
||||
"17.09".sa-east-1.hvm-ebs = "ami-4762202b";
|
||||
"17.09".ap-south-1.hvm-ebs = "ami-4e376021";
|
||||
|
||||
# 18.03.132946.1caae7247b8
|
||||
"18.03".eu-west-1.hvm-ebs = "ami-065c46ec";
|
||||
"18.03".eu-west-2.hvm-ebs = "ami-64f31903";
|
||||
"18.03".eu-west-3.hvm-ebs = "ami-5a8d3d27";
|
||||
"18.03".eu-central-1.hvm-ebs = "ami-09faf9e2";
|
||||
"18.03".us-east-1.hvm-ebs = "ami-8b3538f4";
|
||||
"18.03".us-east-2.hvm-ebs = "ami-150b3170";
|
||||
"18.03".us-west-1.hvm-ebs = "ami-ce06ebad";
|
||||
"18.03".us-west-2.hvm-ebs = "ami-586c3520";
|
||||
"18.03".ca-central-1.hvm-ebs = "ami-aca72ac8";
|
||||
"18.03".ap-southeast-1.hvm-ebs = "ami-aa0b4d40";
|
||||
"18.03".ap-southeast-2.hvm-ebs = "ami-d0f254b2";
|
||||
"18.03".ap-northeast-1.hvm-ebs = "ami-456511a8";
|
||||
"18.03".ap-northeast-2.hvm-ebs = "ami-3366d15d";
|
||||
"18.03".sa-east-1.hvm-ebs = "ami-163e1f7a";
|
||||
"18.03".ap-south-1.hvm-ebs = "ami-6a390b05";
|
||||
|
||||
# 18.09.910.c15e342304a
|
||||
"18.09".eu-west-1.hvm-ebs = "ami-0f412186fb8a0ec97";
|
||||
"18.09".eu-west-2.hvm-ebs = "ami-0dada3805ce43c55e";
|
||||
"18.09".eu-west-3.hvm-ebs = "ami-074df85565f2e02e2";
|
||||
"18.09".eu-central-1.hvm-ebs = "ami-07c9b884e679df4f8";
|
||||
"18.09".us-east-1.hvm-ebs = "ami-009c9c3f1af480ff3";
|
||||
"18.09".us-east-2.hvm-ebs = "ami-08199961085ea8bc6";
|
||||
"18.09".us-west-1.hvm-ebs = "ami-07aa7f56d612ddd38";
|
||||
"18.09".us-west-2.hvm-ebs = "ami-01c84b7c368ac24d1";
|
||||
"18.09".ca-central-1.hvm-ebs = "ami-04f66113f76198f6c";
|
||||
"18.09".ap-southeast-1.hvm-ebs = "ami-0892c7e24ebf2194f";
|
||||
"18.09".ap-southeast-2.hvm-ebs = "ami-010730f36424b0a2c";
|
||||
"18.09".ap-northeast-1.hvm-ebs = "ami-0cdba8e998f076547";
|
||||
"18.09".ap-northeast-2.hvm-ebs = "ami-0400a698e6a9f4a15";
|
||||
"18.09".sa-east-1.hvm-ebs = "ami-0e4a8a47fd6db6112";
|
||||
"18.09".ap-south-1.hvm-ebs = "ami-0880a678d3f555313";
|
||||
|
||||
# 19.03.172286.8ea36d73256
|
||||
"19.03".eu-west-1.hvm-ebs = "ami-0fe40176548ff0940";
|
||||
"19.03".eu-west-2.hvm-ebs = "ami-03a40fd3a02fe95ba";
|
||||
"19.03".eu-west-3.hvm-ebs = "ami-0436f9da0f20a638e";
|
||||
"19.03".eu-central-1.hvm-ebs = "ami-0022b8ea9efde5de4";
|
||||
"19.03".us-east-1.hvm-ebs = "ami-0efc58fb70ae9a217";
|
||||
"19.03".us-east-2.hvm-ebs = "ami-0abf711b1b34da1af";
|
||||
"19.03".us-west-1.hvm-ebs = "ami-07d126e8838c40ec5";
|
||||
"19.03".us-west-2.hvm-ebs = "ami-03f8a737546e47fb0";
|
||||
"19.03".ca-central-1.hvm-ebs = "ami-03f9fd0ef2e035ede";
|
||||
"19.03".ap-southeast-1.hvm-ebs = "ami-0cff66114c652c262";
|
||||
"19.03".ap-southeast-2.hvm-ebs = "ami-054c73a7f8d773ea9";
|
||||
"19.03".ap-northeast-1.hvm-ebs = "ami-00db62688900456a4";
|
||||
"19.03".ap-northeast-2.hvm-ebs = "ami-0485cdd1a5fdd2117";
|
||||
"19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2";
|
||||
"19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878";
|
||||
|
||||
# 19.09.2243.84af403f54f
|
||||
"19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f";
|
||||
"19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3";
|
||||
"19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed";
|
||||
"19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79";
|
||||
"19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed";
|
||||
"19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f";
|
||||
"19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f";
|
||||
"19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6";
|
||||
"19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e";
|
||||
"19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d";
|
||||
"19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95";
|
||||
"19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210";
|
||||
"19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b";
|
||||
"19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93";
|
||||
"19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1";
|
||||
"19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1";
|
||||
"19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06";
|
||||
|
||||
# 20.03.1554.94e39623a49
|
||||
"20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013";
|
||||
"20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1";
|
||||
"20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd";
|
||||
"20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c";
|
||||
"20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b";
|
||||
"20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85";
|
||||
"20.03".us-east-2.hvm-ebs = "ami-030296bb256764655";
|
||||
"20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741";
|
||||
"20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2";
|
||||
"20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7";
|
||||
"20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7";
|
||||
"20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd";
|
||||
"20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c";
|
||||
"20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45";
|
||||
"20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d";
|
||||
"20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86";
|
||||
"20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d";
|
||||
|
||||
# 20.09.2016.19db3e5ea27
|
||||
"20.09".eu-west-1.hvm-ebs = "ami-0057cb7d614329fa2";
|
||||
"20.09".eu-west-2.hvm-ebs = "ami-0d46f16e0bb0ec8fd";
|
||||
"20.09".eu-west-3.hvm-ebs = "ami-0e8985c3ea42f87fe";
|
||||
"20.09".eu-central-1.hvm-ebs = "ami-0eed77c38432886d2";
|
||||
"20.09".eu-north-1.hvm-ebs = "ami-0be5bcadd632bea14";
|
||||
"20.09".us-east-1.hvm-ebs = "ami-0a2cce52b42daccc8";
|
||||
"20.09".us-east-2.hvm-ebs = "ami-09378bf487b07a4d8";
|
||||
"20.09".us-west-1.hvm-ebs = "ami-09b4337b2a9e77485";
|
||||
"20.09".us-west-2.hvm-ebs = "ami-081d3bb5fbee0a1ac";
|
||||
"20.09".ca-central-1.hvm-ebs = "ami-020c24c6c607e7ac7";
|
||||
"20.09".ap-southeast-1.hvm-ebs = "ami-08f648d5db009e67d";
|
||||
"20.09".ap-southeast-2.hvm-ebs = "ami-0be390efaccbd40f9";
|
||||
"20.09".ap-northeast-1.hvm-ebs = "ami-0c3311601cbe8f927";
|
||||
"20.09".ap-northeast-2.hvm-ebs = "ami-0020146701f4d56cf";
|
||||
"20.09".ap-south-1.hvm-ebs = "ami-0117e2bd876bb40d1";
|
||||
"20.09".ap-east-1.hvm-ebs = "ami-0c42f97e5b1fda92f";
|
||||
"20.09".sa-east-1.hvm-ebs = "ami-021637976b094959d";
|
||||
|
||||
# 21.05.740.aa576357673
|
||||
"21.05".eu-west-1.hvm-ebs = "ami-048dbc738074a3083";
|
||||
"21.05".eu-west-2.hvm-ebs = "ami-0234cf81fec68315d";
|
||||
"21.05".eu-west-3.hvm-ebs = "ami-020e459baf709107d";
|
||||
"21.05".eu-central-1.hvm-ebs = "ami-0857d5d1309ab8b77";
|
||||
"21.05".eu-north-1.hvm-ebs = "ami-05403e3ae53d3716f";
|
||||
"21.05".us-east-1.hvm-ebs = "ami-0d3002ba40b5b9897";
|
||||
"21.05".us-east-2.hvm-ebs = "ami-069a0ca1bde6dea52";
|
||||
"21.05".us-west-1.hvm-ebs = "ami-0b415460a84bcf9bc";
|
||||
"21.05".us-west-2.hvm-ebs = "ami-093cba49754abd7f8";
|
||||
"21.05".ca-central-1.hvm-ebs = "ami-065c13e1d52d60b33";
|
||||
"21.05".ap-southeast-1.hvm-ebs = "ami-04f570c70ff9b665e";
|
||||
"21.05".ap-southeast-2.hvm-ebs = "ami-02a3d1df595df5ef6";
|
||||
"21.05".ap-northeast-1.hvm-ebs = "ami-027836fddb5c56012";
|
||||
"21.05".ap-northeast-2.hvm-ebs = "ami-0edacd41dc7700c39";
|
||||
"21.05".ap-south-1.hvm-ebs = "ami-0b279b5bb55288059";
|
||||
"21.05".ap-east-1.hvm-ebs = "ami-06dc98082bc55c1fc";
|
||||
"21.05".sa-east-1.hvm-ebs = "ami-04737dd49b98936c6";
|
||||
|
||||
latest = self."21.05";
|
||||
}; in self
|
||||
# Compatibility shim
|
||||
let
|
||||
lib = import ../../../lib;
|
||||
inherit (lib) mapAttrs;
|
||||
everything = import ./amazon-ec2-amis.nix;
|
||||
doAllVersions = mapAttrs (versionName: doRegion);
|
||||
doRegion = mapAttrs (regionName: systems: systems.x86_64-linux);
|
||||
in
|
||||
doAllVersions everything
|
||||
|
||||
@@ -486,6 +486,7 @@ in
|
||||
vault-postgresql = handleTest ./vault-postgresql.nix {};
|
||||
vaultwarden = handleTest ./vaultwarden.nix {};
|
||||
vector = handleTest ./vector.nix {};
|
||||
vengi-tools = handleTest ./vengi-tools.nix {};
|
||||
victoriametrics = handleTest ./victoriametrics.nix {};
|
||||
vikunja = handleTest ./vikunja.nix {};
|
||||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
|
||||
29
nixos/tests/vengi-tools.nix
Normal file
29
nixos/tests/vengi-tools.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "vengi-tools";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
machine = { config, pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
environment.systemPackages = [ pkgs.vengi-tools ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.wait_for_x()
|
||||
machine.execute("vengi-voxedit >&2 &")
|
||||
machine.wait_for_window("voxedit")
|
||||
# OCR on voxedit's window is very expensive, so we avoid wasting a try
|
||||
# by letting the window load fully first
|
||||
machine.sleep(15)
|
||||
machine.wait_for_text("Palette")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.9.0";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "07qqs5q64zaxl3b2091vjihqb35fm0136cm4zibrgpx21akmbvr2";
|
||||
sha256 = "sha256-fZ0yQGLGnEFxt+OiG9J+niYzvttybudfciu5xo104Qo=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0sdbba32f56z2q7kha5fxw2f00hikbz9sf4zl4wfl2i9b13j7mj0";
|
||||
cargoSha256 = "sha256-i3/96rVfP8TbIz3pNArTp8w27rfp1aPhohfFMMHgubo=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
119
pkgs/applications/graphics/vengi-tools/default.nix
Normal file
119
pkgs/applications/graphics/vengi-tools/default.nix
Normal file
@@ -0,0 +1,119 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
|
||||
, cmake
|
||||
, pkg-config
|
||||
, ninja
|
||||
, python3
|
||||
, makeWrapper
|
||||
|
||||
, glm
|
||||
, lua5_4
|
||||
, SDL2
|
||||
, SDL2_mixer
|
||||
, enet
|
||||
, libuv
|
||||
, libuuid
|
||||
, wayland-protocols
|
||||
, Carbon
|
||||
# optionals
|
||||
, opencl-headers
|
||||
, OpenCL
|
||||
|
||||
, callPackage
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently
|
||||
# related to
|
||||
# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html
|
||||
let cmake3_22 = cmake.overrideAttrs (old: {
|
||||
version = "3.22.0";
|
||||
src = fetchurl {
|
||||
url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz";
|
||||
sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4=";
|
||||
};
|
||||
});
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vengi-tools";
|
||||
version = "0.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgerhardy";
|
||||
repo = "engine";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake3_22
|
||||
pkg-config
|
||||
ninja
|
||||
python3
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glm
|
||||
lua5_4
|
||||
SDL2
|
||||
SDL2_mixer
|
||||
enet
|
||||
libuv
|
||||
libuuid
|
||||
# Only needed for the game
|
||||
#postgresql
|
||||
#libpqxx
|
||||
#mosquitto
|
||||
] ++ lib.optional stdenv.isLinux wayland-protocols
|
||||
++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ]
|
||||
++ lib.optional (!stdenv.isDarwin) opencl-headers;
|
||||
|
||||
cmakeFlags = [
|
||||
# Disable tests due to a problem in linking gtest:
|
||||
# ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main':
|
||||
# <artificial>:(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)'
|
||||
"-DUNITTESTS=OFF"
|
||||
"-DVISUALTESTS=OFF"
|
||||
# We're only interested in the generic tools
|
||||
"-DGAMES=OFF"
|
||||
"-DMAPVIEW=OFF"
|
||||
"-DAIDEBUG=OFF"
|
||||
];
|
||||
|
||||
# Set the data directory for each executable. We cannot set it at build time
|
||||
# with the PKGDATADIR cmake variable because each executable needs a specific
|
||||
# one.
|
||||
# This is not needed on darwin, since on that platform data files are saved
|
||||
# in *.app/Contents/Resources/ too, and are picked up automatically.
|
||||
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram "$prog" \
|
||||
--set CORE_PATH $out/share/$(basename "$prog")/
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {};
|
||||
run-voxedit = nixosTests.vengi-tools;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tools from the vengi voxel engine, including a thumbnailer, a converter, and the VoxEdit voxel editor";
|
||||
longDescription = ''
|
||||
Tools from the vengi C++ voxel game engine. It includes a voxel editor
|
||||
with character animation support and loading/saving into a lot of voxel
|
||||
volume formats. There are other tools like e.g. a thumbnailer for your
|
||||
filemanager and a command line tool to convert between several voxel
|
||||
formats.
|
||||
'';
|
||||
homepage = "https://mgerhardy.github.io/engine/";
|
||||
downloadPage = "https://github.com/mgerhardy/engine/releases";
|
||||
license = [ licenses.mit licenses.cc-by-sa-30 ];
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
{ stdenv
|
||||
, vengi-tools
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "vengi-tools-test-voxconvert-roundtrip";
|
||||
meta.timeout = 10;
|
||||
buildCommand = ''
|
||||
${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox
|
||||
${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb
|
||||
${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox
|
||||
diff chr_knight.vox chr_knight1.vox
|
||||
touch $out
|
||||
'';
|
||||
}
|
||||
@@ -11,11 +11,11 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "stretchly";
|
||||
version = "1.7.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
|
||||
sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw=";
|
||||
sha256 = "sha256-/v74vDGxD5iiOPeBXPAaV42JpyBjeJSO/Lk88pCkDng=";
|
||||
};
|
||||
|
||||
icon = fetchurl {
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/share/${pname}/
|
||||
mv resources/app.asar $out/share/${pname}/
|
||||
mv resources/app.asar* $out/share/${pname}/
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications/
|
||||
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://hovancik.net/stretchly";
|
||||
downloadPage = "https://hovancik.net/stretchly/downloads/";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ _1000101 ];
|
||||
maintainers = with maintainers; [ _1000101 oxalica ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,11 +34,11 @@
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suricata";
|
||||
version = "6.0.3";
|
||||
version = "6.0.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI=";
|
||||
sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,26 +1,35 @@
|
||||
{ stdenv, fetchurl, python3Packages, makeWrapper
|
||||
, enablePlayer ? true, libvlc, qt5, lib }:
|
||||
{ stdenv, lib, fetchurl, python3, makeWrapper
|
||||
, libtorrent-rasterbar-1_2_x, qt5
|
||||
}:
|
||||
|
||||
let
|
||||
libtorrent = (python3.pkgs.toPythonModule (
|
||||
libtorrent-rasterbar-1_2_x.override { python = python3; })).python;
|
||||
|
||||
aiohttp-apispec = python3.pkgs.callPackage
|
||||
../../../../development/python-modules/aiohttp-apispec/unstable.nix { };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tribler";
|
||||
version = "7.4.4";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
|
||||
sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
|
||||
sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.wrapPython
|
||||
python3.pkgs.wrapPython
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
python3Packages.python
|
||||
python3.pkgs.python
|
||||
];
|
||||
|
||||
pythonPath = with python3Packages; [
|
||||
libtorrent-rasterbar
|
||||
pythonPath = [
|
||||
libtorrent
|
||||
] ++ (with python3.pkgs; [
|
||||
twisted
|
||||
netifaces
|
||||
pycrypto
|
||||
@@ -42,49 +51,44 @@ stdenv.mkDerivation rec {
|
||||
pony
|
||||
lz4
|
||||
pyqtgraph
|
||||
pyyaml
|
||||
aiohttp
|
||||
aiohttp-apispec
|
||||
faker
|
||||
sentry-sdk
|
||||
pytest-asyncio
|
||||
pytest-timeout
|
||||
asynctest
|
||||
yappi
|
||||
|
||||
# there is a BTC feature, but it requires some unclear version of
|
||||
# bitcoinlib, so this doesn't work right now.
|
||||
# bitcoinlib
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
${lib.optionalString enablePlayer ''
|
||||
substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')"
|
||||
substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \
|
||||
--replace "if vlc and vlc.plugin_path" "if vlc" \
|
||||
--replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'"
|
||||
''}
|
||||
'';
|
||||
]);
|
||||
|
||||
installPhase = ''
|
||||
mkdir -pv $out
|
||||
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
|
||||
wrapPythonPrograms
|
||||
cp -prvd ./* $out/
|
||||
makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \
|
||||
makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \
|
||||
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
|
||||
--set _TRIBLERPATH $out \
|
||||
--set PYTHONPATH $out:$program_PYTHONPATH \
|
||||
--set _TRIBLERPATH $out/src \
|
||||
--set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \
|
||||
--set NO_AT_BRIDGE 1 \
|
||||
--run 'cd $_TRIBLERPATH' \
|
||||
--add-flags "-O $out/run_tribler.py" \
|
||||
${lib.optionalString enablePlayer ''
|
||||
--prefix LD_LIBRARY_PATH : ${libvlc}/lib
|
||||
''}
|
||||
--add-flags "-O $out/src/run_tribler.py"
|
||||
|
||||
mkdir -p $out/share/applications $out/share/icons $out/share/man/man1
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm
|
||||
cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1
|
||||
mkdir -p $out/share/applications $out/share/icons
|
||||
cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop
|
||||
cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
maintainers = with maintainers; [ xvapx ];
|
||||
maintainers = with maintainers; [ xvapx viric ];
|
||||
homepage = "https://www.tribler.org/";
|
||||
description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053
|
||||
};
|
||||
}
|
||||
|
||||
@@ -49,11 +49,11 @@
|
||||
md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip";
|
||||
}
|
||||
{
|
||||
name = "bzip2-1.0.6.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
|
||||
sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd";
|
||||
md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
|
||||
md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz";
|
||||
name = "bzip2-1.0.8.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz";
|
||||
sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269";
|
||||
md5 = "";
|
||||
md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "cairo-1.16.0.tar.xz";
|
||||
@@ -112,11 +112,11 @@
|
||||
md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
|
||||
}
|
||||
{
|
||||
name = "curl-7.78.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/curl-7.78.0.tar.xz";
|
||||
sha256 = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5";
|
||||
name = "curl-7.79.1.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz";
|
||||
sha256 = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689";
|
||||
md5 = "";
|
||||
md5name = "be42766d5664a739c3974ee3dfbbcbe978a4ccb1fe628bb1d9b59ac79e445fb5-curl-7.78.0.tar.xz";
|
||||
md5name = "0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689-curl-7.79.1.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libe-book-0.1.3.tar.xz";
|
||||
@@ -665,11 +665,11 @@
|
||||
md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar";
|
||||
}
|
||||
{
|
||||
name = "openldap-2.4.45.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz";
|
||||
sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824";
|
||||
name = "openldap-2.4.59.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz";
|
||||
sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34";
|
||||
md5 = "";
|
||||
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
|
||||
md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz";
|
||||
}
|
||||
{
|
||||
name = "openssl-1.1.1l.tar.gz";
|
||||
@@ -728,11 +728,11 @@
|
||||
md5name = "6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30-poppler-data-0.4.10.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "postgresql-13.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
|
||||
sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
|
||||
name = "postgresql-13.5.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.5.tar.bz2";
|
||||
sha256 = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3";
|
||||
md5 = "";
|
||||
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
||||
md5name = "9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3-postgresql-13.5.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "Python-3.8.10.tar.xz";
|
||||
|
||||
@@ -8,7 +8,7 @@ rec {
|
||||
|
||||
major = "7";
|
||||
minor = "2";
|
||||
patch = "2";
|
||||
patch = "3";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
@@ -17,13 +17,13 @@ rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "0w9bn3jhrhaj80qbbs8wp3q5yc0rrpwvqj3abgrllg4clk5c6fw1";
|
||||
sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE=";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "1rhwrax5fxgdvizv74npysam5i67669myysldiplqiah5np672lq";
|
||||
sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw=";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
@@ -31,6 +31,6 @@ rec {
|
||||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1hn56irlkk2ng7wzhiv8alpjcnf7xf95n3syzlbnmcj177kpg883";
|
||||
sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{ stdenv, lib, fetchFromGitHub, python, makeWrapper
|
||||
, eigen, fftw, libtiff, libpng, zlib, ants, bc
|
||||
, qt5, libGL, libGLU, libX11, libXext
|
||||
, withGui ? true }:
|
||||
, withGui ? true, less }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mrtrix";
|
||||
version = "3.0.2";
|
||||
version = "unstable-2021-11-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MRtrix3";
|
||||
repo = "mrtrix3";
|
||||
rev = version;
|
||||
sha256 = "0p4d1230j6664rnb9l65cpyfj9ncbcm39yv1r9y77br9rkkv1za3";
|
||||
rev = "994498557037c9e4f7ba67f255820ef84ea899d9";
|
||||
sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
substituteInPlace ./run_tests \
|
||||
--replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' ""
|
||||
|
||||
substituteInPlace ./build \
|
||||
--replace '"less -RX "' '"${less}/bin/less -RX "'
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42
|
||||
, customOCamlPackages ? null
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses
|
||||
, ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses
|
||||
, buildIde ? true
|
||||
, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems
|
||||
, csdp ? null
|
||||
@@ -45,6 +45,7 @@ let
|
||||
"8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n";
|
||||
"8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk";
|
||||
"8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17";
|
||||
"8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl";
|
||||
};
|
||||
releaseRev = v: "V${v}";
|
||||
fetched = import ../../../../build-support/coq/meta-fetch/default.nix
|
||||
@@ -62,10 +63,11 @@ let
|
||||
'' else "";
|
||||
ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages
|
||||
else with versions; switch coq-version [
|
||||
{ case = range "8.14" "8.14"; out = ocamlPackages_4_12; }
|
||||
{ case = range "8.11" "8.13"; out = ocamlPackages_4_10; }
|
||||
{ case = range "8.7" "8.10"; out = ocamlPackages_4_09; }
|
||||
{ case = range "8.5" "8.6"; out = ocamlPackages_4_05; }
|
||||
] ocamlPackages_4_10;
|
||||
] ocamlPackages_4_12;
|
||||
ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
|
||||
++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5
|
||||
++ optional (!versionAtLeast "8.13") ocamlPackages.num
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib
|
||||
, perl, pixman, vde2, alsa-lib, texinfo, flex
|
||||
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool
|
||||
, makeWrapper, autoPatchelfHook
|
||||
, makeWrapper, autoPatchelfHook, runtimeShell
|
||||
, attr, libcap, libcap_ng
|
||||
, CoreServices, Cocoa, Hypervisor, rez, setfile
|
||||
, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
|
||||
@@ -228,10 +228,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||
postInstall = ''
|
||||
cp -- $emitKvmWarningsPath $out/libexec/emit-kvm-warnings
|
||||
chmod a+x -- $out/libexec/emit-kvm-warnings
|
||||
if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then
|
||||
makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \
|
||||
$out/bin/qemu-kvm \
|
||||
--add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"
|
||||
--run $out/libexec/emit-kvm-warnings \
|
||||
--add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)"
|
||||
fi
|
||||
'';
|
||||
|
||||
@@ -242,6 +245,26 @@ stdenv.mkDerivation rec {
|
||||
# Builds in ~3h with 2 cores, and ~20m with a big-parallel builder.
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
emitKvmWarnings = ''
|
||||
#!${runtimeShell}
|
||||
WARNCOL='\033[1;35m'
|
||||
NEUTRALCOL='\033[0m'
|
||||
WARNING="''${WARNCOL}warning:''${NEUTRALCOL}"
|
||||
if [ ! -e /dev/kvm ]; then
|
||||
echo -e "''${WARNING} KVM is not available - execution will be slow" >&2
|
||||
echo "Consider installing KVM for hardware-accelerated execution." >&2
|
||||
echo "If KVM is already installed make sure the kernel module is loaded." >&2
|
||||
elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then
|
||||
echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2
|
||||
echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2
|
||||
echo "" >&2
|
||||
echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2
|
||||
echo "must be world-read-/writable (rw-rw-rw-)." >&2
|
||||
fi
|
||||
'';
|
||||
|
||||
passAsFile = [ "emitKvmWarnings" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.qemu.org/";
|
||||
description = "A generic and open source machine emulator and virtualizer";
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
, meson
|
||||
, ninja
|
||||
, packagekit
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
@@ -31,13 +30,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appcenter";
|
||||
version = "3.8.2";
|
||||
version = "3.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-NHKP1vzb8qu+EkUWDvLWLl4U4pW9ZxbE7YFI6Vwesfg=";
|
||||
sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-camera";
|
||||
version = "6.0.1";
|
||||
version = "6.0.2";
|
||||
|
||||
repoName = "camera";
|
||||
|
||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-OdBinryF6XTcvtY4A1wdDVazjf/VritEGF97ts6d4RY=";
|
||||
sha256 = "sha256-uVeV+LKA/W7WVUAvVWaSNRzeh1MUrhRjvS0HuhZZJ04=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -21,7 +21,6 @@
|
||||
, libsoup
|
||||
, vte
|
||||
, webkitgtk
|
||||
, zeitgeist
|
||||
, ctags
|
||||
, libgit2-glib
|
||||
, wrapGAppsHook
|
||||
@@ -30,7 +29,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-code";
|
||||
version = "6.0.1";
|
||||
version = "6.1.0";
|
||||
|
||||
repoName = "code";
|
||||
|
||||
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "120328pprzqj4587yj54yya9v2mv1rfwylpmxyr5l2qf80cjxi9d";
|
||||
sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@@ -74,7 +73,6 @@ stdenv.mkDerivation rec {
|
||||
libsoup
|
||||
vte
|
||||
webkitgtk
|
||||
zeitgeist
|
||||
];
|
||||
|
||||
# install script fails with UnicodeDecodeError because of printing a fancy elipsis character
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, vala
|
||||
, atk
|
||||
@@ -20,7 +21,6 @@
|
||||
, gnome-menus
|
||||
, libgee
|
||||
, wrapGAppsHook
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, granite
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-dock";
|
||||
version = "unstable-2021-07-16";
|
||||
version = "unstable-2021-11-08";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = "05fd6fccdf1a769f6737a0d7e57e092825348660";
|
||||
sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4";
|
||||
rev = "51e8d3ddfbed0dfce3158d80f997ab183e92567b";
|
||||
sha256 = "sha256-w6HGxEAXNod/uMEEfSz9nRNTRrCbcEqJCP9EFkVbX1U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -33,7 +32,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-files";
|
||||
version = "6.0.4";
|
||||
version = "6.1.0";
|
||||
|
||||
repoName = "files";
|
||||
|
||||
@@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-FH6EYtgKADp8jjBoCwsdRdknlKS9v3iOtPiT3CyEc/8=";
|
||||
sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
|
||||
bamf
|
||||
elementary-dock
|
||||
elementary-icon-theme
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
libcanberra
|
||||
@@ -83,16 +83,9 @@ stdenv.mkDerivation rec {
|
||||
zeitgeist
|
||||
];
|
||||
|
||||
patches = [
|
||||
./filechooser-portal-hardcode-gsettings-for-nixos.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x meson/post_install.py
|
||||
patchShebangs meson/post_install.py
|
||||
|
||||
substituteInPlace filechooser-portal/LegacyFileChooserDialog.vala \
|
||||
--subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
From 726ab4c0ab01273cb2197e4c151a5b69ff0954b6 Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Fri, 16 Jul 2021 18:24:58 +0800
|
||||
Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos
|
||||
|
||||
---
|
||||
filechooser-portal/LegacyFileChooserDialog.vala | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/filechooser-portal/LegacyFileChooserDialog.vala b/filechooser-portal/LegacyFileChooserDialog.vala
|
||||
index 330718f..f383bb1 100644
|
||||
--- a/filechooser-portal/LegacyFileChooserDialog.vala
|
||||
+++ b/filechooser-portal/LegacyFileChooserDialog.vala
|
||||
@@ -60,7 +60,9 @@ public class Files.LegacyFileChooserDialog : Object {
|
||||
/* If not local only during creation, strange bug occurs on fresh installs */
|
||||
chooser_dialog.local_only = true;
|
||||
|
||||
- var chooser_settings = new Settings ("io.elementary.files.file-chooser");
|
||||
+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
|
||||
+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false);
|
||||
+ var chooser_settings = new Settings.full (chooser_schema, null, null);
|
||||
|
||||
action_area = (Gtk.ButtonBox) chooser_dialog.get_action_area ();
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; {
|
||||
description = "Photo viewer and organizer designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/photos";
|
||||
license = licenses.lgpl21Plus;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, appstream
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, desktop-file-utils
|
||||
, nix-update-script
|
||||
, elementary-gtk-theme
|
||||
@@ -13,7 +14,6 @@
|
||||
, libhandy
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, substituteAll
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,39 +1,42 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, gnome-settings-daemon
|
||||
, granite
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, libhandy
|
||||
, libxml2
|
||||
, libgnomekbd
|
||||
, libxklavier
|
||||
, ibus
|
||||
, onboard
|
||||
, switchboard
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-keyboard";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y";
|
||||
sha256 = "sha256-Bl0T+8upTdBnLs03UIimcAg0LO40KwuMZRNSM+y/3Hc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./0001-Remove-Install-Unlisted-Engines-function.patch
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
ibus = ibus;
|
||||
inherit ibus onboard;
|
||||
})
|
||||
];
|
||||
|
||||
@@ -52,7 +55,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gnome-settings-daemon # media-keys
|
||||
granite
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
ibus
|
||||
libgee
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala
|
||||
index 6d79fdc..de4276e 100644
|
||||
index 7f73c1e1..1f0d6400 100644
|
||||
--- a/src/Views/InputMethod.vala
|
||||
+++ b/src/Views/InputMethod.vala
|
||||
@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
|
||||
@@ -328,7 +328,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid {
|
||||
private void spawn_ibus_daemon () {
|
||||
bool is_spawn_succeeded = false;
|
||||
try {
|
||||
@@ -11,3 +11,16 @@ index 6d79fdc..de4276e 100644
|
||||
} catch (GLib.SpawnError e) {
|
||||
warning (e.message);
|
||||
set_visible_view (e.message);
|
||||
diff --git a/src/Views/Layout.vala b/src/Views/Layout.vala
|
||||
index 75d2d805..b86252a4 100644
|
||||
--- a/src/Views/Layout.vala
|
||||
+++ b/src/Views/Layout.vala
|
||||
@@ -219,7 +219,7 @@ namespace Pantheon.Keyboard {
|
||||
|
||||
onscreen_keyboard_settings.clicked.connect (() => {
|
||||
try {
|
||||
- var appinfo = AppInfo.create_from_commandline ("onboard-settings", null, AppInfoCreateFlags.NONE);
|
||||
+ var appinfo = AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, AppInfoCreateFlags.NONE);
|
||||
appinfo.launch (null, null);
|
||||
} catch (Error e) {
|
||||
warning ("Unable to launch onboard-settings: %s", e.message);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@@ -56,7 +56,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Networking Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-network";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,42 +1,30 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, libgee
|
||||
, evolution-data-server
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
, libaccounts-glib
|
||||
, libgdata
|
||||
, libhandy
|
||||
, libsignon-glib
|
||||
, json-glib
|
||||
, librest
|
||||
, webkitgtk
|
||||
, libsoup
|
||||
, sqlite
|
||||
, switchboard
|
||||
, evolution-data-server
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-onlineaccounts";
|
||||
version = "6.2.1";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1q3f7zr04p2100mb255zy38il2i47l6vqdc9a9acjbk3n7q5sf92";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-L1SL8YbsYKdE+mvRW/fxjNoiyXRXTyV2ru7/tZzgTfM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -48,23 +36,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
evolution-data-server
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
json-glib
|
||||
libaccounts-glib
|
||||
libgdata
|
||||
libgee
|
||||
libhandy
|
||||
libsignon-glib
|
||||
libsoup
|
||||
librest
|
||||
sqlite # needed for camel-1.2
|
||||
switchboard
|
||||
webkitgtk
|
||||
];
|
||||
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers";
|
||||
PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services";
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Online Accounts Plug";
|
||||
@@ -73,5 +58,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.pantheon.members;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@@ -25,28 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-pantheon-shell";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0349150kxdv14ald79pzn7lasiqipyc37fgchygbc8hsy62d9a32";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/switchboard-plug-pantheon-shell/pull/286
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/0c3207ffaeaa82ca3c743bc9ec772185fbd7e8cf.patch";
|
||||
sha256 = "11ymzqx6has4zf8y0xy7pfhymcl128hzzjcgp46inshjf99v5kiv";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-rwneQ1bqpWDyTHULMtGqhPdpSDa4ObnVortmL0E+gHA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -73,6 +57,12 @@ stdenv.mkDerivation rec {
|
||||
wingpanel
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Desktop Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, elementary-settings-daemon
|
||||
, libgee
|
||||
, granite
|
||||
, gsettings-desktop-schemas
|
||||
, gala
|
||||
, gtk3
|
||||
, glib
|
||||
@@ -20,28 +21,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-security-privacy";
|
||||
version = "2.2.5";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ydr1xpbyxjcnd36c9j7a64srbz6gpbshwhcqj6591kmiqhmvknk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/switchboard-plug-security-privacy/pull/130
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/18fe438baba651670d7f0534856c3b2433e3d75d.patch";
|
||||
sha256 = "19qwm725k6h41kgg4a98i4rxx45s4bb1wxx0fzkh75gz9syfi58w";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-pkpS7BR/eXA0rWV1C5AR+FdF5OkDnV8YDBAt1ZkaVPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -53,9 +39,11 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
elementary-settings-daemon # settings schema
|
||||
gala
|
||||
glib
|
||||
granite
|
||||
gsettings-desktop-schemas
|
||||
gtk3
|
||||
libgee
|
||||
polkit
|
||||
@@ -68,6 +56,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Security & Privacy Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-security-privacy";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@@ -17,28 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchboard-plug-sound";
|
||||
version = "2.2.7";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0yjqws7ryfid9lcafgzzbfnjjwccsankscwdwqfw486qid85whzc";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Upstream code not respecting our localedir
|
||||
# https://github.com/elementary/switchboard-plug-sound/pull/203
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/switchboard-plug-sound/commit/1f3b9f001ace4c457ab194158dff04ba5e25d278.patch";
|
||||
sha256 = "1lmf2bbif2wkfv500nxbqxp8jdmnjg8yk8xhx3g2g55d15rc5hk4";
|
||||
})
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,6 +41,12 @@ stdenv.mkDerivation rec {
|
||||
switchboard
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Switchboard Sound Plug";
|
||||
homepage = "https://github.com/elementary/switchboard-plug-sound";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
@@ -13,7 +13,6 @@
|
||||
, libhandy
|
||||
, granite
|
||||
, gettext
|
||||
, clutter-gtk
|
||||
, elementary-icon-theme
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
@@ -46,7 +45,6 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
clutter-gtk
|
||||
elementary-icon-theme
|
||||
granite
|
||||
gtk3
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-gtk-theme";
|
||||
version = "6.1.0";
|
||||
version = "6.1.1";
|
||||
|
||||
repoName = "stylesheet";
|
||||
|
||||
@@ -18,13 +18,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-YvBjMbC3aQtYc/jPZmGdL4VfBH/VuxQ70PD0BWg9DTg=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-gciBn5MQ5Cu+dROL5kCt2GCbNA7W4HOWXyjMBd4OP+8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -34,6 +28,12 @@ stdenv.mkDerivation rec {
|
||||
sassc
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "GTK theme designed to be smooth, attractive, fast, and usable";
|
||||
homepage = "https://github.com/elementary/stylesheet";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-icon-theme";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
repoName = "icons";
|
||||
|
||||
@@ -21,13 +21,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "0k94zi8fzi0nf5q471fmrlz8jjkv8m6vav1spzv7ynkg2hik8d9b";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-WR4HV0nJKj0WeSFHXLK64O0LhX8myAJE4w0aztyhPn4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -57,6 +51,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Named, vector icons for elementary OS";
|
||||
longDescription = ''
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pantheon
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, nixos-artwork
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, linkFarm
|
||||
, substituteAll
|
||||
, elementary-greeter
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -14,6 +15,7 @@
|
||||
, libgee
|
||||
, elementary-icon-theme
|
||||
, elementary-gtk-theme
|
||||
, elementary-settings-daemon
|
||||
, gettext
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
@@ -22,7 +24,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-onboarding";
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
|
||||
repoName = "onboarding";
|
||||
|
||||
@@ -30,13 +32,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "1mpw0j8ymb41py9v9qlk4nwy1lnwj7k388c7gqdv34ynck0ymfi4";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -52,6 +48,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
elementary-gtk-theme
|
||||
elementary-icon-theme
|
||||
elementary-settings-daemon # settings schema
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
@@ -64,6 +61,12 @@ stdenv.mkDerivation rec {
|
||||
src = ./fix-paths.patch;
|
||||
appcenter = appcenter;
|
||||
})
|
||||
# Provides the directory where the locales are actually installed
|
||||
# https://github.com/elementary/onboarding/pull/147
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
|
||||
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -71,6 +74,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Onboarding app for new users designed for elementary OS";
|
||||
homepage = "https://github.com/elementary/onboarding";
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, writeScript
|
||||
, pantheon
|
||||
, gnome-keyring
|
||||
, gnome-session
|
||||
, wingpanel
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, file-roller
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
@@ -16,14 +15,11 @@
|
||||
, granite
|
||||
, libgee
|
||||
, bamf
|
||||
, libcanberra
|
||||
, libcanberra-gtk3
|
||||
, gnome-desktop
|
||||
, mutter
|
||||
, clutter
|
||||
, elementary-dock
|
||||
, elementary-icon-theme
|
||||
, elementary-settings-daemon
|
||||
, gnome-settings-daemon
|
||||
, wrapGAppsHook
|
||||
, gexiv2
|
||||
@@ -31,23 +27,22 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gala";
|
||||
version = "6.2.1";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1phnhj731kvk8ykmm33ypcxk8fkfny9k6kdapl582qh4d47wcy6f";
|
||||
sha256 = "sha256-f/WDm9/+lXgplg9tGpct4f+1cOhKgdypwiDRBhewRGw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./plugins-dir.patch
|
||||
# Multitasking view: Don't use smooth scroll events to handle mouse wheel
|
||||
# Avoid breaking the multitasking view scroll once xf86-input-libinput 1.2.0 lands
|
||||
# https://github.com/elementary/gala/pull/1266
|
||||
# Session crashes when switching windows with Alt+Tab
|
||||
# https://github.com/elementary/gala/issues/1312
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/gala/commit/d2dcfdefdf97c1b49654179a7acd01ebfe017308.patch";
|
||||
sha256 = "sha256-2lKrCz3fSjrfKfysuUHzeUjhmMm84K47n882CLpfAyg=";
|
||||
url = "https://github.com/elementary/gala/commit/cc83db8fe398feae9f3e4caa8352b65f0c8c96d4.patch";
|
||||
sha256 = "sha256-CPO3EHIzqHAV6ZLHngivCdsD8je8CK/NHznfxSEkhzc=";
|
||||
})
|
||||
];
|
||||
|
||||
@@ -66,20 +61,23 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
bamf
|
||||
clutter
|
||||
elementary-dock
|
||||
elementary-icon-theme
|
||||
elementary-settings-daemon
|
||||
gnome-settings-daemon
|
||||
gexiv2
|
||||
gnome-desktop
|
||||
granite
|
||||
gtk3
|
||||
libcanberra
|
||||
libcanberra-gtk3
|
||||
libgee
|
||||
mutter
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
# TODO: enable this and remove --builtin flag from session-settings
|
||||
# https://github.com/NixOS/nixpkgs/pull/140429
|
||||
"-Dsystemd=false"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson/post_install.py
|
||||
patchShebangs build-aux/meson/post_install.py
|
||||
@@ -91,7 +89,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = with lib; {
|
||||
description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon";
|
||||
homepage = "https://github.com/elementary/gala";
|
||||
license = licenses.gpl3Plus;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, substituteAll
|
||||
, meson
|
||||
, ninja
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-applications-menu";
|
||||
version = "2.9.1";
|
||||
version = "2.10.1";
|
||||
|
||||
repoName = "applications-menu";
|
||||
|
||||
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "sha256-Q0ee8S8wWhK0Y16SWfE79Us6QD/oRE5Pxm3o//eb/po=";
|
||||
sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
# Fix incorrect month shown on re-opening indicator if previously changed month
|
||||
# https://github.com/elementary/wingpanel-indicator-datetime/pull/284
|
||||
./fix-incorrect-month.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch";
|
||||
sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 401cb05d7181e69ae8edd347644f2518904e9acb Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Paul Wootten <jeremywootten@gmail.com>
|
||||
Date: Sat, 30 Oct 2021 17:44:12 +0100
|
||||
Subject: [PATCH] Reset position and relative position after rebuilding
|
||||
carousel
|
||||
|
||||
---
|
||||
src/Widgets/calendar/CalendarView.vala | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala
|
||||
index a41b37a4..f946b91c 100644
|
||||
--- a/src/Widgets/calendar/CalendarView.vala
|
||||
+++ b/src/Widgets/calendar/CalendarView.vala
|
||||
@@ -216,7 +216,11 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
|
||||
carousel.add (right_grid);
|
||||
carousel.scroll_to (start_month_grid);
|
||||
label.label = calmodel.month_start.format (_("%OB, %Y"));
|
||||
+
|
||||
+ position = 1;
|
||||
+ rel_postion = 0;
|
||||
}
|
||||
+
|
||||
carousel.no_show_all = false;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -18,19 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wingpanel-indicator-network";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xr1ZihWK8fU8M/rXRKk5dOjoQNe3aJO8ouKC/iVZ7Sk=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-4Fg8/Gm9mUqaL3wEc8h+/pMvOfD75ILjo7LhLz6LQmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -49,6 +42,12 @@ stdenv.mkDerivation rec {
|
||||
wingpanel
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Network Indicator for Wingpanel";
|
||||
homepage = "https://github.com/elementary/wingpanel-indicator-network";
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, gnome
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, fetchpatch
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, python3
|
||||
@@ -7,7 +8,6 @@
|
||||
, vala
|
||||
, pkg-config
|
||||
, libgee
|
||||
, pantheon
|
||||
, gtk3
|
||||
, glib
|
||||
, gettext
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "granite";
|
||||
version = "6.1.2";
|
||||
version = "6.2.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@@ -26,13 +26,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-d48KQH8uwkSZWQEFSq1BD+TVUi9PWVVtMjKYmleRW58=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
sha256 = "sha256-WM0Wo9giVP5pkMFaPCHsMfnAP6xD71zg6QLCYV6lmkY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -58,6 +52,12 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs meson/post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "pantheon.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "An extension to GTK used by elementary OS";
|
||||
longDescription = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, meson
|
||||
, python3
|
||||
, ninja
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, python3
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
@@ -10,7 +11,6 @@
|
||||
, libgee
|
||||
, libhandy
|
||||
, libcanberra-gtk3
|
||||
, pantheon
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, python3
|
||||
, vala
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
@@ -38,13 +38,13 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
vala
|
||||
wrapGAppsHook
|
||||
];
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
geoclue2
|
||||
gtk3
|
||||
libgee
|
||||
];
|
||||
];
|
||||
|
||||
# This should be provided by a post_install.py script - See -> https://github.com/elementary/pantheon-agent-geoclue2/pull/21
|
||||
postInstall = ''
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, pantheon
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@@ -106,6 +106,15 @@ compcert.overrideAttrs (o:
|
||||
})
|
||||
];
|
||||
}
|
||||
{ cases = [ (isEq "8.14") "3.10" ];
|
||||
out = [
|
||||
# Support for Coq 8.14.1
|
||||
(fetchpatch {
|
||||
url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch";
|
||||
sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94";
|
||||
})
|
||||
];
|
||||
}
|
||||
] [];
|
||||
}
|
||||
)
|
||||
|
||||
@@ -28,7 +28,6 @@ in
|
||||
inherit version release;
|
||||
|
||||
defaultVersion = with versions; switch coq.version [
|
||||
{ case = isEq "8.14"; out = "8.14+rc1+0.14.0"; }
|
||||
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
||||
{ case = isEq "8.12"; out = "8.12.0+0.12.1"; }
|
||||
{ case = isEq "8.11"; out = "8.11.0+0.11.1"; }
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{lib, stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
|
||||
, blas, libbfd, intltool, gettext, zlib, libSM}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
baseName = "lush";
|
||||
version = "2.0.1";
|
||||
name = "${baseName}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz";
|
||||
sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd
|
||||
intltool gettext zlib
|
||||
];
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
NIX_LDFLAGS=" -lz ";
|
||||
|
||||
meta = {
|
||||
description = "Lisp Universal SHell";
|
||||
license = lib.licenses.gpl2Plus ;
|
||||
maintainers = [ lib.maintainers.raskin ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
url https://sourceforge.net/projects/lush/files/lush2/
|
||||
version_link '[.]tar[.]gz/download$'
|
||||
SF_redirect
|
||||
minimize_overwrite
|
||||
@@ -238,4 +238,7 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tobim veprbl cpcloud ];
|
||||
};
|
||||
passthru = {
|
||||
inherit enableFlight enableJemalloc enableS3 enableGcs;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-auth";
|
||||
version = "0.6.5";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-auth";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d3UdZucicp+Z0EjWNE5Xa/EMIGPk6GtQc7f0H8RBHA8=";
|
||||
sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-cal";
|
||||
version = "0.5.11";
|
||||
version = "0.5.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rmEsDsY50IKpCpQTvAFEkgCtuHwwgwMwcRpBUyyZGGc=";
|
||||
sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-common";
|
||||
version = "0.6.14";
|
||||
version = "0.6.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JEaRB0k6zyk5UKuB2hEZUAsnp2SuI9mrok/EvwclUJk=";
|
||||
sha256 = "sha256-+FzTEpotxco4+9gLVUL+rkCWoMjRCorKQ47JINHsnNA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-http";
|
||||
version = "0.6.8";
|
||||
version = "0.6.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-http";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JqFvKoWW/2UV0jcR50QlD+LEPwQ4qwPoaPpioAuwf90=";
|
||||
sha256 = "sha256-R+teEKSQjSFYt3+XXvooAy4GJwN4yzEhJtiuknBZIgU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-io";
|
||||
version = "0.10.12";
|
||||
version = "0.10.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8v38NN9qrgdrshMx3l2wLrl7l77HjsW2GPu8IwkclJQ=";
|
||||
sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-c-mqtt";
|
||||
version = "0.7.8";
|
||||
version = "0.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-c-mqtt";
|
||||
rev = "v${version}";
|
||||
sha256 = "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c";
|
||||
sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-crt-cpp";
|
||||
version = "0.17.0";
|
||||
version = "0.17.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-crt-cpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ijvyg3hrh1d0npca62syz8qy6nkqh90fq54cqyln0p333z16q52";
|
||||
sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -1,29 +1,20 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, openssl
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "s2n-tls";
|
||||
version = "1.0.17";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4=";
|
||||
sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix FindLibCrypto paths (https://github.com/aws/s2n-tls/pull/3067)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aws/s2n-tls/commit/bda649524402be4018c44bff07f6c64502a351ec.patch";
|
||||
sha256 = "02jmxsrd506vhjzlrgh1p2z1f1sn4v8klks25zisiykyqkyaczkv";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user