From 9c78f4d8eb8bf6ce43c29948d948ec55cfaaa78a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 11 May 2021 10:54:04 +0000 Subject: [PATCH 01/20] libsForQt5.drumstick: 2.1.1 -> 2.2.0 --- pkgs/development/libraries/drumstick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index e101da352244..d835606b7c86 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp"; + sha256 = "sha256-Ytus/kgL2Bs0vRQGROoJO9eO6lajOSaQLVjwsF4YypY="; }; patches = [ From 1077554f19245c53c408ea8fa9b4215386225fa8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 24 May 2021 00:15:21 +0200 Subject: [PATCH 02/20] rw: mark no longer broken on darwin --- pkgs/tools/misc/rw/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index 408723f058dc..5299d2491465 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -22,7 +22,5 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; - - broken = stdenv.hostPlatform.isDarwin; }; } From 502fda429d98395cc72d88275860d12a1dffd05c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 24 May 2021 00:18:37 +0200 Subject: [PATCH 03/20] debianutils: mark no longer broken on darwin --- pkgs/tools/misc/debianutils/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index d9fc2a407124..8ea8855a100e 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus publicDomain smail ]; maintainers = []; platforms = platforms.all; - broken = stdenv.isDarwin; }; } From 7f5c4bea9443e9bf1d93ff26f2ff7dac4f2da714 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 23 May 2021 19:01:22 -0700 Subject: [PATCH 04/20] pulumi-bin: 3.1.0 -> 3.3.0 --- pkgs/tools/admin/pulumi/data.nix | 138 ++++++++++++++++-------------- pkgs/tools/admin/pulumi/update.sh | 33 +++---- 2 files changed, 90 insertions(+), 81 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 3e7d11f4827e..7642acb25eba 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,48 +1,52 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.1.0"; + version = "3.3.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-linux-x64.tar.gz"; - sha256 = "103r0rih8qzpswij3bxls9gsb832n4ykwrzbki9b21w2ymj7k3x1"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-linux-x64.tar.gz"; + sha256 = "0kcq7zwgbp465lx7p80l5xc50xdmydq32djzis0973hxlkgliiq6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-linux-amd64.tar.gz"; - sha256 = "1f6r59qk48x73nm17swcs3cp3qw616m7p36bvgsc1s96h23k805w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-linux-amd64.tar.gz"; + sha256 = "0vws9mll2k42qx04idyf13vai018552wyrvr1jxjf4fl93yrayz7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-linux-amd64.tar.gz"; - sha256 = "12rnb18p7z709gvw50hvmx9v7f2wd3pwcncwz4g3ragd7f6a4kja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-linux-amd64.tar.gz"; + sha256 = "0mz9zxlx4vc26g0khvdlg5kzc74shdc4lca8h1l9sxqwgkmyga7q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-linux-amd64.tar.gz"; sha256 = "0xs7i9l871x5kr22jg7jjw0rgyvs4j4hazr4n9375xgzc8ysrk09"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-linux-amd64.tar.gz"; - sha256 = "08588m5s6j1xhig4jprlkjgxk1sif4h3f6as7ixnvssin2vhhhl9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0bfs64za4i5bmk3r8qyhgh0x58cdrn88gv0i3vm4prry53zgy3ny"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-linux-amd64.tar.gz"; - sha256 = "01dqah12p23658awcp0sx5h696rdyjl79vd9dm5075jdaix1f648"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-linux-amd64.tar.gz"; + sha256 = "0s1z33iqf0nvrgpq6rqnm79sr8bnnkfspq8qnfynybcn80drn7vd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-linux-amd64.tar.gz"; - sha256 = "0m8q1cswdml0hsc4vkq38pm2izs3lig57fg4a8ghqqi3ykni344d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-linux-amd64.tar.gz"; + sha256 = "0gk60n5s9hjfsaz09aknivqpz1cw41vs6j84fdb3chkip8xzwdr7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-linux-amd64.tar.gz"; sha256 = "06j5k599i8giy5v6scggw8zx1pyfm6w20biwcizv81zk0zkg3fzp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-linux-amd64.tar.gz"; - sha256 = "1bzy4zf473w49fz2n9lg5ncgblq2a5jh70nf6cfwc7kcla407in0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0yhdcjscdkvvai95z2v6xabvvsfvaqi38ngpqrb73ahlwqhz3nys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-linux-amd64.tar.gz"; - sha256 = "0d17ccf84jj6a9hpdrnsziyw790i0y5zk18qgqh4qq79irwz6df2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-linux-amd64.tar.gz"; + sha256 = "1rsqkp76sck0162hz3s5yljs79gis886k1v99k77hr1gbk08rx71"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-linux-amd64.tar.gz"; + sha256 = "0g5x5wycgbn0iwp9y4fp0aqf36pfa3210n1rmiavx1a2g2zj9zvx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-linux-amd64.tar.gz"; @@ -53,86 +57,90 @@ sha256 = "0lqnb1xrb5ma8ssvn63lh92ihja6zx4nrx40pici1ggaln4sphn0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-linux-amd64.tar.gz"; - sha256 = "0s7an3qvczhajs54i0ir3jjmwxpv9w94viqrik506k198j0qnl3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-linux-amd64.tar.gz"; + sha256 = "010j0xmrb5msva2mcmrpr0h8dhpk7x6bswbsbkkdjrf88baryyq0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-linux-amd64.tar.gz"; - sha256 = "0ljxjv8rm4li61vgjbpmxw8w6d2pym5li3w61dqi3kka4ix25aww"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0q1bi1a80jwgx52m9hy0vp67hdv3nbhd0gqxj3jaf5w4dnh48dca"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1mxkwcricqnnbj0dp3wqidci6rgfn7daxkjprcnrndhgcdghq7sv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0g392a6zyycdijjn0nswf2x5h31x1hcffgwwkmbjr304n2ycbb50"; } { 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-openstack-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1535c95ncgdifyz5m29gagpcr7lhhddlffmj9lmwch55w2xlk86k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-linux-amd64.tar.gz"; + sha256 = "1np74bfvp4hr70izb8sarxvga3nnvyi9j7y6f0lqqgrfk2ixn48r"; } { 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-postgresql-v3.0.0-linux-amd64.tar.gz"; - sha256 = "13j13kp0sbwp65l73mdcqiv4cszslxin567ccdkk2rw8vs1ni7x0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-linux-amd64.tar.gz"; + sha256 = "16z2jcixwqasj0rdj83gvsjb51xw5k6kj474sfdx8n0150hplma9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-linux-amd64.tar.gz"; - sha256 = "0pah7s9wwaj8zp371blmj4c1bgyhh0dgsfr9axj0k4lhpqlyikmj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-linux-amd64.tar.gz"; + sha256 = "1lc1i4irkrlv1cxy6xzl1fw8205rvhrdp2if09w4givq351lrmbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-linux-amd64.tar.gz"; - sha256 = "0bk26k1igqljjpwkkvri6dp14cfw9l9a2dvg2as3v5930w4jxql8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-linux-amd64.tar.gz"; + sha256 = "0npszs37q6j1x5h2sp9j1c6qnhr03lxp2r2ci0d4z3x7vyk06rja"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-linux-amd64.tar.gz"; - sha256 = "1lxb03z80r8a2vfckyw5yf036ii30gdi3rch4sriksfv30il9kbc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0xvkkqgfgmw3f2nbmfvn1kwc9088awaw52kx1kxnp217g5r3c0fx"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.1.0-darwin-x64.tar.gz"; - sha256 = "1lfqm4s72bwrycspr9nbgfvf5i6p50x8lk81pcs6zbzz6iff4x7z"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.3.0-darwin-x64.tar.gz"; + sha256 = "1znjqjwasnw9wjdkrwss9shxvizsn5pav1a8rd8c1c6kcgpi01r7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "0nycqlz3lkwirr8rs4sqdqbzn2igv51hjyfjjsgnhx85kjzlkas6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.1.0-darwin-amd64.tar.gz"; + sha256 = "11cpidiasmsy6d29ycpzwkn0vfac9cd1ng410ljhjw8bmmrgfg6f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1kim1lk9dycsanc2vcsr4fgfhk90zyjf24vvwmmkk70nq1lnwqp3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.5.1-darwin-amd64.tar.gz"; + sha256 = "195wrwyw25kaixv277ww38mbw19rq6f56m40f3p0rgicjn2dsgyh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v3.0.0-darwin-amd64.tar.gz"; sha256 = "0kvr057hdwcxf7gj788sv6ysz25ap3z0akqhhb20mlzv3shwiiji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "14d530fbzmq5m3njl31qkgwwfyipad9iqjhv3cd8pcl87blaxxki"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0q4lb32j1bm34sag39w9s6415fni169800k1qyym193s13c4gk89"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0q29dyrnramr2bl89503gnbm4zq2x3bn7kaiwbhg6r17xa6rkji4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "167hg0j3rzxv9bsadhzgv5sz2jhqxdfn0sx35ws8v8b1rblmxywc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "0v8iha0n1kqvaxrjll2mv9znc9lzqj7mqxgxig2g89qqjs6p69ql"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.2.0-darwin-amd64.tar.gz"; + sha256 = "12r9k2ywxi8myvd80gmk1hvhgjmr5js6i5n6jghsyh083kh5wam7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.0.0-darwin-amd64.tar.gz"; sha256 = "0ffic6mqr1zyskrv60q9wg7jc0hq23l5g0pdh3clpnn2m1xnxnxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.0.0-darwin-amd64.tar.gz"; - sha256 = "1793qry84bch32zbc70c777y04qgys6n0vxsxzxqgz2j4r9vmi6a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "1dpsbq3b0fz86355jy7rz4kcsa1lnw4azn25vzlis89ay1ncbblc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1lzjjk2da1xla012xrs9jfcdsbpmkh48n6lypmbr2ixh13pdwk1b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v5.4.0-darwin-amd64.tar.gz"; + sha256 = "121yaplx4nnq9is30iczbqibj1069jh9bqzgbriscd07kifyrpbw"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.0.2-darwin-amd64.tar.gz"; + sha256 = "06nkd2pd4hwahbyh8ygn54xq5hdpbphfkkfhrg4jwgmfgacnz5x9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.0.0-darwin-amd64.tar.gz"; @@ -143,44 +151,44 @@ sha256 = "1lkrx2cayhhv432dvzvz8q4i1gfi659rkl59c0y0dkwbs8x425zb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "10439p96wpxr13pxhii7li2cjq53pgr8c48ir63d2n4b8fn8iklr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "1ix5x92h7i6dlzcpnm819vf4nx1q3p88ky01mfs000xh9pl324ch"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "1n35b1cqglpwvcxdcgxwmv5j1qp8gwrjzh25884l0b72krna9alr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "13rq01ylrqp48n62cp640a4mdqbrqnibb0xaw9pcpddl3a3nnck0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0qx4p0jz3n66r3kgpgs25qbzlmwdqf80353nywyijv3ham6hpicf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0awksrbsmvkgfszdsxfv8wfs1m16y1551jnz0rf51dq0cn9963hq"; } { 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-openstack-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0159ng9c9hshmng8ipss7hncqs5qp8plmr1qjadka6vyp1mxn2c3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.2.0-darwin-amd64.tar.gz"; + sha256 = "08rmknpwrbc9h57a3ddg05s0idxbbrcf46i2gkqknjzs7dr6wzas"; } { 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-postgresql-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "0h9zdiaanvm2yds9z0c5fmz0f05apdhm4w28d2i929djxh57jqrr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.0.1-darwin-amd64.tar.gz"; + sha256 = "00b6i6dai21b8biqdw5ybj2dk7267i99bji2siicvj0nvi3s2wzx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "15pzcymjr9bzx47sq86llzfg0hydyf4cn0bb95zxjqrx8y37rql8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.1.1-darwin-amd64.tar.gz"; + sha256 = "1ja36fh8760sw8sb3wzp5kbv71wv1544ir74ffkw6l0v4q29bwlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.0.0-darwin-amd64.tar.gz"; - sha256 = "1wkak84yg5a4b5791pdwcl0fr089yjk853hwp44x3rhdh8xrdq1p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "0nasbip85f1xjp6dfibw0nh133gf9cy5n4gdqnv5759bg92am7kg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.0.0-darwin-amd64.tar.gz"; - sha256 = "1g2q3zbhxmpk2qp3c9hz0vn0xh95pnl7pd5b5kcizbrdfgjlaabq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "0r3zmd4q9nhwbn52vva62m5j9nsrxbfgljrvfyyh19i2hm7l0kcl"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index d8c5a6983001..cc7f381ee0f4 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,32 +3,33 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.1.0" +VERSION="3.3.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=2.0.0" - "aws=4.0.0" + "auth0=2.1.0" + "aws=4.5.1" "cloudflare=3.0.0" - "consul=3.0.0" - "datadog=3.0.0" - "digitalocean=4.0.0" + "consul=3.1.0" + "datadog=3.2.0" + "digitalocean=4.2.0" "docker=3.0.0" - "gcp=5.0.0" - "github=4.0.0" + "equinix-metal=2.0.0" + "gcp=5.4.0" + "github=4.0.2" "gitlab=4.0.0" "hcloud=1.0.0" - "kubernetes=3.0.0" - "linode=3.0.0" - "mailgun=3.0.0" + "kubernetes=3.2.0" + "linode=3.1.0" + "mailgun=3.1.0" "mysql=3.0.0" - "openstack=3.0.0" + "openstack=3.2.0" "packet=3.2.2" - "postgresql=3.0.0" - "random=4.0.0" - "vault=4.0.0" - "vsphere=3.0.0" + "postgresql=3.0.1" + "random=4.1.1" + "vault=4.1.0" + "vsphere=3.1.0" ) function genMainSrc() { From eef236e8efdf99e4e4d61815aa9889e5b64e6bc3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 24 May 2021 12:39:15 +0200 Subject: [PATCH 05/20] ccls: fix libc++ header path --- pkgs/development/tools/misc/ccls/default.nix | 12 +++--------- pkgs/development/tools/misc/ccls/wrapper | 13 +++++-------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 986363b83ef3..bd753016fc8b 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -21,17 +21,11 @@ stdenv.mkDerivation rec { cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") ''; + clang = llvmPackages.clang; shell = runtimeShell; + postFixup = '' - # We need to tell ccls where to find the standard library headers. - - standard_library_includes="\\\"-isystem\\\", \\\"${lib.getDev stdenv.cc.libc}/include\\\"" - standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" - export standard_library_includes - - wrapped=".ccls-wrapped" - export wrapped - + export wrapped=".ccls-wrapped" mv $out/bin/ccls $out/bin/$wrapped substituteAll ${./wrapper} $out/bin/ccls chmod --reference=$out/bin/$wrapped $out/bin/ccls diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/misc/ccls/wrapper index 155e6d4f6474..c92bc6b40d1a 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/misc/ccls/wrapper @@ -1,12 +1,9 @@ #! @shell@ -e -initString="--init={\"clang\":{\"extraArgs\": [@standard_library_includes@" - -if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then - read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} - initString+=$(printf ', \"%s\"' "${cflags_array[@]}") -fi - -initString+="]}}" +printf -v extraArgs ',\"%s\"' \ + $(cat @clang@/nix-support/libc-cflags \ + @clang@/nix-support/libcxx-cxxflags) \ + ${NIX_CFLAGS_COMPILE} +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" From d9b59212d530c0f5fed476f7595080c149433fcf Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 29 Apr 2021 10:01:45 +0200 Subject: [PATCH 06/20] maintainers/teams: add gcc --- maintainers/team-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0e2baa9e7587..86bc0e69ed54 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -78,6 +78,13 @@ with lib.maintainers; { scope = "Maintain Freedesktop.org packages for graphical desktop."; }; + gcc = { + members = [ + synthetica + ]; + scope = "Maitain GCC (GNU Compiler Collection) compilers"; + }; + golang = { members = [ c00w From c913e53bdb75f58674d3755f68bf35f491ee30f1 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 29 Apr 2021 10:06:46 +0200 Subject: [PATCH 07/20] gcc*: use maintainer team --- pkgs/development/compilers/gcc/10/default.nix | 2 +- pkgs/development/compilers/gcc/7/default.nix | 2 +- pkgs/development/compilers/gcc/8/default.nix | 2 +- pkgs/development/compilers/gcc/9/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1b4aa6b3214c..f8f4ad71e358 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -280,7 +280,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = lib.teams.gcc.members; platforms = lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5ffe6aba90f1..5eb4389be3aa 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -294,7 +294,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ ]; + maintainers = lib.teams.gcc.members; platforms = lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 754f189d508f..ca1b31467af4 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = lib.teams.gcc.members; platforms = lib.platforms.linux ++ diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 5be6dc5811ec..93e75389bd9f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -295,7 +295,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = lib.teams.gcc.members; platforms = lib.platforms.linux ++ From f2e5fa469c6fded72b336b9a611ea64a0e257097 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 29 Apr 2021 11:33:07 +0200 Subject: [PATCH 08/20] maintainers/teams: add vcunat to gcc --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 86bc0e69ed54..eb2199f13f5e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -81,6 +81,7 @@ with lib.maintainers; { gcc = { members = [ synthetica + vcunat ]; scope = "Maitain GCC (GNU Compiler Collection) compilers"; }; From 4b1fa9e8476ce8a16d9eb98495ba0a878ad757c6 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 30 Apr 2021 17:34:29 +0200 Subject: [PATCH 09/20] maintainers/teams: fix typo in gcc Co-authored-by: Henri Menke --- maintainers/team-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index eb2199f13f5e..75c2605a22f8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -83,7 +83,7 @@ with lib.maintainers; { synthetica vcunat ]; - scope = "Maitain GCC (GNU Compiler Collection) compilers"; + scope = "Maintain GCC (GNU Compiler Collection) compilers"; }; golang = { From 841cee208f9a089f963e784ae1c69d4e0913e149 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 24 May 2021 14:58:46 +0200 Subject: [PATCH 10/20] maintainers/teams: add ericson2314 to gcc --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 75c2605a22f8..ab05ab7a5b23 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -82,6 +82,7 @@ with lib.maintainers; { members = [ synthetica vcunat + ericson2314 ]; scope = "Maintain GCC (GNU Compiler Collection) compilers"; }; From 3e91f422fd355a9caf3109f6ef32d811a2e312a8 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 24 May 2021 15:02:14 +0200 Subject: [PATCH 11/20] gcc11: use maintainer team --- pkgs/development/compilers/gcc/11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index cff1abf72673..fe29440c25d5 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -285,7 +285,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with lib.maintainers; [ synthetica ]; + maintainers = lib.teams.gcc.members; platforms = lib.platforms.linux ++ From 821ca7d4cc96722c9ec297b99a64b1d3f26e9fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 11 Apr 2021 19:43:39 +0200 Subject: [PATCH 12/20] nixos/nginx: add option rejectSSL exposing ssl_reject_handshake --- .../services/web-servers/nginx/default.nix | 38 ++++++++++++------- .../web-servers/nginx/vhost-options.nix | 12 ++++++ 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 0e99aabcfc0c..ebb3c38d6c25 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -230,13 +230,13 @@ let defaultListen = if vhost.listen != [] then vhost.listen - else ((optionals hasSSL ( - singleton { addr = "0.0.0.0"; port = 443; ssl = true; } - ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } - )) ++ optionals (!onlySSL) ( - singleton { addr = "0.0.0.0"; port = 80; ssl = false; } - ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } - )); + else optionals (hasSSL || vhost.rejectSSL) ( + singleton { addr = "0.0.0.0"; port = 443; ssl = true; } + ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; } + ) ++ optionals (!onlySSL) ( + singleton { addr = "0.0.0.0"; port = 80; ssl = false; } + ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; } + ); hostListen = if vhost.forceSSL @@ -303,6 +303,9 @@ let ${optionalString (hasSSL && vhost.sslTrustedCertificate != null) '' ssl_trusted_certificate ${vhost.sslTrustedCertificate}; ''} + ${optionalString vhost.rejectSSL '' + ssl_reject_handshake on; + ''} ${mkBasicAuth vhostName vhost} @@ -771,20 +774,27 @@ in } { - assertion = all (conf: with conf; - !(addSSL && (onlySSL || enableSSL)) && - !(forceSSL && (onlySSL || enableSSL)) && - !(addSSL && forceSSL) + assertion = all (host: with host; + count id [ addSSL (onlySSL || enableSSL) forceSSL rejectSSL ] <= 1 ) (attrValues virtualHosts); message = '' Options services.nginx.service.virtualHosts..addSSL, - services.nginx.virtualHosts..onlySSL and services.nginx.virtualHosts..forceSSL - are mutually exclusive. + services.nginx.virtualHosts..onlySSL, + services.nginx.virtualHosts..forceSSL and + services.nginx.virtualHosts..rejectSSL are mutually exclusive. ''; } { - assertion = all (conf: !(conf.enableACME && conf.useACMEHost != null)) (attrValues virtualHosts); + assertion = any (host: host.rejectSSL) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.19.4"; + message = '' + services.nginx.virtualHosts..rejectSSL requires nginx version + 1.19.4 or above; see the documentation for services.nginx.package. + ''; + } + + { + assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts); message = '' Options services.nginx.service.virtualHosts..enableACME and services.nginx.virtualHosts..useACMEHost are mutually exclusive. diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 1f5fe6a368c1..1c7d40244797 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -118,6 +118,18 @@ with lib; ''; }; + rejectSSL = mkOption { + type = types.bool; + default = false; + description = '' + Whether to listen for and reject all HTTPS connections to this vhost. Useful in + default + server blocks to avoid serving the certificate for another vhost. Uses the + ssl_reject_handshake directive available in nginx versions + 1.19.4 and above. + ''; + }; + sslCertificate = mkOption { type = types.path; example = "/var/host.cert"; From fb1d3d68dba7d12e5e047cfaac9dfb3f3eeb57e2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 24 May 2021 16:46:33 +0200 Subject: [PATCH 13/20] CODEOWNERS: merge the neovim lines as they are not additive CODEOWNERS files always take that *last* match for a specific match. Having two lines for the same path will only ever result in the last line being used. The intention here was that both of these individuals are owners of the neovim space and not just one. --- .github/CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 256abac7b413..a5afb86e6fd7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -179,8 +179,7 @@ /pkgs/top-level/emacs-packages.nix @adisbladis # Neovim -/pkgs/applications/editors/neovim @jonringer -/pkgs/applications/editors/neovim @teto +/pkgs/applications/editors/neovim @jonringer @teto # VimPlugins /pkgs/misc/vim-plugins @jonringer @softinio From 40dd7e38cca5a7b041edeebd2d15bb2834c04d43 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 24 May 2021 16:47:17 +0200 Subject: [PATCH 14/20] phpPackages.composer: 2.0.13 -> 2.0.14 https://github.com/composer/composer/releases/tag/2.0.14 --- pkgs/development/php-packages/composer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 6a9cffa8ae77..5d49f32c77e2 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.13"; + version = "2.0.14"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8="; + sha256 = "sha256-KUVLQVWJaMpjS/Xi1NB/8iddkbY3p216BeZ0fTbdNHM="; }; dontUnpack = true; @@ -29,6 +29,7 @@ mkDerivation { description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; + changelog = "https://github.com/composer/composer/releases/tag/${version}"; maintainers = with maintainers; [ offline ] ++ teams.php.members; }; } From 3105dd0f0cba1cf7dd50983dad9e864dd7f2c10d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 24 May 2021 16:50:03 +0200 Subject: [PATCH 15/20] squashfs-tools-ng: mark no longer broken on aarch64-darwin --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index d0ad7803c791..8661740d8074 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { # > "_utimensat", referenced from: # > _set_attribs in rdsquashfs-restore_fstree.o # > ld: symbol(s) not found for architecture x86_64 - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isx86_64; }; } From cbd71e1cd49e7a0575aff017da31e1818c5180a7 Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Mon, 10 May 2021 11:27:59 -0600 Subject: [PATCH 16/20] faraday: init at version 0.2.3 --- .../blockchains/faraday/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/blockchains/faraday/default.nix diff --git a/pkgs/applications/blockchains/faraday/default.nix b/pkgs/applications/blockchains/faraday/default.nix new file mode 100644 index 000000000000..90d76e29b6b6 --- /dev/null +++ b/pkgs/applications/blockchains/faraday/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "faraday"; + version = "0.2.3-alpha"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "faraday"; + rev = "v${version}"; + sha256 = "16cqaslsbwda23b5n0sfppybd3ma4ch545100ydxrwac4zhrq4kq"; + }; + + vendorSha256 = "1hh99nfprlmhkc36arg3w1kxby59i2l7n258cp40niv7bjn37hrq"; + + subPackages = [ "cmd/frcli" "cmd/faraday" ]; + + meta = with lib; { + description = "LND Channel Management Tools"; + homepage = "https://github.com/lightninglabs/faraday"; + license = licenses.mit; + maintainers = with maintainers; [ proofofkeags ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63ed9cf041bb..77656785060c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27532,6 +27532,8 @@ in exodus = callPackage ../applications/blockchains/exodus { }; + faraday = callPackage ../applications/blockchains/faraday { }; + go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; From 94fc5998a009debd746496fc27d02ad3308bc16f Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Tue, 18 May 2021 09:47:35 -0600 Subject: [PATCH 17/20] maintainers: add ProofOfKeags --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3544047ace06..4828d5e81d5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8053,6 +8053,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + proofofkeags = { + email = "keagan.mcclelland@gmail.com"; + github = "ProofOfKeags"; + githubId = 4033651; + name = "Keagan McClelland"; + }; protoben = { email = "protob3n@gmail.com"; github = "protoben"; From 741c61b7359c7861b8b4d1765fdeb0204fd7add3 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 24 May 2021 19:35:55 +0200 Subject: [PATCH 18/20] plexamp: 3.4.4 -> 3.4.6 (#121887) --- pkgs/applications/audio/plexamp/default.nix | 8 +-- .../audio/plexamp/update-plexamp.sh | 54 +++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100755 pkgs/applications/audio/plexamp/update-plexamp.sh diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 47b74cc865b4..5a266580cf75 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.4.4"; + version = "3.4.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha256 = "1iz6qi12ljafb49l73rba5rwi5sdbd8ck5h2r6jiy260lgr2iiyk"; + sha512 = "M2iLJxpufycxnUfdn9f85l47W8HCsi/K0SPVsxyyaeKloV3g6yTyOg1luMwHBLDeXEKwR9jtuvPlIMNyBCFm8w=="; }; appimageContents = appimageTools.extractType2 { @@ -29,10 +29,12 @@ in appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' ''; + passthru.updateScript = ./update-plexamp.sh; + meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/26"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/28"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/plexamp/update-plexamp.sh b/pkgs/applications/audio/plexamp/update-plexamp.sh new file mode 100755 index 000000000000..b6b8def1e310 --- /dev/null +++ b/pkgs/applications/audio/plexamp/update-plexamp.sh @@ -0,0 +1,54 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p yq bash curl bc ripgrep +#! nix-shell -i bash + +set -Eeuxo pipefail + +cleanup() { + rm -rf "$TMPDIR" +} + +trap cleanup EXIT + +ROOT="$(dirname "$(readlink -f "$0")")" +if [ ! -f "$ROOT/default.nix" ]; then + echo "ERROR: cannot find default.nix in $ROOT" + exit 1 +fi + +if [ "$(basename "$ROOT")" != plexamp ]; then + echo "ERROR: folder not named plexamp" + exit 1 +fi + +TMPDIR="$(mktemp -d)" + +VERSION_FILE="$TMPDIR/version.yml" +VERSION_URL="https://plexamp.plex.tv/plexamp.plex.tv/desktop/latest-linux.yml" +curl "$VERSION_URL" -o "$VERSION_FILE" + +VERSION="$(yq -r .version "$VERSION_FILE")" +SHA512="$(yq -r .sha512 "$VERSION_FILE")" + +DEFAULT_NIX="$ROOT/default.nix" +WORKING_NIX="$TMPDIR/default.nix" +cp "$DEFAULT_NIX" "$WORKING_NIX" + +sed -i "s@version = .*;@version = \"$VERSION\";@g" "$WORKING_NIX" + +if diff "$DEFAULT_NIX" "$WORKING_NIX"; then + echo "WARNING: no changes" + exit 0 +fi + +# update sha hash (convenietly provided) +sed -i "s@sha.* = .*;@sha512 = \"$SHA512\";@g" "$WORKING_NIX" + +# update the changelog ("just" increment the number) +CHANGELOG_URL=$(rg --only-matching 'changelog = "(.+)";' --replace '$1' $WORKING_NIX) +CHANGELOG_NUMBER=$(rg --only-matching '.*/([0-9]+)' --replace '$1' <<< $CHANGELOG_URL) +NEXT_CHANGELOG=$(($CHANGELOG_NUMBER + 1)) +NEXT_URL=$(rg --only-matching '(.*)/[0-9]+' --replace "\$1/$NEXT_CHANGELOG" <<< $CHANGELOG_URL) +sed -i "s@changelog = \".*\";@changelog = \"$NEXT_URL\";@" $WORKING_NIX + +mv $WORKING_NIX $DEFAULT_NIX From 338b0fe1c5495615b41c57f83bf5f987ebe54dd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 May 2021 04:21:01 +0200 Subject: [PATCH 19/20] python3Packages.mocket: 3.9.40 -> 3.9.41 --- pkgs/development/python-modules/mocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 76b64be7430b..b05260930f10 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.40"; + version = "3.9.41"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "061w3zqf4ir7hfj0vzl58lg8szsik1fxv126s32x03nk1sd39r6v"; + sha256 = "19zxqh0xk08gj0jf6im9vh53z22yf17ywzykk0fjs9g7m29x8i5j"; }; propagatedBuildInputs = [ From f0fa05742058fef85c49e132c2851940915698ef Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 23 May 2021 04:21:19 +0200 Subject: [PATCH 20/20] python3Packages.pulsectl: 21.5.17 -> 21.5.18 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 8af58a2565eb..83dd2f5fae3c 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.5.17"; + version = "21.5.18"; src = fetchPypi { inherit pname version; - sha256 = "1826wz4d7qnlwl5csnjds1xh9ainicj2s004hlwv54bdvwx2ny1z"; + sha256 = "0n448nkm2i4gnsq48vbj8sldmyx0b7c7rvzijg8h2pxdrmilbqql"; }; patches = [