From 8b62b01325e74f696c479d90d5ad249ef29892cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 28 Oct 2021 18:57:13 +0200 Subject: [PATCH 01/21] neovim: Remove X11 dependency Remove runtime dependency to X11 for smaller closure sizes and reduced complexity. --- pkgs/applications/editors/neovim/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 8655235f2927..6a55e7c8e396 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv , libuv, lua, ncurses, pkg-config -, unibilium, xsel, gperf +, unibilium, gperf , libvterm-neovim , tree-sitter , glibcLocales ? null, procps ? null @@ -113,10 +113,6 @@ in substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; - postInstall = lib.optionalString stdenv.isLinux '' - sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim - ''; - # export PATH=$PWD/build/bin:${PATH} shellHook='' export VIMRUNTIME=$PWD/runtime From cbfd92d51c87f11e98b00513e96b81db8ce103a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Nov 2021 09:49:49 +0000 Subject: [PATCH 02/21] libofx: 0.10.2 -> 0.10.3 --- pkgs/development/libraries/libofx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 2cd480ee0103..97653d6f8e4e 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-V9FyOVH9CB6UtTxDvXRyX6mWaXq2Y2K3t9lotjigK0M="; + sha256 = "sha256-2ZSbXdlpX5MDV9y1d9ZqNSh/834MUeCZJHjJcg7ap0A="; }; preConfigure = "./autogen.sh"; From 5f42a6d626ad5d96c05e8775a6d46198648d93eb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 6 Nov 2021 16:08:53 +0100 Subject: [PATCH 03/21] pulumi-bin: 3.16.0 -> 3.17.0 --- pkgs/tools/admin/pulumi/data.nix | 390 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 2 +- 2 files changed, 196 insertions(+), 196 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 0b1d674a6460..bc702e870c00 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.16.0"; + version = "3.17.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.16.0-linux-x64.tar.gz"; - sha256 = "0c9glgkwsbdj7iii0ng8znjfhlz51ph53y3ilnn3380368c4hxbg"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.0-linux-x64.tar.gz"; + sha256 = "1n9zrqjvm6x6qgwd8hbbl9ywn13niw026a37nlsg5kza2xp8x3al"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-amd64.tar.gz"; - sha256 = "0wzbwpnnjm8lnph6kh2nrb0ns2v4y70sp10pp9qnwhcxggqjpb5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-linux-amd64.tar.gz"; + sha256 = "19rmwbizkhpxlwayd32hfk2dvz9mddkbg956ryckhfgfis6s3scr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-linux-amd64.tar.gz"; @@ -21,28 +21,36 @@ sha256 = "1lmy0dmpspzflc9z8p4w1cz47lbqnbkq8dng3v40lpbs75pnprvs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-linux-amd64.tar.gz"; - sha256 = "0jxcwn3zwqwg29ib5wylmkg8bpzd0vm86yxylh6b2nwfnbnn5d9v"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.25.0-linux-amd64.tar.gz"; - sha256 = "1gdwbpls41svnmcgk042p5sp70pbncx8ryilgcxkky091fqxsbfh"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.24.0-linux-amd64.tar.gz"; - sha256 = "0l1gb324svdxn4i21xfxhmyf1kj25lvg51r53fmmlws12crxd0x5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-linux-amd64.tar.gz"; + sha256 = "1rzwgfz2ikbcjp99yiiai2cqawk80xhwrc7335fylifrvl3wsqis"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-amd64.tar.gz"; sha256 = "0jmbfy6y0l7zpzwndz6xj6jv20ax9rbg8nbqwcadjf96a3zglwhf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.25.0-linux-amd64.tar.gz"; - sha256 = "0mv7n1cd4bn5kws2ddzyisdyy1sm1lhhp5xymnzcgn4fj7q379l9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-amd64.tar.gz"; + sha256 = "1p21963qr8rdl5jp7f05j02yq0ab3flybvzjn7xadcl7m85mkyxh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; - sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz"; + sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.26.0-linux-amd64.tar.gz"; + sha256 = "0gwfw9gr8lrg27ivkw4xx18jjf3zik8cg6gq62nq2y0bclzb3hn6"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; + sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0wzbwpnnjm8lnph6kh2nrb0ns2v4y70sp10pp9qnwhcxggqjpb5r"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-linux-amd64.tar.gz"; + sha256 = "0jxcwn3zwqwg29ib5wylmkg8bpzd0vm86yxylh6b2nwfnbnn5d9v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.4.0-linux-amd64.tar.gz"; @@ -52,34 +60,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.5.0-linux-amd64.tar.gz"; sha256 = "194kym832zfnf58z44y5n789xsvqp2dr3jy5sffqqhfrgcgabvr2"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.0.0-linux-amd64.tar.gz"; - sha256 = "0bp7ki3slszmy1vh4a5d4y4fhbvafrazj1cjf081xv91gi99xxz6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; - sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-amd64.tar.gz"; - sha256 = "0dc96mvy76i0d70jp8gln14cwzsgdxccyhrxrcf3kq38j4vf3bl1"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.3-linux-amd64.tar.gz"; - sha256 = "0vigkbsiydfhiiv1rjy7ba9p7h5gbbyryrq3qmxr3bsbgv6aqixz"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-linux-amd64.tar.gz"; - sha256 = "0cb2b4rrz7zvdpnf0iff21y4kass7gqfimj854fh6za012j18fnx"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; - sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-amd64.tar.gz"; - sha256 = "1h5159y7xlslnijs8lpi4vqgvj2px6whxk9m17p9n7wiyqbmd5na"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-linux-amd64.tar.gz"; sha256 = "0mckcwyngxiv46khvchaxdylcgk82b5j5hlfjiky5qg60bic4gnr"; @@ -89,12 +69,32 @@ sha256 = "0ffqah4anhdacmfb8n3hdq17jhqq0qclc0l0cq77hvhvgn39yy4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-amd64.tar.gz"; - sha256 = "1ixmsxawp0qbyjs37c74gcvj2icpbda6znl17yp9bhiyvnrdvxn7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-amd64.tar.gz"; + sha256 = "0dc96mvy76i0d70jp8gln14cwzsgdxccyhrxrcf3kq38j4vf3bl1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-amd64.tar.gz"; - sha256 = "1p21963qr8rdl5jp7f05j02yq0ab3flybvzjn7xadcl7m85mkyxh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; + sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-linux-amd64.tar.gz"; + sha256 = "1rv6l82b1v44fa685dqq7ivsr1y4xaqln0mqd9hyqnajkb2761d5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-linux-amd64.tar.gz"; + sha256 = "0pd1a2xhhhxyb2sblq474hrwrm18k2dh4c20r3b2xqz77l25nzig"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-amd64.tar.gz"; + sha256 = "04gaimdzh04v7f11xw1b7p95rbb142kbnix1zqas68wd6vpw9kyp"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-amd64.tar.gz"; + sha256 = "0d88xfi7zzmpyrnvakwxsyavdx6d5hmfrcf4jhmd53mni0m0551l"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-linux-amd64.tar.gz"; + sha256 = "0cb2b4rrz7zvdpnf0iff21y4kass7gqfimj854fh6za012j18fnx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-amd64.tar.gz"; @@ -103,12 +103,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.16.0-darwin-x64.tar.gz"; - sha256 = "1b8670hk7xc4wfkgwy2jy7ii4vsa3rz8g4w74pxzh09if7lxpvsd"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.0-darwin-x64.tar.gz"; + sha256 = "1a1bafpwgzv6s80rd4zf9nvchm4jn22wan9z81plxk4d67yfnf7w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "0p3zkgr557ngl6pjdidrp76b741nkdsw4s7wf1aj4mpw74fshm3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-darwin-amd64.tar.gz"; + sha256 = "148wdcdmip8rlh61clhcg44rk1kmvc15dkga1nhp8ngzry1f7lf2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-darwin-amd64.tar.gz"; @@ -119,28 +119,36 @@ sha256 = "1j7z5dbqzsdq1q8ks9g5pwzyc3ml6avhhp6xj94dzdhskl6pd8w5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1z38yhmbmna3d397kdgribqffgagw28xf6ffhksp428dcn979yh5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.25.0-darwin-amd64.tar.gz"; - sha256 = "1h4hyhjbbcn5643nimdznc8caim71bknfib9skkgjykfvbfsbprq"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.24.0-darwin-amd64.tar.gz"; - sha256 = "0lbf59aky33n3w3mwp4f1x6wali5q13q1ygx8qr1k72nzbp4nv3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-darwin-amd64.tar.gz"; + sha256 = "03ccnifs1maxnr7qnqw1mn3lc7x2c06icbc9m9j218bx16lwf8jq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-amd64.tar.gz"; sha256 = "0vd527sx49shr3mpbm5bs4sspmm6vsjli6zlbl5w61y85jp2as1m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.25.0-darwin-amd64.tar.gz"; - sha256 = "0zm073ga7xaq04dffj2mh4a0fpabxi6hmjvd6kj4ly9wr7kcphw0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "1idvdcmbbia0cwkw5v7zp7695p1a6sfmrgsfmzn0r9p8lyg66k8w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.26.0-darwin-amd64.tar.gz"; + sha256 = "1pvicixr245cvziw1inhnzkqkzcm95zyjh6mc5gq6cdwwpagdik0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; + sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "0p3zkgr557ngl6pjdidrp76b741nkdsw4s7wf1aj4mpw74fshm3g"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1z38yhmbmna3d397kdgribqffgagw28xf6ffhksp428dcn979yh5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.4.0-darwin-amd64.tar.gz"; @@ -150,34 +158,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.5.0-darwin-amd64.tar.gz"; sha256 = "1gf83dv5wqvmx8ll7my3c8biklrddjrv069g97d3n510m0k7w85w"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "1i73sxh6vf6adg6as1q1mab3fcjm7ma7gixj2b0y0d2a5d78lhpa"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "1lfai2xd9538cq89b4jg85hj0slnvbwndd24y2g2q9h5qla08cx2"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.3-darwin-amd64.tar.gz"; - sha256 = "07vpzp23frgaqarrkx1i6bnzmx3g9fgw5hjnxpf80ckhjpr93pc5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-darwin-amd64.tar.gz"; - sha256 = "1n82xwkngql039m3pa1pwa8wvqg089mr8xnai67jyj1kryjsij56"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; - sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-amd64.tar.gz"; - sha256 = "0r2ykjwam5m2mfiibhq993s8n5pzmks837cwb57jwgwx8lc3ra4x"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-darwin-amd64.tar.gz"; sha256 = "04hhvakbrvjqzlhhacpb4syy6bz8qgkhqfl8339wjapsczy776j5"; @@ -187,12 +167,32 @@ sha256 = "0j8ysk4wh78xhk3nv6c1dvvyw5ihs7amwlyqicch52yc6jq3v5a6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-amd64.tar.gz"; - sha256 = "1dy4n03xvirg6fihiid786d88qlkyqkvk4fq6ggnxc92620x7342"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-amd64.tar.gz"; + sha256 = "1lfai2xd9538cq89b4jg85hj0slnvbwndd24y2g2q9h5qla08cx2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1idvdcmbbia0cwkw5v7zp7695p1a6sfmrgsfmzn0r9p8lyg66k8w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; + sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "04l07fqzf3fs7hj4giggzyjv9979qcpxrqbiapdjp7x4qsbsz0fv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-darwin-amd64.tar.gz"; + sha256 = "1f06x2h4i15vjzjyzcl5f01by2639hsfij2daayj5xiji3b415ps"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "18vrp0zzi92x4l5nkjszvd0zr7pk6nl6s3h5a3hvsz5qrj2830q3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "12mkr0xczdnp21k0k7qn4r3swkaq3pr6v2z853p1db7ksz5kds23"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-darwin-amd64.tar.gz"; + sha256 = "1n82xwkngql039m3pa1pwa8wvqg089mr8xnai67jyj1kryjsij56"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-amd64.tar.gz"; @@ -201,12 +201,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.16.0-linux-arm64.tar.gz"; - sha256 = "0jkjgp4qjlvgm39axpj8ahkwb6nlgax52x72xnmi3a69z84vgyp1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.0-linux-arm64.tar.gz"; + sha256 = "1nnbm4djs23plycgsvgmi61779qriypzpv26psvi1153ad2qvg4b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-arm64.tar.gz"; - sha256 = "1hiqcy51ag4y8j47di5h07mnplrhpc5f406ab6car2c06fwr2wdn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-linux-arm64.tar.gz"; + sha256 = "10p015rhp9dsxcwp0a0k3xvkphya8vji4ndv66z73jzr6z3vfqzm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-linux-arm64.tar.gz"; @@ -217,28 +217,36 @@ sha256 = "0mddv37k87wiygh6x9bnxpcr721qbmbqf6l5zk3xl61n56j8qyb1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-linux-arm64.tar.gz"; - sha256 = "11yslyxhsqchqyd31b10krgxgf2shi5pxncw79zj26w31qcqdv3x"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.25.0-linux-arm64.tar.gz"; - sha256 = "0l0ipkqp7920jrba43a3mh5z83p6nbglzyl5zaig7jdms97qchi5"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.24.0-linux-arm64.tar.gz"; - sha256 = "0yhnmxpjfirp187zw4xnhh23b186iv61xjidvlkrnjcmrv2ldpqv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-linux-arm64.tar.gz"; + sha256 = "1v5b5bwpzmr124xblrrr0rl0zbvky8ljcilyh0fmjgrmai25zbz2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-linux-arm64.tar.gz"; sha256 = "0ybw5cbiw64zmaqjwlfk5b73h5sy0pk40f15hq41d9rdkc0sypxi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.25.0-linux-arm64.tar.gz"; - sha256 = "0qsvhinsnm8n1w984yvdvwd7gw2fcm7jgh8q30ljb0ikh4d5p98b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-arm64.tar.gz"; + sha256 = "0k4yi9xqrmd5m99lr27h672ycwyh138d9jhh3wvgpmnjpdxy28jm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; - sha256 = "1slrl020xl092hjfr92zjf8i2ys8vzr3nxqh65fhnl0fzfsllvn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz"; + sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.26.0-linux-arm64.tar.gz"; + sha256 = "01mmfsfbggvhq8706irg1pv9n89lrxr9dp05m3fa8wdbfdxiwwvd"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; + sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-linux-arm64.tar.gz"; + sha256 = "1hiqcy51ag4y8j47di5h07mnplrhpc5f406ab6car2c06fwr2wdn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-linux-arm64.tar.gz"; + sha256 = "11yslyxhsqchqyd31b10krgxgf2shi5pxncw79zj26w31qcqdv3x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.4.0-linux-arm64.tar.gz"; @@ -248,31 +256,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.5.0-linux-arm64.tar.gz"; sha256 = "0ap4izb3507rw965qvww1nd2h9jz7ilav92fjdhhvf33g44r6r8y"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.0.0-linux-arm64.tar.gz"; - sha256 = "0mwpbvv62k8fg07447wwfigs4li4n78fswpzwi4alsjrkqlmw9dj"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz"; - sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-arm64.tar.gz"; - sha256 = "0hq4l91ynjk5qzqcwvzqpd978wikqdx6lxngrawdkk501y0yh6f6"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.3-linux-arm64.tar.gz"; - sha256 = "1is34y7npwyl11fxksd68f3gc28f1pxm6ml9qkihvpvmihylan3i"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-linux-arm64.tar.gz"; - sha256 = "0kxi3fm2463bq6n0bnf0sbf4zjhg0c86bxw52dlmc8kp2zqc6lr3"; - } - # pulumi-resource-packet skipped (does not exist on remote) - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-linux-arm64.tar.gz"; - sha256 = "1sc8rf930cz6nkyhqn6p0h7450iqzdsrlw2smhp8yyjjvcjmsksf"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-linux-arm64.tar.gz"; sha256 = "1hxaz0m33vf92d1vwksmib5lnpl57yrh8nf90nqmmzvjzajkzzbl"; @@ -282,12 +265,29 @@ sha256 = "1lh1g90ab4blqmvx0yfp516hfsd6n1y751ab7fzhv7hcajf3klvi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-linux-arm64.tar.gz"; - sha256 = "12iv8vjnal2ym70rxmdnvi02x6md7fxi8jbzhzfw526pzqs1dc47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-linux-arm64.tar.gz"; + sha256 = "0hq4l91ynjk5qzqcwvzqpd978wikqdx6lxngrawdkk501y0yh6f6"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-linux-arm64.tar.gz"; + sha256 = "175bqcamkd2illd57gkycsfh5kyjw700g7phjsg057jij3cdfsr8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-linux-arm64.tar.gz"; - sha256 = "0k4yi9xqrmd5m99lr27h672ycwyh138d9jhh3wvgpmnjpdxy28jm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-linux-arm64.tar.gz"; + sha256 = "0vjdl01ggnf3hj0ak3dak5828d8cj8x05ny9hsii2cqdphxybsj4"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-linux-arm64.tar.gz"; + sha256 = "1slrl020xl092hjfr92zjf8i2ys8vzr3nxqh65fhnl0fzfsllvn0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-linux-arm64.tar.gz"; + sha256 = "1l7zpvacq6kyzj8n82drs9gdfa16k4j945w8nsd0z33byrswxr3w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-linux-arm64.tar.gz"; + sha256 = "0kxi3fm2463bq6n0bnf0sbf4zjhg0c86bxw52dlmc8kp2zqc6lr3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-linux-arm64.tar.gz"; @@ -296,12 +296,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.16.0-darwin-arm64.tar.gz"; - sha256 = "0k7bz1nxigzgggr4qpnhhrmsijyrgs8w7iigqvk5pjd2issvbc3r"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.17.0-darwin-arm64.tar.gz"; + sha256 = "0y5gszzin1p9ck34s6jrg11p34629vvvv4dx0zl4w0j5srmycyjj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-arm64.tar.gz"; - sha256 = "18ggnqx9zh8kl5h6nn2sa4zxvyby9pvscrvqnsam2l9yjv86r7i0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.9.0-darwin-arm64.tar.gz"; + sha256 = "07ldq1anzrznan2a1x1igmgljfh6dx12cypggcyma7axiqj95ww1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.6.0-darwin-arm64.tar.gz"; @@ -312,28 +312,36 @@ sha256 = "0fj1ai1kv8xgmsvfbmy5gsinxag70rx9a9gkifqgcpn3r9mj48ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "1nsqxci7dzg433ydk34fkiq7clq00m45rj26rs4whx65y8hdhxrb"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.25.0-darwin-arm64.tar.gz"; - sha256 = "0134jxl4jca6y7wd23kd6hg1cq28qxvdvjl5148iq85i23wafymr"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.24.0-darwin-arm64.tar.gz"; - sha256 = "19hxs3p7xvgw493grs02b7b1lhfqizqs6ha6zrwjx70kpwbxbkcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.26.0-darwin-arm64.tar.gz"; + sha256 = "141mm2wa211gbs1kzqzq9ivjjz1bd93bb6vh9s28rz4z9ciaq44z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.4.0-darwin-arm64.tar.gz"; sha256 = "1iyc67r551bi1h20lfb2qp5b2ds8kf09gklbaz73k90hcrf0g9la"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.25.0-darwin-arm64.tar.gz"; - sha256 = "15vpbkly9cvwajrridhj9mkjx7ba0hm2c9gbgzg07855ncb0kxaj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-arm64.tar.gz"; + sha256 = "0fsmmgq0hvzyrw6vrdf3pppxjcj94fxxp52dl73r4f5wjkays33c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; - sha256 = "10a2f5kdgk3jcd1441zbfcfnrl5zj6ks832jjmbyym33by7scvgc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz"; + sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.26.0-darwin-arm64.tar.gz"; + sha256 = "1nw1w3fj15d2536zy9im8sr4qn84c2cmvcqflf0fmwah8m21w61d"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; + sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.4.0-darwin-arm64.tar.gz"; + sha256 = "18ggnqx9zh8kl5h6nn2sa4zxvyby9pvscrvqnsam2l9yjv86r7i0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.2.0-darwin-arm64.tar.gz"; + sha256 = "1nsqxci7dzg433ydk34fkiq7clq00m45rj26rs4whx65y8hdhxrb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.4.0-darwin-arm64.tar.gz"; @@ -343,31 +351,6 @@ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.5.0-darwin-arm64.tar.gz"; sha256 = "1y0wc1279ka05ng7wq6skmwyrmp1sb2sc64wiqx52napxvzjpv9r"; } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.0.0-darwin-arm64.tar.gz"; - sha256 = "1hzhlxbwji4p8apx4rnqllsgf1k11w49rplz0syzmzb2fxpkif75"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz"; - sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "1w78lqdf4ynfhl5h0bzxmvqnf4s59mflbdlbqhxq78qxwwq4v193"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.8.3-darwin-arm64.tar.gz"; - sha256 = "08jwgvklg2r78ag7cr5pm4ngy6s0wnj6z4ari50bpszzh69m9qiy"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-darwin-arm64.tar.gz"; - sha256 = "0h9lj565slf1gvzkk8vlk285jgssi62kmayim8473fgbgp3yj6jr"; - } - # pulumi-resource-packet skipped (does not exist on remote) - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.2.0-darwin-arm64.tar.gz"; - sha256 = "1c3pchbnk6dsnxsl02ypq7s4mmkxdgxszdhql1klpx5js7i1lv8k"; - } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.3.0-darwin-arm64.tar.gz"; sha256 = "09vllijaql7141h0dw3p5ikvv4kp0mzfl5f0n7gd9d4pwl3q3yzv"; @@ -377,12 +360,29 @@ sha256 = "1z0gd0fagv55dl3ki340h0ljw7dqj8818w4072pc5xxy5id90gb0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.3.1-darwin-arm64.tar.gz"; - sha256 = "0jrihnwfh5wvc95nipqv7ak77kq9xj0pk5hlapv9w2ls5pwykv0r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.8.0-darwin-arm64.tar.gz"; + sha256 = "1w78lqdf4ynfhl5h0bzxmvqnf4s59mflbdlbqhxq78qxwwq4v193"; + } + # pulumi-resource-packet skipped (does not exist on remote) + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "0wzi2mb6jqmzyww2pbdx7cysi0xn4hp74g5n0jyz3mw68s5fm7vf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.0.0-darwin-arm64.tar.gz"; - sha256 = "0fsmmgq0hvzyrw6vrdf3pppxjcj94fxxp52dl73r4f5wjkays33c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.26.0-darwin-arm64.tar.gz"; + sha256 = "1lm26pinz7bjzv7bk22xq2qhyv5a4v7x7kwbl98sdv0gl1alj44f"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.0.0-darwin-arm64.tar.gz"; + sha256 = "10a2f5kdgk3jcd1441zbfcfnrl5zj6ks832jjmbyym33by7scvgc"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.2.0-darwin-arm64.tar.gz"; + sha256 = "1rmvc2kgjmb978sfmlga6xy4i0f629lk1l95i30wg0rmj1hx3dag"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.5.1-darwin-arm64.tar.gz"; + sha256 = "0h9lj565slf1gvzkk8vlk285jgssi62kmayim8473fgbgp3yj6jr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.0.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 0cbd669a6bf0..5b6b56cc772b 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -6,7 +6,7 @@ API_URL="https://api.github.com/repos/pulumi" # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.16.0" +VERSION="3.17.0" # A hashmap containing a plugin's name and it's respective repository inside # Pulumi's Github organization From d5b8ea84f0bef3aa18e128c9f00a334d7baa20af Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 6 Nov 2021 18:04:03 -0400 Subject: [PATCH 04/21] kodi.packages.archive_tool: init at 2.0.3 --- .../kodi-packages/archive_tool/default.nix | 28 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/video/kodi-packages/archive_tool/default.nix diff --git a/pkgs/applications/video/kodi-packages/archive_tool/default.nix b/pkgs/applications/video/kodi-packages/archive_tool/default.nix new file mode 100644 index 000000000000..4788556a8793 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/archive_tool/default.nix @@ -0,0 +1,28 @@ +{ lib, buildKodiAddon, fetchFromGitHub, vfs-libarchive }: +buildKodiAddon rec { + pname = "archive_tool"; + namespace = "script.module.archive_tool"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "script.module.archive_tool"; + rev = version; + sha256 = "0hbkyk59xxfjv6vzfjplahmqxi5564qjlwyq6k8ijy6jjcwnd3p7"; + }; + + propagatedBuildInputs = [ + vfs-libarchive + ]; + + passthru = { + pythonPath = "lib"; + }; + + meta = with lib; { + homepage = "https://github.com/zach-morris/script.module.archive_tool"; + description = "A set of common python functions to work with the Kodi archive virtual file system (vfs) binary addons"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index e7c848ab5560..3eea231664ff 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -112,6 +112,8 @@ let self = rec { # addon packages (dependencies) + archive_tool = callPackage ../applications/video/kodi-packages/archive_tool { }; + certifi = callPackage ../applications/video/kodi-packages/certifi { }; chardet = callPackage ../applications/video/kodi-packages/chardet { }; From d8727c36bc6dd2abc170aed11a5e863a45f0e198 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 6 Nov 2021 18:05:33 -0400 Subject: [PATCH 05/21] kodi.packages.iagl: init at 1101521-2 --- .../video/kodi-packages/iagl/default.nix | 30 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/video/kodi-packages/iagl/default.nix diff --git a/pkgs/applications/video/kodi-packages/iagl/default.nix b/pkgs/applications/video/kodi-packages/iagl/default.nix new file mode 100644 index 000000000000..8ca0abdf960b --- /dev/null +++ b/pkgs/applications/video/kodi-packages/iagl/default.nix @@ -0,0 +1,30 @@ +{ lib, buildKodiAddon, fetchFromGitHub, fetchzip, dateutil, requests, routing, vfs-libarchive, archive_tool, youtube }: + +buildKodiAddon rec { + pname = "iagl"; + namespace = "plugin.program.iagl"; + version = "1101521-2"; + + src = fetchFromGitHub { + owner = "zach-morris"; + repo = "plugin.program.iagl"; + rev = "30e82eec1a909b31767f0e298cf77fc970b256d3"; + sha256 = "11y05i5f7lzik23w2kr52jdgr8db3gin8i683sy1hzxlmplk4699"; + }; + + propagatedBuildInputs = [ + dateutil + requests + routing + vfs-libarchive + archive_tool + youtube + ]; + + meta = with lib; { + homepage = "https://github.com/zach-morris/plugin.program.iagl"; + description = "Launch Games from the Internet using Kodi"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 3eea231664ff..a7a24a2edb78 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -72,6 +72,8 @@ let self = rec { snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; }; }; + iagl = callPackage ../applications/video/kodi-packages/iagl { }; + libretro = callPackage ../applications/video/kodi-packages/libretro { }; libretro-genplus = callPackage ../applications/video/kodi-packages/libretro-genplus { inherit genesis-plus-gx; }; From 9d8e24e85485e263440c3a84a0f639d3425d7668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sun, 7 Nov 2021 00:18:07 +0100 Subject: [PATCH 06/21] samba4: Fix all libraries This also fixes versioned so files that don't match *.so --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 8248becd3e42..6b49c0127fe4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -159,7 +159,7 @@ stdenv.mkDerivation rec { # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; # Looks like a bug in installer scripts. postFixup = '' - export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)" + export SAMBA_LIBS="$(find $out -type f -regex '.*\.so\(\..*\)?' -exec dirname {} \; | sort | uniq)" read -r -d "" SCRIPT << EOF || true [ -z "\$SAMBA_LIBS" ] && exit 1; BIN='{}'; @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?; patchelf --shrink-rpath "\$BIN"; EOF - find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \; + find $out -type f -regex '.*\.so\(\..*\)?' -exec $SHELL -c "$SCRIPT" \; # Samba does its own shebang patching, but uses build Python find "$out/bin" -type f -executable -exec \ From 50b75596accbb4a353003fd6549de3ca800fbb6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:04:30 +0100 Subject: [PATCH 07/21] python3Packages.async-upnp-client: 0.22.10 -> 0.22.12 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 709a1c624593..3b7634b181e4 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.22.10"; + version = "0.22.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-aWxZP/QsjA6kcSWW6vHpEcX2drV+gTvDQItl7IT7wxY="; + sha256 = "sha256-fp7I0G6gljkTZ2slQJ8R9AJ9VKQOQi2cLiZ63seUajs="; }; propagatedBuildInputs = [ From 0c3a756ffa6ffd1ffbac92fdf562adb767d88214 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:08:01 +0100 Subject: [PATCH 08/21] python3Packages.systembridge: 2.2.1 -> 2.2.3 --- pkgs/development/python-modules/systembridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 58072dd5d764..34403930602c 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-TYRsk47cVlXQ7RWyEGxXmxdHVES6WNbzdW8ZJSkVtb8="; + sha256 = "sha256-AVMZBhf15eZM9oMUFyiHYs866P1v5z1pbTvX2Qpjzfc="; }; propagatedBuildInputs = [ From 69db2b90f8ec9af6ae03ecb4dbf1ac664a419f6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:36:30 +0100 Subject: [PATCH 09/21] python3Packages.aiomusiccast: 0.12.0 -> 0.13.1 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index e90e9ea11fd9..66f83bab8f2e 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.12.0"; + version = "0.13.1"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-LZaRxpjTNkrf8JAWTQLp5LcWOf+epXOnvidJl2tEEE4="; + sha256 = "sha256-y1rt2/nCi2xcNPMEqFGDv4ylWRXv2vfnA3++Qc2aWew="; }; nativeBuildInputs = [ From 98b65cc0a037f22b75c1b5b87592c8804d91104b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:41:12 +0100 Subject: [PATCH 10/21] python3Packages.asyncio-mqtt: 0.10.0 -> 0.11.0 --- .../python-modules/asyncio_mqtt/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index d8a378b082fc..da87124e4424 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -8,17 +8,21 @@ }: buildPythonPackage rec { - pname = "asyncio_mqtt"; - version = "0.10.0"; + pname = "asyncio-mqtt"; + version = "0.11.0"; + format = "setuptools"; src = fetchPypi { - inherit pname version; - sha256 = "0s94dvgh1fazycppki5m6f9d60hc4ykhqfznlzpwl4dzknxplpsz"; + pname = "asyncio_mqtt"; + inherit version; + sha256 = "sha256-uJown3bNA+pLJlorJcCjpMMFosX94gt/2tLAjIkuXLA="; }; propagatedBuildInputs = [ paho-mqtt - ] ++ lib.optional (pythonOlder "3.7") async_generator; + ] ++ lib.optional (pythonOlder "3.7") [ + async_generator + ]; doCheck = false; # no tests From c10a07551721f713392d777c27ac802c99e697bd Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 8 Nov 2021 17:44:04 -0800 Subject: [PATCH 11/21] clinfo: enable on darwin --- pkgs/tools/system/clinfo/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 9c5b54f554bd..a9e7c0c81def 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocl-icd, opencl-headers }: +{ lib, stdenv, fetchFromGitHub, ocl-icd, opencl-headers, OpenCL }: stdenv.mkDerivation rec { pname = "clinfo"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek="; }; - buildInputs = [ ocl-icd opencl-headers ]; - - NIX_CFLAGS_COMPILE = [ - "-Wno-error=stringop-overflow" - "-Wno-error=stringop-truncation" + buildInputs = lib.optionals (!stdenv.isDarwin) [ + ocl-icd + opencl-headers + ] ++ lib.optionals stdenv.isDarwin [ + OpenCL ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Print all known information about all available OpenCL platforms and devices in the system"; homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; - maintainers = with maintainers; [ athas ]; - platforms = platforms.linux; + maintainers = with maintainers; [ athas r-burns ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92672fef81a4..fb255be8b71f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31915,7 +31915,9 @@ with pkgs; click = callPackage ../applications/networking/cluster/click { }; - clinfo = callPackage ../tools/system/clinfo { }; + clinfo = callPackage ../tools/system/clinfo { + inherit (darwin.apple_sdk.frameworks) OpenCL; + }; clpeak = callPackage ../tools/misc/clpeak { }; From 63494114082a3b910768007d7d2e8bad30b33fe6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:31:08 +0100 Subject: [PATCH 12/21] python3Packages.pyvicare: 2.13.1 -> 2.14.0 --- pkgs/development/python-modules/pyvicare/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index b9eb4da6f469..a47a46c338a3 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.13.1"; + version = "2.14.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-L43aickagJolw+VTRX4ZwRcfOm9fMBZOimPx8jLPHhE="; + sha256 = "sha256-+Rjs5PwsjcE8vsCS9gHmEj2Hy2OSH/YxNjYgjrBXHPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -38,7 +40,9 @@ buildPythonPackage rec { --replace "'setuptools-git-versioning'" " " ''; - pythonImportsCheck = [ "PyViCare" ]; + pythonImportsCheck = [ + "PyViCare" + ]; meta = with lib; { description = "Python Library to access Viessmann ViCare API"; From 8539149c7ccc29d5a655ee555a9af0336c9ce74b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:23:15 +0100 Subject: [PATCH 13/21] python3Packages.pyswitchbot: 0.12.0 -> 0.13.0 --- .../python-modules/pyswitchbot/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 1f21d09d9504..a51f15f5eeb7 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -6,20 +6,26 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.12.0"; + version = "0.13.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "sha256-8u5KeWVaCOksag2CYE7GBl36crB4k9YdLZ5aHD9hlwU="; + sha256 = "sha256-dx3OMzWJohOYCg7TnrqL4FLZoC+Q1dyJyUAdreDyfl0="; }; - propagatedBuildInputs = [ bluepy ]; + propagatedBuildInputs = [ + bluepy + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "switchbot" ]; + + pythonImportsCheck = [ + "switchbot" + ]; meta = with lib; { description = "Python library to control Switchbot IoT devices"; From 8ce56fa0c9f3f1d8802a2dfbc8ba9d5c25070ccb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:11:06 +0100 Subject: [PATCH 14/21] python3Packages.mypy-boto3-s3: 1.19.12 -> 1.20.0 --- 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 496a94e776e9..d38c4a557876 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.19.12"; + version = "1.20.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xgcGbWcrdFwFPQLJHmgRdY2XbwAiInZxmw6RiFVJ5F4="; + sha256 = "sha256-lCl3euh9o1MLQV1+DZiAh0h26CHauzjNNJPvtaRtHl8="; }; propagatedBuildInputs = [ From cda29d527796f15d5ac36a0157ef7d4020280ab3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:12:51 +0100 Subject: [PATCH 15/21] python3Packages.env-canada: 0.5.15 -> 0.5.16 --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 7b5f135305b6..23dbf63df691 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.15"; + version = "0.5.16"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "1mgh4sbibgwzrgnlfz4ia2djlyniq7b6f9bd9f2yd1wkai32dm2a"; + sha256 = "sha256-5Cxpl5iwbBtpwQ9//yhEZNCIzBZgTm/fqAo9PNNxoG4="; }; propagatedBuildInputs = [ From 9f43d5d31359a99ab3fcf316e5151243abb18b51 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:27:30 +0100 Subject: [PATCH 16/21] python3Packages.pytradfri: 7.1.1 -> 7.2.0 --- pkgs/development/python-modules/pytradfri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 36ffb02623a3..88e3e448ade9 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "7.1.1"; + version = "7.2.0"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - sha256 = "sha256-rLpqCpvHTXv6SyT3SOv6oUrWnSDhMG5r+BmznlnNKwg="; + sha256 = "sha256-/1K2jBgDuOIUb4WUownoceprZbOwSkQIqeEt07HfZrY="; }; propagatedBuildInputs = [ From d320d0b5ff8ed793589ad5d7355f4aed132a5377 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 00:20:08 +0100 Subject: [PATCH 17/21] python3Packages.pytest-cases: 3.6.4 -> 3.6.5 --- .../python-modules/pytest-cases/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index b8c1ab527220..47f5bbb1fd0b 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.4"; + version = "3.6.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m2oxE7q46TWadhZgpwTAHKep5ZN9LG1VNCRJkPz5W1E="; + sha256 = "sha256-JZfQI6dgYFHWUbCMuHD78eBi9svoV5zkX887V9xFLNw="; }; nativeBuildInputs = [ @@ -32,7 +34,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg --replace "pytest-runner" "" + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" ''; # Tests have dependencies (pytest-harvest, pytest-steps) which @@ -40,7 +43,9 @@ buildPythonPackage rec { # makefun, pytest-*) have circular dependecies. doCheck = false; - pythonImportsCheck = [ "pytest_cases" ]; + pythonImportsCheck = [ + "pytest_cases" + ]; meta = with lib; { description = "Separate test code from test cases in pytest"; From b9012ca748fff76c85a0cbfc5d3585cc8631efbd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 7 Nov 2021 00:22:26 +0100 Subject: [PATCH 18/21] python3Packages.asyncssh: 2.7.2 -> 2.8.0 --- pkgs/development/python-modules/asyncssh/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 8cf73ba5df64..f028fc33310c 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -18,12 +18,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.7.2"; + version = "2.8.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "96b09239c3cc134cfb66ae1138313fdb48cc390806f21f831dd44f8a1d8252a1"; + sha256 = "sha256-VWXLBpShTp1MvJ9zhP58P9ZplVMetPUucq2II+2iG6M="; }; propagatedBuildInputs = [ @@ -62,9 +64,13 @@ buildPythonPackage rec { disabledTests = [ # No PIN set "TestSKAuthCTAP2" + # Requires network access + "test_connect_timeout_exceeded" ]; - pythonImportsCheck = [ "asyncssh" ]; + pythonImportsCheck = [ + "asyncssh" + ]; meta = with lib; { description = "Asynchronous SSHv2 Python client and server library"; From 34a701a87f87a96624365930d27bd56cfc089430 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Nov 2021 23:40:38 +0100 Subject: [PATCH 19/21] python3Packages.aioasuswrt: 1.3.4 -> 1.4.0 --- .../python-modules/aioasuswrt/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix index a6bd79e80ef1..c2a8bded2b6b 100644 --- a/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/pkgs/development/python-modules/aioasuswrt/default.nix @@ -9,22 +9,18 @@ buildPythonPackage rec { pname = "aioasuswrt"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kennedyshead"; repo = pname; - rev = version; - sha256 = "101d76zarvilzfmcy8n3bjqzyars8hsjzr0zc80d4rngv4vhrki1"; + rev = "V${version}"; + sha256 = "1iv9f22v834g8wrjcynjn2azpzk8gsczv71jf7dw8aix0n04h325"; }; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html" "" \ - --replace "--cov-report term-missing" "" - ''; - - propagatedBuildInputs = [ asyncssh ]; + propagatedBuildInputs = [ + asyncssh + ]; checkInputs = [ pytest-asyncio @@ -32,7 +28,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aioasuswrt" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html" "" \ + --replace "--cov-report term-missing" "" + ''; + + pythonImportsCheck = [ + "aioasuswrt" + ]; meta = with lib; { description = "Python module for Asuswrt"; From c3449f13339ce8cb617ac2e61ba7cb848bd87c35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Nov 2021 08:39:31 +0100 Subject: [PATCH 20/21] checkov: 2.0.554 -> 2.0.556 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index f38575880f53..6b14197399d1 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.554"; + version = "2.0.556"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-C1uTIngtuMs7TjjtAezPxtLkH5RhmCMoetbnp25BRbU="; + sha256 = "sha256-hEh7uqIvqkG1X9pxJFoI4dQngJ6nZXIAUR1TmXa2kZE="; }; nativeBuildInputs = with py.pkgs; [ From 8da24573e609f6459012e2be078ccfb047081bfc Mon Sep 17 00:00:00 2001 From: devhell Date: Tue, 9 Nov 2021 08:40:45 +0000 Subject: [PATCH 21/21] zettlr: 2.0.1 -> 2.0.2 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 26b925d51a83..65aca548e4c3 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.0.1"; + version = "2.0.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-vnkZGxuLvj8Pjmey6NO3mcHuWbtO0bYEfgKwvgumbPA="; + sha256 = "sha256-AUGfD7FFB5+pfKyIqvychD4mvFU+GTRneQTRI+8bwBM="; }; appimageContents = appimageTools.extractType2 { inherit name src;