diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-18 00:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-18 00:01:24 +0000 |
commit | 382fdc7ad3184c7d47f54feb535a970fe64a0f35 (patch) | |
tree | e6488db2914676e85250ee12633c8ddf45b7f67b /pkgs/applications/networking | |
parent | c2d4ce2808616d558b6cef8a6d270c4930b06c18 (diff) | |
parent | 688b4cb03efd8bd6bd0796297a8738f8f91a5ff6 (diff) | |
download | nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.gz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.bz2 nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.lz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.xz nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.tar.zst nixpkgs-382fdc7ad3184c7d47f54feb535a970fe64a0f35.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 03f0bf63818..122433d197a 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/baresip-.*[.]tar[.].*"; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 42ea1c52fa9..db30ede8a10 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -54,6 +54,5 @@ mkDerivation rec { maintainers = with maintainers; [ colemickens ]; broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index e3595e07a78..33f3b90873d 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Perl Console Twitter Client"; homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index f918cbdc2b8..31b37fc2dfb 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -42,6 +42,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 3969627a67a..5bbdc6460c6 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -60,6 +60,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index d66dcbf47c1..e9e5fb5f70e 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; - inherit version; - longDescription = '' A simple command line tool to check for new mail in local mbox and maildir and remote POP3 and IMAP mailboxes. |