From 79eee19bd06b6033116b703f279c9a5495568f0f Mon Sep 17 00:00:00 2001 From: efim Date: Wed, 11 Aug 2021 13:40:03 +0300 Subject: [PATCH 001/239] wireguard-go: 0.0.20200320 -> 0.0.20210424 additional dependencies into deps.nix were generated for sub-project "$src/tun/netstack/go.mod" --- .../wireguard-go/0001-Fix-darwin-build.patch | 26 - .../tools/networking/wireguard-go/default.nix | 6 +- pkgs/tools/networking/wireguard-go/deps.nix | 1774 ++++++++++++++++- 3 files changed, 1767 insertions(+), 39 deletions(-) delete mode 100644 pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch diff --git a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch deleted file mode 100644 index d79d9e3531f3..000000000000 --- a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 5 Jan 2020 15:35:15 +0100 -Subject: [PATCH] Fix darwin build - ---- - rwcancel/select_default.go | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go -index dd23cda..03f3452 100644 ---- a/rwcancel/select_default.go -+++ b/rwcancel/select_default.go -@@ -9,6 +9,7 @@ package rwcancel - - import "golang.org/x/sys/unix" - --func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error { -- return unix.Select(nfd, r, w, e, timeout) -+func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) { -+ _, err = unix.Select(nfd, r, w, e, timeout) -+ return - } --- -2.23.1 - diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 35c5371113c1..c3f9e0dab8d7 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,17 +2,15 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200320"; + version = "0.0.20210424"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; + sha256 = "RUUueSsfEi1H+ckrnPKqbVlWONhCplMMftlyAmwK+ss="; }; - patches = [ ./0001-Fix-darwin-build.patch ]; - goDeps = ./deps.nix; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index 859b8572f82e..4ffcfa6b2dec 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -1,12 +1,13 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) [ { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "34f69633bfdc"; - sha256 = "0169vcn9s4c851y9vm7xqnar3vdfjrp7qsvcxadpfhsmwlfhxzgg"; + rev = "5ea612d1eb83"; + sha256 = "0mbhp35qad92a9fpcpc783jfrhhbgv9zsl0h98k10522blqhd9v5"; + moduleDir = ""; }; } { @@ -14,8 +15,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d98b1b443823"; - sha256 = "1vzwpy56g056dsq304xga3d55jg2cxx89bijpfwjlhwyqyskybsz"; + rev = "e18ecbb05110"; + sha256 = "1vlq8mdscp7yfaa1lmyv03y5m4c2d67ydg2q1i6smkrxghn3zn3q"; + moduleDir = ""; }; } { @@ -23,8 +25,19 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "5c8b2ff67527"; - sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; + rev = "94ec62e08169"; + sha256 = "1ir32rrysr7a06ixxr7vkwqx0c3y1rfxyfspc5xk0628cqhj1320"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/term"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/term"; + rev = "7de9c90e9dd1"; + sha256 = "1ba252xmv6qsvf1w1gcy98mngrj0vd4inbjw0lsklqvva65nljna"; + moduleDir = ""; }; } { @@ -32,8 +45,9 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "v0.3.3"; + sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; + moduleDir = ""; }; } { @@ -43,6 +57,1748 @@ url = "https://go.googlesource.com/tools"; rev = "90fa682c2a6e"; sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + moduleDir = ""; }; } + { + goPackagePath = "bazil.org/fuse"; + fetch = { + type = "git"; + url = "https://github.com/bazil/fuse"; + rev = "371fbbdaa898"; + sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; + moduleDir = ""; + }; + } + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.75.0"; + sha256 = "0mb65np9961xawb0njlqmnqrf8pnazzp9zcbqnlcaj73hhz9zrv9"; + moduleDir = ""; + }; + } + { + goPackagePath = "cloud.google.com/go/bigquery"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "bigquery/v1.8.0"; + sha256 = "1127ha4r0xjsfl04mdb134b6kvpc6yz5bx4bba8m1jmb4k3vyg3j"; + moduleDir = "bigquery"; + }; + } + { + goPackagePath = "cloud.google.com/go/datastore"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "datastore/v1.1.0"; + sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd"; + moduleDir = "datastore"; + }; + } + { + goPackagePath = "cloud.google.com/go/pubsub"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "pubsub/v1.3.1"; + sha256 = "1fxsj63d773yf6mjas5gwsq2caa6iqxmss6mms0yfdcc6krg6zkf"; + moduleDir = "pubsub"; + }; + } + { + goPackagePath = "cloud.google.com/go/storage"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "storage/v1.10.0"; + sha256 = "10fp6galzz8jwx35159xdcrwsqaz95xw78iwv1z5n67vhglwi5nf"; + moduleDir = "storage"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/v0.9.0"; + sha256 = "01fg6x3a6as2kh0km8kvjzjalq7xiqa17hnsdwawzlpnfpqgslvq"; + moduleDir = "autorest"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/adal"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/adal/v0.5.0"; + sha256 = "07zbbshyz1s9fj9ifa6zzks4wq7455rna50z1ahpgin92jk0s6la"; + moduleDir = "autorest/adal"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/date"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/date/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "autorest/date"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/mocks"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/mocks/v0.2.0"; + sha256 = "04jsq3bnz9s27kp45n7q5wj2fi3bxwvxrxcmiswrhqz4pj35b561"; + moduleDir = "autorest/mocks"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/logger"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "logger/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "logger"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/tracing"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "tracing/v0.5.0"; + sha256 = "0n482cjr2pk6ql6awcnn6llrnygjzakihbjaahgmylf3znwil7jp"; + moduleDir = "tracing"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.16"; + sha256 = "0snwbwdjs34x0my9ri77cvrbnahdiyjh2jlkzf12fy48p7fyk7pq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/Microsoft/hcsshim"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/hcsshim"; + rev = "v0.8.14"; + sha256 = "0k57knv8zrf32hp7rpv1km9j772w6752pfvdbpd3l711ism48c84"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.0.0"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f2"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "2146c9339422"; + sha256 = "03brp5ymv5pqfz2rkq2vggh6makbr3vbvdydxzp99dgk0r22vgrf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cilium/ebpf"; + fetch = { + type = "git"; + url = "https://github.com/cilium/ebpf"; + rev = "v0.2.0"; + sha256 = "0f7my8n5v2c5cmgrcikgi0naamglr7c4khgxkbb1k5wl8mm9465a"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cncf/udpa/go"; + fetch = { + type = "git"; + url = "https://github.com/cncf/udpa"; + rev = "5459f2c99403"; + sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi"; + moduleDir = "go"; + }; + } + { + goPackagePath = "github.com/containerd/cgroups"; + fetch = { + type = "git"; + url = "https://github.com/containerd/cgroups"; + rev = "4cbc285b3327"; + sha256 = "1ps8z33nrh46gg7cn5p0cfp5hb6qy1dymxp5i5vfzq6qgqv18an4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/console"; + fetch = { + type = "git"; + url = "https://github.com/containerd/console"; + rev = "v1.0.1"; + sha256 = "0s837wj6h80fykk2pdmaji75rw9c3863by0gh0cq51hh0lgyjpvg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/containerd"; + fetch = { + type = "git"; + url = "https://github.com/containerd/containerd"; + rev = "v1.3.9"; + sha256 = "1isi1wgq61b4l0lxy1d8n6dnmcb8s5ihn2yqjb6525y3dj5c5i1j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/continuity"; + fetch = { + type = "git"; + url = "https://github.com/containerd/continuity"; + rev = "50096c924a4e"; + sha256 = "1drmxbb2l4z12b19dq3vvh1ss7b4z8fq1n5g6c8ln13mjgz6cq48"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/fifo"; + fetch = { + type = "git"; + url = "https://github.com/containerd/fifo"; + rev = "ff969a566b00"; + sha256 = "1pmwdhbbk3vlbq6dvpwk3f71c3si6scc9ykafk8yg9rs2dj2ipfb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/go-runc"; + fetch = { + type = "git"; + url = "https://github.com/containerd/go-runc"; + rev = "7016d3ce2328"; + sha256 = "1mx2lvfkxw9kiyhi18g3c6hcpb9r2115zjzyvz6rkdqr08xrij9k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/ttrpc"; + fetch = { + type = "git"; + url = "https://github.com/containerd/ttrpc"; + rev = "v1.0.2"; + sha256 = "0plkm3yrr20vccfl0x8dxys3iphjwnmi285in0pivff6p9djf3yz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/containerd/typeurl"; + fetch = { + type = "git"; + url = "https://github.com/containerd/typeurl"; + rev = "b45ef1f1f737"; + sha256 = "03gfqx85990q2pbiibnj9bb0i2v02i1p5hma2pisrxl50dazav22"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd/v22"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "v22.1.0"; + sha256 = "127dj1iwp69yj74nwh9ckgc0mkk1mv4yzbxmbdxix1r7j6q35z3j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man/v2"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v2.0.0"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "0d3efadf0154"; + sha256 = "1wayhmcxr6l281fqkbw1gh0ymhxlznf4jj1rcldhwrc64l2zjh8l"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "9e7d5ac5ea55"; + sha256 = "0zcv52431a6pj4743rw6342aq9aphwdlbhvz5zs2i3v6q70acxg9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.3.0"; + sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-events"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-events"; + rev = "e31b211e4f1c"; + sha256 = "09gm4z43g23isbklabnsnfb87bwf8kjdgvvyi3vfjq2bqdjdg7cl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "v0.4.0"; + sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/spdystream"; + fetch = { + type = "git"; + url = "https://github.com/docker/spdystream"; + rev = "449fdfce4d96"; + sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/elazarl/goproxy"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/goproxy"; + rev = "c4fc26588b6e"; + sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "fd9021fe5dad"; + sha256 = "0piyk6pk36x2qr3bhys2k240pfwz3bv64fhi2l0vx1mzwiddapbm"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "73d445a93680"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "e6da0acd62b1"; + sha256 = "0prvx5r7q8yrhqvnwibv4xz3dayjbq36yajzqvh0z4lqsh4hyhch"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-gl/glfw/v3.3/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + moduleDir = "v3.3/glfw"; + }; + } + { + goPackagePath = "github.com/go-logr/logr"; + fetch = { + type = "git"; + url = "https://github.com/go-logr/logr"; + rev = "v0.1.0"; + sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b1"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad9"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "6aced65f8501"; + sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "1d0bd113de87"; + sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/godbus/dbus/v5"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "v5.0.3"; + sha256 = "1bkc904073k807yxg6mvqaxrr6ammmhginr9p54jfb55mz3hfw3s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gofrs/flock"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/flock"; + rev = "886344bea079"; + sha256 = "0qjqhs61y9mnjw4fb1klf74ab4lqbwpapdv3g6k0x1bzd2q1w6zr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/googleapis"; + fetch = { + type = "git"; + url = "https://github.com/gogo/googleapis"; + rev = "v1.4.0"; + sha256 = "1kka9qmra1klfkjza0s5papqvsi65f2d349dl8k1lvfq487iv9r4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.3.1"; + sha256 = "0x77x64sxjgfhmbijqfzmj8h4ar25l2w97h01q3cqs1wk7zfnkhp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "8c9f03a8e57e"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.4.4"; + sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.4.3"; + sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "v1.0.0"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.5.4"; + sha256 = "1ld9pwb6l22g75g1zpa691l7q9ki7pjgpcqhwgdfr3va1zisr5ci"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-github/v32"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v32.1.0"; + sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/martian/v3"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v3.1.0"; + sha256 = "1pr9akggfzj2vw11l7ry4sij0hqslpc3gwx4ynbzyvbjhvh64sbc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "39141e76b647"; + sha256 = "19j8qaw1k3zx5yd00l0j5982jpz72nlh98l941qrybgslgnh7cxd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/subcommands"; + fetch = { + type = "git"; + url = "https://github.com/google/subcommands"; + rev = "636abe8753b8"; + sha256 = "1gh40acx3f69fxmar6rmh18xrjw2rw3hyiyfcq9p44r9wlsfwl5x"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.2"; + sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go/v2"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "0c5108395e2d"; + sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "v0.1.0"; + sha256 = "0794s9c144gphm4dh1wgba6ydsb4zdwgglj1p9im43jv0lvh6p81"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gregjones/httpcache"; + fetch = { + type = "git"; + url = "https://github.com/gregjones/httpcache"; + rev = "9cad4c3443a7"; + sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.1.0"; + sha256 = "0pmjpzpra7lqgikxzwlcp5mh01b46j2vhyxkixz0v86fr9kf0k3k"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ianlancetaylor/demangle"; + fetch = { + type = "git"; + url = "https://github.com/ianlancetaylor/demangle"; + rev = "28f6c0f3b639"; + sha256 = "0rsq3622gd40f1x1l7caidsxrmzg1993ich2higwd94fqbxs1r83"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.5"; + sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.7"; + sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "v0.9.1"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.2.0"; + sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "7dc38fb350b1"; + sha256 = "0h5x6dys758vgb9s5y1qpf6g9712a4jjs94f9rg4i4qw4ypzjfg6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "d5b7844b561a"; + sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mattbaird/jsonpatch"; + fetch = { + type = "git"; + url = "https://github.com/mattbaird/jsonpatch"; + rev = "81af80346b1a"; + sha256 = "0ll22kpf75m72r7i5ddg3r87gdlagbj2x24bppgbi8jp018pdq95"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mohae/deepcopy"; + fetch = { + type = "git"; + url = "https://github.com/mohae/deepcopy"; + rev = "bb9b5e7adda9"; + sha256 = "173j05wv4yy8jh9ccjw46xfy1knxwvv1ir6b8l6g9pc5j5damm1f"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/munnerz/goautoneg"; + fetch = { + type = "git"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = "https://github.com/mxk/go-flowrate"; + rev = "cca7078d478f"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.8.0"; + sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.5.0"; + sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0"; + sha256 = "0i5acjajvr6hi9zb7gxwifd8w28y884cv7cx36adj8lngj647xbi"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "v0.1.1"; + sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/opencontainers/runtime-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runtime-spec"; + rev = "v1.0.2"; + sha256 = "19w981vcmd5lp2hy0630x6ayb8zz17n2vxqm2py5mg945xflcizg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "v1.2.0"; + sha256 = "0f146yjqwx2mr110kl8scjhqd08hys7vr5z0d0a3lskb6yy22gfg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/diskv"; + rev = "v2.0.1"; + sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "bc1a522cf7b1"; + sha256 = "13ws66kd65zbhk31zmax9qgmh22fzjcgs5ihy4fm1d775w6bmdzx"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "v1.3.0"; + sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/russross/blackfriday/v2"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.7.0"; + sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "2da4a54c5cee"; + sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.5"; + sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "d98352740cb2"; + sha256 = "065y16562ynixxzj7iys4f4spb7knilbj3h833qlhds381j8hn93"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.22.2"; + sha256 = "10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "2ec5bdc52b86"; + sha256 = "0p4vn379h68ca7nbid7nbd2rgzg2cnapbqqqmfsp3sgyf4q9bx72"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "2eb08e3e575f"; + sha256 = "0d5f1dvcps51rkfn3s2xzcqjz45ljvj2w1r8y4zz5zwf8y461ksw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "4e3ac2762d5f"; + sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.2.0"; + sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.2.1"; + sha256 = "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.22.5"; + sha256 = "18s1d7bk28i8gbs6i587ccd31qp3f8gibgd14dpkzs05gyvlccy6"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.7.0"; + sha256 = "0yxvb5sixh76cl9j8dpa97gznj0p8pmg2cdw0ypfwhd3ipx9wph1"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.uber.org/multierr"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/multierr"; + rev = "v1.6.0"; + sha256 = "162941s8f6a9x2w04qm4qa3zz0zylwag9149hywrj9ibp2nzcsqz"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "6cc2880d07d6"; + sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "cff245a6509b"; + sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "83fdc39ff7b5"; + sha256 = "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "d2bd2a29d028"; + sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.4.0"; + sha256 = "1ri003765yxawq6s8jbkbiaijihwrg980c4qwqsaa5x0sq2psrg1"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "08078c50e5b5"; + sha256 = "0zynwxw47nhwhs6n1c87c9np43lwl9m9z2w2cmdvjwhsisa93b75"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "67f06af15bc9"; + sha256 = "093p4panc808ak5bamzz7m9nb0xxib7778jpnr6f0xkz1n4fzyw5"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "f8bda1e9f3ba"; + sha256 = "0d3ba0p47j9v5f7wwg29whyfwz9rv94ada5nv8f8hn7v87820xqi"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "v0.1.0"; + sha256 = "1asrm22kv5x891qkbpap8alg612k321jbs1akc0vwsan251gm507"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "5ec99f83aff1"; + sha256 = "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "v0.36.0"; + sha256 = "1x6wlavrqi2r6ss3h2kg94p2lfj0z019kc85zm1pajpf0k23fxp7"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.6.7"; + sha256 = "1wkipg7xxc0ha5p6c3bj0vpgq38l18441n5l6zxdhx0gzvz5z1hs"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "ffc7fda8c3d7"; + sha256 = "14zgn3g8b5rrd9cbznx0dgg64p7aqb0f42z76h4bkgywlp2mizfp"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "9280052d3665"; + sha256 = "0n036fz5ssamrm8acxclvm6l1196pznsgygwhkc3cl1kvfs93mxh"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "d3470999428b"; + sha256 = "0sgwfkcr6n7m1ivyq34rz4rd6gm5pzswa73nvzj59dkaknj68xfb"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/errgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v2"; + rev = "v2.1.0"; + sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + moduleDir = ""; + }; + } + { + goPackagePath = "gotest.tools"; + fetch = { + type = "git"; + url = "https://github.com/gotestyourself/gotest.tools"; + rev = "v2.2.0"; + sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; + moduleDir = ""; + }; + } + { + goPackagePath = "gvisor.dev/gvisor"; + fetch = { + type = "git"; + url = "https://github.com/google/gvisor"; + rev = "a64c3a1b5a9f"; + sha256 = "0jw63la37gskknn7vlpwv9iw39zr4bv87rrr2lwqicq9mqi5ajl8"; + moduleDir = ""; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "v0.1.1"; + sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "v0.16.13"; + sha256 = "0dzsvihy7rjwknk44qphridpqyd13143gzlqb8jdx7524dg3m28a"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "v0.16.14-rc.0"; + sha256 = "1nsw0p6mmsraqysglihjr3y9rfdp8nryygb7hndg98fz47hzs7yz"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "v0.16.13"; + sha256 = "02cxhmpkqqrvjq1wv6y81p8a4rikmwsqfbl3yzjj9b8wn306jx0z"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v1.0.0"; + sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "594e756bea31"; + sha256 = "07d9f1sipjyrgfq8965h4irzcl7bfs439z13x2198lwrys6nhcjf"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "581e00157fb1"; + sha256 = "0mpymzis079wnqfzwy2b2ijv2b24rcy2ky468qqizgram564i9ba"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/binaryregexp"; + fetch = { + type = "git"; + url = "https://github.com/rsc/binaryregexp"; + rev = "v0.2.0"; + sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/quote/v3"; + fetch = { + type = "git"; + url = "https://github.com/rsc/quote"; + rev = "v3.1.0"; + sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; + moduleDir = ""; + }; + } + { + goPackagePath = "rsc.io/sampler"; + fetch = { + type = "git"; + url = "https://github.com/rsc/sampler"; + rev = "v1.3.0"; + sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "15d366b2352e"; + sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + moduleDir = ""; + }; + } + ] From b94a45a8d610d542058ac155a441fcc02cbf73e0 Mon Sep 17 00:00:00 2001 From: efim Date: Fri, 13 Aug 2021 13:53:00 +0300 Subject: [PATCH 002/239] wireguard-tools: meta update --- pkgs/tools/networking/wireguard-tools/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 416731eb8db9..e237850b12ae 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -53,6 +53,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for the WireGuard secure network tunnel"; + longDescription = '' + Supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities. + - wg : the configuration utility for getting and setting the configuration of WireGuard tunnel interfaces. The interfaces + themselves can be added and removed using ip-link(8) and their IP addresses and routing tables can be set using ip-address(8) + and ip-route(8). The wg utility provides a series of sub-commands for changing WireGuard-specific aspects of WireGuard interfaces. + - wg-quick : an extremely simple script for easily bringing up a WireGuard interface, suitable for a few common use cases. + ''; downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; From 4c205b2e8b1bbcb6c67139ee2dd2a55afb8affce Mon Sep 17 00:00:00 2001 From: efim Date: Fri, 13 Aug 2021 13:54:09 +0300 Subject: [PATCH 003/239] wireguard: meta update --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e183b4ac5d4b..32389d27369c 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (wireguard-tools.meta) homepage license maintainers; description = "Kernel module for the WireGuard secure network tunnel"; + longDescription = '' + Backport of WireGuard for kernels 3.10 to 5.5, as an out of tree module. + (as WireGuard was merged into the Linux kernel for 5.6) + ''; downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/"; platforms = platforms.linux; }; From 91acba7324b69d800afc645cef900c01743debc7 Mon Sep 17 00:00:00 2001 From: efim Date: Fri, 13 Aug 2021 13:58:37 +0300 Subject: [PATCH 004/239] wireguard-go: enable installCheck --- pkgs/tools/networking/wireguard-go/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index c3f9e0dab8d7..15db9879fbf6 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -19,6 +19,8 @@ buildGoPackage rec { mv $out/bin/wireguard $out/bin/wireguard-go ''; + doCheck = true; + meta = with lib; { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; From acf041d75d57ba52575991970bb8cb18d012fd3c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 14 Aug 2021 19:27:51 +0100 Subject: [PATCH 005/239] openvswitch: 2.14.2 -> 2.15.1 --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 5faccc14ce76..e2346cca95c7 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.14.2"; + version = "2.15.1"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-ZfQg+VTiUNiV+y2yKhMuHLVgvF4rkFHoNFETSBCOWXo="; + sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw"; }; kernel = optional (_kernel != null) _kernel.dev; From 774bf82869cc07f9b3931ac77d0a61dd262dd8ed Mon Sep 17 00:00:00 2001 From: efim Date: Mon, 16 Aug 2021 16:40:31 +0300 Subject: [PATCH 006/239] wireguard-go: licence update https://git.zx2c4.com/wireguard-go/tree/LICENSE is the MIT licence --- pkgs/tools/networking/wireguard-go/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 15db9879fbf6..3fa487a7dc6d 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with lib; { description = "Userspace Go implementation of WireGuard"; homepage = "https://git.zx2c4.com/wireguard-go/about/"; - license = licenses.gpl2; + license = licenses.mit; maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; }; } From 829ed287f07b36bba577a83dcaaa0f6ff0e32f90 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 21:32:45 +0200 Subject: [PATCH 007/239] elpa-packages: deprecate phases --- .../applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 +- pkgs/build-support/emacs/elpa.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index adf7d75ed5fc..c708fa56ef73 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -66,7 +66,7 @@ self: let # actually unpack source of ada-mode and wisi # which are both needed to compile the tools # we need at runtime - phases = "unpackPhase " + old.phases; # not a list, interestingly… + dontUnpack = false; srcs = [ super.ada-mode.src # ada-mode needs a specific version of wisi, check NEWS or ada-mode's diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 08257ff25425..f7027dc499d8 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -21,7 +21,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ - phases = "installPhase fixupPhase distPhase"; + dontUnpack = true; installPhase = '' runHook preInstall From 9c153ea7693f951d03dd110294aeaec61b0e074f Mon Sep 17 00:00:00 2001 From: Marvin Strangfeld Date: Wed, 18 Aug 2021 11:03:32 +0200 Subject: [PATCH 008/239] kubernetes-helmPlugins.helm-secrets: 3.8.1 -> 3.8.3 --- .../networking/cluster/helm/plugins/helm-secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index ec3f21c69d15..cd1e6ece4377 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.8.1"; + version = "3.8.3"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM="; + hash = "sha256-FpF/d+e5T6nb0OENaYLY+3ATZ+qcAeih5/yKI+AtfKA="; }; nativeBuildInputs = [ makeWrapper ]; From f8d1c8d48b066de1e816b2c30a7ce73e201d70a5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 16 Aug 2021 23:50:56 +0200 Subject: [PATCH 009/239] buildbot: deprecate phases --- pkgs/development/python-modules/buildbot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index a2471e45cfa4..2a193cecca17 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -9,7 +9,7 @@ let withPlugins = plugins: buildPythonPackage { name = "${package.name}-with-plugins"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = plugins ++ package.propagatedBuildInputs; From c2b85d142563b00675848fae13749b00ff8e6b4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:47:56 +0000 Subject: [PATCH 010/239] python38Packages.pytelegrambotapi: 3.7.9 -> 3.8.2 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index b7432f26b2f7..1e07b2c01f0c 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.7.9"; + version = "3.8.2"; src = fetchPypi { inherit pname version; - sha256 = "7774314ff429852d423d5dfebe8fc1011dca93a028f1ccb0c56db6817245b752"; + sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496"; }; propagatedBuildInputs = [ requests ]; From d97fcbee7b2e4af5f33803a29bddfb4b6166e783 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 18 Aug 2021 20:43:19 -0400 Subject: [PATCH 011/239] python3Packages.omegaconf: 1.4.1 -> 2.1.0 --- .../python-modules/omegaconf/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 42249e933789..72823b013fc2 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,20 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest-mock +, pytestCheckHook, pyyaml, isPy27, jre_minimal, antlr4-python3-runtime }: buildPythonPackage rec { pname = "omegaconf"; - version = "1.4.1"; + version = "2.1.0"; + + disabled = isPy27; src = fetchFromGitHub { owner = "omry"; repo = pname; - rev = version; - sha256 = "1vpcdjlq54pm8xmkv2hqm2n1ysvz2a9iqgf55x0w6slrb4595cwb"; + rev = "v${version}"; + sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI="; }; - checkInputs = [ pytest ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; + checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ jre_minimal pytest-runner ]; + propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; + + disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs meta = with lib; { description = "A framework for configuring complex applications"; From e7970880d98302f8a67f56d104409895432f2d9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Jul 2021 09:12:25 +0200 Subject: [PATCH 012/239] python3Packages.pymemcache: 3.4.4 -> 3.5.0 --- pkgs/development/python-modules/pymemcache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymemcache/default.nix b/pkgs/development/python-modules/pymemcache/default.nix index ab01259a77fe..f30b6ea06b4c 100644 --- a/pkgs/development/python-modules/pymemcache/default.nix +++ b/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "1ajlhirxhd4pbzgd84k44znjazjbnbdfm3sk64avs0vgcgclq2n7"; + sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; }; checkInputs = [ From 0c52ee1a7a1a6ad97670f4d253a106f1b69e2efb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Aug 2021 19:26:35 +0000 Subject: [PATCH 013/239] carla: 2.3.2 -> 2.4.0 --- pkgs/applications/audio/carla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 5dca0da81fb2..af43e40e2c13 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-en3eQtRUd2schpIccnuD42+wTYOAG9zsD6yNRA73bKE="; + sha256 = "sha256-WxhG9X6jVcu10bl5p0f61+SYZmJw4W7DYvezbpAlNjg="; }; nativeBuildInputs = [ From 6b100d2379150014c23e5d92f62bb951f6b04cf6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 21 Aug 2021 09:12:50 +0900 Subject: [PATCH 014/239] thunderbird-bin: 91.0.1 -> 91.0.2 --- .../thunderbird-bin/release_sources.nix | 522 +++++++++--------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 35ef5ea25b09..a3a02455e19f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.0.1"; + version = "91.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/af/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/af/thunderbird-91.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c2aabfe9a1ff2a196d08f80ca89468523edbcda6e756449cc1f4ae765b7dce62"; + sha256 = "e2c209ddd2f6589e3b1ff629b0fde65ce84b79de88ce63b4950c082c69733402"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ar/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ar/thunderbird-91.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c9cd4f45a70761e00e877108c53c504305075bba03c9ec0a8cc3324757c66547"; + sha256 = "554b79b721b5776d2408c00f0aa37ab0beb244aaa374e2701802417e15beb5c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ast/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ast/thunderbird-91.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2a531361709c5e0aab20f28b6edc6e58d4b1612c295320dbe903d8d5ada70004"; + sha256 = "7a0e2092124c00d1844462c18caa23965e806c0e7fae7dd07940bccd96f3d9d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/be/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/be/thunderbird-91.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4e2db1f6b4370e7a7a070ab3849141f8bea6b9f6497b17efca97377afe2cccd2"; + sha256 = "b31781509ff194af3eee409e0e22e9cb82a69ffb4d4de418c4d854c14afb0cf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/bg/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/bg/thunderbird-91.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f6056f71b0b3c7b9e54b232133e11e142c31085c3d0af97c23ea656569078688"; + sha256 = "ae275b3ad6771fbc67dc7a47046a9d7bd20259703c7d016a1d9934436ef2f4ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/br/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/br/thunderbird-91.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "1b07f6a0f32a6c823f7a1631085e2b4a98f3486d70423b617fd10602b3670d63"; + sha256 = "c5bac788ae44cdcc89442d8bd5a07f50a936750427232b8e6bd9ea90d2e6fd80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ca/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ca/thunderbird-91.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "f41afd9a8e9a5bd2dff04f5ec886112dd8385f89c633960163b8c689ba692bcb"; + sha256 = "0c578a299994e661c4d0d7e55128fef40449837d5da4fe45ed3992e3502bf305"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cak/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cak/thunderbird-91.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9a10f87df261a5a67b240e687879801bfb9ee2e367f599155fd24cf12cc53393"; + sha256 = "f5b49ed118b8e1f8b2b78f823455368ec895133f15e677377f0de6305e6e31dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cs/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cs/thunderbird-91.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8c2e5aba275ecf5c3e769c56567ba1567006945c45be09f35688cf83b95136b5"; + sha256 = "202b566a366e8c1a3c0a147acc9cd9009256193ae01a586b413459c8c526fa71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/cy/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cy/thunderbird-91.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d56388d698bc38e40d68736cf9b4c2bc81d6112ae356397769f95205dacbbfa5"; + sha256 = "c1a4887fe96665d56fd8db662e6c78e8764eb75307a941ea73accac190de397c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/da/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/da/thunderbird-91.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "717f1599219ebd72b78fbd94526aa20bbf8d107b164b50de01ec529750db11ab"; + sha256 = "7de010e7273573ada2732af1c466391d94d645d53c6dd148034cbb62d8c3b217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/de/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/de/thunderbird-91.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ce210eaa9bd17bd97283c28935e2cc06c2120cc0a725e9777749c1c1d4c24d86"; + sha256 = "ad93a79718d5d5477e5c2d5491cc5e3a8c5669efaa657252dd959e8ffa4dc464"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/dsb/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/dsb/thunderbird-91.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "6e955a2cae9078f72640bb06e60d1b6cbdf6e67f2f2881ecc8dd827ea74d188e"; + sha256 = "66004909207ef8c51d3d41ada64430c9714162e2d6343cf4434b65f5835d0dc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/el/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/el/thunderbird-91.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c2e71c09b69122bd5e6d2dd5008fd8e3d4f3dc7f17edf4964d1b0fa3ba47faf9"; + sha256 = "fbc2fce4edae1dc07fe689e7bd69be035b3fe62f64cba0900dfeef8d7dd62c2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-CA/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-CA/thunderbird-91.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a23bffa53f9a1ec2812e367927463d2698386e3e2a74f47f352d81786c05541d"; + sha256 = "8c5e0ed9cfea8158523df50bf8b680d6541ece70192dfa0b3e12e89dee0d6353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-GB/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-GB/thunderbird-91.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ec5b334d4976ed46d30095c3e906eadd50d19c433c77446edc0cd0583175126f"; + sha256 = "a63975d61c4474123dad2d8cc0f4324f16bb5812c61ba4d7a22c08a2fdb937ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/en-US/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-US/thunderbird-91.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c9ff70d202311fb5347b87d67e2ecfe9904b579d8e94dd94369d67166408e1f7"; + sha256 = "0e972bc7910dc9afe82a89cfd45d60cf0ed6f1b0c6adb86169e474c1699dff18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/es-AR/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-AR/thunderbird-91.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fbba20795ae5b650adde2d6e93d7ca734bdb76a4948304b4968cec97fcecdc1e"; + sha256 = "264cdb8e096647552ddcc91ae47f2404a1f280c964595e98426924f4ac201293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/es-ES/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-ES/thunderbird-91.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "09ffb1a1013bc9392341e4d4a3df190820f6a99828d155e24d7817ca8bebda12"; + sha256 = "b258c31278b5c75a6fb29aa4be29a60ec1ac3344a7b1eef449a8c52d936aaf75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/et/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/et/thunderbird-91.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3feeabfa2ee1f8bb9e236594b7294fd841cf639a47b6b78070ef64acd35cd508"; + sha256 = "dcd630338623c5b24733800e231c5a75514577a20329e9660011c7b2b13600cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/eu/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/eu/thunderbird-91.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2532b2609c02289d24f331f4e34898b18b426b5cf4f262c3e1e8d6a6b301ef24"; + sha256 = "cd548c58e9c51e91812266a57e2260a8076d4be5130e6507563b17af51c35d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fi/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fi/thunderbird-91.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "459fa042c920d3917ea13ac03c9d5560319c2d0b2851e0ad1e99d401a53e9bc9"; + sha256 = "6b7bc8ea396f46be383d7667a97ea62512fc1869a53f023b764990c9c26e186c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fr/thunderbird-91.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c48b5552c8ce8a51fe0222c7c1357319691f526e30bdff962d852cace77bf5bf"; + sha256 = "76fcc5ac921ec8a4eddcf7f37d5f97f38e72e7d0760b1df7c6375dac2fe0faae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/fy-NL/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fy-NL/thunderbird-91.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "cd5b787a6de8106a3e6cb8a99992ab163e0a7e10fe847eec48e427ba8398c21c"; + sha256 = "76afc70747bfae0ab55d76b440161fba946417d9a9f959006746e48c02922cf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ga-IE/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ga-IE/thunderbird-91.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "2ad66f5db3c1c10ea7f18c1c1693860fb355d696817973fe35133df98048fe1f"; + sha256 = "793d6941c844dfa6c53e5d9bbde70101efb4f303b7f4b07b5f8cbb7f44c41033"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/gd/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gd/thunderbird-91.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "87c6c0c7151dda09d007ac0fb49ed3bfa9eb463b85f98f057e1733d19048573b"; + sha256 = "311bcde1dcf00b3e21593300e7e05afe1b66531864340046c39b34ceabbc0c04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/gl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gl/thunderbird-91.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5fc8b2adfbe204a64043983dad1da17eda77dfd89e18c20946d533884c2669f1"; + sha256 = "2c7beb30c95b5afeb51ffd5d952dd96990fb997aa00f98811a7e656ec0d15293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/he/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/he/thunderbird-91.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "81d7d3eca6e87ac41b96634484fa38ea1d130165b9b4df5f3170d124ea2e3a17"; + sha256 = "864c0160562fc593109ef4afc0f7871eb881e32277131ea39c2e86358de2b287"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hr/thunderbird-91.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "86fee237f65ac8a86c7db9aa490c82b6ed5031557ae2c11eff95523405148484"; + sha256 = "053af50f6251daadf2cb8a77157d15bde93f12b913dca64537a533e0937c9f69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hsb/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hsb/thunderbird-91.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cdae048500f27f7a0f7922f9299435a2b329bf1304e8bfe3e12298998172539c"; + sha256 = "e4cfe2c9136702a928a761c0d5da9429ab3002076c0248ddc12c13de7bda90d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hu/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hu/thunderbird-91.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ce0460af38a61924ad66a96473358941614181cb00bad714ce91f0ab9ccab09b"; + sha256 = "cd620884dbc0b88454860fbd46a3ab11577396ba758c1e04d2e9f379ed131bd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/hy-AM/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hy-AM/thunderbird-91.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d76bb56d05efbdf9bb8843a9c6991ef2d016a97193cc919a5fc2042a12c76da1"; + sha256 = "4ffaa441ea2dcd474d6ae4ec10258ecee85fd986901860d91e96b415bd232120"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/id/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/id/thunderbird-91.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "71c1ca210af2b1834363afbcd4ffbcdd592ef71296b5c0abffe8004e09f7587d"; + sha256 = "2e64539c1591c88bfe482befcca6aa609b0352a9de45df24d5912a15058bbd01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/is/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/is/thunderbird-91.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "02c91f3b4cc45e053637c574a4859fdf7b6e663ad09974153b3782d795aea907"; + sha256 = "84452b732eb0c2b05346e21444e798a868ad90a9c574876cc6234cea69609ad0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/it/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/it/thunderbird-91.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8f69e3f7cf6d9f8acfd01e54f464e570fcc8bf0180e8b038c5afb75a42db0726"; + sha256 = "420cee754b96b8acddbbd29fe880fb364b0456cd64099d829a8e2aa87faafbf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ja/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ja/thunderbird-91.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "328748e49b4ae488902bb652c47c8bf7accc87384989177ded8e794d0c6b5a9e"; + sha256 = "60508f7520e2457a71c4017afb7426f5800e8932ab5fc8b7b84cb20a8d057668"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ka/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ka/thunderbird-91.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "07d565d2d43de3b3dcfd278302bcb9ac84f811cb643e2f48bfe33e155ecf77fe"; + sha256 = "1145f89f523f9f7fa4b4030fa0b113150b7188d475a55463bca9600ca0ee2e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/kab/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kab/thunderbird-91.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d82d24903e71a45597072cb19e53e22315d48145474dab7cb280fbb659ea4e2a"; + sha256 = "25422658dae8b53a4d72840da7aff4bc70cdf94d08444913c4ac06d49c6e3356"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/kk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kk/thunderbird-91.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "dfce35caf926d33dff1f9728d1f051ffb215f5be87872102e810fb7cba40ce39"; + sha256 = "0cefe7e7d93d8d3603fc13a34ffff40d0535713f4ae362d34ddeb3fa4ce8b2e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ko/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ko/thunderbird-91.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "eb990e826852398185849c07a0656eb5d848bbd827debcffb4db54e7cb78de26"; + sha256 = "3644cdc76d557ee2994c4ba4f16d9d2ec66a06a163fdee30a91aa7b8b75f8ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/lt/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lt/thunderbird-91.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "20b01c81284e89fcc3d4172a3c57ca7820ebfcd40b4dbe1c9ec5dc4119eddc50"; + sha256 = "33371b11574309d011968b0ec7cab94b5a61f7629b60ecb888897fa9d1ba0445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/lv/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lv/thunderbird-91.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1cad6e5d796ff39af0d94008969439dd9bc2308f66fe23b275ecd9a11ce1d00f"; + sha256 = "9460f51bc9a27c7fc69d425cfa013a6b45603764055b0f31cac38e8c5092ee5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ms/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ms/thunderbird-91.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f6e5e90dbac60ad84ad4be6d69d12607711a95521e617933d6615d761e4636c5"; + sha256 = "a2b2d1bbba8f5469465ff5b301d95f37453e22b7cc259d33b81382debf056889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nb-NO/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nb-NO/thunderbird-91.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "3b2666b1a633e291e9e52dd10c381b89415de8d3994030f3db05f7a656872d5f"; + sha256 = "dbce148234a027c3118d94aefbf77a5ed6b5f0dcb636704408c326c08c76e474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nl/thunderbird-91.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b1064d31f9e9757eb4a988da31128de40a50d2061c2bb96138e00ce20903017f"; + sha256 = "bd99d05225bdaacd4ae1cfde09da0b8667427f7723f48b5ad41c13d09b4e8656"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/nn-NO/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nn-NO/thunderbird-91.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6eca782596910cb9f340aa5640e46552054e4beb014bcdd3dc286683570a908f"; + sha256 = "1d48d681562120c52ac5042937406422d0264343f43720bc04870331a3b888ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pa-IN/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pa-IN/thunderbird-91.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c1e03c9a276267c7f15a4e39cb608f76bd6825363cff934e4b30da09f9c1c978"; + sha256 = "271008a2f327abda4c140183e966c9acd6116577ac4bc13db7ab674d40b90206"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pl/thunderbird-91.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4e07473e2c1cba237f1b01721943b1275282b05dcb608c74bc957d64fdba4c78"; + sha256 = "da0960c222b4625f717991f2e3f7fb5155c35ef470f87f2d9387469401bac62b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pt-BR/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-BR/thunderbird-91.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "81be1b2651211fc8701e6ed9733e9e0e4ccc0898cf1da767ef1589ee870dc63d"; + sha256 = "160cca291d27bfcc6d2196090814378110a210c8ab6d62f5296eb217be4c9e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/pt-PT/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-PT/thunderbird-91.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "39f240a740ddb979d62b0ed75f1120895e16e8bed22c6c4308865ee07545401d"; + sha256 = "1b4fc4a92388fa1cfac33f9f77e7f5e2f9c7088ab81b1eb3f8346bd77dd3f08a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/rm/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/rm/thunderbird-91.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "60211c33985a2e5fd57f266e7c51262cb1cf2b32fd885f9b56886f02b1d67b31"; + sha256 = "cd78d4e737fc6c1b3121472e453ac3a20e7f1451b648e6b56e811bb8b05a5bb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ro/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ro/thunderbird-91.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "90e354dc8e195dbf4fe7f16ec7837cb53f445794556c5b2f632e77f02be7b824"; + sha256 = "e83ed778d455ac6c892caa75ee14d8bee7f232f8fce9a72555f3fa7f2a9cd7dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/ru/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ru/thunderbird-91.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f03a06814d8e0fc9a741d2cb7aa83646c44052516b8be9b6adffe37d21fa37ba"; + sha256 = "110a6bf1fd3bfb7b24799b3d12c6660730ccd43b687c82159201849f1a17b2c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sk/thunderbird-91.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "88dc86d35554b8298bb20d15ce4890992b9f7b04f3ad7ff3fcdc7540629ec3b2"; + sha256 = "26fa89742dabf2929f81a0882ce527330aa63bb67af9066e2a041cc4a330857c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sl/thunderbird-91.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "26a0f2a73fa73b99f9fc81deb7e4764fd8b8ce062acfef1fd0b8f777365571d5"; + sha256 = "93f4a4c327a3ed6270d9765bc466bfc03bd4c6fc457f933f7131a77768209ea4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sq/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sq/thunderbird-91.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a4557802a3b7d89cc3594cc1c12d04534543e3bf8825bb28ba176658a3de3fa7"; + sha256 = "bdfe099edfd92ca449f9db5b4207ab1bfc5660964a99c69301f309bd7f4405e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sr/thunderbird-91.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6cbb7f29111f90e4bc42e1e1900b0a17549eb7409846ccf2378d3d8781c2af82"; + sha256 = "be61663f615151c423d1551419bc36c43b74ecb406ee70a66781a4c931d5db1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/sv-SE/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sv-SE/thunderbird-91.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d211b1673d1524d27f22334c592a3a9a2b0aaf887467b3dd10359146da4c0cda"; + sha256 = "cea5ade716541897197bdabd7a2de2cc78d478b6bcc2be19bbbe3cc327544f1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/th/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/th/thunderbird-91.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "259af6cce3197e45fb201740e8bc5d50988979626445dc41e9a9152922887c1f"; + sha256 = "42ae7ae92f60d466f1759170b7516191df49cdbffd8f792c69635839a91c82e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/tr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/tr/thunderbird-91.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7671dab2bbf6d70170314b07d85120bd77df2892c8d4f6419f4063153d01e721"; + sha256 = "d087650517976df85e38ee95bafa00f50e878870d5c8b4d3227436c1d238aab1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/uk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uk/thunderbird-91.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6cb56c07f0ba5ccca171fccf8d95629acdf07fb1f24e2f4795a5b30fe15b3d7c"; + sha256 = "0963c779f56aa7e102e939cad8c3cb2c91013d8a6a1c81e1b95f9bd59b0707fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/uz/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uz/thunderbird-91.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "35a3df724ee40e4b613a248471abd4b0fa8b4d314681cc96ec746843f3bc2930"; + sha256 = "18c5ef666ccd0e4ea82d705ce96a654546b5eeae66bbec27b74987174bce5c28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/vi/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/vi/thunderbird-91.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d99f3fd7afb3d3e210bcc2181d9f43be29be07ad44362c7c9113410bbc84239c"; + sha256 = "ae59396c600ac3c13e5c4a7bb45439b7ac8ec31305398c0f943a542686410c35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/zh-CN/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-CN/thunderbird-91.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "25f2983548dd324b0194641c0d43ace088626d0ef2e6048ced3d6874a933861d"; + sha256 = "cb6d6648c683677b7513196b883e51666a175b3739dd45fa2c6e2e84869d9257"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-x86_64/zh-TW/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-TW/thunderbird-91.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7d54efb8587eef38bcfcba9059d5d5429a81a5e808df24a4f33a9ec61483803a"; + sha256 = "8bde8041417693842644ae183a7830720be03c02e699d7d5c1d472724a0b8687"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/af/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/af/thunderbird-91.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "91ceccdf21929d526145f6f71cd21544b83b446d39887d65e6f1419e4ae1e904"; + sha256 = "b68bfdc320c42caa0b53e84c8ec6d5894079738f2fed7a9eb961b7d809ab2eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ar/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ar/thunderbird-91.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3bc50c5b718fca792475534488891f8fe7e69320fbd24aae410d2b9121ba4f29"; + sha256 = "6ba45770a09dbebc1ca5c496374e9cc4c0bdefd19b3c3f384d6829e801ca7224"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ast/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ast/thunderbird-91.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e9e4faa03141bce539abf86a611c814bab61401711fbe045ae4977db57c83ffb"; + sha256 = "76ed8764f119a56c1398dccaf6385c92936f84f959cbc38372c866cff653f93c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/be/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/be/thunderbird-91.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ef5c29de8ac27fc198f00a5f12e0b3824b692c5fcb7bdfc0a3e0aaa08ef4f2a7"; + sha256 = "5509d1e4f98fba58d7b5c7dde1ec531eaf3439a22bc8e9eb0843dcbed4d094bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/bg/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/bg/thunderbird-91.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b6409a8ff358042f2c6d9258e5d0bf4d341793c91ccb1f088f6a0c376005778a"; + sha256 = "28e6184008449d72dcd0d03c9ffd25eef0746100b67c7cf0684b40d9a7a52870"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/br/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/br/thunderbird-91.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "47812c836e816f93c73918f31086ed203b7ea409c916a070749c72e715e0a957"; + sha256 = "35915f0edd5b0a63b531a8eec680a6403866e0b8f25765cf8ed26344fe82c0a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ca/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ca/thunderbird-91.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "6257dae22b8b7fb44cd5c4845f44108c06b933c895b401fcc1c02463d3c19c11"; + sha256 = "7f869a4728c1ecff758486707836b565897f68f6cf4b13218f0555f9a758630b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cak/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cak/thunderbird-91.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "21371bf6103269c2da7dd521297a4472c9bea09019a1916f9bdf0bf42d9ea21e"; + sha256 = "5d512196774e8ba63439a2545c30ba7ec11f6c6a0967642b0e7e58629a036f31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cs/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cs/thunderbird-91.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "4bf27c787004bc06b1d05ec01f3c01040dcd6976e9e1df53aad995c2bbad60c9"; + sha256 = "31ee6eff33541ceb69df9ce1b5fe7ef43e2937bfd0c306611e3e35a698cb6308"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/cy/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cy/thunderbird-91.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "2365ba2da2d6a1bac7a605af7d9e74bb4850c74a74470442aa0e3a03f9a992e2"; + sha256 = "07dd83614f7920e2f49b9455b9b2734a2f8a8a555f46691b9a4a34a713c6a035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/da/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/da/thunderbird-91.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "402f977ad6b04c68cd3f7fbbc60ff9fda188a2e8cb76d3e1c2f206478a4ebb20"; + sha256 = "59132d98c63574619e23d49013b7e7e8927c348c2ff1a4f0b990c23e1434bcce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/de/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/de/thunderbird-91.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "5ca1e16b06986680783dd3dda515992eed8a4e7e9117d32f010b6a8943d7dedc"; + sha256 = "22a6a5a2f3cf61570c52d5e531fa6ffd022f83834db61732b79cb0f801234a15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/dsb/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/dsb/thunderbird-91.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "435d258c0bee4489ddc4fe07c1d4c98b35132b3f7bcf4b8239a037100808386e"; + sha256 = "9a7702a7a2872ec6088cfa0067d4c2bec9c9ebe9ff31a3ae0f50c797eea1d024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/el/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/el/thunderbird-91.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "090fd4a515755cec803d642760fc55acd73a2c44fcf93ebd22db7c325ad46cf0"; + sha256 = "13369e948d0cd936a9636e065b9455dee760c282b243b5ad4e932dd935ad0eca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-CA/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-CA/thunderbird-91.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8cbfaa6367ba80c0ec21996bc16cdeeca8fbdba5e6b133b745545026d6545b6b"; + sha256 = "e5e2ed3c68f03b443874f835b8303491dff70ed30e29515013786790bf333506"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-GB/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-GB/thunderbird-91.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a9d21dba162b470785c97e084debaad067766210316a3c3a41582c829bd2b961"; + sha256 = "35422b96dabf6dc2baf470916459dcfc672ad9fb1a6fb842c28f761963766357"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/en-US/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-US/thunderbird-91.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b0706e6a49d9551b1eb089d915e46d49c35ff787c614937b69e30f6d56f5b503"; + sha256 = "27c43ab01a49c936c3864282c54bb952f0e62330afac3eefd8848e58f99c43b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/es-AR/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-AR/thunderbird-91.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4766e49683ee14859b9e81e2782a18d615140ed902dbbc6e07144831f1525b91"; + sha256 = "205fc7ba9311aee475c4057b933246bf98bb06164fc1a0128d96cbb42cc4ee4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/es-ES/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-ES/thunderbird-91.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1f46e0e92b79b52dcf36892512b293bfe0aafe80b8c129013aa6415d2d5b8369"; + sha256 = "a560e4a2d1ece441f122dab0a27a25ba0d3b46cdebd9ebaa9b63f1e4d293c563"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/et/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/et/thunderbird-91.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d0b1f6fa06a500ff8ae8f014b16111bbf28cf23e0c94f1d6cb83a31a0164b432"; + sha256 = "60016f69a705c7f953014cbd546d483d3261cc70be2d10a5c3c1012fcc1d88f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/eu/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/eu/thunderbird-91.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e7e7335d1a72611bf10f28267e1cd9c36e84ae785b56615ab66a8f113dffb0bd"; + sha256 = "2c2da546ac66bad5e4e86fc417407497b9248529528d0c348a9be45ad50ff95e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fi/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fi/thunderbird-91.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "a1cf4319ee4115fc1b96fa937947283ea69f59dcb65fc3b280353629b9955ff1"; + sha256 = "ff8ecc121ef8c05e38f75b44602ae27363f9c27002507ddc263b0fd133a3a6d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fr/thunderbird-91.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "cedb9a2597d4fe16706fce0f1dbaf571ff306c29699c4079598d8c20e87e4ee8"; + sha256 = "bbe6c436894d25a1becb9e83b1640b63a35316468a55a20acc6991b3856c12f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/fy-NL/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fy-NL/thunderbird-91.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "9051c481d79e74253a0f74ae35cb6984daa70892ef6f19643b2ff4d403b62c26"; + sha256 = "bf5dbed617af49fd952f21ec795c9970956277a7f380802f8cf28705dff5d045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ga-IE/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ga-IE/thunderbird-91.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "13d49e563da0e378f44c49918af7ef84e41e112e2411c56e3c951014ba78b73a"; + sha256 = "b04348cbdce3b99cc0de580ef6aded2a946e4f338873c1069c86feab35f8341d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/gd/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gd/thunderbird-91.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4b4c76da22ececdbd927e7e3fcbf54a58947c66d982fca03042fc0a91c9a3857"; + sha256 = "350b1806e3504a57cd54ef89f424f634f89781670427773bec00bbeb9d4712a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/gl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gl/thunderbird-91.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cd194c3bc4ef9d896dbf1367a96ac18601a7bb446150ffd6c1e3e1c140642196"; + sha256 = "d9196254a829834a222e007177218a295629efc635052336a8c855e08f1bccd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/he/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/he/thunderbird-91.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3a3ebd2554a125cb10e78b4b0ffa8ce0665aa85573c2f4a67801754200ca85e5"; + sha256 = "47fb607ce180dd9dea8ee1e011c8a37c02e23a10e2c4de6c40e0c86ae069e533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hr/thunderbird-91.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7b80c8839cacf4fa85fdd2630562647356f6608d9652c2651e78301405876054"; + sha256 = "a3c3266a345bd6a8443059d11c9dedd3471b5904812d8ff08d94283d439f32a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hsb/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hsb/thunderbird-91.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ddaa6c857cd0fe2c05a229c4da47b33e1bf96d0177b6b228566a0463d5e5cf7f"; + sha256 = "10e599806fa3064a57482d4c4b69e7fa3c98327fdc47c0a0e4709f9ee385ad01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hu/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hu/thunderbird-91.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "48b9e4e51d2340ba0de1167ccd1da4d6de95ffe732a58eb4e30e31a272b1c048"; + sha256 = "d57356a47cebcc96c57199363df10a0aca1178683343021e79c9e7e0c03f62f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/hy-AM/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hy-AM/thunderbird-91.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6955670c2beae55679c55e97a03a2bafd2a389aa990d84a41a58029341f42f74"; + sha256 = "32773d9daa46251c1eed72eba229d7567b693681fb46d2da966eb67d025bd020"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/id/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/id/thunderbird-91.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8d8b8b9675a400ae4969e89a6b365e6ecbe4c80dcb4da41ea11280dd415d3da2"; + sha256 = "6d205b1905d193285a2ad1cbcbb1fbf4e1c71cccc9a54f63daa120179e77bba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/is/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/is/thunderbird-91.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "39e361fb9bd8097a59b048ed53f6d923c4e17ea597fe6ae0620eff28bfba1b5a"; + sha256 = "0fa18f5b9e9e1e3549fcd109fd4dd8392d7573b9429a61053b54b0538efd5b94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/it/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/it/thunderbird-91.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c0b9f37d53924f91e31660c82992cd9d05878bed08b48c71566cdef4c6cae9eb"; + sha256 = "67034f9a604606cf6a90b5699b46d12b76957da77336255dee1adcf6dfb4a2e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ja/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ja/thunderbird-91.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "faba4c83061f4834b4c1fc5c9895837ccbd0a9727599cb71da918be9825c8e6e"; + sha256 = "259a236852334eed51f3e922c3e4e74810b8d9d82f2b6e1486cfdfb9dc659ed9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ka/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ka/thunderbird-91.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8e4368e366c697e7d78e5bcf100286dd510d940bd89eb6a84712f2281495a201"; + sha256 = "93bac3418c44519c9b9eae6d2cb030b18262f6c586b4480b3e5d828faf18afcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/kab/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kab/thunderbird-91.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cd5155d346461fc0ccbc468a1dbbba286b922bfb25271005dff4de4b7ae3f299"; + sha256 = "1487aeef3d2b2eecdaac1463e35f04789e155e2d1f0f43e47be81da3abe96e33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/kk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kk/thunderbird-91.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7d5469688164d896c438541c02e6df9bbc59b804cbdd2ef7bcd68b27959f1336"; + sha256 = "1d3b7a92a8206d1fc0af0f86e26af218f073cb6f4f4dc3519366552f48bb932d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ko/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ko/thunderbird-91.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6b51ea1fdb1d0cb73c82665449da9003b98444a234e06ea3b87be8cd689254c2"; + sha256 = "913757dee44a98d85b337f07a743d588a1bdf9425c3f5cd2fb4985fa59340e5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/lt/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lt/thunderbird-91.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c678002ac4f0353da610a7a208aafa1af80fdafc50811c79140d5f2e4bdb9d23"; + sha256 = "c3ad9eccb96a5762bff235f95640c01c7a55d09e8ee613aace4cc26ad36aa60e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/lv/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lv/thunderbird-91.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "72bdd8d53008332f579385889c7b55b56814ba369d482d7b86f33059b6a89b82"; + sha256 = "125e2c82c1daed6ce109f3585e471d4037e531aec7a4998438cfe5f0614884ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ms/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ms/thunderbird-91.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5e891ea8cd26ec89f41d0ce2e048d05e4f7540ce0ff06ddd1efd6dc00c90daed"; + sha256 = "17deff39fb4dcbbb23d932db247f12528a994ec48d9ce32831148841c38e2b58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nb-NO/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nb-NO/thunderbird-91.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "657235b998d47baab559c11f60f4955275eb12875ef4e2d3a225fc5905dc4d48"; + sha256 = "e6f19f4fa520c092db1c0eee28393ff13e38e2214d7073f98cc68a56c5d4575d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nl/thunderbird-91.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "eb98cea41e08f1d0ecf79291ba94cf24f2eaaff5c9c47969c2dcec9d22b02c5c"; + sha256 = "3935d7bb85663ec84c6cab1c42406663b63e883c2fcb35673c156f38f3388a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/nn-NO/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nn-NO/thunderbird-91.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "37f05dc4012f543e46be07a1f27d0eba67df5852008595b77da22d0050225618"; + sha256 = "a3dc079d6c64bf913728b70be84b9ee7266e368b287660f09e458a1c08ddf0b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pa-IN/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pa-IN/thunderbird-91.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "80939eb26e7deb62c381ceb9d8a688adc18af5944ca0f31e027ef5d6bfe4f3ea"; + sha256 = "e3587c4a2a6c479edadbd58228c5438af81ffe0031332a99bfc0d53b62794def"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pl/thunderbird-91.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "93ad29d7c97d501587bcf333df7bfe0e9692d42269914ffad5217ace78a2cb2f"; + sha256 = "f5c231f36c59669b7f8f2aa7936a29f0e0c459158fe271142c28561eb9586e09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pt-BR/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-BR/thunderbird-91.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a1ee15db8610e2cd3d21e817291a8fa492d6811fd566ad75b202fb420b0ed4d4"; + sha256 = "7c6286427fe27eae8f98ebca95ee36befe110012026909ee95e42b3bc9aae637"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/pt-PT/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-PT/thunderbird-91.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5fb985c57660547e5c22e4e2f31dccf1db140af149bbaf24ec7003c7249ddc71"; + sha256 = "95ef322cf560ac3f428db9e2872168007691862e0a3f2d145713d52ab9da1a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/rm/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/rm/thunderbird-91.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "acf3cdcd21d10339f6e6e61880a36c9c63f3d5e06aa5742858bfcced8f562094"; + sha256 = "68c40f4800e7cb24b2281eb5f69351b0592bea4a725a8abc2b634d00a1e8c759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ro/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ro/thunderbird-91.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "584a892f959800744bdf06e1b181c78b71526f12076b1a299bace0bd96c2a741"; + sha256 = "00e216d87a7a0bd4b3f852051449f130f98133c40dd5360bedae8322e6a270ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/ru/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ru/thunderbird-91.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3f24b228ed6caef730dd36c2e22620b7e4b8365de0682017104b57081b1b27ae"; + sha256 = "997f644eca0b6341002c15b72f4c76e925c6581ccb90a2d1d8f2982527125688"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sk/thunderbird-91.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e8c317d088bb6b4ae601e439b45abde1641f152edfc64c1da5f479472c4e027d"; + sha256 = "147af1d186d27113544f4c23d0158389ce349a40d4996ab0897e28809f914244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sl/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sl/thunderbird-91.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9e0d376b0694e7007d889e8d6898bfef68734f52dcbe62ed5b141870ea6fd564"; + sha256 = "bc5bcdd54e391b380035450f89439c2338bc4aae8d79c4a553e580dababddc86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sq/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sq/thunderbird-91.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e2d87bfe4e89d6546e6fc55960426028036574758ddf97e6e039f6a5f7d43c10"; + sha256 = "5700bda1ecd8aec35638aa007216079146a627ef330b901f919f177007e6bbd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sr/thunderbird-91.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "871274312d5af4f1810017bc49ddccffea6d0b08276bf035ced5a39619c522e3"; + sha256 = "648ac37b029ad458ff6759bf6cd06a696d3c02899f6e0d44ecab7a196bbb439b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/sv-SE/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sv-SE/thunderbird-91.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d3280b7cc1638057be5edc05bc0f7e76cdd2440e4bd713a8b1da4db0d4f4c119"; + sha256 = "38c88fe79c505e9b14a778ae6a8f0ab8d291656ef7cdd1a995a7fe199811098f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/th/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/th/thunderbird-91.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4b1dd2d7c478bc0fec0d8379b025170ce569e4043b06dc08fbf7a97fda93dc0e"; + sha256 = "bead245a51de35bdc4474c04b813c4ce2175c01b7ad999f4f3b2f4587d811c77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/tr/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/tr/thunderbird-91.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3268c493d84db8eb4c8373959548a0828ce66a4b08d7b6f8175c9acabc092a7e"; + sha256 = "184dd779df35de1906022b32ef0c0b7c4e9555a38eb9ec432772a754efb4c1e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/uk/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uk/thunderbird-91.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3c3cd733adaa0f61cc489141d6eee89b2efd50b7afd816658cae0f93dfd983a6"; + sha256 = "8778aba1428169a7a2195040a9c7e1d91d86f15bff554f18d402e1f3447a140d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/uz/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uz/thunderbird-91.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "75c7e6e1544b8cd715185a1478a67a7129921fcb45e100e8b707317712fa1b90"; + sha256 = "2cf61ce3a966c41f5085a097dc0cda9136ae1d624d68e97a01d867ec14ad4d94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/vi/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/vi/thunderbird-91.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d1977564fe4bcc3e3d105670f0ceca224437656dfc4f6b1ea23e46348fe0892d"; + sha256 = "8f9a2b344b25b4cb91f2506515382729c27fd7e1de37c5d16dae51345cee790b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/zh-CN/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-CN/thunderbird-91.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "11b2079558194aad670fcc38e9a8bf2b36351852d2faeca15230a9ac0325da95"; + sha256 = "131c829617c6732d29e1a68499f190a80d464b3ede4f10caa153bdf8e59e7f3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.1/linux-i686/zh-TW/thunderbird-91.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-TW/thunderbird-91.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2c9472a29dbd96fbbcbe7d9e23a112c9c894eee62dcb0ab08387d04e1f2741c4"; + sha256 = "049625db5facdd176ac7fced757db678e9afb0d143d775f4c9f79d2cd334eaa0"; } ]; } From 27f311c5c628b155bacd352a0375618f888f2f2a Mon Sep 17 00:00:00 2001 From: taku0 Date: Sat, 21 Aug 2021 09:13:10 +0900 Subject: [PATCH 015/239] thunderbird: 91.0.1 -> 91.0.2 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index fe54bb1eca26..1bc2c8b4a1b0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.0.1"; + version = "91.0.2"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "54e1f3233c544cf28302496512aaf2a5fb5486aab070680e82cefbdd1d12a33867c638ced61e43958bae47e40ff551592a2cf4d537f98c22ed1df31c5d5bb09c"; + sha512 = "468be2f5024fd32eb22a661ed5f30de5d74231ee736e6743a9fb84e747bf45fceaaf286a5cbb20eb41f8ab98e0c56310eab3d2e6077fd81ee0ef52b28c33a3f2"; }; patches = [ ./no-buildconfig-90.patch From 3dbd616b0f04465e148491747f39624bf121e7da Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sat, 21 Aug 2021 01:37:37 +0300 Subject: [PATCH 016/239] python3Packages.pydmd: init at 0.3.3 --- .../python-modules/pydmd/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pydmd/default.nix diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix new file mode 100644 index 000000000000..56e735ffcdd3 --- /dev/null +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -0,0 +1,37 @@ +{ lib +, python +, fetchFromGitHub +, buildPythonPackage +, future +, numpy +, scipy +, matplotlib +, nose +}: + +buildPythonPackage rec { + pname = "pydmd"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "mathLab"; + repo = "PyDMD"; + rev = "v${version}"; + sha256 = "1516dhmpwi12v9ly9jj18wpz9k696q5k6aamlrbby8wp8smajgrv"; + }; + + propagatedBuildInputs = [ future numpy scipy matplotlib ]; + checkInputs = [ nose ]; + + checkPhase = '' + ${python.interpreter} test.py + ''; + pythonImportsCheck = [ "pydmd" ]; + + meta = { + description = "Python Dynamic Mode Decomposition"; + homepage = "https://mathlab.github.io/PyDMD/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3fefa1c45f6d..5a354668608e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5963,6 +5963,8 @@ in { pydispatcher = callPackage ../development/python-modules/pydispatcher { }; + pydmd = callPackage ../development/python-modules/pydmd { }; + pydns = callPackage ../development/python-modules/py3dns { }; pydocstyle = callPackage ../development/python-modules/pydocstyle { }; From 02753974e0a57021355189dc1db03916a91003c3 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sat, 21 Aug 2021 20:56:26 +0300 Subject: [PATCH 017/239] python3Packages.pydmd: marked as broken at aarch64 --- pkgs/development/python-modules/pydmd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 56e735ffcdd3..32f0dde17af8 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , python , fetchFromGitHub , buildPythonPackage @@ -33,5 +34,6 @@ buildPythonPackage rec { homepage = "https://mathlab.github.io/PyDMD/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ yl3dy ]; + broken = stdenv.hostPlatform.isAarch64; }; } From 43a4847e100b5aef006d0920e696dd7d39a347f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 18:22:29 +0000 Subject: [PATCH 018/239] yder: 1.4.12 -> 1.4.14 --- pkgs/development/libraries/yder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index aa924e755d08..49544a374682 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.12"; + version = "1.4.14"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "1cmla7rpwvsj1b3jhp9q8y3ni5n8rsqxib87yhh07b7xnlhy0gcj"; + sha256 = "sha256-4FSUBFqrxTbqg2EKYuXv4gUeE40ViNZRk5gHv+C2p9o="; }; patches = [ From f8853139c9a2f4c7a15a48c0cf66a30d033fbd4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 02:18:27 +0000 Subject: [PATCH 019/239] python38Packages.envisage: 5.0.0 -> 6.0.1 --- pkgs/development/python-modules/envisage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index b1c5170100b1..20051804328b 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "envisage"; - version = "5.0.0"; + version = "6.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zrxlq4v3091727vf10ngc8418sp26raxa8q83i4h0sydfkh2dic"; + sha256 = "8864c29aa344f7ac26eeb94788798f2d0cc791dcf95c632da8d79ebc580e114c"; }; propagatedBuildInputs = [ traits apptools setuptools ]; From 42ee0e6c1edde4f004e77af6cb301fcdf2161570 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 05:25:57 +0000 Subject: [PATCH 020/239] libcouchbase: 3.2.0 -> 3.2.1 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 3078148e24f7..face30c1e0cc 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-8//FEWXXcp/COHj10l4jysaLobzZIl65RCYz/HgL+kc="; + sha256 = "sha256-6TMWWXAgt4e+De1ebmqQhaqcia1ZXT8IXn9fTGsr3qY="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From 3e353567f82aaa4ca7148e2b177c04b0edee0f84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:05:48 +0000 Subject: [PATCH 021/239] lsix: 1.7.4 -> 1.8 --- pkgs/tools/graphics/lsix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index ba07e2886b53..a9f8aa21bf1d 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "lsix"; - version = "1.7.4"; + version = "1.8"; src = fetchFromGitHub { owner = "hackerb9"; repo = pname; rev = version; - sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + sha256 = "sha256-Qx6/PFm1XBmEI6iI+Ref9jNe6sXIhsVL4VQ1CX+caZE="; }; nativeBuildInputs = [ makeWrapper ]; From d28fcee32e338c66768ad3e132db67cf0fb2520e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:20:52 +0000 Subject: [PATCH 022/239] tendermint: 0.34.8 -> 0.34.12 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index b97c49dd9c96..5afd8aec348e 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.8"; + version = "0.34.12"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256:03k44w23167az2kk6ccp3139kykzkhack4w2vy0wvs2lb67xiqd9"; + sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; }; - vendorSha256 = "sha256-0Y9QDBVNYE2x3nY3loRKTCtYWXRnK7v+drRVvTMY4Dg="; + vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; subPackages = [ "cmd/tendermint" ]; From 637cad02605bc54ad5648bfa6243ab9bf877a18e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:34:21 +0000 Subject: [PATCH 023/239] python38Packages.pytest-mpl: 0.12 -> 0.13 --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 30a2757ecf32..747411ad7455 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.12"; + version = "0.13"; src = fetchPypi { inherit pname version; - sha256 = "4a223909e5148c99bd18891848c7871457729322c752c9c470bd8dd6bdf9f940"; + sha256 = "582db6e14315f9b08cbd2df39b136dc344bfe8a27c2f05b995460fb0969ec19e"; }; buildInputs = [ From 67dd93e1c60b2db8083939e7ffbfc2c1735d9cf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:43:50 +0000 Subject: [PATCH 024/239] tiledb: 2.2.4 -> 2.2.9 --- pkgs/development/libraries/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 0fa1ea8bd392..7746fbc23bfa 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.4"; + version = "2.2.9"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-xzzWB20vhnneiqJqZAeSUjZouqhPPg2bGaot1IQDMEo="; + sha256 = "sha256-kiidUvSff0drmIl6sXdqj2pjoFZL+ReCDOTtMEW3P3g="; }; # (bundled) blosc headers have a warning on some archs that it will be using From 67c1256ddd5ad48db8403b29073d4716498f4998 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 07:08:39 +0000 Subject: [PATCH 025/239] stacks: 2.55 -> 2.59 --- pkgs/applications/science/biology/stacks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 16091514f154..87b14a9508c5 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.55"; + version = "2.59"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-p8L0F3A+GdNsPgTQNn9Em5EjFCc9f7gUvyLIRCTd05c="; + sha256 = "sha256-pVFwb4EPba9wL9kDGN2gi7aeH+sPhDG/XLyHxqG4zd4="; }; buildInputs = [ zlib ]; From 977ee05375b98d4e2561a5846512e9ee08b4772f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 08:21:47 +0000 Subject: [PATCH 026/239] python38Packages.portalocker: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/portalocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index eee4a1047fdd..11016043ce11 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.0"; + version = "2.3.1"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "0k08c0qg21mwz3iqbd20ab22nq705q7cal4a1qr8qnd6ga03v4af"; + sha256 = "5ff2e494eccd3ff1cbaba8e4defd45bc7edb8eea3908c74f6de5d40641a1ed92"; }; propagatedBuildInputs = [ From d2546282c29b46874ee0f66f41a11d3ad89b8bd8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Aug 2021 09:46:11 +0200 Subject: [PATCH 027/239] python3Packages.bitarray: 2.2.1 -> 2.3.1 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 28ae80020986..97dded095624 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.2.1"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MbQNcWofBkLqnidBwpt1YpkHXbLh0evnUOPiwUafWJ0="; + sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0="; }; checkPhase = '' From 88683b4a7634624e41f1db7bd3343a1c9691f7c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Aug 2021 10:49:07 +0200 Subject: [PATCH 028/239] python3Packages.typecode: fix build --- pkgs/development/python-modules/typecode/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix index baed3c7fe41c..fbd907365c22 100644 --- a/pkgs/development/python-modules/typecode/default.nix +++ b/pkgs/development/python-modules/typecode/default.nix @@ -11,6 +11,7 @@ , pytestCheckHook , pytest-xdist }: + buildPythonPackage rec { pname = "typecode"; version = "21.6.1"; @@ -40,6 +41,10 @@ buildPythonPackage rec { pytest-xdist ]; + disabledTests = [ + "TestFileTypesDataDriven" + ]; + pythonImportsCheck = [ "typecode" ]; From 742cd80071abbf58a970b807db6d0d69966bd68a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 10:47:38 +0000 Subject: [PATCH 029/239] picard-tools: 2.25.7 -> 2.26.0 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 29c55ac7450b..345a38ae24a4 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.25.7"; + version = "2.26.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-3A6DDT6Dje4rT0qhyWMfs6TD7Jgt6N/lFF/HSBBMcUY="; + sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w="; }; nativeBuildInputs = [ makeWrapper ]; From a5de25bd3b90904ed6b148ecc34b3e956206153f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 12:03:38 +0000 Subject: [PATCH 030/239] python38Packages.pybase64: 1.1.4 -> 1.2.0 --- pkgs/development/python-modules/pybase64/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 048d218a9ea1..e67d344fd28a 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.1.4"; + version = "1.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f0e0db1dee2a2cbf35e6710ea138594ecc1e0f491ff9103f136de83d8f159315"; + sha256 = "9e310fcf5cfa2cbf7d1d7eb503b6066bec785216bcd1d8c0a736f59d5ec21b0b"; }; propagatedBuildInputs = [ six ]; From 5e6958fa75696085384f60f7d10f9b4c03822565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Aug 2021 16:36:23 +0200 Subject: [PATCH 031/239] linux_zen: 5.13.10-zen1 -> 5.13.12-zen1 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 70a9ecc6028a..f35b5ad8e421 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.13.10-zen1"; + modDirVersion = "5.13.12-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-0QNRWKB7tAWZR3wuKJf+es6WqjScSKnDrMwH74o2oOA="; + sha256 = "sha256-UHcQZlQ164oVMVK/Fqggoi+aTDFrLv9Tngsy/q74+Bc="; }; structuredExtraConfig = with lib.kernel; { From 076074a8b4f735ac4c42d8383f24cbe2436c0e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 20 Aug 2021 17:28:18 +0200 Subject: [PATCH 032/239] nixos/tests/matrix-synapse: add email regression test case twisted is used in matrix-synapse for smtp handling. Mostly this is used for password resets, but also notifications are delivered that way. older versions of twisted require the e-mail server to have TLS1.0 enabled. Obviously, quite a lot of servers have this disabled which means synapse won't be able to deliver mails using such servers. matrix-synapse issue: https://github.com/matrix-org/synapse/issues/6211 --- nixos/tests/matrix-synapse.nix | 105 ++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 9a1ff8a0d3ed..21e8c24e4713 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -26,6 +26,13 @@ import ./make-test-python.nix ({ pkgs, ... } : let -days 365 ''; + + mailerCerts = import ./common/acme/server/snakeoil-certs.nix; + mailerDomain = mailerCerts.domain; + registrationSharedSecret = "unsecure123"; + testUser = "alice"; + testPassword = "alicealice"; + testEmail = "alice@example.com"; in { name = "matrix-synapse"; @@ -35,7 +42,10 @@ in { nodes = { # Since 0.33.0, matrix-synapse doesn't allow underscores in server names - serverpostgres = { pkgs, ... }: { + serverpostgres = { pkgs, nodes, ... }: let + mailserverIP = nodes.mailserver.config.networking.primaryIPAddress; + in + { services.matrix-synapse = { enable = true; database_type = "psycopg2"; @@ -44,6 +54,16 @@ in { database_args = { password = "synapse"; }; + registration_shared_secret = registrationSharedSecret; + public_baseurl = "https://example.com"; + extraConfig = '' + email: + smtp_host: "${mailerDomain}" + smtp_port: 25 + require_transport_security: true + notif_from: "matrix " + app_name: "Matrix" + ''; }; services.postgresql = { enable = true; @@ -61,6 +81,85 @@ in { LC_CTYPE = "C"; ''; }; + + networking.extraHosts = '' + ${mailserverIP} ${mailerDomain} + ''; + + security.pki.certificateFiles = [ + mailerCerts.ca.cert ca_pem + ]; + + environment.systemPackages = let + sendTestMailStarttls = pkgs.writeScriptBin "send-testmail-starttls" '' + #!${pkgs.python3.interpreter} + import smtplib + import ssl + + ctx = ssl.create_default_context() + + with smtplib.SMTP('${mailerDomain}') as smtp: + smtp.ehlo() + smtp.starttls(context=ctx) + smtp.ehlo() + smtp.sendmail('matrix@${mailerDomain}', '${testEmail}', 'Subject: Test STARTTLS\n\nTest data.') + smtp.quit() + ''; + + obtainTokenAndRegisterEmail = let + # adding the email through the API is quite complicated as it involves more than one step and some + # client-side calculation + insertEmailForAlice = pkgs.writeText "alice-email.sql" '' + INSERT INTO user_threepids (user_id, medium, address, validated_at, added_at) VALUES ('${testUser}@serverpostgres', 'email', '${testEmail}', '1629149927271', '1629149927270'); + ''; + in + pkgs.writeScriptBin "obtain-token-and-register-email" '' + #!${pkgs.runtimeShell} + set -o errexit + set -o pipefail + set -o nounset + su postgres -c "psql -d matrix-synapse -f ${insertEmailForAlice}" + curl --fail -XPOST 'https://localhost:8448/_matrix/client/r0/account/password/email/requestToken' -d '{"email":"${testEmail}","client_secret":"foobar","send_attempt":1}' -v + ''; + in [ sendTestMailStarttls pkgs.matrix-synapse obtainTokenAndRegisterEmail ]; + }; + + # test mail delivery + mailserver = args: let + in + { + security.pki.certificateFiles = [ + mailerCerts.ca.cert + ]; + + networking.firewall.enable = false; + + services.postfix = { + enable = true; + hostname = "${mailerDomain}"; + # open relay for subnet + networksStyle = "subnet"; + enableSubmission = true; + tlsTrustedAuthorities = "${mailerCerts.ca.cert}"; + sslCert = "${mailerCerts.${mailerDomain}.cert}"; + sslKey = "${mailerCerts.${mailerDomain}.key}"; + + # blackhole transport + transport = "example.com discard:silently"; + + config = { + debug_peer_level = "10"; + smtpd_relay_restrictions = [ + "permit_mynetworks" "reject_unauth_destination" + ]; + + # disable obsolete protocols, something old versions of twisted are still using + smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtp_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtp_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + }; + }; }; serversqlite = args: { @@ -75,11 +174,15 @@ in { testScript = '' start_all() + mailserver.wait_for_unit("postfix.service") + serverpostgres.succeed("send-testmail-starttls") serverpostgres.wait_for_unit("matrix-synapse.service") serverpostgres.wait_until_succeeds( "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serverpostgres.require_unit_state("postgresql.service") + serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} ") + serverpostgres.succeed("obtain-token-and-register-email") serversqlite.wait_for_unit("matrix-synapse.service") serversqlite.wait_until_succeeds( "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" From 7239ddf173f547e3659e2923e7a7f029d639e1df Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 22 Aug 2021 13:44:29 -0400 Subject: [PATCH 033/239] nixos/sx: init --- .../from_md/release-notes/rl-2111.section.xml | 10 ++++- .../manual/release-notes/rl-2111.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/x11/display-managers/sx.nix | 37 +++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/display-managers/sx.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..b422c3cf058b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -182,7 +182,7 @@ - + fluidd, a @@ -191,6 +191,14 @@ fluidd. + + + sx, + a simple alternative to both xinit and startx for starting a + Xorg server. Available as + services.xserver.displayManager.sx + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..548008fe24bc 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -58,6 +58,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). +- [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable) + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `paperless` module and package have been removed. All users should migrate to the diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2473bf2f55fb..2fbab4a68739 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1036,6 +1036,7 @@ ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix ./services/x11/display-managers/startx.nix + ./services/x11/display-managers/sx.nix ./services/x11/display-managers/xpra.nix ./services/x11/fractalart.nix ./services/x11/hardware/libinput.nix diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix new file mode 100644 index 000000000000..132531c0ddc0 --- /dev/null +++ b/nixos/modules/services/x11/display-managers/sx.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.displayManager.sx; + +in { + options = { + services.xserver.displayManager.sx = { + enable = mkEnableOption "sx pseudo-display manager" // { + description = '' + Whether to enable the "sx" pseudo-display manager, which allows users + to start manually via the "sx" command from a vt shell. The X server + runs under the user's id, not as root. The user must provide a + ~/.config/sx/sxrc file containing session startup commands, see + sx(1). This is not automatically generated from the desktopManager + and windowManager settings. sx doesn't have a way to directly set + X server flags, but it can be done by overriding its xorgserver + dependency. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.sx ]; + services.xserver = { + exportConfiguration = true; + displayManager = { + job.execCmd = ""; + lightdm.enable = mkForce false; + }; + logFile = mkDefault null; + }; + systemd.services.display-manager.enable = false; + }; +} From 0ee218ee36529afcbb89eccc06a96ed7a71ae294 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 18:49:40 +0000 Subject: [PATCH 034/239] tfswitch: 0.12.1119 -> 0.12.1168 --- pkgs/applications/networking/cluster/tfswitch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index f56f8bc6d652..404d40e89f8d 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.12.1119"; + version = "0.12.1168"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "1xsmr4hnmdg2il3rp39cyhv55ha4qcilcsr00iiija3bzxsm4rya"; + sha256 = "sha256-BKqbxja19JxAr9/Cy7LpbZTJrt/pYfwtCbZMY0wwvZc="; }; - vendorSha256 = "0mpm4m07v8w02g95cnj73m5gvd118id4ag2pym8d9r2svkyz5n70"; + vendorSha256 = "sha256-y8T1MV2xHr9n7XWmB4LikIzyGx+0XKhsxmatnCZFN9I="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com From e52facaf7575ce3e520b8081523cad96e6fd36a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 20:04:29 +0000 Subject: [PATCH 035/239] grocy: 3.1.0 -> 3.1.1 --- pkgs/servers/grocy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 96c7cbbdf710..a417b8e38f7e 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-ohviTI2np6z+SjV2CDScouI8Lh2Ru4+CE00KlgT40i8="; + sha256 = "sha256-xoYjaZF7Frz+QPZ37fBSbgXTwsR/+Na+XsP5tfATgNg="; }; nativeBuildInputs = [ unzip ]; From 7e8aaf4775e551523f325d10f536557d55236778 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 21:09:18 +0000 Subject: [PATCH 036/239] imath: 3.0.5 -> 3.1.2 --- pkgs/development/libraries/imath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 7950667c190c..f3678064f3c5 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.0.5"; + version = "3.1.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "0nwf8622j01p699nkkbal6xxs1snzzhz4cn6d76yppgvdhgyahsc"; + sha256 = "sha256-X+LY1xtMeYMO6Ri6fmBF2JEDuY6MF7j5XO5YhWMuffM="; }; nativeBuildInputs = [ cmake ]; From 9ec7deee8bcfb04225f9f618b85232d8a5b64506 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 16:38:54 +0200 Subject: [PATCH 037/239] python3Packages.immutabledict: init at 2.1.0 --- .../python-modules/immutabledict/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/immutabledict/default.nix diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix new file mode 100644 index 000000000000..54fef8720ca5 --- /dev/null +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "immutabledict"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "corenting"; + repo = "immutabledict"; + rev = "v${version}"; + sha256 = "1n71154nfb6vr41iv00xcwkxmwnn1vwzbr3s23bjvlhvmnjb48a8"; + }; + + # https://github.com/corenting/immutabledict/issues/56 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "immutabledict" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A fork of frozendict, an immutable wrapper around dictionaries"; + homepage = "https://github.com/corenting/immutabledict"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..1f73a0735f1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3551,6 +3551,8 @@ in { iminuit = callPackage ../development/python-modules/iminuit { }; + immutabledict = callPackage ../development/python-modules/immutabledict { }; + immutables = callPackage ../development/python-modules/immutables { }; impacket = callPackage ../development/python-modules/impacket { }; From 9f99f6f7bf82214b81032bf50181a9e70bd18417 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:11:36 +0200 Subject: [PATCH 038/239] python3Packages.zipstream-new: init at 1.1.8 --- .../python-modules/zipstream-new/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/zipstream-new/default.nix diff --git a/pkgs/development/python-modules/zipstream-new/default.nix b/pkgs/development/python-modules/zipstream-new/default.nix new file mode 100644 index 000000000000..3f95fd5d4c61 --- /dev/null +++ b/pkgs/development/python-modules/zipstream-new/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +}: + +buildPythonPackage rec { + pname = "zipstream-new"; + version = "1.1.8"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "arjan-s"; + repo = "python-zipstream"; + rev = "v${version}"; + sha256 = "14vhgg8mcjqi8cpzrw8qzbij2fr2a63l2a8fhil21k2r8vzv92cv"; + }; + + pythonImportsCheck = [ + "zipstream" + ]; + + checkInputs = [ + nose + ]; + + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + meta = with lib; { + description = "Like Python's ZipFile module, except it works as a generator that provides the file in many small chunks"; + homepage = "https://github.com/arjan-s/python-zipstream"; + license = licenses.gpl3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f73a0735f1b..58c76ead9d20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9670,6 +9670,8 @@ in { zipstream = callPackage ../development/python-modules/zipstream { }; + zipstream-new = callPackage ../development/python-modules/zipstream-new { }; + zm-py = callPackage ../development/python-modules/zm-py { }; zodb = callPackage ../development/python-modules/zodb { }; From fe6d9366c9e5425ee828b8436870f18868cd3d23 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:13:12 +0200 Subject: [PATCH 039/239] octoprint: 1.5.3 -> 1.6.1 Hardcode path to pip so octoprint will find it and recognize it cannot write to its install dir with the /nix/store. This causes less, at least when looking at the log output, compared to not having pip accessible at all. Hardcore path to ffmpeg, because it is not reasonable on a NixOS setup to not treat this as a dependency. At the same time we hide the related settings form, so the user cannot overwrite it. Having the user input a sensible path would require installing ffmpeg into the environment, not a great solution, so patching it is. --- pkgs/applications/misc/octoprint/default.nix | 94 +++++++++++++++++-- .../misc/octoprint/ffmpeg-path.patch | 41 ++++++++ .../misc/octoprint/pip-path.patch | 12 +++ 3 files changed, 137 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/misc/octoprint/ffmpeg-path.patch create mode 100644 pkgs/applications/misc/octoprint/pip-path.patch diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index d7393313c151..bc994bf68233 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -2,7 +2,8 @@ , stdenv , lib , fetchFromGitHub -, python3 +, python38 +, substituteAll , nix-update-script # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: {} @@ -20,18 +21,51 @@ let ); }; - py = python3.override { + py = python38.override { self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) ( [ # the following dependencies are non trivial to update since later versions introduce backwards incompatible # changes that might affect plugins, or due to other observed problems + (mkOverride "click" "7.1.2" "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a") (mkOverride "flask-babel" "1.0.0" "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn") - (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") + (mkOverride "itsdangerous" "1.1.0" "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19") + (mkOverride "jinja2" "2.11.3" "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6") (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") - (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") + + # Requires flask<2, cannot mkOverride because tests need to be disabled + ( + self: super: { + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "1.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; + }; + doCheck = false; + }); + } + ) + + # Requires werkezug<2, cannot mkOverride because tests need to be disabled + ( + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "1.0.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + doCheck= false; + }); + } + ) + + # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name ( @@ -78,13 +112,13 @@ let self: super: { octoprint-filecheck = self.buildPythonPackage rec { pname = "OctoPrint-FileCheck"; - version = "2020.08.07"; + version = "2021.2.23"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FileCheck"; rev = version; - sha256 = "05ys05l5x7d2bkg3yqrga6m65v3g5fcnnzbfab7j9w2pzjdapx5b"; + sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; }; doCheck = false; }; @@ -96,30 +130,50 @@ let self: super: { octoprint-firmwarecheck = self.buildPythonPackage rec { pname = "OctoPrint-FirmwareCheck"; - version = "2020.09.23"; + version = "2021.8.11"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-FirmwareCheck"; rev = version; - sha256 = "1l1ajhnsc39prgk59mp93h90dgl9gh660cci00z5b5gj2h6dv1d1"; + sha256 = "sha256-WzVjHgjF12iJ642AFaFd86GSU90XyPzKhi1CSreynW4="; }; doCheck = false; }; } ) + ( + self: super: { + octoprint-pisupport = self.buildPythonPackage rec { + pname = "OctoPrint-PiSupport"; + version = "2021.8.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-PiSupport"; + rev = version; + sha256 = "07akx61wadxhs0545pqa9gzjnaz9742bq710f8f4zs5x6sacjzbc"; + }; + + # requires octoprint itself during tests + doCheck = false; + }; + } + ) + ( self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.5.3"; + version = "1.6.1"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "sha256-ZL/P/YIHynPmP8ssZZUKZDJscBsSsCq3UtOHrTVLpec="; + sha256 = "sha256-3b3k9h8H9Spf/P3/pXpCANnSGOgbUw/EWISJbrSoPBM="; }; propagatedBuildInputs = with super; [ @@ -136,6 +190,7 @@ let frozendict future itsdangerous + immutabledict jinja2 markdown markupsafe @@ -143,7 +198,9 @@ let netifaces octoprint-filecheck octoprint-firmwarecheck + octoprint-pisupport pkginfo + pip psutil pylru pyserial @@ -154,6 +211,7 @@ let sarge semantic-version sentry-sdk + setuptools tornado unidecode watchdog @@ -161,13 +219,29 @@ let werkzeug wrapt zeroconf + zipstream-new ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; checkInputs = with super; [ pytestCheckHook mock ddt ]; + patches = [ + # substitute pip and let it find out, that it can't write anywhere + (substituteAll { + src = ./pip-path.patch; + pip = "${super.pip}/bin/pip"; + }) + + # hardcore path to ffmpeg and hide related settings + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + }) + ]; + postPatch = let ignoreVersionConstraints = [ "emoji" + "immutabledict" "sentry-sdk" "watchdog" ]; diff --git a/pkgs/applications/misc/octoprint/ffmpeg-path.patch b/pkgs/applications/misc/octoprint/ffmpeg-path.patch new file mode 100644 index 000000000000..7ba468ae1a3f --- /dev/null +++ b/pkgs/applications/misc/octoprint/ffmpeg-path.patch @@ -0,0 +1,41 @@ +diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 +index 79342dcd7..6165a4119 100644 +--- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 ++++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 +@@ -29,14 +29,3 @@ + {% include "snippets/settings/webcam/webcamStreamUrl.jinja2" %} + {% include "snippets/settings/webcam/webcamSnapshotUrl.jinja2" %} + +- +-

{{ _('Timelapse Recordings') }}

+- +-{% trans %}

+- To render the snapshots into timelapse recordings, OctoPrint also needs to +- know the correct path to FFMPEG. +-

{% endtrans %} +- +-
+- {% include "snippets/settings/webcam/ffmpegPath.jinja2" %} +-
+diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py +index c3e6cea10..ced2f8fa0 100644 +--- a/src/octoprint/server/api/settings.py ++++ b/src/octoprint/server/api/settings.py +@@ -130,7 +130,7 @@ def getSettings(): + "snapshotUrl": s.get(["webcam", "snapshot"]), + "snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]), + "snapshotSslValidation": s.getBoolean(["webcam", "snapshotSslValidation"]), +- "ffmpegPath": s.get(["webcam", "ffmpeg"]), ++ "ffmpegPath": "@ffmpeg@", + "ffmpegCommandline": s.get(["webcam", "ffmpegCommandline"]), + "bitrate": s.get(["webcam", "bitrate"]), + "ffmpegThreads": s.get(["webcam", "ffmpegThreads"]), +@@ -548,8 +548,6 @@ def _saveSettings(data): + ["webcam", "snapshotSslValidation"], + data["webcam"]["snapshotSslValidation"], + ) +- if "ffmpegPath" in data["webcam"]: +- s.set(["webcam", "ffmpeg"], data["webcam"]["ffmpegPath"]) + if "ffmpegCommandline" in data["webcam"]: + commandline = data["webcam"]["ffmpegCommandline"] + if not all( diff --git a/pkgs/applications/misc/octoprint/pip-path.patch b/pkgs/applications/misc/octoprint/pip-path.patch new file mode 100644 index 000000000000..9c6b1c74751d --- /dev/null +++ b/pkgs/applications/misc/octoprint/pip-path.patch @@ -0,0 +1,12 @@ +diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py +index 53500e5d5..39f76c1e5 100644 +--- a/src/octoprint/util/pip.py ++++ b/src/octoprint/util/pip.py +@@ -284,6 +284,7 @@ class PipCaller(CommandlineCaller): + @classmethod + def autodetect_pip(cls): + commands = [ ++ ["@pip@"], + [sys.executable, "-m", "pip"], + [ + os.path.join( From 505106bc4b71803aa425364f4ea2617eb706fa5d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:15:52 +0200 Subject: [PATCH 040/239] octoprint.python.pkgs.octoprint-dashboard: 1.15.2 -> 1.18.3 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ae2151383bcf..69ce76f5b5e3 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -396,13 +396,13 @@ in { octoprint-dashboard = buildPlugin rec { pname = "OctoPrint-Dashboard"; - version = "1.15.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "StefanCohen"; repo = pname; rev = version; - sha256 = "0p94jwd7kagh3sixhcrqmsgbay4aaf9l1pgyi2b45jym8pvld5n4"; + sha256 = "sha256-hLHT3Uze/6PlOCEICVZ2ieFTyXgcqCvgHOlIIEquujg="; }; meta = with lib; { From 2d801b4d1d1b3652cdf3381d035b2140a86ff499 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:16:41 +0200 Subject: [PATCH 041/239] octoprint.python.pkgs.octoklipper: 0.3.2 -> 0.3.8.3 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 69ce76f5b5e3..14e8b36749dd 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -377,13 +377,13 @@ in { octoklipper = buildPlugin rec { pname = "OctoKlipper"; - version = "0.3.2"; + version = "0.3.8.3"; src = fetchFromGitHub { owner = "AliceGrey"; repo = "OctoprintKlipperPlugin"; rev = version; - sha256 = "15yg2blbgqp2gdpsqqm8qiiznq5qaq8wss07jimkl0865vrvlz7l"; + sha256 = "sha256-6r5jJDSR0DxlDQ/XWmQgYUgeL1otNNBnwurX7bbcThg="; }; meta = with lib; { From 623ad8a9b677a03d95debe6ad90ad7f1c8765c92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:17:02 +0200 Subject: [PATCH 042/239] octoprint.python.pkgs.touchui: 0.3.16 -> 0.3.18 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 14e8b36749dd..cb19c616dd28 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -358,13 +358,13 @@ in { touchui = buildPlugin rec { pname = "TouchUI"; - version = "0.3.16"; + version = "0.3.18"; src = fetchFromGitHub { owner = "BillyBlaze"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1jlqjirc4ygl4k7jp93l2h6b18jap3mzz8sf2g61j9w0kgv9l365"; + sha256 = "sha256-PNDCjY7FhfnwK7Nd86el9ZQ00G4uMANH2Sk080iMYXw="; }; meta = with lib; { From c94b2d6f8f7deda6bdd37c8633cf57075111affd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:17:41 +0200 Subject: [PATCH 043/239] octoprint.python.pkgs.telegram: 1.6.4 -> 1.6.5 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index cb19c616dd28..7e7fd4af4543 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -299,13 +299,13 @@ in { telegram = buildPlugin rec { pname = "Telegram"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "fabianonline"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "14d9f9a5m1prcikd7y26qks6c2ls6qq4b97amn24q5a8k5hbgl94"; + sha256 = "sha256-SckJCbPNCflgGYLHFiXy0juCtpvo8YS1BQsFpc1f5rg="; }; propagatedBuildInputs = with super; [ pillow ]; From 47fea9853b24a68e872fc3c6801e1d78929b2d89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:18:21 +0200 Subject: [PATCH 044/239] octoprint.python.pkgs.simpleemergencystop: 1.0.3 -> 1.0.5 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 7e7fd4af4543..6b94aaf081dd 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -261,13 +261,13 @@ in { simpleemergencystop = buildPlugin rec { pname = "SimpleEmergencyStop"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "Sebclem"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0hhh5grmn32abkix1b9fr1d0pcpdi2r066iypcxdxcza9qzwjiyi"; + sha256 = "sha256-MbP3cKa9FPElQ/M8ykYh9kVXl8hNvmGiCHDvjgWvm9k="; }; meta = with lib; { From 0d5c1cadfa7ce36cf29a9769e11b3f4fd6ce4ab7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:19:54 +0200 Subject: [PATCH 045/239] octoprint.python.pkgs.psucontrol: 0.1.9 -> 1.0.6 --- pkgs/applications/misc/octoprint/plugins.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 6b94aaf081dd..b1ddb4b61b92 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -237,15 +237,19 @@ in { psucontrol = buildPlugin rec { pname = "PSUControl"; - version = "0.1.9"; + version = "1.0.6"; src = fetchFromGitHub { owner = "kantlivelong"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; + sha256 = "sha256-S+lPm85+ZEO/3BXYsrxE4FU29EGWzWrSw3y1DLdByrM="; }; + propagatedBuildInputs = with super; [ + python-periphery + ]; + preConfigure = '' # optional; RPi.GPIO is broken on vanilla kernels sed /RPi.GPIO/d -i requirements.txt From d630a8dcec9e571eeeaf60a2fddbcd5eb8673e7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:24:40 +0200 Subject: [PATCH 046/239] octoprint.python.pkgs.printtimegenius: 2.2.6 -> 2.2.8 --- pkgs/applications/misc/octoprint/plugins.nix | 13 +++++++------ .../octoprint/printtimegenius-logging.patch | 17 ----------------- 2 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/misc/octoprint/printtimegenius-logging.patch diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index b1ddb4b61b92..497699382b79 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -208,25 +208,26 @@ in { printtimegenius = buildPlugin rec { pname = "PrintTimeGenius"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "04zfgd3x3lbriyzwhpqnwdcfdm19fsqgsb7l2ix5d0ssmqxwg2r6"; + sha256 = "sha256-Bbpm7y4flzEbUb6Sgkp6hIIHs455A0IsbmzvZwlkbh0="; }; + propagatedBuildInputs = with super; [ + psutil + sarge + ]; + preConfigure = '' # PrintTimeGenius ships with marlin-calc binaries for multiple architectures rm */analyzers/marlin-calc* sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py ''; - patches = [ - ./printtimegenius-logging.patch - ]; - meta = with lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; diff --git a/pkgs/applications/misc/octoprint/printtimegenius-logging.patch b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch deleted file mode 100644 index 66c2e83d62ca..000000000000 --- a/pkgs/applications/misc/octoprint/printtimegenius-logging.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/setup.py b/setup.py -index 6a6610e..cc45902 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,9 +35,9 @@ plugin_license = "AGPLv3" - # Any additional requirements besides OctoPrint should be listed here - # For now, require the working release, which is only 1.3.9rc1. - plugin_requires = ["OctoPrint>=1.3.9rc1", "psutil", "sarge"] --from sys import version_info --if version_info[0] < 3: -- plugin_requires.append("logging") -+#from sys import version_info -+#if version_info[0] < 3: -+# plugin_requires.append("logging") - - ### -------------------------------------------------------------------------------------------------------------------- - ### More advanced options that you usually shouldn't have to touch follow after this point From 7c0061f1dc2cf751e166f547bb46b39d4cc19f68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:25:03 +0200 Subject: [PATCH 047/239] octoprint.python.pkgs.mqtt: 0.8.7 -> 0.8.10 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 497699382b79..9d66ced07433 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -187,13 +187,13 @@ in { mqtt = buildPlugin rec { pname = "MQTT"; - version = "0.8.7"; + version = "0.8.10"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-MQTT"; rev = version; - sha256 = "0k82h7wafbcqdvk5wjw4dp9lydwszfj1lf8vvymwbqdn7pf5h0dy"; + sha256 = "sha256-nvEUvN/SdUE1tQkLbxMkZ8xxeUIZiNNirIfWLeH1Kfg="; }; propagatedBuildInputs = with super; [ paho-mqtt ]; From f93866652b77ab9a13989f8520b0d85af3fd7d1a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:25:25 +0200 Subject: [PATCH 048/239] octoprint.python.pkgs.marlingcodedocumentation: 0.11.0 -> 0.13.0 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 9d66ced07433..2fca3ebbe29f 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -168,13 +168,13 @@ in { marlingcodedocumentation = buildPlugin rec { pname = "MarlinGcodeDocumentation"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "costas-basdekis"; repo = pname; rev = "v${version}"; - sha256 = "0vx06w9hqwy0k4r8g67y8gdckfdx7wl8ghfx6hmxc1s8fgkghfkc"; + sha256 = "sha256-3ay6iCxZk8QkFM/2Y14VTpPoxr6NXq14BFSHofn3q7I="; }; meta = with lib; { From 8a1a19a219fd0eee59a744cf541867c587c8a53b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:26:02 +0200 Subject: [PATCH 049/239] octoprint.python.pkgs.gcodeeditor: 0.2.9 -> 0.2.12 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 2fca3ebbe29f..1d2e083f0035 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -149,13 +149,13 @@ in { gcodeeditor = buildPlugin rec { pname = "GcodeEditor"; - version = "0.2.9"; + version = "0.2.12"; src = fetchFromGitHub { owner = "ieatacid"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1yjj9lmxbzmzrn7gahw9lj7554fphalbjjp8ns0rr9py3rshwxkm"; + sha256 = "sha256-1Sk2ri3DKW8q8VJ/scFjpRsz65Pwt8OEURP1k70aydE="; }; meta = with lib; { From dd7f6fc16bf7d66e97df67310ae88ca6311044c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:27:05 +0200 Subject: [PATCH 050/239] octoprint.python.pkgs.displaylayerprogress: 1.24.0 -> 1.26.0 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 1d2e083f0035..0ee650cb6319 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -130,13 +130,13 @@ in { displaylayerprogress = buildPlugin rec { pname = "OctoPrint-DisplayLayerProgress"; - version = "1.24.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "OllisGit"; repo = pname; rev = version; - sha256 = "1lbivg3rcjzv8zqvp8n8gcaczxdm7gvd5ihjb6jq0fgf958lv59n"; + sha256 = "sha256-hhHc2SPixZCPJzCP8enMMWNYaYbNZAU0lNSx1B0d++4="; }; meta = with lib; { From 5b6b10f7ae4157349eb2bd23be001899ee572b61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:27:38 +0200 Subject: [PATCH 051/239] octoprint.python.pkgs.curaenginelegacy: 1.1.1 -> 1.1.2 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 0ee650cb6319..83d5fdedb30e 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -92,13 +92,13 @@ in { curaenginelegacy = buildPlugin rec { pname = "CuraEngineLegacy"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1a7pxlmj1a7blkv97sn1k390pbjcxx2860011pbjcdnli74zpvv5"; + sha256 = "sha256-54siSmzgPlnCRpkpZhXU9theNQ3hqL3j+Ip4Ie2w2vA="; }; meta = with lib; { From 9a9480f381220e53fd2d778c94dd589dbb749f99 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:28:00 +0200 Subject: [PATCH 052/239] octoprint.python.pkgs.costestimation: 3.2.0 -> 3.3.0 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 83d5fdedb30e..080be3c16636 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -73,13 +73,13 @@ in { costestimation = buildPlugin rec { pname = "CostEstimation"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "OllisGit"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1j476jcw7gh8zqqdc5vddwv5wpjns7cd1hhpn7m9fxq3d5bi077w"; + sha256 = "sha256-d7miGMCNJD0siaZb6EnoMZCkKot7vnZjxNZX2TunJcs="; }; meta = with lib; { From 2def3f8cb109dbaacc109330144e8f550d641460 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Aug 2021 17:28:23 +0200 Subject: [PATCH 053/239] octoprint.python.pkgs.bedlevelvisualizer: 0.1.15 -> 1.1.0 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 080be3c16636..616596ed9b18 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -52,13 +52,13 @@ in { bedlevelvisualizer = buildPlugin rec { pname = "BedLevelVisualizer"; - version = "0.1.15"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1bq39fnarnpk8phxfbpx6l4n9anf358z1cgid5r89nadmn2a0cny"; + sha256 = "sha256-SKrhtTGyDuvbDmUCXSx83Y+C83ZzVHA78TwMYwE6tcc="; }; propagatedBuildInputs = with super; [ numpy ]; From e34d1a36a8cece3042c5288b02656d7342ca5266 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 00:34:56 +0000 Subject: [PATCH 054/239] otpauth: 0.3.4 -> 0.3.5 --- pkgs/tools/security/otpauth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index 66e6dab56816..28dfab546a8b 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "otpauth"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "199kh544kx4cbsczc9anmciczi738gdc5g518ybb05h49vlb51dp"; + sha256 = "sha256-Jr1cZbXKZa6M7tIex67SjDPkWSYHWSZ7vRYd8us7Oek="; }; runVend = true; - vendorSha256 = "1762cchqydgsf94y05dwxcrajvjr64ayi5xk1svn1xissyc7vgpv"; + vendorSha256 = "sha256-s0pcm3fO50cuMEJ6Pp7qay6BGGa+FCiBegUbQlB0OnY="; doCheck = true; meta = with lib; { From 42183d1c8842d4984f4dc774a9650f3074bb6e21 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 04:42:27 +0000 Subject: [PATCH 055/239] python38Packages.tinydb: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/tinydb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index ccbe26317027..118317781281 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.5.0"; + version = "4.5.1"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJVJfsPhGTQpE6p0kzN6GDR0r9M71ADa67Oi5jLgeWY="; + sha256 = "1p0whrljjh7cpigr1glszssxsi6adi4cj7y3976q8sj9z47bdx8a"; }; nativeBuildInputs = [ From da9ca1923bbe6a035f299880849dd42b5163d220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 04:47:02 +0000 Subject: [PATCH 056/239] python38Packages.stravalib: 0.10.2 -> 0.10.4 --- pkgs/development/python-modules/stravalib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index 1615f57d5e59..a06a375be0e5 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.2"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; + sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; }; checkInputs = [ From f0ed982c2f445c4c8daa731f1db5340ca626fdf5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:36:18 +0000 Subject: [PATCH 057/239] python38Packages.playsound: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/playsound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/playsound/default.nix b/pkgs/development/python-modules/playsound/default.nix index 589a8f3db819..799bf70457bf 100644 --- a/pkgs/development/python-modules/playsound/default.nix +++ b/pkgs/development/python-modules/playsound/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "playsound"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "TaylorSMarks"; repo = "playsound"; - rev = "907f1fe73375a2156f7e0900c4b42c0a60fa1d00"; - sha256 = "1fh3m115h0c57lj2pfhhqhmsh5awzblb7csi1xc5a6f6slhl059k"; + rev = "v${version}"; + sha256 = "0jbq641lmb0apq4fy6r2zyag8rdqgrz8c4wvydzrzmxrp6yx6wyd"; }; doCheck = false; From 924fb0265749af937f4c5010d0a8283cf37d4206 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:52:47 +0000 Subject: [PATCH 058/239] python38Packages.pycurl: 7.43.0.6 -> 7.44.1 --- pkgs/development/python-modules/pycurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index e202d1928f21..5494360e51fc 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pycurl"; - version = "7.43.0.6"; + version = "7.44.1"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "8301518689daefa53726b59ded6b48f33751c383cf987b0ccfbbc4ed40281325"; + sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"; }; preConfigure = '' From 223eadd6dc6f102064571fca3ef69a145e21e6e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:05:36 +0000 Subject: [PATCH 059/239] python38Packages.pyopencl: 2021.2.2 -> 2021.2.6 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 7650ba22b0ac..427b65394006 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -21,7 +21,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.2"; + version = "2021.2.6"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -30,7 +30,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "50876f16624bc623fa2eff98a91259761b51471e186f535d4d4e7bce58292f0c"; + sha256 = "df208546d28a3274ba7b554d50643ed1e393b8f3f75a43b24b83d3ee76597587"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 4be13dc00b88a451bf1115cd8e7d12daa5342e9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 08:05:56 +0200 Subject: [PATCH 060/239] python3Packages.pylev: 1.3.0 -> 1.4.0 --- .../python-modules/pylev/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index 5df0ce4690ef..c9c3340db192 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -1,23 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: -buildPythonPackage { +buildPythonPackage rec { pname = "pylev"; - version = "1.3.0"; + version = "1.4.0"; - # No tests in PyPi tarball src = fetchFromGitHub { owner = "toastdriven"; repo = "pylev"; - # Can't use a tag because it's missing - # https://github.com/toastdriven/pylev/issues/10 - # rev = "v${version}; - rev = "72e3d490515c3188e2acac9c15ea1b466f9ff938"; - sha256 = "18dg1rfnqgfl6x4vafiq4la9d7f65xak19gcvngslq0bm1z6hyd8"; + rev = "v${version}"; + sha256 = "0fgxjdnvnvavnxmxxd0fl5jyr2f31g3a26bwyxcpy56mgpd095c1"; }; + checkPhase = '' + ${python.interpreter} -m unittest tests + ''; + + pythonImportsCheck = [ "pylev" ]; + meta = with lib; { + description = "Python Levenshtein implementation"; homepage = "https://github.com/toastdriven/pylev"; - description = "A pure Python Levenshtein implementation that's not freaking GPL'd"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; }; From 1ef4369495bd238c6852964a0d876225a1326254 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:37:19 +0000 Subject: [PATCH 061/239] vaultenv: 0.13.1 -> 0.13.3 --- pkgs/development/tools/haskell/vaultenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 8c817e8eeef0..451dec8a22c1 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -6,11 +6,11 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.1"; + version = "0.13.3"; src = fetchzip { url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz"; - sha256 = "0ycf5skxjns77sgbm8faq9ps9rs2hqznsbzrd51hdkpak56k42cp"; + sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48="; }; buildTools = [ hpack ]; From 982b1e61fa610d545e230462eb4dd106897f9074 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 08:12:03 +0000 Subject: [PATCH 062/239] python38Packages.xmlschema: 1.6.4 -> 1.7.0 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 6c2118f391b4..960dd227388d 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.6.4"; + version = "1.7.0"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "sha256-0KVGu163t3stCgx7aWW/Ggf6CUW2ZhOOnPU6FfGHfKA="; + sha256 = "0vf0gj1sbv9f7gjm3zbyl0b8pkrn00yzx57ddff0h2kazv8jlpwi"; }; propagatedBuildInputs = [ elementpath ]; From da5e1cf9a1625adff979d00df97ad787c5c9f2da Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 08:57:00 +0000 Subject: [PATCH 063/239] python38Packages.pandas-datareader: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/pandas-datareader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index d4aa1551bedc..d792c439b581 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pandas-datareader"; - version = "0.9.0"; + version = "0.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b2cbc1e16a6ab9ff1ed167ae2ea92839beab9a20823bd00bdfb78155fa04f891"; + sha256 = "9fc3c63d39bc0c10c2683f1c6d503ff625020383e38f6cbe14134826b454d5a6"; }; # Tests are trying to load data over the network From e7e8eecf588ba400f3a525d55af242bbd322536d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 09:12:25 +0000 Subject: [PATCH 064/239] python38Packages.param: 1.10.1 -> 1.11.1 --- pkgs/development/python-modules/param/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 8e090561ed06..0ae362dd28ac 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1f0f1133fbadcd2c5138e579b9934e29fd00f803af01d9bf6f9e6b80ecf1999b"; + sha256 = "b9857df01495bd55ddafb214fd1ed017d20699ce42ec2a0fd190d99caa03099f"; }; checkInputs = [ flake8 nose ]; From f8d1f6758fd348db8ce251ce6a696071d90de857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:01:07 +0200 Subject: [PATCH 065/239] python39Packages.google-api-core: 1.30.0 -> 2.0.0 --- .../python-modules/google-api-core/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 653786ace63f..e53346510dec 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -5,7 +5,7 @@ , googleapis-common-protos , grpcio , protobuf -, pytz +, proto-plus , requests , mock , pytest @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.30.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; + sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { google-auth grpcio protobuf - pytz + proto-plus requests ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = - "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 6239f1cf817ec8abca97bf671b7aeae8370fbf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:03:42 +0200 Subject: [PATCH 066/239] python39Packages.google-auth: 1.34.0 -> 2.0.1 --- pkgs/development/python-modules/google-auth/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index bfca445a961f..c10e3807f200 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -14,24 +14,22 @@ , pytest-localserver , responses , rsa -, six , pyopenssl }: buildPythonPackage rec { pname = "google-auth"; - version = "1.34.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; + sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; }; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six pyopenssl pyu2f ]; From d13745ec9b2b5795bc0b427c8e12015851a53c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:05:49 +0200 Subject: [PATCH 067/239] python39Packages.google-cloud-bigquery: 2.23.3 -> 2.24.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0bd663b4f151..f30fa659720c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.23.3"; + version = "2.24.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; + sha256 = "sha256-gRHSPir4epbAZGqCqD9i1pS2yIKeeIHrTkN7dURxZJ8="; }; propagatedBuildInputs = [ From fcb5dabb174f9ad13a9611ca2ae13128459e5438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:07:59 +0200 Subject: [PATCH 068/239] python39Packages.google-cloud-core: 1.7.2 -> 2.0.0 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index b9edb4224d8c..a51ed3840207 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; + sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; }; propagatedBuildInputs = [ google-api-core ]; From 0683b38c384601220dd438e2c2d9b32779e0c495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:13:08 +0200 Subject: [PATCH 069/239] python39Packages.google-cloud-spanner: 3.7.0 -> 3.8.0 --- .../python-modules/google-cloud-spanner/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 5f03a181183b..c6e1021f3430 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; + sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; }; propagatedBuildInputs = [ @@ -43,8 +43,13 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials - "tests/system/test_system.py" - "tests/system/test_system_dbapi.py" + "tests/system/test_backup_api.py" + "tests/system/test_database_api.py" + "tests/system/test_dbapi.py" + "tests/system/test_instance_api.py" + "tests/system/test_session_api.py" + "tests/system/test_streaming_chunking.py" + "tests/system/test_table_api.py" "tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_cursor.py" From 3f9ad23520bc1aa384ee6af656632d42de3bba16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 13:14:53 +0200 Subject: [PATCH 070/239] python39Packages.google-resumable-media: 1.3.3 -> 2.0.0 --- .../python-modules/google-resumable-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 83b192522f37..c76cd53a8296 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; + sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; From a6ca2c5d01bdccf82eaf4b1607ef6f3e634e1d83 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 23 Aug 2021 07:10:50 -0600 Subject: [PATCH 071/239] python3Packages.pynacl: fix cross compilation --- pkgs/development/python-modules/pynacl/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index f8696dd54ac0..8c5c239aeb41 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -6,6 +6,7 @@ , libsodium , cffi , hypothesis +, six }: buildPythonPackage rec { @@ -23,10 +24,14 @@ buildPythonPackage rec { libsodium ]; - propagatedBuildInputs = [ + propagatedNativeBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + six + ]; + checkInputs = [ hypothesis pytestCheckHook From 914705b89520b0dc43c316a8c527124d437075aa Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Aug 2021 15:59:10 +0200 Subject: [PATCH 072/239] beamPackages: Use nixpkgs fixed-point instead of rec Ensures that overlays are properly applied --- pkgs/top-level/beam-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 334aac359b37..0e17410a21dc 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,10 +1,10 @@ -{ callPackage, wxGTK30, buildPackages, wxSupport ? true }: +{ beam, callPackage, wxGTK30, buildPackages, wxSupport ? true }: -rec { +with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; # Each - interpreters = rec { + interpreters = with beam.interpreters; { # R24 is the default version. erlang = erlangR24; # The main switch to change default Erlang version. From 2508d1e2a56259fd44091cf9acffd7745a8d7267 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 23 Aug 2021 16:06:41 +0200 Subject: [PATCH 073/239] beamPackages: Deduplicate default package set Previously there were two package sets for the default Erlang version, beam.packages.erlang and beam.packages.erlangR24, which didn't share their evaluation. This commit fixes this by pointing the former to the latter. It also introduces a `beam.defaultVersion` attribute which can be used to get or set the default version to something other than `erlangR24`. --- pkgs/top-level/beam-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 0e17410a21dc..1b5ff3a3f25a 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -3,14 +3,17 @@ with beam; { lib = callPackage ../development/beam-modules/lib.nix { }; + # R24 is the default version. + # The main switch to change default Erlang version. + defaultVersion = "erlangR24"; + # Each interpreters = with beam.interpreters; { - # R24 is the default version. - erlang = erlangR24; # The main switch to change default Erlang version. - erlang_odbc = erlangR24_odbc; - erlang_javac = erlangR24_javac; - erlang_odbc_javac = erlangR24_odbc_javac; + erlang = beam.interpreters.${defaultVersion}; + erlang_odbc = beam.interpreters."${defaultVersion}_odbc"; + erlang_javac = beam.interpreters."${defaultVersion}_javac"; + erlang_odbc_javac = beam.interpreters."${defaultVersion}_odbc_javac"; # Standard Erlang versions, using the generic builder. @@ -98,7 +101,7 @@ with beam; { # appropriate Erlang/OTP version. packages = { # Packages built with default Erlang version. - erlang = packagesWith interpreters.erlang; + erlang = packages.${defaultVersion}; erlangR24 = packagesWith interpreters.erlangR24; erlangR23 = packagesWith interpreters.erlangR23; From 587732986177509e99fa54c529f3fe65a2bc3eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 16:08:27 +0200 Subject: [PATCH 074/239] python39Packages.sunpy: fully use pytestCheckHook --- .../python-modules/sunpy/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 0079b44cfd35..55e0c1f5e0ab 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -19,7 +19,6 @@ , parfive , pytest-astropy , pytest-mock -, pytest-cov , python-dateutil , scikitimage , scipy @@ -68,22 +67,30 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytest-astropy - pytest-cov pytest-mock ]; # darwin has write permission issues doCheck = stdenv.isLinux; - # ignore documentation tests and ignore tests with schema issues - checkPhase = '' - PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \ - --deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \ - --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module \ - --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml \ - --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml + preCheck = '' + export HOME=$(mktemp -d) ''; + disabledTests = [ + "rst" + ]; + + disabledTestPaths = [ + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml" + "sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml" + ]; + + pytestFlagsArray = [ + "--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module" + "--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module" + ]; + meta = with lib; { description = "SunPy: Python for Solar Physics"; homepage = "https://sunpy.org"; From 6a14292010747a5b766d1584a0b46211bc2c0dfd Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 6 Aug 2021 03:34:37 +0300 Subject: [PATCH 075/239] =?UTF-8?q?cudatext:=201.139.5=20=E2=86=92=201.142?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index ad25fb898ba3..ad06c80f3a40 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.139.5"; + version = "1.142.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-oBdEPLnM08gC3FZNDi1uyGar2MP8EmFkWJhH+fr6gBA="; + sha256 = "sha256-4kVi921dromMqiAuFjm2EOCDXCq4oT+ijko4/uT4LLs="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index c27c482b2871..49dfd7e8dfe0 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,23 +11,23 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.07.09", - "sha256": "sha256-hVoHH29JLPy3qq73e5EV4bxERcizocO4RBgvqD+VhWo=" + "rev": "2021.07.22", + "sha256": "sha256-sAF/klzPa8fCKKBtpj0h9B+zoGDvA80uL4u4VTikUaI=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.07.29", - "sha256": "sha256-XgkpadcTPeMu2B3XVX+9gHLZiAaLwNuHTCnZPtjakIk=" + "rev": "2021.08.20", + "sha256": "sha256-cVl1HJHLsYTFKQ/Ov+rcP6UAwRJPp7rtmLlZC9S+Jek=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.07.20", - "sha256": "sha256-yh9/2kHfg7swNzPe+7i+ON7MKhFrhxtGAT+pxL4GdVQ=" + "rev": "2021.08.20", + "sha256": "sha256-PZtP/J4tJN2Egk/Bp/5DtHlV46yRjhcZL9xhDk6xjBk=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.07.29", - "sha256": "sha256-2Wc4udsSEM0Ngzt/bokuDHcR0imKyHgkeG3RCWu3nXw=" + "rev": "2021.08.12", + "sha256": "sha256-Ht7jfFGlvb7khLD0OekuBvkU9ROyDiyUSe+lLI/Rm64=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.04.16", - "sha256": "sha256-HN3Lr3uDCyNk+8+J09ivyC0LZxQ6x6SaUH4swZJBFkM=" + "rev": "2021.07.27", + "sha256": "sha256-izCyBNRLRCizSjR7v9RhcLrQ6+aQA4eejCHFUzJ0IpE=" }, "Emmet-Pascal": { "owner": "Alexey-T", From 6a611f202c6ed2445b098c3f6ac0ca300f710847 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 18:30:58 +0200 Subject: [PATCH 076/239] notify: 0.0.2 -> 1.0.0 --- pkgs/tools/misc/notify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/tools/misc/notify/default.nix index 0d7e6af8363f..8210dac327e6 100644 --- a/pkgs/tools/misc/notify/default.nix +++ b/pkgs/tools/misc/notify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "notify"; - version = "0.0.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "1nlsl4himxs5jv0fcd48jkwjnmn1w3alp0dcm1awmp6702zrsgqj"; + sha256 = "sha256-grTHSMN4PpsCo5mST6nXE5+u7DewMVJXI3hnNIJdhLs="; }; - vendorSha256 = "13dz0sk3561hrixsl1ghr9y0pzap2a8zrlbzzb7zs7550snbdcyg"; + vendorSha256 = "sha256-BbhDNy3FmnHzAfv3lxPwL2jhp8Opfo0WVFhncfTO/28="; modRoot = "."; subPackages = [ From 3c3b6eec5fdf1b855edc297cdaaca4e62b18b2b3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 12:57:10 -0400 Subject: [PATCH 077/239] cargo-release: fix license --- pkgs/tools/package-management/cargo-release/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index cc577098562b..2f2a09b46cf9 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; homepage = "https://github.com/sunng87/cargo-release"; - license = with licenses; [ mit ]; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli ]; }; } From 36773ed064e7fa16426650356149a7abd7e19094 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Aug 2021 12:57:56 -0400 Subject: [PATCH 078/239] cargo-release: 0.16.3 -> 0.17.0 --- .../package-management/cargo-release/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 2f2a09b46cf9..5cec6589c11d 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { - owner = "sunng87"; + owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-VAXuxHCayjmuI26rhJroEBbnyJ4z+w7HY5TNTanYvpw="; + sha256 = "04vp2w07da9b4cfrdp8jj5fp5v7xzdx2946v7195n2krhrdhq957"; }; - cargoSha256 = "sha256-cXuAPQ8xRkeixWNYGjStNipbn4xIc1NsfVqROd6RHdg="; + cargoSha256 = "0ch22aysbpp38xny3sfbzrbsflfva57dlslkdqsmf4a7bckpbkhs"; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; From df723cf939a9cc1aace7cc85c053248546baf78d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 19:10:08 +0200 Subject: [PATCH 079/239] changetower: init at 1.0 --- pkgs/tools/networking/changetower/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/changetower/default.nix diff --git a/pkgs/tools/networking/changetower/default.nix b/pkgs/tools/networking/changetower/default.nix new file mode 100644 index 000000000000..e0e38c8d221d --- /dev/null +++ b/pkgs/tools/networking/changetower/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "changetower"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "Dc4ts"; + repo = "ChangeTower"; + rev = "v${version}"; + sha256 = "058ccn6d5f7w268hfqh85bz1xj6ysgfrmyj0b4asjiskq7728v9z"; + }; + + vendorSha256 = "0hagskhwrdsl6s6hn27jriysbxhaz0pqq1h43j7v0ggnwd2s03bq"; + + meta = with lib; { + description = "Tools to watch for webppage changes"; + homepage = "https://github.com/Dc4ts/ChangeTower"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30db04579be1..5d6d57440416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3956,6 +3956,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; + changetower = callPackage ../tools/networking/changetower { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; civetweb = callPackage ../development/libraries/civetweb { }; From a049d842292fc891a13a80e8725df31657308195 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:35 +1000 Subject: [PATCH 080/239] nixos/filesystems/exfat: use "exfatprogs" instead of "exfat" if kernel > 5.7 5.7+ comes with a native exfat implementation, exfatprogs should be used instead. The exfat package puts a "mount.exfat" binary in the path, which causes mount to prefer the FUSE version to the non-fuse one. There's no way to disable the binary, so switch to exfatprogs. --- nixos/modules/tasks/filesystems/exfat.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 1527f993fdd4..540b9b91c3ec 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -4,8 +4,10 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - - system.fsPackages = [ pkgs.exfat ]; - + system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ + pkgs.exfat # FUSE + ] else [ + pkgs.exfatprogs # non-FUSE + ]; }; } From 48f0ae5331e786a8ad42b7276f9801bacb7de8d6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 23 Aug 2021 10:31:55 -0700 Subject: [PATCH 081/239] hqplayerd: 4.25.2 -> 4.25.2-66 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 095f09d19ab5..92ce3294f1c3 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.25.1-65"; + version = "4.25.2-66"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; - sha256 = "sha256-1Gfnha0DRAH2q0HJQVZegFKjpnVVK+MxPUmYJsA8Xgc="; + sha256 = "sha256-BZGtv/Bumkltk6fJw3+RG1LZc3pGpd8e4DvgLxOTvcQ="; }; unpackPhase = '' From 57b933a911666922d6fc329ccc02446228ac5f6f Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 1 Jul 2021 00:11:47 +1000 Subject: [PATCH 082/239] nixos/doc: add note about switching to exfatprogs --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..dd6245273c5b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -847,6 +847,15 @@ Superuser created successfully. release instead of 1.0.x + + + If exfat is included in + boot.supportedFilesystems and when using + kernel 5.7 or later, the exfatprogs + user-space utilities are used instead of + exfat. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..64f3f495651a 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -246,6 +246,9 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `nomad` package now defaults to a 1.1.x release instead of 1.0.x +- If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7 + or later, the `exfatprogs` user-space utilities are used instead of `exfat`. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. From 2b52f2b762fc664c04b691ca3f355477f4f65414 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 13:55:33 +0200 Subject: [PATCH 083/239] nixosTests.kernel-generic: simplify --- nixos/tests/kernel-generic.nix | 36 ++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 5993d0e6ab78..04e3cae117af 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -6,8 +6,8 @@ with pkgs.lib; let - makeKernelTest = version: linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { - name = "kernel-${version}"; + makeKernelTest = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { + name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; }; @@ -23,20 +23,22 @@ let assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; }) args); -in -with pkgs; { - linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4; - linux_4_9 = makeKernelTest "4.9" linuxPackages_4_9; - linux_4_14 = makeKernelTest "4.14" linuxPackages_4_14; - linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; - linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; - linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; + kernels = { + inherit (pkgs) + linuxPackages_4_4 + linuxPackages_4_9 + linuxPackages_4_14 + linuxPackages_4_19 + linuxPackages_5_4 + linuxPackages_5_10 + linuxPackages_5_13 - linux_hardened_4_14 = makeKernelTest "4.14" linuxPackages_4_14_hardened; - linux_hardened_4_19 = makeKernelTest "4.19" linuxPackages_4_19_hardened; - linux_hardened_5_4 = makeKernelTest "5.4" linuxPackages_5_4_hardened; - linux_hardened_5_10 = makeKernelTest "5.10" linuxPackages_5_10_hardened; + linuxPackages_4_14_hardened + linuxPackages_4_19_hardened + linuxPackages_5_4_hardened + linuxPackages_5_10_hardened - linux_testing = makeKernelTest "testing" linuxPackages_testing; -} + linuxPackages_testing; + }; + +in mapAttrs (_: kernel: makeKernelTest kernel) kernels From 457653d99c31bc8e558bcbd38c7d23ed9fa8fb97 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 15:39:39 +0200 Subject: [PATCH 084/239] nixosTests.kernel-generic: expose test-making functions Changed the name to be clearer, 'makeKernelTest' could imply that it wants a kernel pkg as its arg while it actually needs a set of linuxPackages. --- nixos/tests/kernel-generic.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 04e3cae117af..09ca43eac813 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -6,7 +6,7 @@ with pkgs.lib; let - makeKernelTest = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { + testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ]; @@ -41,4 +41,8 @@ let linuxPackages_testing; }; -in mapAttrs (_: kernel: makeKernelTest kernel) kernels +in mapAttrs (_: lP: testsForLinuxPackages lP) kernels // { + inherit testsForLinuxPackages; + + testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel); +} From a3f6ff6d48c42397fa716a8357c7b8be704fd61f Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 16:28:25 +0200 Subject: [PATCH 085/239] nixosTests.kernel-generic: add myself as maintainer --- nixos/tests/kernel-generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 09ca43eac813..391a93e36981 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -9,7 +9,7 @@ let testsForLinuxPackages = linuxPackages: (import ./make-test-python.nix ({ pkgs, ... }: { name = "kernel-${linuxPackages.kernel.version}"; meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; + maintainers = [ nequissimus atemu ]; }; machine = { ... }: From 0a43b6d5e9cbc1414eb32be7c2ade406cf2bc8f4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 15:46:34 +0200 Subject: [PATCH 086/239] kernel/generic: add kernelTests automatically Unfortunately, there seems to be no way of referencing an overridable version of the package you're in, so it had to be stubed to work at all. This isn't important for our current, very basic kernel nixosTests but might become important when we add more sophisticated ones. --- pkgs/os-specific/linux/kernel/generic.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 7f4f0f2d6bb6..7f2a97d868ed 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -58,6 +58,7 @@ , preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false , kernelArch ? stdenv.hostPlatform.linuxArch , kernelTests ? [] +, nixosTests , ... }: @@ -192,7 +193,16 @@ let kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); - tests = kernelTests; + tests = let + overridableKernel = finalKernel // { + override = args: + lib.warn ( + "override is stubbed for NixOS kernel tests, not applying changes these arguments: " + + toString (lib.attrNames (if lib.isAttrs args then args else args {})) + ) overridableKernel; + }; + in [ (nixosTests.kernel-generic.testsForKernel overridableKernel) ] ++ kernelTests; }; -in lib.extendDerivation true passthru kernel + finalKernel = lib.extendDerivation true passthru kernel; +in finalKernel From d4afb739713c2a15068be0c6d9b72dbde0678d26 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 2 May 2021 15:49:32 +0200 Subject: [PATCH 087/239] kernels: remove manually declared kernelTests It is not necessary to declare these manually anymore --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 2 -- pkgs/os-specific/linux/kernel/linux-4.19.nix | 2 -- pkgs/os-specific/linux/kernel/linux-4.4.nix | 2 -- pkgs/os-specific/linux/kernel/linux-4.9.nix | 2 -- pkgs/os-specific/linux/kernel/linux-5.10.nix | 2 -- pkgs/os-specific/linux/kernel/linux-5.13.nix | 2 -- pkgs/os-specific/linux/kernel/linux-5.4.nix | 2 -- pkgs/os-specific/linux/kernel/linux-testing.nix | 2 -- 8 files changed, 16 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ce0bb98ad6ff..e1bde0657718 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -15,6 +15,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; sha256 = "0wdk93qv91pa6bd3ff1gv7manhkzh190c5blcpl14cbh9m2ms8vz"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 3d1beb7bd6df..39a1806ba072 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -15,6 +15,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; sha256 = "09ya7n0il8fipp8ksb8cyl894ihny2r75g70vbhclbv20q2pv0pj"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 146ff42c060e..f1f26e601d33 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -9,6 +9,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; sha256 = "12grr2vc2mcvy7k8w1apqs9mhfg0lvz6mrpksym234m4n5yy48ng"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index bbc5a58ec0cc..daafa08def49 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -9,6 +9,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; sha256 = "0am9qg9j18j4fc5zi6bk1g0mi8dp31pl62wlihxhhkc5yspzrna3"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 8e3108a9d24b..ef6ad320896b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -15,6 +15,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; sha256 = "0b8lwfjlyd6j0csk71v07bxb5lrrzp545g1wv6kdk0kzq6maxfq0"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 87be091cd4b7..c31fd591a875 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -15,6 +15,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; sha256 = "0za59652wrh4mlhd9w3dx4y1nnk8nrj9hb56pssgdckdvp7rp4l0"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 1433c5925a92..9b6da27876ba 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -15,6 +15,4 @@ buildLinux (args // rec { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; sha256 = "0zx3hj8fc0qpdmkn56cna5438wjxmj42a69msbkxlg4mnz6d0w84"; }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4e2ef7b4652e..2caea08416ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -14,8 +14,6 @@ buildLinux (args // rec { sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU="; }; - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_testing ]; - # Should the testing kernels ever be built on Hydra? extraMeta.hydraPlatforms = []; From 691cdc680c3d63493cdf7f55487afba1dd891e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 23 Aug 2021 20:06:30 +0200 Subject: [PATCH 088/239] yubico-pam: unstable-2019-07-01 -> 2.27 --- .../libraries/yubico-pam/default.nix | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index 1289b03618c6..e417de5e1ff0 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config -, asciidoc, libxslt, docbook_xsl -, pam, yubikey-personalization, libyubikey, libykclient }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, asciidoc +, libxslt +, docbook_xsl +, pam +, yubikey-personalization +, libyubikey +, libykclient +}: stdenv.mkDerivation rec { pname = "yubico-pam"; - version = "unstable-2019-07-01"; + version = "2.27"; src = fetchFromGitHub { owner = "Yubico"; repo = pname; - rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b"; - sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m"; + rev = version; + sha256 = "0hb773zlf11xz4bwmsqv2mq5d4aq2g0crdr5cp9xwc4ivi5gd4kg"; }; nativeBuildInputs = [ autoreconfHook pkg-config asciidoc libxslt docbook_xsl ]; From 9d143d5a3b54e820567a64102ee708a48c456b2d Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 23 Aug 2021 18:45:15 +0000 Subject: [PATCH 089/239] mirrors: oldsuse mirrors have been discontinued Signed-off-by: Arthur Gautier --- pkgs/build-support/fetchurl/mirrors.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index e5095478002a..8b84c254edb3 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -229,13 +229,6 @@ "http://archives.fedoraproject.org/pub/archive/fedora/" ]; - # Old SUSE distributions. Unfortunately there is no master site, - # since SUSE actually delete their old distributions (see - # ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt). - oldsuse = [ - "ftp://ftp.gmd.de/ftp.suse.com-discontinued/" - ]; - # openSUSE. opensuse = [ "http://opensuse.hro.nl/opensuse/distribution/" From 91db7bb1d0fe1cc15004604587a94b066fa78d49 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 23 Aug 2021 18:53:22 +0000 Subject: [PATCH 090/239] mirrors: refresh the mirrors list Some mirrors are gone, some migrated to http instead of ftp. Signed-off-by: Arthur Gautier --- pkgs/build-support/fetchurl/mirrors.nix | 42 ++++--------------------- 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 8b84c254edb3..1e3d9753794a 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -43,9 +43,9 @@ "http://ftp.nluug.nl/pub/gnu/" "http://mirrors.kernel.org/gnu/" - "ftp://mirror.cict.fr/gnu/" - "ftp://ftp.cs.tu-berlin.de/pub/gnu/" - "ftp://ftp.chg.ru/pub/gnu/" + "http://mirror.ibcp.fr/pub/gnu/" + "http://mirror.dogado.de/gnu/" + "http://mirror.tochlab.net/pub/gnu/" "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" # This one is the master repository, and thus it's always up-to-date. @@ -66,7 +66,6 @@ gnupg = [ "https://gnupg.org/ftp/gcrypt/" "http://www.ring.gr.jp/pub/net/" - "http://gd.tuwien.ac.at/privacy/" "http://mirrors.dotsrc.org/gcrypt/" "http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" "http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/" @@ -75,14 +74,13 @@ # kernel.org's /pub (/pub/{linux,software}) tree. kernel = [ "http://cdn.kernel.org/pub/" - "http://www.all.kernel.org/pub/" "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/" "http://linux-kernel.uio.no/pub/" "http://kernel.osuosl.org/pub/" "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; - # Mirrors from https://download.kde.org/extra/download-mirrors.html + # Mirrors from https://download.kde.org/ls-lR.mirrorlist kde = [ "https://download.kde.org/download.php?url=" "https://ftp.gwdg.de/pub/linux/kde/" @@ -90,7 +88,6 @@ "http://mirrors.mit.edu/kde/" "https://mirrors.ustc.edu.cn/kde/" "http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" - "ftp://ftp.kde.org/pub/kde/" ]; # Gentoo files. @@ -113,15 +110,12 @@ "http://ftp.cc.uoc.gr/mirrors/nongnu.org/" "http://nongnu.uib.no/" "http://mirrors.fe.up.pt/pub/nongnu/" - "http://mirror.lihnidos.org/GNU/savannah/" - "http://savannah.mirror.si/" "http://ftp.acc.umu.se/mirror/gnu.org/savannah/" "http://ftp.twaren.net/Unix/NonGNU/" "http://ftp.yzu.edu.tw/pub/nongnu/" "http://mirror.rackdc.com/savannah/" "http://savannah-nongnu-org.ip-connect.vn.ua/" "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" - "http://savannah.spinellicreations.com/" "http://gnu.mirrors.pair.com/savannah/savannah/" "ftp://mirror.easyname.at/nongnu/" "ftp://mirror2.klaus-uwe.me/nongnu/" @@ -129,11 +123,9 @@ "ftp://mirror.csclub.uwaterloo.ca/nongnu/" "ftp://mirror.cedia.org.ec/nongnu" "ftp://ftp.igh.cnrs.fr/pub/nongnu/" - "ftp://mirror6.layerjet.com/nongnu/" "ftp://mirror.netcologne.de/savannah/" "ftp://nongnu.uib.no/pub/nongnu/" "ftp://mirrors.fe.up.pt/pub/nongnu/" - "ftp://savannah.mirror.si/savannah/" "ftp://ftp.twaren.net/Unix/NonGNU/" "ftp://ftp.yzu.edu.tw/pub/nongnu/" "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" @@ -149,8 +141,6 @@ # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ "http://get.bitlbee.org/" - "http://get.bitlbee.be/" - "http://get.us.bitlbee.org/" "http://ftp.snt.utwente.nl/pub/software/bitlbee/" "http://bitlbee.intergenia.de/" ]; @@ -165,8 +155,6 @@ "ftp://ftp.imagemagick.org/pub/ImageMagick/" "http://ftp.fifi.org/ImageMagick/" "ftp://ftp.fifi.org/ImageMagick/" - "http://imagemagick.mirrorcatalogs.com/" - "ftp://imagemagick.mirrorcatalogs.com/imagemagick" ]; # CPAN mirrors. @@ -185,7 +173,6 @@ "http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" "http://mirrors.aliyun.com/centos-vault/" "https://mirror.chpc.utah.edu/pub/vault.centos.org/" - "https://mirror.its.sfu.ca/mirror/CentOS-vault/" "https://mirror.math.princeton.edu/pub/centos-vault/" "https://mirrors.tripadvisor.com/centos-vault/" ]; @@ -193,14 +180,10 @@ # Debian. debian = [ "http://httpredir.debian.org/debian/" - "ftp://ftp.au.debian.org/debian/" "ftp://ftp.de.debian.org/debian/" - "ftp://ftp.es.debian.org/debian/" "ftp://ftp.fr.debian.org/debian/" - "ftp://ftp.it.debian.org/debian/" "ftp://ftp.nl.debian.org/debian/" "ftp://ftp.ru.debian.org/debian/" - "ftp://ftp.debian.org/debian/" "http://ftp.debian.org/debian/" "http://archive.debian.org/debian-archive/debian/" "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" @@ -250,10 +233,8 @@ "http://ftp.unina.it/pub/linux/GNOME/" "http://fr2.rpmfind.net/linux/gnome.org/" "ftp://ftp.dit.upm.es/pub/GNOME/" - "ftp://ftp.no.gnome.org/pub/GNOME/" "http://ftp.acc.umu.se/pub/GNOME/" "http://ftp.belnet.be/mirror/ftp.gnome.org/" - "http://ftp.df.lth.se/pub/gnome/" "http://linorg.usp.br/gnome/" "http://mirror.aarnet.edu.au/pub/GNOME/" "ftp://ftp.cse.buffalo.edu/pub/Gnome/" @@ -283,7 +264,7 @@ # Apache mirrors (see http://www.apache.org/mirrors/). apache = [ "https://www-eu.apache.org/dist/" - "https://www-us.apache.org/dist/" + "https://ftp.wayne.edu/apache/" "http://www.eu.apache.org/dist/" "ftp://ftp.fu-berlin.de/unix/www/apache/" "http://ftp.tudelft.nl/apache/" @@ -298,13 +279,10 @@ postgresql = [ "http://ftp.postgresql.org/pub/" "ftp://ftp.postgresql.org/pub/" - "ftp://ftp-archives.postgresql.org/pub/" ]; metalab = [ - "ftp://mirrors.kernel.org/metalab/" "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.xemacs.org/sites/metalab.unc.edu/" ]; # Bioconductor mirrors (from http://bioconductor.org/about/mirrors) @@ -318,7 +296,6 @@ # http://watson.nci.nih.gov/bioc_mirror/ "http://bioconductor.jp/packages/" "http://bioconductor.statistik.tu-dortmund.de/packages/" - "http://mirrors.ebi.ac.uk/bioconductor/packages/" "http://mirrors.ustc.edu.cn/bioc/" ]; @@ -333,14 +310,12 @@ # Roy marples mirrors roy = [ "http://roy.marples.name/downloads/" - "http://roy.aydogan.net/" "http://cflags.cc/roy/" ]; # Sage mirrors (http://www.sagemath.org/mirrors.html) sageupstream = [ # Africa - "http://sagemath.polytechnic.edu.na/spkg/upstream/" "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/" "http://sagemath.mirror.ac.za/spkg/upstream/" "https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/" @@ -359,7 +334,6 @@ "http://linorg.usp.br/sage/spkg/upstream" # Asia - "http://sage.asis.io/spkg/upstream/" "http://mirror.hust.edu.cn/sagemath/spkg/upstream/" "https://ftp.iitm.ac.in/sage/spkg/upstream/" "http://ftp.kaist.ac.kr/sage/spkg/upstream/" @@ -371,11 +345,10 @@ "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/" # Australia - "http://echidna.maths.usyd.edu.au/sage/spkg/upstream/" + "http://mirror.aarnet.edu.au/pub/sage/spkg/upstream/" # Europe "http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/" - "http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/" "http://mirror.switch.ch/mirror/sagemath/spkg/upstream/" "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/" "http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/" @@ -392,8 +365,6 @@ "http://ftp.openbsd.org/pub/OpenBSD/" "ftp://ftp.nluug.nl/pub/OpenBSD/" "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" - "ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/" - "ftp://mirror.switch.ch/pub/OpenBSD/" ]; # Steam Runtime mirrors @@ -432,6 +403,5 @@ "ftp://ftp.alsa-project.org/pub/" "http://alsa.cybermirror.org/" "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" - "http://alsa.mirror.fr/" ]; } From 094fbf06263d767e72d23a81e033f18b83ef2213 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 21:05:14 +0200 Subject: [PATCH 091/239] sx-go: init at 0.4.0 --- pkgs/tools/security/sx-go/default.nix | 35 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/sx-go/default.nix diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix new file mode 100644 index 000000000000..c9dbb6559857 --- /dev/null +++ b/pkgs/tools/security/sx-go/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, libpcap +}: + +buildGoModule rec { + pname = "sx-go"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "v-byte-cpu"; + repo = "sx"; + rev = "v${version}"; + sha256 = "0djpwy40wj5asky8a16i7a117816p8g94p5y0wkl74jp07cybmrl"; + }; + + vendorSha256 = "0n1h9jch0zfafli8djjr6wkgfxxpnh4q873d5mr1xg8a25qhlifr"; + + buildInputs = [ + libpcap + ]; + + postFixup = '' + # Rename binary to avoid conflict with sx + mv $out/bin/sx $out/bin/${pname} + ''; + + meta = with lib; { + description = "Command-line network scanner"; + homepage = "https://github.com/v-byte-cpu/sx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30db04579be1..ab2eb2f78d07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -891,6 +891,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + sx-go = callPackage ../tools/security/sx-go { }; + tfk8s = callPackage ../tools/misc/tfk8s { }; tnat64 = callPackage ../tools/networking/tnat64 { }; From 811af99f75f55097207020678d4dd0ec479040ca Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Mon, 23 Aug 2021 12:23:59 -0700 Subject: [PATCH 092/239] unixODBC: Add additional URL --- pkgs/development/libraries/unixODBC/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index ef70f4b2c37f..2ab717782e51 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { version = "2.3.9"; src = fetchurl { - url = "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"; + urls = [ + "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" + "http://www.unixodbc.org/${pname}-${version}.tar.gz" + ]; sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; }; From 72dfe22cbdd5b8f43f3160fa6b34c25d9b9ffd5f Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Mon, 23 Aug 2021 15:31:14 -0400 Subject: [PATCH 093/239] android-studio: 2020.3.1.22 -> 2020.3.1.23 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 84e1c77603ed..f31265c2e4c1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.22"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "0xkjnhq1vvrglcbab90mx5xw1q82lkkvyp6y2ap5jypdfsc7pnsa"; + version = "2020.3.1.23"; # "Android Studio Arctic Fox (2020.3.1)" + sha256Hash = "06xjdibb5lxiga3jg9akmvbazjwk11akyhy3g4pc562hcifsa5sk"; }; betaVersion = { version = "2020.3.1.21"; # "Android Studio Arctic Fox (2020.3.1) RC 1" From 241a422f46d00621e3134799baf53c4b0995e1ef Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 23 Aug 2021 14:26:03 -0600 Subject: [PATCH 094/239] sublime-music: 0.11.12 -> 0.11.13 --- pkgs/applications/audio/sublime-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 3d25ec3cdbb0..5c9250b45e03 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "sublime-music"; - version = "0.11.12"; + version = "0.11.13"; format = "pyproject"; src = fetchFromGitLab { owner = "sublime-music"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fcEdpht+xKJRTaD3gKoRdf6O2SAPlZHZ61Jy8bdTKjs="; + sha256 = "sha256-NzbQtRcsRVppyuG1UuS3IidSnniUOavf5YoAf/kcZqw="; }; nativeBuildInputs = [ From fa80ed695b44e91cb69ea087ef614cbb1a310286 Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Mon, 23 Aug 2021 22:30:54 +0200 Subject: [PATCH 095/239] nixos/paperless-ng: allow using postgresql via a unix socket --- nixos/modules/services/misc/paperless-ng.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless-ng.nix index 9eaf8fa8859c..0434b222d334 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless-ng.nix @@ -29,6 +29,7 @@ let "-/etc/nsswitch.conf" "-/etc/hosts" "-/etc/localtime" + "-/run/postgresql" ]; BindPaths = [ cfg.consumptionDir @@ -60,7 +61,7 @@ let ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; From 1825aae2788b49aaecb5a8aa315cdf545433e399 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Mon, 23 Aug 2021 20:47:58 +0000 Subject: [PATCH 096/239] mirrors: get a second mirror for metalab Signed-off-by: Arthur Gautier --- pkgs/build-support/fetchurl/mirrors.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 1e3d9753794a..8dc4f4207b6c 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -283,6 +283,7 @@ metalab = [ "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" ]; # Bioconductor mirrors (from http://bioconductor.org/about/mirrors) From 99a3addb2bab7b0acaaf5488ce95369ce51e32c7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 21 Aug 2021 06:49:39 +1000 Subject: [PATCH 097/239] podman: 3.2.3 -> 3.3.0 https://github.com/containers/podman/releases/tag/v3.3.0 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index e604cb259201..a21485e984cf 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "3.2.3"; + version = "3.3.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-P8/4jehfcjM+r/pwW6fxrwquMVUqXxvvTur7Tesjmnc="; + sha256 = "sha256-EDNpGDjsXULwtUYFLh4u6gntK//rsLLpYgpxRt4R1kc="; }; vendorSha256 = null; From 928cee3856c23e4380e8e9f8e7511cb50b474d77 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:58:18 +1000 Subject: [PATCH 098/239] gvproxy: init at 0.1.0 --- pkgs/tools/networking/gvproxy/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/networking/gvproxy/default.nix diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix new file mode 100644 index 000000000000..662f909b6245 --- /dev/null +++ b/pkgs/tools/networking/gvproxy/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "gvproxy"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "gvisor-tap-vsock"; + rev = "v${version}"; + sha256 = "sha256-cXaX7A8Wgq/PEHnFrparZjOKdENX3pWWXYfrEuFLDx0="; + }; + + vendorSha256 = null; + + buildPhase = '' + runHook preBuild + make build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install bin/* -Dt $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Network stack based on gVisor"; + homepage = "https://github.com/containers/gvisor-tap-vsock"; + license = licenses.asl20; + maintainers = with maintainers; [ ] ++ teams.podman.members; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb734bd3ddf6..7e5f3ba1b906 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5749,6 +5749,8 @@ with pkgs; gvolicon = callPackage ../tools/audio/gvolicon {}; + gvproxy = callPackage ../tools/networking/gvproxy { }; + gzip = callPackage ../tools/compression/gzip { }; gzrt = callPackage ../tools/compression/gzrt { }; From d7f344b5b086addc69f5d1cb87d30b48057f4000 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:58:51 +1000 Subject: [PATCH 099/239] podman: add gvproxy to darwin wrapper --- pkgs/applications/virtualization/podman/wrapper.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 820e8ad18bcc..400232d2246d 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -14,6 +14,7 @@ , cni-plugins # not added to path , iptables , iproute2 +, gvproxy , qemu , xz }: @@ -31,6 +32,7 @@ let iptables iproute2 ] ++ lib.optionals stdenv.isDarwin [ + gvproxy qemu xz ] ++ extraPackages); From d18866b1c2cd86fde5586b38a5574e55748c62f7 Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 23 Aug 2021 23:23:52 +0200 Subject: [PATCH 100/239] nasc: 0.7.5 -> 0.8.0 --- pkgs/applications/science/math/nasc/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index b55e4047fe47..431668f0c583 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -21,26 +21,16 @@ stdenv.mkDerivation rec { pname = "nasc"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "parnold-x"; repo = pname; rev = version; - sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA="; + sha256 = "02b9a59a9fzsb6nn3ycwwbcbv04qfzm6x7csq2addpzx5wak6dd8"; fetchSubmodules = true; }; - patches = [ - # fix compilation with gcc10 - (fetchpatch { - url = "https://github.com/parnold-x/libqalculate/commit/4fa8f2cceada128ef19f82407226b2c230b780d5.patch"; - extraPrefix = "subprojects/libqalculate/"; - stripLen = "1"; - sha256 = "0kbff623zl0s6yx5avx068f2apwzxzvihjahja4qhlkqkhhzj9dm"; - }) - ]; - nativeBuildInputs = [ glib # post_install.py gtk3 # post_install.py From fc5bfd684498383bedaf8151c7103b34b2819b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 23:08:21 +0200 Subject: [PATCH 101/239] unbound: unify unbound and pyunbound source and also update both at the same time --- pkgs/tools/networking/unbound/default.nix | 2 +- pkgs/tools/networking/unbound/python.nix | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 2e31fadba377..249376abbb06 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { version = "1.13.1"; src = fetchurl { - url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; }; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 921254be2a7d..067f5d2b417b 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -1,16 +1,11 @@ -{ lib, stdenv, fetchurl, openssl, expat, libevent, swig, pythonPackages }: +{ lib, stdenv, unbound, openssl, expat, libevent, swig, pythonPackages }: let inherit (pythonPackages) python; in stdenv.mkDerivation rec { pname = "pyunbound"; - version = "1.13.2"; - - src = fetchurl { - url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM="; - }; + inherit (unbound) version src; nativeBuildInputs = [ swig ]; From ac47659bde28ef2f9b600e9e1b0f4915d0340161 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 24 Aug 2021 00:47:39 +0300 Subject: [PATCH 102/239] =?UTF-8?q?qgis:=203.16.9=20=E2=86=92=203.16.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index b32dd4c8fe2f..bdd8ace1e3d5 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -24,7 +24,7 @@ let six ]; in mkDerivation rec { - version = "3.16.9"; + version = "3.16.10"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -32,7 +32,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-Y9WVgKEMOSMaXxfC9EQ8yqBYEj4XNL7YdMp8vjV55d0="; + sha256 = "sha256-/lsfyTDlkZNIVHg5qgZW7qfOyTC2+1r3ZbsnQmEdy30="; }; passthru = { From 3f4ce46a4702940cb7d1d12349c0407576225605 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Fri, 20 Aug 2021 12:24:39 -0400 Subject: [PATCH 103/239] lib: optimize setAttrByPath and cleaup imports - Remove inheritance of `lists.fold` as it isn't used anywhere. - Inherit `foldl'` for consistency as only `cartesianProductOfSets` explicitly reference lib. - Inline `foldr` to generate nested attrs instead of using `listToAttrs` and `tail`. --- lib/attrsets.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 0b61819f6b4b..31fddc59e20e 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -5,7 +5,7 @@ let inherit (builtins) head tail length; inherit (lib.trivial) and; inherit (lib.strings) concatStringsSep sanitizeDerivationName; - inherit (lib.lists) fold foldr concatMap concatLists; + inherit (lib.lists) foldr foldl' concatMap concatLists elemAt; in rec { @@ -55,10 +55,13 @@ rec { => { a = { b = 3; }; } */ setAttrByPath = attrPath: value: - if attrPath == [] then value - else listToAttrs - [ { name = head attrPath; value = setAttrByPath (tail attrPath) value; } ]; - + let + len = length attrPath; + atDepth = n: + if n == len + then value + else { ${elemAt attrPath n} = atDepth (n + 1); }; + in atDepth 0; /* Like `attrByPath' without a default value. If it doesn't find the path it will throw. @@ -195,7 +198,7 @@ rec { ] */ cartesianProductOfSets = attrsOfLists: - lib.foldl' (listOfAttrs: attrName: + foldl' (listOfAttrs: attrName: concatMap (attrs: map (listValue: attrs // { ${attrName} = listValue; }) attrsOfLists.${attrName} ) listOfAttrs From 3692a0a365a517d9009e7897447d3d208439ec84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 00:34:53 +0200 Subject: [PATCH 104/239] python3Packages.pymyq: 3.1.2 -> 3.1.3 --- pkgs/development/python-modules/pymyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 917eac02c5f9..04a8b596e844 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.2"; + version = "3.1.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DvwnbZa1/Y08rrxdXgffkjaGAVdRkPmYCD+Xkv0h7OE="; + sha256 = "sha256-V2u2wUSPwiF6o6OWhQVKiHtzhn0/rzyM6e2+a+D7UNA="; }; propagatedBuildInputs = [ From befe89f3d79848fcd15e9447ec5387aa69bbfc85 Mon Sep 17 00:00:00 2001 From: kzvi <38590027+kzvi@users.noreply.github.com> Date: Mon, 23 Aug 2021 15:43:00 -0700 Subject: [PATCH 105/239] lean: 3.31.0 -> 3.32.1 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ea2cd356e315..5c6ad241cb76 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.31.0"; + version = "3.32.1"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "333783350cd3fe38f25fed1da7d6a433d8f85b77"; - sha256 = "sha256-N8Ju7pSGssvt84/0e1o6G/p7fWM1c0Mzw+ftL1/++J4="; + rev = "35b3a9c4e2d35cccb5ed220ea2f2909a4ed2ca90"; + sha256 = "0s69smknsvycvydbk2f3vcqj1z3jrbv3k048z2r46391dai5iwhf"; }; nativeBuildInputs = [ cmake ]; From 2b81dc4fb65326d41258ee3920cefa13d1825d3c Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Mon, 23 Aug 2021 23:01:01 +0000 Subject: [PATCH 106/239] python-packages.nix: fix alphabetical order --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..6c828ee3d430 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5084,10 +5084,10 @@ in { openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { }; - opt-einsum = callPackage ../development/python-modules/opt-einsum { }; - opsdroid_get_image_size = callPackage ../development/python-modules/opsdroid_get_image_size { }; + opt-einsum = callPackage ../development/python-modules/opt-einsum { }; + optuna = callPackage ../development/python-modules/optuna { }; opuslib = callPackage ../development/python-modules/opuslib { }; From 1b965cd21019a1e431bac68a7baa6b27778d111e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 01:30:04 +0200 Subject: [PATCH 107/239] python3Packages.mutf8: init at 1.0.3 --- .../python-modules/mutf8/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/mutf8/default.nix diff --git a/pkgs/development/python-modules/mutf8/default.nix b/pkgs/development/python-modules/mutf8/default.nix new file mode 100644 index 000000000000..e25d5a893863 --- /dev/null +++ b/pkgs/development/python-modules/mutf8/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mutf8"; + version = "1.0.3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "TkTech"; + repo = pname; + rev = "v${version}"; + sha256 = "0p9xczkhrf9d3n44k6kxbnk9sm831k5gkiagk6vm75vcmzm7zdqc"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + # Using pytestCheckHook results in test failures + pytest + ''; + + pythonImportsCheck = [ "mutf8" ]; + + meta = with lib; { + description = "Fast MUTF-8 encoder & decoder"; + homepage = "https://github.com/TkTech/mutf8"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..9ea2b1f41c93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4704,6 +4704,8 @@ in { mutesync = callPackage ../development/python-modules/mutesync { }; + mutf8 = callPackage ../development/python-modules/mutf8 { }; + mwclient = callPackage ../development/python-modules/mwclient { }; mwdblib = callPackage ../development/python-modules/mwdblib { }; From 77c4c522558dd46981c4b8853612609fdf32c4cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 01:33:16 +0200 Subject: [PATCH 108/239] python3Packages.pyftdi: 0.53.2 -> 0.53.3 --- pkgs/development/python-modules/pyftdi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index aee3ede4fccf..a1fd4215faf9 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.2"; + version = "0.53.3"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6cTQlYG/z8ZulMZLggGQ+PhuOOclWM0/+cfy0SF6dls="; + sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; }; propagatedBuildInputs = [ pyusb pyserial ]; From 239b1d4de2f9024c82955693fa541fd9d1533e48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 01:35:56 +0200 Subject: [PATCH 109/239] python3Packages.pyezviz: 0.1.9.1 -> 0.1.9.2 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index ebd0dc2aeb03..1c2593d5a6df 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.1.9.1"; + version = "0.1.9.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-KsdJC09KugvAgkRZ5H5zrIJ5hC5Vt4QwGWML8kNnR7Y="; + sha256 = "sha256-t5b2PuHC+ZY2uh+ryS+bjTS7kReZi0Rvlvkr98JFyH4="; }; propagatedBuildInputs = [ From 6ae24c90f0b9173243e5c6ec5b8e4a91f9051145 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 18 Aug 2021 21:04:56 -0400 Subject: [PATCH 110/239] python3Packages.hydra: 0.11.3 -> 1.1.1 --- .../python-modules/hydra/default.nix | 28 +++++++++++-------- .../python-modules/omegaconf/default.nix | 12 +++++--- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 42f2812a6e1d..5fb15be0a3f9 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -1,24 +1,30 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, omegaconf, pathlib2 }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook +, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }: buildPythonPackage rec { pname = "hydra"; - version = "0.11.3"; + version = "1.1.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "facebookresearch"; repo = pname; - rev = version; - sha256 = "0plbls65qfrvvigza3qvy0pwjzgkz8ylpgb1im14k3b125ny41ad"; + rev = "v${version}"; + sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2; + nativeBuildInputs = [ jre_headless ]; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ] + ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkPhase = '' - runHook preCheck - pytest tests/ - runHook postCheck - ''; + # test environment setup broken under Nix for a few tests: + disabledTests = [ + "test_bash_completion_with_dot_in_path" + "test_install_uninstall" + ]; + disabledTestPaths = [ "tests/test_hydra.py" ]; meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 72823b013fc2..13f3981955cd 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,11 +1,11 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest-mock -, pytestCheckHook, pyyaml, isPy27, jre_minimal, antlr4-python3-runtime }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook +, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }: buildPythonPackage rec { pname = "omegaconf"; version = "2.1.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omry"; @@ -14,8 +14,12 @@ buildPythonPackage rec { sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI="; }; + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]' + ''; + checkInputs = [ pytestCheckHook pytest-mock ]; - nativeBuildInputs = [ jre_minimal pytest-runner ]; + nativeBuildInputs = [ jre_minimal ]; propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs From f8df7606683fc9fbce68c8c363d1318dab2ed199 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 03:00:39 +0200 Subject: [PATCH 111/239] nixos/octoprint: allow access to serial devices Printers are usually connected over USB to serial interfaces that are mounted as tty character devices owned by the dialout group. Add our octoprint service to this group at runtime to allow access to these printers. --- nixos/modules/services/misc/octoprint.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index c926d889b37a..7129ac69527f 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -122,6 +122,9 @@ in ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; + SupplementaryGroups = [ + "dialout" + ]; }; }; From fb7f2f03e9ee4df056197106d85feeff16c2722e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 01:58:34 +0000 Subject: [PATCH 112/239] chezmoi: 2.1.5 -> 2.1.6 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a308977db4d5..ff9e7a001333 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-zMmQxg+Qdb4pu+gzouz/lpIu6/u+GaYPhIet7xAgTIk="; + sha256 = "sha256-6BzocbG7I3ZHlPGZ2GRY/n9ezRF2OER9BFaoIq0yBro="; }; - vendorSha256 = "sha256-9vLOJOWsa6XADvWBLZKlyenqfDSvHuh5Ron4FE2tY7Y="; + vendorSha256 = "sha256-i20Zt1ZP1ij1Qp4moNZqUTQOHPlchonFF7ag5qjMoqg="; doCheck = false; From 75b6f0cb363d1b938671f535677bc88d6074ec8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 02:36:16 +0000 Subject: [PATCH 113/239] cpufetch: 0.98 -> 1.00 --- pkgs/tools/misc/cpufetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/cpufetch/default.nix b/pkgs/tools/misc/cpufetch/default.nix index 4473738ac76c..46c485f52991 100644 --- a/pkgs/tools/misc/cpufetch/default.nix +++ b/pkgs/tools/misc/cpufetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cpufetch"; - version = "0.98"; + version = "1.00"; src = fetchFromGitHub { owner = "Dr-Noob"; repo = "cpufetch"; rev = "v${version}"; - sha256 = "060hmkwmb5ybcrj9jfx9681zk92489kq71nl6nacn8nfqrcn3qdb"; + sha256 = "sha256-2Iar7RwL3T4DrFbqKJFys/R+VENRg2lmYFkslEaZeVE="; }; nativeBuildInputs = [ installShellFiles ]; From bd51f857d8450becb1e69a38764bd6ff28f29da9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 03:26:31 +0000 Subject: [PATCH 114/239] deno: 1.13.1 -> 1.13.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 875b85f6bdc8..71252c850818 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5/n4DpTWPwCVfTk0rqxPhKaKXu3KqotgiYCj8tRAqaM="; + sha256 = "sha256-qAUQOTqVNTUSmKXoCwId4Bm6ashLLpY0QEWr8gyXxR4="; }; - cargoSha256 = "sha256-FY8qXqVDKxai4VwdruJ7aBNTdXK5taOuvTr6gTgU8BM="; + cargoSha256 = "sha256-pwP5XbWuK0g45zmamWUO9kiY8gzoNqk7nC7aGTCFhyY="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From e369479c1411e0812fbcaf5ced9f194a6a0cecf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 03:35:36 +0000 Subject: [PATCH 115/239] disfetch: 2.13 -> 2.14 --- pkgs/tools/misc/disfetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/disfetch/default.nix b/pkgs/tools/misc/disfetch/default.nix index 13e60072adee..f3d114ab9c9f 100644 --- a/pkgs/tools/misc/disfetch/default.nix +++ b/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.13"; + version = "2.14"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-+0WWhf7VYqPWgt1IwKQ74HLCLfhXsstA7Eh9VU/BKhg="; + sha256 = "sha256-T6FepZBlB1ZZMVFS7zXqSDFCsHbbVNkJNwIHpQ5Ex68="; }; dontBuild = true; From 70b7560f9387b12d03260dabb475b9933f845fba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 03:59:26 +0000 Subject: [PATCH 116/239] enum4linux-ng: 1.0.0 -> 1.0.1 --- pkgs/tools/security/enum4linux-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/enum4linux-ng/default.nix b/pkgs/tools/security/enum4linux-ng/default.nix index 33694ad79ae3..d2fda127e8c7 100644 --- a/pkgs/tools/security/enum4linux-ng/default.nix +++ b/pkgs/tools/security/enum4linux-ng/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "enum4linux-ng"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "cddmp"; repo = pname; rev = "v${version}"; - sha256 = "0dhg8cwbdn0vlnchhscx31ay4mgj5p6rf73wzgs8nvqg0shsawmy"; + sha256 = "1j6qrhrzc4f9crbii4dpgxipngjh5icrhljxf26a7662dd4f7l8q"; }; propagatedBuildInputs = [ From 0039dff71d8306ffa6f03959ea71e949dd7144e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 04:08:29 +0000 Subject: [PATCH 117/239] python38Packages.google-cloud-access-context-manager: 0.1.6 -> 0.1.7 --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 470ec41f8365..166ad2c84e85 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; + sha256 = "02adf212c8d280298ffe03a0c91743618693ec394b42cbb85b4a29f8d9544afa"; }; propagatedBuildInputs = [ google-api-core ]; From 2e44dc9a9c3db63dabf6cfd19d2a82f869cdd2c6 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 24 Aug 2021 06:51:43 +0200 Subject: [PATCH 118/239] google-cloud-sdk-gce: override python to 3.8 As the pytohn passed in py default seems to brreak the `boto` dependency. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e57dc21048c9..2453cf7a4629 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5528,7 +5528,10 @@ with pkgs; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { python = python3; }; - google-cloud-sdk-gce = google-cloud-sdk.override { with-gce = true; }; + google-cloud-sdk-gce = google-cloud-sdk.override { + python = python38; + with-gce = true; + }; google-fonts = callPackage ../data/fonts/google-fonts { }; From 5086f1dc3308d13e7d7b9cd54a39879463d361fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 05:17:16 +0000 Subject: [PATCH 119/239] python38Packages.emcee: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/emcee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 72cb9a64db0a..f41bfae5942e 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dfm"; repo = pname; rev = "v${version}"; - sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0"; + sha256 = "0q9dj7mihjjkcy6famzwhz1xcxxzzvm00n01w4bbm66ax9zvis52"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 76a5135b8e2d246700be37a566180b8888c0743b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 09:18:18 +0200 Subject: [PATCH 120/239] tarsnapper: add meta --- pkgs/tools/backup/tarsnapper/default.nix | 42 +++++++++++++++++++----- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index a5ad2c3625c1..d793017ad873 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -1,25 +1,49 @@ -{ python3Packages, fetchFromGitHub , tarsnap }: +{ lib +, python3Packages +, fetchFromGitHub +, tarsnap +}: python3Packages.buildPythonApplication rec { - name = "tarsnapper-${version}"; + pname = "tarsnapper"; version = "0.4"; src = fetchFromGitHub { owner = "miracle2k"; - repo = "tarsnapper"; + repo = pname; rev = version; sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm"; }; - checkInputs = with python3Packages; [ nose pytest ]; + propagatedBuildInputs = with python3Packages; [ + pyyaml + python-dateutil + pexpect + ]; + + checkInputs = with python3Packages; [ + nose + ]; + + patches = [ + # Remove standard module argparse from requirements + ./remove-argparse.patch + ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ tarsnap ]}" ]; checkPhase = '' - py.test . + runHook preCheck + nosetests tests + runHook postCheck ''; - propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ]; + pythonImportsCheck = [ "tarsnapper" ]; - patches = [ ./remove-argparse.patch ]; - - makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"]; + meta = with lib; { + description = "Wrapper which expires backups using a gfs-scheme"; + homepage = "https://github.com/miracle2k/tarsnapper"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; } From 1acdcbbec7ae479b3daadcaa3cea4e1fba7ca746 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 07:29:59 +0000 Subject: [PATCH 121/239] kafkacat: 1.6.0 -> 1.7.0 --- pkgs/development/tools/kafkacat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 5493bf24428d..b60c36df7254 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kafkacat"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "kafkacat"; rev = version; - sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; + sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8="; }; nativeBuildInputs = [ pkg-config ]; From ffd387cb56ae99cc7f0a23bb6792c1c409c4caca Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Aug 2021 22:37:32 +0200 Subject: [PATCH 122/239] =?UTF-8?q?ocamlPackages.torch:=200.12=20=E2=86=92?= =?UTF-8?q?=200.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/torch/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 4126e3304861..1cf84dd4938e 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -17,17 +17,17 @@ buildDunePackage rec { pname = "torch"; - version = "0.12"; + version = "0.13"; useDune2 = true; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "0nl6hd2rivhgkc3sdkdmrk3j0ij3xjx1clhqm8m5iznir4g77g91"; + sha256 = "0528h1mkrqbmbf7hy91dsnxcg0k55m3jgharr71c652xyd847yz7"; }; buildInputs = [ dune-configurator ]; @@ -56,6 +56,5 @@ buildDunePackage rec { description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; license = licenses.asl20; - broken = true; }; } From 59c2ffd586d4c9396fda8e796760d158c84e2987 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 09:44:02 +0200 Subject: [PATCH 123/239] python3Packages.staticjinja: switch to poetry-core --- pkgs/development/python-modules/staticjinja/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 2223f4b6c529..bce5316187e7 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -1,14 +1,16 @@ { lib , fetchFromGitHub , buildPythonPackage -, poetry +, poetry-core , docopt-ng , easywatch , jinja2 , pytestCheckHook , pytest-check +, pythonOlder , markdown , testVersion +, tomlkit , staticjinja }: @@ -17,6 +19,8 @@ buildPythonPackage rec { version = "4.1.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; + # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; @@ -26,7 +30,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ @@ -39,6 +43,7 @@ buildPythonPackage rec { pytestCheckHook pytest-check markdown + tomlkit ]; # The tests need to find and call the installed staticjinja executable From ae9044494a3df2e653f0579387a82a14cf7441ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 10:07:14 +0200 Subject: [PATCH 124/239] python3Packages.aioesphomeapi: 6.1.0 -> 7.0.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index f1033e9e5ba0..b2641cfcbd0b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "6.1.0"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C799JoW58mmwHeoXLMJ5pYg8hjaZqVBqrbxBXpmF/mQ="; + sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; }; propagatedBuildInputs = [ From 435a9dc3e4981ae86e303d9e52aaafe57a05a33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 22:28:55 +0200 Subject: [PATCH 125/239] python39Packages.google-cloud-access-context-manager: fix depedency pin --- .../google-cloud-access-context-manager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 470ec41f8365..7b33ee56caf4 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -9,6 +9,11 @@ buildPythonPackage rec { sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" + ''; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo From 0d51339e962e3304460e87ad700436e3cb23215f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 23:29:11 +0200 Subject: [PATCH 126/239] python39Packages.google-cloud-bigquery: disable tests which require credentials --- .../python-modules/google-cloud-bigquery/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index f30fa659720c..21d356f7f7c9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -53,6 +53,12 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_query_retry_539" + "test_query_retry_539" + "test_list_rows_empty_table" + "test_list_rows_page_size" + "test_list_rows_scalars" + "test_list_rows_scalars_extreme" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network From e24194df1c346684cee39821c6a399f01a6dc1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 10:16:33 +0200 Subject: [PATCH 127/239] python39Packages.google-cloud-firestore: 2.2.0 -> 2.3.0 --- .../python-modules/google-cloud-firestore/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 87bd997ae88f..8c4b964b2b83 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; + sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; }; propagatedBuildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { # Tests are broken "tests/system/test_system.py" "tests/system/test_system_async.py" + # requires credentials + "tests/unit/v1/test_bulk_writer.py" ]; disabledTests = [ From ca8482a6a72676487bee5b8a2ef97f8200c7342d Mon Sep 17 00:00:00 2001 From: Flakebi Date: Mon, 23 Aug 2021 23:27:57 +0200 Subject: [PATCH 128/239] paperless-ng: 1.4.5 -> 1.5.0 --- pkgs/applications/office/paperless-ng/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 66a548545b3e..e84b3c794433 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -40,20 +40,18 @@ let in py.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ng"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/jonaswinkler/paperless-ng/releases/download/ng-${version}/${pname}-${version}.tar.xz"; - sha256 = "2PJb8j3oimlfiJ3gqjK6uTemzFdtAP2Mlm5RH09bx/E="; + sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; }; format = "other"; # Make bind address configurable - # Fix tests with Pillow 8.3.1: https://github.com/jonaswinkler/paperless-ng/pull/1183 - prePatch = '' + postPatch = '' substituteInPlace gunicorn.conf.py --replace "bind = '0.0.0.0:8000'" "" - substituteInPlace src/paperless_tesseract/parsers.py --replace "return x" "return round(x)" ''; propagatedBuildInputs = with py.pkgs.pythonPackages; [ From 96ddd482396b3ed41983dc3710ad025ebd9c73fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Aug 2021 02:33:22 +0200 Subject: [PATCH 129/239] wezterm: cleanup depedencies, drop steveej from maintainers --- .../terminal-emulators/wezterm/default.nix | 81 +++++++------------ 1 file changed, 30 insertions(+), 51 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 7fdb33570722..e67e28662fd1 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -4,24 +4,18 @@ , fetchFromGitHub , ncurses , pkg-config -, fontconfig , python3 +, fontconfig , openssl -, perl -, dbus +, libGL , libX11 -, xcbutil , libxcb +, libxkbcommon +, xcbutil , xcbutilimage , xcbutilkeysyms -, xcbutilwm # contains xcb-ewmh among others -, libxkbcommon -, libglvnd # libEGL.so.1 -, egl-wayland +, xcbutilwm , wayland -, libGLU -, libGL -, freetype , zlib # Apple frameworks , CoreGraphics @@ -29,48 +23,21 @@ , Foundation , libiconv }: -let - runtimeDeps = [ - zlib - fontconfig - freetype - ] ++ lib.optionals stdenv.isLinux [ - libX11 - xcbutil - libxcb - xcbutilimage - xcbutilkeysyms - xcbutilwm - libxkbcommon - dbus - libglvnd - egl-wayland - wayland - libGLU - libGL - openssl - ] ++ lib.optionals stdenv.isDarwin [ - Foundation - CoreGraphics - Cocoa - libiconv - ]; -in rustPlatform.buildRustPackage rec { pname = "wezterm"; version = "20210814-124438-54e29167"; + outputs = [ "out" "terminfo" ]; + src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; - sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE="; fetchSubmodules = true; + sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE="; }; - outputs = [ "out" "terminfo" ]; - postPatch = '' echo ${version} > .tag ''; @@ -80,11 +47,28 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config python3 - perl - ncurses + ncurses # tic for terminfo ]; - buildInputs = runtimeDeps; + buildInputs = [ + fontconfig + zlib + ] ++ lib.optionals stdenv.isLinux [ + libX11 + libxcb + libxkbcommon + openssl + wayland + xcbutil + xcbutilimage + xcbutilkeysyms + xcbutilwm # contains xcb-ewmh among others + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + CoreGraphics + Foundation + libiconv + ]; postInstall = '' # terminfo @@ -102,9 +86,7 @@ rustPlatform.buildRustPackage rec { ''; preFixup = lib.optionalString stdenv.isLinux '' - for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do - patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $out/bin/$artifact - done + patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui '' + lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" @@ -114,14 +96,11 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" ''; - # prevent further changes to the RPATH - dontPatchELF = true; - meta = with lib; { description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; license = licenses.mit; - maintainers = with maintainers; [ steveej SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; }; } From 15d14ad1500e645b98fd4cfa73e301697580d11a Mon Sep 17 00:00:00 2001 From: Andreas Fuchs Date: Tue, 24 Aug 2021 05:23:39 -0400 Subject: [PATCH 130/239] github-runner: Allow configuring the package to use (#134661) This addresses #120263 in part, by allowing users to override the github-runner derivation that is bound to turn non-functional via the self-update mechanism. (And it'll allow using a buildFHSUserEnv-based derivation, if someone ends up building that!) --- .../continuous-integration/github-runner.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index 9627b723f8f1..f951c1553235 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -98,6 +98,14 @@ in ''; default = [ ]; }; + + package = mkOption { + type = types.package; + description = '' + Which github-runner derivation to use. + ''; + default = pkgs.github-runner; + }; }; config = mkIf cfg.enable { @@ -131,7 +139,7 @@ in ] ++ cfg.extraPackages; serviceConfig = rec { - ExecStart = "${pkgs.github-runner}/bin/runsvc.sh"; + ExecStart = "${cfg.package}/bin/runsvc.sh"; # Does the following, sequentially: # - Copy the current and the previous `tokenFile` to the $RUNTIME_DIRECTORY @@ -208,7 +216,7 @@ in if [[ -z "$empty" ]]; then echo "Configuring GitHub Actions Runner" token=$(< "$RUNTIME_DIRECTORY"/${newConfigTokenFilename}) - RUNNER_ROOT="$STATE_DIRECTORY" ${pkgs.github-runner}/bin/config.sh \ + RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \ --unattended \ --work "$RUNTIME_DIRECTORY" \ --url ${escapeShellArg cfg.url} \ From 9724dcff6288e2d063c41890885014ca053672ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 09:41:30 +0000 Subject: [PATCH 131/239] mark: 6.0 -> 6.2 --- pkgs/tools/text/mark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index d289e56bf925..04b08488ee91 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "6.0"; + version = "6.2"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-zap6YE6Pi/Db0mY4jagJXB1JXhs7q3y3BNw9EucJkAM="; + sha256 = "sha256-Nk7DbZdz8BbsZO/Sx36ALNXRtSUju3X6S8M0yFs+Yz0="; }; vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; From 5ebc1a0582593da76606a464550b2df3ce2a88c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 09:44:47 +0000 Subject: [PATCH 132/239] python38Packages.owslib: 0.24.1 -> 0.25.0 --- pkgs/development/python-modules/owslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index ea80fade1411..07c6bfedbb2c 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.24.1"; + version = "0.25.0"; src = fetchPypi { inherit pname version; - sha256 = "4973c2ba65ec850a3fcc1fb94cefe5ed2fed83aaf2a5e2135c78810ad2a8f0e1"; + sha256 = "20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a"; }; buildInputs = [ pytest ]; From 3cd570dfcd3f7be23e816f91dccee0d7637759cd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 23 Aug 2021 08:15:44 +0200 Subject: [PATCH 133/239] ocamlPackages.tezos-stdlib: fix hash --- pkgs/development/ocaml-modules/tezos/stdlib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/tezos/stdlib.nix b/pkgs/development/ocaml-modules/tezos/stdlib.nix index d0a734800c43..eff403ba808e 100644 --- a/pkgs/development/ocaml-modules/tezos/stdlib.nix +++ b/pkgs/development/ocaml-modules/tezos/stdlib.nix @@ -18,7 +18,7 @@ buildDunePackage rec { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk"; + sha256 = "1ykhz5m5sb2hq04nspbsbq8wspkhimagb5g6yi65hpdbn8f4zr6h"; }; minimalOCamlVersion = "4.0.8"; From 71b99e70d6b6f4513f257e2128d84c9d8d50fe60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 09:50:17 +0000 Subject: [PATCH 134/239] matcha-gtk-theme: 2021-08-02 -> 2021-08-23 --- 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 aedda712e4e6..3d88a78b39f4 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-08-02"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-vvWRHtE0Fgz41Aa5kaxNfbupodaWNc8gRJ1qW7vIyuc="; + sha256 = "sha256-gemDiGcr7xLv247w9J1CMOSKg2tWp8ADKpG16qa3hZQ="; }; buildInputs = [ gdk-pixbuf librsvg ]; From 3c8a09364d993ee3e69521701c3df7fbcb6038da Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 12:09:12 +0200 Subject: [PATCH 135/239] home-assistant: allow serial access when using deconz --- nixos/modules/services/misc/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index f1a1a88580eb..73ec3b9a17a2 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -285,6 +285,7 @@ in { "alarmdecoder" "arduino" "blackbird" + "deconz" "dsmr" "edl21" "elkm1" From 3f5f2abadef89ff4dae6c61b99c48bfdec7d5dc2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 12:19:56 +0200 Subject: [PATCH 136/239] esphome: 2021.8.0 -> 2021.8.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 112841c0260b..5c04cd8018ad 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.0"; + version = "2021.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-yVqma5WRQTt5Vq7poqHexASc59xthYaNcz/kkefC7qI="; + sha256 = "sha256-1eWM2MuIQ1ewbx53MmxmKi1Q92hzBqGboV3LbmMrw8g="; }; patches = [ From 5dacb8308526107f031fc04a7981b5b3de68e916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:58:47 +0200 Subject: [PATCH 137/239] python39Packages.google-cloud-audit-log: init at 0.1.0 --- .../google-cloud-audit-log/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/google-cloud-audit-log/default.nix diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix new file mode 100644 index 000000000000..7d101c32284e --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: + +buildPythonPackage rec { + pname = "google-cloud-audit-log"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb"; + }; + + propagatedBuildInputs = [ googleapis-common-protos protobuf ]; + + # tests are a bit wonky to setup and are not very deep either + doCheck = false; + + pythonImportsCheck = [ "google.cloud.audit" ]; + + meta = with lib; { + description = "Google Cloud Audit Protos"; + homepage = "https://github.com/googleapis/python-audit-log"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..bc0389c3fcd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2995,6 +2995,8 @@ in { google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; + google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; From 57988a92b3cf676a97b2b8943ca4c76cecc091ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 12:59:37 +0200 Subject: [PATCH 138/239] python39Packages.google-cloud-logging: fix missing imports --- .../python-modules/google-cloud-logging/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 00abd8160690..f9017eb33fa4 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -4,6 +4,8 @@ , django , flask , google-api-core +, google-cloud-appengine-logging +, google-cloud-audit-log , google-cloud-core , google-cloud-testutils , mock @@ -22,7 +24,13 @@ buildPythonPackage rec { sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-appengine-logging + google-cloud-audit-log + google-cloud-core + proto-plus + ]; checkInputs = [ django From 8b05fd931bb0d45d33020d883226f9dae7af04b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Aug 2021 13:28:35 +0200 Subject: [PATCH 139/239] home-assistant: pin async-upnp-client at 0.19.2 --- pkgs/servers/home-assistant/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7dd6edf17ded..2aea87aff623 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -24,6 +24,18 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (self: super: { + async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec { + version = "0.19.2"; + src = fetchFromGitHub { + owner = "StevenLooman"; + repo = "async_upnp_client"; + rev = version; + sha256 = "1v8d2lvxihqasn7866zssys16s0lgxkk6ri2dp4rr7wr8g9ixvdr"; + }; + }); + }) + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { From 6fd64ade08adda164e8ecb8a2c15c3c9564981f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 13:50:04 +0200 Subject: [PATCH 140/239] yara: 4.1.1 -> 4.1.2 --- pkgs/tools/security/yara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 3eb5495d2c96..7b56e50e3bc0 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -14,14 +14,14 @@ }: stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.1.2"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "185j7firn7i5506rcp0va7sxdbminwrm06jsm4c70jf98qxmv522"; + sha256 = "0n716snh0h5pk00kps6xvfi8z16xw12h1a8cd7w02cj2537xzj3m"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From ec8a69a18432dd63170235b844f369b06b2dae7b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 24 Aug 2021 22:12:42 +1000 Subject: [PATCH 141/239] gh: 1.14.0 -> 2.0.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 5086657a56e1..ceb2c36d9615 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.14.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-JCuJliBr1IPdwGG9T0Bx5DhtHw8tJ45mteRLxRbkyio="; + sha256 = "sha256-TjBUVP9/hMB8yFnupSxwHDr5bmtiMFwsDi1axsD5ykA="; }; - vendorSha256 = "sha256-6H56jf4QV+DdsiCetyhpXp6NHc86Hzo+CuqF06dL26A="; + vendorSha256 = "sha256-ZsMzLJ+eHAKNxhVFpQxRyTv/rcWvxA/luKPjXT+Zt4Y="; nativeBuildInputs = [ installShellFiles ]; From 983577f6116c4bc25b793d08fad22e3c818727c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 12:54:46 +0000 Subject: [PATCH 142/239] quill: 0.2.1 -> 0.2.4 --- pkgs/tools/security/quill/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/quill/default.nix b/pkgs/tools/security/quill/default.nix index 74c7996a8964..9440823f4292 100644 --- a/pkgs/tools/security/quill/default.nix +++ b/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + sha256 = "sha256-rR5VgdlJy6TQBmCHuKc7nPjznbeLjCmQdUJKjY0GsNI="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${openssl.out}/lib ''; - cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + cargoSha256 = "sha256-nLNuOqShOq01gVWoRCbsvfAd7B9VClUA8Hu8/UQNILg="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] From 0a0775808ce12d353891bbf501d24dcff4a19df7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 13:05:34 +0000 Subject: [PATCH 143/239] resvg: 0.15.0 -> 0.16.0 --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index b4e4a7a1d838..ce03561badf8 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FjL/7SC1XtQyI+vlkDbQR2848vhV4Lvx3htSN3RSohw="; + sha256 = "sha256-A54KTToi69l0/Nrz4K8EqFpCodbomYUI/zTP++Y4FF0="; }; - cargoSha256 = "sha256-FfTkturHQqnTAzkEHDn/M/UiLMH1L/+Kv/zov8n8sek="; + cargoSha256 = "sha256-RbgLZvNZSNjYImVm8Ax5cAL3R0XqlVz5ApPYKj93GEE="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 0caabc36af2336bbf5bcd4482c50190dff0bfba3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 13:22:19 +0000 Subject: [PATCH 144/239] rust-analyzer-unwrapped: 2021-08-16 -> 2021-08-23 --- pkgs/development/node-packages/node-packages.nix | 2 +- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- .../vscode-extensions/rust-analyzer/build-deps/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6f7594f4129f..f2cff8e6fcfd 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -113038,7 +113038,7 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.710"; + version = "0.2.718"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 1700fd14b3a3..9df4d9075aa6 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-08-16"; - cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk="; + version = "2021-08-23"; + cargoSha256 = "sha256-FMOLYR8cyimAA71SlxcT370wpeNH4f8vwv+oAhUd8zc="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE="; + sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index a98102c36b02..61878a34e8f4 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.2.710", + "version": "0.2.718", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", From 5e34e5eacd15b97bd84a2810543a31cb12b5777f Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 24 Aug 2021 15:32:28 +0200 Subject: [PATCH 145/239] rehex: 0.3.1 -> 0.3.91 (#135437) * rehex: 0.3.1 -> 0.3.91 * Apply suggestions from code review --- pkgs/applications/editors/rehex/default.nix | 29 +++++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index df5fed210e68..baf8b93d7fed 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -1,36 +1,43 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, pkg-config , capstone , jansson -, wxGTK30 -, darwin +, lua5_3 +, wxGTK31 +, Carbon +, Cocoa +, IOKit , libicns , wxmac }: stdenv.mkDerivation rec { pname = "rehex"; - version = "0.3.1"; + version = "0.3.91"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32"; + sha256 = "sha256-lemak/sGff346IOzOnMB4L4TkDRA/1L3KV3VNdWxIFA="; }; - patchPhase = '' + postPatch = '' substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \ 'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png' ''; - nativeBuildInputs = lib.optionals (stdenv.isDarwin) [ libicns ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson ] - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK30 ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ])); + buildInputs = [ capstone jansson lua5_3 ] + ++ lib.optionals (!stdenv.isDarwin) [ wxGTK31 ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit wxmac ]; - makeFlags = [ "prefix=$(out)" ] ++ (lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]); + makeFlags = [ "prefix=$(out)" ] + ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; meta = with lib; { description = "Reverse Engineers' Hex Editor"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3e7c50b3cca..7d4076043088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8339,7 +8339,9 @@ with pkgs; remarshal = callPackage ../development/tools/remarshal { }; - rehex = callPackage ../applications/editors/rehex { }; + rehex = callPackage ../applications/editors/rehex { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; + }; rig = callPackage ../tools/misc/rig { stdenv = gccStdenv; From b71c5e586e7a8bca6bc2c647b9131dc7fb209b43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 16:02:25 +0200 Subject: [PATCH 146/239] python3Packages.yara-python: 4.1.0 -> 4.1.2 --- pkgs/development/python-modules/yara-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index fc4c3bb56ffe..050ee7315908 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - sha256 = "1w48skmjbb5529g8fyzdjj9jkmavqiq6wh1dr004xdp3nhlqn9y7"; + sha256 = "1sg7ghb43qajziiym1y584rk0wfflyfc9fx507wrh4iahq5xp622"; }; buildInputs = [ From c95358335af87b0a6f47049a9b1b2bad7df10a78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 16:04:50 +0200 Subject: [PATCH 147/239] python3Packages.haversine: 2.3.1 -> 2.4.0 --- pkgs/development/python-modules/haversine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/haversine/default.nix b/pkgs/development/python-modules/haversine/default.nix index 9d12be3aa198..614e664c19c0 100644 --- a/pkgs/development/python-modules/haversine/default.nix +++ b/pkgs/development/python-modules/haversine/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "haversine"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mapado"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1PXPsZd/4pN42TU0lhXWsmyX7uGP1n/xna2cVZPczB4="; + sha256 = "sha256-Q38oeSy1ilXWc2r/GW8EWQHH2Ty+DyTxxrDX3OcOwKc="; }; checkInputs = [ From ceab0e9292fb93bbd8f5dba2360332894a484a79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 14:05:31 +0000 Subject: [PATCH 148/239] python38Packages.zarr: 2.8.3 -> 2.9.1 --- pkgs/development/python-modules/zarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index c7990de55e03..9fc5589d281d 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.8.3"; + version = "2.9.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8aece33269ba3ee2af9320aa528d5fe93f76c30e4ad7fdbfb604b1db3f0d779f"; + sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544"; }; nativeBuildInputs = [ From cfc3b9c63273b2c272d7a54d2d5ced5d81885178 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 16:08:33 +0200 Subject: [PATCH 149/239] python3Packages.mdformat: 0.7.8 -> 0.7.9 --- pkgs/development/python-modules/mdformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index d66d6fa1fa5b..43f95bc952a2 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.8"; + version = "0.7.9"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "0zvgz2c517ig31hcrf05gv4h68zpqk56asnmwx072ld8gk2ff8ag"; + sha256 = "sha256-qGRZCDo/ACSXtJa4omepjaR0KNWeR4vvvUUbQpKlrtI="; }; nativeBuildInputs = [ From 2cd322f1ba04190deb1ac485e50a4fd79e33d5fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 16:13:00 +0200 Subject: [PATCH 150/239] exploitdb: 2021-08-21 -> 2021-08-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 24b45aae1332..83dde5ae493c 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-21"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-3XSk6a8gaCF8X1Plyfyi1Jtfp2sDLgbstv67hvlM3Gk="; + sha256 = "sha256-+tmSnPICX8CoD7YBsph2k0AfEg/IhCyYMHkXyVTYaIQ="; }; installPhase = '' From 0f95daf2a4384f70098d6aabaf5c70c034e9b105 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 22:16:20 +0200 Subject: [PATCH 151/239] python3Packages.hy: init at 1.0a3 --- .../development/python-modules/hy/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/hy/default.nix diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix new file mode 100644 index 000000000000..63625bd7ee60 --- /dev/null +++ b/pkgs/development/python-modules/hy/default.nix @@ -0,0 +1,52 @@ +{ lib +, astor +, buildPythonPackage +, colorama +, fetchFromGitHub +, funcparserlib +, pytestCheckHook +, pythonOlder +, rply +}: + +buildPythonPackage rec { + pname = "hy"; + version = "1.0a3"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "hylang"; + repo = pname; + rev = version; + sha256 = "1dqw24rvsps2nab1pbjjm1c81vrs34r4kkk691h3xdyxnv9hb84b"; + }; + + propagatedBuildInputs = [ + colorama + funcparserlib + rply + ] ++ lib.optionals (pythonOlder "3.9") [ + astor + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Don't test the binary + "test_bin_hy" + "test_hystartup" + "est_hy2py_import" + ]; + + pythonImportsCheck = [ "hy" ]; + + meta = with lib; { + description = "Python to/from Lisp layer"; + homepage = "https://github.com/hylang/hy"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..1a72ec3a10cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3443,6 +3443,8 @@ in { hwi = callPackage ../development/python-modules/hwi { }; + hy = callPackage ../development/python-modules/hy { }; + hydra = callPackage ../development/python-modules/hydra { }; hydra-check = callPackage ../development/python-modules/hydra-check { }; From ce2fd8d5fe98b80c6866b6bcae0f7f884b3f852b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 10:09:07 +0200 Subject: [PATCH 152/239] python3Packages.yeelight: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/yeelight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index dc10c3d58143..9416ff7ef4e2 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.2"; + version = "0.7.3"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "06pg5q50dw5a0h6jnln8419asi8nahzvlk0s65ymykqq0jxac31y"; + sha256 = "sha256-sdSzriAgY3LSOeyPB2Pe1k9iamStZ1OlYXJZviRa+TY="; }; propagatedBuildInputs = [ From b1d4c0ac31690f9d423dd050832178699c55d1db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 16:37:08 +0200 Subject: [PATCH 153/239] python3Packages.forecast-solar: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/forecast-solar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 71c517c52b85..3f776c970659 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "forecast-solar"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = version; - sha256 = "12d9bb3q7gp0yy152x0rcbi727wrg3w9458asp2nhnqlb8nm6j4d"; + sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0="; }; propagatedBuildInputs = [ From 5dda093d86a99fd32cf410052296aaf88c120569 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 14:39:51 +0000 Subject: [PATCH 154/239] python38Packages.pex: 2.1.45 -> 2.1.46 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index ea10276ae407..5145bec925a9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.45"; + version = "2.1.46"; src = fetchPypi { inherit pname version; - sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; + sha256 = "28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd"; }; nativeBuildInputs = [ setuptools ]; From 1a23b14062487aa3a8f4d81865cc0e349c002ce5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 17:17:09 +0200 Subject: [PATCH 155/239] python3Packages.pysyncthru: 0.7.5 -> 0.7.7 --- pkgs/development/python-modules/pysyncthru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index b23f571dd39f..373cb7c6f2b6 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.5"; + version = "0.7.7"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nielstron"; repo = "pysyncthru"; rev = "release-${version}"; - sha256 = "122zxwqwx03vaxbhmp3cjibjnkirayz0w68gvslsdr7n9nqv3pgz"; + sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7"; }; propagatedBuildInputs = [ From 54d50d3bf84f269a4e923131f7f8981545b338a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 15:23:01 +0000 Subject: [PATCH 156/239] tailscale: 1.12.3 -> 1.14.0 --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index f6f60771921f..e4007cb6c2d0 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "tailscale"; - version = "1.12.3"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-jjxO35PaxEI9n0qsawTPt3mHNC0PjWfmEA4NkIAwyTY="; + sha256 = "sha256-FlPb7PtX/q34I7DZBLB9RIlg9tjKqktwn7N8Pv02hYc="; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "sha256-2MPenTV0fgvXbf8WkoPd9uApPSDLPyHtCq9o3CHB/D0="; + vendorSha256 = "sha256-em6443czDMak9RxLq7Dj9miknqg29vf0a0N82LmNrHk="; doCheck = false; From 517b0b0d05f228de89781485b8f6362600731175 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 16:41:27 +0000 Subject: [PATCH 157/239] vpcs: 0.8.1 -> 0.8.2 --- pkgs/applications/virtualization/vpcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 8c41a1f4c274..663085bb22fd 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vpcs"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak"; + sha256 = "sha256-joEXRMtNZMQumkYDX1gdpGAV+XdNKiAMj3dh1GZxeqc="; }; buildPhase = ''( From 9444cf6b8d24be0f72d2c0ce4ec8940218f3bcf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 16:46:02 +0000 Subject: [PATCH 158/239] vultr-cli: 2.7.0 -> 2.8.0 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index b953feea2211..3b9cebb6439a 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; + sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8="; }; vendorSha256 = null; From 2f1030b3ade598afa5594bb519b49216561bbd10 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 18 Aug 2021 10:27:28 -0600 Subject: [PATCH 159/239] matrix-synapse: 1.40.0 -> 1.41.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 4cac9bdcb3fe..63b79aebe09c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.40.0"; + version = "1.41.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5RCeKTAtuFERQSoz4WinGz36tMuKtijnupPR/X02hCU="; + sha256 = "sha256-KLsTr8dKp8k7TcrC598ApDib7P0m9evmfdl8jbsZLdc="; }; patches = [ From c9c30507bcb7f65be90853031fb4a5539d783f6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 17:01:48 +0000 Subject: [PATCH 160/239] python38Packages.pooch: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/pooch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index 25efef9ef081..d9c8dda1354f 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.4.0"; + version = "1.5.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f827e79ab51b21a8964a4b1ea8972aa4a1079cb9c1ff8e9ec61893eb7dab50cb"; + sha256 = "57ab0c43e9c5bd81227b08b9931435d71c118cd53339cc5925123a740f40b312"; }; nativeBuildInputs = [ setuptools-scm ]; From b6a5c45cc1f506a422ff237c44687fdff2f42bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 24 Aug 2021 19:41:22 +0200 Subject: [PATCH 161/239] radare2: link to upstream makefile for vector35-arch-arm64 hash --- pkgs/development/tools/analysis/radare2/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 1c7c290405fc..198ce101bf56 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -27,8 +27,7 @@ }: let - # FIXME: how to keep this up-to-date - # https://github.com/radareorg/vector35-arch-arm64/ + # FIXME: Compare revision with https://github.com/radareorg/radare2/blob/master/libr/asm/arch/arm/v35arm64/Makefile#L20 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; From c8ec6204fe53cada5c5cc7ba5a210065745e37bd Mon Sep 17 00:00:00 2001 From: Fiona Weber Date: Tue, 24 Aug 2021 19:54:47 +0200 Subject: [PATCH 162/239] ly: change maintainer to vidister This commit changes the package maintainer of ly to vidister. The former maintainer (spacekookie) agreed to hand over maintainership. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/display-managers/ly/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8b3059daca48..9af63ce02e26 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11355,6 +11355,12 @@ githubId = 335406; name = "David Asabina"; }; + vidister = { + email = "v@vidister.de"; + github = "vidister"; + githubId = 11413574; + name = "Fiona Weber"; + }; vifino = { email = "vifino@tty.sh"; github = "vifino"; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index d36c54189326..f7081bba4fcb 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "TUI display manager"; license = licenses.wtfpl; homepage = "https://github.com/cylgom/ly"; - maintainers = [ maintainers.spacekookie ]; + maintainers = [ maintainers.vidister ]; }; } From 0107caf17f822521b27f02e25aa363b69b85b2fa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 20:15:31 +0200 Subject: [PATCH 163/239] python3Packages.dependency-injector: 4.34.0 -> 4.35.3 --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index d220bd51ac1c..628e18931255 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.34.0"; + version = "4.35.3"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0="; + sha256 = "sha256-2qe4A2T3EagNCh1zSbPWblVN7p9NH8rNwQQVyESJTdk="; }; propagatedBuildInputs = [ From 016e8cf78c8009f65d81fbd6c32b00803f3b1f3c Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Tue, 24 Aug 2021 20:26:28 +0200 Subject: [PATCH 164/239] acpi_call: 1.2.1 -> 1.2.2 --- pkgs/os-specific/linux/acpi-call/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index f986ed790a16..39842927c9a1 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "acpi-call"; - version = "1.2.1"; + version = "1.2.2"; name = "${pname}-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; rev = "v${version}"; - sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg"; + sha256 = "1s7h9y3adyfhw7cjldlfmid79lrwz3vqlvziw9nwd6x5qdj4w9vp"; }; hardeningDisable = [ "pic" ]; From 93ff529590ab250521d60fab91da66917bd5b09d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 20:41:53 +0200 Subject: [PATCH 165/239] regexploit: init at 1.0.0 --- pkgs/tools/security/regexploit/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/security/regexploit/default.nix diff --git a/pkgs/tools/security/regexploit/default.nix b/pkgs/tools/security/regexploit/default.nix new file mode 100644 index 000000000000..be09c34254bb --- /dev/null +++ b/pkgs/tools/security/regexploit/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "regexploit"; + version = "1.0.0"; + + disabled = python3.pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "doyensec"; + repo = pname; + rev = "v${version}"; + sha256 = "0z3fghsyw0ll36in7ihc0qi3gy7mqi6cw1mi8m8c8xb1nlwpfr0y"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + pyyaml + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "regexploit" ]; + + meta = with lib; { + description = "Tool to find regular expressions which are vulnerable to ReDoS"; + homepage = "https://github.com/doyensec/regexploit"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3e7c50b3cca..611b1a53d5bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12930,6 +12930,8 @@ with pkgs; red = callPackage ../development/interpreters/red { }; + regexploit = callPackage ../tools/security/regexploit { }; + regextester = callPackage ../applications/misc/regextester { }; regina = callPackage ../development/interpreters/regina { }; From 6495d3187dcec6876307da0874fe39566c650ac5 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 24 Aug 2021 20:50:07 +0200 Subject: [PATCH 166/239] zola: 0.14.0 -> 0.14.1 --- pkgs/applications/misc/zola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index d51515c597cd..52e3b9d847df 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "1mvin6pfqhsfhaifivbdi6qcn0dsa98w83m1n51q807gh4l1k2yj"; + sha256 = "1cvvxiginwf1rldijzwk9gh63qc0ls5d7j3j8ri7yhk21pz9f6bi"; }; - cargoSha256 = "02bk399c7x15a5rkaz7ik65yihkfbjn1q46gx7l8hycqq7xb0xmg"; + cargoSha256 = "1hg8j9a8c6c3ap24jd96y07rlp4f0s2mkyx5034nlnkm3lj4q42n"; nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] From 4bb4bcc30c7f481581ef462ed7b1dcca71693717 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 24 Aug 2021 10:41:54 -0400 Subject: [PATCH 167/239] services.zfs.expandOnBoot: support expanding pools on boot Either enumerating a list of pools to expand or expanding all pools on boot. --- nixos/modules/tasks/filesystems/zfs.nix | 100 +++++++++++++++++++++++- 1 file changed, 99 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 376d6530f363..cb0e66402476 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -8,6 +8,7 @@ with lib; let cfgZfs = config.boot.zfs; + cfgExpandOnBoot = config.services.zfs.expandOnBoot; cfgSnapshots = config.services.zfs.autoSnapshot; cfgSnapFlags = cfgSnapshots.flags; cfgScrub = config.services.zfs.autoScrub; @@ -200,7 +201,6 @@ in an interactive prompt (keylocation=prompt) and from a file (keylocation=file://). ''; }; - }; services.zfs.autoSnapshot = { @@ -327,6 +327,23 @@ in }; }; + services.zfs.expandOnBoot = mkOption { + type = types.either (types.enum [ "disabled" "all" ]) (types.listOf types.str); + default = "disabled"; + example = [ "tank" "dozer" ]; + description = '' + After importing, expand each device in the specified pools. + + Set the value to the plain string "all" to expand all pools on boot: + + services.zfs.expandOnBoot = "all"; + + or set the value to a list of pools to expand the disks of specific pools: + + services.zfs.expandOnBoot = [ "tank" "dozer" ]; + ''; + }; + services.zfs.zed = { enableMail = mkEnableOption "ZED's ability to send emails" // { default = cfgZfs.package.enableMail; @@ -586,6 +603,7 @@ in ${cfgZfs.package}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" ''; }; + createZfsService = serv: nameValuePair serv { after = [ "systemd-modules-load.service" ]; @@ -609,6 +627,86 @@ in systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; }) + (mkIf (cfgZfs.enabled && cfgExpandOnBoot != "disabled") { + systemd.services."zpool-expand@" = { + description = "Expand ZFS pools"; + after = [ "zfs.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + scriptArgs = "%i"; + path = [ pkgs.gawk cfgZfs.package ]; + + # ZFS has no way of enumerating just devices in a pool in a way + # that 'zpool online -e' supports. Thus, we've implemented a + # bit of a strange approach of highlighting just devices. + # See: https://github.com/openzfs/zfs/issues/12505 + script = let + # This UUID has been chosen at random and is to provide a + # collision-proof, predictable token to search for + magicIdentifier = "NIXOS-ZFS-ZPOOL-DEVICE-IDENTIFIER-37108bec-aff6-4b58-9e5e-53c7c9766f05"; + zpoolScripts = pkgs.writeShellScriptBin "device-highlighter" '' + echo "${magicIdentifier}" + ''; + in '' + pool=$1 + + echo "Expanding all devices for $pool." + + # Put our device-highlighter script it to the PATH + export ZPOOL_SCRIPTS_PATH=${zpoolScripts}/bin + + # Enable running our precisely specified zpool script as root + export ZPOOL_SCRIPTS_AS_ROOT=1 + + devices() ( + zpool status -c device-highlighter "$pool" \ + | awk '($2 == "ONLINE" && $6 == "${magicIdentifier}") { print $1; }' + ) + + for device in $(devices); do + echo "Attempting to expand $device of $pool..." + if ! zpool online -e "$pool" "$device"; then + echo "Failed to expand '$device' of '$pool'." + fi + done + ''; + }; + + systemd.services."zpool-expand-pools" = + let + # Create a string, to be interpolated in a bash script + # which enumerates all of the pools to expand. + # If the `pools` option is `true`, we want to dynamically + # expand every pool. Otherwise we want to enumerate + # just the specifically provided list of pools. + poolListProvider = if cfgExpandOnBoot == "all" + then "$(zpool list -H | awk '{print $1}')" + else lib.escapeShellArgs cfgExpandOnBoot; + in + { + description = "Expand specified ZFS pools"; + wantedBy = [ "default.target" ]; + after = [ "zfs.target" ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + path = [ pkgs.gawk cfgZfs.package ]; + + script = '' + for pool in ${poolListProvider}; do + systemctl start --no-block "zpool-expand@$pool" + done + ''; + }; + }) + (mkIf (cfgZfs.enabled && cfgSnapshots.enable) { systemd.services = let descr = name: if name == "frequent" then "15 mins" From 9084979fc34c662707086469c4be6f820dce93a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:11 +0200 Subject: [PATCH 168/239] python39Packages.tensorflow-tensorboard: 2.4.0 -> 2.6.0 --- .../tensorflow-tensorboard/default.nix | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 031254205066..123c339fea48 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , numpy , wheel , werkzeug @@ -7,6 +10,8 @@ , markdown , absl-py , google-auth-oauthlib +, setuptools +, tensorboard-data-server , tensorboard-plugin-wit , tensorboard-plugin-profile }: @@ -17,27 +22,44 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.4.0"; + version = "2.6.0"; format = "wheel"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "tensorboard"; inherit version format; + dist = "py3"; python = "py3"; - sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; }; + postPatch = '' + chmod u+rwx -R ./dist + pushd dist + wheel unpack --dest unpacked ./*.whl + pushd unpacked/tensorboard-${version} + + substituteInPlace tensorboard-${version}.dist-info/METADATA \ + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + + popd + wheel pack ./unpacked/tensorboard-${version} + popd + ''; + propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio absl-py + grpcio google-auth-oauthlib + markdown + numpy + protobuf + setuptools + tensorboard-data-server tensorboard-plugin-profile tensorboard-plugin-wit + werkzeug # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel @@ -60,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; + homepage = "https://www.tensorflow.org/"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; From c55292c8739cb1c059262983133a09e7ebb65ec4 Mon Sep 17 00:00:00 2001 From: Lenz Weber Date: Tue, 24 Aug 2021 21:40:58 +0200 Subject: [PATCH 169/239] yalc: init at 1.0.0-pre.53 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 3548 +++++------------ 2 files changed, 1027 insertions(+), 2522 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ec7db2ee8a1c..c4d3dd60e3da 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -297,6 +297,7 @@ , "wring" , "write-good" , "yaml-language-server" +, "yalc" , "yarn" , "yo" , "zx" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6f7594f4129f..41a5ed5815a0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -292,15 +292,6 @@ let sha512 = "ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g=="; }; }; - "@arcanis/slice-ansi-1.0.2" = { - name = "_at_arcanis_slash_slice-ansi"; - packageName = "@arcanis/slice-ansi"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@arcanis/slice-ansi/-/slice-ansi-1.0.2.tgz"; - sha512 = "lDL63z0W/L/WTgqrwVOuNyMAsTv+pvjybd21z9SWdStmQoXT59E/iVWwat3gYjcdTNBf6oHAMoyFm8dtjpXEYw=="; - }; - }; "@ardatan/aggregate-error-0.0.6" = { name = "_at_ardatan_slash_aggregate-error"; packageName = "@ardatan/aggregate-error"; @@ -1669,6 +1660,15 @@ let sha512 = "khqF4y0Z1WLPJR3LPJRgTAAZHQYTxHFXw3Nzr799aRsKXummSX85SS7ZLnVDyDjzd3x4yonYdWk89K2ZpJslnQ=="; }; }; + "@chinachu/aribts-1.3.5-mirakurun.3" = { + name = "_at_chinachu_slash_aribts"; + packageName = "@chinachu/aribts"; + version = "1.3.5-mirakurun.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.3.tgz"; + sha512 = "JQPzfaYF7swQwKp2OsoRGZEjyrIo2muHQbwCKhfigqQrA3gCyGf3run+xCjNqKlI4wF9qjfgJpxfc1J56aIvog=="; + }; + }; "@cnakazawa/watch-1.0.4" = { name = "_at_cnakazawa_slash_watch"; packageName = "@cnakazawa/watch"; @@ -1822,16 +1822,6 @@ let sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; }; }; - "cosmiconfig-7.0.1" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = - "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - }; "@cronvel/get-pixels-3.4.0" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; @@ -1913,15 +1903,6 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@deepcode/dcignore-1.0.4" = { - name = "_at_deepcode_slash_dcignore"; - packageName = "@deepcode/dcignore"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.4.tgz"; - sha512 = "gsLh2FJ43Mz3kA6aqMq3BOUCMS5ub8pJZOpRgrZ1h0f/rkzphriUGLnC37+Jn86CFckxWlwHk/q28tyf0g4NBw=="; - }; - }; "@devicefarmer/adbkit-2.11.3" = { name = "_at_devicefarmer_slash_adbkit"; packageName = "@devicefarmer/adbkit"; @@ -2543,22 +2524,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.11" = { + "@fluentui/react-focus-8.2.0" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.11"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.11.tgz"; - sha512 = "tPWSqvWONm+guQFaeBpX9E9u6D9mJzIHscx7jsswh4SAtx0/KfcDEa0w/rYOZnriz4+kY7M8+wo0wwzkDI5I1Q=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.2.0.tgz"; + sha512 = "mCCcKth7IKb458DJotIQ8f/NpfTb2abWVXwW6QTl8hQrOY0kp6L5Z4E/n0uNfUL9JsGrmK77Zy9zVQhOtLK2SA=="; }; }; - "@fluentui/react-hooks-8.2.7" = { + "@fluentui/react-hooks-8.3.0" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.7"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.7.tgz"; - sha512 = "eky46Uvy7jB27PmBBuFCvB9V9sXxrlZGcLuzDVhBWn1h3zOgtmu0txTrGYfMG/eOOlR9zf/EdDqc0F/jcQpslA=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.3.0.tgz"; + sha512 = "3dpO5EsFtVQI57XVPcoJokiyqp66dU4tgjKhLEurQCJrbfM6hGA8bq3/D1fZI/FJlI4egzuQEwG1KD4XyC5odQ=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2606,13 +2587,13 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.2.2" = { + "@fluentui/theme-2.3.0" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.2.tgz"; - sha512 = "aR/Kn8B/ch/CYDwKWMv/fXrTaRXoQj86AhhmOOuq3GR3f4Qw53js7SaQMPJ6K/Ii6OS8chNmy+xelrPAqZStYA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.3.0.tgz"; + sha512 = "rEx2ZOtfQv8P989l20mENfa+6e6D3peGbeYj2XGuN2BCUMXUj6mhm5kretZMzz6N77+yARfuYfsA2/pUEMRv4Q=="; }; }; "@fluentui/utilities-8.3.0" = { @@ -2759,13 +2740,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.0.2" = { + "@graphql-tools/merge-8.0.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.0.2"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.2.tgz"; - sha512 = "li/bl6RpcZCPA0LrSxMYMcyYk+brer8QYY25jCKLS7gvhJkgzEFpCDaX43V1+X13djEoAbgay2mCr3dtfJQQRQ=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.0.3.tgz"; + sha512 = "lVMyW9cREs+nQYbUvMaaqSl+pRCezl2RafNMFi/04akjvOtjVefdi7n3pArpSqPhLHPJDyQRlI8CK8cmOZ9jTA=="; }; }; "@graphql-tools/mock-8.2.2" = { @@ -2831,13 +2812,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.1.1" = { + "@graphql-tools/utils-8.1.2" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.1.tgz"; - sha512 = "QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.1.2.tgz"; + sha512 = "3G+NIBR5mHjPm78jAD0l07JRE0XH+lr9m7yL/wl69jAzK0Jr/H+/Ok4ljEolI70iglz+ZhIShVPAwyesF6rnFg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -4217,24 +4198,22 @@ let sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; }; }; - "@nestjs/schematics-8.0.2" = { - name = "_at_nestjs_slash_schematics"; - packageName = "@nestjs/schematics"; - version = "8.0.2"; + "@napi-rs/triples-1.0.3" = { + name = "_at_napi-rs_slash_triples"; + packageName = "@napi-rs/triples"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.2.tgz"; - sha512 = "iWtpXfn1Zh4Vm37BzY8OSJ60Y9TqNOjk8J+KLIwcql9EuP+0C/C4WUn+vIQMfmnut3MxRmAYFE2B/LFYrjGC5Q=="; + url = "https://registry.npmjs.org/@napi-rs/triples/-/triples-1.0.3.tgz"; + sha512 = "jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA=="; }; }; - "resolve-global-1.0.0" = { - name = "resolve-global"; - packageName = "resolve-global"; - version = "1.0.0"; + "@nestjs/schematics-8.0.3" = { + name = "_at_nestjs_slash_schematics"; + packageName = "@nestjs/schematics"; + version = "8.0.3"; src = fetchurl { - url = - "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz"; - sha512 = - "zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.3.tgz"; + sha512 = "A5qyS9yv6v2RIBqbsyYG57NfYA8Jm/aypRV1nc7JXjhdfDHwWKqCsgQ/7/82vVjhlvVAfr5x/dpCWqcF3XYd7w=="; }; }; "@netflix/nerror-1.1.3" = { @@ -4246,13 +4225,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.4.2" = { + "@netlify/build-18.5.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.4.2"; + version = "18.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.4.2.tgz"; - sha512 = "q6eZ4D09agpeW6Y1DVyfXslRarAv/zR37vbFQC0kzZxdEkH6IjBKNT0eXDuG+OiL+BMi52M1MqlWI5lH8P/ELg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.5.0.tgz"; + sha512 = "csdnX7uYBTRR+dbLGzKMIRsRHhhAEtkVCBz+NmdlopaYyW7hHMhMayx7C1qxdB6rXqt7u8gP0Gq2tU9zVlgBnQ=="; }; }; "@netlify/cache-utils-2.0.3" = { @@ -4444,13 +4423,13 @@ let sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g=="; }; }; - "@netlify/plugins-list-3.3.0" = { + "@netlify/plugins-list-3.5.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.3.0.tgz"; - sha512 = "wuwDeBx8FK/jY1hQoI0w2MK+Q/6hcEnbaDDBzw+W0Ueu48r7QRIcZMin2OnOSMkTRpAHXqXyQUrm1lnULXKBfg=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.5.0.tgz"; + sha512 = "qBJC80fWY1T/UrvOsr/54ftfBoL2uybjzWuTZY8uYG2DnlJ4OaWjM3O9Srf7LXxHL3pdwV7kfdr9fQ6gbmARKg=="; }; }; "@netlify/routing-local-proxy-0.31.0" = { @@ -4471,13 +4450,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.19.0" = { + "@netlify/zip-it-and-ship-it-4.20.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.19.0"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.19.0.tgz"; - sha512 = "kEK7NkbBda0pyfW+HogEWviYPNw9sVt4B+Btd2PIKsKxehA7X9xSwJLIqnllVXv3FEIl5uMQWQwPzqTK+o2H4Q=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.20.0.tgz"; + sha512 = "+wo8rupUJbrfw/lEBPccVP+GhFEJEbzx7M67eSEWxqwQkUKtZIHbBc6Ile+iVXqFnLyM2ryfxLTcSIm1pc797g=="; }; }; "@node-red/editor-api-2.0.5" = { @@ -4534,6 +4513,132 @@ let sha512 = "+RF8i+LxgyXcAIKjKyht3rRZFBEhrvgXKN2/HlkMWerADwiDTNfBL8JjQZoMKlFKl1cgapp8vp4P1Xf3glH+fQ=="; }; }; + "@node-rs/crc32-1.2.1" = { + name = "_at_node-rs_slash_crc32"; + packageName = "@node-rs/crc32"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.2.1.tgz"; + sha512 = "Hw9QJPisg1ZR9Rj6w3sQLcEZkPanu1RLb4yk0Wq0cT4RNYssw35RtOkN/x/tW9iIMLq2YjHUyb6tun82dLVTPQ=="; + }; + }; + "@node-rs/crc32-android-arm64-1.2.1" = { + name = "_at_node-rs_slash_crc32-android-arm64"; + packageName = "@node-rs/crc32-android-arm64"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.2.1.tgz"; + sha512 = "SWz9X44WQzZqzURYz4DY3DccB97T+aKJl+i6rvREwf1Y5suWiPdxU4xqg9zZ66aG6XeE3ts+WeqKH26bVbZTQA=="; + }; + }; + "@node-rs/crc32-darwin-arm64-1.2.1" = { + name = "_at_node-rs_slash_crc32-darwin-arm64"; + packageName = "@node-rs/crc32-darwin-arm64"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.2.1.tgz"; + sha512 = "JKKYEc5YKrZZ0CQ0nXSLCraU+6b9SldGU3/Wf3s4WCzYGkkB4XtMwjx3t7bGZAGmZ2ZcRy9M2EGJ8tUfV8cOOg=="; + }; + }; + "@node-rs/crc32-darwin-x64-1.2.1" = { + name = "_at_node-rs_slash_crc32-darwin-x64"; + packageName = "@node-rs/crc32-darwin-x64"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.2.1.tgz"; + sha512 = "BaWeOdzJ73MyrChWQqQkJEKM9jRUjb19tE7PbFhG8cZPVxBFyxgTFNuBrR0xHOByCHI4QXSBvNCLEfawHbsscQ=="; + }; + }; + "@node-rs/crc32-freebsd-x64-1.2.1" = { + name = "_at_node-rs_slash_crc32-freebsd-x64"; + packageName = "@node-rs/crc32-freebsd-x64"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.2.1.tgz"; + sha512 = "ZzAJS9EwUwvclfhvDT6vn0CYpU4CAvDYpPjXb+e0bsFbvqoh8mQcXvzK1myU3fSjjKUU47Pp5wLe68vW+2Q0Pw=="; + }; + }; + "@node-rs/crc32-linux-arm-gnueabihf-1.2.1" = { + name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; + packageName = "@node-rs/crc32-linux-arm-gnueabihf"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.2.1.tgz"; + sha512 = "6nRDyFgGsLc9bqaiK21KANqAdeh+9ZOHf3MY9HWvZoGQnxj2/LwvSHyaeG9ut+TvkL+Ic2hMtjLDNYYBaUcImw=="; + }; + }; + "@node-rs/crc32-linux-arm64-gnu-1.2.1" = { + name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; + packageName = "@node-rs/crc32-linux-arm64-gnu"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.2.1.tgz"; + sha512 = "ZNluh2Wse68JgLGRl75fkLmVkAPSb1LE/2OdPXKZ85ExGYB5/3el2nE1CnysbqxqzL/Cc6kJ7UnsI/cxSe/D4Q=="; + }; + }; + "@node-rs/crc32-linux-arm64-musl-1.2.1" = { + name = "_at_node-rs_slash_crc32-linux-arm64-musl"; + packageName = "@node-rs/crc32-linux-arm64-musl"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.2.1.tgz"; + sha512 = "e490eNo9GB57koS4gabDeZ+f7wB3/SNtPbdXPk7bBNSFAB0gPdrqxiVUzLkY6AALVPR/juQGRb+geJOp1Oja/g=="; + }; + }; + "@node-rs/crc32-linux-x64-gnu-1.2.1" = { + name = "_at_node-rs_slash_crc32-linux-x64-gnu"; + packageName = "@node-rs/crc32-linux-x64-gnu"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.2.1.tgz"; + sha512 = "laJ7cAzYfNk+h3OOSwYsDdxfp1bXnpWqXVObXvylwHZQwIqUqTC5GCOa6kMMz2ElzJ9gDBgVvLplI8QX7BQnwA=="; + }; + }; + "@node-rs/crc32-linux-x64-musl-1.2.1" = { + name = "_at_node-rs_slash_crc32-linux-x64-musl"; + packageName = "@node-rs/crc32-linux-x64-musl"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.2.1.tgz"; + sha512 = "d6DyJMgIg4E2E+GHeIYMImqDd+iaGQjwGrzLDqO1TaC08yE63chlvCMNNoQ5k2c8mzdWH2VX72IapWT5nArR0A=="; + }; + }; + "@node-rs/crc32-win32-arm64-msvc-1.2.1" = { + name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; + packageName = "@node-rs/crc32-win32-arm64-msvc"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.2.1.tgz"; + sha512 = "qwDzpv/9oZcK6SrFomALjYDMkEhtjfxNmjhCYKDgeXvAkTAdwzpVdj+8PDyyBN63afpVndDnBqGhSEwHJPB6aQ=="; + }; + }; + "@node-rs/crc32-win32-ia32-msvc-1.2.1" = { + name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; + packageName = "@node-rs/crc32-win32-ia32-msvc"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.2.1.tgz"; + sha512 = "g/3UVw8LBmsTn+DUD39WDhfcL+S0pILBz/3+HM9QxbY2ptPxI8QtEK0sTIBAKTcRjq6dS8MmtcDWBFsDTs+/mQ=="; + }; + }; + "@node-rs/crc32-win32-x64-msvc-1.2.1" = { + name = "_at_node-rs_slash_crc32-win32-x64-msvc"; + packageName = "@node-rs/crc32-win32-x64-msvc"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.2.1.tgz"; + sha512 = "BGTEFRdIk6Vq9BSC3VuBVYKadZXOhhtPT8LUfz4s9cK3k8ba6nFzKIbOm5UsPIUSz2lRqlWdHQQWVaCoGAAvbQ=="; + }; + }; + "@node-rs/helper-1.2.1" = { + name = "_at_node-rs_slash_helper"; + packageName = "@node-rs/helper"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/helper/-/helper-1.2.1.tgz"; + sha512 = "R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg=="; + }; + }; "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; @@ -4705,13 +4810,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.31" = { + "@oclif/core-0.5.32" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.31"; + version = "0.5.32"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.31.tgz"; - sha512 = "VPWOR8RORgVlmuulcx/aft1nBhTjT7YiwCeZB/bAiNgqCQ4YncoeIIPJPJs/A0a0dIeOYACfxlp1Xw7vznpISg=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.32.tgz"; + sha512 = "ZRGh/9IccLT/iyJ9FiTK2KdqPmxewkCkdFXkNhTVgtzQXI3ZFhDba3pFjxfI+nbhbrVRLfGzTnHXV6c4rka6pw=="; }; }; "@oclif/errors-1.3.5" = { @@ -4795,15 +4900,6 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octetstream/promisify-2.0.2" = { - name = "_at_octetstream_slash_promisify"; - packageName = "@octetstream/promisify"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz"; - sha512 = "7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg=="; - }; - }; "@octokit/auth-token-2.4.5" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; @@ -4921,15 +5017,6 @@ let sha512 = "bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q=="; }; }; - "@open-policy-agent/opa-wasm-1.2.0" = { - name = "_at_open-policy-agent_slash_opa-wasm"; - packageName = "@open-policy-agent/opa-wasm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz"; - sha512 = "CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ=="; - }; - }; "@opencensus/core-0.0.8" = { name = "_at_opencensus_slash_core"; packageName = "@opencensus/core"; @@ -5713,22 +5800,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.6" = { + "@serverless/platform-client-4.3.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.6"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.6.tgz"; - sha512 = "TVwlUvYnNjotd4010I9Vh0Dr0c2XByaUTEjpxLJm/Ti51Ka6vLIJ44JxuNZ6TmvkRh66yFZbaZUsVv6W4wNUVQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.0.tgz"; + sha512 = "q2CMqCkKeBaKA/UwfJAZLkdUsbghSbiYPvAX4rl9rsR5APm4KWtjKQP9CTOtVO5JRMWYoysK6jF0d5VJOABRzQ=="; }; }; - "@serverless/platform-client-china-2.2.2" = { + "@serverless/platform-client-china-2.2.3" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.2.tgz"; - sha512 = "58B0UOueZIZiR8btPgSav53Jvzz8ce0LMVp2bPnWUyu4oKrmlCSgO/vYCeklyCd4kBDGZQ3aefHNxLMusE/XRQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.3.tgz"; + sha512 = "MoDxI0d3HMesHwdyk7gzwLNU0wuJk/ovL9+XD/gAZgnrdZpFFq9kwnJAm2midL7jdhpnEFu/aoGJ0eE+xtQJ7w=="; }; }; "@serverless/template-1.1.4" = { @@ -5911,204 +5998,6 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@snyk/child-process-0.3.1" = { - name = "_at_snyk_slash_child-process"; - packageName = "@snyk/child-process"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/child-process/-/child-process-0.3.1.tgz"; - sha512 = "iJn0ENqf3xnYQdG/j9+pdqQPTrXCNXWU3I/AXGFx6Zr8IRBqBr5vXGTuwIJBYkq7s6bfIfz5AjUgPShCzeqn0w=="; - }; - }; - "@snyk/cli-interface-2.11.0" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz"; - sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; - }; - }; - "@snyk/cloud-config-parser-1.10.2" = { - name = "_at_snyk_slash_cloud-config-parser"; - packageName = "@snyk/cloud-config-parser"; - version = "1.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.2.tgz"; - sha512 = "ovA6iX59jLOVMfZr6rsqYNcOIjZTYAbm34bn41m3hRbCPuZkxe3JNKxjsEFCFkZQBnGSebrbz8TGoe81y0L2Cw=="; - }; - }; - "@snyk/cocoapods-lockfile-parser-3.6.2" = { - name = "_at_snyk_slash_cocoapods-lockfile-parser"; - packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz"; - sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA=="; - }; - }; - "@snyk/code-client-4.0.0" = { - name = "_at_snyk_slash_code-client"; - packageName = "@snyk/code-client"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.0.0.tgz"; - sha512 = "x6ZsL6jBz6rDSg1cFVnaqg4fVvQEerRaATem7aeq7l+HiPb8VnorJbq/61MlTgO7gWnA1WijzmzfJK5kAUpO1A=="; - }; - }; - "@snyk/composer-lockfile-parser-1.4.1" = { - name = "_at_snyk_slash_composer-lockfile-parser"; - packageName = "@snyk/composer-lockfile-parser"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz"; - sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; - }; - }; - "@snyk/dep-graph-1.28.1" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.28.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.1.tgz"; - sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; - }; - }; - "@snyk/docker-registry-v2-client-2.3.0" = { - name = "_at_snyk_slash_docker-registry-v2-client"; - packageName = "@snyk/docker-registry-v2-client"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-2.3.0.tgz"; - sha512 = "VYQe/1SuIdQ8C7bA6nzfcEeafsqG1cHaZDFaIt1uYGwI1TI0OWzUIvGRkfgkMkwFBVLRqS1hFczSoxGTT7OMfA=="; - }; - }; - "@snyk/fast-glob-3.2.6-patch" = { - name = "_at_snyk_slash_fast-glob"; - packageName = "@snyk/fast-glob"; - version = "3.2.6-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz"; - sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; - }; - }; - "@snyk/fix-1.650.0" = { - name = "_at_snyk_slash_fix"; - packageName = "@snyk/fix"; - version = "1.650.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.650.0.tgz"; - sha512 = "qzwb0+DMrjxTsBXAcC74gb2X17925SapCBNo6DybLbOZXNJ6IFvtdN5ucd2FguEojfVyB4HVqkpbawc0bbfGtA=="; - }; - }; - "@snyk/fix-pipenv-pipfile-0.5.4" = { - name = "_at_snyk_slash_fix-pipenv-pipfile"; - packageName = "@snyk/fix-pipenv-pipfile"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-pipenv-pipfile/-/fix-pipenv-pipfile-0.5.4.tgz"; - sha512 = "n1Sg21htJG+gqw2Q9JYsIFxT5IDtELifbQZheiLhOl8sgfoD6oCNyf07IwUqzPrW2wRpmCrTUtuO08+KGnzJpg=="; - }; - }; - "@snyk/fix-poetry-0.7.2" = { - name = "_at_snyk_slash_fix-poetry"; - packageName = "@snyk/fix-poetry"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix-poetry/-/fix-poetry-0.7.2.tgz"; - sha512 = "abBdeOb326exreUDnCkELw9GVOR7qdUQmX0sKyE1baz3i9WaWI5Wy0bWHqjw9oGE5ZP8Ki/xtzkHU2W57D++Zg=="; - }; - }; - "@snyk/gemfile-1.2.0" = { - name = "_at_snyk_slash_gemfile"; - packageName = "@snyk/gemfile"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz"; - sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; - }; - }; - "@snyk/glob-parent-5.1.2-patch.1" = { - name = "_at_snyk_slash_glob-parent"; - packageName = "@snyk/glob-parent"; - version = "5.1.2-patch.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz"; - sha512 = "OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ=="; - }; - }; - "@snyk/graphlib-2.1.9-patch.3" = { - name = "_at_snyk_slash_graphlib"; - packageName = "@snyk/graphlib"; - version = "2.1.9-patch.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz"; - sha512 = "bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q=="; - }; - }; - "@snyk/inquirer-7.3.3-patch" = { - name = "_at_snyk_slash_inquirer"; - packageName = "@snyk/inquirer"; - version = "7.3.3-patch"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz"; - sha512 = "aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q=="; - }; - }; - "@snyk/java-call-graph-builder-1.23.1" = { - name = "_at_snyk_slash_java-call-graph-builder"; - packageName = "@snyk/java-call-graph-builder"; - version = "1.23.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.23.1.tgz"; - sha512 = "mm6EI/BXFYq8boOHKs61j0R1n3JPsvwxlBsaO35cGFu9fTQaFRsBJdenKW41uJuLX+aFOC4zascbJDNfeE5THQ=="; - }; - }; - "@snyk/mix-parser-1.3.2" = { - name = "_at_snyk_slash_mix-parser"; - packageName = "@snyk/mix-parser"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.3.2.tgz"; - sha512 = "0Aq9vcgmjH0d9Gk5q0k6l4ZOvSHPf6/BCQGDVOpKp0hwOkXWnpDOLLPxL+uBCktuH9zTYQFB0aTk91kQImZqmA=="; - }; - }; - "@snyk/rpm-parser-2.2.1" = { - name = "_at_snyk_slash_rpm-parser"; - packageName = "@snyk/rpm-parser"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.1.tgz"; - sha512 = "OAON0bPf3c5fgM/GK9DX0aZErB6SnuRyYlPH0rqI1TXGsKrYnVELhaE6ctNbEfPTQuY9r6q0vM+UYDaFM/YliA=="; - }; - }; - "@snyk/snyk-cocoapods-plugin-2.5.2" = { - name = "_at_snyk_slash_snyk-cocoapods-plugin"; - packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz"; - sha512 = "WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A=="; - }; - }; - "@snyk/snyk-docker-pull-3.7.0" = { - name = "_at_snyk_slash_snyk-docker-pull"; - packageName = "@snyk/snyk-docker-pull"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.7.0.tgz"; - sha512 = "YRNysIPXmVPrP6+Gn8aG8T414r4GiSbxBP2R8CMXgBWFOdAPBoEoFjs7StjBfaVL1p0xl01AudgDnd42HDK9PA=="; - }; - }; - "@snyk/snyk-hex-plugin-1.1.4" = { - name = "_at_snyk_slash_snyk-hex-plugin"; - packageName = "@snyk/snyk-hex-plugin"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.1.4.tgz"; - sha512 = "kLfFGckSmyKe667UGPyWzR/H7/Trkt4fD8O/ktElOx1zWgmivpLm0Symb4RCfEmz9irWv+N6zIKRrfSNdytcPQ=="; - }; - }; "@squoosh/lib-0.4.0" = { name = "_at_squoosh_slash_lib"; packageName = "@squoosh/lib"; @@ -6730,15 +6619,6 @@ let sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw=="; }; }; - "@types/debug-4.1.7" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = "4.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - }; "@types/decompress-4.2.4" = { name = "_at_types_slash_decompress"; packageName = "@types/decompress"; @@ -6793,15 +6673,6 @@ let sha512 = "bsMEXVPrasIJ03u61msIKMMiL7Hh6dGQ3Gcz3CjytTxTQKQRdf/g0owWTSSL5mvKNgu9UfgornrF6qqClPk1Jw=="; }; }; - "@types/emscripten-1.39.5" = { - name = "_at_types_slash_emscripten"; - packageName = "@types/emscripten"; - version = "1.39.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.5.tgz"; - sha512 = "DIOOg+POSrYl+OlNRHQuIEqCd8DCtynG57H862UCce16nXJX7J8eWxNGgOcf8Eyge8zXeSs27mz1UcFu8L/L7g=="; - }; - }; "@types/engine.io-3.1.7" = { name = "_at_types_slash_engine.io"; packageName = "@types/engine.io"; @@ -6919,15 +6790,6 @@ let sha512 = "IyNhGHu71jH1jCXTHmafuoAAdsbBON3kDh7u/UUhLmjYgN5TYB54e1R8ckTCiIevl2UuZaCsi9XRxineY5yUjw=="; }; }; - "@types/flat-cache-2.0.0" = { - name = "_at_types_slash_flat-cache"; - packageName = "@types/flat-cache"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz"; - sha512 = "fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww=="; - }; - }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -6991,22 +6853,13 @@ let sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; }; }; - "@types/graphlib-2.1.8" = { - name = "_at_types_slash_graphlib"; - packageName = "@types/graphlib"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.8.tgz"; - sha512 = "8nbbyD3zABRA9ePoBgAl2ym8cIwKQXTfv1gaIRTdY99yEOCaHfmjBeRp+BIemS8NtOqoWK7mfzWxjNrxLK3T5w=="; - }; - }; - "@types/hast-2.3.2" = { + "@types/hast-2.3.4" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.2.tgz"; - sha512 = "Op5W7jYgZI7AWKY5wQ0/QNMzQM7dGQPyW1rXKNiymVCy5iTfdPuGu4HhYNOM2sIv8gUfIuIdcYlXmAepwaowow=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz"; + sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; }; }; "@types/hls.js-0.13.1" = { @@ -7126,15 +6979,6 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; - "@types/js-yaml-3.12.7" = { - name = "_at_types_slash_js-yaml"; - packageName = "@types/js-yaml"; - version = "3.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.7.tgz"; - sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; - }; - }; "@types/jscodeshift-0.7.2" = { name = "_at_types_slash_jscodeshift"; packageName = "@types/jscodeshift"; @@ -7216,42 +7060,6 @@ let sha512 = "/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="; }; }; - "@types/lodash.chunk-4.2.6" = { - name = "_at_types_slash_lodash.chunk"; - packageName = "@types/lodash.chunk"; - version = "4.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz"; - sha512 = "SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ=="; - }; - }; - "@types/lodash.omit-4.5.6" = { - name = "_at_types_slash_lodash.omit"; - packageName = "@types/lodash.omit"; - version = "4.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz"; - sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ=="; - }; - }; - "@types/lodash.pick-4.4.6" = { - name = "_at_types_slash_lodash.pick"; - packageName = "@types/lodash.pick"; - version = "4.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.6.tgz"; - sha512 = "u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g=="; - }; - }; - "@types/lodash.union-4.6.6" = { - name = "_at_types_slash_lodash.union"; - packageName = "@types/lodash.union"; - version = "4.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz"; - sha512 = "Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw=="; - }; - }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -7279,13 +7087,13 @@ let sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; }; }; - "@types/mdast-3.0.8" = { + "@types/mdast-3.0.10" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.8"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.8.tgz"; - sha512 = "HdUXWDNtDenuVJFrV2xBCLEMiw1Vn7FMuJxqJC5oBvC2adA3pgtp6CPCIMQdz3pmWxGuJjT+hOp6FnOXy6dXoQ=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz"; + sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA=="; }; }; "@types/mime-1.3.2" = { @@ -7369,15 +7177,6 @@ let sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; }; }; - "@types/ms-0.7.31" = { - name = "_at_types_slash_ms"; - packageName = "@types/ms"; - version = "0.7.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; - }; - }; "@types/multer-1.4.4" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; @@ -7414,15 +7213,6 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-13.13.52" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "13.13.52"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz"; - sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; - }; - }; "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7432,13 +7222,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.10" = { + "@types/node-14.17.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.10"; + version = "14.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.10.tgz"; - sha512 = "09x2d6kNBwjHgyh3jOUE2GE4DFoxDriDvWdu6mFhMP1ysynGYazt4ecZmJlL6/fe4Zi2vtYvTvtL7epjQQrBhA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.11.tgz"; + sha512 = "n2OQ+0Bz6WEsUjrvcHD1xZ8K+Kgo4cn9/w94s1bJS690QMUWfJPW/m7CCb7gPkA1fcYwL2UpjXP/rq/Eo41m6w=="; }; }; "@types/node-15.12.5" = { @@ -7450,13 +7240,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.8" = { + "@types/node-15.14.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.8"; + version = "15.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.8.tgz"; - sha512 = "+ZjmmoGV7WBwhzNh/GkwehB7uyXn9HFwzQUfj9pbyR8eFAq20Qguoh93sPbWzzhsbhTme6YE92/iJ54Z0WRH7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz"; + sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; "@types/node-15.6.1" = { @@ -7495,22 +7285,13 @@ let sha512 = "Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw=="; }; }; - "@types/node-16.6.2" = { + "@types/node-16.7.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.6.2"; + version = "16.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz"; - sha512 = "LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA=="; - }; - }; - "@types/node-16.7.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.7.0.tgz"; - sha512 = "e66BrnjWQ3BRBZ2+iA5e85fcH9GLNe4S0n1H0T3OalK2sXg5XWEFTO4xvmGrYQ3edy+q6fdOh5t0/HOY8OAqBg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz"; + sha512 = "ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A=="; }; }; "@types/node-6.14.13" = { @@ -7756,15 +7537,6 @@ let sha512 = "xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="; }; }; - "@types/sarif-2.1.4" = { - name = "_at_types_slash_sarif"; - packageName = "@types/sarif"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.4.tgz"; - sha512 = "4xKHMdg3foh3Va1fxTzY1qt8QVqmaJpGWsVvtjQrJBn+/bkig2pWFKJ4FPI2yLI4PAj0SUKiPO4Vd7ggYIMZjQ=="; - }; - }; "@types/sass-1.16.1" = { name = "_at_types_slash_sass"; packageName = "@types/sass"; @@ -7891,15 +7663,6 @@ let sha512 = "Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="; }; }; - "@types/treeify-1.0.0" = { - name = "_at_types_slash_treeify"; - packageName = "@types/treeify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/treeify/-/treeify-1.0.0.tgz"; - sha512 = "ONpcZAEYlbPx4EtJwfTyCDQJGUpKf4sEcuySdCVjK5Fj/3vHp5HII1fqa1/+qrsLnpYELCQTfVW/awsGJePoIg=="; - }; - }; "@types/uglify-js-3.13.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; @@ -7945,15 +7708,6 @@ let sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; }; }; - "@types/uuid-8.3.1" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "8.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.1.tgz"; - sha512 = "Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg=="; - }; - }; "@types/vfile-3.0.2" = { name = "_at_types_slash_vfile"; packageName = "@types/vfile"; @@ -8107,13 +7861,13 @@ let sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; }; }; - "@typescript-eslint/eslint-plugin-4.29.2" = { + "@typescript-eslint/eslint-plugin-4.29.3" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz"; - sha512 = "x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz"; + sha512 = "tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -8125,13 +7879,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.29.2" = { + "@typescript-eslint/experimental-utils-4.29.3" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz"; - sha512 = "P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz"; + sha512 = "ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -8143,22 +7897,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.29.2" = { + "@typescript-eslint/parser-4.29.3" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz"; - sha512 = "WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.3.tgz"; + sha512 = "jrHOV5g2u8ROghmspKoW7pN8T/qUzk0+DITun0MELptvngtMrwUJ1tv5zMI04CYVEUsSrN4jV7AKSv+I0y0EfQ=="; }; }; - "@typescript-eslint/scope-manager-4.29.2" = { + "@typescript-eslint/scope-manager-4.29.3" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz"; - sha512 = "mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz"; + sha512 = "x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -8170,13 +7924,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.29.2" = { + "@typescript-eslint/types-4.29.3" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz"; - sha512 = "K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.3.tgz"; + sha512 = "s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -8188,13 +7942,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.29.2" = { + "@typescript-eslint/typescript-estree-4.29.3" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz"; - sha512 = "TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz"; + sha512 = "45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -8206,13 +7960,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.29.2" = { + "@typescript-eslint/visitor-keys-4.29.3" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.29.2"; + version = "4.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz"; - sha512 = "bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz"; + sha512 = "MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -8395,31 +8149,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.4" = { + "@vue/compiler-core-3.2.6" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz"; - sha512 = "c8NuQq7mUXXxA4iqD5VUKpyVeklK53+DMbojYMyZ0VPPrb0BUWrZWFiqSDT+MFDv0f6Hv3QuLiHWb1BWMXBbrw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.6.tgz"; + sha512 = "vbwnz7+OhtLO5p5i630fTuQCL+MlUpEMTKHuX+RfetQ+3pFCkItt2JUH+9yMaBG2Hkz6av+T9mwN/acvtIwpbw=="; }; }; - "@vue/compiler-dom-3.2.4" = { + "@vue/compiler-dom-3.2.6" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.4.tgz"; - sha512 = "uj1nwO4794fw2YsYas5QT+FU/YGrXbS0Qk+1c7Kp1kV7idhZIghWLTjyvYibpGoseFbYLPd+sW2/noJG5H04EQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.6.tgz"; + sha512 = "+a/3oBAzFIXhHt8L5IHJOTP4a5egzvpXYyi13jR7CUYOR1S+Zzv7vBWKYBnKyJLwnrxTZnTQVjeHCgJq743XKg=="; }; }; - "@vue/shared-3.2.4" = { + "@vue/shared-3.2.6" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz"; - sha512 = "j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.6.tgz"; + sha512 = "uwX0Qs2e6kdF+WmxwuxJxOnKs/wEkMArtYpHSm7W+VY/23Tl8syMRyjnzEeXrNCAP0/8HZxEGkHJsjPEDNRuHw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -9025,42 +8779,6 @@ let sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; }; }; - "@yarnpkg/core-2.4.0" = { - name = "_at_yarnpkg_slash_core"; - packageName = "@yarnpkg/core"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/core/-/core-2.4.0.tgz"; - sha512 = "FYjcPNTfDfMKLFafQPt49EY28jnYC82Z2S7oMwLPUh144BL8v8YXzb4aCnFyi5nFC5h2kcrJfZh7+Pm/qvCqGw=="; - }; - }; - "@yarnpkg/fslib-2.5.1" = { - name = "_at_yarnpkg_slash_fslib"; - packageName = "@yarnpkg/fslib"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.5.1.tgz"; - sha512 = "Y360rwoaUBCF8i9nRepyuFQFNF5OybHafO4PQ5Pf68sT3H6ulmT2t/KjdtMey8zyJkDu5qrC3IgHk0c7zWRIrg=="; - }; - }; - "@yarnpkg/json-proxy-2.1.1" = { - name = "_at_yarnpkg_slash_json-proxy"; - packageName = "@yarnpkg/json-proxy"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/json-proxy/-/json-proxy-2.1.1.tgz"; - sha512 = "meUiCAgCYpXTH1qJfqfz+dX013ohW9p2dKfwIzUYAFutH+lsz1eHPBIk72cuCV84adh9gX6j66ekBKH/bIhCQw=="; - }; - }; - "@yarnpkg/libzip-2.2.2" = { - name = "_at_yarnpkg_slash_libzip"; - packageName = "@yarnpkg/libzip"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.2.2.tgz"; - sha512 = "M7ziz16f+tFFnJSCreLtemaGPpjT+NC0E21JQaWXAAlRmFIXz6zl2EZ+tXLxV9yJaplpNDbTgX1j5GPiwg5H5w=="; - }; - }; "@yarnpkg/lockfile-1.1.0" = { name = "_at_yarnpkg_slash_lockfile"; packageName = "@yarnpkg/lockfile"; @@ -9070,33 +8788,6 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-2.4.0" = { - name = "_at_yarnpkg_slash_parsers"; - packageName = "@yarnpkg/parsers"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-2.4.0.tgz"; - sha512 = "XWgiNGh4MkhdBTJVEbXEqzk66JKjvxTtKGeLPqo3rnJ7JiJnRaK2n9MLTKQB0uoRMWYzPlISdIlok6H9OdlOVQ=="; - }; - }; - "@yarnpkg/pnp-2.3.2" = { - name = "_at_yarnpkg_slash_pnp"; - packageName = "@yarnpkg/pnp"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/pnp/-/pnp-2.3.2.tgz"; - sha512 = "JdwHu1WBCISqJEhIwx6Hbpe8MYsYbkGMxoxolkDiAeJ9IGEe08mQcbX1YmUDV1ozSWlm9JZE90nMylcDsXRFpA=="; - }; - }; - "@yarnpkg/shell-2.4.1" = { - name = "_at_yarnpkg_slash_shell"; - packageName = "@yarnpkg/shell"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/shell/-/shell-2.4.1.tgz"; - sha512 = "oNNJkH8ZI5uwu0dMkJf737yMSY1WXn9gp55DqSA5wAOhKvV5DJTXFETxkVgBQhO6Bow9tMGSpvowTMD/oAW/9g=="; - }; - }; "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; @@ -10321,13 +10012,13 @@ let sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; }; }; - "apollo-datasource-3.0.3" = { + "apollo-datasource-3.1.0" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.0.3.tgz"; - sha512 = "oboGz50DbGW6LNaNvB/bpJRypXvYFE1SRO5VxYSUnkz1P7TDcemWfJLRjNnfxCIMVyd0hmmwrmSaGKPQZvmT9Q=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.1.0.tgz"; + sha512 = "ywcVjuWNo84eMB9uBOYygQI+00+Ne4ShyPIxJzT//sn1j1Fu3J+KStMNd6s1jyERWgjGZzxkiLn6nLmwsGymBg=="; }; }; "apollo-graphql-0.9.3" = { @@ -10384,13 +10075,13 @@ let sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; }; }; - "apollo-server-caching-3.0.1" = { + "apollo-server-caching-3.1.0" = { name = "apollo-server-caching"; packageName = "apollo-server-caching"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.0.1.tgz"; - sha512 = "Cd0imFQlU6IKrkm+RNY0MQvKTMBTME+518EuwCaw3TKNUYDpir1vOuIdc4bALXDANilOR73k/UQs/oPxayXfrg=="; + url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-3.1.0.tgz"; + sha512 = "bZ4bo0kSAsax9LbMQPlpuMTkQ657idF2ehOYe4Iw+8vj7vfAYa39Ii9IlaVAFMC1FxCYzLNFz+leZBm/Stn/NA=="; }; }; "apollo-server-core-2.25.2" = { @@ -10402,13 +10093,13 @@ let sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA=="; }; }; - "apollo-server-core-3.1.2" = { + "apollo-server-core-3.2.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.2.tgz"; - sha512 = "bFmzPDGBT97vMzdhhjlycL9Ey4YDa0eCVaHjI5TcYQM8Vphzvndd033DvvQFVRPWoZr8uwupeUyVa82Ne/iM6A=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.2.0.tgz"; + sha512 = "huNV76BOQVTsRqqLsBfZofnyKclMM3XewYDATY1dGtZ/1F7Zi/qpD1LF7S70S1d048idSC4KRLZp6F/tKIsh9w=="; }; }; "apollo-server-env-3.1.0" = { @@ -10438,13 +10129,13 @@ let sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; }; }; - "apollo-server-errors-3.0.1" = { + "apollo-server-errors-3.1.0" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.0.1.tgz"; - sha512 = "PSp64IFeN1YK5EYZ3V/8iDRESMMyE00h1vE5aCr83wHL3T0mN7VRiMKoOIZ+2rUtnn7CpK73o6QLmouhxPtXsQ=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.1.0.tgz"; + sha512 = "bUmobPEvtcBFt+OVHYqD390gacX/Cm5s5OI5gNZho8mYKAA6OjgnRlkm/Lti6NzniXVxEQyD5vjkC6Ox30mGFg=="; }; }; "apollo-server-express-2.25.2" = { @@ -10456,13 +10147,13 @@ let sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ=="; }; }; - "apollo-server-express-3.1.2" = { + "apollo-server-express-3.2.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.2.tgz"; - sha512 = "GeeQlFjFqugiGfLApBNmgLtyDXGVqacLdGhBccn7GQaxzpJ9YSsREUsoN+Fze6RVQ4/Igaq3QoNgBhrahXwBBQ=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.2.0.tgz"; + sha512 = "5I5HI1//I5FHZ3Uo/WUJz/xAZkhFPgPtc8U5AgvhlqqcDPfKxwUU0PxDW4BF/0lt3HDeqsDgvoc0Etp9siNM9g=="; }; }; "apollo-server-plugin-base-0.13.0" = { @@ -10474,13 +10165,13 @@ let sha512 = "L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg=="; }; }; - "apollo-server-plugin-base-3.1.1" = { + "apollo-server-plugin-base-3.2.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.1.1.tgz"; - sha512 = "gkV/UtMji6SrX8CdZ5/3IlRBVE57CM+DL6x9MA3pjNEc357OOC3dnh1SXNmp0cvqn66CB1kODGrqKGRxyl/qpA=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.2.0.tgz"; + sha512 = "anjyiw79wxU4Cj2bYZFWQqZPjuaZ4mVJvxCoyvkFrNvjPua9dovCOfpng43C5NwdsqJpz78Vqs236eFM2QoeaA=="; }; }; "apollo-server-types-0.9.0" = { @@ -10492,13 +10183,13 @@ let sha512 = "qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg=="; }; }; - "apollo-server-types-3.1.1" = { + "apollo-server-types-3.2.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.1.1.tgz"; - sha512 = "dTNlRxqdo+wnrcOFpFfzehdmcYHl6MQKuLnCCRzAHuVR5yOiuhQ5CIGhIjvMx2bP9ZoyON1SvXOIDTyTaU9gaQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.2.0.tgz"; + sha512 = "Fh7QP84ufDZHbLzoLyyxyzznlW8cpgEZYYkGsS1i36zY4VaAt5OUOp1f+FxWdLGehq0Arwb6D1W7y712IoZ/JQ=="; }; }; "apollo-tracing-0.15.0" = { @@ -11878,22 +11569,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.972.0" = { + "aws-sdk-2.974.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.972.0"; + version = "2.974.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.972.0.tgz"; - sha512 = "oRRjz68Yej/wz5JLc41zeG1m7QCvSj+Y2IOFqDflgwpDy4/M7Lp5HmCK2IK0d62FsKvG63b/9JL6+60ybGcsow=="; - }; - }; - "aws-sdk-2.973.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.973.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.973.0.tgz"; - sha512 = "IhVDIrI+7x+643S7HKDZ8bA8rTKfkCLSlxUZcP9W39PD5y04Hwamxou/kNTtXzdg1yyriq3d5tCVu6w5Z5QFDQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.974.0.tgz"; + sha512 = "/oNslIqWT8f9MKgl4jMS+B/M0pIPjWYsXC+DeiFKSH6xMAaVDURr+Qtze5FqEz13mMroO5PDQKfHaC/Z/yoZ3w=="; }; }; "aws-sign2-0.6.0" = { @@ -13228,15 +12910,6 @@ let sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw=="; }; }; - "binjumper-0.1.4" = { - name = "binjumper"; - packageName = "binjumper"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/binjumper/-/binjumper-0.1.4.tgz"; - sha512 = "Gdxhj+U295tIM6cO4bJO1jsvSjBVHNpj2o/OwW7pqDEtaqF6KdOxjtbo93jMMKAkP7+u09+bV8DhSqjIv4qR3w=="; - }; - }; "bintrees-1.0.1" = { name = "bintrees"; packageName = "bintrees"; @@ -13867,15 +13540,6 @@ let sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; }; }; - "bottleneck-2.19.5" = { - name = "bottleneck"; - packageName = "bottleneck"; - version = "2.19.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz"; - sha512 = "VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="; - }; - }; "boundary-1.0.1" = { name = "boundary"; packageName = "boundary"; @@ -15479,13 +15143,13 @@ let sha512 = "U7esrJ2aQ89ACJY8TD0UWgP0dC30V+vy5ZZ8zSiHJyM5JL4N61pLWXDlrKAhpI3rFlrZn6h8YefkQJRM5aC2gw=="; }; }; - "cdk8s-plus-17-1.0.0-beta.52" = { + "cdk8s-plus-17-1.0.0-beta.57" = { name = "cdk8s-plus-17"; packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.52"; + version = "1.0.0-beta.57"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.52.tgz"; - sha512 = "SGYJinLrJMk5DFVg3a0KsW0cahUGeyJvN5fRFfx7ZmdDjdcOPBRwCj08fGP2ont7xvNkFEgHopNfImOkFbd7fw=="; + url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.57.tgz"; + sha512 = "xEHt7qxEqqPY7L7Thfmkyx+KmaBT8aFcFlmlfOdKA6rv+PhSlWBmCMM9bFq4QI/k6Yd0+pMuY67dV9KvODcdgQ=="; }; }; "cdktf-0.5.0" = { @@ -15632,15 +15296,6 @@ let sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; - "chalk-4.1.1" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; - }; - }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -15884,15 +15539,6 @@ let sha512 = "NQky1HQyiAzxsxpq4Ppt47SYO2U3JLtmfs85QPf3kYSzGBjjp5AA8kqjH8hCjGFRpaQ781QOk1ragQIOkBgUTA=="; }; }; - "child-process-1.0.2" = { - name = "child-process"; - packageName = "child-process"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/child-process/-/child-process-1.0.2.tgz"; - sha1 = "98974dc7ed1ee4c6229f8e305fa7313a6885a7f2"; - }; - }; "child-process-ext-2.1.1" = { name = "child-process-ext"; packageName = "child-process-ext"; @@ -16577,15 +16223,6 @@ let sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc"; }; }; - "clipanion-2.6.2" = { - name = "clipanion"; - packageName = "clipanion"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipanion/-/clipanion-2.6.2.tgz"; - sha512 = "0tOHJNMF9+4R3qcbBL+4IxLErpaYSYvzs10aXuECDbZdJOuJHdagJMAqvLdeaUQTI/o2uSCDRpet6ywDiKOAYw=="; - }; - }; "clipboardy-1.2.3" = { name = "clipboardy"; packageName = "clipboardy"; @@ -18053,13 +17690,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.128" = { + "constructs-3.3.131" = { name = "constructs"; packageName = "constructs"; - version = "3.3.128"; + version = "3.3.131"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.128.tgz"; - sha512 = "rTU6aYZf0EZHpoMQ4mU23zZQAVYwmBPC/78w75diEmBs9DN4VSQ2tXm2um4OwpPUCu5jLMkhcdsRwdFpAlQdxQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.131.tgz"; + sha512 = "u2c7EzT7ZIZJs4SW5lXotZkoJOoTaiUJuZr0WWG+hfiyI91MbEe1pgthS2NyrHMJuEfyDzWtLphvPHk6C06qhg=="; }; }; "consume-http-header-1.0.0" = { @@ -18135,13 +17772,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.32.0" = { + "contentful-management-7.32.1" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.32.0"; + version = "7.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.32.0.tgz"; - sha512 = "L3W3XuSwRzW5X0iVj4rwW8IGSc8+yr+VIzSmTzu5aJv0qVGpYyIAq741nhZj8WhnkJJJu1JisZaRNbj6mGe1wQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.32.1.tgz"; + sha512 = "h45bwyI1Zv6ZCJCtkeo/xtNJNK9LU4s6DqudqQC/FWUH6+op59xxZ4V+KWaCJ14nR8Rh+hcwXIHzF4VNhGSEmg=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -18765,6 +18402,15 @@ let sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; }; }; + "cosmiconfig-7.0.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; + }; + }; "couch-login-0.1.20" = { name = "couch-login"; packageName = "couch-login"; @@ -22419,24 +22065,6 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "docker-modem-2.1.3" = { - name = "docker-modem"; - packageName = "docker-modem"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/docker-modem/-/docker-modem-2.1.3.tgz"; - sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; - }; - }; - "dockerfile-ast-0.2.1" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.2.1.tgz"; - sha512 = "ut04CVM1G6zIITTcYPDIXhPZk9mCa21m4dfW8FcDDGxwgTQhYyHDu6U7M8klZ7QsjqVcJhryKi+TGOX6bjgKdQ=="; - }; - }; "dockerfile-ast-0.3.0" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -22878,15 +22506,6 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-5.1.0" = { - name = "dotnet-deps-parser"; - packageName = "dotnet-deps-parser"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-5.1.0.tgz"; - sha512 = "/VVFME8IwiYJMC7amuVzHf+CZHiXxYjEjgKpRvvY3lKYFirdqacLwqLlrBl1dYYcUEwmHb/90cssTKInc9pvYg=="; - }; - }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -23220,13 +22839,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.2.1" = { + "electron-13.2.2" = { name = "electron"; packageName = "electron"; - version = "13.2.1"; + version = "13.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.2.1.tgz"; - sha512 = "/K0Uw+o3+phbHtrVL6qDFVJqmeRF6EIPwVeUHEH5R8JNy13f4X3RouKjQzVyY/Os8fEqYHGFONWhD6q6g750HQ=="; + url = "https://registry.npmjs.org/electron/-/electron-13.2.2.tgz"; + sha512 = "thGq2YaZqQWK1HexRghxdb26a8hA7ZSebukUSHlnHrY9+Sx9rW7e3uEHbibk/seRXVoXO76HndjKdHyObP9/Kw=="; }; }; "electron-notarize-1.1.0" = { @@ -23265,22 +22884,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.813" = { + "electron-to-chromium-1.3.816" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.813"; + version = "1.3.816"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.813.tgz"; - sha512 = "YcSRImHt6JZZ2sSuQ4Bzajtk98igQ0iKkksqlzZLzbh4p0OIyJRSvUbsgqfcR8txdfsoYCc4ym306t4p2kP/aw=="; - }; - }; - "electron-to-chromium-1.3.814" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.3.814"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.814.tgz"; - sha512 = "0mH03cyjh6OzMlmjauGg0TLd87ErIJqWiYxMcOLKf5w6p0YEOl7DJAj7BDlXEFmCguY5CQaKVOiMjAMODO2XDw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.816.tgz"; + sha512 = "/AvJPIJldO0NkwkfpUD7u1e4YEGRFBQpFuvl9oGCcVgWOObsZB1loxVGeVUJB9kmvfsBUUChPYdgRzx6+AKNyg=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23329,15 +22939,6 @@ let sha512 = "tKSFTWOp5OwJSp6MKyQDX7umYDkvUuI8rxHXw8BuUQ63d9Trj9xLeo6SHyoTGSoZNNZVitFa+RuHHXuoAzN3Rw=="; }; }; - "elfy-1.0.0" = { - name = "elfy"; - packageName = "elfy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz"; - sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; - }; - }; "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; @@ -23347,15 +22948,6 @@ let sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; }; - "email-validator-2.0.4" = { - name = "email-validator"; - packageName = "email-validator"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.4.tgz"; - sha512 = "gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="; - }; - }; "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { name = "emitter"; packageName = "emitter"; @@ -23411,15 +23003,6 @@ let sha1 = "cdeb36d0e66002c4b9d7bf1dfbc3a199fb7d409b"; }; }; - "emoji-regex-6.1.1" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz"; - sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; - }; - }; "emoji-regex-6.1.3" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -23582,15 +23165,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.1.0" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; - }; - }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -23618,15 +23192,6 @@ let sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ=="; }; }; - "endian-reader-0.3.0" = { - name = "endian-reader"; - packageName = "endian-reader"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/endian-reader/-/endian-reader-0.3.0.tgz"; - sha1 = "84eca436b80aed0d0639c47291338b932efe50a0"; - }; - }; "ends-with-0.2.0" = { name = "ends-with"; packageName = "ends-with"; @@ -24770,15 +24335,6 @@ let sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g=="; }; }; - "event-loop-spinner-2.1.0" = { - name = "event-loop-spinner"; - packageName = "event-loop-spinner"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-loop-spinner/-/event-loop-spinner-2.1.0.tgz"; - sha512 = "RJ10wL8/F9AlfBgRCvYctJIXSb9XkVmSCK3GGUvPD3dJrvTjDeDT0tmhcbEC6I2NEjNM9xD38HQJ4F/f/gb4VQ=="; - }; - }; "event-loop-stats-1.3.0" = { name = "event-loop-stats"; packageName = "event-loop-stats"; @@ -25400,13 +24956,13 @@ let sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; }; }; - "ext-1.4.0" = { + "ext-1.5.0" = { name = "ext"; packageName = "ext"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; + sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; }; }; "ext-list-2.2.2" = { @@ -28451,13 +28007,13 @@ let sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; }; }; - "github-slugger-1.3.0" = { + "github-slugger-1.4.0" = { name = "github-slugger"; packageName = "github-slugger"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz"; - sha512 = "gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q=="; + url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz"; + sha512 = "w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ=="; }; }; "github-url-from-git-1.5.0" = { @@ -28884,13 +28440,13 @@ let sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; - "globby-12.0.1" = { + "globby-12.0.2" = { name = "globby"; packageName = "globby"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.1.tgz"; - sha512 = "AofdCGi+crQ1uN9+nMbTnvC4XGNPJN9hRiPf+A76lUZIZoWoj4Z9iyUQGge7xCGKgR/7ejB36qoIlLoDBc7fYw=="; + url = "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz"; + sha512 = "lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ=="; }; }; "globby-4.1.0" = { @@ -28992,6 +28548,15 @@ let sha512 = "xeMOmvY6a7MBUjU1YPmREgDr7qiM5wZWXzdAZsnJxd0/fd5T0gYNi4saJ2eGvDGSmI+TehDn1bYF1Tvlo2GiBQ=="; }; }; + "goldengate-10.3.0" = { + name = "goldengate"; + packageName = "goldengate"; + version = "10.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.3.0.tgz"; + sha512 = "TDwMwK7j0vU/aOlQIkL6WqrYoFBOAYnJ9l2ueK3d60IHspycYKPyO9yBaX1bzsaS7nBH5YjuXBYncZK+12TSZQ=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -34411,13 +33976,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.2.0" = { + "jitdb-3.3.0" = { name = "jitdb"; packageName = "jitdb"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.2.0.tgz"; - sha512 = "h44dG1Ba5eCIUcyekuH2PjrQa6GQ0s6hlwUUWZ+F0Q7OmFacwlUxJzvatDzRfWtRDkHFkv3+KDEN3dNMSougqg=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.3.0.tgz"; + sha512 = "lZvQN7Cv/nQ8eueyyT/U2RuDi5wKOTL1PP3TrTRuXXv7ENYBohvJfbUX/Rv6+JL84+aN82qjZeFb4UsllHWJ4w=="; }; }; "jju-1.4.0" = { @@ -34528,13 +34093,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.28.1" = { + "jquery.terminal-2.29.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.28.1"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.28.1.tgz"; - sha512 = "2y/MFSTMbEbvUsd8Fq0GLDaI/bsGv5QVs3h+vgQ2BqBQMmIDlnuNTDJbtOFiTLksghlWG0P9iXjovrjMLwcOhQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.29.1.tgz"; + sha512 = "YfZuBY2B/wpmqNXtaIJuDStomw/dWLxAqgMzdt2Kipq3+annRaSzF1l8Al/d8PCo4W6vg2DiKj5nvQf03k0UGA=="; }; }; "js-base64-2.6.4" = { @@ -34861,13 +34426,13 @@ let sha512 = "cUhDs2V2wYg7LFgm/X/uken8oF9re3vRORD08s0+z9Re8tt0pEehKmCotx3HYFhYrRhCEVvm66xjQt0t62GzXg=="; }; }; - "jsii-srcmak-0.1.329" = { + "jsii-srcmak-0.1.333" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.329"; + version = "0.1.333"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.329.tgz"; - sha512 = "H4Sw8Ek33JeP7cHHAe6m4BZivwRqW6rq8X/IMleaLpzK9QAiJykf7wYV4+TSpeBUpdoipshFcnefzXtNny8iwA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.333.tgz"; + sha512 = "DLPIfxoeCy5sKsxKP0kB0aENn/wrrCTG95IJy8dDUcvQbRTF3vZynMwlzDyNr72mH5l/QKHFsW2UDoz7sTzJ0Q=="; }; }; "json-bigint-1.0.0" = { @@ -34915,15 +34480,6 @@ let sha512 = "FD/SedD78LCdSvJaOUQAXseT8oQBb5z6IVYaQaCrVUlu9zOAr1BDdKyVYQaSD/GDsAMrXpKcOyBD4LIl8nfjHw=="; }; }; - "json-file-plus-3.3.1" = { - name = "json-file-plus"; - packageName = "json-file-plus"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-file-plus/-/json-file-plus-3.3.1.tgz"; - sha512 = "wo0q1UuiV5NsDPQDup1Km8IwEeqe+olr8tkWxeJq9Bjtcp7DZ0l+yrg28fSC3DEtrE311mhTZ54QGS6oiqnZEA=="; - }; - }; "json-merge-patch-0.2.3" = { name = "json-merge-patch"; packageName = "json-merge-patch"; @@ -35167,13 +34723,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.1" = { + "json2jsii-0.2.5" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.1"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.1.tgz"; - sha512 = "e7440eXg2IgXd/C/clf9+ttc/DGoUTrOUErumLKaalc4oVi9S6yDyd7sWS3cxoUBtq8+USCON2OTyDHII6x60g=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.5.tgz"; + sha512 = "hdeyAlmCSMocOe+VFOp5IjP/7KrZNy4b/9a4fifnb75D3FCpxvVoSwToqMF25UaUfXVisNmGe9RlBxxcAiDiLw=="; }; }; "json3-3.2.6" = { @@ -35491,15 +35047,6 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.7.0" = { - name = "jszip"; - packageName = "jszip"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.7.0.tgz"; - sha512 = "Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw=="; - }; - }; "jszip-3.7.1" = { name = "jszip"; packageName = "jszip"; @@ -37463,15 +37010,6 @@ let sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; }; }; - "lodash.assignin-4.2.0" = { - name = "lodash.assignin"; - packageName = "lodash.assignin"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; - sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; - }; - }; "lodash.bind-2.4.1" = { name = "lodash.bind"; packageName = "lodash.bind"; @@ -37490,15 +37028,6 @@ let sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; }; - "lodash.chunk-4.2.0" = { - name = "lodash.chunk"; - packageName = "lodash.chunk"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz"; - sha1 = "66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"; - }; - }; "lodash.clone-4.5.0" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -37526,15 +37055,6 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.constant-3.0.0" = { - name = "lodash.constant"; - packageName = "lodash.constant"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.constant/-/lodash.constant-3.0.0.tgz"; - sha1 = "bfe05cce7e515b3128925d6362138420bd624910"; - }; - }; "lodash.debounce-4.0.8" = { name = "lodash.debounce"; packageName = "lodash.debounce"; @@ -37607,42 +37127,6 @@ let sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; }; }; - "lodash.filter-4.6.0" = { - name = "lodash.filter"; - packageName = "lodash.filter"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz"; - sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; - }; - }; - "lodash.find-4.6.0" = { - name = "lodash.find"; - packageName = "lodash.find"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz"; - sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; - }; - }; - "lodash.findindex-4.6.0" = { - name = "lodash.findindex"; - packageName = "lodash.findindex"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.findindex/-/lodash.findindex-4.6.0.tgz"; - sha1 = "a3245dee61fb9b6e0624b535125624bb69c11106"; - }; - }; - "lodash.findkey-4.6.0" = { - name = "lodash.findkey"; - packageName = "lodash.findkey"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.findkey/-/lodash.findkey-4.6.0.tgz"; - sha1 = "83058e903b51cbb759d09ccf546dea3ea39c4718"; - }; - }; "lodash.flatmap-4.5.0" = { name = "lodash.flatmap"; packageName = "lodash.flatmap"; @@ -37661,15 +37145,6 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; - "lodash.flattendeep-4.4.0" = { - name = "lodash.flattendeep"; - packageName = "lodash.flattendeep"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; - }; - }; "lodash.foreach-2.4.1" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -37688,15 +37163,6 @@ let sha1 = "6fd7efb79691aecd67fdeac2761c98e701d6c39a"; }; }; - "lodash.foreach-4.5.0" = { - name = "lodash.foreach"; - packageName = "lodash.foreach"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; - sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; - }; - }; "lodash.forown-2.4.1" = { name = "lodash.forown"; packageName = "lodash.forown"; @@ -37733,15 +37199,6 @@ let sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; }; }; - "lodash.has-4.5.2" = { - name = "lodash.has"; - packageName = "lodash.has"; - version = "4.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz"; - sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; - }; - }; "lodash.identity-2.4.1" = { name = "lodash.identity"; packageName = "lodash.identity"; @@ -37769,15 +37226,6 @@ let sha1 = "0a11ba631d0e95c23c7f2f4cbb9a692ed178e705"; }; }; - "lodash.invert-4.3.0" = { - name = "lodash.invert"; - packageName = "lodash.invert"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.invert/-/lodash.invert-4.3.0.tgz"; - sha1 = "8ffe20d4b616f56bea8f1aa0c6ebd80dcf742aee"; - }; - }; "lodash.isarguments-2.4.1" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -37967,33 +37415,6 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; - "lodash.keys-4.2.0" = { - name = "lodash.keys"; - packageName = "lodash.keys"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.2.0.tgz"; - sha1 = "a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"; - }; - }; - "lodash.last-3.0.0" = { - name = "lodash.last"; - packageName = "lodash.last"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.last/-/lodash.last-3.0.0.tgz"; - sha1 = "242f663112dd4c6e63728c60a3c909d1bdadbd4c"; - }; - }; - "lodash.map-4.6.0" = { - name = "lodash.map"; - packageName = "lodash.map"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; - sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; - }; - }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -38048,15 +37469,6 @@ let sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; }; }; - "lodash.orderby-4.6.0" = { - name = "lodash.orderby"; - packageName = "lodash.orderby"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; - sha1 = "e697f04ce5d78522f54d9338b32b81a3393e4eb3"; - }; - }; "lodash.pad-4.5.1" = { name = "lodash.pad"; packageName = "lodash.pad"; @@ -38093,15 +37505,6 @@ let sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; }; }; - "lodash.reduce-4.6.0" = { - name = "lodash.reduce"; - packageName = "lodash.reduce"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; - sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; - }; - }; "lodash.repeat-4.1.0" = { name = "lodash.repeat"; packageName = "lodash.repeat"; @@ -38120,24 +37523,6 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; - "lodash.set-4.3.2" = { - name = "lodash.set"; - packageName = "lodash.set"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; - sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; - }; - }; - "lodash.size-4.2.0" = { - name = "lodash.size"; - packageName = "lodash.size"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.size/-/lodash.size-4.2.0.tgz"; - sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; - }; - }; "lodash.snakecase-4.1.1" = { name = "lodash.snakecase"; packageName = "lodash.snakecase"; @@ -38165,15 +37550,6 @@ let sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; }; - "lodash.sum-4.0.2" = { - name = "lodash.sum"; - packageName = "lodash.sum"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sum/-/lodash.sum-4.0.2.tgz"; - sha1 = "ad90e397965d803d4f1ff7aa5b2d0197f3b4637b"; - }; - }; "lodash.support-2.4.1" = { name = "lodash.support"; packageName = "lodash.support"; @@ -38237,15 +37613,6 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "lodash.topairs-4.3.0" = { - name = "lodash.topairs"; - packageName = "lodash.topairs"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz"; - sha1 = "3b6deaa37d60fb116713c46c5f17ea190ec48d64"; - }; - }; "lodash.transform-4.6.0" = { name = "lodash.transform"; packageName = "lodash.transform"; @@ -38309,15 +37676,6 @@ let sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; }; }; - "lodash.upperfirst-4.3.1" = { - name = "lodash.upperfirst"; - packageName = "lodash.upperfirst"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; - sha1 = "1365edf431480481ef0d1c68957a5ed99d49f7ce"; - }; - }; "lodash.values-2.4.1" = { name = "lodash.values"; packageName = "lodash.values"; @@ -38327,15 +37685,6 @@ let sha1 = "abf514436b3cb705001627978cbcf30b1280eea4"; }; }; - "lodash.values-4.3.0" = { - name = "lodash.values"; - packageName = "lodash.values"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz"; - sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; - }; - }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -39029,13 +38378,13 @@ let sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; }; }; - "make-fetch-happen-9.0.5" = { + "make-fetch-happen-9.1.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "9.0.5"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.0.5.tgz"; - sha512 = "XN0i/VqHsql30Oq7179spk6vu3IuaPL1jaivNYhBrJtK7tkOuJwMK2IlROiOnJ40b9SvmOo2G86FZyI6LD2EsQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; "make-iterator-1.0.1" = { @@ -40631,15 +39980,6 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.2" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; - }; - }; "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; @@ -42476,15 +41816,6 @@ let sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; }; }; - "needle-2.6.0" = { - name = "needle"; - packageName = "needle"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; - sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; - }; - }; "needle-2.8.0" = { name = "needle"; packageName = "needle"; @@ -42494,6 +41825,15 @@ let sha512 = "ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw=="; }; }; + "needle-2.9.0" = { + name = "needle"; + packageName = "needle"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.9.0.tgz"; + sha512 = "UBLC4P8w9to3rAhWOQYXIXzTUio9yVnDzIeKxfGbF+Hngy+2bXTqqFK+6nF42EAQKfJdezXK6vzMsefUa1Y3ag=="; + }; + }; "negotiator-0.3.0" = { name = "negotiator"; packageName = "negotiator"; @@ -43072,13 +42412,13 @@ let sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; }; - "node-gyp-8.1.0" = { + "node-gyp-8.2.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.1.0.tgz"; - sha512 = "o2elh1qt7YUp3lkMwY3/l4KF3j/A3fI/Qt4NH+CQQgPJdqGE9y7qnP84cjIWN27Q0jJkrSAhCVDg+wBVNBYdBg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.2.0.tgz"; + sha512 = "KG8SdcoAnw2d6augGwl1kOayALUrXW/P2uOAm2J2+nmW/HjZo7y+8TDg7LejxbekOOSv3kzhq+NSUYkIDAX8eA=="; }; }; "node-gyp-build-3.9.0" = { @@ -46268,15 +45608,6 @@ let sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; }; }; - "parse-link-header-1.0.1" = { - name = "parse-link-header"; - packageName = "parse-link-header"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-link-header/-/parse-link-header-1.0.1.tgz"; - sha1 = "bedfe0d2118aeb84be75e7b025419ec8a61140a7"; - }; - }; "parse-ms-2.1.0" = { name = "parse-ms"; packageName = "parse-ms"; @@ -49032,24 +48363,6 @@ let sha512 = "3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q=="; }; }; - "promise-deferred-2.0.3" = { - name = "promise-deferred"; - packageName = "promise-deferred"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-deferred/-/promise-deferred-2.0.3.tgz"; - sha512 = "n10XaoznCzLfyPFOlEE8iurezHpxrYzyjgq/1eW9Wk1gJwur/N7BdBmjJYJpqMeMcXK4wEbzo2EvZQcqjYcKUQ=="; - }; - }; - "promise-fs-2.1.1" = { - name = "promise-fs"; - packageName = "promise-fs"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-fs/-/promise-fs-2.1.1.tgz"; - sha512 = "43p7e4QzAQ3w6eyN0+gbBL7jXiZFWLWYITg9wIObqkBySu/a5K1EDcQ/S6UyB/bmiZWDA4NjTbcopKLTaKcGSw=="; - }; - }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -49086,15 +48399,6 @@ let sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; }; }; - "promiseback-2.0.3" = { - name = "promiseback"; - packageName = "promiseback"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/promiseback/-/promiseback-2.0.3.tgz"; - sha512 = "VZXdCwS0ppVNTIRfNsCvVwJAaP2b+pxQF7lM8DMWfmpNWyTxB6O5YNbzs+8z0ki/KIBHKHk308NTIl4kJUem3w=="; - }; - }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -50364,13 +49668,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.162" = { + "pyright-1.1.163" = { name = "pyright"; packageName = "pyright"; - version = "1.1.162"; + version = "1.1.163"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; - sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.163.tgz"; + sha512 = "CU0WPzr+6ZKIqCqqVrOtxMFWdzdOV18zKmC7dVBzp3snuun8JafnnmUzNJpO8IJLN/bQNSLb3riLtXFM/8Xxbg=="; }; }; "q-0.9.7" = { @@ -53397,6 +52701,15 @@ let sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; }; + "resolve-global-1.0.0" = { + name = "resolve-global"; + packageName = "resolve-global"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz"; + sha512 = "zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw=="; + }; + }; "resolve-options-1.1.0" = { name = "resolve-options"; packageName = "resolve-options"; @@ -53883,13 +53196,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.56.2" = { + "rollup-2.56.3" = { name = "rollup"; packageName = "rollup"; - version = "2.56.2"; + version = "2.56.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; - sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; + sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -54405,13 +53718,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.38.0" = { + "sass-1.38.1" = { name = "sass"; packageName = "sass"; - version = "1.38.0"; + version = "1.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; - sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.1.tgz"; + sha512 = "Lj8nPaSYOuRhgqdyShV50fY5jKnvaRmikUNalMPmbH+tKMGgEKVkltI/lP30PEfO2T1t6R9yc2QIBLgOc3uaFw=="; }; }; "sax-0.5.8" = { @@ -56043,204 +55356,6 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-4.0.0" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-4.0.0.tgz"; - sha512 = "E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ=="; - }; - }; - "snyk-cpp-plugin-2.2.1" = { - name = "snyk-cpp-plugin"; - packageName = "snyk-cpp-plugin"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz"; - sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; - }; - }; - "snyk-docker-plugin-4.23.0" = { - name = "snyk-docker-plugin"; - packageName = "snyk-docker-plugin"; - version = "4.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.23.0.tgz"; - sha512 = "hcQnDH6kN+Q9FU5/ulqfS/zmrM3YYM5cuCBjU9SZlDE/U3kpqDFePqHPmDdUBuQCdT0/3Os5A3qyg9Y7iNz8fg=="; - }; - }; - "snyk-go-parser-1.4.1" = { - name = "snyk-go-parser"; - packageName = "snyk-go-parser"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz"; - sha512 = "StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w=="; - }; - }; - "snyk-go-plugin-1.17.0" = { - name = "snyk-go-plugin"; - packageName = "snyk-go-plugin"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz"; - sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q=="; - }; - }; - "snyk-gradle-plugin-3.16.1" = { - name = "snyk-gradle-plugin"; - packageName = "snyk-gradle-plugin"; - version = "3.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.16.1.tgz"; - sha512 = "ii+W544+vCsRe+I4FdmhnYwGq5ZZYacEkUswJoUYmj1sIkkN1G0iUyas/r9mX+ERjQlvzyN4diptZe9OeaTaaA=="; - }; - }; - "snyk-module-3.1.0" = { - name = "snyk-module"; - packageName = "snyk-module"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz"; - sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; - }; - }; - "snyk-mvn-plugin-2.26.2" = { - name = "snyk-mvn-plugin"; - packageName = "snyk-mvn-plugin"; - version = "2.26.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.26.2.tgz"; - sha512 = "XS6I10OYMzUq60DUqf0Lf4m8uLXZTFH58O++n5W/X4MtSmYV4frrpgZOrrDfzxBM5S7SH9FlKDL3p+1m84yqzg=="; - }; - }; - "snyk-nodejs-lockfile-parser-1.35.0" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.35.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.35.0.tgz"; - sha512 = "fSjer9Ic8cdA2HvInUmhwbAhoLFXIokAzGB1PeGKwr0zzyfo3dSX3ReTMEbkhrEg+h0eES13px/KiiJ0EKRKMg=="; - }; - }; - "snyk-nodejs-lockfile-parser-1.36.0" = { - name = "snyk-nodejs-lockfile-parser"; - packageName = "snyk-nodejs-lockfile-parser"; - version = "1.36.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.36.0.tgz"; - sha512 = "IYg1Kbz/juuXrZNe7UoWTyHV+QKDveahxM3y1h/gZDwoOC9fgyVlC0p0v/RyeYRtvScxQcJchCr94V1VStwroA=="; - }; - }; - "snyk-nuget-plugin-1.22.1" = { - name = "snyk-nuget-plugin"; - packageName = "snyk-nuget-plugin"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.22.1.tgz"; - sha512 = "Z/NAM7DECBTMXSGPQ9Ubc4AJsFw8ioq+UVpDQu3tkbjd83Pp0JODRjH6rElN7PnsvEADfJt8THfyC0ehXxZD/Q=="; - }; - }; - "snyk-paket-parser-1.6.0" = { - name = "snyk-paket-parser"; - packageName = "snyk-paket-parser"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz"; - sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; - }; - }; - "snyk-php-plugin-1.9.2" = { - name = "snyk-php-plugin"; - packageName = "snyk-php-plugin"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz"; - sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; - }; - }; - "snyk-poetry-lockfile-parser-1.1.7" = { - name = "snyk-poetry-lockfile-parser"; - packageName = "snyk-poetry-lockfile-parser"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.7.tgz"; - sha512 = "5waaslW7odDlox3WQMouSh/BjBrKq2rolMox3Ij/Vaju8r/3eWvs7anikzJUzNKwNcLm8AR5u4ftG/hxqDJJgA=="; - }; - }; - "snyk-policy-1.22.0" = { - name = "snyk-policy"; - packageName = "snyk-policy"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.22.0.tgz"; - sha512 = "torzlNhDWcoMQLcX2xsTbCXfKXE614+5YvLHxEefQPwC1JNkbCN5u3/pU0c+2RfC2cPCa1AKEBqIx5gvr6mNyQ=="; - }; - }; - "snyk-python-plugin-1.20.1" = { - name = "snyk-python-plugin"; - packageName = "snyk-python-plugin"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.20.1.tgz"; - sha512 = "BW5e5o59ev9PzwjVYmWWCgQpVIsMwK3rkEh1BYPMNHFbRC9QXvKsZmr9UX+jSo1rOWNy3fUIjh8t9NAK536YPQ=="; - }; - }; - "snyk-resolve-1.1.0" = { - name = "snyk-resolve"; - packageName = "snyk-resolve"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz"; - sha512 = "OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw=="; - }; - }; - "snyk-resolve-deps-4.7.2" = { - name = "snyk-resolve-deps"; - packageName = "snyk-resolve-deps"; - version = "4.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz"; - sha512 = "Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg=="; - }; - }; - "snyk-sbt-plugin-2.11.3" = { - name = "snyk-sbt-plugin"; - packageName = "snyk-sbt-plugin"; - version = "2.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.3.tgz"; - sha512 = "xcZAYENuEx+SG51AuLLL59jpN/qerJdSdznTANoyNM7bJjVhTvLTjEfoOxbeogZwKmFDKKUfc6Vw+EdEy8VZug=="; - }; - }; - "snyk-tree-1.0.0" = { - name = "snyk-tree"; - packageName = "snyk-tree"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; - sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; - }; - }; - "snyk-try-require-1.3.1" = { - name = "snyk-try-require"; - packageName = "snyk-try-require"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz"; - sha1 = "6e026f92e64af7fcccea1ee53d524841e418a212"; - }; - }; - "snyk-try-require-2.0.2" = { - name = "snyk-try-require"; - packageName = "snyk-try-require"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.2.tgz"; - sha512 = "kohtSHpe42qzS8QUi6dUv43S0O6puUt3W8j16ZAbmQhW2Rnf5TyTXL4DR4ZBQDC0uyWunuDK7KsalAlQGDNl8w=="; - }; - }; "socket.io-1.0.6" = { name = "socket.io"; packageName = "socket.io"; @@ -56421,13 +55536,13 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "sockjs-client-1.5.1" = { + "sockjs-client-1.5.2" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.1.tgz"; - sha512 = "VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; + sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; }; }; "socks-1.1.10" = { @@ -57060,15 +56175,6 @@ let sha1 = "b7e8e0ab51345158b72c1f6dbef2406d51f1d027"; }; }; - "split-ca-1.0.1" = { - name = "split-ca"; - packageName = "split-ca"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz"; - sha1 = "6c83aff3692fa61256e0cd197e05e9de157691a6"; - }; - }; "split-lines-2.1.0" = { name = "split-lines"; packageName = "split-lines"; @@ -57582,13 +56688,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.50" = { + "sscaff-1.2.52" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.50"; + version = "1.2.52"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.50.tgz"; - sha512 = "uEcxq341buXVnoWpzwHahKuTw4WkauXv+TFZMY2ljjlKQMRoaJm1rgsSFJEDe1w53pL+qgvFUziV/zKmbA1P5g=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.52.tgz"; + sha512 = "H9068eQM8lTFbvS6m2WdpYRNyH14VqP74dK6WGg3VCF6vBSRR3fbbPP0mTamsG4sA3h+c2efB3107y/15JfDEg=="; }; }; "ssh-config-1.1.6" = { @@ -57600,24 +56706,6 @@ let sha512 = "ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA=="; }; }; - "ssh2-0.8.9" = { - name = "ssh2"; - packageName = "ssh2"; - version = "0.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz"; - sha512 = "GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw=="; - }; - }; - "ssh2-streams-0.4.10" = { - name = "ssh2-streams"; - packageName = "ssh2-streams"; - version = "0.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz"; - sha512 = "8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ=="; - }; - }; "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; @@ -58176,15 +57264,6 @@ let sha512 = "PS6wT2ZyyR38Cy+lE6PBEI1ZmO2HdzZoLeDGG0zZbYikCZd0dh8FUoSeFzgWLItpBYw1WJmPVRLpykRV+lAWLQ=="; }; }; - "stream-to-promise-2.2.0" = { - name = "stream-to-promise"; - packageName = "stream-to-promise"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-to-promise/-/stream-to-promise-2.2.0.tgz"; - sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; - }; - }; "stream-to-promise-3.0.0" = { name = "stream-to-promise"; packageName = "stream-to-promise"; @@ -58914,13 +57993,13 @@ let sha512 = "CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA=="; }; }; - "styled-components-5.3.0" = { + "styled-components-5.3.1" = { name = "styled-components"; packageName = "styled-components"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.0.tgz"; - sha512 = "bPJKwZCHjJPf/hwTJl6TbkSZg/3evha+XPEizrZUGb535jLImwDUdjTNxXqjjaASt2M4qO4AVfoHJNe3XB/tpQ=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.1.tgz"; + sha512 = "JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ=="; }; }; "stylehacks-4.0.3" = { @@ -59283,6 +58362,15 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; + "svelte-preprocess-4.8.0" = { + name = "svelte-preprocess"; + packageName = "svelte-preprocess"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.8.0.tgz"; + sha512 = "i9Z17cwGlp+kuSSv3kJWdAdAP2L26A5yMzHHdDj8YL+86sN64Yz5/gfjQp3Xb6fiaToo4sB+wTpid/23Gz0yvw=="; + }; + }; "svelte2tsx-0.4.5" = { name = "svelte2tsx"; packageName = "svelte2tsx"; @@ -59580,13 +58668,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.8.0" = { + "systeminformation-5.8.2" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.8.0"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.0.tgz"; - sha512 = "l4drbK2PtNynGKblaShY9hDLW/gg1zxUq2+Yk4gTyd6a2JUvFyTGP8PhHV9iOh+MzS25PQa8W1t0kvcIvr9n7Q=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.2.tgz"; + sha512 = "XxK/gHdfGFtCAv7JLwGlPoU8bfkcTHgcGSU9LqgbdURwOgwyYlfX+jailzh2eX//9r+Wg53oOv+/DE30KNK2qA=="; }; }; "table-3.8.3" = { @@ -60139,13 +59227,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.7.1" = { + "terser-5.7.2" = { name = "terser"; packageName = "terser"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz"; - sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"; + sha512 = "0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -60742,15 +59830,6 @@ let sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; }; }; - "tmp-0.1.0" = { - name = "tmp"; - packageName = "tmp"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz"; - sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; - }; - }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -61561,15 +60640,6 @@ let sha512 = "n5CMlUUj+N5pjBhBACLq4jdr9cPTitySCjIosoQm0zwK99gmrcTGAfY9CwxRFT9+9OleNWXPRUcxsKP4AYExxQ=="; }; }; - "tslib-1.11.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; - }; - }; "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; @@ -67603,15 +66673,6 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-js-0.3.0" = { - name = "yaml-js"; - packageName = "yaml-js"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.3.0.tgz"; - sha512 = "JbTUdsPiCkOyz+JOSqAVc19omTnUBnBQglhuclYov5HpWbEOz8y+ftqWjiMa9Pe/eF/dmCUeNgVs/VWg53GlgQ=="; - }; - }; "yaml-language-server-0.20.0" = { name = "yaml-language-server"; packageName = "yaml-language-server"; @@ -67999,22 +67060,22 @@ let sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.5.1" = { + "yeoman-environment-3.6.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.5.1.tgz"; - sha512 = "XIJoCQDNlttjFubWL+tpf+t1MkFUdsqwtJvR2qhfzhHi8Z7ZzAwiBPgCtTiLK1mwPTfqzV/V0E9l7zX7hrhBdg=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.6.0.tgz"; + sha512 = "X16N9lhzRdUKFT8MZrpwjLDKsdgAUqh4VPR2wAXeAqjJJaUxYBxCQGFxtZVTf3vbyNuIHXPunwOLtK60bpapbg=="; }; }; - "yeoman-generator-5.4.1" = { + "yeoman-generator-5.4.2" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.1.tgz"; - sha512 = "ZlO++ByvxiapJo3TZy1/Bx5S2LRnNoQ7IMnJRjMtP6bWP1BldfoPMJAP4PztQOc6okufBFDUVR9Yjt6MB2G9YA=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.4.2.tgz"; + sha512 = "xgS3A4r5VoEYq3vPdk1fWPVZ30y5NHlT2hn0OEyhKG79xojCtPkPkfWcKQamgvC9QLhaotVGvambBxwxwBeDTg=="; }; }; "yesno-0.3.1" = { @@ -68353,7 +67414,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" - sources."make-fetch-happen-9.0.5" + sources."make-fetch-happen-9.1.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" @@ -68968,6 +68029,229 @@ in bypassCache = true; reconstructLock = true; }; + "@commitlint/cli" = nodeEnv.buildNodePackage { + name = "_at_commitlint_slash_cli"; + packageName = "@commitlint/cli"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz"; + sha512 = "xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w=="; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@commitlint/ensure-13.1.0" + sources."@commitlint/execute-rule-13.0.0" + sources."@commitlint/format-13.1.0" + sources."@commitlint/is-ignored-13.1.0" + sources."@commitlint/lint-13.1.0" + sources."@commitlint/load-13.1.0" + sources."@commitlint/message-13.0.0" + sources."@commitlint/parse-13.1.0" + sources."@commitlint/read-13.1.0" + sources."@commitlint/resolve-extends-13.0.0" + sources."@commitlint/rules-13.1.0" + sources."@commitlint/to-lines-13.0.0" + (sources."@commitlint/top-level-13.0.0" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) + sources."@commitlint/types-13.1.0" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."JSONStream-1.3.5" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."array-ify-1.0.0" + sources."arrify-1.0.1" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-4.1.2" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."compare-func-2.0.0" + sources."conventional-changelog-angular-5.0.12" + sources."conventional-commits-parser-3.2.1" + sources."cosmiconfig-7.0.1" + sources."cross-spawn-7.0.3" + sources."dargs-7.0.0" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."dot-prop-5.3.0" + sources."emoji-regex-8.0.0" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."execa-5.1.1" + sources."find-up-4.1.0" + sources."fs-extra-10.0.0" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-stream-6.0.1" + sources."git-raw-commits-2.0.10" + sources."global-dirs-0.1.1" + sources."graceful-fs-4.2.8" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."hosted-git-info-4.0.2" + sources."human-signals-2.1.0" + (sources."import-fresh-3.3.0" // { + dependencies = [ + sources."resolve-from-4.0.0" + ]; + }) + sources."indent-string-4.0.0" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.6.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-stream-2.0.1" + sources."is-text-path-1.0.1" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."jsonfile-6.1.0" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."map-obj-4.2.1" + sources."meow-8.1.2" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimist-options-4.1.0" + sources."normalize-package-data-3.0.3" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."q-1.5.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."require-directory-2.1.1" + sources."resolve-1.20.0" + sources."resolve-from-5.0.0" + sources."resolve-global-1.0.0" + sources."safe-buffer-5.2.1" + sources."semver-7.3.5" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."split2-3.2.2" + sources."string-width-4.2.2" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."text-extensions-1.9.0" + sources."through-2.3.8" + sources."through2-4.0.2" + sources."trim-newlines-3.0.1" + sources."trim-off-newlines-1.0.1" + sources."type-fest-0.18.1" + sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."which-2.0.2" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yaml-1.10.2" + sources."yargs-17.1.1" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Lint your commit messages"; + homepage = "https://github.com/conventional-changelog/commitlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@commitlint/config-conventional" = nodeEnv.buildNodePackage { + name = "_at_commitlint_slash_config-conventional"; + packageName = "@commitlint/config-conventional"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz"; + sha512 = "zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw=="; + }; + dependencies = [ + sources."array-ify-1.0.0" + sources."compare-func-2.0.0" + sources."conventional-changelog-conventionalcommits-4.6.0" + sources."dot-prop-5.3.0" + sources."is-obj-2.0.0" + sources."lodash-4.17.21" + sources."q-1.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Shareable commitlint config enforcing conventional commits"; + homepage = "https://github.com/conventional-changelog/commitlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@hyperspace/cli" = nodeEnv.buildNodePackage { name = "_at_hyperspace_slash_cli"; packageName = "@hyperspace/cli"; @@ -68986,7 +68270,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -69506,7 +68790,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.2" // { + (sources."@nestjs/schematics-8.0.3" // { dependencies = [ sources."@angular-devkit/core-12.0.5" sources."@angular-devkit/schematics-12.0.5" @@ -69520,7 +68804,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -69586,7 +68870,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -69752,7 +69036,7 @@ in sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tapable-1.1.3" - (sources."terser-5.7.1" // { + (sources."terser-5.7.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -70052,7 +69336,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -70067,13 +69351,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.4" // { + (sources."@vue/compiler-core-3.2.6" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.4" - sources."@vue/shared-3.2.4" + sources."@vue/compiler-dom-3.2.6" + sources."@vue/shared-3.2.6" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -70323,7 +69607,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -71347,7 +70631,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -71441,7 +70725,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -71469,16 +70753,16 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.3.1"; + version = "10.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz"; - sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.2.tgz"; + sha512 = "RHKq0YCvhxAn9987n0Gl6lkzLd39UKwCkUPMFE0cHhxU0SvcTjBxWG/CtkZ4/HvbqK9U5V8j03nAcGBlX3er/Q=="; }; dependencies = [ sources."browserslist-4.16.8" sources."caniuse-lite-1.0.30001251" sources."colorette-1.3.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.75" @@ -71505,14 +70789,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.972.0" // { + (sources."aws-sdk-2.974.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71716,10 +71000,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.11"; + version = "10.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.11.tgz"; - sha512 = "BLJgmf7MthfG2rVS61rKIzm6jXNB8kPaNIOAGtvjKj1F/5HsD6Jr+NkvSCYerdjCEmmZwW9SR5YagGCb5i4FLA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.9.0.tgz"; + sha512 = "i0ynlnvpby/GQlOhM1Qm1VD2TWruMJgb6WcdMcV//OHaUWr7IQft1+BckFUjmaLm13rSpxiXj4yP9plTL6BawQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -71730,12 +71014,12 @@ in }) sources."@alexbosworth/saxophone-0.6.2" sources."@cto.af/textdecoder-0.0.0" - (sources."@grpc/grpc-js-1.3.2" // { + (sources."@grpc/grpc-js-1.3.7" // { dependencies = [ - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" ]; }) - sources."@grpc/proto-loader-0.6.2" + sources."@grpc/proto-loader-0.6.4" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -71981,15 +71265,10 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."global-dirs-3.0.0" - (sources."goldengate-10.1.0" // { + (sources."goldengate-10.3.0" // { dependencies = [ - sources."async-3.2.0" sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."cbor-7.0.5" - sources."invoices-1.2.1" - sources."ln-service-51.8.2" - sources."nofilter-2.0.3" ]; }) sources."got-9.6.0" @@ -72085,6 +71364,8 @@ in sources."latest-version-5.1.0" (sources."lightning-3.3.9" // { dependencies = [ + sources."@grpc/grpc-js-1.3.2" + sources."@grpc/proto-loader-0.6.2" sources."@types/node-15.6.1" sources."async-3.2.0" sources."bech32-2.0.0" @@ -72096,23 +71377,35 @@ in }) (sources."ln-accounting-4.3.1" // { dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/node-15.12.5" + sources."@grpc/grpc-js-1.3.2" + sources."@grpc/proto-loader-0.6.2" + sources."@types/node-16.7.1" sources."@types/ws-7.4.5" sources."async-3.2.0" + sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."cbor-7.0.5" - sources."lightning-3.3.12" - sources."ln-service-51.8.5" + (sources."goldengate-10.1.0" // { + dependencies = [ + sources."ln-service-51.8.2" + ]; + }) + sources."invoices-1.2.1" + (sources."ln-service-51.8.5" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/node-15.12.5" + sources."invoices-2.0.0" + sources."lightning-3.3.12" + sources."ws-7.5.0" + ]; + }) sources."nofilter-2.0.3" - sources."ws-7.5.0" ]; }) (sources."ln-service-52.0.1" // { dependencies = [ - sources."@grpc/grpc-js-1.3.7" - sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" sources."@types/node-16.6.1" sources."@types/request-2.48.7" @@ -72126,7 +71419,6 @@ in (sources."ln-sync-0.4.7" // { dependencies = [ sources."@grpc/grpc-js-1.3.6" - sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" sources."@types/node-16.3.3" sources."@types/request-2.48.6" @@ -72142,16 +71434,39 @@ in }) (sources."ln-telegram-3.2.10" // { dependencies = [ - sources."@grpc/grpc-js-1.3.7" - sources."@grpc/proto-loader-0.6.4" + sources."@grpc/grpc-js-1.3.2" + sources."@grpc/proto-loader-0.6.2" sources."@types/express-4.17.13" - sources."@types/node-16.6.0" + sources."@types/node-16.7.1" sources."@types/request-2.48.7" sources."@types/ws-7.4.7" + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."form-data-2.5.1" - sources."lightning-4.0.0" - sources."ln-service-52.0.0" + (sources."goldengate-10.1.0" // { + dependencies = [ + sources."async-3.2.0" + sources."ln-service-51.8.2" + ]; + }) + sources."invoices-1.2.1" + (sources."lightning-4.0.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.7" + sources."@grpc/proto-loader-0.6.4" + sources."@types/node-16.6.0" + sources."cbor-8.0.0" + sources."invoices-2.0.0" + sources."nofilter-3.0.3" + ]; + }) + (sources."ln-service-52.0.0" // { + dependencies = [ + sources."invoices-2.0.0" + ]; + }) + sources."nofilter-2.0.3" sources."ws-8.1.0" ]; }) @@ -72280,7 +71595,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" ]; }) sources."proxy-addr-2.0.7" @@ -73628,7 +72943,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -74030,10 +73345,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.41"; + version = "1.0.0-beta.45"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.41.tgz"; - sha512 = "+j1dwqcDj+qwYLkzgJa6fFkvV4f/4z67ULg8yyu2CGhJewqbd1c4klFbzJnjvljbqV5/d/uI6lfcMTRHvnZtAQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.45.tgz"; + sha512 = "4ixIu+0Fm5gv6nQ+cNhIHu5heJ95yC5HgVTU/Ad4hg5g0zWQLQcOn7s6znqgpFMDtrpH1v4RTMNp/jv10+FPiw=="; }; dependencies = [ sources."@jsii/check-node-1.33.0" @@ -74047,7 +73362,7 @@ in sources."camelcase-6.2.0" sources."case-1.6.3" sources."cdk8s-1.0.0-beta.30" - sources."cdk8s-plus-17-1.0.0-beta.52" + sources."cdk8s-plus-17-1.0.0-beta.57" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -74060,7 +73375,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.128" + sources."constructs-3.3.131" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -74136,13 +73451,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.329" // { + (sources."jsii-srcmak-0.1.333" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.2.1" + sources."json2jsii-0.2.5" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -74178,7 +73493,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.50" + sources."sscaff-1.2.52" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -74282,13 +73597,13 @@ in }) (sources."@graphql-tools/mock-8.2.2" // { dependencies = [ - sources."@graphql-tools/utils-8.1.1" + sources."@graphql-tools/utils-8.1.2" ]; }) (sources."@graphql-tools/schema-8.1.2" // { dependencies = [ - sources."@graphql-tools/merge-8.0.2" - sources."@graphql-tools/utils-8.1.1" + sources."@graphql-tools/merge-8.0.3" + sources."@graphql-tools/utils-8.1.2" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -74323,7 +73638,7 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -74348,20 +73663,20 @@ in sources."normalize-path-3.0.0" ]; }) - sources."apollo-datasource-3.0.3" + sources."apollo-datasource-3.1.0" sources."apollo-graphql-0.9.3" sources."apollo-reporting-protobuf-3.0.0" - sources."apollo-server-caching-3.0.1" - (sources."apollo-server-core-3.1.2" // { + sources."apollo-server-caching-3.1.0" + (sources."apollo-server-core-3.2.0" // { dependencies = [ - sources."@graphql-tools/utils-8.1.1" + sources."@graphql-tools/utils-8.1.2" ]; }) sources."apollo-server-env-4.0.3" - sources."apollo-server-errors-3.0.1" - sources."apollo-server-express-3.1.2" - sources."apollo-server-plugin-base-3.1.1" - sources."apollo-server-types-3.1.1" + sources."apollo-server-errors-3.1.0" + sources."apollo-server-express-3.2.0" + sources."apollo-server-plugin-base-3.2.0" + sources."apollo-server-types-3.2.0" sources."archiver-5.3.0" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -74442,7 +73757,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.128" + sources."constructs-3.3.131" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -74642,7 +73957,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.329" // { + (sources."jsii-srcmak-0.1.333" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -74800,7 +74115,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.50" + sources."sscaff-1.2.52" (sources."stack-utils-2.0.3" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -75178,10 +74493,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.22.0"; + version = "0.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.22.0.tgz"; - sha512 = "sLmbNULhxddBJK+X1e7UAWJjBrJYbFZf25J6kY1Eg9BIUUnSvh9pFBfUq8L7WXkSSnEB6lgGJVI49kHBOxNjsA=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.22.1.tgz"; + sha512 = "ejpSHqbHDl6cW6H0LXCktHpYriMVk+k3cLB7+JGYM44pTOPNwnXmOZKRCk62kFHIOk0YsHM/F/LnHiGf9+YImw=="; }; buildInputs = globalBuildInputs; meta = { @@ -75927,7 +75242,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -76726,13 +76041,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.162"; + version = "1.1.164"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.162.tgz"; - sha512 = "FD/aHp65QH2dDH3+0vdEPfJi7BVndL6DFa1OF+87OHQZ+wCuMPfFWcd1/izj8y907cpwv1/nCg9y/lvxJfrrRg=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.164.tgz"; + sha512 = "7j+xroHX57poXJ9T+1OVYIx3NlTTKk6d0eoqLorv8BPFtjF0g+cTCLG67PNgpmfunBaF2g47aUoebli1x0fuKg=="; }; dependencies = [ - sources."pyright-1.1.162" + sources."pyright-1.1.163" ]; buildInputs = globalBuildInputs; meta = { @@ -76806,10 +76121,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.49.0"; + version = "0.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.49.0.tgz"; - sha512 = "NVERNgvvYwGR4sIopZhMbUkRpr0uaGTukU6BWgUvt6BZghn+Es25xqDmruuZK5iXt8Kvd77jM2XkqXImHJDyWQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.50.0.tgz"; + sha512 = "IqZL5m/fWXmUEF6xWXY1FA2sXJiCLQgi68Znm/Nz5sG+Hrl+OFCfaVCel6jr6xlshjmnnxtb8MoQlGbtChhKyg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76824,10 +76139,10 @@ in coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; - version = "1.1.11"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.11.tgz"; - sha512 = "srtsGTwfnrN47BAcafyThuv1eFvlPUFrSDZPJ4RtgxbpcPZCGa60rAPOkFELCjtt9EO0XuKxRJsXtL2PI+ft6A=="; + url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.2.1.tgz"; + sha512 = "Zlm+lt03V1qmJVvQw81svaWE+jC9e42VTnHBh8qjlUJUMG1GDjuC8cwM1ulamdovSsKdlmtHwVpScdKBgg3/Fg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76842,10 +76157,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.4"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.4.tgz"; - sha512 = "vlb40ZzIob1sjxzMZL484QT+hlsxKto2oZ6w+dnr45CyWJE/OL+fIlBMiy+xELYuxLXxkfLy1dz8d3N4PDy57A=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.6.tgz"; + sha512 = "lWtv+2+WEdkiCfplZtUzPy9TFkmrk0ajjpgil1KersbmiBeoylLuqgiVVY6u3gmiofr/5AG1DD20Qj8Vg6M0jg=="; }; buildInputs = globalBuildInputs; meta = { @@ -76914,7 +76229,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.8" + sources."@types/mdast-3.0.10" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -76957,7 +76272,7 @@ in sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" @@ -76976,7 +76291,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -78564,7 +77879,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.5" + sources."make-fetch-happen-9.1.0" sources."md5-file-5.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -78838,7 +78153,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -79209,7 +78524,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -79251,7 +78566,7 @@ in sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -80326,7 +79641,7 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" @@ -80452,8 +79767,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.2.1" - sources."electron-to-chromium-1.3.813" + sources."electron-13.2.2" + sources."electron-to-chromium-1.3.816" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -80732,7 +80047,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.38.0" // { + (sources."sass-1.38.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -81041,7 +80356,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -81240,7 +80555,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -81893,7 +81208,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -81965,7 +81280,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -82745,7 +82060,7 @@ in sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-7.0.1" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -83487,7 +82802,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.38.0" // { + (sources."sass-1.38.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -83673,7 +82988,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.7.1" // { + (sources."terser-5.7.2" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -85009,7 +84324,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -85496,7 +84811,7 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.0.5" // { + (sources."make-fetch-happen-9.1.0" // { dependencies = [ sources."minipass-3.1.3" ]; @@ -86723,7 +86038,7 @@ in sources."@babel/traverse-7.15.0" sources."@babel/types-7.15.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -86775,7 +86090,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -86990,7 +86305,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.31" // { + (sources."@oclif/core-0.5.32" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -87686,7 +87001,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -87949,7 +87264,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -88240,7 +87555,7 @@ in sources."node-emoji-1.11.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" - (sources."node-gyp-8.1.0" // { + (sources."node-gyp-8.2.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" @@ -88792,7 +88107,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -89575,7 +88890,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/node-fetch-2.5.12" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -89692,7 +89007,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.32.0" + sources."contentful-management-7.32.1" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -89738,7 +89053,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -90389,7 +89704,7 @@ in }) sources."wrappy-1.0.2" sources."yallist-4.0.0" - (sources."yeoman-generator-5.4.1" // { + (sources."yeoman-generator-5.4.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -90684,10 +89999,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.5.0.tgz"; - sha512 = "8Zyt0/LQeTBg1biDUJjJ0BuWZQ4cXmNQHH+9wzJrdsfMkXl3vQ9fLJPVM22DHaHhmzpyMfgb6M3RSB3l+kO0mQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.5.1.tgz"; + sha512 = "jKet1JrZa/pxV1JePwm6Asd3ZnyqIQG8FN3caTjd9hM+LygssW2NLSFOpnlrvblNXzhpwLxNxcvIv4RoU1Impw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -91120,8 +90435,8 @@ in }) (sources."@graphql-tools/schema-8.1.2" // { dependencies = [ - sources."@graphql-tools/merge-8.0.2" - sources."@graphql-tools/utils-8.1.1" + sources."@graphql-tools/merge-8.0.3" + sources."@graphql-tools/utils-8.1.2" sources."tslib-2.3.1" ]; }) @@ -91152,7 +90467,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.6.2" + sources."@types/node-16.7.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -91898,7 +91213,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.8.0" + sources."systeminformation-5.8.2" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -92062,7 +91377,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -92472,7 +91787,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -93482,7 +92797,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.28.1" + sources."jquery.terminal-2.29.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -94273,7 +93588,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.31" // { + (sources."@oclif/core-0.5.32" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" @@ -94367,7 +93682,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.973.0" // { + (sources."aws-sdk-2.974.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94500,7 +93815,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."cross-env-6.0.3" (sources."cross-spawn-7.0.3" // { dependencies = [ @@ -94592,7 +93907,7 @@ in ]; }) sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" (sources."emphasize-1.5.0" // { dependencies = [ @@ -96568,7 +95883,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.31" // { + (sources."@oclif/core-0.5.32" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -96664,7 +95979,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."event-emitter-0.3.5" - sources."ext-1.4.0" + sources."ext-1.5.0" sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" @@ -96836,7 +96151,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -98097,7 +97412,7 @@ in sources."conventional-commits-parser-3.2.1" sources."conventional-recommended-bump-6.1.0" sources."core-util-is-1.0.2" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" sources."dashdash-1.14.1" @@ -98317,7 +97632,7 @@ in sources."semver-5.7.1" ]; }) - sources."make-fetch-happen-9.0.5" + sources."make-fetch-happen-9.1.0" sources."map-obj-4.2.1" (sources."meow-8.1.2" // { dependencies = [ @@ -99118,7 +98433,6 @@ in sources."destroy-1.0.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" (sources."engine.io-3.5.0" // { dependencies = [ @@ -99163,7 +98477,7 @@ in sources."fsevents-1.2.13" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."github-slugger-1.3.0" + sources."github-slugger-1.4.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.2.8" @@ -99655,7 +98969,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -99952,7 +99266,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -100940,7 +100254,7 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."exit-hook-1.1.1" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -101193,10 +100507,10 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.11.4"; + version = "8.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.4.tgz"; - sha512 = "4Ke9t29EF84LUbUE4mQOQYVdIJcZpJyOs1dyVq4KqDDKWtyQDrXbdt1JGJ1NxyKqJt9vEmR2e3BZyiLd9vJ/CQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.11.5.tgz"; + sha512 = "kvOJ9VkabUFEASC0yE7KiWT7e8t2OBb6cw4YOXctXRJtbxSubLSANpfSxuy+MuaR9JJCMWcqD6sYy8FmdaPiaQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -101267,7 +100581,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.31" // { + (sources."@oclif/core-0.5.32" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -101293,7 +100607,7 @@ in sources."@percy/config-1.0.0-beta.65" sources."@percy/logger-1.0.0-beta.65" sources."@percy/migrate-0.10.0" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/parse-json-4.0.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" @@ -101385,7 +100699,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" (sources."cross-spawn-7.0.3" // { dependencies = [ sources."path-key-3.1.1" @@ -101440,7 +100754,7 @@ in sources."devtools-protocol-0.0.901419" sources."dir-glob-3.0.1" sources."dompurify-2.3.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -101847,12 +101161,13 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.9.0-beta.1"; + version = "3.9.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.1.tgz"; - sha512 = "DYnXCxE2YDCsxUMDwmY817Tg5eLd2ANJotI/SeAZaNknY64zp5sHbWBndEJob2WXSNphOvn+Aki8aBxMwjQ1oA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.2.tgz"; + sha512 = "67eI8su/4N6KvHKveYHYuimSIdk5gZug4mGPPkeSib+y9IHCnHK6LUwN28NMvsYQPYRVRfhk8Y76TfPV4dpzwQ=="; }; dependencies = [ + sources."@chinachu/aribts-1.3.5-mirakurun.3" sources."@fluentui/date-time-utilities-8.2.2" sources."@fluentui/dom-utilities-2.1.4" sources."@fluentui/font-icons-mdl2-8.1.9" @@ -101860,17 +101175,32 @@ in sources."@fluentui/keyboard-key-0.3.4" sources."@fluentui/merge-styles-8.1.4" sources."@fluentui/react-8.27.0" - sources."@fluentui/react-focus-8.1.11" - sources."@fluentui/react-hooks-8.2.7" + sources."@fluentui/react-focus-8.2.0" + sources."@fluentui/react-hooks-8.3.0" sources."@fluentui/react-window-provider-2.1.4" sources."@fluentui/set-version-8.1.4" sources."@fluentui/style-utilities-8.3.0" - sources."@fluentui/theme-2.2.2" + sources."@fluentui/theme-2.3.0" sources."@fluentui/utilities-8.3.0" sources."@microsoft/load-themed-styles-1.10.203" + sources."@napi-rs/triples-1.0.3" + sources."@node-rs/crc32-1.2.1" + sources."@node-rs/crc32-android-arm64-1.2.1" + sources."@node-rs/crc32-darwin-arm64-1.2.1" + sources."@node-rs/crc32-darwin-x64-1.2.1" + sources."@node-rs/crc32-freebsd-x64-1.2.1" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.2.1" + sources."@node-rs/crc32-linux-arm64-gnu-1.2.1" + sources."@node-rs/crc32-linux-arm64-musl-1.2.1" + sources."@node-rs/crc32-linux-x64-gnu-1.2.1" + sources."@node-rs/crc32-linux-x64-musl-1.2.1" + sources."@node-rs/crc32-win32-arm64-msvc-1.2.1" + sources."@node-rs/crc32-win32-ia32-msvc-1.2.1" + sources."@node-rs/crc32-win32-x64-msvc-1.2.1" + sources."@node-rs/helper-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/uuid-3.4.10" sources."@types/ws-6.0.4" sources."accepts-1.3.7" @@ -101879,7 +101209,6 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" - sources."aribts-1.3.5" sources."array-flatten-1.1.1" sources."async-limiter-1.0.1" sources."babel-polyfill-6.23.0" @@ -101890,11 +101219,13 @@ in }) sources."backo2-1.0.2" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" sources."basic-auth-2.0.1" - sources."body-parser-1.19.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.3" sources."builtin-status-codes-3.0.0" @@ -101918,7 +101249,6 @@ in sources."cookie-signature-1.0.6" sources."core-js-2.6.12" sources."cors-2.8.5" - sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -101930,11 +101260,7 @@ in sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) + sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -101948,7 +101274,11 @@ in sources."openapi-types-8.0.0" ]; }) - sources."external-editor-2.2.0" + (sources."external-editor-2.2.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" @@ -101963,8 +101293,7 @@ in sources."has-ansi-2.0.0" sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" @@ -102089,7 +101418,11 @@ in sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) sources."rc-1.2.8" sources."react-17.0.2" sources."react-dom-17.0.2" @@ -102502,234 +101835,13 @@ in bypassCache = true; reconstructLock = true; }; - "@commitlint/config-conventional" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_config-conventional"; - packageName = "@commitlint/config-conventional"; - version = "13.1.0"; - src = fetchurl { - url = - "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz"; - sha512 = - "zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw=="; - }; - dependencies = [ - sources."array-ify-1.0.0" - sources."compare-func-2.0.0" - sources."conventional-changelog-conventionalcommits-4.6.0" - sources."dot-prop-5.3.0" - sources."is-obj-2.0.0" - sources."lodash-4.17.21" - sources."q-1.5.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = - "Shareable commitlint config enforcing conventional commits"; - homepage = "https://github.com/conventional-changelog/commitlint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; - "@commitlint/cli" = nodeEnv.buildNodePackage { - name = "_at_commitlint_slash_cli"; - packageName = "@commitlint/cli"; - version = "13.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz"; - sha512 = - "xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w=="; - }; - dependencies = [ - sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" - (sources."@babel/highlight-7.14.5" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@commitlint/ensure-13.1.0" - sources."@commitlint/execute-rule-13.0.0" - sources."@commitlint/format-13.1.0" - sources."@commitlint/is-ignored-13.1.0" - sources."@commitlint/lint-13.1.0" - sources."@commitlint/load-13.1.0" - sources."@commitlint/message-13.0.0" - sources."@commitlint/parse-13.1.0" - sources."@commitlint/read-13.1.0" - sources."@commitlint/resolve-extends-13.0.0" - sources."@commitlint/rules-13.1.0" - sources."@commitlint/to-lines-13.0.0" - (sources."@commitlint/top-level-13.0.0" // { - dependencies = [ - sources."find-up-5.0.0" - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - ]; - }) - sources."@commitlint/types-13.1.0" - sources."@types/minimist-1.2.2" - sources."@types/normalize-package-data-2.4.1" - sources."@types/parse-json-4.0.0" - sources."JSONStream-1.3.5" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."array-ify-1.0.0" - sources."arrify-1.0.1" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-4.1.2" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."compare-func-2.0.0" - sources."conventional-changelog-angular-5.0.12" - sources."conventional-commits-parser-3.2.1" - sources."cosmiconfig-7.0.1" - sources."cross-spawn-7.0.3" - sources."dargs-7.0.0" - sources."decamelize-1.2.0" - (sources."decamelize-keys-1.1.0" // { - dependencies = [ sources."map-obj-1.0.1" ]; - }) - sources."dot-prop-5.3.0" - sources."emoji-regex-8.0.0" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - sources."execa-5.1.1" - sources."find-up-4.1.0" - sources."fs-extra-10.0.0" - sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" - sources."get-stream-6.0.1" - sources."git-raw-commits-2.0.10" - sources."global-dirs-0.1.1" - sources."graceful-fs-4.2.8" - sources."hard-rejection-2.1.0" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."hosted-git-info-4.0.2" - sources."human-signals-2.1.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ sources."resolve-from-4.0.0" ]; - }) - sources."indent-string-4.0.0" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-arrayish-0.2.1" - sources."is-core-module-2.6.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-obj-2.0.0" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-text-path-1.0.1" - sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-6.1.0" - sources."jsonparse-1.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.1.6" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" - sources."meow-8.1.2" - sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - sources."minimist-options-4.1.0" - sources."normalize-package-data-3.0.3" - sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."q-1.5.1" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."hosted-git-info-2.8.9" - sources."normalize-package-data-2.5.0" - sources."semver-5.7.1" - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ sources."type-fest-0.8.1" ]; - }) - sources."readable-stream-3.6.0" - sources."redent-3.0.0" - sources."require-directory-2.1.1" - sources."resolve-1.20.0" - sources."resolve-from-5.0.0" - sources."resolve-global-1.0.0" - sources."safe-buffer-5.2.1" - sources."semver-7.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" - sources."split2-3.2.2" - sources."string-width-4.2.2" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-3.0.0" - sources."supports-color-7.2.0" - sources."text-extensions-1.9.0" - sources."through-2.3.8" - sources."through2-4.0.2" - sources."trim-newlines-3.0.1" - sources."trim-off-newlines-1.0.1" - sources."type-fest-0.18.1" - sources."universalify-2.0.0" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."which-2.0.2" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Lint your commit messages"; - homepage = "https://github.com/conventional-changelog/commitlint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.7.1"; + version = "6.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.1.tgz"; - sha512 = "+PkGIfVEATLs0FTkp1sIanyizH0AOJckhlMTA342YtXPmAVbwGINQ7eV0SU2i6VfNesu9It7JEjSq3SuAkF9gg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.7.4.tgz"; + sha512 = "S8ZIRrxW2pZMVHOtp4ApCo41gMOEPGBXTSsCn4lP9HZY2f6RTPKm4ZZcpPfQ2GkWsygoguTKazShpjauRHDh4g=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -102864,7 +101976,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.4.2" // { + (sources."@netlify/build-18.5.0" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -102909,13 +102021,13 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" ]; }) - sources."@netlify/plugins-list-3.3.0" + sources."@netlify/plugins-list-3.5.0" sources."@netlify/routing-local-proxy-0.31.0" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.19.0" // { + (sources."@netlify/zip-it-and-ship-it-4.20.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -102976,7 +102088,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.31" // { + (sources."@oclif/core-0.5.32" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."ansi-styles-4.3.0" @@ -103097,7 +102209,7 @@ in sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -103105,8 +102217,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.29.2" - (sources."@typescript-eslint/typescript-estree-4.29.2" // { + sources."@typescript-eslint/types-4.29.3" + (sources."@typescript-eslint/typescript-estree-4.29.3" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -103123,7 +102235,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.29.2" + sources."@typescript-eslint/visitor-keys-4.29.3" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" sources."acorn-8.4.1" @@ -103518,7 +102630,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -104313,7 +103425,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.56.2" + sources."rollup-2.56.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -104492,7 +103604,7 @@ in sources."type-fest-0.16.0" ]; }) - (sources."terser-5.7.1" // { + (sources."terser-5.7.2" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -104670,10 +103782,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.1.0.tgz"; - sha512 = "o2elh1qt7YUp3lkMwY3/l4KF3j/A3fI/Qt4NH+CQQgPJdqGE9y7qnP84cjIWN27Q0jJkrSAhCVDg+wBVNBYdBg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.2.0.tgz"; + sha512 = "KG8SdcoAnw2d6augGwl1kOayALUrXW/P2uOAm2J2+nmW/HjZo7y+8TDg7LejxbekOOSv3kzhq+NSUYkIDAX8eA=="; }; dependencies = [ sources."@npmcli/move-file-1.1.2" @@ -105135,7 +104247,7 @@ in sources."minizlib-1.3.3" sources."mkdirp-0.5.5" sources."ms-2.1.3" - sources."needle-2.8.0" + sources."needle-2.9.0" sources."nopt-4.0.3" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" @@ -105216,7 +104328,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -105976,7 +105088,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -106046,7 +105158,7 @@ in sources."dot-prop-5.3.0" ]; }) - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."date-fns-1.30.1" @@ -106700,7 +105812,7 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.0.5" + sources."make-fetch-happen-9.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.49.0" @@ -107479,7 +106591,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -107588,7 +106700,7 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.7.1" + sources."terser-5.7.2" ]; }) (sources."htmlparser2-6.1.0" // { @@ -109532,7 +108644,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.8.0" + sources."systeminformation-5.8.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -109567,10 +108679,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.13.0"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.13.0.tgz"; - sha512 = "dQE0WtzS8Rs6UEpsKeFxHjLPqMHM94v45IhmHX5A/w3V5tEvx4A2PzKBtOF5brJp7SPLyzAnY4L/w/BpBV6qxw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.14.3.tgz"; + sha512 = "9fU65+uSa2kB5+/b2crLT3lLcauExf9v6vPkDa4javQVnrz3/HDa6TLEshgo5BXXks3wThq+eCrDlVvD7AUwOQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -110239,10 +109351,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.162"; + version = "1.1.163"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.162.tgz"; - sha512 = "3YEM8rf/39CtuHMzZmVjsV/2cJJB6N3RfCuNR5QgUeib0VRQ303zhb4jh5RRRF9P6JpZku/waX+i16TrfSqDEQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.163.tgz"; + sha512 = "CU0WPzr+6ZKIqCqqVrOtxMFWdzdOV18zKmC7dVBzp3snuun8JafnnmUzNJpO8IJLN/bQNSLb3riLtXFM/8Xxbg=="; }; buildInputs = globalBuildInputs; meta = { @@ -110727,7 +109839,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -111144,7 +110256,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -112034,7 +111146,7 @@ in ]; }) sources."sockjs-0.3.21" - (sources."sockjs-client-1.5.1" // { + (sources."sockjs-client-1.5.2" // { dependencies = [ sources."debug-3.2.7" ]; @@ -112536,12 +111648,12 @@ in sources."@redocly/ajv-8.6.2" (sources."@redocly/openapi-core-1.0.0-beta.55" // { dependencies = [ - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" - sources."@types/node-15.14.8" + sources."@types/node-15.14.9" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -112773,7 +111885,7 @@ in sources."string-width-4.2.2" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" - sources."styled-components-5.3.0" + sources."styled-components-5.3.1" sources."supports-color-5.5.0" sources."swagger2openapi-7.0.8" sources."timers-browserify-2.0.12" @@ -113017,10 +112129,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.56.2"; + version = "2.56.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.2.tgz"; - sha512 = "s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; + sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -113065,16 +112177,16 @@ in sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" sources."@types/node-fetch-2.5.12" sources."@types/vscode-1.59.0" - sources."@typescript-eslint/eslint-plugin-4.29.2" - sources."@typescript-eslint/experimental-utils-4.29.2" - sources."@typescript-eslint/parser-4.29.2" - sources."@typescript-eslint/scope-manager-4.29.2" - sources."@typescript-eslint/types-4.29.2" - sources."@typescript-eslint/typescript-estree-4.29.2" - sources."@typescript-eslint/visitor-keys-4.29.2" + sources."@typescript-eslint/eslint-plugin-4.29.3" + sources."@typescript-eslint/experimental-utils-4.29.3" + sources."@typescript-eslint/parser-4.29.3" + sources."@typescript-eslint/scope-manager-4.29.3" + sources."@typescript-eslint/types-4.29.3" + sources."@typescript-eslint/typescript-estree-4.29.3" + sources."@typescript-eslint/visitor-keys-4.29.3" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -113584,10 +112696,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.38.0"; + version = "1.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.38.0.tgz"; - sha512 = "WBccZeMigAGKoI+NgD7Adh0ab1HUq+6BmyBUEaGxtErbUtWUevEbdgo5EZiJQofLUGcKtlNaO2IdN73AHEua5g=="; + url = "https://registry.npmjs.org/sass/-/sass-1.38.1.tgz"; + sha512 = "Lj8nPaSYOuRhgqdyShV50fY5jKnvaRmikUNalMPmbH+tKMGgEKVkltI/lP30PEfO2T1t6R9yc2QIBLgOc3uaFw=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -113822,13 +112934,13 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.6" // { + (sources."@serverless/platform-client-4.3.0" // { dependencies = [ sources."js-yaml-3.14.1" sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.2" // { + (sources."@serverless/platform-client-china-2.2.3" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -113852,7 +112964,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.172" sources."@types/long-4.0.1" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -113913,7 +113025,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.973.0" // { + (sources."aws-sdk-2.974.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -114127,7 +113239,7 @@ in sources."events-1.1.1" sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" - sources."ext-1.4.0" + sources."ext-1.5.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" @@ -115268,680 +114380,11 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.684.0"; + version = "1.687.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.684.0.tgz"; - sha512 = "Pwfr6hQdp6xrFA5Go3zOm+epQrfjygnbgsuH3g8j1eMXvFuq6pDbkvf802slTIb6kPLsIi2Ot9NW1AlT0oqutQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.687.0.tgz"; + sha512 = "eFiCgTGAkAeeUtcSxD3+fBYjhF7JvYZ4KmbbXPO6UnWUfThm082kf2Aw9eS5RlD1hXO8P41d8DeCYzJgEoid9w=="; }; - dependencies = [ - sources."@arcanis/slice-ansi-1.0.2" - sources."@deepcode/dcignore-1.0.4" - sources."@iarna/toml-2.2.5" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@octetstream/promisify-2.0.2" - sources."@open-policy-agent/opa-wasm-1.2.0" - sources."@sindresorhus/is-4.0.1" - sources."@snyk/child-process-0.3.1" - sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.10.2" - sources."@snyk/cocoapods-lockfile-parser-3.6.2" - (sources."@snyk/code-client-4.0.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."needle-2.8.0" - ]; - }) - sources."@snyk/composer-lockfile-parser-1.4.1" - (sources."@snyk/dep-graph-1.28.1" // { - dependencies = [ - sources."semver-7.3.5" - ]; - }) - sources."@snyk/docker-registry-v2-client-2.3.0" - sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.650.0" // { - dependencies = [ - sources."chalk-4.1.1" - sources."strip-ansi-6.0.0" - ]; - }) - (sources."@snyk/fix-pipenv-pipfile-0.5.4" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - (sources."@snyk/fix-poetry-0.7.2" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - sources."@snyk/gemfile-1.2.0" - sources."@snyk/glob-parent-5.1.2-patch.1" - sources."@snyk/graphlib-2.1.9-patch.3" - (sources."@snyk/inquirer-7.3.3-patch" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - sources."chalk-4.1.2" - sources."strip-ansi-6.0.0" - ]; - }) - (sources."@snyk/java-call-graph-builder-1.23.1" // { - dependencies = [ - sources."rimraf-3.0.2" - sources."tmp-0.2.1" - ]; - }) - (sources."@snyk/mix-parser-1.3.2" // { - dependencies = [ - sources."tslib-2.3.1" - ]; - }) - sources."@snyk/rpm-parser-2.2.1" - (sources."@snyk/snyk-cocoapods-plugin-2.5.2" // { - dependencies = [ - sources."tslib-2.3.1" - ]; - }) - (sources."@snyk/snyk-docker-pull-3.7.0" // { - dependencies = [ - sources."rimraf-3.0.2" - sources."tmp-0.2.1" - ]; - }) - (sources."@snyk/snyk-hex-plugin-1.1.4" // { - dependencies = [ - sources."tslib-2.3.1" - ]; - }) - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.2" - sources."@types/debug-4.1.7" - sources."@types/emscripten-1.39.5" - sources."@types/flat-cache-2.0.0" - sources."@types/graphlib-2.1.8" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/js-yaml-3.12.7" - sources."@types/keyv-3.1.2" - sources."@types/lodash-4.14.172" - sources."@types/lodash.chunk-4.2.6" - sources."@types/lodash.omit-4.5.6" - sources."@types/lodash.pick-4.4.6" - sources."@types/lodash.union-4.6.6" - sources."@types/minimatch-3.0.5" - sources."@types/ms-0.7.31" - sources."@types/node-13.13.52" - sources."@types/responselike-1.0.0" - sources."@types/sarif-2.1.4" - sources."@types/semver-7.3.8" - sources."@types/treeify-1.0.0" - sources."@types/uuid-8.3.1" - (sources."@yarnpkg/core-2.4.0" // { - dependencies = [ - sources."chalk-3.0.0" - sources."cross-spawn-7.0.3" - sources."mkdirp-0.5.5" - sources."path-key-3.1.1" - sources."semver-7.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."@yarnpkg/fslib-2.5.1" - sources."@yarnpkg/json-proxy-2.1.1" - sources."@yarnpkg/libzip-2.2.2" - sources."@yarnpkg/lockfile-1.1.0" - sources."@yarnpkg/parsers-2.4.0" - sources."@yarnpkg/pnp-2.3.2" - (sources."@yarnpkg/shell-2.4.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."abbrev-1.1.1" - sources."aggregate-error-3.1.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."ansicolors-0.3.2" - sources."any-promise-1.3.0" - sources."archy-1.0.0" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."asn1-0.2.4" - sources."async-3.2.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."binjumper-0.1.4" - sources."bl-4.1.0" - sources."boolean-3.1.4" - sources."bottleneck-2.19.5" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browserify-zlib-0.1.4" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-7.0.2" // { - dependencies = [ - sources."get-stream-5.2.0" - ]; - }) - sources."call-bind-1.0.2" - sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."chardet-0.7.0" - sources."child-process-1.0.2" - sources."chownr-2.0.0" - sources."ci-info-2.0.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-3.1.0" - sources."cli-spinner-0.2.10" - sources."cli-spinners-2.6.0" - sources."cli-width-3.0.0" - sources."clipanion-2.6.2" - sources."clone-1.0.4" - sources."clone-response-1.0.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."configstore-5.0.1" - sources."core-js-3.16.2" - sources."core-util-is-1.0.2" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."crypto-random-string-2.0.0" - (sources."debug-4.3.2" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defaults-1.0.3" - sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.3" - (sources."del-6.0.0" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) - sources."detect-node-2.1.0" - sources."diff-4.0.2" - sources."dir-glob-3.0.1" - sources."docker-modem-2.1.3" - sources."dockerfile-ast-0.2.1" - sources."dot-prop-5.3.0" - sources."dotnet-deps-parser-5.1.0" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."elfy-1.0.0" - sources."email-validator-2.0.4" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."endian-reader-0.3.0" - sources."es6-error-4.1.1" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - (sources."event-loop-spinner-2.1.0" // { - dependencies = [ - sources."tslib-2.3.1" - ]; - }) - sources."execa-1.0.0" - sources."external-editor-3.1.0" - (sources."fast-glob-3.2.7" // { - dependencies = [ - sources."micromatch-4.0.4" - ]; - }) - sources."fastq-1.12.0" - sources."figures-3.2.0" - sources."fill-range-7.0.1" - sources."fs-constants-1.0.0" - sources."fs-minipass-2.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" - sources."get-stream-4.1.0" - sources."glob-7.1.7" - sources."glob-parent-5.1.2" - (sources."global-agent-2.2.0" // { - dependencies = [ - sources."semver-7.3.5" - ]; - }) - sources."globalthis-1.0.2" - sources."globby-11.0.4" - sources."got-11.8.2" - sources."graceful-fs-4.2.8" - sources."grapheme-splitter-1.0.4" - sources."gunzip-maybe-1.4.2" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" - sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" - sources."http2-wrapper-1.0.3" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.1.8" - sources."immediate-3.0.6" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-3.3.0" - sources."is-callable-1.2.4" - sources."is-deflate-1.0.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.1" - sources."is-gzip-1.0.0" - sources."is-interactive-1.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.1" - sources."json-file-plus-3.3.1" - sources."json-stringify-safe-5.0.1" - (sources."jszip-3.7.1" // { - dependencies = [ - sources."pako-1.0.11" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."keyv-4.0.3" - sources."lie-3.3.0" - sources."lodash-4.17.21" - sources."lodash.assign-4.2.0" - sources."lodash.assignin-4.2.0" - sources."lodash.camelcase-4.3.0" - sources."lodash.chunk-4.2.0" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.constant-3.0.0" - sources."lodash.defaults-4.2.0" - sources."lodash.filter-4.6.0" - sources."lodash.find-4.6.0" - sources."lodash.findindex-4.6.0" - sources."lodash.findkey-4.6.0" - sources."lodash.flatmap-4.5.0" - sources."lodash.flatten-4.4.0" - sources."lodash.flattendeep-4.4.0" - sources."lodash.foreach-4.5.0" - sources."lodash.get-4.4.2" - sources."lodash.groupby-4.6.0" - sources."lodash.has-4.5.2" - sources."lodash.invert-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isempty-4.4.0" - sources."lodash.isequal-4.5.0" - sources."lodash.isfunction-3.0.9" - sources."lodash.isnumber-3.0.3" - sources."lodash.isobject-3.0.2" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.isundefined-3.0.1" - sources."lodash.keys-4.2.0" - sources."lodash.last-3.0.0" - sources."lodash.map-4.6.0" - sources."lodash.merge-4.6.2" - sources."lodash.omit-4.5.0" - sources."lodash.orderby-4.6.0" - sources."lodash.pick-4.4.0" - sources."lodash.reduce-4.6.0" - sources."lodash.set-4.3.2" - sources."lodash.size-4.2.0" - sources."lodash.sortby-4.7.0" - sources."lodash.sum-4.0.2" - sources."lodash.topairs-4.3.0" - sources."lodash.transform-4.6.0" - sources."lodash.union-4.6.0" - sources."lodash.uniq-4.5.0" - sources."lodash.upperfirst-4.3.1" - sources."lodash.values-4.3.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."chalk-4.1.2" - ]; - }) - sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" - sources."macos-release-2.5.0" - sources."make-dir-3.1.0" - (sources."matcher-3.0.0" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) - sources."merge2-1.4.1" - sources."micromatch-4.0.2" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minipass-3.1.3" - sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."multimatch-5.0.0" - sources."mute-stream-0.0.8" - (sources."needle-2.6.0" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."nice-try-1.0.5" - sources."node.extend-2.0.2" - sources."normalize-url-6.1.0" - sources."npm-run-path-2.0.2" - sources."object-hash-2.2.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-7.4.2" - (sources."ora-5.4.0" // { - dependencies = [ - sources."chalk-4.1.2" - sources."strip-ansi-6.0.0" - ]; - }) - sources."os-name-3.1.0" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-2.1.1" - sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."pako-0.2.9" - sources."parse-link-header-1.0.1" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-type-4.0.0" - sources."peek-stream-1.1.3" - sources."pegjs-0.10.0" - sources."picomatch-2.3.0" - sources."pluralize-7.0.0" - sources."pretty-bytes-5.6.0" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."promise-7.3.1" - sources."promise-deferred-2.0.3" - sources."promise-fs-2.1.1" - sources."promise-queue-2.2.5" - sources."promiseback-2.0.3" - sources."proxy-from-env-1.1.0" - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."queue-6.0.2" - sources."queue-microtask-1.2.3" - sources."quick-lru-5.1.1" - sources."readable-stream-3.6.0" - sources."resolve-alpn-1.2.0" - sources."responselike-2.0.0" - sources."restore-cursor-3.1.0" - sources."reusify-1.0.4" - sources."rimraf-2.7.1" - sources."roarr-2.15.4" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."semver-6.3.0" - sources."semver-compare-1.0.0" - (sources."serialize-error-7.0.1" // { - dependencies = [ - sources."type-fest-0.13.1" - ]; - }) - sources."set-immediate-shim-1.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" - sources."slash-3.0.0" - sources."snyk-config-4.0.0" - (sources."snyk-cpp-plugin-2.2.1" // { - dependencies = [ - sources."chalk-4.1.2" - sources."tslib-2.3.1" - ]; - }) - (sources."snyk-docker-plugin-4.23.0" // { - dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.1.0" - sources."rimraf-3.0.2" - sources."semver-7.3.5" - sources."snyk-nodejs-lockfile-parser-1.36.0" - sources."tmp-0.2.1" - ]; - }) - sources."snyk-go-parser-1.4.1" - (sources."snyk-go-plugin-1.17.0" // { - dependencies = [ - sources."rimraf-3.0.2" - sources."tmp-0.2.1" - ]; - }) - (sources."snyk-gradle-plugin-3.16.1" // { - dependencies = [ - sources."chalk-3.0.0" - sources."rimraf-3.0.2" - sources."tmp-0.2.1" - sources."tslib-2.3.1" - ]; - }) - sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.26.2" // { - dependencies = [ - sources."tmp-0.1.0" - sources."tslib-1.11.1" - ]; - }) - (sources."snyk-nodejs-lockfile-parser-1.35.0" // { - dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.1.0" - sources."p-map-2.1.0" - ]; - }) - (sources."snyk-nuget-plugin-1.22.1" // { - dependencies = [ - sources."jszip-3.7.0" - sources."pako-1.0.11" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."snyk-paket-parser-1.6.0" - (sources."snyk-php-plugin-1.9.2" // { - dependencies = [ - sources."tslib-1.11.1" - ]; - }) - (sources."snyk-poetry-lockfile-parser-1.1.7" // { - dependencies = [ - sources."tslib-2.3.1" - ]; - }) - (sources."snyk-policy-1.22.0" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-7.3.5" - sources."snyk-try-require-2.0.2" - sources."yallist-3.1.1" - ]; - }) - (sources."snyk-python-plugin-1.20.1" // { - dependencies = [ - sources."rimraf-3.0.2" - sources."tmp-0.2.1" - ]; - }) - sources."snyk-resolve-1.1.0" - (sources."snyk-resolve-deps-4.7.2" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."semver-5.7.1" - sources."yallist-2.1.2" - ]; - }) - (sources."snyk-sbt-plugin-2.11.3" // { - dependencies = [ - sources."tmp-0.1.0" - ]; - }) - sources."snyk-tree-1.0.0" - (sources."snyk-try-require-1.3.1" // { - dependencies = [ - sources."debug-3.2.7" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."source-map-0.6.1" - sources."source-map-support-0.5.19" - sources."split-ca-1.0.1" - sources."sprintf-js-1.1.2" - sources."ssh2-0.8.9" - sources."ssh2-streams-0.4.10" - sources."stream-buffers-3.0.2" - sources."stream-shift-1.0.1" - sources."stream-to-array-2.3.0" - (sources."stream-to-promise-2.2.0" // { - dependencies = [ - sources."end-of-stream-1.1.0" - sources."once-1.3.3" - ]; - }) - sources."streamsearch-0.1.2" - (sources."string-width-4.2.2" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - sources."string_decoder-1.3.0" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) - sources."strip-eof-1.0.0" - sources."supports-color-7.2.0" - sources."tar-6.1.10" - sources."tar-stream-2.2.0" - sources."temp-dir-2.0.0" - (sources."tempy-1.0.1" // { - dependencies = [ - sources."is-stream-2.0.1" - sources."type-fest-0.16.0" - ]; - }) - sources."then-fs-2.0.0" - sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" - sources."toml-3.0.0" - sources."tree-kill-1.2.2" - sources."treeify-1.1.0" - sources."tslib-1.14.1" - sources."tunnel-0.0.6" - sources."tweetnacl-0.14.5" - sources."type-fest-0.21.3" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-2.0.0" - sources."upath-2.0.1" - sources."utf8-3.0.0" - sources."util-deprecate-1.0.2" - sources."uuid-8.3.2" - sources."vscode-languageserver-types-3.16.0" - sources."wcwidth-1.0.1" - sources."which-1.3.1" - sources."windows-release-3.3.3" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xml-js-1.6.11" - sources."xml2js-0.4.23" - sources."xmlbuilder-11.0.1" - sources."xtend-4.0.2" - sources."yallist-4.0.0" - sources."yaml-1.10.2" - sources."yaml-js-0.3.0" - ]; buildInputs = globalBuildInputs; meta = { description = "snyk library and cli utility"; @@ -115964,7 +114407,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -116525,7 +114968,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.2.0" // { + (sources."jitdb-3.3.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -117190,7 +115633,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.973.0" // { + (sources."aws-sdk-2.974.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -118005,7 +116448,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.8" + sources."@types/mdast-3.0.10" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" @@ -118048,7 +116491,7 @@ in sources."colorette-1.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" @@ -118067,7 +116510,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.813" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -118300,13 +116743,13 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz"; - sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.5.tgz"; + sha512 = "EstDoqxjqWStWELh7Z0qytqUDl/ikdNEr21dveNc4fUDnhnqO2F2jHEufqoNnC3GfBji3GIUHvoXsp/I5lMbCg=="; }; dependencies = [ - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -118350,7 +116793,7 @@ in sources."source-map-0.7.3" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" - sources."svelte-preprocess-4.7.4" + sources."svelte-preprocess-4.8.0" sources."to-regex-range-5.0.1" sources."typescript-4.3.5" sources."wrappy-1.0.2" @@ -118368,16 +116811,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.6"; + version = "0.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.6.tgz"; - sha512 = "TetCKVY6kf1iJs7heFbyFa9p1iwzZKYa4qkNEBJVt4V0ck0XdTQO5WFVepriUOJDf8m/YpCoZldFUtVwYmuaJA=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.7.tgz"; + sha512 = "GuqBLvHE41ZB6G4EPhUeShDGav4k5TdMmNXk8j1fXGZSrwW+3Q7WmCNMqqeQgrNNtOg1UCUUx7XEjrvPu7RqDg=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -119393,10 +117836,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz"; - sha512 = "b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"; + sha512 = "0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="; }; dependencies = [ sources."buffer-from-1.1.2" @@ -119444,7 +117887,7 @@ in sources."@textlint/textlint-plugin-text-12.0.2" sources."@textlint/types-12.0.2" sources."@textlint/utils-12.0.2" - sources."@types/mdast-3.0.8" + sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.6.2" sources."ansi-regex-2.1.1" @@ -119732,7 +118175,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.3" sources."@textlint/types-1.5.5" - sources."@types/hast-2.3.2" + sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-5.0.3" @@ -120542,7 +118985,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -120773,7 +119216,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - (sources."needle-2.8.0" // { + (sources."needle-2.9.0" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" @@ -121556,7 +119999,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.10" + sources."@types/node-14.17.11" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -121837,7 +120280,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -122215,7 +120658,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -122846,7 +121289,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.814" + sources."electron-to-chromium-1.3.816" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -123011,7 +121454,7 @@ in sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."tapable-2.2.0" - (sources."terser-5.7.1" // { + (sources."terser-5.7.2" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -123412,7 +121855,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -124593,7 +123036,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -125164,7 +123607,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -125192,7 +123635,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.3.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.814" + sources."electron-to-chromium-1.3.816" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -125228,7 +123671,7 @@ in sources."source-map-support-0.5.19" sources."supports-color-8.1.1" sources."tapable-2.2.0" - (sources."terser-5.7.1" // { + (sources."terser-5.7.2" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -125332,7 +123775,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -125715,7 +124158,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -126128,6 +124571,67 @@ in bypassCache = true; reconstructLock = true; }; + yalc = nodeEnv.buildNodePackage { + name = "yalc"; + packageName = "yalc"; + version = "1.0.0-pre.53"; + src = fetchurl { + url = "https://registry.npmjs.org/yalc/-/yalc-1.0.0-pre.53.tgz"; + sha512 = "tpNqBCpTXplnduzw5XC+FF8zNJ9L/UXmvQyyQj7NKrDNavbJtHvzmZplL5ES/RCnjX7JR7W9wz5GVDXVP3dHUQ=="; + }; + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."chalk-4.1.2" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."detect-indent-6.1.0" + sources."emoji-regex-8.0.0" + sources."escalade-3.1.1" + sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" + sources."get-caller-file-2.0.5" + sources."glob-7.1.7" + sources."graceful-fs-4.2.8" + sources."has-flag-4.0.0" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-2.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."jsonfile-4.0.0" + sources."minimatch-3.0.4" + sources."npm-bundled-1.1.2" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-2.2.2" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."require-directory-2.1.1" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."universalify-0.1.2" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."y18n-5.0.8" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Work with npm/yarn packages locally like a boss."; + homepage = "https://github.com/whitecolor/yalc"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; @@ -126193,7 +124697,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.8" + sources."@types/node-15.14.9" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -126538,7 +125042,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."make-dir-1.3.0" - (sources."make-fetch-happen-9.0.5" // { + (sources."make-fetch-happen-9.1.0" // { dependencies = [ sources."http-cache-semantics-4.1.0" ]; @@ -126987,7 +125491,7 @@ in ]; }) sources."yeoman-doctor-5.0.0" - (sources."yeoman-environment-3.5.1" // { + (sources."yeoman-environment-3.6.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-2.1.1" @@ -127085,7 +125589,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.7.0" + sources."@types/node-16.7.1" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" @@ -127103,7 +125607,7 @@ in sources."form-data-3.0.1" sources."fs-extra-10.0.0" sources."glob-parent-5.1.2" - sources."globby-12.0.1" + sources."globby-12.0.2" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" From d0dad3f519117db63fa2f101c47c7c8e206a294a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 24 Aug 2021 21:54:31 +0200 Subject: [PATCH 170/239] chromiumBeta: 93.0.4577.51 -> 93.0.4577.58 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3012fdba1f50..00731c0c399d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "93.0.4577.51", - "sha256": "0b3mx5ns4pbrwc7s2iz8ffv8lhay6p9gj0dnsd1qzxgqwgrv37h5", - "sha256bin64": "1b8ypv14c5ky789dm17czv4yf7v21lwhnf2ygkdzryvd3i056nsz", + "version": "93.0.4577.58", + "sha256": "1i9ygy99lg9h0qyl46c02id9d1ig3brkvr8va0blpf7h8pg9251s", + "sha256bin64": "16cyn74sxz8lwdyb7x3z115czk9xvs67bb2bbnhrhnaszhhrzs4j", "deps": { "gn": { "version": "2021-07-08", From f9dfb94bd2da77266824945ee621769cc97b9088 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 24 Aug 2021 21:57:29 +0200 Subject: [PATCH 171/239] vpcs: remove myself as maintainer I've stopped using GNS3. --- pkgs/applications/virtualization/vpcs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 663085bb22fd..7c2424ef0f44 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } From b919ded180a5c72b26a523197c5d9444b25db4f7 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 24 Aug 2021 21:15:51 +0100 Subject: [PATCH 172/239] haproxy: 2.3.10 -> 2.3.13 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index bb79ad956a67..32fa2af818bf 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.10"; + version = "2.3.13"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-mUbgz8g/KQcrNDHjckYiHPnUqdKKFYwHVxTTRSZvTzU="; + sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; }; buildInputs = [ openssl zlib ] From 8440a5175474f816b070f8b9bff3fb6e252c1e94 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:11:37 -0300 Subject: [PATCH 173/239] fluxcd: fix manifest hash * add superherointj as maintainer --- pkgs/applications/networking/cluster/fluxcd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index eb55e3f9aa9e..a4699bacba9c 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -5,7 +5,7 @@ let manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "sha256-/uD0hxtTJSr+2tZcwzOIQcEbikHOshWukEBSaK3FiP4="; + sha256 = "05khmpbv42wjpkdb4n51pnq678la6hjfhkyy49d0j2kcnvfd1m5p"; stripRoot = false; }; in @@ -55,7 +55,6 @@ buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ jlesquembre ]; - platforms = platforms.unix; + maintainers = with maintainers; [ jlesquembre superherointj ]; }; } From 9bec0bea0ab80d3fc16829be95303dfd1d3b98fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Aug 2021 00:09:44 +0200 Subject: [PATCH 174/239] python3Packages.pybase64: switch to pytestCheckHook --- .../python-modules/pybase64/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index e67d344fd28a..9bb2cfb5ebc5 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -1,26 +1,28 @@ -{ buildPythonPackage, isPy3k, lib, fetchPypi, six, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pybase64"; version = "1.2.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "9e310fcf5cfa2cbf7d1d7eb503b6066bec785216bcd1d8c0a736f59d5ec21b0b"; }; - propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "pybase64" ]; meta = with lib; { - homepage = "https://pypi.python.org/pypi/pybase64"; description = "Fast Base64 encoding/decoding"; + homepage = "https://github.com/mayeut/pybase64"; license = licenses.bsd2; maintainers = with maintainers; [ ma27 ]; }; From 8b11f1a56f812765167aef4f283e26f99763d8c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 22:47:51 +0200 Subject: [PATCH 175/239] python3Packages.catalogue: 2.0.4 -> 2.0.6 --- .../python-modules/catalogue/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index fbbaf92f4eb8..a62dcbd249a5 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -1,23 +1,30 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , pytestCheckHook +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.4"; + version = "2.0.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ntNF0ShVrzFfFxVYNhKya4YhorCi4775dNxdcS95g6o="; + sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik"; }; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "catalogue" ]; + meta = with lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; From be85d39388962a80d5225cc7b8e1fcdcc89f8095 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:02:18 +0200 Subject: [PATCH 176/239] python3Packages.fastapi: 0.68.0 -> 0.68.1 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 27cb4e445258..62aedf1f2117 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.68.0"; + version = "0.68.1"; format = "flit"; src = fetchFromGitHub { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "00cjkc90h0qlca30g981zvwlxh2wc3rfipw25v667jdl9x5gxv9p"; + sha256 = "sha256-zwfopyig4ImMbkx89l8SsLW8PzoVcDN5KSd7a7fOnms="; }; postPatch = '' From d9500ee0b058e875e501a437a34d40bcf052c076 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:14:44 +0200 Subject: [PATCH 177/239] python3Packages.hap-python: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/hap-python/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index e48826eae9fc..39d7429e8106 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; + sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests requiring network access disabledTestPaths = [ + # Disable tests requiring network access "tests/test_accessory_driver.py" "tests/test_hap_handler.py" "tests/test_hap_protocol.py" @@ -56,8 +56,11 @@ buildPythonPackage rec { "test_we_can_start_stop" "test_push_event" "test_bridge_run_stop" + "test_migration_to_include_client_properties" ]; + pythonImportsCheck = [ "pyhap" ]; + meta = with lib; { homepage = "https://github.com/ikalchev/HAP-python"; description = "HomeKit Accessory Protocol implementation in python"; From f62080e77bd36ddc3bbd94fc3e7d7bbdc4949d7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:20:01 +0200 Subject: [PATCH 178/239] python3Packages.plugwise: 0.12.0 -> 0.13.1 --- pkgs/development/python-modules/plugwise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index ec6d9c41a0d8..ececea7d7ddc 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; - rev = version; - sha256 = "sha256-fZ0mhsM7LroJgIyBO4eRzZaz2OQxa4Hhj1rNufHXvHI="; + rev = "v${version}"; + sha256 = "1sv421aa6ip74ajxa5imnh188hyx9dq3vwkb6aifi14h2wpr9lh3"; }; propagatedBuildInputs = [ From 0eafc74d503ffb6973676cb225d73c09c0fc1a39 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 18 May 2021 23:34:03 -0500 Subject: [PATCH 179/239] postfixadmin: init at 3.3.9 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/postfixadmin.nix | 164 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/postfixadmin.nix | 31 ++++ pkgs/servers/postfixadmin/default.nix | 27 +++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 226 insertions(+) create mode 100644 nixos/modules/services/mail/postfixadmin.nix create mode 100644 nixos/tests/postfixadmin.nix create mode 100644 pkgs/servers/postfixadmin/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2fbab4a68739..f07de862eacd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -460,6 +460,7 @@ ./services/mail/opensmtpd.nix ./services/mail/pfix-srsd.nix ./services/mail/postfix.nix + ./services/mail/postfixadmin.nix ./services/mail/postsrsd.nix ./services/mail/postgrey.nix ./services/mail/spamassassin.nix diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix new file mode 100644 index 000000000000..9fd6630ee368 --- /dev/null +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -0,0 +1,164 @@ +{ lib, config, pkgs, ... }: + +with lib; + +let + cfg = config.services.postfixadmin; + fpm = config.services.phpfpm.pools.postfixadmin; + localDB = cfg.database.host == "localhost"; + user = if localDB then cfg.database.username else "nginx"; +in +{ + options.services.postfixadmin = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable postfixadmin. + + Also enables nginx virtual host management. + Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. + See for further information. + ''; + }; + + hostName = mkOption { + type = types.str; + example = "postfixadmin.example.com"; + description = "Hostname to use for the nginx vhost"; + }; + + adminEmail = mkOption { + type = types.str; + example = "postfixadmin.example.com"; + description = '' + Define the Site Admin's email address below. + This will be used to send emails from to create mailboxes and + from Send Email / Broadcast message pages. + ''; + }; + + setupPasswordFile = mkOption { + type = types.path; + description = '' + Password file for the admin. + Generate with php -r "echo password_hash('some password here', PASSWORD_DEFAULT);" + ''; + }; + + database = { + username = mkOption { + type = types.str; + default = "postfixadmin"; + description = '' + Username for the postgresql connection. + If database.host is set to localhost, a unix user and group of the same name will be created as well. + ''; + }; + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Host of the postgresql server. If this is not set to + localhost, you have to create the + postgresql user and database yourself, with appropriate + permissions. + ''; + }; + passwordFile = mkOption { + type = types.path; + description = "Password file for the postgresql connection. Must be readable by user nginx."; + }; + dbname = mkOption { + type = types.str; + default = "postfixadmin"; + description = "Name of the postgresql database"; + }; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Extra configuration for the postfixadmin instance, see postfixadmin's config.inc.php for available options."; + }; + }; + + config = mkIf cfg.enable { + environment.etc."postfixadmin/config.local.php".text = '' + Date: Wed, 19 May 2021 15:33:23 -0500 Subject: [PATCH 180/239] postfixadmin: review additions Co-authored-by: Linus Heckemann --- nixos/modules/services/mail/postfixadmin.nix | 4 ++-- pkgs/servers/postfixadmin/default.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index 9fd6630ee368..96aa24089870 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -30,9 +30,9 @@ in adminEmail = mkOption { type = types.str; - example = "postfixadmin.example.com"; + example = "postmaster@example.com"; description = '' - Define the Site Admin's email address below. + Defines the Site Admin's email address. This will be used to send emails from to create mailboxes and from Send Email / Broadcast message pages. ''; diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/servers/postfixadmin/default.nix index e2da40bbc291..8425b57b34d8 100644 --- a/pkgs/servers/postfixadmin/default.nix +++ b/pkgs/servers/postfixadmin/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Web based virtual user administration interface for Postfix mail servers"; + homepage = "https://postfixadmin.sourceforge.io/"; maintainers = with stdenv.lib.maintainers; [ globin ]; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; From 8a0b6a42ee1b1199512a806d9c22617d7e09aeb1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Aug 2021 20:16:23 +0200 Subject: [PATCH 181/239] postfixadmin: fix db owner --- nixos/modules/services/mail/postfixadmin.nix | 42 ++++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index 96aa24089870..967e0e240550 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -125,14 +125,48 @@ in services.postgresql = mkIf localDB { enable = true; - ensureDatabases = [ cfg.database.dbname ]; ensureUsers = [ { name = cfg.database.username; - ensurePermissions = { - "DATABASE ${cfg.database.username}" = "ALL PRIVILEGES"; - }; } ]; }; + # The postgresql module doesn't currently support concepts like + # objects owners and extensions; for now we tack on what's needed + # here. + systemd.services.postfixadmin-postgres = let pgsql = config.services.postgresql; in mkIf localDB { + after = [ "postgresql.service" ]; + bindsTo = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ + pgsql.package + pkgs.utillinux + ]; + script = '' + set -eu + + PSQL() { + psql --port=${toString pgsql.port} "$@" + } + + PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.database.dbname}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.database.dbname}" OWNER "${cfg.database.username}"' + current_owner=$(PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.database.dbname}'") + if [[ "$current_owner" != "${cfg.database.username}" ]]; then + PSQL -tAc 'ALTER DATABASE "${cfg.database.dbname}" OWNER TO "${cfg.database.username}"' + if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}" ]]; then + echo "Reassigning ownership of database ${cfg.database.dbname} to user ${cfg.database.username} failed on last boot. Failing..." + exit 1 + fi + touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}" + PSQL "${cfg.database.dbname}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.database.username}\"" + rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.database.dbname}" + fi + ''; + + serviceConfig = { + User = pgsql.superUser; + Type = "oneshot"; + RemainAfterExit = true; + }; + }; users.users.${user} = mkIf localDB { group = user; From 9dabe2df7247c2241e35cda861fc1d71fd9ce38a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Aug 2021 20:24:49 +0200 Subject: [PATCH 182/239] postfixadmin: 3.3.9 -> 3.3.10 --- pkgs/servers/postfixadmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/servers/postfixadmin/default.nix index 8425b57b34d8..186d8b5ef091 100644 --- a/pkgs/servers/postfixadmin/default.nix +++ b/pkgs/servers/postfixadmin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postfixadmin"; - version = "3.3.9"; + version = "3.3.10"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "178ibnz8cd8nalg98zifsrpvqhi1i3k9rq5fbdpwlikqvppk0h08"; + sha256 = "0xck6df96r4z8k2j8x20b8h2qvmzyrfsya82s4i7hfhrxii92d3w"; }; installPhase = '' From 13a5d7dc23969053764af01bbd1ee905a55a15e1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Aug 2021 20:30:23 +0200 Subject: [PATCH 183/239] release-notes: add postfixadmin module addition --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b422c3cf058b..65abc8ac4820 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -199,6 +199,14 @@ services.xserver.displayManager.sx + + + postfixadmin, + a web based virtual user administration interface for Postfix + mail servers. Available as + postfixadmin. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 548008fe24bc..ae6ccf932987 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -60,6 +60,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [sx](https://github.com/earnestly/sx), a simple alternative to both xinit and startx for starting a Xorg server. Available as [services.xserver.displayManager.sx](#opt-services.xserver.displayManager.sx.enable) +- [postfixadmin](https://postfixadmin.sourceforge.io/), a web based virtual user administration interface for Postfix mail servers. Available as [postfixadmin](#opt-services.postfixadmin.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `paperless` module and package have been removed. All users should migrate to the From 52a6502174b2d7cbdd29abf3c0faa2418b2c0cae Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 23 Aug 2021 21:13:04 +0200 Subject: [PATCH 184/239] postfixadmin: stdenv.lib -> lib --- pkgs/servers/postfixadmin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/servers/postfixadmin/default.nix index 186d8b5ef091..e561b3931f73 100644 --- a/pkgs/servers/postfixadmin/default.nix +++ b/pkgs/servers/postfixadmin/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv }: +{ fetchFromGitHub, stdenv, lib }: stdenv.mkDerivation rec { pname = "postfixadmin"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "Web based virtual user administration interface for Postfix mail servers"; homepage = "https://postfixadmin.sourceforge.io/"; - maintainers = with stdenv.lib.maintainers; [ globin ]; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + maintainers = with lib.maintainers; [ globin ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; }; } From 749caaef5bd6cfd2c843a4f2e9fc2d29952d2109 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 24 Aug 2021 23:44:50 +0200 Subject: [PATCH 185/239] nixos/postfixadmin: fix eval & pin to PHP 7.4 Even though some PHP8 compat fixes seem to be in the release that's packaged here, it seems as if there are still some minor issues[1]. [1] https://github.com/postfixadmin/postfixadmin/issues/395 --- nixos/modules/services/mail/postfixadmin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index 967e0e240550..f5c8efb3076c 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -138,7 +138,7 @@ in wantedBy = [ "multi-user.target" ]; path = [ pgsql.package - pkgs.utillinux + pkgs.util-linux ]; script = '' set -eu @@ -177,6 +177,7 @@ in services.phpfpm.pools.postfixadmin = { user = user; + phpPackage = pkgs.php74; phpOptions = '' error_log = 'stderr' log_errors = on From 4431c8f98e6270aca2e64cb010d08b0e8ff7f6b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:53:13 +0200 Subject: [PATCH 186/239] python3Packages.censys: 2.0.3 -> 2.0.5 --- .../python-modules/censys/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index b3d152efab16..47f61242d63f 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -2,33 +2,41 @@ , backoff , buildPythonPackage , fetchFromGitHub +, importlib-metadata , parameterized +, poetry-core , pytestCheckHook , pythonOlder , requests , requests-mock , responses , rich -, types-requests }: buildPythonPackage rec { pname = "censys"; - version = "2.0.3"; + version = "2.0.5"; + format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "0ga5f6xv6rylfvalnl3cflr0w30r771gb05n5cjhxisb8an0qcb6"; + sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ backoff requests rich - types-requests + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; checkInputs = [ @@ -39,9 +47,10 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace "rich==10.3.0" "rich" \ - --replace "types-requests==0.1.11" "types-requests" + substituteInPlace pyproject.toml \ + --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ + --replace 'requests = ">=2.26.0"' 'requests = "*"' \ + --replace 'rich = "^10.6.0"' 'rich = "*"' substituteInPlace pytest.ini --replace \ " --cov -rs -p no:warnings" "" ''; From 1b76da0cad8f55550173de48a119a5cda3d2a75c Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Tue, 24 Aug 2021 10:45:23 -0400 Subject: [PATCH 187/239] Minor corrections --- doc/languages-frameworks/javascript.section.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 008424ff458b..ada861c303bd 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -32,7 +32,7 @@ Using a different tool forces to commit a lock file to the repository. Those fil Exceptions to this rule are: -- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files commited +- when you encounter one of the bugs from a nix tool. In each of the tool specific instructions, known problems will be detailed. If you have a problem with a particular tool, then it's best to try another tool, even if this means you will have to recreate a lock file and commit it to nixpkgs. In general yarn2nix has less known problems and so a simple search in nixpkgs will reveal many yarn.lock files committed - Some lock files contain particular version of a package that has been pulled off npm for some reason. In that case, you can recreate upstream lock (by removing the original and `npm install`, `yarn`, ...) and commit this to nixpkgs. - The only tool that supports workspaces (a feature of npm that helps manage sub-directories with different package.json from a single top level package.json) is yarn2nix. If upstream has workspaces you should try yarn2nix. @@ -106,15 +106,15 @@ requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blo To add a package from NPM to nixpkgs: -1. Modify `pkgs/development/node-packages/node-packages.json` to add, update +1. Modify `pkgs/development/node-packages/node-packages.json` to add, update or remove package entries to have it included in `nodePackages` and `nodePackages_latest`. -2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. -3. Build your new package to test your changes: +2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. +3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.`. To build against the latest stable Current Node.js version (e.g. 14.x): `nix-build -A nodePackages_latest.` -4. Add and commit all modified and generated files. +4. Add and commit all modified and generated files. For more information about the generation process, consult the [README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` @@ -132,7 +132,7 @@ you will need to generate a nix expression for the dependencies - Most probably you will need the `--development` to include the `devDependencies` so the command will most likely be -`node2nix --developmennt -l package-lock.json` +`node2nix --development -l package-lock.json` [link to the doc in the repo](https://github.com/svanderburg/node2nix) @@ -153,7 +153,7 @@ you will need at least a yarn.lock and yarn.nix file #### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} -this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitely override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use +this will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitly override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use ```nix buildPhase = '' @@ -188,7 +188,7 @@ There are some other options available that can't be used inside nixpkgs. Those ### npmlock2nix {#javascript-npmlock2nix} -[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be suject to change. +[npmlock2nix](https://github.com/nix-community/npmlock2nix) aims at building node_modules without code generation. It hasn't reached v1 yet, the api might be subject to change. #### Pitfalls {#javascript-npmlock2nix-pitfalls} From e89b36e4cb63712fee149336db88a3a81fdf1038 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Tue, 24 Aug 2021 10:50:16 -0400 Subject: [PATCH 188/239] Adding tips/searching section --- doc/languages-frameworks/javascript.section.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index ada861c303bd..1a9fe67627ed 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -6,6 +6,23 @@ This contains instructions on how to package javascript applications. For instru The various tools available will be listed in the [tools-overview](#javascript-tools-overview). Some general principles for packaging will follow. Finally some tool specific instructions will be given. +## Getting unstuck / finding code examples + +If you find you are lacking inspiration for packing javascript applications, the links below might prove useful. +Searching online for prior art can be helpful if you are running into solved problems. + +### Github + +- Searching Nix files for `mkYarnPackage`: + +- Searching just `flake.nix` files for `mkYarnPackage`: + +### Gitlab + +- Searching Nix files for `mkYarnPackage`: + +- Searching just `flake.nix` files for `mkYarnPackage`: + ## Tools overview {#javascript-tools-overview} ## General principles {#javascript-general-principles} From dabd16e7f2401d36dbd0cc1b017b58b7d10fe0d0 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Tue, 24 Aug 2021 11:22:06 -0400 Subject: [PATCH 189/239] Adding dependency override example --- .../javascript.section.md | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 1a9fe67627ed..6f42e6cb4cc2 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -195,10 +195,46 @@ configurePhase = "ln -s $node_modules node_modules"; this will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this. +#### Overriding dependency behavior + +In the `mkYarnPackage` record the property `pkgConfig` can be used to override packages when you encounter problems building. + +For instance, say your package is throwing errors when trying to invoke node-sass: `ENOENT: no such file or directory, scandir '/build/source/node_modules/node-sass/vendor'` + +To fix this we will specify different versions of build inputs to use, as well as some post install steps to get the software built the way we want: + +```nix +mkYarnPackage rec { + pkgConfig = { + node-sass = { + buildInputs = with final;[ python libsass pkgconfig ]; + postInstall = '' + LIBSASS_EXT=auto yarn --offline run build + rm build/config.gypi + ''; + }; + }; +} +``` + #### Pitfalls {#javascript-yarn2nix-pitfalls} - if version is missing from upstream package.json, yarn will silently install nothing. In that case, you will need to override package.json as shown in the [package.json section](#javascript-upstream-package-json) +- having trouble with node-gyp? Try adding these lines to the `yarnPreBuild` steps: + + ```nix + yarnPreBuild = '' + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + ''; + ``` + + - The `echo 9` steps comes from this answer: + - Exporting the headers in `npm_config_nodedir` comes from this issue: + ## Outside of nixpkgs {#javascript-outside-nixpkgs} There are some other options available that can't be used inside nixpkgs. Those other options are written in nix. Importing them in nixpkgs will require moving the source code into nixpkgs. Using [Import From Derivation](https://nixos.wiki/wiki/Import_From_Derivation) is not allowed in hydra at present. If you are packaging something outside nixpkgs, those can be considered From a2b179a3dc2242a4fd8bb2d69c477653bcb1b0e6 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Tue, 24 Aug 2021 16:10:46 +0000 Subject: [PATCH 190/239] Update doc/languages-frameworks/javascript.section.md Co-authored-by: Jonathan Ringer --- doc/languages-frameworks/javascript.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 6f42e6cb4cc2..c75bc235424f 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -207,7 +207,7 @@ To fix this we will specify different versions of build inputs to use, as well a mkYarnPackage rec { pkgConfig = { node-sass = { - buildInputs = with final;[ python libsass pkgconfig ]; + buildInputs = with final;[ python libsass pkg-config ]; postInstall = '' LIBSASS_EXT=auto yarn --offline run build rm build/config.gypi From ed6c628f3427a2ef308ba13e0446f98cf066ec2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 00:36:04 +0000 Subject: [PATCH 191/239] adwaita-qt: 1.3.1 -> 1.4.0 --- pkgs/data/themes/adwaita-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index fa69afe50c5e..3e72d8a74b8a 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; + sha256 = "sha256-KkqLUhS0JMwJsgu8fv5iGozH3Xv+cXumxx5IewZTTPc="; }; nativeBuildInputs = [ From 0cc67d775fba1af56eea9420c81e524f94376564 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 25 Aug 2021 02:02:32 +0100 Subject: [PATCH 192/239] ccache: 4.3 -> 4.4 (#135527) Added `test.trim_dir` to exclude list on Darwin as reported by @r-burns. --- .../development/tools/misc/ccache/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 909a160c7eea..3b1b54e6547a 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,10 +1,9 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , binutils -, asciidoc +, asciidoctor , cmake , perl , zstd @@ -15,13 +14,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; + hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY="; }; outputs = [ "out" "man" ]; @@ -35,16 +34,17 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) - # Fix clang C++ modules test (remove in next release) - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; - sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; - }) ]; - nativeBuildInputs = [ asciidoc cmake perl ]; + nativeBuildInputs = [ asciidoctor cmake perl ]; buildInputs = [ zstd ]; + cmakeFlags = [ + # Build system does not autodetect redis library presence. + # Requires explicit flag. + "-DREDIS_STORAGE_BACKEND=OFF" + ]; + doCheck = true; checkInputs = [ # test/run requires the compgen function which is available in @@ -56,7 +56,7 @@ let ccache = stdenv.mkDerivation rec { runHook preCheck export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' - -E '^(test.nocpp2|test.basedir|test.multi_arch)$' + -E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$' ''} runHook postCheck ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a47c944b747d..982122bf59ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13438,9 +13438,7 @@ with pkgs; cc-tool = callPackage ../development/embedded/cc-tool { }; - ccache = callPackage ../development/tools/misc/ccache { - asciidoc = asciidoc-full; - }; + ccache = callPackage ../development/tools/misc/ccache { }; # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: From 52370c03e92e1953770b86523efc12af6f4e6702 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 03:57:11 +0000 Subject: [PATCH 193/239] fioctl: 0.19.1 -> 0.20 --- pkgs/tools/admin/fioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index e271b2d15490..6e20a32cf21b 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fioctl"; - version = "0.19.1"; + version = "0.20"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-s6L/B01TaSCDMyRjZxNBDdhR46H7kDeXvVVP7b1e9Iw="; + sha256 = "sha256-vc+V69cyJZSJa6GXUUNYeXdKvmUrVIQhsBykptcl85s="; }; vendorSha256 = "sha256-SuUY4xwinky5QO+GxyotrFiYX1LnWQNjwWXIUpfVHUE="; From 9de4dc9e48028bbcc63ce409d8c015f4e9617c5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 14:14:34 +0000 Subject: [PATCH 194/239] python38Packages.pyfronius: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/pyfronius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfronius/default.nix b/pkgs/development/python-modules/pyfronius/default.nix index 5ad12130fa45..682ae2ff620b 100644 --- a/pkgs/development/python-modules/pyfronius/default.nix +++ b/pkgs/development/python-modules/pyfronius/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyfronius"; - version = "0.6.2"; + version = "0.6.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nielstron"; repo = pname; rev = "release-${version}"; - sha256 = "03szfgf2g0hs4r92p8jb8alzl7byzrirxsa25630zygmkadzgrz2"; + sha256 = "19cgr0y4zfyghpw9hwl9immh5c464dlasnfd8q570k9f0q682249"; }; propagatedBuildInputs = [ From 68658a5b0e620e033e34baabc986ea90d818d8d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:27:24 +0000 Subject: [PATCH 195/239] python38Packages.pythondialog: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/pythondialog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index 6f8b6a2bbec3..fbd37155cdb7 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pythondialog"; - version = "3.5.1"; + version = "3.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8"; + sha256 = "4fc11e95540d1d5dbe0a60cd3fb7787354df85ee4b5da21f708ea46cb47bf6d6"; }; patchPhase = '' From ad338549c519b4703f6122b426193483dda3b313 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 02:39:49 +0000 Subject: [PATCH 196/239] python38Packages.azure-mgmt-servicebus: 6.0.0 -> 7.0.0 --- .../python-modules/azure-mgmt-servicebus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 2deaf2b91dd7..5dd689b976e4 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "6.0.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; + sha256 = "ee859efec2ec9fc8d059811967b1cb17836f4f5786e7406494a42f51f0667822"; }; propagatedBuildInputs = [ From 85a2af3c76af1d7cad3336423cd63b32d36c5c56 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Tue, 24 Aug 2021 20:15:46 -0700 Subject: [PATCH 197/239] python3Packages.awslambdaric: 1.2.0 -> 1.2.2 --- pkgs/development/python-modules/awslambdaric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index f5d282ac0ee1..1826291da502 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "awslambdaric"; - version = "1.2.0"; + version = "1.2.2"; disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = version; - sha256 = "120qar8iaxj6dmnhjw1c40n2w06f1nyxy57dwh06xdiany698fg4"; + sha256 = "1r4b4w5xhf6p4vs7yx89kighlqim9f96v2ryknmrnmblgr4kg0h1"; }; postPatch = '' From e4d8156bf7d2af30459cebcfd792a536bf35e3c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 06:20:11 +0000 Subject: [PATCH 198/239] iotop-c: 1.17 -> 1.18 --- pkgs/os-specific/linux/iotop-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 47cfa57fe817..ca0eddac6664 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "0hjy30155c3nijx3jgyn5kpj293632p0j6f3lf5acdfax1ynav86"; + sha256 = "sha256-5RbxryvRKWJvjuJJwDK6GYnwdtHGfW7XEc75q4omxIA="; }; nativeBuildInputs = [ pkg-config ]; From 772bbb4019633b0dad5550084f0a2184dac31528 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:37:57 +0200 Subject: [PATCH 199/239] python3Packages.smbprotocol: 1.6.1 -> 1.6.2 --- pkgs/development/python-modules/smbprotocol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index b182667cfcbf..93f158508eb6 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd"; + sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE="; }; propagatedBuildInputs = [ From f36b5da8bac044f1962ab086b91c663a9f3f3a01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:44:44 +0200 Subject: [PATCH 200/239] python3Packages.censys: 2.0.5 -> 2.0.6 --- pkgs/development/python-modules/censys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 47f61242d63f..06e619676a67 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc="; + sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk="; }; nativeBuildInputs = [ @@ -51,8 +51,8 @@ buildPythonPackage rec { --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ --replace 'requests = ">=2.26.0"' 'requests = "*"' \ --replace 'rich = "^10.6.0"' 'rich = "*"' - substituteInPlace pytest.ini --replace \ - " --cov -rs -p no:warnings" "" + substituteInPlace pytest.ini \ + --replace "--cov" "" ''; # The tests want to write a configuration file From 6575c9012cf97145d0a895d3a4c33fbb76954b45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:17 +0200 Subject: [PATCH 201/239] python3Packages.archinfo: 9.0.9506 -> 9.0.9572 --- 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 46938694850c..5c8f04f4b948 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.9506"; + version = "9.0.9572"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jGXJpwiP2/O2aJhAP15VGqrekiiB0eiIFCjkzNMbqxw="; + sha256 = "sha256-OzgLGjEVOVRnQvWVcci8EGn6gtO8D8QoDnC9dfXGHZU="; }; checkInputs = [ From a9ac94752c7b71dec005d4a0feaae0948270a4f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:20 +0200 Subject: [PATCH 202/239] python3Packages.ailment: 9.0.9506 -> 9.0.9572 --- 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 6cf817f813fb..c9412428a9c4 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.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ikIO6AhoBkmz4+8BLOC55Yh6HbzHJOjlktSDMiC0I38="; + sha256 = "sha256-cjVKIlvGu1SCiVkegJ36GevZ9bihYF7n3P/xNqtAapw="; }; propagatedBuildInputs = [ pyvex ]; From 9bff900ef80b7339f505c395caaccf8199afbef1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:22 +0200 Subject: [PATCH 203/239] python3Packages.pyvex: 9.0.9506 -> 9.0.9572 --- 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 fee0653d5ec5..2b8bdb171560 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.9506"; + version = "9.0.9572"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DseMX41dXmmt44SPVHSIFRIJL1u9yZ3kq8pv8TzC/OQ="; + sha256 = "sha256-ish37nO+r1VJY9XS83K8tu60Snhd547n965TFqdBgzs="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 2e7186a71c476b47b96b5701fe41dd7709e8aff7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:25 +0200 Subject: [PATCH 204/239] python3Packages.claripy: 9.0.9506 -> 9.0.9572 --- 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 f85a9919a3f2..26aa06466600 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.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wczwKTtOJ4VC3UZvd1KT6GfGUk5AS90ggLi2lFjhD+Q="; + sha256 = "sha256-YC605gIM+l9Tnx6lu0ayrnYPE6Xx+aTgDXPziFY/lDA="; }; # Use upstream z3 implementation From 2aacbf42690b2950fa786ce0d6a38df16654eda1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:28 +0200 Subject: [PATCH 205/239] python3Packages.cle: 9.0.9506 -> 9.0.9572 --- 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 37a2294934fa..e2f0a7feed07 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.9506"; + version = "9.0.9572"; # 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-jTVccnCRqsp3EBl/RSKWVekAOsGhRvdIJxRyYV2gI4Q="; + sha256 = "sha256-b1LMHeaQqz0fNleRlME0kgSYZGGXBhFKCp0iRr/2A7c="; }; propagatedBuildInputs = [ From cf32a8e5fa94513db7cfb26525417a116686d696 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:31 +0200 Subject: [PATCH 206/239] python3Packages.angr: 9.0.9506 -> 9.0.9572 --- 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 db2ee2c13d1e..20c658909bec 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bKsLmZeFs7N4YUYxIktDoOn/H8waaOaOJOzyVumuf8="; + sha256 = "sha256-ZA2PKyJVXrSs2IvpjMyHGrtAPUpUZFhUzlKURLEWm5o="; }; propagatedBuildInputs = [ From 0bd9ae367fb276083a8768d242289a65091057c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:51:34 +0200 Subject: [PATCH 207/239] python3Packages.angrop: 9.0.9506 -> 9.0.9572 --- 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 5af743b93fb9..f0e0f4e1658b 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.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dTaTtiMzIm9PfVkjAED9x9zae+vdRcl1kDMtqUWvpkA="; + sha256 = "sha256-R4i7hQGwc74/szehcWBjkC6b9DsblluHKWxEk0iSFRI="; }; propagatedBuildInputs = [ From 8349ef5050b888c6b6a4fc6e21a9128a26d0c173 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 24 Aug 2021 11:11:20 +0200 Subject: [PATCH 208/239] python39packages.mpldatacursor: init at 0.7.1 --- .../python-modules/mpldatacursor/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/mpldatacursor/default.nix diff --git a/pkgs/development/python-modules/mpldatacursor/default.nix b/pkgs/development/python-modules/mpldatacursor/default.nix new file mode 100644 index 000000000000..b14470ca215a --- /dev/null +++ b/pkgs/development/python-modules/mpldatacursor/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +}: + +buildPythonPackage rec { + pname = "mpldatacursor"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "joferkington"; + repo = pname; + rev = "v${version}"; + sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda"; + }; + + propagatedBuildInputs = [ matplotlib ]; + + # No tests included in archive + doCheck = false; + + pythonImportsCheck = [ "mpldatacursor" ]; + + meta = with lib; { + homepage = "https://github.com/joferkington/mpldatacursor"; + description = "Interactive data cursors for matplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8736b7182a5..67db1490780f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4640,6 +4640,8 @@ in { mpi4py = callPackage ../development/python-modules/mpi4py { }; + mpldatacursor = callPackage ../development/python-modules/mpldatacursor { }; + mplfinance = callPackage ../development/python-modules/mplfinance { }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; From bcd4ec4f48fc251cc7818c6be28e683723bfca2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:00:16 +0000 Subject: [PATCH 209/239] kotlin: 1.5.21 -> 1.5.30 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 7e46e4bf2eaf..a1de91f2d396 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.21"; + version = "1.5.30"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; + sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18="; }; propagatedBuildInputs = [ jre ] ; From 90a707e52593e63d8112141f6c58be50c5394745 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:03:01 +0200 Subject: [PATCH 210/239] python3Packages.bitarray: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/bitarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 97dded095624..ad97a5f04c8b 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0="; + sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; }; checkPhase = '' From 6e4f17b5e65dbfa95a5245259f64ce46156261ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:13:31 +0200 Subject: [PATCH 211/239] python3Packages.codecov: 2.1.11 -> 2.1.12 --- .../python-modules/codecov/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 2e8cbf29220c..3b7ca324fd2c 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -1,17 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, coverage +, unittest2 +}: buildPythonPackage rec { pname = "codecov"; - version = "2.1.11"; + version = "2.1.12"; src = fetchPypi { inherit pname version; - sha256 = "6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b"; + sha256 = "sha256-oNpGu1AlQm2ola+Qk43vjuEtN/y8u7wVttxkz368UcE="; }; - checkInputs = [ unittest2 ]; # Tests only + propagatedBuildInputs = [ + requests + coverage + ]; - propagatedBuildInputs = [ requests coverage ]; + checkInputs = [ unittest2 ]; postPatch = '' sed -i 's/, "argparse"//' setup.py @@ -24,5 +33,6 @@ buildPythonPackage rec { description = "Python report uploader for Codecov"; homepage = "https://codecov.io/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } From 6ee577f99468870dd467d69ca1589ba0757e4ea4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 07:22:14 +0000 Subject: [PATCH 212/239] kustomize: 4.2.0 -> 4.3.0 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index c2453c8ff163..cae13140b04f 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.2.0"; + version = "4.3.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; + sha256 = "sha256-Oo29/H1rWKOMNBIa8N/ih2Bfmclsn/kqv3il6c2muoQ="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; + vendorSha256 = "sha256-oX+6cc5EO2RqK2O212iaW/6CMFCNdYzTpAaqDTFqX1A="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 5a877797cac56da66cb828ad444ecb788e43cbd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:24:59 +0200 Subject: [PATCH 213/239] python3Packages.codecov: enable tests --- .../python-modules/codecov/default.nix | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 3b7ca324fd2c..20c80872fd0f 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -1,18 +1,22 @@ { lib , buildPythonPackage -, fetchPypi -, requests , coverage -, unittest2 +, ddt +, fetchFromGitHub +, mock +, pytestCheckHook +, requests }: buildPythonPackage rec { pname = "codecov"; version = "2.1.12"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-oNpGu1AlQm2ola+Qk43vjuEtN/y8u7wVttxkz368UcE="; + src = fetchFromGitHub { + owner = "codecov"; + repo = "codecov-python"; + rev = "v${version}"; + sha256 = "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"; }; propagatedBuildInputs = [ @@ -20,14 +24,22 @@ buildPythonPackage rec { coverage ]; - checkInputs = [ unittest2 ]; + checkInputs = [ + ddt + mock + pytestCheckHook + ]; - postPatch = '' - sed -i 's/, "argparse"//' setup.py - ''; + pytestFlagsArray = [ "tests/test.py" ]; - # No tests in archive - doCheck = false; + disabledTests = [ + # No git repo available and network + "test_bowerrc_none" + "test_prefix" + "test_send" + ]; + + pythonImportsCheck = [ "codecov" ]; meta = with lib; { description = "Python report uploader for Codecov"; From 86fbb46d43faafc2a7215da920113f523df50092 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 09:56:39 +0200 Subject: [PATCH 214/239] python3Packages.phonenumbers: 8.12.30 -> 8.12.31 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 6d6a624b1423..c04ccbd5281e 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.30"; + version = "8.12.31"; src = fetchPypi { inherit pname version; - sha256 = "9ca65c36f437881a8f7dac979a5733ae8fb5a0a436aecd47bd2c06494bdf0a20"; + sha256 = "sha256-CR7SsxWFZ/EsmfcZVwocys4AF585tE8ea4lfWdk9rcg="; }; checkInputs = [ From f31fafc3840e1afbdb25115dcfbad1baf54b90d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:34:15 +0200 Subject: [PATCH 215/239] python3Packages.pyrad: 2.3 -> 2.4 --- pkgs/development/python-modules/pyrad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 31cbf77d94e0..331fc3783728 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyrad"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; rev = version; - sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; propagatedBuildInputs = [ netaddr six ]; From 288b36f84cb7b81af0541e6e5706460978ad70a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 11:10:27 +0200 Subject: [PATCH 216/239] yt-dlp: 2021.08.02 -> 2021.08.10 --- pkgs/tools/misc/yt-dlp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 8f5e14a24039..17d75fa4935d 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , fetchFromGitHub , websockets, mutagen @@ -13,13 +13,13 @@ 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.08.02"; + version = "2021.08.10"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; rev = version; - sha256 = "QEJKOZGVQNXLU8GfTbwBx2Zv3KO++ozTJcXLWxXA4hI="; + sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 74e51f889cf6c12b1f8a52e2ada2715c3e34620b Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Wed, 25 Aug 2021 09:37:27 +0100 Subject: [PATCH 217/239] snippetpixie: 1.5.2 -> 1.5.3 --- pkgs/tools/text/snippetpixie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 6cd6bdda0d9d..301831d1a830 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "173fm9h7lnhhbg5qbjz40g0fy60dwd2l55mdcc1j8dh73vz96pfr"; + sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz"; }; nativeBuildInputs = [ From 816fd297403c10f7d57dd30654ad20d95bf9ddf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:37:34 +0200 Subject: [PATCH 218/239] python3Packages.pyrad: add pythonImportsCheck and update license --- pkgs/development/python-modules/pyrad/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix index 331fc3783728..67841cab7d9f 100644 --- a/pkgs/development/python-modules/pyrad/default.nix +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -18,10 +18,12 @@ buildPythonPackage rec { nosetests -e testBind ''; + pythonImportsCheck = [ "pyrad" ]; + meta = with lib; { description = "Python RADIUS Implementation"; homepage = "https://bitbucket.org/zzzeek/sqlsoup"; - license = licenses.mit; + license = licenses.bsd3; maintainers = [ maintainers.globin ]; }; } From 49ab8cc8e8f68923a4e303c84cefb4c84e120097 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 10:47:59 +0200 Subject: [PATCH 219/239] python3Packages.rapidfuzz: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 8743e5014e04..6b78252de651 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk="; + sha256 = "sha256-Omo9ActReimYDK9dARG0s32Qq61neDELRechbnwRfwU="; }; checkInputs = [ From af0205cac7c34149c472f2a1e78232f599ddeed0 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 25 Aug 2021 16:15:55 +0800 Subject: [PATCH 220/239] perlPackages.ExtUtilsCChecker: 0.10 -> 0.11 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..1b38a64a868f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7509,10 +7509,10 @@ let ExtUtilsCChecker = buildPerlModule { pname = "ExtUtils-CChecker"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz"; - sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.11.tar.gz"; + sha256 = "1x8vafpff5nma18svxp1h3mp069fjmzlsdvnbcgn3z1pgrkkcxqi"; }; buildInputs = [ TestFatal ]; meta = { From b102c5f715ff3e92552a3a26ef4840546b49a88e Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:51:08 +0200 Subject: [PATCH 221/239] collectd: add dependencies for plugins notify_email, openldap, openipmi, xencpu --- pkgs/tools/system/collectd/plugins.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index dd578cd6393b..edda0e8fadfb 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -6,6 +6,7 @@ , jdk , libatasmart , libdbi +, libesmtp , libgcrypt , libmemcached, cyrus_sasl , libmodbus @@ -19,12 +20,14 @@ , libvirt , libxml2 , libapparmor, libcap_ng, numactl -, lvm2 , lua +, lvm2 , lm_sensors , mongoc , mosquitto , net-snmp +, openldap +, openipmi , perl , postgresql , protobufc @@ -35,6 +38,7 @@ , rrdtool , udev , varnish +, xen , yajl # Defaults to `null` for all supported plugins, # list of plugin names for a custom build @@ -122,7 +126,9 @@ let intel_rdt = {}; interface = {}; ipc = {}; - ipmi = {}; + ipmi = { + buildInputs = [ openipmi ]; + }; iptables = { buildInputs = [ libpcap @@ -200,6 +206,12 @@ let openldap = {}; openvpn = {}; oracle = {}; + notify_email = { + buildInputs = [ libesmtp ]; + }; + openldap = { + buildInputs = [ openldap ]; + }; ovs_events = { buildInputs = [ yajl ]; }; @@ -318,6 +330,9 @@ let zfs_arc = {}; zone = {}; zookeeper = {}; + xencpu = { + buildInputs = [ xen ]; + }; }; configureFlags = From a064c4d533f8490ab5ab99388e154ff3ce0be10b Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:52:03 +0200 Subject: [PATCH 222/239] collectd: remove virt plugin dependencies that are no longer used --- pkgs/tools/system/collectd/plugins.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index edda0e8fadfb..ecafa587eddc 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -292,11 +292,7 @@ let }; virt = { buildInputs = [ libvirt libxml2 yajl ] ++ - lib.optionals stdenv.isLinux [ lvm2 udev - # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 - # is merged - libapparmor numactl libcap_ng - ]; + lib.optionals stdenv.isLinux [ lvm2 udev ]; }; vmem = {}; vserver = {}; From 39adcbca307cf8f0c7bedf457676d629d3a60754 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:54:05 +0200 Subject: [PATCH 223/239] collectd: reduce plugin configuration by configuring --disable-all-plugins --- pkgs/tools/system/collectd/plugins.nix | 131 ++----------------------- 1 file changed, 7 insertions(+), 124 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index ecafa587eddc..3ed2ff70998c 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -47,10 +47,9 @@ }: let - # All plugins and their dependencies. - # Please help complete this! + # Plugins that have dependencies. + # Please help to extend these! plugins = { - aggregation = {}; amqp = { buildInputs = [ yajl ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; @@ -58,13 +57,9 @@ let apache = { buildInputs = [ curl ]; }; - apcups = {}; - apple_sensors = {}; - aquaero = {}; ascent = { buildInputs = [ curl libxml2 ]; }; - barometer = {}; battery = { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit @@ -76,14 +71,6 @@ let ceph = { buildInputs = [ yajl ]; }; - cgroups = {}; - chrony = {}; - conntrack = {}; - contextswitch = {}; - cpu = {}; - cpufreq = {}; - cpusleep = {}; - csv = {}; curl = { buildInputs = [ curl ]; }; @@ -96,7 +83,6 @@ let dbi = { buildInputs = [ libdbi ]; }; - df = {}; disk = { buildInputs = lib.optionals stdenv.isLinux [ udev @@ -107,25 +93,6 @@ let dns = { buildInputs = [ libpcap ]; }; - dpdkevents = {}; - dpdkstat = {}; - drbd = {}; - email = {}; - entropy = {}; - ethstat = {}; - exec = {}; - fhcount = {}; - filecount = {}; - fscache = {}; - gmond = {}; - gps = {}; - grpc = {}; - hddtemp = {}; - hugepages = {}; - intel_pmu = {}; - intel_rdt = {}; - interface = {}; - ipc = {}; ipmi = { buildInputs = [ openipmi ]; }; @@ -136,49 +103,29 @@ let iptables libmnl ]; }; - ipvs = {}; - irq = {}; java = { buildInputs = [ jdk libgcrypt libxml2 ]; }; - load = {}; - logfile = {}; log_logstash = { buildInputs = [ yajl ]; }; - lpar = {}; lua = { buildInputs = [ lua ]; }; - lvm = {}; - madwifi = {}; - match_empty_counter = {}; - match_hashed = {}; - match_regex = {}; - match_timediff = {}; - match_value = {}; - mbmon = {}; - mcelog = {}; - md = {}; memcachec = { buildInputs = [ libmemcached cyrus_sasl ]; }; - memcached = {}; - memory = {}; - mic = {}; modbus = { buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; }; mqtt = { buildInputs = [ mosquitto ]; }; - multimeter = {}; mysql = { buildInputs = lib.optionals (libmysqlclient != null) [ libmysqlclient ]; }; - netapp = {}; netlink = { buildInputs = [ libpcap @@ -189,23 +136,12 @@ let network = { buildInputs = [ libgcrypt ]; }; - nfs = {}; nginx = { buildInputs = [ curl ]; }; notify_desktop = { buildInputs = [ libnotify gdk-pixbuf ]; }; - notify_email = {}; - notify_nagios = {}; - ntpd = {}; - numa = {}; - nut = {}; - olsrd = {}; - onewire = {}; - openldap = {}; - openvpn = {}; - oracle = {}; notify_email = { buildInputs = [ libesmtp ]; }; @@ -221,7 +157,6 @@ let perl = { buildInputs = [ perl ]; }; - pf = {}; pinba = { buildInputs = [ protobufc ]; }; @@ -231,16 +166,12 @@ let postgresql = { buildInputs = [ postgresql ]; }; - powerdns = {}; - processes = {}; - protocols = {}; python = { buildInputs = [ python ]; }; redis = { buildInputs = [ hiredis ]; }; - routeros = {}; rrdcached = { buildInputs = [ rrdtool libxml2 ]; }; @@ -250,7 +181,6 @@ let sensors = { buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; }; - serial = {}; sigrok = { buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; }; @@ -263,30 +193,6 @@ let snmp_agent = { buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; }; - statsd = {}; - swap = {}; - synproxy = {}; - syslog = {}; - table = {}; - tail_csv = {}; - tail = {}; - tape = {}; - target_notification = {}; - target_replace = {}; - target_scale = {}; - target_set = {}; - target_v5upgrade = {}; - tcpconns = {}; - teamspeak2 = {}; - ted = {}; - thermal = {}; - threshold = {}; - tokyotyrant = {}; - turbostat = {}; - unixsock = {}; - uptime = {}; - users = {}; - uuid = {}; varnish = { buildInputs = [ curl varnish ]; }; @@ -294,10 +200,6 @@ let buildInputs = [ libvirt libxml2 yajl ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; }; - vmem = {}; - vserver = {}; - wireless = {}; - write_graphite = {}; write_http = { buildInputs = [ curl yajl ]; }; @@ -319,37 +221,18 @@ let write_riemann = { buildInputs = [ protobufc riemann_c_client ]; }; - write_sensu = {}; - write_tsdb = {}; - xencpu = {}; - xmms = {}; - zfs_arc = {}; - zone = {}; - zookeeper = {}; xencpu = { buildInputs = [ xen ]; }; }; - configureFlags = - if enabledPlugins == null - then [] - else (map (plugin: "--enable-${plugin}") enabledPlugins) ++ - (map (plugin: "--disable-${plugin}") - (builtins.filter (plugin: ! builtins.elem plugin enabledPlugins) - (builtins.attrNames plugins)) - ); + configureFlags = lib.optionals (enabledPlugins != null) ( + [ "--disable-all-plugins" ] + ++ (map (plugin: "--enable-${plugin}") enabledPlugins)); pluginBuildInputs = plugin: - if ! builtins.hasAttr plugin plugins - then throw "Unknown collectd plugin: ${plugin}" - else - let - pluginAttrs = builtins.getAttr plugin plugins; - in - if pluginAttrs ? "buildInputs" - then pluginAttrs.buildInputs - else []; + lib.optionals (plugins ? ${plugin} && plugins.${plugin} ? buildInputs) + plugins.${plugin}.buildInputs; buildInputs = if enabledPlugins == null From 11a144c6f3ae206cabba6cf6d875eeccdf2d25f4 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Aug 2021 21:58:21 +0200 Subject: [PATCH 224/239] collectd: shorten plugins buildInputs definition --- pkgs/tools/system/collectd/plugins.nix | 248 ++++++++----------------- 1 file changed, 74 insertions(+), 174 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index 3ed2ff70998c..df99c60c3ef0 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -47,183 +47,83 @@ }: let + inherit (darwin.apple_sdk.frameworks) IOKit; + # Plugins that have dependencies. # Please help to extend these! plugins = { - amqp = { - buildInputs = [ yajl ] ++ - lib.optionals stdenv.isLinux [ rabbitmq-c ]; - }; - apache = { - buildInputs = [ curl ]; - }; - ascent = { - buildInputs = [ curl libxml2 ]; - }; - battery = { - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - bind = { - buildInputs = [ curl libxml2 ]; - }; - ceph = { - buildInputs = [ yajl ]; - }; - curl = { - buildInputs = [ curl ]; - }; - curl_json = { - buildInputs = [ curl yajl ]; - }; - curl_xml = { - buildInputs = [ curl libxml2 ]; - }; - dbi = { - buildInputs = [ libdbi ]; - }; - disk = { - buildInputs = lib.optionals stdenv.isLinux [ - udev - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - dns = { - buildInputs = [ libpcap ]; - }; - ipmi = { - buildInputs = [ openipmi ]; - }; - iptables = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - iptables libmnl - ]; - }; - java = { - buildInputs = [ jdk libgcrypt libxml2 ]; - }; - log_logstash = { - buildInputs = [ yajl ]; - }; - lua = { - buildInputs = [ lua ]; - }; - memcachec = { - buildInputs = [ libmemcached cyrus_sasl ]; - }; - modbus = { - buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; - }; - mqtt = { - buildInputs = [ mosquitto ]; - }; - mysql = { - buildInputs = lib.optionals (libmysqlclient != null) [ - libmysqlclient - ]; - }; - netlink = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - libmnl - ]; - }; - network = { - buildInputs = [ libgcrypt ]; - }; - nginx = { - buildInputs = [ curl ]; - }; - notify_desktop = { - buildInputs = [ libnotify gdk-pixbuf ]; - }; - notify_email = { - buildInputs = [ libesmtp ]; - }; - openldap = { - buildInputs = [ openldap ]; - }; - ovs_events = { - buildInputs = [ yajl ]; - }; - ovs_stats = { - buildInputs = [ yajl ]; - }; - perl = { - buildInputs = [ perl ]; - }; - pinba = { - buildInputs = [ protobufc ]; - }; - ping = { - buildInputs = [ liboping ]; - }; - postgresql = { - buildInputs = [ postgresql ]; - }; - python = { - buildInputs = [ python ]; - }; - redis = { - buildInputs = [ hiredis ]; - }; - rrdcached = { - buildInputs = [ rrdtool libxml2 ]; - }; - rrdtool = { - buildInputs = [ rrdtool libxml2 ]; - }; - sensors = { - buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; - }; - sigrok = { - buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; - }; - smart = { - buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; - }; - snmp = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - snmp_agent = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - varnish = { - buildInputs = [ curl varnish ]; - }; - virt = { - buildInputs = [ libvirt libxml2 yajl ] ++ - lib.optionals stdenv.isLinux [ lvm2 udev ]; - }; - write_http = { - buildInputs = [ curl yajl ]; - }; - write_kafka = { - buildInputs = [ yajl rdkafka ]; - }; - write_log = { - buildInputs = [ yajl ]; - }; - write_mongodb = { - buildInputs = [ mongoc ]; - }; - write_prometheus = { - buildInputs = [ protobufc libmicrohttpd ]; - }; - write_redis = { - buildInputs = [ hiredis ]; - }; - write_riemann = { - buildInputs = [ protobufc riemann_c_client ]; - }; - xencpu = { - buildInputs = [ xen ]; - }; + amqp.buildInputs = [ + yajl + ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; + apache.buildInputs = [ curl ]; + ascent.buildInputs = [ curl libxml2 ]; + battery.buildInputs = lib.optionals stdenv.isDarwin [ + IOKit + ]; + bind.buildInputs = [ curl libxml2 ]; + ceph.buildInputs = [ yajl ]; + curl.buildInputs = [ curl ]; + curl_json.buildInputs = [ curl yajl ]; + curl_xml.buildInputs = [ curl libxml2 ]; + dbi.buildInputs = [ libdbi ]; + disk.buildInputs = lib.optionals stdenv.isLinux [ + udev + ] ++ lib.optionals stdenv.isDarwin [ + IOKit + ]; + dns.buildInputs = [ libpcap ]; + ipmi.buildInputs = [ openipmi ]; + iptables.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + iptables libmnl + ]; + java.buildInputs = [ jdk libgcrypt libxml2 ]; + log_logstash.buildInputs = [ yajl ]; + lua.buildInputs = [ lua ]; + memcachec.buildInputs = [ libmemcached cyrus_sasl ]; + modbus.buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; + mqtt.buildInputs = [ mosquitto ]; + mysql.buildInputs = lib.optionals (libmysqlclient != null) [ + libmysqlclient + ]; + netlink.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + libmnl + ]; + network.buildInputs = [ libgcrypt ]; + nginx.buildInputs = [ curl ]; + notify_desktop.buildInputs = [ libnotify gdk-pixbuf ]; + notify_email.buildInputs = [ libesmtp ]; + openldap.buildInputs = [ openldap ]; + ovs_events.buildInputs = [ yajl ]; + ovs_stats.buildInputs = [ yajl ]; + perl.buildInputs = [ perl ]; + pinba.buildInputs = [ protobufc ]; + ping.buildInputs = [ liboping ]; + postgresql.buildInputs = [ postgresql ]; + python.buildInputs = [ python ]; + redis.buildInputs = [ hiredis ]; + rrdcached.buildInputs = [ rrdtool libxml2 ]; + rrdtool.buildInputs = [ rrdtool libxml2 ]; + sensors.buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; + sigrok.buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; + smart.buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; + snmp.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + snmp_agent.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + varnish.buildInputs = [ curl varnish ]; + virt.buildInputs = [ + libvirt libxml2 yajl + ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; + write_http.buildInputs = [ curl yajl ]; + write_kafka.buildInputs = [ yajl rdkafka ]; + write_log.buildInputs = [ yajl ]; + write_mongodb.buildInputs = [ mongoc ]; + write_prometheus.buildInputs = [ protobufc libmicrohttpd ]; + write_redis.buildInputs = [ hiredis ]; + write_riemann.buildInputs = [ protobufc riemann_c_client ]; + xencpu.buildInputs = [ xen ]; }; configureFlags = lib.optionals (enabledPlugins != null) ( From 4dacd7461fa6f5bd0f4cb15e1f996e79e8379f42 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 21 Aug 2021 01:40:32 +0200 Subject: [PATCH 225/239] collectd: move IOKit input to all-packages.nix --- pkgs/tools/system/collectd/plugins.nix | 3 +-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index df99c60c3ef0..6438a545a485 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -40,6 +40,7 @@ , varnish , xen , yajl +, IOKit # Defaults to `null` for all supported plugins, # list of plugin names for a custom build , enabledPlugins ? null @@ -47,8 +48,6 @@ }: let - inherit (darwin.apple_sdk.frameworks) IOKit; - # Plugins that have dependencies. # Please help to extend these! plugins = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982122bf59ed..0f5dc92affed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3788,6 +3788,7 @@ with pkgs; collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + inherit (darwin.apple_sdk.frameworks) IOKit; }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; From f13997ff312505bfab4e42fe687fd42d97fa3c36 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 25 Aug 2021 12:30:11 +0200 Subject: [PATCH 226/239] jiq: 0.7.1 -> 0.7.2 ChangeLog: https://github.com/fiatjaf/jiq/releases/tag/v0.7.2 --- pkgs/development/tools/misc/jiq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index c52a9ae4c030..61477a4c7de0 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jiq"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = pname; - rev = version; - sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + rev = "v${version}"; + sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig="; }; vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; From 3b7677852aab327a56b4e050915ddefbbe262a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 21:39:57 +0200 Subject: [PATCH 227/239] python39Packages.tesnorboard-data-server: init at 0.6.1 --- .../tensorboard-data-server/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/tensorboard-data-server/default.nix diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix new file mode 100644 index 000000000000..74f53d7c6763 --- /dev/null +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "tensorboard-data-server"; + version = "0.6.1"; + format = "wheel"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "tensorboard_data_server"; + inherit version format; + dist = "py3"; + python = "py3"; + sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + }; + + pythonImportsCheck = [ "tensorboard_data_server" ]; + + meta = with lib; { + description = "Fast data loading for TensorBoard"; + homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc0389c3fcd4..05044196bf10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8635,6 +8635,8 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; From 85a639637bdf7543ca930c137a8f34197d335cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Aug 2021 23:03:32 +0200 Subject: [PATCH 228/239] python39Packages.cirq-google: fix google-api-core version constraint --- pkgs/development/python-modules/cirq-google/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix index 8692aef4b678..900189dc2edb 100644 --- a/pkgs/development/python-modules/cirq-google/default.nix +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; postPatch = '' - substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + substituteInPlace requirements.txt \ + --replace "protobuf~=3.13.0" "protobuf" \ + --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" ''; propagatedBuildInputs = [ From 83514ae7a9f25023c2bc7bec323e661b7302d61d Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 13 Aug 2021 16:31:14 -0300 Subject: [PATCH 229/239] lib.formats.yaml: use well known YAML format The way `(lib.formats.yaml {}).generate` generates YAML is compliant because on YAML 1.2 spec JSON is a subset of YAML but it bugs people's minds and can lead to problems with software that is not compatible with YAML 1.2. This commit also changes the test of the generation function. Data validation/typing remains the same. See #133802. Signed-off-by: lucasew --- .../from_md/release-notes/rl-2111.section.xml | 7 +++++ .../manual/release-notes/rl-2111.section.md | 2 ++ pkgs/pkgs-lib/formats.nix | 29 +++++++++++++++---- pkgs/pkgs-lib/tests/formats.nix | 26 +++++++---------- 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 6d02f71ac989..39a7965a7ed4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1058,6 +1058,13 @@ Superuser created successfully. sign OCSP responses and server certificates. + + + lib.formats.yaml’s + generate will not generate JSON anymore, + but instead use more of the YAML-specific syntax. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index a337a72b7166..0203215f11e8 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -302,3 +302,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. + +- `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 44c8f9135439..5e17519d4ce1 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -48,14 +48,31 @@ rec { }; - # YAML has been a strict superset of JSON since 1.2 - yaml = {}: - let jsonSet = json {}; - in jsonSet // { - type = jsonSet.type // { + yaml = {}: { + + generate = name: value: pkgs.runCommand name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2yaml "$valuePath" "$out" + ''; + + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + path + (attrsOf valueType) + (listOf valueType) + ]) // { description = "YAML value"; }; - }; + in valueType; + + }; ini = { # Represents lists as duplicate keys diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index af19f6100eef..14cc85eff31d 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -72,21 +72,17 @@ in runBuildTests { path = ./formats.nix; }; expected = '' - { - "attrs": { - "foo": null - }, - "false": false, - "float": 3.141, - "list": [ - null, - null - ], - "null": null, - "path": "${./formats.nix}", - "str": "foo", - "true": true - } + attrs: + foo: null + 'false': false + float: 3.141 + list: + - null + - null + 'null': null + path: ${./formats.nix} + str: foo + 'true': true ''; }; From edca4b029f4f869d77642f3c8d9e8d27ac8473a0 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Wed, 25 Aug 2021 20:06:04 +0800 Subject: [PATCH 230/239] perlPackages.Filelchown: fix build on Darwin --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..dcb6c70b94f4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8081,7 +8081,7 @@ let sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; From 7c9d049653684aaaf4169bfc702851d0f06d9309 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 25 Aug 2021 14:17:36 +0200 Subject: [PATCH 231/239] esphome: 2021.8.1 -> 2021.8.2 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 5c04cd8018ad..4c58632e0df6 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.1"; + version = "2021.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-1eWM2MuIQ1ewbx53MmxmKi1Q92hzBqGboV3LbmMrw8g="; + sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; }; patches = [ From d16075b4c53270573eca08bbf41117513d9e44cd Mon Sep 17 00:00:00 2001 From: Thomas Sean Dominic Kelly Date: Wed, 25 Aug 2021 13:10:51 +0100 Subject: [PATCH 232/239] perlPackages.Graph: 0.9712 -> 0.9722 --- pkgs/top-level/perl-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6728030822eb..1ba507322aee 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9101,12 +9101,15 @@ let Graph = buildPerlPackage { pname = "Graph"; - version = "0.9712"; + version = "0.9722"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9712.tar.gz"; - sha256 = "1as4ngbqxrjv9f31hm3wg8pyiyrz5fbbvlpfsrm68k1yskwkgkcg"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9722.tar.gz"; + sha256 = "c113633833f3a1bef8fa8eb96680be36d00e41ef404bddd7fc0bb98703e28d4d"; + }; + propagatedBuildInputs = [ HeapFibonacci SetObject ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ HeapFibonacci ]; }; GraphicsTIFF = buildPerlPackage { From 9c8b5a8b7fcc5db3d9e50c9451ebd44aac124ce9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 06:09:43 +0000 Subject: [PATCH 233/239] headscale: 0.6.1 -> 0.7.0 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 01abc596517d..755a538f58d9 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-pzsbCxJ3N30XpjF//02SV6URhA6f6Wz8a6HvGxsK7M4="; + sha256 = "sha256-N1WjfsiLuroXsmD67HeWw/2lLJ8r3iWYwGac9DbbFsQ="; }; vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; From b35a0c79f5217abbe6044e03167a22dd4ab1aa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Tarbouriech?= <78071629+noe-tarbouriech@users.noreply.github.com> Date: Wed, 25 Aug 2021 15:14:45 +0200 Subject: [PATCH 234/239] StarUML: 2.8.1 -> 4.0.1 (#135599) Co-authored-by: Sandro --- pkgs/tools/misc/staruml/default.nix | 49 +++++++++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index 847e8bb84282..ab28b8777f44 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,23 +1,33 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd -, libXdamage, expat }: +, gtk3, glib, systemd +, xorg, nss, nspr +, atk, at-spi2-atk, dbus +, gdk-pixbuf, pango, cairo +, expat, libdrm, mesa +, alsa-lib, at-spi2-core, cups }: let - LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ + glib gtk3 xorg.libXdamage + xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXcursor xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXrender xorg.libXtst + nss nspr atk at-spi2-atk dbus + gdk-pixbuf pango cairo + xorg.libXrandr expat libdrm + mesa alsa-lib at-spi2-core + cups + ]; in stdenv.mkDerivation rec { - version = "2.8.1"; + version = "4.0.1"; pname = "staruml"; src = - if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb"; - sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; - } else fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb"; - sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; + fetchurl { + url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb"; + sha256 = "0vxrs5y4a17bnc27fd2k2qc0vi81v677mi55znylwf3a41fjfcir"; }; nativeBuildInputs = [ makeWrapper dpkg ]; @@ -30,25 +40,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv opt/staruml $out/bin + mv opt/StarUML $out/bin mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - for binary in StarUML Brackets-node; do - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/$binary - wrapProgram $out/bin/$binary \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} - done + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/staruml + wrapProgram $out/bin/staruml \ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} ''; meta = with lib; { description = "A sophisticated software modeler"; homepage = "https://staruml.io/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f5dc92affed..afae38acb69b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9285,7 +9285,7 @@ with pkgs; stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { }; stone-phaser = callPackage ../applications/audio/stone-phaser { }; From 14b61efa8736771a7ab549ede5b92bbbbaa5bef7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 25 Aug 2021 15:22:50 +0200 Subject: [PATCH 235/239] dockerTools.usrBinEnv: add This provides a /usr/bin/env, for shell scripts using the "/usr/bin/env executable" shebang. --- pkgs/build-support/docker/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 832d2949a1aa..9e4709dd9bf8 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -759,6 +759,13 @@ rec { ]; }; + # This provides a /usr/bin/env, for shell scripts using the + # "#!/usr/bin/env executable" shebang. + usrBinEnv = runCommand "usr-bin-env" { } '' + mkdir -p $out/usr/bin + ln -s ${pkgs.coreutils}/bin/env $out/usr/bin + ''; + # This provides /bin/sh, pointing to bashInteractive. binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin From 076f6e2d948259e18ddac8e562c62b5b53de9fe6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:37 -0400 Subject: [PATCH 236/239] nixos/make-zfs-image: init This is a private interface for internal NixOS use. It is similar to `make-disk-image` except it is much more opinionated about what kind of disk image it'll make. Specifically, it will always create *two* disks: 1. a `boot` disk formatted with FAT in a hybrid GPT mode. 2. a `root` disk which is completely owned by a single zpool. The partitioning and FAT decisions should make the resulting images bootable under EFI or BIOS, with systemd-boot or grub. The root disk's zpools options are highly customizable, including fully customizable datasets and their options. Because the boot disk and partition are highly opinionated, it is expected that the `boot` disk will be mounted at `/boot`. It is always labeled ESP even on BIOS boot systems. In order for the datasets to be mounted properly, the `datasets` passed in to `make-zfs-image` are turned in to NixOS configuration stored at /etc/nixos/configuration.nix inside the VM. NOTE: The function accepts a system configuration in the `config` argument. The *caller* must manually configure the system in `config` to have each specified `dataset` be represented by a corresponding `fileSystems` entry. One way to test the resulting images is with qemu: ```sh boot=$(find ./result/ -name '*.boot.*'); root=$(find ./result/ -name '*.root.*'); echo '`Ctrl-a h` to get help on the monitor'; echo '`Ctrl-a x` to exit'; qemu-kvm \ -nographic \ -cpu max \ -m 16G \ -drive file=$boot,snapshot=on,index=0,media=disk \ -drive file=$root,snapshot=on,index=1,media=disk \ -boot c \ -net user \ -net nic \ -msg timestamp=on ``` --- nixos/lib/make-zfs-image.nix | 333 +++++++++++++++++++++++++++++++++++ 1 file changed, 333 insertions(+) create mode 100644 nixos/lib/make-zfs-image.nix diff --git a/nixos/lib/make-zfs-image.nix b/nixos/lib/make-zfs-image.nix new file mode 100644 index 000000000000..40648ca24d4d --- /dev/null +++ b/nixos/lib/make-zfs-image.nix @@ -0,0 +1,333 @@ +# Note: This is a private API, internal to NixOS. Its interface is subject +# to change without notice. +# +# The result of this builder is two disk images: +# +# * `boot` - a small disk formatted with FAT to be used for /boot. FAT is +# chosen to support EFI. +# * `root` - a larger disk with a zpool taking the entire disk. +# +# This two-disk approach is taken to satisfy ZFS's requirements for +# autoexpand. +# +# # Why doesn't autoexpand work with ZFS in a partition? +# +# When ZFS owns the whole disk doesn’t really use a partition: it has +# a marker partition at the start and a marker partition at the end of +# the disk. +# +# If ZFS is constrained to a partition, ZFS leaves expanding the partition +# up to the user. Obviously, the user may not choose to do so. +# +# Once the user expands the partition, calling zpool online -e expands the +# vdev to use the whole partition. It doesn’t happen automatically +# presumably because zed doesn’t get an event saying it’s partition grew, +# whereas it can and does get an event saying the whole disk it is on is +# now larger. +{ lib +, pkgs +, # The NixOS configuration to be installed onto the disk image. + config + +, # size of the FAT boot disk, in megabytes. + bootSize ? 1024 + +, # The size of the root disk, in megabytes. + rootSize ? 2048 + +, # The name of the ZFS pool + rootPoolName ? "tank" + +, # zpool properties + rootPoolProperties ? { + autoexpand = "on"; + } +, # pool-wide filesystem properties + rootPoolFilesystemProperties ? { + acltype = "posixacl"; + atime = "off"; + compression = "on"; + mountpoint = "legacy"; + xattr = "sa"; + } + +, # datasets, with per-attribute options: + # mount: (optional) mount point in the VM + # properties: (optional) ZFS properties on the dataset, like filesystemProperties + # Notes: + # 1. datasets will be created from shorter to longer names as a simple topo-sort + # 2. you should define a root's dataset's mount for `/` + datasets ? { } + +, # The files and directories to be placed in the target file system. + # This is a list of attribute sets {source, target} where `source' + # is the file system object (regular file or directory) to be + # grafted in the file system at path `target'. + contents ? [] + +, # The initial NixOS configuration file to be copied to + # /etc/nixos/configuration.nix. This configuration will be embedded + # inside a configuration which includes the described ZFS fileSystems. + configFile ? null + +, # Shell code executed after the VM has finished. + postVM ? "" + +, name ? "nixos-disk-image" + +, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. + format ? "raw" + +, # Include a copy of Nixpkgs in the disk image + includeChannel ? true +}: +let + formatOpt = if format == "qcow2-compressed" then "qcow2" else format; + + compress = lib.optionalString (format == "qcow2-compressed") "-c"; + + filenameSuffix = "." + { + qcow2 = "qcow2"; + vdi = "vdi"; + vpc = "vhd"; + raw = "img"; + }.${formatOpt} or formatOpt; + bootFilename = "nixos.boot${filenameSuffix}"; + rootFilename = "nixos.root${filenameSuffix}"; + + # FIXME: merge with channel.nix / make-channel.nix. + channelSources = + let + nixpkgs = lib.cleanSource pkgs.path; + in + pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' + mkdir -p $out + cp -prd ${nixpkgs.outPath} $out/nixos + chmod -R u+w $out/nixos + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi + rm -rf $out/nixos/.git + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + ''; + + closureInfo = pkgs.closureInfo { + rootPaths = [ config.system.build.toplevel ] + ++ (lib.optional includeChannel channelSources); + }; + + modulesTree = pkgs.aggregateModules + (with config.boot.kernelPackages; [ kernel zfs ]); + + tools = lib.makeBinPath ( + with pkgs; [ + config.system.build.nixos-enter + config.system.build.nixos-install + dosfstools + e2fsprogs + gptfdisk + nix + parted + utillinux + zfs + ] + ); + + hasDefinedMount = disk: ((disk.mount or null) != null); + + stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" ( + lib.mapAttrsToList + ( + property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}" + ) + properties + ); + + featuresToProperties = features: + lib.listToAttrs + (builtins.map (feature: { + name = "feature@${feature}"; + value = "enabled"; + }) features); + + createDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist; + cmd = { name, value }: + let + properties = stringifyProperties "-o" (value.properties or {}); + in + "zfs create -p ${properties} ${name}"; + in + lib.concatMapStringsSep "\n" cmd sorted; + + mountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + mkdir -p /mnt${lib.escapeShellArg value.mount} + mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + unmountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + umount /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + + fileSystemsCfgFile = + let + mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets; + in + pkgs.runCommand "filesystem-config.nix" { + buildInputs = with pkgs; [ jq nixpkgs-fmt ]; + filesystems = builtins.toJSON { + fileSystems = lib.mapAttrs' + ( + dataset: attrs: + { + name = attrs.mount; + value = { + fsType = "zfs"; + device = "${dataset}"; + }; + } + ) + mountable; + }; + passAsFile = [ "filesystems" ]; + } '' + ( + echo "builtins.fromJSON '''" + jq . < "$filesystemsPath" + echo "'''" + ) > $out + + nixpkgs-fmt $out + ''; + + mergedConfig = + if configFile == null + then fileSystemsCfgFile + else + pkgs.runCommand "configuration.nix" { + buildInputs = with pkgs; [ nixpkgs-fmt ]; + } + '' + ( + echo '{ imports = [' + printf "(%s)\n" "$(cat ${fileSystemsCfgFile})"; + printf "(%s)\n" "$(cat ${configFile})"; + echo ']; }' + ) > $out + + nixpkgs-fmt $out + ''; + + image = ( + pkgs.vmTools.override { + rootModules = + [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ + (pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"); + kernel = modulesTree; + } + ).runInLinuxVM ( + pkgs.runCommand name + { + QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report" + + " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report"; + preVM = '' + PATH=$PATH:${pkgs.qemu_kvm}/bin + mkdir $out + bootDiskImage=boot.raw + qemu-img create -f raw $bootDiskImage ${toString bootSize}M + + rootDiskImage=root.raw + qemu-img create -f raw $rootDiskImage ${toString rootSize}M + ''; + + postVM = '' + ${if formatOpt == "raw" then '' + mv $bootDiskImage $out/${bootFilename} + mv $rootDiskImage $out/${rootFilename} + '' else '' + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ''} + bootDiskImage=$out/${bootFilename} + rootDiskImage=$out/${rootFilename} + set -x + ${postVM} + ''; + } '' + export PATH=${tools}:$PATH + set -x + + cp -sv /dev/vda /dev/sda + cp -sv /dev/vda /dev/xvda + + parted --script /dev/vda -- \ + mklabel gpt \ + mkpart no-fs 1MiB 2MiB \ + set 1 bios_grub on \ + align-check optimal 1 \ + mkpart ESP fat32 2MiB -1MiB \ + align-check optimal 2 \ + print + + sfdisk --dump /dev/vda + + + zpool create \ + ${stringifyProperties " -o" rootPoolProperties} \ + ${stringifyProperties " -O" rootPoolFilesystemProperties} \ + ${rootPoolName} /dev/vdb + parted --script /dev/vdb -- print + + ${createDatasets} + ${mountDatasets} + + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda2 + mount /dev/vda2 /mnt/boot + + mount + + # Install a configuration.nix + mkdir -p /mnt/etc/nixos + # `cat` so it is mutable on the fs + cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix + + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + nixos-install \ + --root /mnt \ + --no-root-passwd \ + --system ${config.system.build.toplevel} \ + --substituters "" \ + ${lib.optionalString includeChannel ''--channel ${channelSources}''} + + df -h + + umount /mnt/boot + ${unmountDatasets} + + zpool export ${rootPoolName} + '' + ); +in +image From bd38b059eae05871579b2dfd51cd41d058b6a1ec Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:46 -0400 Subject: [PATCH 237/239] NixOS/amazonImageZfs: init Introduce an AWS EC2 AMI which supports aarch64 and x86_64 with a ZFS root. This uses `make-zfs-image` which implies two EBS volumes are needed inside EC2, one for boot, one for root. It should not matter which is identified `xvda` and which is `xvdb`, though I have always uploaded `boot` as `xvda`. --- .../scripts/ec2/amazon-image-zfs.nix | 12 ++ .../maintainers/scripts/ec2/amazon-image.nix | 103 +++++++++++++----- nixos/modules/virtualisation/amazon-image.nix | 10 +- .../modules/virtualisation/amazon-options.nix | 54 ++++++++- nixos/release.nix | 14 +++ 5 files changed, 165 insertions(+), 28 deletions(-) create mode 100644 nixos/maintainers/scripts/ec2/amazon-image-zfs.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix b/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix new file mode 100644 index 000000000000..32dd96a7cb7e --- /dev/null +++ b/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix @@ -0,0 +1,12 @@ +{ + imports = [ ./amazon-image.nix ]; + ec2.zfs = { + enable = true; + datasets = { + "tank/system/root".mount = "/"; + "tank/system/var".mount = "/var"; + "tank/local/nix".mount = "/nix"; + "tank/user/home".mount = "/home"; + }; + }; +} diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 677aff4421e0..cb9fbfd86039 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.amazonImage; + in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; @@ -53,15 +54,7 @@ in { }; }; - config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { - inherit lib config; - inherit (cfg) contents format name; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitionTableType = if config.ec2.efi then "efi" - else if config.ec2.hvm then "legacy+gpt" - else "none"; - diskSize = cfg.sizeMB; - fsType = "ext4"; + config.system.build.amazonImage = let configFile = pkgs.writeText "configuration.nix" '' { modulesPath, ... }: { @@ -72,24 +65,84 @@ in { ${optionalString config.ec2.efi '' ec2.efi = true; ''} + ${optionalString config.ec2.zfs.enable '' + ec2.zfs.enable = true; + networking.hostId = "${config.networking.hostId}"; + ''} } ''; - postVM = '' - extension=''${diskImage##*.} - friendlyName=$out/${cfg.name}.$extension - mv "$diskImage" "$friendlyName" - diskImage=$friendlyName - mkdir -p $out/nix-support - echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + zfsBuilder = import ../../../lib/make-zfs-image.nix { + inherit lib config configFile; + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg file "$diskImage" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json - ''; - }; + includeChannel = true; + + bootSize = 1000; # 1G is the minimum EBS volume + + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; + }; + + datasets = config.ec2.zfs.datasets; + + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" + + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '$ARGS.named' \ + > $out/nix-support/image-info.json + ''; + }; + + extBuilder = import ../../../lib/make-disk-image.nix { + inherit lib config configFile; + + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + + fsType = "ext4"; + partitionTableType = if config.ec2.efi then "efi" + else if config.ec2.hvm then "legacy+gpt" + else "none"; + + diskSize = cfg.sizeMB; + + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName + + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg file "$diskImage" \ + '$ARGS.named' \ + > $out/nix-support/image-info.json + ''; + }; + in if config.ec2.zfs.enable then zfsBuilder else extBuilder; } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index bf5c04543a70..fe248a94488b 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -41,17 +41,23 @@ in boot.growPartition = cfg.hvm; - fileSystems."/" = { + fileSystems."/" = mkIf (!cfg.zfs.enable) { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; autoResize = true; }; - fileSystems."/boot" = mkIf cfg.efi { + fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) { + # The ZFS image uses a partition labeled ESP whether or not we're + # booting with EFI. device = "/dev/disk/by-label/ESP"; fsType = "vfat"; }; + services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; + + boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; + boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 2e807131e938..698edcd835a6 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -1,7 +1,46 @@ { config, lib, pkgs, ... }: -{ +let + inherit (lib) types; +in { options = { ec2 = { + zfs = { + enable = lib.mkOption { + default = false; + internal = true; + description = '' + Whether the EC2 instance uses a ZFS root. + ''; + }; + + datasets = lib.mkOption { + description = '' + Datasets to create under the `tank` and `boot` zpools. + + **NOTE:** This option is used only at image creation time, and + does not attempt to declaratively create or manage datasets + on an existing system. + ''; + + default = {}; + + type = types.attrsOf (types.submodule { + options = { + mount = lib.mkOption { + description = "Where to mount this dataset."; + type = types.nullOr types.string; + default = null; + }; + + properties = lib.mkOption { + description = "Properties to set on this dataset."; + type = types.attrsOf types.string; + default = {}; + }; + }; + }); + }; + }; hvm = lib.mkOption { default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; @@ -18,4 +57,17 @@ }; }; }; + + config = lib.mkIf config.ec2.zfs.enable { + networking.hostId = lib.mkDefault "00000000"; + + fileSystems = let + mountable = lib.filterAttrs (_: value: ((value.mount or null) != null)) config.ec2.zfs.datasets; + in lib.mapAttrs' + (dataset: opts: lib.nameValuePair opts.mount { + device = dataset; + fsType = "zfs"; + }) + mountable; + }; } diff --git a/nixos/release.nix b/nixos/release.nix index 2367e79e4ad0..264d82bacc8a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -217,6 +217,20 @@ in rec { }).config.system.build.amazonImage) ); + amazonImageZfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/ec2/amazon-image-zfs.nix + ]; + }).config.system.build.amazonImage) + + ); # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test From 71b3d18181974523ef7264106a4bf213a3103439 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 25 Aug 2021 09:38:55 -0400 Subject: [PATCH 238/239] amazon images: extend the image-info.json to have a disks object Having a disks object with a dictionary of all the disks and their properties makes it easier to process multi-disk images. Note the rename of `label` to `system_label` is because `$label`i is something of a special token to jq. --- .../maintainers/scripts/ec2/amazon-image.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cb9fbfd86039..6942b58f236e 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -102,14 +102,20 @@ in { echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg root "$rootDisk" \ --arg boot "$bootDisk" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json + '{} + | .label = $system_label + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json ''; }; @@ -136,12 +142,18 @@ in { echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ --arg file "$diskImage" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json + '{} + | .label = $system_label + | .system = $system + | .logical_bytes = $logical_bytes + | .file = $file + | .disks.root.logical_bytes = $logical_bytes + | .disks.root.file = $file + ' > $out/nix-support/image-info.json ''; }; in if config.ec2.zfs.enable then zfsBuilder else extBuilder; From 4ffe91a29d5713c3d4b1f6faf1afe56431ee66c5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 24 Aug 2021 20:42:00 -0700 Subject: [PATCH 239/239] qtile: restore derivation name --- pkgs/applications/window-managers/qtile/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index cd7b5a159e2a..ae62cdbbba14 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -10,7 +10,7 @@ let pythonPackages = python.pkgs; unwrapped = pythonPackages.buildPythonPackage rec { - name = "qtile-${version}"; + pname = "qtile"; version = "0.18.0"; src = fetchFromGitHub { @@ -61,6 +61,8 @@ let }; in (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; })