From 5a6c43dda3f74e78ba1c143cb2ee2652567e362c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 8 Oct 2021 17:06:03 +0200 Subject: [PATCH 001/121] ec2-amis.nix -> amazon-ec2-amis.nix, new format --- .../virtualisation/amazon-ec2-amis.nix | 371 +++++++++++++++++ nixos/modules/virtualisation/ec2-amis.nix | 380 +----------------- 2 files changed, 380 insertions(+), 371 deletions(-) create mode 100644 nixos/modules/virtualisation/amazon-ec2-amis.nix diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix new file mode 100644 index 000000000000..6905080f6352 --- /dev/null +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -0,0 +1,371 @@ +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.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"; + + # 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 diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index d38f41ab39d7..1ffb326ba7a8 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -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 From 00563d4f076a476c670635fbe266689af1a73f07 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 8 Oct 2021 17:29:33 +0200 Subject: [PATCH 002/121] amazon-ec2-amis: Add aarch64 amis --- .../virtualisation/amazon-ec2-amis.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index 6905080f6352..b3459ba3d650 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -328,6 +328,23 @@ let self = { "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"; @@ -347,6 +364,24 @@ let self = { "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"; From b5681a7a4096b81101626a0853c28bede0495490 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 1 Nov 2021 10:59:47 +0100 Subject: [PATCH 003/121] nixos/specialisation: Rephrase in terms of extendModules, noUserModules By using the new extendModules function to produce the specialisations, we avoid reimplementing the eval-config.nix logic in reverse and fix cross compilation support for specialisations in the process. --- nixos/lib/eval-config.nix | 21 +++++++----- nixos/modules/system/activation/top-level.nix | 32 +++++++++++-------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 69e0a2afdba3..74b52daa3c8e 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -51,23 +51,28 @@ let }; }; -in rec { - - # Merge the option definitions in all modules, forming the full - # system configuration. - inherit (lib.evalModules { + noUserModules = lib.evalModules { inherit prefix check; - modules = baseModules ++ extraModules ++ [ pkgsModule ] ++ modules; + modules = baseModules ++ extraModules ++ [ pkgsModule ]; args = extraArgs; specialArgs = { modulesPath = builtins.toString ../modules; } // specialArgs; - }) config options _module type; + }; # These are the extra arguments passed to every module. In # particular, Nixpkgs is passed through the "pkgs" argument. extraArgs = extraArgs_ // { - inherit baseModules extraModules modules; + inherit noUserModules baseModules extraModules modules; }; +in rec { + + # Merge the option definitions in all modules, forming the full + # system configuration. + inherit (noUserModules.extendModules { inherit modules; }) + config options _module type; + + inherit extraArgs; + inherit (_module.args) pkgs; } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 68da910d29cc..8266622e78df 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modules, baseModules, specialArgs, ... }: +{ config, lib, pkgs, extendModules, noUserModules, ... }: with lib; @@ -11,16 +11,10 @@ let # you can provide an easy way to boot the same configuration # as you use, but with another kernel # !!! fix this - children = mapAttrs (childName: childConfig: - (import ../../../lib/eval-config.nix { - inherit lib baseModules specialArgs; - system = config.nixpkgs.initialSystem; - modules = - (optionals childConfig.inheritParentConfig modules) - ++ [ ./no-clone.nix ] - ++ [ childConfig.configuration ]; - }).config.system.build.toplevel - ) config.specialisation; + children = + mapAttrs + (childName: childConfig: childConfig.configuration.system.build.toplevel) + config.specialisation; systemBuilder = let @@ -176,7 +170,11 @@ in ''; type = types.attrsOf (types.submodule ( - { ... }: { + local@{ ... }: let + extend = if local.config.inheritParentConfig + then extendModules + else noUserModules.extendModules; + in { options.inheritParentConfig = mkOption { type = types.bool; default = true; @@ -185,7 +183,15 @@ in options.configuration = mkOption { default = {}; - description = "Arbitrary NixOS configuration options."; + description = '' + Arbitrary NixOS configuration. + + Anything you can add to a normal NixOS configuration, you can add + here, including imports and config values, although nested + specialisations will be ignored. + ''; + visible = "shallow"; + inherit (extend { modules = [ ./no-clone.nix ]; }) type; }; }) ); From e699a0ade267e2c6308f29a30692662dcf27a291 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 17 Nov 2021 09:15:06 +0000 Subject: [PATCH 004/121] musikcube: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: musikcube/cursespp/cursespp/curses_config.h:54:36: error: format not a string literal and no format arguments [-Werror=format-security] 54 | if (window && format) { wprintw(window, format, ##__VA_ARGS__); } | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ musikcube/src/musikcube/app/window/TransportWindow.cpp:640:5: note: in expansion of macro 'checked_wprintw' 640 | checked_wprintw(c, shuffleLabel.c_str( --- pkgs/applications/audio/musikcube/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 2824832ef604..8e9e269abc97 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -4,6 +4,7 @@ , boost , curl , fetchFromGitHub +, fetchpatch , ffmpeg , lame , libev @@ -26,6 +27,16 @@ stdenv.mkDerivation rec { sha256 = "1y00vwn1h10cfflxrm5bk271ak9gilhjycgi44hlkkhmf5bdgn35"; }; + patches = [ + # Fix pending upstream inclusion for ncuurses-6.3 support: + # https://github.com/clangen/musikcube/pull/474 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; + sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; + }) + ]; + nativeBuildInputs = [ cmake pkg-config From 363d7f3ae857aeb863bc2e00fb487591b7d5db2b Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 15 Nov 2021 12:11:18 -0800 Subject: [PATCH 005/121] nixos/test-driver: add timeout parameter to execute --- nixos/lib/test-driver/test-driver.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index a7c0484060f2..1d45e001bb4c 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -597,9 +597,14 @@ class Machine: break return "".join(output_buffer) - def execute(self, command: str, check_return: bool = True) -> Tuple[int, str]: + def execute( + self, command: str, check_return: bool = True, timeout: Optional[int] = 900 + ) -> Tuple[int, str]: self.connect() + if timeout is not None: + command = "timeout {} sh -c {}".format(timeout, shlex.quote(command)) + out_command = f"( set -euo pipefail; {command} ) | (base64 --wrap 0; echo)\n" assert self.shell self.shell.send(out_command.encode()) From e62b8020f3d6597ffe4c5444fe824546af88e739 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 15 Nov 2021 12:23:25 -0800 Subject: [PATCH 006/121] nixos/test-driver: add (functional) timeouts to more functions A retry timeout doesn't really help if the thing it's retrying may block forever. --- nixos/lib/test-driver/test-driver.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 1d45e001bb4c..b6fbc03c1777 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -634,12 +634,12 @@ class Machine: pass_fds=[self.shell.fileno()], ) - def succeed(self, *commands: str) -> str: + def succeed(self, *commands: str, timeout: Optional[int] = None) -> str: """Execute each command and check that it succeeds.""" output = "" for command in commands: with self.nested("must succeed: {}".format(command)): - (status, out) = self.execute(command) + (status, out) = self.execute(command, timeout=timeout) if status != 0: self.log("output: {}".format(out)) raise Exception( @@ -648,12 +648,12 @@ class Machine: output += out return output - def fail(self, *commands: str) -> str: + def fail(self, *commands: str, timeout: Optional[int] = None) -> str: """Execute each command and check that it fails.""" output = "" for command in commands: with self.nested("must fail: {}".format(command)): - (status, out) = self.execute(command) + (status, out) = self.execute(command, timeout=timeout) if status == 0: raise Exception( "command `{}` unexpectedly succeeded".format(command) @@ -669,14 +669,14 @@ class Machine: def check_success(_: Any) -> bool: nonlocal output - status, output = self.execute(command) + status, output = self.execute(command, timeout=timeout) return status == 0 with self.nested("waiting for success: {}".format(command)): retry(check_success, timeout) return output - def wait_until_fails(self, command: str) -> str: + def wait_until_fails(self, command: str, timeout: int = 900) -> str: """Wait until a command returns failure. Throws an exception on timeout. """ @@ -684,7 +684,7 @@ class Machine: def check_failure(_: Any) -> bool: nonlocal output - status, output = self.execute(command) + status, output = self.execute(command, timeout=timeout) return status != 0 with self.nested("waiting for failure: {}".format(command)): From 7331816f56680397a0c294b5d5b8809e82c0752c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Nov 2021 08:18:23 +0000 Subject: [PATCH 007/121] nfstrace: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: nfstrace/analyzers/src/watch/nc_windows/header_window.cpp:77:82: error: format '%d' expects argument of type 'int', but argument 5 has type 'time_t' {aka 'long int'} [-Werror=format=] 77 | mvwprintw(_window, HEADER::ELAPSED_LINE, FIRST_CHAR_POS, "Elapsed time: \t %d days; %d:%d:%d times", | ~^ | int | %ld While at it wropped blnket -Werror that fails on gcc-12 and clang-12. --- pkgs/tools/networking/nfstrace/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index ca75e50fa527..ac9af8e9816c 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -22,11 +22,22 @@ stdenv.mkDerivation rec { url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch"; sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p"; }) + + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/epam/nfstrace/pull/50 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch"; + sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx"; + }) ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace "-Wno-braced-scalar-init" "" + # -Wall -Wextra -Werror fails on clang and newer gcc + substituteInPlace CMakeLists.txt \ + --replace "-Werror" "" ''; buildInputs = [ json_c libpcap ncurses libtirpc ]; From 217aa28f460157c14c614245356bc3feef5805d2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 19 Nov 2021 09:39:32 +0000 Subject: [PATCH 008/121] wiimms-iso-tools: pull pending upstream inclusion fix for ncurses-6.3 Without the fix build on ncurses-6.3 fails as: src/lib-std.c:3623:32: error: format not a string literal and no format arguments [-Werror=format-security] 3623 | ERROR0(ERR_WARNING,errmsg); | ^~~~~~ --- .../filesystems/wiimms-iso-tools/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index 70c445014098..8f6e0db7ea27 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, zlib, ncurses, fuse}: +{lib, stdenv, fetchurl, fetchpatch, zlib, ncurses, fuse}: stdenv.mkDerivation rec { name = "wiimms-iso-tools"; @@ -11,7 +11,19 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ncurses fuse ]; - patches = [ ./fix-paths.diff ]; + patches = [ + ./fix-paths.diff + + # Pull pending upstream fix for ncurses-6.3: + # https://github.com/Wiimm/wiimms-iso-tools/pull/14 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/Wiimm/wiimms-iso-tools/commit/3f1e84ec6915cc4f658092d33411985bd3eaf4e6.patch"; + sha256 = "18cfri4y1082phg6fzh402gk5ri24wr8ff4zl8v5rlgjndh610im"; + stripLen = 1; + }) + ]; + postPatch = '' patchShebangs setup.sh patchShebangs gen-template.sh From 12bab91d3ba343c8dee5093da0eab38136752d60 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sun, 21 Nov 2021 20:12:31 -0800 Subject: [PATCH 009/121] nixos/doc: improve example of renaming network interfaces For reliably identifying network interfaces, `PermanentMACAddress` is likely to be preferable to `MACAddress`. NetworkManager in particular commonly changes the MAC address of wireless interfaces. Reference: - https://www.freedesktop.org/software/systemd/man/systemd.link.html#PermanentMACAddress= --- nixos/doc/manual/configuration/renaming-interfaces.section.md | 2 +- .../from_md/configuration/renaming-interfaces.section.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/configuration/renaming-interfaces.section.md b/nixos/doc/manual/configuration/renaming-interfaces.section.md index b124e8303fee..18390c959b24 100644 --- a/nixos/doc/manual/configuration/renaming-interfaces.section.md +++ b/nixos/doc/manual/configuration/renaming-interfaces.section.md @@ -26,7 +26,7 @@ we assign the name `wan` to the interface with MAC address ```nix systemd.network.links."10-wan" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; + matchConfig.PermanentMACAddress = "52:54:00:12:01:01"; linkConfig.Name = "wan"; }; ``` diff --git a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml index 1c32e30b3f85..88c9e624c82f 100644 --- a/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml +++ b/nixos/doc/manual/from_md/configuration/renaming-interfaces.section.xml @@ -32,7 +32,7 @@ systemd.network.links."10-wan" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; + matchConfig.PermanentMACAddress = "52:54:00:12:01:01"; linkConfig.Name = "wan"; }; From 26038de2256eae025045e4646d91a73285700ed3 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 25 Nov 2021 10:11:28 +0100 Subject: [PATCH 010/121] ruby: 2.7.4 -> 2.7.5, 3.0.2 -> 3.0.3 --- pkgs/development/interpreters/ruby/default.nix | 12 ++++++------ pkgs/development/interpreters/ruby/patchsets.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b6010cf32d10..7ab397bfc191 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -252,18 +252,18 @@ let in { ruby_2_7 = generic { - version = rubyVersion "2" "7" "4" ""; + version = rubyVersion "2" "7" "5" ""; sha256 = { - src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"; - git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p"; + src = "1wc1hwmz4m6iqlmqag8liyld917p6a8dvnhnpd1v8d8jl80bjm97"; + git = "16565fyl7141hr6q6d74myhsz46lvgam8ifnacshi68vzibwjbbh"; }; }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "2" ""; + version = rubyVersion "3" "0" "3" ""; sha256 = { - src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah"; - git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r"; + src = "1b4j39zyyvdkf1ax2c6qfa40b4mxfkr87zghhw19fmnzn8f8d1im"; + git = "1q19w5i1jkfxn7qq6f9v9ngax9h52gxwijk7hp312dx6amwrkaim"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3ea358c349a3..31a9a9f1c08d 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,12 +1,12 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.7.4" = ops useRailsExpress [ + "2.7.5" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.2" = ops useRailsExpress [ + "3.0.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; From c5be6ef14f7133cdecbb3e8f87dfc4a4ee396c91 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 26 Nov 2021 14:02:17 -0800 Subject: [PATCH 011/121] probe-run: 0.3.0 -> 0.3.1 --- pkgs/development/tools/rust/probe-run/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 6f9cb007b904..2626de0f84ba 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, libusb1 +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1 , libiconv, AppKit, IOKit }: rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.0"; + version = "0.3.1"; - src = fetchFromGitHub { - owner = "knurling-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "0qlpvy62wqc8k9sww6pbiqv0yrjwpnai1vgrijw5285qpvrdsdw2"; + src = fetchCrate { + inherit pname version; + sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; }; - cargoSha256 = "10ybgzvv2iy5bjmmw48gmgvsx6rfqclsysyfbhd820dg2lshgi44"; + cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] From f5e66f362769284e376307319d64f8806c6fc61c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Nov 2021 04:20:00 +0000 Subject: [PATCH 012/121] groonga: 11.0.5 -> 11.0.9 --- pkgs/servers/search/groonga/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index b405a4c2f09d..f9e24a956744 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config -, suggestSupport ? false, zeromq, libevent, msgpack +, suggestSupport ? false, zeromq, libevent, msgpack, openssl , lz4Support ? false, lz4 -, zlibSupport ? false, zlib +, zlibSupport ? true, zlib }: stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.5"; + version = "11.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oBABhMKLezjPeHkWfqesy+ze+CPnWfmS17vCKC7fWEU="; + sha256 = "sha256-yE/Ok0QNY9+a4vfNJWZjR4W8E/i+lw7T85X2+oOw8m4="; }; buildInputs = with lib; - [ pkg-config mecab kytea libedit ] + [ pkg-config mecab kytea libedit openssl ] ++ optional lz4Support lz4 ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; From 3b35310cdc4e79a47f11bba28f22c982add599b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Nov 2021 04:20:00 +0000 Subject: [PATCH 013/121] git-filter-repo: remove duplicated expression --- .../git-and-tools/git-filter-repo/default.nix | 28 ------------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix deleted file mode 100644 index f5e964d3ca9a..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, pythonPackages }: - -stdenv.mkDerivation rec { - pname = "git-filter-repo"; - version = "2.33.0"; - - src = fetchurl { - url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-e88R2hNLvYKkFx9/soo6t7xNR4/o7Do9lYDku9wy5uk="; - }; - - buildInputs = [ pythonPackages.python ]; - - dontBuild = true; - - installPhase = '' - install -Dm755 -t $out/bin git-filter-repo - install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 - ''; - - meta = with lib; { - homepage = "https://github.com/newren/git-filter-repo"; - description = "Quickly rewrite git repository history (filter-branch replacement)"; - license = licenses.mit; - inherit (pythonPackages.python.meta) platforms; - maintainers = [ maintainers.marsam ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf51b1df7af8..2c461dee4983 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5618,9 +5618,7 @@ with pkgs; git-fast-export = callPackage ../applications/version-management/git-and-tools/fast-export { }; - git-filter-repo = callPackage ../applications/version-management/git-and-tools/git-filter-repo { - pythonPackages = python3Packages; - }; + git-filter-repo = with python3Packages; toPythonApplication git-filter-repo; git-gone = callPackage ../applications/version-management/git-and-tools/git-gone { inherit (darwin.apple_sdk.frameworks) Security; From ceec67c6803d32a8f3ceb0450373e39c723e4987 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 27 Nov 2021 04:20:00 +0000 Subject: [PATCH 014/121] postgresqlPackages.pgroonga: 2.3.2 -> 2.3.4 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 86c9e54526f7..c0d05fc1769f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "10rj35xxcfg10nvq3zqxm25hfb3hw58z4dda1b4hh8ibyz2489vy"; + sha256 = "sha256-XE669KfHEyY5TghMUC0GcIqdPTsdAs04pA/t84k+i2E="; }; nativeBuildInputs = [ pkg-config ]; From 9a0723cc3f472d5e36ff622eb47303da5291d156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 28 Nov 2021 15:41:19 +0100 Subject: [PATCH 015/121] unbound-full: fix the build again ... by not avoiding openssl dependency in .lib. dnstap part of code ran into issues with this during checkPhase. The benefit of withSlimLib is mainly for `unbound`; for the fuller builds it doesn't seem important. --- pkgs/tools/networking/unbound/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 98b7b2547d69..f9ff82735b90 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -32,6 +32,9 @@ , withDNSTAP ? false , withTFO ? false , withRedis ? false +# Avoid .lib depending on openssl.out +# The build gets a little hacky, so in some cases we disable this approach. +, withSlimLib ? stdenv.isLinux && !stdenv.hostPlatform.isMusl && !withDNSTAP , libnghttp2 }: @@ -105,10 +108,9 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - preFixup = lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit + preFixup = lib.optionalString withSlimLib # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. - # There was some problem with this on Darwin; let's not complicate non-Linux. '' configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only" configurePhase From 8d227fe05c146aee8ae6ded8ad2168f074f1b203 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Nov 2021 11:16:47 +0200 Subject: [PATCH 016/121] wxmaxima: 21.05.2 -> 21.11.0 - Remove the `Version-` prefix from the version. - Add @doronbehar as maintainer. --- .../science/math/wxmaxima/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 57e4a6f1d336..76d2c782b4d4 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,21 +1,37 @@ -{ lib, stdenv, fetchFromGitHub -, wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome }: +{ lib +, stdenv +, fetchFromGitHub +, wrapGAppsHook +, cmake +, gettext +, maxima +, wxGTK +, gnome +}: stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "21.05.2"; + version = "21.11.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "sha256-HPqdxGrPxe5FZNOimTpAP+c9VpDBkXu3Z1c1Aaf3+UA="; + sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk="; }; - buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; + buildInputs = [ + wxGTK + maxima + # So it won't embed svg files into headers. + gnome.adwaita-icon-theme + ]; - nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; + nativeBuildInputs = [ + wrapGAppsHook + cmake + gettext + ]; preConfigure = '' gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin) @@ -25,6 +41,7 @@ stdenv.mkDerivation rec { description = "Cross platform GUI for the computer algebra system Maxima"; license = licenses.gpl2; homepage = "https://wxmaxima-developers.github.io/wxmaxima/"; + maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; } From 8d17f4babf00cb40c893d4dfc84a67a5805c0b69 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Nov 2021 11:08:17 +0200 Subject: [PATCH 017/121] maxima: 5.45.0 -> 5.45.1 - Reformat expression with 1 line per input / argument - Add @doronbehar as maintainer. --- .../science/math/maxima/default.nix | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 3f295b416fb0..4fbd6e5a00d1 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, sbcl, texinfo, perl, python3, makeWrapper, autoreconfHook -, rlwrap ? null, tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false +{ lib +, stdenv +, fetchurl +, fetchpatch +, texinfo +, perl +, python3 +, makeWrapper +, autoreconfHook +, rlwrap ? null +, tk ? null +, gnuplot ? null +, ecl ? null +, ecl-fasl ? false +, sbcl }: let - name = "maxima"; - version = "5.45.0"; - lisp-compiler = if ecl-fasl then ecl else sbcl; searchPath = lib.makeBinPath (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in -stdenv.mkDerivation ({ - inherit version; - name = "${name}-${version}"; +stdenv.mkDerivation rec { + pname = "maxima"; + version = "5.45.1"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng="; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "sha256-/pAWJ2lwvvIUoaJENIVYZEUU1/36pPyLnQ6Hr8u059w="; }; nativeBuildInputs = [ @@ -67,7 +77,8 @@ stdenv.mkDerivation ({ sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; }) - # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca, see see https://trac.sagemath.org/ticket/13364#comment:93 + # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca + # see https://trac.sagemath.org/ticket/13364#comment:93 (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; @@ -100,10 +111,10 @@ stdenv.mkDerivation ({ ecl = ecl; }; - meta = { + meta = with lib; { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Maxima is a fairly complete computer algebra system written in @@ -111,7 +122,7 @@ stdenv.mkDerivation ({ DOE-MACSYMA and licensed under the GPL. Its abilities include symbolic integration, 3D plotting, and an ODE solver. ''; - - platforms = lib.platforms.unix; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.unix; }; -}) +} From 57ab62314b18dcdeb4c3e0365cf1821dd1f3340b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 29 Nov 2021 14:43:39 +0200 Subject: [PATCH 018/121] maxima, sage: Simplify lisp-compiler arguments namings Make clearer the difference between `maxima` and `maxima-ecl` top-level attributes. Use the `lisp-compiler` as a passthru for all of sage's expressions. Add the `pname` attribute for `ecl` for compatibility with other lisp implementations. --- .../science/math/maxima/default.nix | 18 +++++++----------- .../applications/science/math/sage/default.nix | 16 +++++++--------- .../science/math/sage/env-locations.nix | 9 ++++----- .../science/math/sage/sage-env.nix | 7 +++---- .../science/math/sage/sage-with-env.nix | 4 ++-- .../applications/science/math/sage/sagedoc.nix | 4 ++-- .../applications/science/math/sage/sagelib.nix | 6 +++--- pkgs/development/compilers/ecl/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 6 ++---- 9 files changed, 32 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 4fbd6e5a00d1..8bad09f17880 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -10,17 +10,13 @@ , rlwrap ? null , tk ? null , gnuplot ? null -, ecl ? null -, ecl-fasl ? false -, sbcl +, lisp-compiler }: let - lisp-compiler = if ecl-fasl then ecl else sbcl; - - searchPath = - lib.makeBinPath - (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); + # Allow to remove some executables from the $PATH of the wrapped binary + searchPath = lib.makeBinPath + (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in stdenv.mkDerivation rec { pname = "maxima"; @@ -59,7 +55,7 @@ stdenv.mkDerivation rec { ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima '' - + (lib.optionalString ecl-fasl '' + + (lib.optionalString (lisp-compiler.pname == "ecl") '' cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" '') ; @@ -83,7 +79,7 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - ] ++ lib.optionals ecl-fasl [ + ] ++ lib.optionals (lisp-compiler.pname == "ecl") [ # build fasl, needed for ECL support (fetchpatch { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; @@ -108,7 +104,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - ecl = ecl; + inherit lisp-compiler; }; meta = with lib; { diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index b7821db1f9a7..e9dae55fbae3 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -15,7 +15,7 @@ let sagelib = self.callPackage ./sagelib.nix { inherit flint arb; inherit sage-src env-locations pynac singular; - ecl = maxima-ecl.ecl; + inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -48,9 +48,8 @@ let # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { inherit pari_data; - inherit singular maxima-ecl; + inherit singular maxima; inherit three; - ecl = maxima-ecl.ecl; cysignals = python3.pkgs.cysignals; mathjax = nodePackages.mathjax; }; @@ -61,22 +60,21 @@ let sagelib = python3.pkgs.sagelib; sage_docbuild = python3.pkgs.sage_docbuild; inherit env-locations; - inherit python3 singular palp flint pynac pythonEnv maxima-ecl; - ecl = maxima-ecl.ecl; + inherit python3 singular palp flint pynac pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; # The documentation for sage, building it takes a lot of ram. sagedoc = callPackage ./sagedoc.nix { inherit sage-with-env; - inherit python3 maxima-ecl; + inherit python3 maxima; }; # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. sage-with-env = callPackage ./sage-with-env.nix { inherit python3 pythonEnv; inherit sage-env; - inherit pynac singular maxima-ecl; + inherit pynac singular maxima; inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -118,8 +116,8 @@ let singular = pkgs.singular.override { inherit flint; }; - maxima-ecl = pkgs.maxima-ecl.override { - ecl = pkgs.ecl.override { + maxima = pkgs.maxima.override { + lisp-compiler = pkgs.ecl.override { # "echo syntax error | ecl > /dev/full 2>&1" segfaults in # ECL. We apply a patch to fix it (write_error.patch), but it # only works if threads are disabled. sage 9.2 tests this diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index b1ad0aad9c76..45a4799d1a03 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -2,13 +2,12 @@ , pari_data , pari , singular -, maxima-ecl +, maxima , conway_polynomials , graphs , elliptic_curves , polytopes_db , gap -, ecl , combinatorial_designs , jmol , mathjax @@ -30,14 +29,14 @@ writeTextFile rec { export SINGULAR_SO='${singular}/lib/libSingular.so' export GAP_SO='${gap}/lib/libgap.so' export SINGULAR_EXECUTABLE='${singular}/bin/Singular' - export MAXIMA_FAS='${maxima-ecl}/lib/maxima/${maxima-ecl.version}/binary-ecl/maxima.fas' - export MAXIMA_PREFIX="${maxima-ecl}" + export MAXIMA_FAS='${maxima}/lib/maxima/${maxima.version}/binary-ecl/maxima.fas' + export MAXIMA_PREFIX="${maxima}" export CONWAY_POLYNOMIALS_DATA_DIR='${conway_polynomials}/share/conway_polynomials' export GRAPHS_DATA_DIR='${graphs}/share/graphs' export ELLCURVE_DATA_DIR='${elliptic_curves}/share/ellcurves' export POLYTOPE_DATA_DIR='${polytopes_db}/share/reflexive_polytopes' export GAP_ROOT_DIR='${gap}/share/gap/build-dir' - export ECLDIR='${ecl}/lib/ecl-${ecl.version}/' + export ECLDIR='${maxima.lisp-compiler}/lib/${maxima.lisp-compiler.pname}-${maxima.lisp-compiler.version}/' export COMBINATORIAL_DESIGN_DATA_DIR="${combinatorial_designs}/share/combinatorial_designs" export CREMONA_MINI_DATA_DIR="${elliptic_curves}/share/cremona" export JMOL_DIR="${jmol}/share/jmol" # point to the directory that contains JmolData.jar diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index fd67076c97de..ae0b9f7453b5 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -15,8 +15,7 @@ , pkg-config , pari , gap -, ecl -, maxima-ecl +, maxima , singular , fflas-ffpack , givaro @@ -77,8 +76,8 @@ let pkg-config pari gap - ecl - maxima-ecl + maxima.lisp-compiler + maxima singular giac palp diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index f204d97961b6..b74ec4007e62 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -9,7 +9,7 @@ , singular , gap , giac -, maxima-ecl +, maxima , pari , gmp , gfan @@ -42,7 +42,7 @@ let pari gmp gfan - maxima-ecl + maxima eclib flintqs ntl diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 76bbc90773b4..6016b3baeb48 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,7 +1,7 @@ { stdenv , sage-with-env , python3 -, maxima-ecl +, maxima , tachyon , jmol , cddlib @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ sage-with-env.env.lib python3 - maxima-ecl + maxima tachyon jmol cddlib diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index b9c98ed64d01..a884ad8899d4 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -10,7 +10,7 @@ , cypari2 , cysignals , cython -, ecl +, lisp-compiler , eclib , ecm , flint @@ -74,7 +74,7 @@ buildPythonPackage rec { jupyter_core pkg-config pip # needed to query installed packages - ecl + lisp-compiler ]; buildInputs = [ @@ -92,7 +92,7 @@ buildPythonPackage rec { arb brial cliquer - ecl + lisp-compiler eclib ecm fflas-ffpack diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 5896e9488268..9d2ded48a377 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -28,7 +28,8 @@ let ]; in stdenv.mkDerivation { - inherit (s) name version; + inherit (s) version; + pname = s.baseName; inherit nativeBuildInputs propagatedBuildInputs; src = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ca8774dcfe..dcc51574d764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31880,12 +31880,10 @@ with pkgs; }; maxima = callPackage ../applications/science/math/maxima { - ecl = null; + lisp-compiler = sbcl; }; maxima-ecl = maxima.override { - inherit ecl; - ecl-fasl = true; - sbcl = null; + lisp-compiler = ecl; }; mxnet = callPackage ../applications/science/math/mxnet { From 640050fcb94dd4735098ca87ae432198a1db04cf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 29 Nov 2021 21:17:40 -0500 Subject: [PATCH 019/121] ionide.ionide-fsharp: 5.5.5 -> 5.10.1 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 25a8495c5a9f..c71d373e1e16 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -921,8 +921,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "5.5.5"; - sha256 = "xrBNiIbZVJ0sGUk/4PudD8kSyX94QkrFtf7Ho/sB0Vs="; + version = "5.10.1"; + sha256 = "sha256-LkWWgyh4khPyUgekVeO8ZzPK+1gTrS8d9Yz6/kHomr8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; From 428620c9c5b7a208bf5df34a6fa30ea8fde02947 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 30 Nov 2021 11:43:00 +0100 Subject: [PATCH 020/121] matrix-appservice-irc: 0.30.0 -> 0.32.1 --- .../matrix-appservice-irc/default.nix | 2 +- .../matrix-appservice-irc/node-packages.nix | 915 ++++++++++++++---- .../matrix-appservice-irc/package.json | 20 +- 3 files changed, 718 insertions(+), 219 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 1465b9518ffa..2da3a81e187a 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -15,7 +15,7 @@ ourNodePackages.package.override { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = version; - sha256 = "sha256-EncodJKptrLC54B5XipkiHXFgJ5cD+crcT3SOPOc+7M="; + sha256 = "sha256-pJ024kIN7TJdOVV/mMB/DQJdaPQJI6yQci3uASyMZRs="; }; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix index f2d2b6fc94c1..af405451e58b 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix @@ -139,31 +139,41 @@ let sha512 = "5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" = { + name = "_at_matrix-org_slash_olm"; + packageName = "@matrix-org/olm"; + version = 1; + src = fetchurl { + name = "olm-1.tar.gz"; + url = "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz"; + sha1 = "edc0156a17eb1087df44f6e0b153ef0c9d454495"; + }; + }; + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@sentry/core-5.27.1" = { @@ -274,13 +284,31 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.8" = { + "@types/diff-5.0.1" = { + name = "_at_types_slash_diff"; + packageName = "@types/diff"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/diff/-/diff-5.0.1.tgz"; + sha512 = "XIpxU6Qdvp1ZE6Kr3yrkv1qgUab0fyf4mHYvW8N3Bx3PCsbN6or1q9/q72cv5jIFWolaGH08U9XyYoLLIykyKQ=="; + }; + }; + "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.8"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + }; + }; + "@types/express-4.17.13" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; "@types/express-serve-static-core-4.17.19" = { @@ -310,13 +338,13 @@ let sha512 = "jpzrsR1ns0n3kyWt92QfOUQhIuJGQ9+QGa7M62rO6toe98woQjnsnzjdMtsQXCdvjjmqjS2ZBCC7xKw0cdzU+Q=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; "@types/mime-1.3.2" = { @@ -337,13 +365,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-12.12.54" = { + "@types/node-14.17.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.54"; + version = "14.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.54.tgz"; - sha512 = "ge4xZ3vSBornVYlDnk7yZ0gK6ChHf/CHB7Gl1I0Jhah8DDnEQqBzgohYG4FX4p81TNirSETOiSyn+y1r9/IR6w=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.19.tgz"; + sha512 = "jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA=="; }; }; "@types/nopt-3.0.29" = { @@ -400,67 +428,67 @@ let sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; - "@typescript-eslint/eslint-plugin-4.16.1" = { + "@typescript-eslint/eslint-plugin-4.33.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz"; - sha512 = "SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; + sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/experimental-utils-4.16.1" = { + "@typescript-eslint/experimental-utils-4.33.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz"; - sha512 = "0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; + sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; }; - "@typescript-eslint/parser-4.16.1" = { + "@typescript-eslint/parser-4.33.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz"; - sha512 = "/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz"; + sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/scope-manager-4.16.1" = { + "@typescript-eslint/scope-manager-4.33.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz"; - sha512 = "6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; + sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/types-4.16.1" = { + "@typescript-eslint/types-4.33.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz"; - sha512 = "nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz"; + sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/typescript-estree-4.16.1" = { + "@typescript-eslint/typescript-estree-4.33.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz"; - sha512 = "m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; + sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/visitor-keys-4.16.1" = { + "@typescript-eslint/visitor-keys-4.33.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.16.1"; + version = "4.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz"; - sha512 = "s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; + sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; "abbrev-1.1.1" = { @@ -535,13 +563,13 @@ let sha1 = "b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"; }; }; - "ansi-align-3.0.0" = { + "ansi-align-3.0.1" = { name = "ansi-align"; packageName = "ansi-align"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz"; - sha512 = "ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw=="; + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; }; "ansi-colors-4.1.1" = { @@ -553,6 +581,24 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "ansi-regex-4.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -562,13 +608,13 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-3.2.1" = { @@ -607,6 +653,15 @@ let sha512 = "P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw=="; }; }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; "archy-1.0.0" = { name = "archy"; packageName = "archy"; @@ -616,6 +671,15 @@ let sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; }; }; + "are-we-there-yet-1.1.7" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + }; + }; "argparse-1.0.10" = { name = "argparse"; packageName = "argparse"; @@ -742,6 +806,15 @@ let sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; }; }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; "basic-auth-2.0.1" = { name = "basic-auth"; packageName = "basic-auth"; @@ -760,6 +833,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "better-sqlite3-7.4.3" = { + name = "better-sqlite3"; + packageName = "better-sqlite3"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -778,6 +860,15 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; + "bindings-1.5.0" = { + name = "bindings"; + packageName = "bindings"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; + }; + }; "bintrees-1.0.1" = { name = "bintrees"; packageName = "bintrees"; @@ -787,6 +878,15 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -850,6 +950,15 @@ let sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-writer-2.0.0" = { name = "buffer-writer"; packageName = "buffer-writer"; @@ -967,6 +1076,24 @@ let sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "ci-info-2.0.0" = { name = "ci-info"; packageName = "ci-info"; @@ -1003,6 +1130,15 @@ let sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; }; }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -1120,6 +1256,15 @@ let sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; "content-disposition-0.5.3" = { name = "content-disposition"; packageName = "content-disposition"; @@ -1273,6 +1418,15 @@ let sha1 = "80a4dd323748384bfa248083622aedec982adff3"; }; }; + "decompress-response-4.2.1" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + }; "deep-extend-0.6.0" = { name = "deep-extend"; packageName = "deep-extend"; @@ -1327,6 +1481,15 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; "depd-1.1.2" = { name = "depd"; packageName = "depd"; @@ -1354,6 +1517,24 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1597,6 +1778,15 @@ let sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; + "eslint-utils-3.0.0" = { + name = "eslint-utils"; + packageName = "eslint-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; + }; + }; "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -1696,6 +1886,15 @@ let sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; }; }; + "expand-template-2.0.3" = { + name = "expand-template"; + packageName = "expand-template"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; + }; + }; "express-4.17.1" = { name = "express"; packageName = "express"; @@ -1732,13 +1931,13 @@ let sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1768,13 +1967,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fastq-1.11.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "fecha-4.2.1" = { @@ -1804,6 +2003,15 @@ let sha512 = "VYb3HZ/GiAGUCrfeakO8Mp54YGswNUHvL7P09WQcXAJNSj3iQ5QraYSp3cIn1MUyw6uzfgN/EFOarCNa4JvUHQ=="; }; }; + "file-uri-to-path-1.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + }; + }; "fill-keys-1.0.2" = { name = "fill-keys"; packageName = "fill-keys"; @@ -1921,6 +2129,24 @@ let sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; }; }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1957,6 +2183,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -2020,6 +2255,15 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; + "github-from-package-0.0.0" = { + name = "github-from-package"; + packageName = "github-from-package"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + }; + }; "glob-7.1.7" = { name = "glob"; packageName = "glob"; @@ -2074,13 +2318,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globby-11.0.3" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; - sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; "got-9.6.0" = { @@ -2155,6 +2399,15 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; "has-yarn-2.1.0" = { name = "has-yarn"; packageName = "has-yarn"; @@ -2209,6 +2462,15 @@ let sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; "htmlencode-0.0.4" = { name = "htmlencode"; packageName = "htmlencode"; @@ -2290,6 +2552,15 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "ignore-4.0.6" = { name = "ignore"; packageName = "ignore"; @@ -2461,6 +2732,15 @@ let sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -3019,15 +3299,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -3073,22 +3344,22 @@ let sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.6.1" = { + "matrix-appservice-bridge-3.1.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.6.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.1.tgz"; - sha512 = "XNOziYVQoTQ9cym3Z2acXy8CKRXPVcEbni0XXCUfvu4O9+cBjUPywtRmhDBENsl/bgGbFKqbJNr68E/j9j+Tbw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-3.1.2.tgz"; + sha512 = "1VjKSalKS/9/MknrcAkAEFcoeOduzqBWr3LHmuwc4+T94vtCrA3WX+SciurxW8jfs0D8sLdnNjH1sMVAPfA2Gw=="; }; }; - "matrix-bot-sdk-0.4.0" = { + "matrix-bot-sdk-0.6.0-beta.2" = { name = "matrix-bot-sdk"; packageName = "matrix-bot-sdk"; - version = "0.4.0"; + version = "0.6.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.4.0.tgz"; - sha512 = "ZIICFEYDsSX3emPnVRTV1FIV22zkt7KiJbTYN4rHQ3Z/rk66RB7Y+TMHxrkJCqPs3xVdaGmGkh5m+hNi4fibRg=="; + url = "https://registry.npmjs.org/matrix-bot-sdk/-/matrix-bot-sdk-0.6.0-beta.2.tgz"; + sha512 = "D9aQ2++1bJIzka2uIz22HkaeyT058QGOh96xdxiDOaezyzLY5BN7ehYg+P0xRzDYDFKx9DbqDYCt97IkfahtPw=="; }; }; "matrix-js-sdk-9.11.0" = { @@ -3100,15 +3371,6 @@ let sha512 = "wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ=="; }; }; - "matrix-lastactive-0.1.5" = { - name = "matrix-lastactive"; - packageName = "matrix-lastactive"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/matrix-lastactive/-/matrix-lastactive-0.1.5.tgz"; - sha512 = "JFIMJPNGGqi0myzIlN94SQReUbCrWi1TW5PZih1OGXzUj2wXYz3puktV/f64HZYn6D1ZKcwxZdLuNCG8cRuCyw=="; - }; - }; "matrix-org-irc-1.2.0" = { name = "matrix-org-irc"; packageName = "matrix-org-irc"; @@ -3208,6 +3470,15 @@ let sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; }; + "mimic-response-2.1.0" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + }; "minimalistic-assert-1.0.1" = { name = "minimalistic-assert"; packageName = "minimalistic-assert"; @@ -3235,6 +3506,24 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minipass-3.1.5" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + }; + }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -3244,6 +3533,24 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "mkdirp-classic-0.5.3" = { + name = "mkdirp-classic"; + packageName = "mkdirp-classic"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; + }; + }; "module-not-found-error-1.0.1" = { name = "module-not-found-error"; packageName = "module-not-found-error"; @@ -3307,6 +3614,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "napi-build-utils-1.0.2" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -3343,6 +3659,15 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; + "node-abi-2.30.1" = { + name = "node-abi"; + packageName = "node-abi"; + version = "2.30.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + }; + }; "node-gyp-build-4.2.3" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -3415,6 +3740,24 @@ let sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "nyc-14.1.1" = { name = "nyc"; packageName = "nyc"; @@ -3433,6 +3776,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; "object-hash-2.2.0" = { name = "object-hash"; packageName = "object-hash"; @@ -3658,13 +4010,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -3766,22 +4118,13 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; - }; - }; - "picomatch-2.2.3" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; - sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-3.0.0" = { @@ -3811,15 +4154,6 @@ let sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; }; }; - "postcss-7.0.35" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; - }; - }; "postcss-8.3.0" = { name = "postcss"; packageName = "postcss"; @@ -3865,6 +4199,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "prebuild-install-6.1.4" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + }; "prelude-ls-1.2.1" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -4306,15 +4649,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-1.27.5" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.27.5"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; - }; - }; "sanitize-html-2.4.0" = { name = "sanitize-html"; packageName = "sanitize-html"; @@ -4432,6 +4766,24 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; + "simple-concat-1.0.1" = { + name = "simple-concat"; + packageName = "simple-concat"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + }; + "simple-get-3.1.0" = { + name = "simple-get"; + packageName = "simple-get"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -4594,6 +4946,24 @@ let sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; }; }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; "string-width-3.1.0" = { name = "string-width"; packageName = "string-width"; @@ -4612,6 +4982,15 @@ let sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; }; }; + "string-width-4.2.3" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -4630,6 +5009,24 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; "strip-ansi-5.2.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -4648,6 +5045,15 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; + "strip-ansi-6.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; "strip-bom-3.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -4711,6 +5117,33 @@ let sha512 = "ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg=="; }; }; + "tar-6.1.11" = { + name = "tar"; + packageName = "tar"; + version = "6.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + }; + }; + "tar-fs-2.1.1" = { + name = "tar-fs"; + packageName = "tar-fs"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; "tdigest-0.1.1" = { name = "tdigest"; packageName = "tdigest"; @@ -4891,13 +5324,13 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typescript-4.2.3" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.2.3"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz"; - sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "undefsafe-2.0.3" = { @@ -5071,6 +5504,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; "widest-line-3.1.0" = { name = "widest-line"; packageName = "widest-line"; @@ -5188,15 +5630,6 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -5228,7 +5661,7 @@ let args = { name = "matrix-appservice-irc"; packageName = "matrix-appservice-irc"; - version = "0.30.0"; + version = "0.32.1"; src = ./.; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -5262,9 +5695,10 @@ let sources."ignore-4.0.6" ]; }) - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" + sources."@matrix-org/olm-https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.4.tgz" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sentry/core-5.27.1" sources."@sentry/hub-5.27.1" sources."@sentry/minimal-5.27.1" @@ -5277,14 +5711,15 @@ let sources."@types/bluebird-3.5.32" sources."@types/body-parser-1.19.0" sources."@types/connect-3.4.34" - sources."@types/express-4.17.8" + sources."@types/diff-5.0.1" + sources."@types/express-4.17.11" sources."@types/express-serve-static-core-4.17.19" sources."@types/extend-3.0.1" sources."@types/he-1.1.1" - sources."@types/json-schema-7.0.7" + sources."@types/json-schema-7.0.9" sources."@types/mime-1.3.2" sources."@types/nedb-1.8.11" - sources."@types/node-12.12.54" + sources."@types/node-14.17.19" sources."@types/nopt-3.0.29" sources."@types/pg-8.6.0" sources."@types/qs-6.9.6" @@ -5296,25 +5731,29 @@ let ]; }) sources."@types/serve-static-1.13.9" - (sources."@typescript-eslint/eslint-plugin-4.16.1" // { + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/experimental-utils-4.16.1" - sources."@typescript-eslint/parser-4.16.1" - sources."@typescript-eslint/scope-manager-4.16.1" - sources."@typescript-eslint/types-4.16.1" - (sources."@typescript-eslint/typescript-estree-4.16.1" // { + (sources."@typescript-eslint/experimental-utils-4.33.0" // { + dependencies = [ + sources."eslint-utils-3.0.0" + ]; + }) + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-4.16.1" + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."acorn-7.4.1" @@ -5322,7 +5761,13 @@ let sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."another-json-0.2.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ansi-colors-4.1.1" sources."ansi-regex-4.1.0" (sources."ansi-styles-4.3.0" // { @@ -5332,7 +5777,14 @@ let }) sources."anymatch-3.1.2" sources."append-transform-1.0.0" + sources."aproba-1.2.0" sources."archy-1.0.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-union-2.1.0" @@ -5345,11 +5797,15 @@ let sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."base-x-3.0.8" + sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."better-sqlite3-7.4.3" sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" + sources."bindings-1.5.0" sources."bintrees-1.0.1" + sources."bl-4.1.0" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -5360,7 +5816,7 @@ let }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."chalk-3.0.0" sources."has-flag-4.0.0" sources."string-width-4.2.2" @@ -5372,6 +5828,7 @@ let sources."braces-3.0.2" sources."browser-request-0.3.3" sources."bs58-4.0.1" + sources."buffer-5.7.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { @@ -5394,10 +5851,12 @@ let }) sources."chardet-1.3.0" sources."chokidar-3.5.1" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cliui-5.0.0" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-3.0.0" (sources."color-convert-1.9.3" // { dependencies = [ @@ -5418,6 +5877,7 @@ let sources."write-file-atomic-3.0.3" ]; }) + sources."console-control-strings-1.1.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.7.0" @@ -5441,8 +5901,11 @@ let sources."default-require-extensions-2.0.0" sources."defer-to-connect-1.1.3" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."diff-5.0.0" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" (sources."dom-serializer-1.3.2" // { @@ -5478,7 +5941,7 @@ let sources."escape-string-regexp-4.0.0" (sources."eslint-7.21.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."chalk-4.1.1" sources."has-flag-4.0.0" sources."ignore-4.0.6" @@ -5516,6 +5979,7 @@ let sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" + sources."expand-template-2.0.3" (sources."express-4.17.1" // { dependencies = [ sources."cookie-0.4.0" @@ -5526,14 +5990,15 @@ let sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.1" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.11.0" + sources."fastq-1.13.0" sources."fecha-4.2.1" sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" + sources."file-uri-to-path-1.0.0" sources."fill-keys-1.0.2" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -5559,33 +6024,41 @@ let sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" + sources."github-from-package-0.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-2.1.0" sources."globals-12.4.0" - sources."globby-11.0.3" + sources."globby-11.0.4" sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - ]; - }) + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hash.js-1.1.7" (sources."hasha-3.0.0" // { @@ -5596,6 +6069,7 @@ let sources."he-1.2.0" sources."hosted-git-info-2.8.9" sources."html-escaper-2.0.2" + sources."html-to-text-6.0.0" sources."htmlencode-0.0.4" sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" @@ -5607,6 +6081,7 @@ let sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" sources."immediate-3.0.6" @@ -5683,7 +6158,6 @@ let sources."loglevel-1.7.1" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" sources."lru_map-0.3.3" (sources."make-dir-2.1.0" // { dependencies = [ @@ -5692,36 +6166,19 @@ let ]; }) sources."matrix-appservice-0.8.0" - (sources."matrix-appservice-bridge-2.6.1" // { + (sources."matrix-appservice-bridge-3.1.2" // { dependencies = [ + sources."@types/express-4.17.13" sources."argparse-2.0.1" sources."chalk-4.1.1" - sources."extend-3.0.2" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" + sources."lru-cache-6.0.0" + sources."matrix-bot-sdk-0.6.0-beta.2" + sources."mkdirp-1.0.4" sources."nopt-5.0.0" sources."supports-color-7.2.0" - ]; - }) - (sources."matrix-bot-sdk-0.4.0" // { - dependencies = [ - sources."chalk-3.0.0" - sources."escape-string-regexp-1.0.5" - sources."has-flag-4.0.0" - (sources."postcss-7.0.35" // { - dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" - ]; - }) - sources."sanitize-html-1.27.5" - sources."supports-color-7.2.0" + sources."yallist-4.0.0" ]; }) (sources."matrix-js-sdk-9.11.0" // { @@ -5729,18 +6186,13 @@ let sources."qs-6.10.1" ]; }) - sources."matrix-lastactive-0.1.5" sources."matrix-org-irc-1.2.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-source-map-1.1.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."micromatch-4.0.4" // { - dependencies = [ - sources."picomatch-2.2.3" - ]; - }) + sources."micromatch-4.0.4" sources."mime-1.6.0" sources."mime-db-1.47.0" sources."mime-types-2.1.30" @@ -5748,7 +6200,18 @@ let sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + (sources."minipass-3.1.5" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.5" + sources."mkdirp-classic-0.5.3" sources."module-not-found-error-1.0.1" sources."moment-2.29.1" (sources."morgan-1.10.0" // { @@ -5760,10 +6223,16 @@ let }) sources."ms-2.1.2" sources."nanoid-3.1.23" + sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."node-gyp-build-4.2.3" (sources."nodemon-2.0.7" // { dependencies = [ @@ -5780,12 +6249,15 @@ let }) sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" (sources."nyc-14.1.1" // { dependencies = [ sources."rimraf-2.7.1" ]; }) sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."object-hash-2.2.0" sources."object-inspect-1.10.3" sources."on-finished-2.3.0" @@ -5811,7 +6283,7 @@ let sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" @@ -5822,7 +6294,7 @@ let sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pify-3.0.0" sources."pkg-dir-3.0.0" sources."postcss-8.3.0" @@ -5830,6 +6302,7 @@ let sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" + sources."prebuild-install-6.1.4" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -5876,7 +6349,6 @@ let sources."release-zalgo-1.0.0" (sources."request-2.88.2" // { dependencies = [ - sources."extend-3.0.2" sources."qs-6.5.2" ]; }) @@ -5897,7 +6369,6 @@ let (sources."sanitize-html-2.4.0" // { dependencies = [ sources."domhandler-4.2.0" - sources."escape-string-regexp-4.0.0" sources."htmlparser2-6.1.0" ]; }) @@ -5920,6 +6391,13 @@ let sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.2" + sources."simple-concat-1.0.1" + (sources."simple-get-3.1.0" // { + dependencies = [ + sources."decompress-response-4.2.1" + sources."mimic-response-2.1.0" + ]; + }) sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."slice-ansi-4.0.0" @@ -5960,12 +6438,24 @@ let (sources."table-6.7.1" // { dependencies = [ sources."ajv-8.4.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; }) + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."yallist-4.0.0" + ]; + }) + (sources."tar-fs-2.1.1" // { + dependencies = [ + sources."chownr-1.1.4" + ]; + }) + sources."tar-stream-2.2.0" sources."tdigest-0.1.1" sources."term-size-2.2.1" sources."test-exclude-5.2.3" @@ -5990,7 +6480,7 @@ let sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.2.3" + sources."typescript-4.4.3" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -6020,9 +6510,17 @@ let sources."verror-1.10.0" sources."which-2.0.2" sources."which-module-2.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" ]; @@ -6050,7 +6548,6 @@ let sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" sources."y18n-4.0.3" - sources."yallist-3.1.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json index 998515f568e6..afbafc9b5e96 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json @@ -1,6 +1,6 @@ { "name": "matrix-appservice-irc", - "version": "0.30.0", + "version": "0.32.1", "description": "An IRC Bridge for Matrix", "main": "app.js", "bin": "./bin/matrix-appservice-irc", @@ -28,13 +28,12 @@ "dependencies": { "@sentry/node": "^5.27.1", "bluebird": "^3.7.2", + "diff": "^5.0.0", "escape-string-regexp": "^4.0.0", "extend": "^3.0.2", "he": "^1.2.0", "logform": "^2.2.0", - "matrix-appservice": "^0.8.0", - "matrix-appservice-bridge": "^2.6.1", - "matrix-lastactive": "^0.1.5", + "matrix-appservice-bridge": "^3.1.2", "matrix-org-irc": "^1.2.0", "nedb": "^1.1.2", "nodemon": "^2.0.7", @@ -50,20 +49,23 @@ }, "devDependencies": { "@types/bluebird": "^3.5.32", - "@types/express": "^4.17.7", + "@types/diff": "^5.0.1", "@types/extend": "^3.0.1", "@types/he": "^1.1.1", "@types/nedb": "^1.8.11", + "@types/node": "^14", "@types/nopt": "^3.0.29", "@types/pg": "^8.6.0", "@types/sanitize-html": "^2.3.1", - "@typescript-eslint/eslint-plugin": "^4.16.1", - "@typescript-eslint/parser": "^4.16.1", + "@types/express": "4.17.11", + "@types/express-serve-static-core": "4.17.19", + "@typescript-eslint/eslint-plugin": "^4.33.0", + "@typescript-eslint/parser": "^4.33.0", "eslint": "^7.21.0", "jasmine": "^3.6.2", "nyc": "^14.1.1", - "prom-client": "^13.0.0", + "prom-client": "13.1.0", "proxyquire": "^1.4.0", - "typescript": "^4.2.2" + "typescript": "^4.4.3" } } From 225ffe5dd0a9d2e29fbfce87607046e2cacd304d Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 30 Nov 2021 16:04:59 +0100 Subject: [PATCH 021/121] matrix-appservice-irc: improve updateScript --- .../matrix-synapse/matrix-appservice-irc/default.nix | 3 ++- .../matrix-synapse/matrix-appservice-irc/src.json | 10 ++++++++++ .../matrix-synapse/matrix-appservice-irc/update.sh | 6 ++---- 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 2da3a81e187a..020a3a28fe77 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -6,6 +6,7 @@ let inherit (stdenv.hostPlatform) system; }; version = (lib.importJSON ./package.json).version; + srcInfo = lib.importJSON ./src.json; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; @@ -15,7 +16,7 @@ ourNodePackages.package.override { owner = "matrix-org"; repo = "matrix-appservice-irc"; rev = version; - sha256 = "sha256-pJ024kIN7TJdOVV/mMB/DQJdaPQJI6yQci3uASyMZRs="; + inherit (srcInfo) sha256; }; nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json new file mode 100644 index 000000000000..14eb6c69d6df --- /dev/null +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/matrix-org/matrix-appservice-irc", + "rev": "6d5795ce9544c8d73f4846f1bd7190d352dddead", + "date": "2021-10-25T12:54:49+02:00", + "path": "/nix/store/by3iwfs5yayyv576qvfl650dgjw7jy5k-matrix-appservice-irc", + "sha256": "06v5ihn03vidfa8aq8q9yil5s0hdgz09hzsm75fk5v8d8bi3d7d4", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index d2c16dedfcd2..5d26c26dc7d9 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix +#! nix-shell -i bash -p nodePackages.node2nix nodejs-12_x curl jq nix nix-prefetch-git set -euo pipefail # cd to the folder containing this script @@ -23,6 +23,4 @@ wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-i rm ./package-lock-temp.json -# Apparently this is done by r-ryantm, so only uncomment for manual usage -#git add ./package.json ./node-packages.nix -#git commit -m "matrix-appservice-irc: ${CURRENT_VERSION} -> ${TARGET_VERSION}" +nix-prefetch-git --rev "$TARGET_VERSION" --url "https://github.com/matrix-org/matrix-appservice-irc" > ./src.json From b58f54b6fe0fc94570d18964f7beb6bd6abed8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 30 Nov 2021 17:23:27 +0100 Subject: [PATCH 022/121] dunst: 1.7.1 -> 1.7.2 --- pkgs/applications/misc/dunst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 698a9b7c3b5f..4f0f98ba3afc 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw"; + sha256 = "LGLo+K0FxQQ3hrPYwvjApcOnNliZ5j0T6yEtcxZAFOU="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; From 61a2a7612e6b80d69c7e4c4cec3fc76d75e439a3 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 30 Nov 2021 17:54:18 +0100 Subject: [PATCH 023/121] drawio: 15.8.4 -> 15.8.7 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5e2e3b58dbaf..c05342a2e10d 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "15.8.4"; + version = "15.8.7"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "4708c727b51c85a6b77a1b72a4075a1b24628aae42302203e66f704203692616"; + sha256 = "532f9926b4b055cbb741a778d57df42c65c5af82d0a8829e87324eb5e82025e3"; }; nativeBuildInputs = [ From 568e4f57cee2cef45230224efd0869e999f515df Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 30 Nov 2021 19:31:55 +0000 Subject: [PATCH 024/121] Update pkgs/tools/networking/nfstrace/default.nix Co-authored-by: Sandro --- pkgs/tools/networking/nfstrace/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index ac9af8e9816c..7e2b938e4c8b 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # -Wall -Wextra -Werror fails on clang and newer gcc substituteInPlace CMakeLists.txt \ - --replace "-Wno-braced-scalar-init" "" - # -Wall -Wextra -Werror fails on clang and newer gcc - substituteInPlace CMakeLists.txt \ + --replace "-Wno-braced-scalar-init" "" \ --replace "-Werror" "" ''; From d30bfaa9abe1ed3963bccf32af4b200c5003e056 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 21:01:30 +0100 Subject: [PATCH 025/121] sqlfluff: 0.8.1 -> 0.8.2 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 559aeb18c267..26d3377b22ff 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.8.1"; + version = "0.8.2"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-p2vRHJ7IDjGpAqWLkAHIjNCFRvUfpkvwVtixz8wWR8I="; + sha256 = "sha256-0FlXHUjoeZ7XfmOSlY30b13i2t/4vyWwhDKXquXKaJE="; }; propagatedBuildInputs = with python3.pkgs; [ From 22dffe27f394427505d1c9006dcb6aebc6b9f85b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 29 Nov 2021 19:24:13 +0100 Subject: [PATCH 026/121] pkgs/tools: use pname&version instead of name --- pkgs/tools/X11/dex/default.nix | 5 ++--- pkgs/tools/X11/sct/default.nix | 3 ++- pkgs/tools/X11/virtualgl/default.nix | 3 ++- pkgs/tools/misc/byobu/default.nix | 2 +- pkgs/tools/misc/cpuminer-multi/default.nix | 9 +++------ pkgs/tools/misc/fx_cast/default.nix | 2 +- pkgs/tools/misc/heimdall/default.nix | 16 ++++++++-------- pkgs/tools/misc/jugglinglab/default.nix | 2 +- pkgs/tools/misc/loadlibrary/default.nix | 2 +- pkgs/tools/misc/logstash/6.x.nix | 4 ++-- pkgs/tools/misc/opencorsairlink/default.nix | 4 ++-- pkgs/tools/misc/ponysay/default.nix | 2 +- .../misc/veikk-linux-driver-gui/default.nix | 4 ++-- pkgs/tools/misc/x11idle/default.nix | 3 +-- pkgs/tools/networking/atinout/default.nix | 2 +- pkgs/tools/networking/bacnet-stack/default.nix | 2 +- pkgs/tools/networking/netboot/default.nix | 2 +- pkgs/tools/networking/ngrok-2/default.nix | 4 ++-- pkgs/tools/networking/prettyping/default.nix | 5 ++--- pkgs/tools/networking/redsocks/default.nix | 9 +++------ pkgs/tools/networking/rp-pppoe/default.nix | 8 ++++---- pkgs/tools/networking/tdns-cli/default.nix | 6 +++--- pkgs/tools/networking/toxvpn/default.nix | 2 +- pkgs/tools/networking/waitron/default.nix | 4 ++-- .../disnix/dydisnix/default.nix | 2 +- pkgs/tools/package-management/nox/default.nix | 2 +- pkgs/tools/security/gnupg/1compat.nix | 3 ++- pkgs/tools/security/srm/default.nix | 5 ++--- pkgs/tools/system/ipmiutil/default.nix | 5 ++--- pkgs/tools/text/grin/default.nix | 5 ++--- pkgs/tools/text/mecab/default.nix | 3 ++- pkgs/tools/text/mecab/nodic.nix | 3 ++- pkgs/tools/text/papertrail/default.nix | 3 ++- pkgs/tools/text/sgml/jade/default.nix | 2 +- pkgs/tools/text/smu/default.nix | 2 +- pkgs/tools/virtualization/ec2-utils/default.nix | 2 +- pkgs/tools/wayland/swaycwd/default.nix | 5 ++--- 37 files changed, 70 insertions(+), 77 deletions(-) diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index dd1953d783a0..c0d1c5e6e4a1 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - program = "dex"; - name = "${program}-${version}"; + pname = "dex"; version = "0.9.0"; src = fetchFromGitHub { owner = "jceb"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86"; }; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 0d74206155ab..5b361e924eb7 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libX11, libXrandr }: stdenv.mkDerivation rec { - name = "sct"; + pname = "sct"; + version = "unstable-2015-11-16"; src = fetchurl { url = "http://www.tedunangst.com/flak/files/sct.c"; diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index fe5ac9410a67..05c0f1c69b40 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation { - name = "virtualgl-${lib.getVersion virtualglLib}"; + pname = "virtualgl"; + version = lib.getVersion virtualglLib; paths = [ virtualglLib ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index ffe3fd0fe162..23df93172e99 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -7,7 +7,7 @@ let in stdenv.mkDerivation rec { version = "5.133"; - name = "byobu-" + version; + pname = "byobu"; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index fac8fbcfee97..3fbdcfae0fe4 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, curl, jansson, autoconf, automake , aesni ? stdenv.hostPlatform.aesSupport }: -let - rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; - date = "20160316"; -in stdenv.mkDerivation { - name = "cpuminer-multi-${date}-${lib.strings.substring 0 7 rev}"; + pname = "cpuminer-multi"; + version = "unstable-2016-03-16"; src = fetchFromGitHub { owner = "hyc"; repo = "cpuminer-multi"; - inherit rev; + rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index b94b16d7bf54..1e140ecc0282 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -21,7 +21,7 @@ }; in stdenv.mkDerivation rec { - name = "fx_cast_bridge-${version}"; + pname = "fx_cast_bridge"; version = "0.1.2"; src = pkgs.fetchFromGitHub { diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 3dcefa8b2d0f..19bc90779d83 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -2,10 +2,9 @@ , enableGUI ? false, qtbase ? null }: -let version = "1.4.2"; in - -mkDerivation { - name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; +mkDerivation rec { + pname = "heimdall${lib.optionalString enableGUI "-gui"}"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; @@ -15,7 +14,8 @@ mkDerivation { }; buildInputs = [ - zlib libusb1 + zlib + libusb1 ] ++ lib.optional enableGUI qtbase; nativeBuildInputs = [ cmake ]; @@ -44,10 +44,10 @@ mkDerivation { ''; meta = with lib; { - homepage = "http://www.glassechidna.com.au/products/heimdall/"; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; - license = licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index f9038da04b57..7b52091104c7 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { version = "1.2.1"; - name = "jugglinglab"; + pname = "jugglinglab"; src = fetchFromGitHub { owner = "jkboyce"; repo = "jugglinglab"; diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index e6d19fc6d406..a299a85b6b82 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -4,7 +4,7 @@ # support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. stdenv_32bit.mkDerivation rec { - name = "loadlibrary-${version}"; + pname = "loadlibrary"; version = "20170525-${lib.strings.substring 0 7 rev}"; rev = "721b084c088d779075405b7f20c77c2578e2a961"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 1c7ab29cbc86..b35e5a4aea43 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -11,10 +11,10 @@ with lib; let this = stdenv.mkDerivation rec { version = elk6Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; + pname = "logstash${optionalString (!enableUnfree) "-oss"}"; src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; sha256 = if enableUnfree then "00pwi7clgdflzzg15bh3y30gzikvvy7p5fl88fww7xhhy47q8053" diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 14f955be1cdc..1c18cb82c590 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { - name = "OpenCorsairLink-${version}"; - version = "2019-12-23"; + pname = "OpenCorsairLink"; + version = "unstable-2019-12-23"; buildInputs = [ libusb1 ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix index e75481fcc2c1..2fb48f05850e 100644 --- a/pkgs/tools/misc/ponysay/default.nix +++ b/pkgs/tools/misc/ponysay/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, texinfo, makeWrapper }: stdenv.mkDerivation rec { - name = "ponysay"; + pname = "ponysay"; version = "unstable-2021-03-27"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index a833846dd00f..1c7dfd20330c 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchFromGitHub, gnumake, qmake }: mkDerivation rec { - name = "veikk-linux-driver-gui"; + pname = "veikk-linux-driver-gui"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "02g1q79kwjlzg95w38a1d7nxvcry8xcsvhax2js4c7xqvzhkki5j"; }; diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index cd1c11dbdb64..ee64f69897d2 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libXScrnSaver, libX11 }: stdenv.mkDerivation rec { - version = "9.2.4"; - name = "x11idle-org-${version}"; + pname = "x11idle-org"; src = fetchurl { url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c"; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 93535531d91b..6fad1174bbf0 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, ronn, mount }: stdenv.mkDerivation rec { - name = "atinout-${version}"; + pname = "atinout"; version = "0.9.2-alpha"; NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.cc.isClang) "-Werror=implicit-fallthrough=0"; diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index a4f2ef36360e..9e47993df602 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "bacnet-stack"; + pname = "bacnet-stack"; version = "1.0.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index fdd1857ef10e..cfd768e40ab6 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bison, lzo, db4 }: stdenv.mkDerivation rec { - name = "netboot"; + pname = "netboot"; version = "0.10.2"; src = fetchurl { diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index f1f8545c96de..5366a2c3a9c6 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -16,8 +16,8 @@ let versions = lib.importJSON ./versions.json; in stdenv.mkDerivation { - name = "ngrok-${version}"; - version = version; + pname = "ngrok"; + inherit version; # run ./update src = fetchurl { inherit sha256 url; }; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index 43f32ddb9fb4..16311f5b9961 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -1,12 +1,11 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "${program}-${version}"; - program = "prettyping"; + pname = "prettyping"; version = "1.0.1"; src = fetchFromGitHub { owner = "denilsonsa"; - repo = program; + repo = pname; rev = "v${version}"; sha256 = "05vfaq9y52z40245j47yjk1xaiwrazv15sgjq64w91dfyahjffxf"; }; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index b609cce90bc5..9b8989f30c2a 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -1,15 +1,12 @@ { lib, stdenv, fetchFromGitHub, libevent }: -let - pkg = "redsocks"; +stdenv.mkDerivation rec { + pname = "redsocks"; version = "0.5"; -in -stdenv.mkDerivation { - name = "${pkg}-${version}"; src = fetchFromGitHub { owner = "darkk"; - repo = pkg; + repo = "redsocks"; rev = "release-${version}"; sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fd3a563c209d..572625651e9a 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, ppp } : let - version = "3.12"; in -stdenv.mkDerivation { - name = "rp-pppoe-" + version; +stdenv.mkDerivation rec { + pname = "rp-pppoe"; + version = "3.12"; + src = fetchurl { url = "https://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz"; sha256 = "1hl6rjvplapgsyrap8xj46kc9kqwdlm6ya6gp3lv0ihm0c24wy80"; @@ -11,7 +12,6 @@ stdenv.mkDerivation { buildInputs = [ ppp ]; - preConfigure = '' cd src export PPPD=${ppp}/sbin/pppd diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 9f1ac89ce8ec..a38456bcc760 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tdns-cli"; + pname = "tdns-cli"; version = "0.0.5"; src = fetchFromGitHub { owner = "rotty"; - repo = name; + repo = pname; rev = "v${version}"; sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; }; - cargoSha256 = "14mmfj5my8gbsdhlhz17w8wjcc085c6dkj78kwr2hhsbcxp1vjgg"; + cargoSha256 = "sha256-O4n38dla2WgZ4949Ata6AYbZF9LMnXDyuFNoXRrTN7I="; meta = with lib; { description = "DNS tool that aims to replace dig and nsupdate"; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c5aaec66d9e3..57a5510bd430 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation { - name = "toxvpn"; + pname = "toxvpn"; version = "unstable-2019-09-09"; src = fetchFromGitHub { diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 8364cd5763dc..c37d82024fe6 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -2,8 +2,8 @@ { lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "waitron-unstable-${version}"; - version = "2020-01-24"; + pname = "waitron"; + version = "unstable-2020-01-24"; rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; goPackagePath = "github.com/ns1/waitron"; diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index 924ed8252811..0c95e41f8c9a 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "unstable-2020-11-02"; - name = "dydisnix-${version}"; + pname = "dydisnix"; src = fetchFromGitHub { owner = "svanderburg"; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index c949b443e363..b215a8e1d285 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,7 +1,7 @@ { lib, python3Packages, fetchurl, git }: python3Packages.buildPythonApplication rec { - name = "nox-${version}"; + pname = "nox"; version = "0.0.6"; namePrefix = ""; diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 371a7ca67afd..6625a4567954 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -1,7 +1,8 @@ { stdenv, gnupg, coreutils, writeScript }: stdenv.mkDerivation { - name = "gnupg1compat-${gnupg.version}"; + pname = "gnupg1compat"; + version = gnupg.version; builder = writeScript "gnupg1compat-builder" '' PATH=${coreutils}/bin diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 587d7782e765..8e4b3e697312 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - - name = "srm-" + version; + pname = "srm"; version = "1.2.15"; src = fetchurl { - url = "mirror://sourceforge/project/srm/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/srm/${version}/srm-${version}.tar.gz"; sha256 = "10sjarhprs6s4zandndg720528rcnd4xk8dl48pjj7li1q9c30vm"; }; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index a11890dabd6f..2166a671ab1c 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { - baseName = "ipmiutil"; + pname = "ipmiutil"; version = "3.1.6"; - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; + url = "mirror://sourceforge/project/ipmiutil/pmiutil-${version}.tar.gz"; sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548"; }; diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 5d89619001b4..ceeed3d6f76b 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - program = "grin"; + pname = "grin"; version = "1.2.1"; - name = "${program}-${version}"; namePrefix = ""; src = fetchFromGitHub { owner = "rkern"; - repo = program; + repo = pname; rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f"; sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd"; }; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index c579dcb8a175..04293d29efb2 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -4,7 +4,8 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-${mecab-base.version}"; + pname = "mecab"; + version = mecab-base.version; postInstall = '' sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/tools/text/mecab/nodic.nix index 1cbc31be4ee1..be9003623e05 100644 --- a/pkgs/tools/text/mecab/nodic.nix +++ b/pkgs/tools/text/mecab/nodic.nix @@ -4,5 +4,6 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-nodic-${mecab-base.version}"; + pname = "mecab-nodic"; + version = mecab-base.version; }) diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index c3d005a97e08..afc9d2d89e7a 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -9,7 +9,8 @@ let gemset = ./gemset.nix; }; in stdenv.mkDerivation { - name = "papertrail-${(import ./gemset.nix).papertrail.version}"; + pname = "papertrail"; + version = (import ./gemset.nix).papertrail.version; dontUnpack = true; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index c599375bc1cc..b58b4c62947d 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { - name = "jade-${version}-${debpatch}"; + pname = "jade"; version = "1.2.1"; debpatch = "47.3"; diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 854e70c7622b..02a29a91f47d 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "smu"; + pname = "smu"; version = "1.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index 1605bcfa43b6..283219108424 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rpmextract, fetchurl, python2, tree }: stdenv.mkDerivation { - name = "ec2-utils"; + pname = "ec2-utils"; version = "0.5.1"; # The url can be determined by booting an "Amazon Linux 2" and running: diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix index d8fec3fd15c6..9214f38b3303 100644 --- a/pkgs/tools/wayland/swaycwd/default.nix +++ b/pkgs/tools/wayland/swaycwd/default.nix @@ -4,13 +4,12 @@ , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: nimPackages.buildNimPackage rec{ - - name = "swaycwd"; + pname = "swaycwd"; version = "0.0.2"; src = fetchFromGitLab { owner = "cab404"; - repo = name; + repo = pname; rev = "v${version}"; hash = "sha256-OZWOPtOqcX+fVQCxWntrn98EzFu70WH55rfYCPDMSKk="; }; From 445c1a6e07402ec7876da56d22cb0c2bed18cc40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 21:15:45 +0100 Subject: [PATCH 027/121] checkov: 2.0.606 -> 2.0.614 --- .../development/tools/analysis/checkov/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 79300180948d..aabbcd07a535 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -39,16 +39,6 @@ let doCheck = false; }); - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "0.6.2"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - sha256 = "10cmp2aqbnbiyrsq5r9p7ppghqj3zyg612d2dldk6m85li3jr500"; - }; - }); - }; }; in @@ -56,13 +46,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.606"; + version = "2.0.614"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-2t/yYVhJVf5j+ya96zc3EY708ggU8BtsIIIh2ug9XF0="; + sha256 = "sha256-z1d1Zcq4x2wU/j4yWpaRwJXsUqy95Ai2uM18EHqxze0="; }; nativeBuildInputs = with py.pkgs; [ From 948c50a99ab8e6930d55c40976e63529e62b9cad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 21:22:37 +0100 Subject: [PATCH 028/121] tfsec: 0.61.2 -> 0.61.3 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index d708f92a0bfe..9bd7a4c8daf4 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.61.2"; + version = "0.61.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8wC3IX6BhpCEsj9SiWPpxgboIJsKjMlrIHKqiJbMp+8="; + sha256 = "sha256-hMLUdUZz7IUTldiJQLKwq0AJdpQqTTzuorfzaUR+ao8="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 1f37386976936130c9399f7c9428425c1b947110 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 30 Nov 2021 21:32:06 +0100 Subject: [PATCH 029/121] goreleaser: 0.184.0 -> 1.1.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 5ff4a9e05e99..f6c03edfe53d 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.184.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ujhYcihLJh52cURvQ7p1B4fZTDx8cq3WA4RfKetWEBo="; + sha256 = "1rk2n1c2ia8kwqvbfnhsf3jbbi1qzndniq7cxs8iy9drn4adl7gv"; }; - vendorSha256 = "sha256-J9lAkmLDowMmbwcHV2t9/7iVzkZRnF60/4PSRS8+4Sg="; + vendorSha256 = "1hm5ya240vpfmgc8y6qv4gp4gbcqydk7hg05fwr7nzc2apj5fv6a"; ldflags = [ "-s" From d9ae78fac88d9db128e1559c5ba7dbd96e4b5ba1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 21:52:10 +0100 Subject: [PATCH 030/121] python3Packages.pytenable: 1.3.3 -> 1.4.0 --- pkgs/development/python-modules/pytenable/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index d2e227c1b175..e36e4f178b8c 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -14,17 +14,18 @@ , responses , restfly , semver +, typing-extensions }: buildPythonPackage rec { pname = "pytenable"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq"; + sha256 = "sha256-JdI0nAX/leTnYgGId2ct04u1a+z7eU2UY6pk2cUM4fg="; }; propagatedBuildInputs = [ @@ -40,6 +41,7 @@ buildPythonPackage rec { requests requests-pkcs12 restfly + typing-extensions ]; checkInputs = [ From 5b89ab8ef17a0c2c6f68289897ba2bcebe931d01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 21:55:52 +0100 Subject: [PATCH 031/121] python3Packages.qcs-api-client: 0.20.1 -> 0.20.3 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 4f0dd38c67c9..50d88458a4d6 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.1"; + version = "0.20.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rlDquNKWnmP8d3pxmFfViDN++8x59h6bGXBJv//q/dk="; + sha256 = "sha256-3PzjCdH0Mxw1GvtqvEMyAaYt96QX0zoXwK3azF2ey+U="; }; propagatedBuildInputs = [ From 80863cd550a2f26309f4b3c971ff88a7c9bd2f89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:00:17 +0100 Subject: [PATCH 032/121] python3Packages.vt-py: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/vt-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index fcd2c2452fe6..9c5fb0fc2276 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.8.0"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-j9TlZDzl9sWFPt8TeuyoJi01JhyPBVXs1w3YJMoVvLw="; + sha256 = "sha256-PpgN9adGNZOorOUigsBVOb//ZafUaYHfo/Fv1IZf/XA="; }; propagatedBuildInputs = [ From 43ec279d771da1ba85be75159de93f0f0d13d2bd Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 30 Nov 2021 16:02:00 -0500 Subject: [PATCH 033/121] minecraft-server: 1.17.1 -> 1.18 --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 2304acf446df..5d7506ba160b 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.17.1"; + version = "1.18"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/a16d67e5807f57fc4e550299cf20226194497dc2/server.jar"; + url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar"; # sha1 because that comes from mojang via api - sha1 = "a16d67e5807f57fc4e550299cf20226194497dc2"; + sha1 = "3cf24a8694aca6267883b17d934efacc5e44440d"; }; preferLocalBuild = true; From 1b1e75f1006a5bae9be3565b683ef65ed165cd4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:09:09 +0100 Subject: [PATCH 034/121] python3Packages.python-gvm: 21.10.0 -> 21.11.0 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index 5f3ff50d1a8d..b98c44581887 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "21.10.0"; + version = "21.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6cNoeuB9449HB2/41VjazpSAGvaHmBjG/hqmBKX5FEA="; + sha256 = "sha256-H3cM+4YA6obYbo7qm7BhLlQxW4DKV6A3X0ZKsXWPDBs="; }; nativeBuildInputs = [ From d5bd356070f0e267a7822a4b61693df3b7eb3870 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:17:59 +0100 Subject: [PATCH 035/121] python3Packages.archinfo: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index bdbdeb306207..e07ae115fcb4 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10651"; + version = "9.0.10689"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w="; + sha256 = "sha256-kye8muKTm79lVhOBJeHnI4apJBsUVtNtGYpNiykXFDs="; }; checkInputs = [ From 2ecba993ae56b06191c796b3c2055a030fa3e03c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:02 +0100 Subject: [PATCH 036/121] python3Packages.ailment: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index bc7fba543efc..9797d8ebe76b 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc="; + sha256 = "sha256-U+2R/TlMwRj+FEuO1aOox7dt3RXlDjazjoG7IfN8um8="; }; propagatedBuildInputs = [ pyvex ]; From 73f72eaebc1d28fa5b8b2836184ae2ab0bcc09bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:06 +0100 Subject: [PATCH 037/121] python3Packages.pyvex: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index d054a0c8e8f7..388611595a6d 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10651"; + version = "9.0.10689"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4="; + sha256 = "sha256-BP0yRsp0I6QNN6lCpF6MwBw/BXTXCsNbmzfpKNMS0fQ="; }; postPatch = lib.optionalString stdenv.isDarwin '' From fbc522930fea0d68bf815436ce6693ceefae102e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:10 +0100 Subject: [PATCH 038/121] python3Packages.claripy: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 95b2a39a6827..f5016d1fe7f8 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg="; + sha256 = "sha256-s3h+SnqCi29B0/BwUHp08x7n4tej+u5aI4exGpeKbxc="; }; # Use upstream z3 implementation From 6e37d87a36757913d04a7f5e30f8d1e3be719d95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:13 +0100 Subject: [PATCH 039/121] python3Packages.cle: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 25e7b8751b52..df3bd33e9961 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10651"; + version = "9.0.10689"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk="; + sha256 = "sha256-sZVdDEs+9UqPHWiCxrZpHp3UiB1hX8dTZxR3TXrIsTQ="; }; propagatedBuildInputs = [ From 17d9ff5a3e44903cffa9a095431a2e21c177365d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:18 +0100 Subject: [PATCH 040/121] python3Packages.angr: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 2f69f2196166..0fb339507448 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -44,14 +44,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA="; + sha256 = "sha256-UMPJZUtfcUTiL0Ha+p1M09yhLwaCuBLpam4KUgtYvnw="; }; propagatedBuildInputs = [ From a2515aedae5b5fc1a3404944c42b45b35fc33940 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Nov 2021 22:18:21 +0100 Subject: [PATCH 041/121] python3Packages.angrop: 9.0.10651 -> 9.0.10689 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 1b67568f3cd8..8cf1acc783eb 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10651"; + version = "9.0.10689"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak="; + sha256 = "sha256-ZWu9Kk/d6Qz9IEDUkuaB0f5cZV0HnZAaEDnYSoiKMDI="; }; propagatedBuildInputs = [ From cb91e61c5680e499e70fe535b4f18569b8f81908 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 30 Nov 2021 22:17:24 +0100 Subject: [PATCH 042/121] chromiumDev: 98.0.4710.4 -> 98.0.4736.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4e7149ec1ee5..2a105527c102 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "98.0.4710.4", - "sha256": "0ay4bn9963k7bbv31wfc1iy2z6n6jjk1h2mn7m7893i81raisk8m", - "sha256bin64": "0n4kb6iiv9aih7yzrnr9m7znqb2p37grlj8by6gpjfikx3fxf5gg", + "version": "98.0.4736.0", + "sha256": "1bakzvzx0604k20p16lxmbl0s8za6fy4akng35c1kzf350jznq7n", + "sha256bin64": "09adpl6b43fzlms081c1bs3vrlwrm3kq0mfcqff4q33i0wb5wl25", "deps": { "gn": { - "version": "2021-11-16", + "version": "2021-11-24", "url": "https://gn.googlesource.com/gn", - "rev": "4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e", - "sha256": "0jwjfbxlbqxlz7wm46vyrxn3pgwyyd03as6gy5mcvvk9aialqh9f" + "rev": "b79031308cc878488202beb99883ec1f2efd9a6d", + "sha256": "1fdn48y0nvs2qm67qvp1i75d9278ddi5v3bpxgjf28zrh9yragwd" } } }, From 5bb9d9176d8eb8fbc4893d77be20e6eaf5843dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 30 Nov 2021 15:58:26 -0600 Subject: [PATCH 043/121] gnome: update docs regarding nvidiaWayland --- .../services/x11/desktop-managers/gnome.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml index 6c53bacacb32..e5da7740196e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ b/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -126,21 +126,6 @@ -
- GDM - - - If you want to use GNOME Wayland session on Nvidia hardware, you need to enable: - - - - = true; - - - - as the default configuration will forbid this. - -
Icons and GTK Themes From 0f2f663d26540fb99f2e30aa9f59bc8a07de4760 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 16:49:36 +0100 Subject: [PATCH 044/121] matrix-appservice-irc: fix current version detection in update script Would previously error out with > error: '(with import ../../../../. {}; matrix-appservice-irc.version)' is not a valid URL --- pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index 5d26c26dc7d9..4ed109cc352f 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -5,7 +5,7 @@ set -euo pipefail # cd to the folder containing this script cd "$(dirname "$0")" -CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') +CURRENT_VERSION=$(nix-instantiate ../../../../. --eval --strict -A matrix-appservice-irc.version | tr -d '"') TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then From 1f726635ee4f0a5faebc4c9b9787bc0d76d0ace4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 23:30:54 +0100 Subject: [PATCH 045/121] nixos/charybdis: implement reload functionality IRC daemons are highly stateful daemons, so allow config changes without kicking all server and client connections. Basically a port of 60c62214f5a3c7db6aa30d8a8e02c863b6abcf0a. --- nixos/modules/services/networking/charybdis.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix index 43829d36e417..ff09c0160cb6 100644 --- a/nixos/modules/services/networking/charybdis.nix +++ b/nixos/modules/services/networking/charybdis.nix @@ -85,14 +85,21 @@ in "d ${cfg.statedir} - ${cfg.user} ${cfg.group} - -" ]; + environment.etc."charybdis/ircd.conf".source = configFile; + systemd.services.charybdis = { description = "Charybdis IRC daemon"; wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ + configFile + ]; environment = { BANDB_DBPATH = "${cfg.statedir}/ban.db"; }; serviceConfig = { - ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile ${configFile}"; + ExecStart = "${charybdis}/bin/charybdis -foreground -logfile /dev/stdout -configfile /etc/charybdis/ircd.conf"; + ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; Group = cfg.group; User = cfg.user; }; From 914567e4a7f41b046af6aa4b5214b9d026256a77 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 30 Nov 2021 21:55:23 +0000 Subject: [PATCH 046/121] spdk: upstream fix for ncurses-6.3 Without the change the build fails as: spdk_top.c:1949:69: error: format not a string literal and no format arguments [-Werror=format-security] 1949 | mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); | ^~~~~~~~~ --- pkgs/development/libraries/spdk/default.nix | 7 ++- .../libraries/spdk/ncurses-6.3.patch | 48 +++++++++++++++++++ .../libraries/spdk/spdk-dpdk-meson.patch | 17 ------- 3 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/libraries/spdk/ncurses-6.3.patch delete mode 100644 pkgs/development/libraries/spdk/spdk-dpdk-meson.patch diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index ec20f68b6f48..0171070377c3 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchurl , fetchFromGitHub -, fetchpatch , ncurses , python3 , cunit @@ -24,6 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-/hynuYVdzIfiHUUfuuOY8SBJ18DqJr2Fos2JjQQVvbg="; }; + patches = [ + # Backport of upstream patch for ncurses-6.3 support. + # Will be in next release after 21.10. + ./ncurses-6.3.patch + ]; + nativeBuildInputs = [ python3 ]; diff --git a/pkgs/development/libraries/spdk/ncurses-6.3.patch b/pkgs/development/libraries/spdk/ncurses-6.3.patch new file mode 100644 index 000000000000..174c9b6435ef --- /dev/null +++ b/pkgs/development/libraries/spdk/ncurses-6.3.patch @@ -0,0 +1,48 @@ +Backport of upstream https://review.spdk.io/gerrit/c/spdk/spdk/+/10300 +--- a/app/spdk_top/spdk_top.c ++++ b/app/spdk_top/spdk_top.c +@@ -1012 +1012 @@ print_max_len(WINDOW *win, int row, uint16_t col, uint16_t max_len, enum str_ali +- mvwprintw(win, row, col, tmp_str); ++ mvwprintw(win, row, col, "%s", tmp_str); +@@ -1944 +1944 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%" PRIu64, ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 6, "%d", +@@ -1949 +1949 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); +@@ -1951 +1951 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); +@@ -1954 +1954 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, idle_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 32, "%s", idle_time); +@@ -1956 +1956 @@ display_thread(struct rpc_thread_info *thread_info) +- mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, busy_time); ++ mvwprintw(thread_win, 3, THREAD_WIN_FIRST_COL + 54, "%s", busy_time); +@@ -2111 +2111 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, idle_time); ++ mvwprintw(core_win, 5, CORE_WIN_FIRST_COL + 20, "%s", idle_time); +@@ -2118 +2118 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, busy_time); ++ mvwprintw(core_win, 7, CORE_WIN_FIRST_COL + 20, "%s", busy_time); +@@ -2124 +2124 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); ++ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); +@@ -2137 +2137 @@ show_core(uint8_t current_page) +- mvwprintw(core_win, i + 10, 1, core_info->threads.thread[i].name); ++ mvwprintw(core_win, i + 10, 1, "%s", core_info->threads.thread[i].name); +@@ -2214 +2214 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, ++ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL, "%s", +@@ -2216 +2216 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, poller->thread_name); ++ mvwprintw(poller_win, 3, POLLER_WIN_FIRST_COL + 23, "%s", poller->thread_name); +@@ -2231 +2231 @@ show_poller(uint8_t current_page) +- mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, poller_period); ++ mvwprintw(poller_win, 4, POLLER_WIN_FIRST_COL + 23, "%s", poller_period); +@@ -2264 +2264 @@ print_bottom_error_message(char *msg) +- mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, msg); ++ mvprintw(g_max_row - 1, g_max_col - strlen(msg) - 2, "%s", msg); +@@ -2434 +2434 @@ show_stats(pthread_t *data_thread) +- mvprintw(g_max_row - 1, 1, current_page_str); ++ mvprintw(g_max_row - 1, 1, "%s", current_page_str); diff --git a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch b/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch deleted file mode 100644 index 9cc6d89ce50e..000000000000 --- a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch +++ /dev/null @@ -1,17 +0,0 @@ -1. dpdk built with meson generates rte_build_config.h rather than rte_config.h. -2. dpdk configured with libbsd requires that dependents link with libbsd. - ---- a/lib/env_dpdk/env.mk -+++ b/lib/env_dpdk/env.mk -@@ -140,6 +140,9 @@ endif - --ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h)) --ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h)) -+ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_build_config.h)) -+ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_build_config.h)) - ENV_LINKER_ARGS += -lnuma - endif -+ifneq (,$(shell grep -e "define RTE_USE_LIBBSD 1" $(DPDK_INC_DIR)/rte_build_config.h)) -+ENV_LINKER_ARGS += -lbsd -+endif - endif From cb928788e024e2d2326f63550663acfd7205e759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 30 Nov 2021 15:11:32 -0800 Subject: [PATCH 047/121] libdeltachat: 1.68.0 -> 1.69.0 https://github.com/deltachat/deltachat-core-rust/blob/1.69.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 81d033f136d1..e418e3a4e933 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-T49E9pGetJqO5qj014efioZtlHM9ZAxH9WzwVmk85XM="; + hash = "sha256-yW6MXDb7kiI24akJrEPHeb4bI8jEldBcPYx+5+dwJR0="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-jAL8siaMonTMYE88kK7E6RQesPahCLr082dHJovmoo0="; + hash = "sha256-76TraZCJhppPhkdQfAf1XqOoK7RS+VoYIp2keTn4es4="; }; nativeBuildInputs = [ From 254dd2a1025e46bccd05c4cc0dd461093b689480 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Dec 2021 01:09:52 +0100 Subject: [PATCH 048/121] nixos/home-assistant: consider extraComponents in hardening Previously the extraComponents added to an overriden package would not have been considered in hardening measures enforced by the module. Home Assistant is warning the user about component definitions having moved away from YAML, so using an override to include support for a component might become the better way moving forward. --- nixos/modules/services/misc/home-assistant.nix | 9 +++++++-- pkgs/servers/home-assistant/default.nix | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 8279d075bafb..2de25d87ed39 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -24,6 +24,8 @@ let availableComponents = cfg.package.availableComponents; + explicitComponents = cfg.package.extraComponents; + usedPlatforms = config: if isAttrs config then optional (config ? platform) config.platform @@ -42,10 +44,13 @@ let # } ]; useComponentPlatform = component: elem component (usedPlatforms cfg.config); - # Returns whether component is used in config + useExplicitComponent = component: elem component explicitComponents; + + # Returns whether component is used in config or explicitly passed into package useComponent = component: hasAttrByPath (splitString "." component) cfg.config - || useComponentPlatform component; + || useComponentPlatform component + || useExplicitComponent component; # List of components used in config extraComponents = filter useComponent availableComponents; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4b4cb222e964..5febf010dff8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -888,7 +888,7 @@ in with py.pkgs; buildPythonApplication rec { ''; passthru = { - inherit availableComponents; + inherit availableComponents extraComponents; python = py; tests = { inherit (nixosTests) home-assistant; From 9e234eba80af954e38cef182b4d0774b5fb40a47 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Dec 2021 01:19:01 +0100 Subject: [PATCH 049/121] nixos/tests/home-assistant: test hardening with extraComponents --- nixos/tests/home-assistant.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0894736bac9c..1ab5755863f7 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -24,6 +24,11 @@ in { services.home-assistant = { inherit configDir; enable = true; + package = (pkgs.home-assistant.override { + extraComponents = [ "zha" ]; + }).overrideAttrs (oldAttrs: { + doInstallCheck = false; + }); config = { homeassistant = { name = "Home"; @@ -87,6 +92,8 @@ in { with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): hass.wait_for_open_port(80) hass.succeed("curl --fail http://localhost:80/description.xml") + with subtest("Check extra components are considered in systemd unit hardening"): + hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB") with subtest("Print log to ease debugging"): output_log = hass.succeed("cat ${configDir}/home-assistant.log") print("\n### home-assistant.log ###\n") From 753c1f5a975b9d62bcaf78e8f5c082860b1f342d Mon Sep 17 00:00:00 2001 From: genofire Date: Fri, 26 Nov 2021 23:09:33 +0100 Subject: [PATCH 050/121] gnomeExtensions.pop-shell: init at unstable-2021-11-30 --- .../gnome/extensions/manuallyPackaged.nix | 1 + .../gnome/extensions/pop-shell/default.nix | 36 ++++++++++ .../gnome/extensions/pop-shell/fix-gjs.patch | 67 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/pop-shell/default.nix create mode 100644 pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 1c648e4a047c..a47fb16011d0 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -15,6 +15,7 @@ "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix new file mode 100644 index 000000000000..759deb98b19d --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, glib, nodePackages, gjs }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pop-shell"; + version = "unstable-2021-11-30"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "shell"; + rev = "4b65ee865d01436ec75a239a0586a2fa6051b8c3"; + sha256 = "DHmp3kzBgbyxRe0TjER/CAqyUmD9LeRqAFQ9apQDzfk="; + }; + + nativeBuildInputs = [ glib nodePackages.typescript gjs ]; + + buildInputs = [ gjs ]; + + patches = [ + ./fix-gjs.patch + ]; + + makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; + + passthru = { + extensionUuid = "pop-shell@system76.com"; + extensionPortalSlug = "pop-shell"; + }; + + meta = with lib; { + description = "Keyboard-driven layer for GNOME Shell"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.genofire ]; + homepage = "https://github.com/pop-os/shell"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch new file mode 100644 index 000000000000..e1e6fb7a839a --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -0,0 +1,67 @@ +diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts +index 9522499..9911530 100644 +--- a/src/color_dialog/src/main.ts ++++ b/src/color_dialog/src/main.ts +@@ -1,4 +1,4 @@ +-#!/usr/bin/gjs ++#!/usr/bin/env gjs + + imports.gi.versions.Gtk = '3.0'; + +@@ -84,4 +84,4 @@ function launch_color_dialog() { + + Gtk.init(null); + +-launch_color_dialog() +\ No newline at end of file ++launch_color_dialog() +diff --git a/src/extension.ts b/src/extension.ts +index 7417c46..00d5829 100644 +--- a/src/extension.ts ++++ b/src/extension.ts +@@ -534,7 +534,7 @@ export class Ext extends Ecs.System { + return true + } + +- const ipc = utils.async_process_ipc(["gjs", path]) ++ const ipc = utils.async_process_ipc([path]) + + if (ipc) { + const generator = (stdout: any, res: any) => { +diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts +index f298ec7..87a6bc4 100644 +--- a/src/floating_exceptions/src/main.ts ++++ b/src/floating_exceptions/src/main.ts +@@ -1,4 +1,4 @@ +-#!/usr/bin/gjs ++#!/usr/bin/env gjs + + imports.gi.versions.Gtk = '3.0' + +@@ -329,4 +329,4 @@ function main() { + Gtk.main() + } + +-main() +\ No newline at end of file ++main() +diff --git a/src/panel_settings.ts b/src/panel_settings.ts +index 83ff56c..1bc1e98 100644 +--- a/src/panel_settings.ts ++++ b/src/panel_settings.ts +@@ -338,7 +338,7 @@ function color_selector(ext: Ext, menu: any) { + color_selector_item.add_child(color_button); + color_button.connect('button-press-event', () => { + let path = Me.dir.get_path() + "/color_dialog/main.js"; +- let resp = GLib.spawn_command_line_async(`gjs ${path}`); ++ let resp = GLib.spawn_command_line_async(path); + if (!resp) { + + return null; +@@ -353,4 +353,4 @@ function color_selector(ext: Ext, menu: any) { + }); + + return color_selector_item; +-} +\ No newline at end of file ++} From 8b0fbacca099ac142de90ade03acf4291b222094 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Wed, 1 Dec 2021 10:23:18 +0800 Subject: [PATCH 051/121] godns: 2.5.2 -> 2.5.3 --- pkgs/tools/networking/godns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 2f2ef3851d1f..fffcbbb528b7 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "godns"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-pNy1mTP2AaeuwNvvfrHOp5v1nQgv+1DJRGYKgnx98Xo="; + sha256 = "sha256-C2Auk0BJLhW8r4cnmoZiUddb8rcZqND5fER9L+3ooH4="; }; - vendorSha256 = "sha256-TYjkow/9W467CMyqV2SSRJAuqXGdnAgR9gtfq4vX4u0="; + vendorSha256 = "sha256-/egdqQCkbmrxuQ3vPfHOtHxAgW143Y2eZEzKAsBVmaI="; # Some tests require internet access, broken in sandbox doCheck = false; From 42a7e36904bae3a1eea01b189ddd1dfdad4509e0 Mon Sep 17 00:00:00 2001 From: James Walker Date: Tue, 30 Nov 2021 21:49:00 -0500 Subject: [PATCH 052/121] tailscale: 1.14.6 -> 1.18.1 --- pkgs/servers/tailscale/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 85f292711ef4..2a0165a9fe66 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.6"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-Mvt2j1AAkENT0krl2PbtzM7HXgs4miYXDchFm+8cspY="; + sha256 = "sha256-DmgCuv10TiB4UYISthJ1UghuPdvRKYl0cU9VxDvFjMc="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-v/jcNKcjE/c4DuxwfCy09xFTDk3yysP4tBmVW69FI4o="; + vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f923b5fc1403..4de41b595959 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21587,7 +21587,9 @@ with pkgs; syncserver = callPackage ../servers/syncserver { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo117Module; + }; thanos = callPackage ../servers/monitoring/thanos { }; From e6096f4e1e9b8c7a5e9d766933b453ada004abf4 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 1 Dec 2021 08:34:00 +0530 Subject: [PATCH 053/121] git-quickfix: 0.0.4 -> 0.0.5 --- .../git-and-tools/git-quickfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix index 2b7f26501969..b8743b7ea902 100644 --- a/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-quickfix/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "git-quickfix"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "siedentop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JdRlrNzWMPS3yG1UvKKtHVRix3buSm9jfSoAUxP35BY="; + sha256 = "sha256-LDA94pH5Oodf80mEENoURh+MJSg122SVWFVo9i1TEQg="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-ENeHPhEBniR9L3J5el6QZrIS1Q4O0pNiSzJqP1aQS9Q="; + cargoSha256 = "sha256-QTPy0w45AawEU4fHf2FMGpL3YM+iTNnyiI4+mDJzWaE="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; From 579cc4c0658fc9a7463c17c2cdd90e66e6929006 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 054/121] certigo: 1.12.1 -> 1.13.0 https://github.com/square/certigo/releases/tag/v1.13.0 --- pkgs/tools/admin/certigo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 422c6da82d2f..ff5d6c8f56fa 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "certigo"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; + sha256 = "sha256-3VysSE4N2MlNDOZ27RbCe8rUuYChU5Z3L/CIhtvMp38="; }; - vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; + vendorSha256 = "sha256-0wul0f8T7E4cXbsNee1j1orUgjrAToqDLgwCjiyii1Y="; doCheck = false; From c8ddc08aabf8aa5bfac408696184f866c4c338c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 055/121] vale: 2.11.2 -> 2.13.0 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index fc350162845a..7b4cde33f5d1 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.11.2"; + version = "2.13.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1g8k9723d1xmx918f60lpla52ly90rz6z0ffzwsb2rh62r3h80h5"; + sha256 = "sha256-I1hrmlNZUDhjWTsOzmp8xIc8rv2gTGRx2/yiAmCy9IY="; }; - vendorSha256 = "0czxigagjbqdzzgmh1iw3q0d4sj6635384lnn1w5smws8nsqr9ia"; + vendorSha256 = "sha256-tZarz6xwZo9IFfKB9qGxqezYaFrPyQp3wcug5jGaElY="; postInstall = '' mkdir -p $data/share/vale From eea9da363dde044099f9a9249ded3d17300c11c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Dec 2021 04:20:00 +0000 Subject: [PATCH 056/121] ncspot: 0.9.0 -> 0.9.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.9.1 https://github.com/hrkfdn/ncspot/releases/tag/v0.9.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 29a244f19d7a..d9df34c41f78 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -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 ]; From bc25e8f24f317daadaa8b19ed3d5c1937ae9cb69 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 30 Nov 2021 23:14:55 -0500 Subject: [PATCH 057/121] =?UTF-8?q?protontricks:=201.6.1=20=E2=86=92=201.6?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protontricks/default.nix | 9 +++++-- .../protontricks/steam-run.patch | 26 +++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index aab524d77a28..125b96953734 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -9,17 +9,18 @@ , winetricks , yad , pytestCheckHook +, nix-update-script }: buildPythonApplication rec { pname = "protontricks"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-2ZOVcPCF1o8mNfHOWRFTjAEu0dWzaMxlMTcctn/ScxY="; + sha256 = "sha256-XC5ip12wlXRo/AaTFJWEZvEZPPC1WtXTyeYivvyHZaE="; }; patches = [ @@ -55,6 +56,10 @@ buildPythonApplication rec { pythonImportsCheck = [ "protontricks" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index eead5ef6f49e..d27289bb3f5c 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index d811cb7..a376a34 100755 +index bd651aa..2b82aea 100755 --- a/src/protontricks/cli/main.py +++ b/src/protontricks/cli/main.py @@ -14,8 +14,8 @@ import sys @@ -57,9 +57,9 @@ index d811cb7..a376a34 100755 use_steam_runtime=use_steam_runtime, - legacy_steam_runtime_path=legacy_steam_runtime_path, use_bwrap=use_bwrap, - command=[str(winetricks_path)] + args.winetricks_command) - elif args.command: -@@ -296,7 +285,6 @@ def main(args=None): + command=[str(winetricks_path)] + args.winetricks_command + ) +@@ -297,7 +286,6 @@ def main(args=None): steam_app=steam_app, command=args.command, use_steam_runtime=use_steam_runtime, @@ -121,7 +121,7 @@ index be5322b..552f894 100644 APPINFO_STRUCT_SECTION = " Date: Tue, 30 Nov 2021 21:03:43 -0800 Subject: [PATCH 058/121] mrtrix: 3.0.2 -> unstable-2021-11-25 The latest stable version fails to build with latest eigen (> 3). https://github.com/MRtrix3/mrtrix3/pull/2368 --- pkgs/applications/science/biology/mrtrix/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index e0b122778d1b..10bfb633f4af 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -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 = '' From 5ecb046485782e458943c387e4cd0c2a8b0ea547 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Dec 2021 15:22:12 +1000 Subject: [PATCH 059/121] yt-dlp: 2021.11.10.1 -> 2021.12.1 https://github.com/yt-dlp/yt-dlp/releases/tag/2021.12.01 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 6a6a019dcbee..e694e1561365 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.11.10.1"; + version = "2021.12.1"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "f0ad6ae2e2838b608df2fd125f2a777a7ad832d3e757ee6d4583b84b21e44388"; + sha256 = "sha256-WNpbltSDT+gTDJYLnf1nDNLQ5TtlDNkuXEOBckFRuA8="; }; propagatedBuildInputs = [ websockets mutagen ] From 20dd43c6df11af4248a9ec2b0c0ab0b0d9bfb0f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 08:48:58 +0100 Subject: [PATCH 060/121] python3Packages.meshtastic: 1.2.40 -> 1.2.43 --- .../python-modules/meshtastic/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 6826298699e1..c31773ad65e0 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -15,12 +15,14 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.40"; + version = "1.2.43"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "be8464037d0c8085350065b38e7a7b028db15f2524764dec0e3548ea5b53500f"; + sha256 = "sha256-nGbULY/QJUv3sk8vYXvh/fhkab/vB3lGGhXRTjt8anI="; }; propagatedBuildInputs = [ @@ -35,18 +37,13 @@ buildPythonPackage rec { timeago ]; - postPatch = '' - # https://github.com/meshtastic/Meshtastic-python/pull/87 - substituteInPlace setup.py \ - --replace 'with open("README.md", "r") as fh:' "" \ - --replace "long_description = fh.read()" "" \ - --replace "long_description=long_description," 'long_description="",' - ''; - # Project only provides PyPI releases which don't contain the tests # https://github.com/meshtastic/Meshtastic-python/issues/86 doCheck = false; - pythonImportsCheck = [ "meshtastic" ]; + + pythonImportsCheck = [ + "meshtastic" + ]; meta = with lib; { description = "Python API for talking to Meshtastic devices"; From a1a2d0a4fcbd5b9bea8591a2b43567ea11695ff2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 1 Dec 2021 07:52:43 +0000 Subject: [PATCH 061/121] dozenal: disable parallel build Parallel build fails for missing dependencies in subdirectories: ../doz/doz.c:39:10: fatal error: conv.h: No such file or directory 39 | #include "conv.h" | ^~~~~~~~ Let's explicitly disable parallelism until upstream fixes it. --- pkgs/applications/misc/dozenal/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index ae5dd170eb92..c0bedb728aa6 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { patches = [ ./lua-header.patch ]; preBuild = "cd dozenal"; buildInputs = [ ncurses hdate lua5_2 ]; + + # Parallel builds fail due to no dependencies between subdirs. + # As a result some subdirs are atempted to build twice: + # ../dec/dec.c:39:10: fatal error: conv.h: No such file or directory + # Let's disable parallelism until it's fixed upstream: + # https://gitlab.com/dgoodmaniii/dozenal/-/issues/8 + enableParallelBuilding = false; + # I remove gdozdc, as I didn't figure all it's dependency yet. postInstall = "rm $out/bin/gdozdc"; From 12cb1380061ba95afee747eca670ae2370082e93 Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Tue, 30 Nov 2021 20:19:31 -0800 Subject: [PATCH 062/121] lush2: remove package No releases or activity after v2.0.1 (since 2011) --- .../development/interpreters/lush/default.nix | 29 ------------------- .../interpreters/lush/default.upstream | 4 --- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 35 deletions(-) delete mode 100644 pkgs/development/interpreters/lush/default.nix delete mode 100644 pkgs/development/interpreters/lush/default.upstream diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix deleted file mode 100644 index fe51d154956a..000000000000 --- a/pkgs/development/interpreters/lush/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream deleted file mode 100644 index 8a8b08fcd68a..000000000000 --- a/pkgs/development/interpreters/lush/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/lush/files/lush2/ -version_link '[.]tar[.]gz/download$' -SF_redirect -minimize_overwrite diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d21ad89c5a3..6bfdbee7aa4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13470,8 +13470,6 @@ with pkgs; ### End of CuboCore - lush2 = callPackage ../development/interpreters/lush {}; - maude = callPackage ../development/interpreters/maude { stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; }; From fc48d182bc6e58e8c4c210a7e142c3b1c67c8d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Tue, 30 Nov 2021 18:46:00 +0100 Subject: [PATCH 063/121] neovim: 0.5.1 -> 0.6.0 --- pkgs/applications/editors/neovim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 6a55e7c8e396..b44fc98722e9 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "0b2gda9h14lvwahrr7kq3ix8wsw99g4ngy1grmhv5544n93ypcyk"; + sha256 = "sha256-mVVZiDjAsAs4PgC8lHf0Ro1uKJ4OKonoPtF59eUd888="; }; patches = [ From bdaf195e9854a1491b4d463384128fbb5f8afd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 1 Dec 2021 10:12:37 +0100 Subject: [PATCH 064/121] spdk: enable parallel building --- pkgs/development/libraries/spdk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 0171070377c3..862547043ed8 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; + enableParallelBuilding = true; + configureFlags = [ "--with-dpdk=${dpdk}" ]; NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. From 137a15365503782e44f33772e4562b7eb222765f Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 1 Dec 2021 10:15:46 +0100 Subject: [PATCH 065/121] neovim: provide default value for python3Env (#147241) --- pkgs/applications/editors/neovim/wrapper.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index d94f3239f4bb..2a0d60ce5a79 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -3,6 +3,7 @@ , bundlerEnv, ruby , nodejs , nodePackages +, python3 , python3Packages , callPackage }: @@ -17,7 +18,7 @@ let , wrapperArgs ? [] , manifestRc ? null , withPython2 ? false - , withPython3 ? true, python3Env ? null + , withPython3 ? true, python3Env ? python3 , withNodeJs ? false , rubyEnv ? null , vimAlias ? false @@ -59,7 +60,7 @@ let --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython3 '' - makeWrapper ${python3Env}/bin/python3 $out/bin/nvim-python3 --unset PYTHONPATH + makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' + optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby From 7a66744a78547843bb05bd2c75ad5e537544979d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 1 Dec 2021 10:20:11 +0100 Subject: [PATCH 066/121] .github/labeler.yml: tag neovim files with "vim" label --- .github/labeler.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 780843a2a553..e23cd9598ff9 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -143,6 +143,8 @@ - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - pkgs/misc/vim-plugins/**/* + - nixos/modules/programs/neovim.nix + - pkgs/applications/editors/neovim/**/* "6.topic: xfce": - nixos/doc/manual/configuration/xfce.xml From 21e5acd30888d414953ef69257f9510e29a311c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 10:36:07 +0100 Subject: [PATCH 067/121] python3Packages.twitterapi: 2.7.7 -> 2.7.9.1 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 313e408ca50d..6bbb68c28f5a 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.7"; + version = "2.7.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI="; + sha256 = "sha256-3Ho8iw//X+eB7B/Q9TJGeoxAYjUJ96qsI1T3WYqZOpM="; }; propagatedBuildInputs = [ From 574e92dac65adab09b44ab101cde1b4b1737a7b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 11:57:53 +0100 Subject: [PATCH 068/121] python3Packages.pre-commit: 2.15.0 -> 2.16.0 --- .../python-modules/pre-commit/default.nix | 30 ++++++++++--------- ...use-the-hardcoded-path-to-pre-commit.patch | 15 ---------- 2 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 7739c33f7ca2..384544f82866 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,47 +1,47 @@ { lib -, fetchPypi , buildPythonPackage -, pythonOlder -, aspy-yaml -, cached-property , cfgv +, fetchPypi , identify , importlib-metadata , importlib-resources , nodeenv , python -, six +, pythonOlder +, pyyaml , toml , virtualenv }: buildPythonPackage rec { pname = "pre-commit"; - version = "2.15.0"; + version = "2.16.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "sha256-PCWt1429+2ooplF4DVwxGsQN0X8WDrOVSgxZ2kClBac="; + sha256 = "sha256-/piXysgwqnFk29AqTnuQyuSWMEUc6IRkvKc9tIa6n2U="; }; patches = [ - ./hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch ./languages-use-the-hardcoded-path-to-python-binaries.patch ]; propagatedBuildInputs = [ - aspy-yaml - cached-property cfgv identify nodeenv - six + pyyaml toml virtualenv - ] ++ lib.optional (pythonOlder "3.8") importlib-metadata - ++ lib.optional (pythonOlder "3.7") importlib-resources; + ] ++ lib.optional (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optional (pythonOlder "3.7") [ + importlib-resources + ]; # slow and impure doCheck = false; @@ -55,7 +55,9 @@ buildPythonPackage rec { --subst-var-by nodeenv ${nodeenv} ''; - pythonImportsCheck = [ "pre_commit" ]; + pythonImportsCheck = [ + "pre_commit" + ]; meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch deleted file mode 100644 index 4c1b6421e090..000000000000 --- a/pkgs/development/python-modules/pre-commit/hook-tmpl-use-the-hardcoded-path-to-pre-commit.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl -index 299144e..6d12543 100755 ---- a/pre_commit/resources/hook-tmpl -+++ b/pre_commit/resources/hook-tmpl -@@ -25,8 +25,8 @@ ARGS.append('--') - ARGS.extend(sys.argv[1:]) - - DNE = '`pre-commit` not found. Did you forget to activate your virtualenv?' --if os.access(INSTALL_PYTHON, os.X_OK): -- CMD = [INSTALL_PYTHON, '-mpre_commit'] -+if os.access('@pre-commit@/bin/pre-commit', os.X_OK): -+ CMD = ['@pre-commit@/bin/pre-commit'] - elif which('pre-commit'): - CMD = ['pre-commit'] - else: From 3a972acb377a06a6356aa0e45cd0eae778609bf8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:33:50 +0100 Subject: [PATCH 069/121] python3Packages.mypy-boto3-s3: 1.20.12 -> 1.20.17 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 426d0e6942d6..b26086f00ae0 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.12"; + version = "1.20.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0EqIMSQEvev8sZ1XLgxPD68xlgPtlRTW/yBPyrekFQ="; + sha256 = "sha256-7Zw8NxOEXDRmLChxHQXVU/HzR8z6HuLxX8bB3pZuCqc="; }; propagatedBuildInputs = [ From 6074436c1bb0576402968638c3e8ac2790772bc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:37:23 +0100 Subject: [PATCH 070/121] python3Packages.md-toc: 8.0.1 -> 8.1.0 --- pkgs/development/python-modules/md-toc/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 754ed78cff70..58670c49a90b 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.0.1"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-nh9KxjwF+O4n0qVo9yPP6fvKB5XFICh+Ak6oD2fQVdk="; + sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; }; propagatedBuildInputs = [ @@ -28,11 +28,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "fpyutils>=2.0,<2.1" "fpyutils>=2.0,<3" - ''; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; From 86c99790e6e3b1eaef116de6685f0877bfd65278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:40:39 +0100 Subject: [PATCH 071/121] httpx: 1.1.3 -> 1.1.4 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 07becc2c3488..3e9164befc96 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-sB/z7Z35SQt2D6YHgSJjXS/O9qbkqVrcl/OB+YhGhwQ="; + sha256 = "sha256-Mis3DQwcTazHVF7hkTRQ2OtQxeGut5LRUAloBXCdq3s="; }; - vendorSha256 = "sha256-/GC81ukWpC7h86noPv6zayS9fxWhJpWGXPM8u56F5c4="; + vendorSha256 = "sha256-53Mvc637J306MJLw+l1amAuZhUE/NdDvuWEe0fg4Hog="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; From 7dd5a9c02997c98acf721a311e30799c8a37d048 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 12:47:25 +0100 Subject: [PATCH 072/121] gosec: 2.9.1 -> 2.9.3 --- pkgs/development/tools/gosec/default.nix | 25 +++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 70e127e9000d..00529c265ee3 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -1,23 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gosec"; - version = "2.9.1"; - - subPackages = [ "cmd/gosec" ]; + version = "2.9.3"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "0q9834siya19gj5ckymymyzkd1yn34b4xg5bvcgd7ckcpky143yw"; + sha256 = "sha256-WjHNiFfa0YXuRq/FfWcamBwAVqRqLv9Qf+vy74rsCS4="; }; - vendorSha256 = "1h0bbkp9g5nzzjm8qkaag54n9nl711ckkjwibb1gb9ciqwsad33l"; + vendorSha256 = "sha256-X2qxoq6bCQJH0B/jq670WWuTkDEurFI+Zx/5bcvXtVY="; + + subPackages = [ + "cmd/gosec" + ]; doCheck = false; - ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X main.GitTag=${src.rev}" + "-X main.BuildDate=unknown" + ]; meta = with lib; { homepage = "https://github.com/securego/gosec"; From bd9ae0ab7b7613d9f636caa53c0f45a1193f8233 Mon Sep 17 00:00:00 2001 From: Subhrajyoti Sen Date: Wed, 1 Dec 2021 17:19:08 +0530 Subject: [PATCH 073/121] ktlint: 0.43.0 -> 0.43.1 --- pkgs/development/tools/ktlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 96a98222caaa..81bb656bdc57 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.0"; + version = "0.43.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "0vrfxmqnwwgij8hrcbzp3j0vg90w55r6kw4zhqmjsnnsg29gc82s"; + sha256 = "1qcalpimgsm5s3xhssrnanryra4dp2if9y4647aimydwvfhi05df"; }; nativeBuildInputs = [ makeWrapper ]; From cc084edc89974e7d98ae329585956b9d27bc349e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 13:08:02 +0100 Subject: [PATCH 074/121] kubeval: 0.16.0 -> 0.16.1 --- .../networking/cluster/kubeval/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index af8e04667b7f..774efb044af1 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchFromGitHub, buildGoModule, makeWrapper }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +}: buildGoModule rec { pname = "kubeval"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; - rev = version; - sha256 = "sha256-c5UESyWK1rfnD0etOuIroBUSqZQuu57jio7/ArItMP0="; + rev = "v${version}"; + sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg="; }; - vendorSha256 = "sha256-SqYNAUYPUJYmHj4cFEYqQ8hEkYWmmpav9AGOSFDc/M4="; + vendorSha256 = "sha256-OAFxEb7IWhyRBEi8vgmekDSL/YpmD4EmUfildRaPR24="; doCheck = false; From 9cb58616cc4f95300c7b9eedf05c5c9eb8b60ce8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 07:31:44 +0000 Subject: [PATCH 075/121] =?UTF-8?q?ocamlPackages.merlin:=204.3.1=20?= =?UTF-8?q?=E2=86=92=204.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/merlin/4.x.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 5554ce163502..831360cd858d 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,11 +15,12 @@ }: let - merlinVersion = "4.3.1"; + merlinVersion = "4.4"; hashes = { - "4.3.1-411" = "0lhxkd1wa8k3fkcnhvzlahx3g519cdi5h7lgs60khqqm8nfvfcr5"; - "4.3.1-412" = "0ah2zbj1hhrrfxp4nhfh47jsbkvm0b30dr7ikjpmvb13wa8h20sr"; + "4.4-411" = "sha256:0chx28098mmnjbnaz5wgzsn82rh1w9dhzqmsykb412cq13msl1q4"; + "4.4-412" = "sha256:18xjpsiz7xbgjdnsxfc52l7yfh22harj0birlph4xm42d14pkn0n"; + "4.4-413" = "sha256:1ilmh2gqpwgr51w2ba8r0s5zkj75h00wkw4az61ssvivn9jxr7k0"; }; ocamlVersionShorthand = lib.concatStrings @@ -37,7 +38,7 @@ buildDunePackage { inherit version; src = fetchurl { - url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-${version}.tbz"; sha256 = hashes."${version}"; }; @@ -47,10 +48,12 @@ buildDunePackage { dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; dune = "${dune_2}/bin/dune"; }) + ] ++ lib.optional (!lib.versionAtLeast ocaml.version "4.12") # This fixes the test-suite on macOS # See https://github.com/ocaml/merlin/pull/1399 + # Fixed in 4.4 for OCaml ≥ 4.12 ./test.patch - ]; + ; useDune2 = true; From 4f51fae5bbbb5b232ca340f5836875cc2c0f10cc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 10:34:03 +0000 Subject: [PATCH 076/121] coqPackages.serapi: remove with Coq 8.14 --- pkgs/development/coq-modules/serapi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index f70cdcc9322a..301e5975c576 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -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"; } From 48406e3fca5be837df5cfa3a5b891dd3d6557e1b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Nov 2021 10:33:29 +0000 Subject: [PATCH 077/121] =?UTF-8?q?coq=5F8=5F14:=208.14.0=20=E2=86=92=208.?= =?UTF-8?q?14.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And build Coq ≥ 8.14 with OCaml 4.12 --- pkgs/applications/science/logic/coq/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/coq-packages.nix | 9 +++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 16db7384df17..02082663516e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c62666a42a75..031e293860f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31621,7 +31621,7 @@ with pkgs; cadical = callPackage ../applications/science/logic/cadical {}; inherit (callPackage ./coq-packages.nix { - inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit (ocaml-ng) ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10 ocamlPackages_4_12; }) mkCoqPackages coqPackages_8_5 coq_8_5 coqPackages_8_6 coq_8_6 diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 60d6265309bb..3d6f6df61148 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -1,5 +1,5 @@ { lib, stdenv, callPackage, newScope, recurseIntoAttrs, ocamlPackages_4_05, ocamlPackages_4_09 -, ocamlPackages_4_10, fetchpatch, makeWrapper, coq2html +, ocamlPackages_4_10, ocamlPackages_4_12, fetchpatch, makeWrapper, coq2html }@args: let lib = import ../build-support/coq/extra-lib.nix {inherit (args) lib;}; in let @@ -113,7 +113,12 @@ let ) (lib.attrNames set) ); mkCoq = version: callPackage ../applications/science/logic/coq { - inherit version ocamlPackages_4_05 ocamlPackages_4_09 ocamlPackages_4_10; + inherit version + ocamlPackages_4_05 + ocamlPackages_4_09 + ocamlPackages_4_10 + ocamlPackages_4_12 + ; }; in rec { From 3782c097b2ac1ef19ed573eeaf7b1a02ae10ac3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 1 Dec 2021 10:30:32 -0300 Subject: [PATCH 078/121] matcha-gtk-theme: 2021-09-24 -> 2021-11-29 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 4507e3c2f151..886a173b2d89 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-09-24"; + version = "2021-11-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "064x340z6fif59bbk1p7ryl6xfj8hlf42ld7h8prcjsyghpznw15"; + sha256 = "10fgz09h25cmnvz0bzx5qadv7cqnl1bdd6hj7w0rcbsws4c2j17q"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 3b1c4a732f9d8f4961153a087d86e66ca704ac55 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Dec 2021 14:21:39 +0100 Subject: [PATCH 079/121] compcert: fix for Coq 8.14.1 --- pkgs/development/coq-modules/compcert/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 253b710048d4..9757b3e43c8b 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -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"; + }) + ]; + } ] []; } ) From 21a54a4e4c91f043aa46063a9276b768fa6af8b1 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Wed, 1 Dec 2021 17:55:06 +0300 Subject: [PATCH 080/121] nixos/transmission: adjust message-level enum --- nixos/modules/services/torrent/transmission.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index a6ff467914a1..b8b38f6ba93c 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -67,7 +67,7 @@ in description = ""; }; options.message-level = mkOption { - type = types.ints.between 0 2; + type = types.ints.between 0 3; default = 2; description = "Set verbosity of transmission messages."; }; From 6daa4a5c045d40e6eae60a3b6e427e8700f1c07f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Dec 2021 10:48:36 +0100 Subject: [PATCH 081/121] haskell.compiler.*: use wrapped darwin bintools on aarch64 On aarch64-darwin we have additional wrappers for install_name_tool and strip to deal with codesigning requirements (e. g. updating the signature / checksum after changing a binary). These wrappers don't exist on x86_64-darwin which is why the unwrapped versions were used before, causing the kernel to kill (some) executables produced by GHC. --- pkgs/development/compilers/ghc/8.10.7.nix | 22 ++++++++++++++++++++-- pkgs/development/compilers/ghc/9.0.1.nix | 22 ++++++++++++++++++++-- pkgs/development/compilers/ghc/9.2.1.nix | 22 ++++++++++++++++++++-- pkgs/development/compilers/ghc/head.nix | 22 ++++++++++++++++++++-- 4 files changed, 80 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 5be64bebcd4d..1b4dac4a9768 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -130,6 +130,24 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. @@ -207,10 +225,10 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index d377328692cb..cd4a8acebba0 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -125,6 +125,24 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. @@ -173,10 +191,10 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 20062358db50..8361d4e939b7 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -126,6 +126,24 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. @@ -173,10 +191,10 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 537b735b4a21..d88d4493bb64 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -139,6 +139,24 @@ let targetCC = builtins.head toolsForTarget; + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. @@ -187,10 +205,10 @@ stdenv.mkDerivation (rec { export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" - export INSTALL_NAME_TOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}install_name_tool" + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" '' + lib.optionalString useLLVM '' export LLC="${lib.getBin llvmPackages.llvm}/bin/llc" export OPT="${lib.getBin llvmPackages.llvm}/bin/opt" From 3d468e031569ba21e2c0b393e7f43767f8a078f5 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Wed, 1 Dec 2021 19:20:18 +0100 Subject: [PATCH 082/121] gradle: 7.3 -> 7.3.1 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 308a006ecba6..0c154079ff4e 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -89,9 +89,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.3"; + version = "7.3.1"; nativeVersion = "0.22-milestone-21"; - sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy"; + sha256 = "0rkb9pdmvq0zidv8lv4im2j7gs949lg35r79l1hwf4pwi2k3ryws"; defaultJava = jdk17; }; From c6ee63259a744b204ef2283a931de9f4e246f238 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 18 Nov 2021 08:53:54 -0800 Subject: [PATCH 083/121] nixos/test-driver: more context when step finishes When displaying the amount of time some step took, with no other context, it becomes nigh impossible (especially in longer tests) to see when specific steps finished. --- nixos/lib/test-driver/test-driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 643446f313e3..7b8912acf503 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -171,7 +171,7 @@ class Logger: yield self.drain_log_queue() toc = time.time() - self.log("({:.2f} seconds)".format(toc - tic)) + self.log("(finished: {}, in {:.2f} seconds)".format(message, toc - tic)) self.xml.endElement("nest") From af765f3abd7193ec5256cea3d5e8b7692dc99931 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 18 Nov 2021 09:10:51 -0800 Subject: [PATCH 084/121] nixos/test-driver: give more functions nested labels This will make it easier to trace through the test execution without having to scroll through the entire kernel output. --- nixos/lib/test-driver/test-driver.py | 71 +++++++++++++++------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7b8912acf503..da5a6cec4ec4 100755 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -490,23 +490,24 @@ class Machine: return rootlog.nested(msg, my_attrs) def wait_for_monitor_prompt(self) -> str: - assert self.monitor is not None - answer = "" - while True: - undecoded_answer = self.monitor.recv(1024) - if not undecoded_answer: - break - answer += undecoded_answer.decode() - if answer.endswith("(qemu) "): - break - return answer + with self.nested("waiting for monitor prompt"): + assert self.monitor is not None + answer = "" + while True: + undecoded_answer = self.monitor.recv(1024) + if not undecoded_answer: + break + answer += undecoded_answer.decode() + if answer.endswith("(qemu) "): + break + return answer def send_monitor_command(self, command: str) -> str: - message = ("{}\n".format(command)).encode() - self.log("sending monitor command: {}".format(command)) - assert self.monitor is not None - self.monitor.send(message) - return self.wait_for_monitor_prompt() + with self.nested("sending monitor command: {}".format(command)): + message = ("{}\n".format(command)).encode() + assert self.monitor is not None + self.monitor.send(message) + return self.wait_for_monitor_prompt() def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None: """Wait for a systemd unit to get into "active" state. @@ -533,7 +534,12 @@ class Machine: return state == "active" - retry(check_active) + with self.nested( + "waiting for unit {}{}".format( + unit, f" with user {user}" if user is not None else "" + ) + ): + retry(check_active) def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) @@ -752,7 +758,8 @@ class Machine: status, _ = self.execute("nc -z localhost {}".format(port)) return status != 0 - retry(port_is_closed) + with self.nested("waiting for TCP port {} to be closed"): + retry(port_is_closed) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl("start {}".format(jobname), user) @@ -886,20 +893,20 @@ class Machine: retry(screen_matches) def wait_for_console_text(self, regex: str) -> None: - self.log("waiting for {} to appear on console".format(regex)) - # Buffer the console output, this is needed - # to match multiline regexes. - console = io.StringIO() - while True: - try: - console.write(self.last_lines.get()) - except queue.Empty: - self.sleep(1) - continue - console.seek(0) - matches = re.search(regex, console.read()) - if matches is not None: - return + with self.nested("waiting for {} to appear on console".format(regex)): + # Buffer the console output, this is needed + # to match multiline regexes. + console = io.StringIO() + while True: + try: + console.write(self.last_lines.get()) + except queue.Empty: + self.sleep(1) + continue + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) @@ -1014,7 +1021,7 @@ class Machine: ) return any(pattern.search(name) for name in names) - with self.nested("Waiting for a window to appear"): + with self.nested("waiting for a window to appear"): retry(window_is_visible) def sleep(self, secs: int) -> None: From f69af24c74715039420a999690870433ef991127 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 10:34:09 +0100 Subject: [PATCH 085/121] esphome: 2021.10.1 -> 2021.11.4 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 1ce5ced3f3ed..5a44d7e84606 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20211021.0"; + version = "20211201.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stJ6fUs02XpCN671EztHTLkXd57eMo6472Q1e1/cbHY="; + sha256 = "sha256-/VARM59TI2Ff70Jq0smFMrt4o2G/wKSdcOreLfxMAMQ="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index dbe57f1bdf5b..243629ec24b5 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.10.1"; + version = "2021.11.4"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zVZantMYtDWkvFrXmX0HpUchmc3T2gbkrMiWGP2ibNc="; + sha256 = "sha256-hPnng3Jkb2FucEOar/MIjvWHKbT3NNxEn6CIr3sd1Ng="; }; patches = [ From a542c7c8c52b1d7ba014c326126cd298f8e0720e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 1 Dec 2021 20:01:05 +0100 Subject: [PATCH 086/121] esphome: apply patch to fix subprocess usage --- pkgs/tools/misc/esphome/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 243629ec24b5..6f5725b2b313 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -2,6 +2,7 @@ , pkgs , python3 , fetchFromGitHub +, fetchpatch , platformio , esptool , git @@ -28,7 +29,11 @@ with python.pkgs; buildPythonApplication rec { patches = [ # fix missing write permissions on src files before modifing them - ./fix-src-permissions.patch + ./fix-src-permissions.patch + (fetchpatch { + url = "https://github.com/esphome/esphome/commit/fbe1bca1b9896ba8c8b754c5a4faf790bffd887b.patch"; + sha256 = "sha256-Iyc79iL2YkLGD81TbFK3GaCY2L9nTE9mKz6MQSNQWr8="; + }) ]; postPatch = '' From f0a01556c72c279fd16f3c52665b1453eef5b334 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 30 Nov 2021 21:20:59 +0000 Subject: [PATCH 087/121] libxc: fix darwin build --- pkgs/development/libraries/libxc/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 046d630888c4..5ed5ef1fc373 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" + # needed for tests to link + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" @@ -27,10 +29,6 @@ stdenv.mkDerivation rec { "-DDISABLE_LXC=0" ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd) - ''; - doCheck = true; meta = with lib; { From 5dfface8d549fdc80100c7dd06f00fe5e6226bd2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 1 Dec 2021 16:24:38 -0300 Subject: [PATCH 088/121] pinta: 1.6 -> 1.7.1 --- pkgs/applications/graphics/pinta/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 66804fc3110b..c2704cbf265b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -11,7 +11,7 @@ let in buildDotnetPackage rec { baseName = "Pinta"; - version = "1.6"; + version = "1.7.1"; outputFiles = [ "bin/*" ]; buildInputs = [ gtksharp mono-addins gettext ]; @@ -21,7 +21,7 @@ buildDotnetPackage rec { owner = "PintaProject"; repo = "Pinta"; rev = version; - sha256 = "0vgswy981c7ys4q7js5k85sky7bz8v32wsfq3br4j41vg92pw97d"; + sha256 = "sha256-yRp/dpJ9T4DieqHTj3vhyuASPGe4vjHw0rSXFrTNZVc="; }; # Remove version information from nodes @@ -74,6 +74,8 @@ buildDotnetPackage rec { --replace _Comment Comment \ --replace _GenericName GenericName \ --replace _X-GNOME-FullName X-GNOME-FullName + substitute xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml \ + --replace _p p xbuild /target:CompileTranslations Pinta.Install.proj xbuild /target:Install Pinta.Install.proj From 1195e8cecc8651d7168e4064a4d4c4e6e83a985a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 1 Dec 2021 17:19:34 -0300 Subject: [PATCH 089/121] clj-kondo: 2021.10.19 -> 2021.12.01 --- pkgs/development/tools/clj-kondo/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index df6a5e0f90ef..206b4d727266 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2021.10.19"; + version = "2021.12.01"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-i0OeQPZfQPUeXC/Bs84I91IahBKK6W1mFix97s8/lVA="; + sha256 = "sha256-AH2MAz++jjBNHWAsUOWkfdzyWzGfmcDBNKcJp4xbPxQ="; }; extraNativeImageBuildArgs = [ @@ -18,6 +18,7 @@ buildGraalvmNativeImage rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/clj-kondo/clj-kondo"; license = licenses.epl10; + changelog = "https://github.com/clj-kondo/clj-kondo/blob/v${versiont}/CHANGELOG.md"; maintainers = with maintainers; [ jlesquembre bandresen thiagokokada ]; }; } From e87aec124e710d3ccbf7c6a0d4f7538ec62ffa68 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 1 Dec 2021 21:37:38 +0100 Subject: [PATCH 090/121] maintainers: update patryk27's email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8851889ef566..3fac740a11ee 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8923,7 +8923,7 @@ name = "pasqui23"; }; patryk27 = { - email = "wychowaniec.patryk@gmail.com"; + email = "pwychowaniec@pm.me"; github = "Patryk27"; githubId = 3395477; name = "Patryk Wychowaniec"; From 33b9a3048d1201c4abb610908aecad664c75b872 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 1 Dec 2021 21:38:11 +0100 Subject: [PATCH 091/121] clang-tools: update maintainers --- pkgs/development/tools/clang-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index ba829f2c41df..bfc00fb6e3d3 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -34,6 +34,6 @@ in stdenv.mkDerivation { meta = unwrapped.meta // { description = "Standalone command line tools for C++ development"; - maintainers = with lib.maintainers; [ aherrmann ]; + maintainers = with lib.maintainers; [ patryk27 ]; }; } From 82aef7957db4f08ff7415761321ace9ec77d89e3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 2 Dec 2021 08:03:17 +1100 Subject: [PATCH 092/121] fastp: 0.23.1 -> 0.23.2 --- pkgs/applications/science/biology/fastp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix index 2e44113f40ef..4dace9e63b42 100644 --- a/pkgs/applications/science/biology/fastp/default.nix +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-vRJlNtg2JabBAUaX91Y04z8MdyxEnreBAlIHn7VB+u4="; + sha256 = "sha256-W1mXTfxD7/gHJhao6qqbNcyM3t2cfrUYiBYPJi/O1RI="; }; buildInputs = [ zlib libdeflate isa-l ]; From 9859ef861c9fd45ad50da5bed54fae5ee645536e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:06:12 +0100 Subject: [PATCH 093/121] python3Packages.tailscale: 0.1.2 -> 0.1.3 --- pkgs/development/python-modules/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index a2e58322cea3..d560b5e89c2a 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "1jqx2i8rghfxlb1c76f37viz9fc1vq95xb2jm3bpnx5yy4n5dly1"; + sha256 = "sha256-0qWuOSQncEldA073ByFWkpW97HY0JANSvnv8xX/NSs8="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for the Tailscale API"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-tailscale"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 1c5f50daf3919d636475026a9100286dbcc78731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:14:21 +0100 Subject: [PATCH 094/121] python3Packages.cloudsplaining: 0.4.6 -> 0.4.8 --- pkgs/development/python-modules/cloudsplaining/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 6dbb3f91d1e8..2a5dc7efcdf8 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.6"; + version = "0.4.8"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - sha256 = "sha256-TFUOsfQ1QxdpmRUJPoHMCuCpmYpQodLkP5EVXKm+qsw="; + sha256 = "sha256-t1eSPa1KqzUB2xYGkU10lVIZQ3CcIHiZZtTa0j2TUGc="; }; propagatedBuildInputs = [ From 52209dc538b144b997f8365f76d1cbf0dcc240fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:34:27 +0100 Subject: [PATCH 095/121] python3Packages.vehicle: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/vehicle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index b7b7fbc32738..9d5f15a3e1b1 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "vehicle"; - version = "0.2.0"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-vehicle"; rev = "v${version}"; - sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + sha256 = "sha256-3DkfS8gx3C1/Vj8+IE7uxZ5i0cKJk0mJpBWQqAgb2Xo="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client providing RDW vehicle information"; - homepage = "https://github.com/frenck/python-wled"; + homepage = "https://github.com/frenck/python-vehicle"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 8fafb2d3cf04df3d6ae5d5931cd49c07cb6747e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 1 Dec 2021 22:46:24 +0100 Subject: [PATCH 096/121] python39Packages.open-meteo: init at 0.2.0 --- .../python-modules/open-meteo/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/open-meteo/default.nix diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix new file mode 100644 index 000000000000..6a7d5cfeb6e0 --- /dev/null +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "open-meteo"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-open-meteo"; + rev = "v${version}"; + sha256 = "tuAuY43HRz8zFTOhsm4TxSppP4CYTGPqQndDMxW3URs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + aresponses + pydantic + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" \ + --replace 'aiohttp = "^3.8.1"' 'aiohttp = "^3.8.0"' + ''; + + pythonImportsCheck = [ + "open_meteo" + ]; + + meta = with lib; { + description = "Python client for the Open-Meteo API"; + homepage = "https://github.com/frenck/python-open-meteo"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bf6e52459c7..6fa682290567 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5359,6 +5359,8 @@ in { open-garage = callPackage ../development/python-modules/open-garage { }; + open-meteo = callPackage ../development/python-modules/open-meteo { }; + openant = callPackage ../development/python-modules/openant { }; openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; From 755320fe14d22e585eb2e85fd0b87ff73844739a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Dec 2021 23:23:18 +0100 Subject: [PATCH 097/121] signal-desktop: 5.24.0 -> 5.25.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 20e589813381..fef5c11ae8f6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.24.0"; # Please backport all updates to the stable channel. + version = "5.25.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1p19vs4wxlghv8cbsq5k4bl8h9fzr9izp4k4qs5fcnqiy1z92ycy"; + sha256 = "0ql9rzxrisqms3plcrmf3fjinpxba10asmpsxvhn0zlfajy47d0a"; }; nativeBuildInputs = [ From ecb836f4dd22665a6cf1e3ddd7b06f26cbafff8e Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Wed, 1 Dec 2021 23:40:56 +0100 Subject: [PATCH 098/121] hydrus: 463 -> 464 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 787aace163b8..45b3c5563771 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "463"; + version = "464"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-GT5aIMskOVn4eAd4612YYA8uAQC8tuJzpEHNhc7pMuc="; + sha256 = "sha256-ZAndODbl6cH0H1rA3Bhn3AlfIuba0LjxWxusGPDYvlA="; }; nativeBuildInputs = [ From 0d02ab20287ebf6bbd249ca18a53a3d7952b05e3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Dec 2021 15:27:57 +1000 Subject: [PATCH 099/121] .github/workflows/editorconfig.yml: write changed files to disk This avoids errors when exporting long lists to $GITHUB_ENV. Co-authored-by: Moritz Hedtke --- .github/workflows/editorconfig.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 4cd3a1dfa8e8..01a6d736c137 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -17,30 +17,26 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - echo 'PR_DIFF<> $GITHUB_ENV gh api \ repos/NixOS/nixpkgs/pulls/${{github.event.number}}/files --paginate \ | jq '.[] | select(.status != "removed") | .filename' \ - >> $GITHUB_ENV - echo 'EOF' >> $GITHUB_ENV + > "$HOME/changed_files" + - name: print list of changed files + run: | + cat "$HOME/changed_files" - uses: actions/checkout@v2 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - if: env.PR_DIFF - uses: cachix/install-nix-action@v16 - if: env.PR_DIFF with: # nixpkgs commit is pinned so that it doesn't break nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '' - if: env.PR_DIFF - name: Checking EditorConfig - if: env.PR_DIFF run: | - echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size + cat "$HOME/changed_files" | xargs -r editorconfig-checker -disable-indent-size - if: ${{ failure() }} run: | echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." - From ee36cb7d2c90faac15a670aa867387dbe31df208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Thu, 2 Dec 2021 01:24:35 +0100 Subject: [PATCH 100/121] nss: 3.72 -> 3.73 (#148219) Update done by running the `nss` and `cacert` update scripts, then running nixpkgs-check to validate things look good enough to be thrown at hydra --- pkgs/development/libraries/nss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ad212e1b1d78..4a69ad54c4e4 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.72"; + version = "3.73"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "bqYKn/ET5JPqKrJfQep1qfvRCveQPyb3A9rIaAcy0C4="; + sha256 = "1rfqjq02rfv0ycdmvic51pi093rg33zb8kpqkvddf44vv9l3lvan"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 5b0af75786ec92a997c8db73b2492a429cb2f587 Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Wed, 1 Dec 2021 20:21:40 -0300 Subject: [PATCH 101/121] materia-theme: 20200916 -> 20210322 --- pkgs/data/themes/materia-theme/default.nix | 23 +++++++--------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index f9e3463f2fdc..da79f68638b9 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -11,30 +12,20 @@ stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20200916"; + version = "20210322"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; + sha256 = "1fsicmcni70jkl4jb3fvh7yv0v9jhb8nwjzdq8vfwn256qyk0xvl"; }; - nativeBuildInputs = [ - meson - ninja - sassc - ]; + nativeBuildInputs = [ meson ninja sassc ]; - buildInputs = [ - gnome.gnome-themes-extra - gdk-pixbuf - librsvg - ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; dontBuild = true; From 1526faf075bdb52ece4fd5c259c54c66d1fcf003 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 16:22:44 +0000 Subject: [PATCH 102/121] julia_17-bin: init at 1.7.0 https://github.com/JuliaLang/julia/blob/v1.7.0/NEWS.md --- pkgs/development/compilers/julia/1.7-bin.nix | 71 +++++++++++++++++++ ...able-parallel-unit-tests-for-sandbox.patch | 30 ++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/julia/1.7-bin.nix create mode 100644 pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix new file mode 100644 index 000000000000..99677636b282 --- /dev/null +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -0,0 +1,71 @@ +{ autoPatchelfHook, fetchurl, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "julia-bin"; + version = "1.7.0"; + + src = { + x86_64-linux = fetchurl { + url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; + sha256 = "0h0d9kfg00vglg2qmcx0k8c2gzn445i0xbsfw6wy1idf72kg76bj"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + # Julia’s source files are in different locations for source and binary + # releases. Thus we temporarily create a symlink to allow us to share patches + # with source releases. + prePatch = '' + ln -s share/julia/test + ''; + patches = [ + # Source release Nix patch(es) relevant for binary releases as well. + ./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch + ]; + postPatch = '' + # Revert symlink hack. + rm test + + # Julia fails to pick up our Certification Authority root certificates, but + # it provides its own so we can simply disable the test. Patching in the + # dynamic path to ours require us to rebuild the Julia system image. + substituteInPlace share/julia/stdlib/v${lib.versions.majorMinor version}/NetworkOptions/test/runtests.jl \ + --replace '@test ca_roots_path() != bundled_ca_roots()' \ + '@test_skip ca_roots_path() != bundled_ca_roots()' + ''; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + cp -r . $out + runHook postInstall + ''; + + # Breaks backtraces, etc. + dontStrip = true; + + doInstallCheck = true; + preInstallCheck = '' + # Some tests require read/write access to $HOME. + export HOME="$TMPDIR" + ''; + installCheckPhase = '' + runHook preInstallCheck + # Command lifted from `test/Makefile`. + $out/bin/julia \ + --check-bounds=yes \ + --startup-file=no \ + --depwarn=error \ + $out/share/julia/test/runtests.jl + runHook postInstallCheck + ''; + + meta = { + description = "High-level, high-performance dynamic language for technical computing."; + homepage = "https://julialang.org"; + # Bundled and linked with various GPL code, although Julia itself is MIT. + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ninjin raskin ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch new file mode 100644 index 000000000000..243a9cfd76ae --- /dev/null +++ b/pkgs/development/compilers/julia/patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch @@ -0,0 +1,30 @@ +From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001 +From: Pontus Stenetorp +Date: Thu, 8 Apr 2021 04:37:44 +0000 +Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox + +Disabled by default due to lack of networking in the Nix sandbox. This +greatly speeds up the build process on a multi-core system. +--- + test/runtests.jl | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/runtests.jl b/test/runtests.jl +index 2f9cd058bb..2f8c19fa32 100644 +--- a/test/runtests.jl ++++ b/test/runtests.jl +@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests) + import LinearAlgebra + cd(@__DIR__) do + n = 1 +- if net_on +- n = min(Sys.CPU_THREADS, length(tests)) ++ if net_on || haskey(ENV, "NIX_BUILD_CORES") ++ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS ++ n = min(x, Sys.CPU_THREADS, length(tests)) + n > 1 && addprocs_with_testenv(n) + LinearAlgebra.BLAS.set_num_threads(1) + end +-- +2.29.3 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 031e293860f2..18d29b659ca1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12440,9 +12440,10 @@ with pkgs; julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; + julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; julia-lts-bin = julia_10-bin; - julia-stable-bin = julia_16-bin; + julia-stable-bin = julia_17-bin; julia-bin = julia-stable-bin; jwasm = callPackage ../development/compilers/jwasm { }; From 36afb5849371a1898dc605b0905f4d351cee4b39 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 17:11:15 +0000 Subject: [PATCH 103/121] julia_10-bin and julia_16-bin: update LTS alias In line with the upstream announcement: https://discourse.julialang.org/t/julia-v1-7-0-has-been-released-and-v1-6-is-now-lts/72336 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18d29b659ca1..5c05c1688975 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12442,7 +12442,7 @@ with pkgs; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; - julia-lts-bin = julia_10-bin; + julia-lts-bin = julia_16-bin; julia-stable-bin = julia_17-bin; julia-bin = julia-stable-bin; From 6e176f712be1dd51c2c53528f4ee1b3efb6ac222 Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Wed, 1 Dec 2021 17:22:02 +0000 Subject: [PATCH 104/121] julia_10-bin: deprecate No longer supported upstream: https://discourse.julialang.org/t/julia-v1-7-0-has-been-released-and-v1-6-is-now-lts/72336 --- pkgs/development/compilers/julia/1.0-bin.nix | 80 ----------------- ...ip-tests-that-require-network-access.patch | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 pkgs/development/compilers/julia/1.0-bin.nix delete mode 100644 pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch diff --git a/pkgs/development/compilers/julia/1.0-bin.nix b/pkgs/development/compilers/julia/1.0-bin.nix deleted file mode 100644 index dfda8da9e4de..000000000000 --- a/pkgs/development/compilers/julia/1.0-bin.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ autoPatchelfHook, fetchurl, lib, makeWrapper, openssl, stdenv }: - -stdenv.mkDerivation rec { - pname = "julia-bin"; - version = "1.0.5"; - - src = { - x86_64-linux = fetchurl { - url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "00vbszpjmz47nqy19v83xa463ajhzwanjyg5mvcfp9kvfw9xdvcx"; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - # Julia’s source files are in different locations for source and binary - # releases. Thus we temporarily create symlinks to allow us to share patches - # with source releases. - prePatch = '' - ln -s share/julia/stdlib/v${lib.versions.majorMinor version} stdlib - ln -s share/julia/test - ''; - patches = [ - # Source release Nix patch(es) relevant for binary releases as well. - ./patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch - ]; - postPatch = '' - # Revert symlink hack. - rm stdlib test - ''; - - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ autoPatchelfHook ]; - - installPhase = '' - runHook preInstall - cp -r . $out - # Setting `LD_LIBRARY_PATH` resolves `Libdl` failures. Not sure why this is - # only necessary on v1.0.x and a cleaner solution is welcome, but after - # staring at `strace` for a few hours this is as clean as I could make it. - wrapProgram $out/bin/julia \ - --suffix LD_LIBRARY_PATH : $out/lib - runHook postInstall - ''; - - # Breaks backtraces, etc. - dontStrip = true; - - doInstallCheck = true; - installCheckInputs = [ openssl ]; - preInstallCheck = '' - # Some tests require read/write access to $HOME. - export HOME="$TMPDIR" - ''; - installCheckPhase = '' - runHook preInstallCheck - # Command lifted from `test/Makefile`. - $out/bin/julia \ - --check-bounds=yes \ - --startup-file=no \ - --depwarn=error \ - $out/share/julia/test/runtests.jl - runHook postInstallCheck - ''; - - meta = { - description = "High-level, high-performance dynamic language for technical computing"; - homepage = "https://julialang.org"; - # Bundled and linked with various GPL code, although Julia itself is MIT. - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin ]; - platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - # Built with libgit2 v0.27.2: - # https://github.com/JuliaLang/julia/blob/e0837d1e64a9e4d17534a9f981e9a2a3f221356f/deps/libgit2.version - # https://nvd.nist.gov/vuln/detail/CVE-2020-12278 - "CVE-2020-12278" - # https://nvd.nist.gov/vuln/detail/CVE-2020-12279 - "CVE-2020-12279" - ]; - }; -} diff --git a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch b/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch deleted file mode 100644 index 0de1f7c010d3..000000000000 --- a/pkgs/development/compilers/julia/patches/1.0-bin/0002-nix-Skip-tests-that-require-network-access.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 4954b99efae367da49412edd31a7bd832ec62c69 Mon Sep 17 00:00:00 2001 -From: Pontus Stenetorp -Date: Mon, 15 Mar 2021 05:55:18 +0000 -Subject: [PATCH 2/3] nix: Skip tests that require network access - -Necessary as the Nix build sandbox does not permit network access. ---- - stdlib/Sockets/test/runtests.jl | 40 ++++++++++++++++----------------- - test/file.jl | 4 ++-- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/stdlib/Sockets/test/runtests.jl b/stdlib/Sockets/test/runtests.jl -index 6145f87616..9cc7a001e5 100644 ---- a/stdlib/Sockets/test/runtests.jl -+++ b/stdlib/Sockets/test/runtests.jl -@@ -151,33 +151,33 @@ defaultport = rand(2000:4000) - end - - @testset "getnameinfo on some unroutable IP addresses (RFC 5737)" begin -- @test getnameinfo(ip"192.0.2.1") == "192.0.2.1" -- @test getnameinfo(ip"198.51.100.1") == "198.51.100.1" -- @test getnameinfo(ip"203.0.113.1") == "203.0.113.1" -- @test getnameinfo(ip"0.1.1.1") == "0.1.1.1" -- @test getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -- @test getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -- @test getnameinfo(ip"2001:db8::1") == "2001:db8::1" -+ @test_skip getnameinfo(ip"192.0.2.1") == "192.0.2.1" -+ @test_skip getnameinfo(ip"198.51.100.1") == "198.51.100.1" -+ @test_skip getnameinfo(ip"203.0.113.1") == "203.0.113.1" -+ @test_skip getnameinfo(ip"0.1.1.1") == "0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:0.1.1.1") == "::ffff:0.1.1.1" -+ @test_skip getnameinfo(ip"::ffff:192.0.2.1") == "::ffff:192.0.2.1" -+ @test_skip getnameinfo(ip"2001:db8::1") == "2001:db8::1" - end - - @testset "getnameinfo on some valid IP addresses" begin - @test !isempty(getnameinfo(ip"::")::String) -- @test !isempty(getnameinfo(ip"0.0.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.0")::String) -- @test !isempty(getnameinfo(ip"10.1.0.255")::String) -- @test !isempty(getnameinfo(ip"10.1.255.1")::String) -- @test !isempty(getnameinfo(ip"255.255.255.255")::String) -- @test !isempty(getnameinfo(ip"255.255.255.0")::String) -- @test !isempty(getnameinfo(ip"192.168.0.1")::String) -- @test !isempty(getnameinfo(ip"::1")::String) -+ @test_skip !isempty(getnameinfo(ip"0.0.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.0")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.0.255")::String) -+ @test_skip !isempty(getnameinfo(ip"10.1.255.1")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.255")::String) -+ @test_skip !isempty(getnameinfo(ip"255.255.255.0")::String) -+ @test_skip !isempty(getnameinfo(ip"192.168.0.1")::String) -+ @test_skip !isempty(getnameinfo(ip"::1")::String) - end - - @testset "getaddrinfo" begin -- let localhost = getnameinfo(ip"127.0.0.1")::String -- @test !isempty(localhost) && localhost != "127.0.0.1" -- @test !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -- @test getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -- @test try -+ let localhost = getnameinfo(ip"::")::String -+ @test_skip !isempty(localhost) && localhost != "127.0.0.1" -+ @test_skip !isempty(getalladdrinfo(localhost)::Vector{IPAddr}) -+ @test_skip getaddrinfo(localhost, IPv4)::IPv4 != ip"0.0.0.0" -+ @test_skip try - getaddrinfo(localhost, IPv6)::IPv6 != ip"::" - catch ex - isa(ex, Sockets.DNSError) && ex.code == Base.UV_EAI_NONAME && ex.host == localhost -diff --git a/test/file.jl b/test/file.jl -index e86476f975..579276f82c 100644 ---- a/test/file.jl -+++ b/test/file.jl -@@ -874,8 +874,8 @@ if !Sys.iswindows() || (Sys.windows_version() >= Sys.WINDOWS_VISTA_VER) - else - @test_throws ErrorException symlink(file, "ba\0d") - end --@test_throws ArgumentError download("good", "ba\0d") --@test_throws ArgumentError download("ba\0d", "good") -+@test_skip @test_throws ArgumentError download("good", "ba\0d") -+@test_skip @test_throws ArgumentError download("ba\0d", "good") - - ################### - # walkdir # --- -2.29.3 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7e89081aef3c..a6518b062b8b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -394,6 +394,7 @@ mapAliases ({ julia_1 = throw "julia_1 has been deprecated in favor of julia_10 as it was ambiguous"; # added 2021-03-13 julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # added 2020-09-15 julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # added 2021-03-13 + julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # added 2021-12-02 kbdKeymaps = throw "kbdKeymaps is not needed anymore since dvp and neo are now part of kbd"; # added 2021-04-11 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 kdiff3-qt5 = kdiff3; # added 2017-02-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c05c1688975..2e64257eb62c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12438,7 +12438,6 @@ with pkgs; julia-stable = julia_15; julia = julia-stable; - julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { }; julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { }; julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { }; From 6cbd21cb02170f8f53fd5c8410a62af1fab2b46f Mon Sep 17 00:00:00 2001 From: Pontus Stenetorp Date: Thu, 2 Dec 2021 01:08:09 +0000 Subject: [PATCH 105/121] julia_16-bin and julia_17-bin: punctuation fixes Thank you @7c6f434c for spotting these. --- pkgs/development/compilers/julia/1.6-bin.nix | 2 +- pkgs/development/compilers/julia/1.7-bin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/1.6-bin.nix b/pkgs/development/compilers/julia/1.6-bin.nix index 5743681ae7f0..abd2235189e7 100644 --- a/pkgs/development/compilers/julia/1.6-bin.nix +++ b/pkgs/development/compilers/julia/1.6-bin.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing."; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix index 99677636b282..0743fe3fdd72 100644 --- a/pkgs/development/compilers/julia/1.7-bin.nix +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "High-level, high-performance dynamic language for technical computing."; + description = "High-level, high-performance, dynamic language for technical computing"; homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; From d86329b7cd29d1fb6c261d6a022a4de9dacc942d Mon Sep 17 00:00:00 2001 From: Adson Cicilioti Date: Wed, 1 Dec 2021 23:43:22 -0300 Subject: [PATCH 106/121] flat-remix-gtk: 20201129 -> 20211130 --- pkgs/data/themes/flat-remix-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index afdf478fea03..722c3cbc41e5 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20201129"; + version = "20211130"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-lAlHRVB/P3A1qWsXQZPZ3uhgctR4FLa+ocUrsbleXJU="; + sha256 = "0n6djx346bzk558yd9nk0r6hqszcbkj0h1pv2n8n15ps2j9lyvw8"; }; dontBuild = true; From 8db9c46d69ac92675a9b675e41193d6376265b7e Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Wed, 1 Dec 2021 22:25:09 -0500 Subject: [PATCH 107/121] python3Packages.rdkit: fix on aarch64-darwin --- pkgs/development/python-modules/rdkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 97f2e5a6afc2..1ec7301dabd1 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -4,7 +4,7 @@ , fetchzip , cmake , boost -, catch +, catch2 , inchi , cairo , eigen @@ -75,7 +75,7 @@ buildPythonPackage rec { buildInputs = [ boost - catch + catch2 inchi eigen cairo @@ -107,7 +107,7 @@ buildPythonPackage rec { ''; cmakeFlags = [ - "-DCATCH_DIR=${catch}/include/catch" + "-DCATCH_DIR=${catch2}/include/catch2" "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so" "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so" "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi" From b952a9b16ee8a8b6c45d16d84aa298717624e34f Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Wed, 1 Dec 2021 22:04:14 -0600 Subject: [PATCH 108/121] adopt multiple packages --- pkgs/applications/science/astronomy/celestia/default.nix | 1 + pkgs/development/libraries/boost/generic.nix | 1 + .../development/libraries/science/astronomy/cfitsio/default.nix | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 6b76c2de4b05..3f21987661cf 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Real-time 3D simulation of space"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ hjones2199 ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index fdc8f7c21f18..6358df1a555c 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,6 +137,7 @@ stdenv.mkDerivation { badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" ++ optionals (versionOlder version "1.73") lib.platforms.riscv; + maintainers = with maintainers; [ hjones2199 ]; }; preConfigure = optionalString useMpi '' diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index e38c384009c9..9f9545e52f3b 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; changelog = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt"; license = licenses.mit; - maintainers = [ maintainers.xbreak ]; + maintainers = with maintainers; [ xbreak hjones2199 ]; platforms = with platforms; linux ++ darwin; }; } From 559edc03590da7bf77bfa262a111cf0834473aa7 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Wed, 1 Dec 2021 17:43:01 -0600 Subject: [PATCH 109/121] bunnyfetch: unstable-2021-06-19 -> 0.2.0 --- pkgs/tools/misc/bunnyfetch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix index e2b99da82db0..d03fea2cefd2 100644 --- a/pkgs/tools/misc/bunnyfetch/default.nix +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bunnyfetch"; - version = "unstable-2021-06-19"; + version = "0.2.0"; src = fetchFromGitHub { owner = "Rosettea"; repo = "bunnyfetch"; - rev = "24370338b936bae1ebdefea73e8372ac0b4d2858"; - sha256 = "09wcffx6ak4djm2lrxq43n27p9qmczng4rf11qpwx3w4w67jvpz9"; + rev = "v${version}"; + sha256 = "sha256-6MnjCXc9/8twdf8PHKsVJY1yWYwUf5R01vtQFJbyy7M="; }; - vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + vendorSha256 = "sha256-w+O1dU8t7uNvdlFnYhCdJCDixpWWZAnj9GrtsCbu9SM="; # No upstream tests doCheck = false; From cf6fc1fd1734373a5dc9dc6c223caaaad2a8592e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 2 Dec 2021 01:26:52 +0300 Subject: [PATCH 110/121] =?UTF-8?q?podman-compose:=202021-05-18=20?= =?UTF-8?q?=E2=86=92=200.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualization/podman-compose/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 2a6d2a20c44e..c18790c1b887 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,19 +1,15 @@ { lib, buildPythonApplication, fetchFromGitHub, pyyaml }: buildPythonApplication rec { - version = "0.2.0pre-2021-05-18"; + version = "0.1.8"; pname = "podman-compose"; # "This project is still under development." -- README.md - # - # As of May 2021, the latest release (0.1.5) has fewer than half of all - # commits. This project seems to have no release management, so the last - # commit is the best one until proven otherwise. src = fetchFromGitHub { repo = "podman-compose"; owner = "containers"; - rev = "62d2024feecf312e9591cc145f49cee9c70ab4fe"; - sha256 = "17992imkvi6129wvajsp0iz5iicfmh53i20qy2mzz17kcz30r2pp"; + rev = version; + sha256 = "sha256-BN6rG46ejYY6UCNjKYQpxPQGTW3x12zpGDnH2SKn304="; }; propagatedBuildInputs = [ pyyaml ]; @@ -21,7 +17,7 @@ buildPythonApplication rec { meta = { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; From 932ab304f0b8e3241c1311b9b731d3d330291715 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 2 Dec 2021 10:27:29 +0800 Subject: [PATCH 111/121] emacsPackages.orgPackages: deprecated org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191 --- .../from_md/release-notes/rl-2205.section.xml | 13 +++++++- .../manual/release-notes/rl-2205.section.md | 5 +++ .../emacs/elisp-packages/org-packages.nix | 33 ------------------- .../emacs/elisp-packages/update-from-overlay | 4 --- .../editors/emacs/elisp-packages/update-org | 4 --- pkgs/top-level/emacs-packages.nix | 6 ---- 6 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/org-packages.nix delete mode 100755 pkgs/applications/editors/emacs/elisp-packages/update-org diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index baefa0d369e5..4752cad6c7b0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -24,7 +24,7 @@
Backward Incompatibilities - + pkgs.ghc now refers to @@ -46,6 +46,17 @@ haskellPackages.callPackage). + + + pkgs.emacsPackages.orgPackages is removed + because org elpa is deprecated. The packages in the top level + of pkgs.emacsPackages, such as org and + org-contrib, refer to the ones in + pkgs.emacsPackages.elpaPackages and + pkgs.emacsPackages.nongnuPackages where the + new versions will release. + +
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a66e29bdb5f8..b0526a1fb3b4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin instead to ensure cross compilation keeps working (or switch to `haskellPackages.callPackage`). +* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. + The packages in the top level of `pkgs.emacsPackages`, such as org and + org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and + `pkgs.emacsPackages.nongnuPackages` where the new versions will release. + ## Other Notable Changes {#sec-release-22.05-notable-changes} diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix deleted file mode 100644 index 12680336e0e8..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* - -# Updating - -To update the list of packages from Org (ELPA), - -1. Run `./update-org`. -2. Check for evaluation errors: - env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages -3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` - -*/ - -{ lib }: - -self: let - - generateOrg = lib.makeOverridable ({ - generated ? ./org-generated.nix - }: let - - imported = import generated { - inherit (self) callPackage; - }; - - super = imported; - - overrides = { - }; - - in super // overrides); - -in generateOrg { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c..052364c803c1 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/ nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix - curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org deleted file mode 100755 index 2119a1672287..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell --show-trace ./emacs2nix.nix -i bash - -exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba1ed113ab60..0ac3ae8b4339 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -45,10 +45,6 @@ let inherit lib pkgs; }; - mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix { - inherit lib; - }; - mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix { inherit lib pkgs; }; @@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self - , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } - // orgPackages // { inherit orgPackages; } // manualPackages // { inherit manualPackages; } // { From 56ea0c9308e084acdf59b46721619cc847ae8b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Dec 2021 09:54:49 +0100 Subject: [PATCH 112/121] qemu: fix darwin build --- pkgs/applications/virtualization/qemu/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index b4a31c657cdc..5c22b1649239 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -228,8 +228,7 @@ 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 + install -m755 -D $emitKvmWarningsPath $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 \ From 28731a2d43e7771259a3ba63a8afbe8b2a43ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Mon, 22 Nov 2021 14:56:55 +0100 Subject: [PATCH 113/121] csvdiff: Init at 1.4.0 --- pkgs/tools/text/csvdiff/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/text/csvdiff/default.nix diff --git a/pkgs/tools/text/csvdiff/default.nix b/pkgs/tools/text/csvdiff/default.nix new file mode 100644 index 000000000000..f85d725d6ca4 --- /dev/null +++ b/pkgs/tools/text/csvdiff/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "csvdiff"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "aswinkarthik"; + repo = "csvdiff"; + rev = "v${version}"; + sha256 = "0cd1ikxsypjqisfnmr7zix3g7x8p892w77086465chyd39gpk97b"; + }; + + vendorSha256 = "1612s4kc0r8zw5y2n6agwdx9kwhxkdrjzagn4g22lzmjq02a64xf"; + + meta = with lib; { + homepage = "https://aswinkarthik.github.io/csvdiff/"; + description = "A fast diff tool for comparing csv files"; + license = licenses.mit; + maintainers = with maintainers; [ turion ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e64257eb62c..dc81aeb9e789 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2632,6 +2632,8 @@ with pkgs; csv2odf = callPackage ../applications/office/csv2odf { }; + csvdiff = callPackage ../tools/text/csvdiff { }; + csview = callPackage ../tools/text/csview { }; csvkit = callPackage ../tools/text/csvkit { }; From ba798538d076f5dea9e5f8bafdec0384fef9b1d6 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Thu, 2 Dec 2021 10:36:16 +0100 Subject: [PATCH 114/121] terraform-providers.dhall: init at 0.0.1 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 03d2797fe391..012cd1e1caec 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -268,6 +268,15 @@ "vendorSha256": null, "version": "2.16.0" }, + "dhall": { + "owner": "awakesecurity", + "provider-source-address": "registry.terraform.io/awakesecurity/dhall", + "repo": "terraform-provider-dhall", + "rev": "v0.0.1", + "sha256": "1cymabpa03a5avf0j6jj2mpnc62ap9b82zmpsgzwdjrb3mf954fa", + "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", + "version": "0.0.1" + }, "dme": { "owner": "terraform-providers", "repo": "terraform-provider-dme", From 38f9e483a5b60452c29d9ffc5272b6130184e414 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 2 Dec 2021 09:24:30 +0200 Subject: [PATCH 115/121] zerotierone: 1.8.3 -> 1.8.4 --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 94cd645d177c..3062befe2d3b 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-668KZ2E0jx/s+w4pl+oJbPlfdRGr6ypP2/FoFEBReIk="; + sha256 = "sha256-aM0FkcrSd5dEJVdJryIGuyWNFwvKH0SBfOuy4dIMK4A="; }; preConfigure = '' From 5dd8c34e3b96bae34c5ab93323e4b7968a277d85 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:05:36 +1000 Subject: [PATCH 116/121] terraform-providers.github: 4.18.0 -> 4.18.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 012cd1e1caec..b4d4df030f90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -380,10 +380,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.18.0", - "sha256": "0vr7vxlpq1lbp85qm2084w7mqkz5yp7gxj5ln29plhm7xjpd87bp", + "rev": "v4.18.2", + "sha256": "1m4ddj4bm84ljrkg8i98gdgbf5c89chv3yz13xbmyl2iga2x5bf7", "vendorSha256": null, - "version": "4.18.0" + "version": "4.18.2" }, "gitlab": { "owner": "gitlabhq", From d5a8b6e06353f72007d68176d4d23ab1c49e50f0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:02 +1000 Subject: [PATCH 117/121] terraform-providers.kubernetes: 2.6.1 -> 2.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4d4df030f90..e482caa69779 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -581,10 +581,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.6.1", - "sha256": "164x0ddgqk3bj0za4h9kz69npgr4cw7w5hnl0pmxsgvsb04vwc0g", + "rev": "v2.7.0", + "sha256": "07rqk60k87dff2wgg72ar7sdg99hd210k8afvvz9xh1arj63ixxi", "vendorSha256": null, - "version": "2.6.1" + "version": "2.7.0" }, "launchdarkly": { "owner": "terraform-providers", From d871541f064d33666e23d8128a01c066b45e5837 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:23 +1000 Subject: [PATCH 118/121] terraform-providers.nomad: 1.4.15 -> 1.4.16 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e482caa69779..8594dd98224c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -708,10 +708,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.15", - "sha256": "18rrvp7h27f51di8hajl2jb53v7wadqv4241rxdx1d180fas69k1", - "vendorSha256": "1y5wpilnqn17zbi88z23159gx2p57a9c10ajb7gn9isbxfdqj9mb", - "version": "1.4.15" + "rev": "v1.4.16", + "sha256": "11pw1ss4rk8hmfk0q9n8nim441ig0cgl1qxsjzcfsznkp5bb11rw", + "vendorSha256": "0b813dnkn15sdgvi4lh1l5fppgivzrcv5w56w0yf98vyy8wq7p0j", + "version": "1.4.16" }, "ns1": { "owner": "terraform-providers", From fbdfa32356a8275824db809636eeb46c4da3960f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 19:06:56 +1000 Subject: [PATCH 119/121] terraform-providers.vault: 3.0.0 -> 3.0.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8594dd98224c..822308419ca6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1129,10 +1129,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.0.0", - "sha256": "0k6wwkjxj9ywv16713k6r3ybni9041jx0y0ma7ygcxwk3mciac1z", + "rev": "v3.0.1", + "sha256": "0ppx8kc4zf0yp09vbkmj875sqvklbx0p8a1ganpzdm3462zskra4", "vendorSha256": "03l8bk9jsqf4c7gv0hs1rli7wmlcvpdxmxhra9vndnz6g0jvkvyx", - "version": "3.0.0" + "version": "3.0.1" }, "vcd": { "owner": "terraform-providers", From 160682f3487ac9f2ccbd8b51d98ae43610e0c2e0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 2 Dec 2021 20:01:32 +1000 Subject: [PATCH 120/121] terraform-providers: sort Merged ba798538d076f5dea9e5f8bafdec0384fef9b1d6 out of order. --- .../cluster/terraform-providers/providers.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 822308419ca6..e2f181d02abe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -259,15 +259,6 @@ "vendorSha256": "1i5ph7p4pj5ph9rkynii50n3npjprrcsmd15i430wpyjxvsjnw8c", "version": "3.6.0" }, - "digitalocean": { - "owner": "digitalocean", - "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", - "repo": "terraform-provider-digitalocean", - "rev": "v2.16.0", - "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", - "vendorSha256": null, - "version": "2.16.0" - }, "dhall": { "owner": "awakesecurity", "provider-source-address": "registry.terraform.io/awakesecurity/dhall", @@ -277,6 +268,15 @@ "vendorSha256": "0m11cpis171j9aicw0c66y4m1ckg41gjknj86qvblh57ai96gc1n", "version": "0.0.1" }, + "digitalocean": { + "owner": "digitalocean", + "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", + "repo": "terraform-provider-digitalocean", + "rev": "v2.16.0", + "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", + "vendorSha256": null, + "version": "2.16.0" + }, "dme": { "owner": "terraform-providers", "repo": "terraform-provider-dme", From 1304435f48c4b07f2886f240b674a38069f94758 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 2 Dec 2021 12:55:38 +0100 Subject: [PATCH 121/121] i3: 4.20 -> 4.20.1 (#148253) https://github.com/i3/i3/blob/next/RELEASE-NOTES-4.20.1 --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 0617e8572398..5c2db7d47a53 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.20"; + version = "4.20.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-jPTxdPbPVU84VjOAaBq+JYaOmVWIN5HgmG7NicU6wyI="; + sha256 = "1rpwdgykcvmrmdz244f0wm7446ih1dcw8rlc1hm1c7cc42pyrq93"; }; nativeBuildInputs = [