diff options
Diffstat (limited to 'pkgs/applications/networking')
46 files changed, 531 insertions, 233 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index aa77bae2d2313..acc11144def90 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "95.0.4638.54", - "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", - "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a", + "version": "95.0.4638.69", + "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", + "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", "deps": { "gn": { "version": "2021-08-11", @@ -12,15 +12,15 @@ } }, "chromedriver": { - "version": "95.0.4638.17", - "sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q", - "sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8" + "version": "95.0.4638.54", + "sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk", + "sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l" } }, "beta": { - "version": "96.0.4664.18", - "sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf", - "sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi", + "version": "96.0.4664.27", + "sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6", + "sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7", "deps": { "gn": { "version": "2021-09-24", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "97.0.4676.0", - "sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5", - "sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh", + "version": "97.0.4682.3", + "sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4", + "sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a", "deps": { "gn": { "version": "2021-10-08", @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "95.0.4638.54", - "sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry", - "sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a", + "version": "95.0.4638.69", + "sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq", + "sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp", "deps": { "gn": { "version": "2021-08-11", @@ -55,8 +55,8 @@ "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "95.0.4638.54-1", - "sha256": "01jkkz5224aaj5cgdmqknf8v73fyaw4q8bzbqa520a0lvl7hwbg5" + "rev": "95.0.4638.69-1", + "sha256": "19azr4m4rd6za9vgcggijyq9x54jrjp0n07y4falgjrdz9q4f7aj" } } } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 50ada47a44463..dbe25ea06a945 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-/VsxMpITBDKJqyMwl1oitS8aUM4AziibV/OHRSHbRjg="; + sha256 = "sha256-vyzuMU2Qfz8DMRP0+QQmSx8J40ADTMJqg2jQOZJQxUA="; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 91ccf67f55796..4e4d47733c7ca 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.2"; - commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e"; + version = "2.1.6"; + commit = "a346cf933e10d872eae26bff8e58c5e7ac40db25"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596"; + sha256 = "sha256-8DeVO7Wr1bFZXTp2kaEPizDwNU5ZsA1fykccaDUivh8="; }; vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 5984710d8c292..2351b41369ebd 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "05qc1fcf4ahl1zvxv92mq3awiy5b1rq6r9l896b4hkp0m5lx9m3c"; + sha256 = "sha256-vIm5PkRyh41jtvDrLDxFVzSkhFipYYYEEY0/qxbOXGE="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 0867306e2f944..06a8f162ccbf4 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.19.1"; - sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0"; - manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95"; + version = "0.20.0"; + sha256 = "06n4d7l00lmrrs7s41mjfk06c0cj04v0s0mbs9b3ppzbws07wca5"; + manifestsSha256 = "03hfnqc19n3iz47a5137lmwq4mgd6dxcl6ml057kq1bxm2qsq3y4"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -23,7 +23,7 @@ buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g="; + vendorSha256 = "sha256-WkPdBipgEOBy0qjPaX7zGfspWfCtiFB1MUMHLlHGB/U="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index aa0abbae4293b..47da659d7e1f3 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.5"; + version = "3.7.7"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-QJXCVcEf23oaTDemoCV/2aaajbubfXg0AfZrlSTS4Ag="; + sha256 = "sha256-duNkvRMq3CKAGDDsrDWKydFZRt6fxuO0uP2Ff3HA+ek="; }; vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 51dced0af2805..958640af659b3 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.11.0"; - sha256 = "172in8vmr7c5sff111rrd5127lz2pv7bbh7p399xafnk8ri0fx2i"; + version = "2.11.1"; + sha256 = "09zwxcaqn537ls737js7rcsqarapw5k25gv41d844k73yvxm882c"; vendorSha256 = "sha256-c3EyVrblqtFuoP7+YdbyPN0DdN6TcQ5DTtFQ/frKM0Q="; } diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index b82b6cf610de9..13d15d0bf6188 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "981a3ffd4368600eb1a5bca3f12a251e80895d37"; +let rev = "08bb70f407d0334fa80b9dbc6850987f16eb27d3"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.53.2"; # Do not forget to update `rev` above + version = "0.54.0"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,10 +17,10 @@ buildGoModule rec { ]; src = fetchFromGitHub { - sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; - rev = "v${version}"; - repo = "sonobuoy"; owner = "vmware-tanzu"; + repo = "sonobuoy"; + rev = "v${version}"; + sha256 = "sha256-Gtpky+zkFKukIIHF91F4uBZjaguk8KlOEVhSwTj+ccs="; }; vendorSha256 = "sha256-Lkwv95BZa7nFEXk1KcwXIRVpj9DZmqnWjkdrZkO/k24="; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 44ceb3f16227d..50efacfd62ef4 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PzGlEEhootf2SCOy7+11aST7NMTNhNMQWeZO40mrMYQ="; + sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E="; }; - vendorSha256 = "sha256-T/jgFPBUQMATX7DoWsDR/VFjka7Vxk7F4taE25cdnTk="; + vendorSha256 = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 54959e4583148..35493aa31b7aa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -57,6 +57,7 @@ let libvirt = callPackage ./libvirt { }; linuxbox = callPackage ./linuxbox { }; lxd = callPackage ./lxd { }; + teleport = callPackage ./teleport { }; vpsadmin = callPackage ./vpsadmin { }; vercel = callPackage ./vercel { }; } // (lib.optionalAttrs (config.allowAliases or false) { diff --git a/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix b/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix new file mode 100644 index 0000000000000..733d154087469 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "terraform-provider-teleport"; + version = "7.3.0"; + + src = fetchFromGitHub { + owner = "gravitational"; + repo = "teleport-plugins"; + rev = "v${version}"; + sha256 = "19zn78nn64gc0nm7ycblzi4549a0asql07pfxvrphi6s9fjr5m3y"; + }; + vendorSha256 = null; + + sourceRoot = "source/terraform"; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = '' + mv $NIX_BUILD_TOP/go/bin/{terraform,terraform-provider-teleport_v${version}} + ''; + + passthru.provider-source-address = "gravitational.com/teleport/teleport"; + + meta = with lib; { + description = "Provider for managing resources in Teleport, a SSH CA management suite"; + homepage = "https://github.com/gravitational/teleport-plugins"; + license = licenses.asl20; + maintainers = with maintainers; [ justinas ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ba034056c95d2..8dfc8c701e3ab 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.9"; - sha256 = "0g97l53xrcafjrzz5inij4q4aaadibn5ilr5j39a6569pkvcvsh3"; + version = "1.0.10"; + sha256 = "1jcgp9q99785m85754ipza7b3dd3g58adpnyh5w2imqj01cas6mb"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e07b9b88ddc4d..f2ae9a9490aa3 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.1"; + version = "0.35.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DCum3vCrN530Z0VW0WEoLtjN+kre/mU9O+sJxckZgfc="; + sha256 = "sha256-VUB1zZwRZ+TUFDcq/lBB9eAeM7d5zWhFy7nxzH5S6oc="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 289f631ee8fb1..65835aa10cf3f 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "0qb10w7pn9hiczjjpc0xanmc83p22ngcqcrkjwji5rl0sh8v9ii4"; + sha256 = "sha256-TAnGDxTKYl4niouS6nYdJDaIngAPsPHr9Bw9L3cR2Xk="; }; - cargoSha256 = "0vhr8qyw4f3lc208mgl1m3z42igkbwly6wcv7g7jrq3c6dcwyhjn"; + cargoSha256 = "sha256-MxoyYBLbrCuLVa0p8JrYKSKu2oFPnXMwab42lhhAu48="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 7fd2a9684ae78..c3c58dc075687 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.0.2"; + version = "4.0.4"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-Q2yVprIB8YeB8bCAau1H2m8QOidX1RrMIRET/fXyNi4="; + sha256 = "sha256-c6+SlZx3ACG0nJRW+zcDDzVd/oSLAdSaq2fHrPpt6zw="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 96ed5a86a1694..22fd08e3f4a87 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.1.140"; + version = "3.1.149"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "15ngmpqqx902l7gxg2lb6h8q8vmjk247jbqhc92l1apr1imjqcc5"; + sha256 = "1yrb8cfrc6y7gpfgzn0q6ldx9vk06qp229wjs4q8rccp72p6d6gg"; }; postPatch = '' @@ -32,38 +32,36 @@ python3Packages.buildPythonApplication rec { # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4 - cherrypy - colorama - colorclass feedparser - flask-compress - flask-cors - flask_login - flask-restful - flask-restx - flask - greenlet guessit html5lib jinja2 jsonschema loguru more-itertools - progressbar + psutil pynzb - pyparsing PyRSS2Gen python-dateutil pyyaml rebulk requests + rich rpyc - sgmllib3k sqlalchemy - terminaltables + + # WebUI requirements + cherrypy + flask-compress + flask-cors + flask_login + flask-restful + flask-restx + flask + pyparsing zxcvbn - psutil - # plugins + + # Plugins requirements transmission-rpc ]; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index 3e0a20a371c78..8d0b9915d0d7d 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -14,6 +15,17 @@ buildGoModule rec { sha256 = "sha256-1gOixuOvPHEjnnDNNda9sktnhffovOfeG4XDrLRRMlE="; }; + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd gmailctl \ + --bash <($out/bin/gmailctl completion bash) \ + --fish <($out/bin/gmailctl completion fish) \ + --zsh <($out/bin/gmailctl completion zsh) + ''; + vendorSha256 = "sha256-Yv3OGHFOmenst/ujUgvCaSEjwwBf3W9n+55ztVhuWjo="; doCheck = false; diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 89c04508b70f3..037feccca4ed6 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.6"; + version = "0.1.7"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,10 +10,10 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg="; + sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A="; }; - vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI="; + vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index ced3dcf5fe481..2b6cb9969e82a 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "1vjzv8zg9s393xw81klcgbkn4h6j2blzla9iil5kqfrw7wmldskh"; + sha256 = "1337qkpcv7j0fgws9scnk82mn2l7s17060vmrbh3ihinmxmbxg6x"; }; buildInputs = [ @@ -57,9 +57,6 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ xvfb-run dbus.daemon ]; checkPhase = '' - # https://dev.gajim.org/gajim/gajim/-/issues/10478 - rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py - xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ ${python3.interpreter} setup.py test diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 10cbcb6c1d298..8af6811d6a58c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, imagemagick, gettext, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; - version = "unstable-2018-04-10"; + version = "unstable-2021-10-17"; src = fetchFromGitHub { owner = "EionRobb"; repo = "purple-discord"; - rev = "9a97886d15a1f028de54b5e6fc54e784531063b0"; - sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; + rev = "b7ac72399218d2ce011ac84bb171b572560aa2d2"; + sha256 = "0xvj9rdvgsvcr55sk9m40y07rchg699l1yr98xqwx7sc2sba3814"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ imagemagick gettext ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 341d9e1d840c2..a7ea5bee30891 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -10,6 +10,7 @@ , gnutls ? null , libgcrypt ? null , plugins, symlinkJoin +, cacert }: # FIXME: clean the mess around choosing the SSL library (nss by default) @@ -59,6 +60,7 @@ let unwrapped = stdenv.mkDerivation rec { "--with-nss-includes=${nss.dev}/include/nss" "--with-nss-libs=${nss.out}/lib" "--with-ncurses-headers=${ncurses.dev}/include" + "--with-system-ssl-certs=${cacert}/etc/ssl/certs" "--disable-meanwhile" "--disable-nm" "--disable-tcl" diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 359c0fa7aac50..268a077e7c5bb 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -3,7 +3,6 @@ , lib , fetchFromGitHub , cmake -, qtbase , qtquickcontrols , qtquickcontrols2 , qtkeychain @@ -15,19 +14,17 @@ mkDerivation rec { pname = "quaternion"; - version = "0.0.95"; + version = "0.0.95.1"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "sha256-WqhHqo4ySxufulC+TxS2ko2R5hUiORgdNAkp5Awdcw8="; + sha256 = "sha256-6FLj/hVY13WO7sMgHCHV57eMJu39cwQHXQX7m0lmv4I="; }; buildInputs = [ - qtbase qtmultimedia - qtquickcontrols qtquickcontrols2 qtkeychain libquotient @@ -47,11 +44,10 @@ mkDerivation rec { ''; meta = with lib; { - description = - "Cross-platform desktop IM client for the Matrix protocol"; + description = "Cross-platform desktop IM client for the Matrix protocol"; homepage = "https://matrix.org/docs/projects/client/quaternion.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; + inherit (qtquickcontrols2.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json new file mode 100644 index 0000000000000..299598063c012 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -0,0 +1,6 @@ +{ + "version": "1.9.0-sc.1", + "srcHash": "10swz5gwz1izryzllmjm8mhhd0vqk2cp8qjcmmr5gbzspj7p3xgw", + "webYarnHash": "134llyh0197andpnbmfcxnidcgi3xxnb9v10bwfvrqysgnhb5z8v", + "desktopYarnHash": "150jc6p9kbdz599bdkinrhbhncpamhz35j6rcc008qxg2d9qfhwr" +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix new file mode 100644 index 0000000000000..4e1d330f50009 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -0,0 +1,128 @@ +{ lib +, element-desktop # for seshat and keytar +, schildichat-web +, stdenv +, fetchgit +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, fetchYarnDeps +, yarn, nodejs, fixup_yarn_lock +, electron +, Security +, AppKit +, CoreServices + +, useWayland ? false +}: + +let + pinData = lib.importJSON ./pin.json; + executableName = "schildichat-desktop"; + electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; +in +stdenv.mkDerivation rec { + pname = "schildichat-desktop"; + inherit (pinData) version; + + src = fetchgit { + url = "https://github.com/SchildiChat/schildichat-desktop/"; + rev = "v${version}"; + sha256 = pinData.srcHash; + fetchSubmodules = true; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/element-desktop/yarn.lock"; + sha256 = pinData.desktopYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper copyDesktopItems ]; + inherit (element-desktop) seshat keytar; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + pushd element-desktop + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + rm -rf node_modules/matrix-seshat node_modules/keytar + ln -s $keytar node_modules/keytar + ln -s $seshat node_modules/matrix-seshat + patchShebangs node_modules/ + popd + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd element-desktop + npx tsc + yarn run i18n + node ./scripts/copy-res.js + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # resources + mkdir -p "$out/share/element" + ln -s '${schildichat-web}' "$out/share/element/webapp" + mv element-desktop "$out/share/element/electron" + cp -r "$out/share/element/electron/res/img" "$out/share/element" + cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json + ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json + + # icons + for icon in $out/share/element/electron/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/schildichat.png" + done + + # executable wrapper + makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for element-web again. + # note: `doDist = false;` does not work. + distPhase = ";"; + + # The desktop item properties should be kept in sync with data from upstream: + # https://github.com/schildichat/element-desktop/blob/sc/package.json + desktopItems = [ + (makeDesktopItem { + name = "schildichat-desktop"; + exec = "${executableName} %u"; + icon = "schildichat"; + desktopName = "SchildiChat"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass=schildichat + MimeType=x-scheme-handler/element; + ''; + }) + ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Matrix client / Element Desktop fork"; + homepage = "https://schildi.chat/"; + changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix new file mode 100644 index 0000000000000..015c44e428bd1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -0,0 +1,86 @@ +{ stdenv, lib +, fetchgit +, fetchYarnDeps +, nodejs +, yarn +, fixup_yarn_lock +, writeText, jq, conf ? {} +}: + +let + pinData = builtins.fromJSON (builtins.readFile ./pin.json); + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + }; + configOverrides = writeText "element-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { + pname = "schildichat-web"; + inherit (pinData) version; + + src = fetchgit { + url = "https://github.com/SchildiChat/schildichat-desktop/"; + rev = "v${version}"; + sha256 = pinData.srcHash; + fetchSubmodules = true; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/element-web/yarn.lock"; + sha256 = pinData.webYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$PWD/tmp + mkdir -p $HOME + pushd element-web + yarn config --offline set yarn-offline-mirror $offlineCache + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + rm -rf node_modules/matrix-react-sdk + patchShebangs node_modules/ ../matrix-react-sdk/scripts/ + ln -s $PWD/../matrix-react-sdk node_modules/ + ln -s $PWD/node_modules ../matrix-react-sdk/ + popd + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + pushd matrix-react-sdk + node_modules/.bin/reskindex -h ../element-web/src/header + popd + + pushd element-web + node scripts/copy-res.js + node_modules/.bin/reskindex -h ../element-web/src/header + node_modules/.bin/webpack --progress --mode production + popd + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mv element-web/webapp $out + jq -s '.[0] * .[1]' "configs/sc/config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + + meta = { + description = "Matrix client / Element Web fork"; + homepage = "https://schildi.chat/"; + changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh new file mode 100755 index 0000000000000..3f5289de8c4ed --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq + +if [[ "$#" -gt 1 || "$1" == -* ]]; then + echo "Regenerates packaging data for the SchildiChat packages." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +# strip leading "v" +version="${version#v}" + +src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version}) +src=$(echo $src_data | jq -r .path) +src_hash=$(echo $src_data | jq -r .sha256) + +web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) +desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) + +cat > pin.json << EOF +{ + "version": "$version", + "srcHash": "$src_hash", + "webYarnHash": "$web_yarn_hash", + "desktopYarnHash": "$desktop_yarn_hash" +} +EOF diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index ea5ca8bebfaa1..e83e45370cd8f 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.7.3"; + version = "1.7.4"; in appimageTools.wrapType2 { name = "session-desktop-appimage-${version}"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "0s0zvj9ddrngdzsx8hd07pq3150sq8ab1hbpsi9i2ir99sv1p7gn"; + sha256 = "1yjah9ip3r2irvv2g9j0ql55nkmpwml7lngmq954xrkq9smrdrm5"; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 49e8227b21f12..01a214bed2331 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -10,6 +10,7 @@ , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" # For a full list of available languages: # $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' +, sqlcipher }: let @@ -21,9 +22,43 @@ let in lib.optionalString (spellcheckerLanguage != null) '' --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ --set LC_MESSAGES "${spellcheckerLanguage}"''); + + sqlcipher-signal = sqlcipher.overrideAttrs (_: { + # Using the same features as the upstream signal sqlcipher build + # https://github.com/signalapp/better-sqlite3/blob/2fa02d2484e9f9a10df5ac7ea4617fb2dff30006/deps/defines.gypi + CFLAGS = [ + "-DSQLITE_LIKE_DOESNT_MATCH_BLOBS" + "-DSQLITE_THREADSAFE=2" + "-DSQLITE_USE_URI=0" + "-DSQLITE_DEFAULT_MEMSTATUS=0" + "-DSQLITE_OMIT_DEPRECATED" + "-DSQLITE_OMIT_GET_TABLE" + "-DSQLITE_OMIT_TCL_VARIABLE" + "-DSQLITE_OMIT_PROGRESS_CALLBACK" + "-DSQLITE_OMIT_SHARED_CACHE" + "-DSQLITE_TRACE_SIZE_LIMIT=32" + "-DSQLITE_DEFAULT_CACHE_SIZE=-16000" + "-DSQLITE_DEFAULT_FOREIGN_KEYS=1" + "-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1" + "-DSQLITE_ENABLE_COLUMN_METADATA" + "-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT" + "-DSQLITE_ENABLE_STAT4" + "-DSQLITE_ENABLE_FTS5" + "-DSQLITE_ENABLE_JSON1" + "-DSQLITE_ENABLE_RTREE" + "-DSQLITE_INTROSPECTION_PRAGMAS" + + # SQLCipher-specific options + "-DSQLITE_HAS_CODEC" + "-DSQLITE_TEMP_STORE=2" + "-DSQLITE_SECURE_DELETE" + ]; + + LDFLAGS = [ "-lm" ]; + }); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.21.0"; # Please backport all updates to the stable channel. + version = "5.22.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +68,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "19bp5gjf13n87cyicqaikmz3bdx6szazq1kbp4gkyhq0mw7nah7c"; + sha256 = "1y88qw57wk187fjb05zqvagv4pamc8171xwvznqb2k0vclsg82j8"; }; nativeBuildInputs = [ @@ -115,15 +150,10 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - # Required for $SQLCIPHER_LIB which contains "/build/" inside the path: - noAuditTmpdir = true; - preFixup = '' - export SQLCIPHER_LIB="$out/lib/Signal/resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node" - test -x "$SQLCIPHER_LIB" # To ensure the location hasn't changed gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" - --prefix LD_PRELOAD : "$SQLCIPHER_LIB" + --prefix LD_PRELOAD : "${sqlcipher-signal}/lib/libsqlcipher.so" ${customLanguageWrapperArgs} ) diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index a26fbed2a0490..649cc8843d2eb 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl , makeWrapper }: let pname = "signald"; + version = "0.14.1"; - version = "0.13.1"; - - # This package uses the .git directory - src = fetchgit { - url = "https://gitlab.com/signald/signald"; + src = fetchFromGitLab { + owner = pname; + repo = pname; rev = version; - sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7"; - leaveDotGit = true; + sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA="; }; buildConfigJar = fetchurl { @@ -19,8 +17,6 @@ let sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; }; - patches = [ ./git-describe-always.patch ./gradle-plugin.patch ]; - postPatch = '' patchShebangs gradlew sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle @@ -29,7 +25,7 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { name = "${pname}-deps"; - inherit src version postPatch patches; + inherit src version postPatch; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -45,11 +41,17 @@ let forceShare = [ "dummy" ]; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7"; + # Downloaded jars differ by platform + outputHash = { + x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM="; + aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A="; + }.${stdenv.system} or (throw "Unsupported platform"); }; in stdenv.mkDerivation rec { - inherit pname src version postPatch patches; + inherit pname src version postPatch; + + patches = [ ./gradle-plugin.patch ]; buildPhase = '' runHook preBuild @@ -90,6 +92,6 @@ in stdenv.mkDerivation rec { homepage = "https://signald.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch b/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch deleted file mode 100644 index 2f4830e27dd56..0000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/version.sh b/version.sh -index 7aeeb3c..060cba3 100755 ---- a/version.sh -+++ b/version.sh -@@ -1,3 +1,3 @@ - #!/bin/sh --VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count) -+VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count) - echo $VERSION diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch index 6952654758d36..fec988a94e735 100644 --- a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch @@ -2,7 +2,7 @@ diff --git a/build.gradle b/build.gradle index 11d7a99..66805bb 100644 --- a/build.gradle +++ b/build.gradle -@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal +@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.xml.sax.SAXParseException @@ -17,10 +17,3 @@ index 11d7a99..66805bb 100644 apply plugin: 'java' apply plugin: 'application' -@@ -185,4 +188,4 @@ task integrationTest(type: Test) { - testClassesDirs = sourceSets.integrationTest.output.classesDirs - classpath = sourceSets.integrationTest.runtimeClasspath - outputs.upToDateWhen { false } --} -\ No newline at end of file -+} diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index e7ca8c320ac60..7cb9798517dbf 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tangram"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - sha256 = "0bhs9s6c2k06i3cx01h2102lgl7g6vxm3k63jkkhh2bwdpc9kvn3"; + sha256 = "sha256-WI0H3bforQ6Jc/+TWFT1zUs4KRtWwvXY2/va+Fnd+iU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index e5a2c201d873d..4392f5879954c 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "utox"; - version = "0.17.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index baad7602cf059..432544c60c6cd 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.0"; + version = "3.42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq"; + sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 564a4c5499ea7..34b25c17a2548 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.0"; + version = "3.42.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8"; + sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 5eeec874deeb6..6d5ab96b4edc8 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib +, fetchpatch }: stdenv.mkDerivation rec { - version = "20211022"; + version = "20211029"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-gPMbl+g9tU7YmT3uJoJozCdDBb/4eFyVyvHdREK1Ss0="; + sha256 = "sha256-haPDZorAfKuIEMiBCXJRMALAYnurQyjmCSOnj9IsoKk="; }; buildInputs = [ @@ -24,6 +25,15 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m ]; + patches = [ + # Remove on next update, see + # https://github.com/NixOS/nixpkgs/pull/143641#issuecomment-954991746 for context. + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/4242a31313e0b600693215c01047bbda8a6dd25a.patch"; + sha256 = "sha256-fcuNeBkPjqln5QA9VFcfXCQD/VrUoSEMSxQ//Xj+yxY="; + }) + ]; + enableParallelBuilding = true; postPatch = '' diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 19354df40adf5..4b357324889d5 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.88.4"; + version = "3.89.5"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-UOb63+NfW6mHKaj3PDEzvz5hcmJBIISq02rtwgSZMjo="; + sha256 = "sha256-DBqeLoHPr/OwiA3cWO5MYoHSBqrEmP8j8q+rd50hYH8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index a14e55e51f298..e2bf0b134d542 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.15"; + version = "1.4.16"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-P1KytdS8WO2TzwsRRs7k903oHCwHol7gMu+mWUZaAnA="; + sha256 = "sha256-hw61cerm0j+5KtDITXnenDjF9iTjYUk31XS/5Jumh/k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 884e5a644fc05..d87d23be429cc 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.17"; + version = "1.8.18"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-D92+dMGp3PZGG0obDbPk00JmGEUAxAPX8QetQttOxNM="; + sha256 = "sha256-FPxirzfr3MXtGaJFoF64N27+cBYRjwDJxZS8mZ1VYKU="; }; patches = [ diff --git a/pkgs/applications/networking/p2p/rqbit/default.nix b/pkgs/applications/networking/p2p/rqbit/default.nix index 0a77a64916e1a..0220b12bd4b87 100644 --- a/pkgs/applications/networking/p2p/rqbit/default.nix +++ b/pkgs/applications/networking/p2p/rqbit/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - sha256 = "1dyf1sjfiwrrigk1186mzvx5vn196h45imvily394ky2di633av5"; + sha256 = "0b9wxjwnhhs3vi1x55isdqck67lh1r7nf3dwmhlwcg5887smwp5c"; }; - cargoSha256 = "02z5gdmir1x80axnv516hs00478c7zbb30rdsbs966yh1725w12z"; + cargoSha256 = "1s278d73mwqpq3n5vmrn5jb6g5dafaaplnhs8346pwcc6y16w3d3"; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index e5c17581cb523..01e119dafc187 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.84"; + version = "2.85"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-l3giWCMymUk5z4r4sEBZoeCh3K8jAp8TSf+xvhjeAEU="; + sha256 = "sha256-grmJ52x2NcsgXw5BWrEGF9+7TYS/45HgHUXuZB+hVK4="; }; installPhase = '' diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index ee92f4727c707..1bbf3d6554fc6 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,90 +1,54 @@ -{ lib, fetchFromGitHub, makeDesktopItem, makeWrapper, imagemagick -, python3Packages, wrapGAppsHook, protonvpn-cli, gtk3, pango -, gobject-introspection, libnotify, libappindicator-gtk3 -, procps, openvpn }: +{ lib, fetchFromGitHub, gobject-introspection, imagemagick, +wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: -let - extraPath = lib.makeBinPath [ procps openvpn ]; - -in python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-gui"; - version = "2.1.1"; + version = "1.4.1"; src = fetchFromGitHub { - owner = "protonvpn"; - repo = "linux-gui"; - rev = "v${version}"; - sha256 = "avo5/2eq53HSHCnnjtxrsmpURtHvxmLZn2BxActImGY="; - }; - - desktopItem = makeDesktopItem { - name = "ProtonVPN"; - desktopName = "ProtonVPN GUI"; - type = "Application"; - exec = "protonvpn-gui"; - icon = "protonvpn"; - categories = "Network;"; - terminal = "false"; - }; - - trayDesktopItem = makeDesktopItem { - name = "ProtonVPN Tray"; - desktopName = "ProtonVPN Tray"; - type = "Application"; - exec = "protonvpn-tray"; - icon = "protonvpn"; - categories = "Network;"; - terminal = "false"; + owner = "ProtonVPN"; + repo = "linux-app"; + rev = version; + sha256 = "sha256-08gXEKm8udgNltRdqvAMFL0pDCWZu/kfl1xGQtZPBCc="; }; - nativeBuildInputs = [ wrapGAppsHook makeWrapper imagemagick ]; - - propagatedBuildInputs = (with python3Packages; [ - pygobject3 - pycairo - requests - configparser - ]) ++ [ - protonvpn-cli - gtk3 - gobject-introspection - libnotify - libappindicator-gtk3 - ]; + strictDeps = false; - prePatch = '' - # if pkexec is used, we want to have more time to enter password - substituteInPlace linux_gui/services/login_service.py --replace 'timeout=8' 'timeout=30' - ''; + nativeBuildInputs = [ + gobject-introspection imagemagick wrapGAppsHook + ]; - postInstall = '' - # wrap binaries with extra required path - wrapProgram "$out/bin/protonvpn-tray" --prefix PATH ":" ${extraPath} - wrapProgram "$out/bin/protonvpn-gui" --prefix PATH ":" ${extraPath} + propagatedBuildInputs = with python3Packages; [ + protonvpn-nm-lib + psutil + ]; - # install desktop files - mkdir -p $out/share/applications - cp "$desktopItem/share/applications/ProtonVPN.desktop" $out/share/applications/protonvpn-gui.desktop - cp "$trayDesktopItem/share/applications/ProtonVPN Tray.desktop" $out/share/applications/protonvpn-tray.desktop + buildInputs = [ + gtk3 networkmanager webkitgtk + ]; - # create icons + postFixup = '' + # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" \ - linux_gui/resources/img/logo/protonvpn_logo.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/protonvpn.png + convert -resize $size'x'$size \ + protonvpn_gui/assets/icons/protonvpn-logo.png \ + $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png done + + install -Dm644 protonvpn.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/protonvpn.desktop \ + --replace 'protonvpn-logo' protonvpn ''; - # no tests + # Project has a dummy test doCheck = false; meta = with lib; { description = "Linux GUI for ProtonVPN, written in Python"; - homepage = "https://github.com/ProtonVPN/linux-gui"; - maintainers = with maintainers; [ offline ]; + homepage = "https://github.com/ProtonVPN/linux-app"; + maintainers = with maintainers; [ offline wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; - mainProgram = "protonvpn-gui"; }; } diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 0f76bced878a4..9f8a6dfc5761b 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-o+9twuyH9keWJriCSNkR63+xZuuOmPjoWg+Jp616CsQ="; + sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 446da4cdea32f..b0975c56b0591 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.3"; + version = "8.0.4"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "cG3OSqRhYnxlzfauQia6pM/1gu+iE5mtHTGk3kGMFH0="; + sha256 = "sha256-HIgIcw4Y/NXidCBwRMrdKojlqO8CJO+6N7s7PdBx4YQ="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,6 +29,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ eduardosm ]; + maintainers = with maintainers; [ schmittlauch ]; }; } diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 40cf26962a176..ed8a86bc9d3fd 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.63"; + version = "2.71"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU="; + sha256 = "sha256-d4Vl+HixZy7fJ8YU1fy3b2B+F/76mm0NQmFC/PDl4SY="; }; - vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE="; + vendorSha256 = "sha256-oxrOjiRxgcJ5yzQYQvLXFPHlOHMB88FThw4OCVxFOwQ="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index a5edbac135f99..b655671b52c58 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -1,16 +1,32 @@ -{ lib, stdenv, fetchFromGitLab, vala, python3, pkg-config, meson, ninja, gtk3 -, json-glib, libsoup, webkitgtk, geocode-glib, nix-update-script -, libappindicator, desktop-file-utils, appstream, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitLab +, nix-update-script +, appstream +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, glib +, gtk3 +, json-glib +, libappindicator +, libsoup +, webkitgtk +}: stdenv.mkDerivation rec { pname = "meteo"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitLab { owner = "bitseater"; repo = pname; rev = version; - sha256 = "1ll5fja0dqxcr6hrh2dk4hgw9gf8ms9bcp1ifznd21byxzyhdlr0"; + sha256 = "sha256-8v6lg66QEVFMNO8sMkh/H6ouS8359Z7gjRQQnJs+lEE="; }; nativeBuildInputs = [ @@ -25,7 +41,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - geocode-glib + glib gtk3 json-glib libappindicator @@ -44,12 +60,12 @@ stdenv.mkDerivation rec { }; }; - meta = with lib; { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bobby285271 ]; platforms = platforms.linux; + mainProgram = "com.gitlab.bitseater.meteo"; }; } |