From 840fd0a4f8d1d7cd32328b9d853b34165884fdfc Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 14 Jul 2021 19:03:58 +0200
Subject: [PATCH 01/11] doc/coding-conventions: Increase passthru test timeout
 3s -> 60s

3s is too small a margin for a loaded slow system to start a bloated
program.
This leads to problems when tests are written on decent dev hardware
but later run on build farms of potentially slower hardware,
particularly in the case of non x86.

The chance of needing the timeout is actually very small, so those
rare 57s are a reasonable price to pay for fewer timeouts on build
farms, each of which should be investigated and usually fixed by
increasing the timeout.
---
 doc/contributing/coding-conventions.chapter.md | 2 +-
 pkgs/tools/misc/phoronix-test-suite/tests.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md
index e42ba512b98f..240260105c3b 100644
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -568,7 +568,7 @@ let
   inherit (phoronix-test-suite) pname version;
 in
 
-runCommand "${pname}-tests" { meta.timeout = 3; }
+runCommand "${pname}-tests" { meta.timeout = 60; }
   ''
     # automatic initial setup to prevent interactive questions
     ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null
diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/tools/misc/phoronix-test-suite/tests.nix
index 06bd9def9aa6..85249c1242ff 100644
--- a/pkgs/tools/misc/phoronix-test-suite/tests.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/tests.nix
@@ -4,7 +4,7 @@ let
   inherit (phoronix-test-suite) pname version;
 in
 
-runCommand "${pname}-tests" { meta.timeout = 3; }
+runCommand "${pname}-tests" { meta.timeout = 60; }
   ''
     # automatic initial setup to prevent interactive questions
     ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null

From babb32f49204e1bdd0135dd8d68023948716343c Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 26 Jul 2021 11:36:53 +0200
Subject: [PATCH 02/11] metals: 0.10.4 -> 0.10.5

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index b85ca99a9e60..859864c37c2f 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.10.4";
+  version = "0.10.5";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q";
+    outputHash     = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b8c370fedfb161e3694619625306c8a2ae34483c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 27 Jul 2021 19:35:11 +0200
Subject: [PATCH 03/11] tools/{X11/video/virtualization}: replace name with
 pname&version

---
 pkgs/tools/X11/imwheel/default.nix                  | 5 +++--
 pkgs/tools/X11/keynav/default.nix                   | 3 ++-
 pkgs/tools/X11/x2vnc/default.nix                    | 7 ++++---
 pkgs/tools/X11/x2x/default.nix                      | 7 ++++---
 pkgs/tools/X11/xbrightness/default.nix              | 7 ++++---
 pkgs/tools/X11/xcalib/default.nix                   | 5 +++--
 pkgs/tools/X11/xchainkeys/default.nix               | 5 +++--
 pkgs/tools/X11/xdg-user-dirs/default.nix            | 5 +++--
 pkgs/tools/X11/xkbset/default.nix                   | 5 +++--
 pkgs/tools/X11/xmagnify/default.nix                 | 7 ++++---
 pkgs/tools/video/dvgrab/default.nix                 | 3 ++-
 pkgs/tools/video/mjpegtools/default.nix             | 5 +++--
 pkgs/tools/video/swfmill/default.nix                | 5 +++--
 pkgs/tools/video/vncrec/default.nix                 | 3 ++-
 pkgs/tools/virtualization/aws/default.nix           | 3 ++-
 pkgs/tools/virtualization/ec2-api-tools/default.nix | 5 +++--
 16 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/X11/imwheel/default.nix b/pkgs/tools/X11/imwheel/default.nix
index 27a545a95cdb..7aa8a6cba6a7 100644
--- a/pkgs/tools/X11/imwheel/default.nix
+++ b/pkgs/tools/X11/imwheel/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11, libXext, libXi, libXmu, libXt, libXtst }:
 
 stdenv.mkDerivation rec {
-  name = "imwheel-1.0.0pre12";
+  pname = "imwheel";
+  version = "1.0.0pre12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/imwheel/${name}.tar.gz";
+    url = "mirror://sourceforge/imwheel/imwheel-${version}.tar.gz";
     sha256 = "2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3";
   };
 
diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix
index 75b5bc2356a1..077e41b10bed 100644
--- a/pkgs/tools/X11/keynav/default.nix
+++ b/pkgs/tools/X11/keynav/default.nix
@@ -3,7 +3,8 @@
 
 let release = "20180821"; in
 stdenv.mkDerivation {
-  name = "keynav-0.${release}.0";
+  pname = "keynav";
+  version = "0.${release}.0";
 
   src = fetchFromGitHub {
     owner = "jordansissel";
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index 10519128a9d8..ed4a83fc8de0 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, xorg }:
 
-stdenv.mkDerivation {
-  name = "x2vnc-1.7.2";
+stdenv.mkDerivation rec {
+  pname = "x2vnc";
+  version = "1.7.2";
 
   src = fetchurl {
-    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz";
+    url = "https://fredrik.hubbe.net/x2vnc/x2vnc-${version}.tar.gz";
     sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
   };
 
diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix
index 01169e68f6e8..f473344ad38c 100644
--- a/pkgs/tools/X11/x2x/default.nix
+++ b/pkgs/tools/X11/x2x/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
 
-stdenv.mkDerivation {
-  name = "x2x-1.27";
+stdenv.mkDerivation rec {
+  pname = "x2x";
+  version = "1.27";
 
   src = fetchurl {
-    url = "https://github.com/downloads/dottedmag/x2x/x2x-1.27.tar.gz";
+    url = "https://github.com/downloads/dottedmag/x2x/x2x-${version}.tar.gz";
     sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
   };
 
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index 1bb95699f644..1445c60ccb19 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, imake, gccmakedep
 , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm  }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  pname = "xbrightness";
+  version = "0.3-mika-akk";
 
-  name = "xbrightness-0.3-mika-akk";
   src = fetchurl {
-    url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz";
+    url = "https://shallowsky.com/software/xbrightness/xbrightness-${version}.tar.gz";
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
   };
 
diff --git a/pkgs/tools/X11/xcalib/default.nix b/pkgs/tools/X11/xcalib/default.nix
index 78804d027917..09d5cde88fe6 100644
--- a/pkgs/tools/X11/xcalib/default.nix
+++ b/pkgs/tools/X11/xcalib/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitHub, libX11, libXxf86vm, libXext, libXrandr }:
 
 stdenv.mkDerivation rec {
-  name = "xcalib-0.10";
+  pname = "xcalib";
+  version = "0.10";
 
   src = fetchFromGitHub {
     owner = "OpenICC";
     repo = "xcalib";
-    rev = "f95abc1a551d7c695a8b142c4d9d5035368d482d";
+    rev = version;
     sha256 = "05fzdjmhiafgi2jf0k41i3nm0837a78sb6yv59cwc23nla8g0bhr";
   };
 
diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix
index 06428393b2a2..5c154f8a1116 100644
--- a/pkgs/tools/X11/xchainkeys/default.nix
+++ b/pkgs/tools/X11/xchainkeys/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xchainkeys-0.11";
+  pname = "xchainkeys";
+  version = "0.11";
 
   src = fetchurl {
-    url = "http://henning-bekel.de/download/xchainkeys/${name}.tar.gz";
+    url = "http://henning-bekel.de/download/xchainkeys/xchainkeys-${version}.tar.gz";
     sha256 = "1rpqs7h5krral08vqxwb0imy33z17v5llvrg5hy8hkl2ap7ya0mn";
   };
 
diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix
index 991b9be22389..a5eb5e0ee0ad 100644
--- a/pkgs/tools/X11/xdg-user-dirs/default.nix
+++ b/pkgs/tools/X11/xdg-user-dirs/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "xdg-user-dirs-0.17";
+  pname = "xdg-user-dirs";
+  version = "0.17";
 
   src = fetchurl {
-    url = "https://user-dirs.freedesktop.org/releases/${name}.tar.gz";
+    url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz";
     sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
   };
 
diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix
index 132b7a111220..31bcfc10d6d4 100644
--- a/pkgs/tools/X11/xkbset/default.nix
+++ b/pkgs/tools/X11/xkbset/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "xkbset-0.5";
+  pname = "xkbset";
+  version = "0.5";
 
   src = fetchurl {
-    url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz";
+    url = "http://faculty.missouri.edu/~stephen/software/xkbset/xkbset-${version}.tar.gz";
     sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172";
   };
 
diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix
index b4df0f00342f..a9cb715be396 100644
--- a/pkgs/tools/X11/xmagnify/default.nix
+++ b/pkgs/tools/X11/xmagnify/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchFromGitLab, libX11, xorgproto }:
 
-stdenv.mkDerivation {
-  name = "xmagnify-0.1.0";
+stdenv.mkDerivation rec {
+  pname = "xmagnify";
+  version = "0.1.0";
 
   src = fetchFromGitLab {
     owner = "amiloradovsky";
     repo = "magnify";
-    rev = "0.1.0";  # 56da280173e9d0bd7b3769e07ba485cb4db35869
+    rev = version;
     sha256 = "1ngnp5f5zl3v35vhbdyjpymy6mwrs0476fm5nd7dzkba7n841jdh";
   };
 
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 18088eb6c308..9f4b8832f390 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -2,7 +2,8 @@
 , libavc1394, pkg-config, autoreconfHook }:
 
 stdenv.mkDerivation {
-  name = "dvgrab-2016-05-16";
+  pname = "dvgrab";
+  version = "2016-05-16";
 
   src = fetchFromGitHub {
     # mirror of original project with some build fixes
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 45f63dc7727d..29dad791bc69 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -8,10 +8,11 @@
 # - libXxf86dga support? checking for XF86DGAQueryExtension in -lXxf86dga... no
 
 stdenv.mkDerivation rec {
-  name = "mjpegtools-2.1.0";
+  pname = "mjpegtools";
+  version = "2.1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/mjpeg/${name}.tar.gz";
+    url = "mirror://sourceforge/mjpeg/mjpegtools-${version}.tar.gz";
     sha256 = "01y4xpfdvd4zgv6fmcjny9mr1gbfd4y2i4adp657ydw6fqyi8kw6";
   };
 
diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix
index c5e777f7531e..dbad79e61ad1 100644
--- a/pkgs/tools/video/swfmill/default.nix
+++ b/pkgs/tools/video/swfmill/default.nix
@@ -3,10 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "swfmill-0.3.3";
+  pname = "swfmill";
+  version = "0.3.3";
 
   src = fetchurl {
-    url = "http://swfmill.org/releases/${name}.tar.gz";
+    url = "http://swfmill.org/releases/swfmill-${version}.tar.gz";
     sha256 = "15mcpql448vvgsbxs7wd0vdk1ln6rdcpnif6i2zjm5l4xng55s7r";
   };
 
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 5a60fc4c5d2e..02608ac16b20 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -3,7 +3,8 @@
 }:
 
 stdenv.mkDerivation {
-  name = "vncrec-0.2"; # version taken from Arch AUR
+  pname = "vncrec";
+  version = "0.2"; # version taken from Arch AUR
 
   src = fetchurl {
     url = "http://ronja.twibright.com/utils/vncrec-twibright.tgz";
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index d3a5cbf10e1a..d09e001ec6eb 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchurl, perl, curl }:
 
 stdenv.mkDerivation {
-  name = "aws-2019.06.18";
+  pname = "aws";
+  version = "2019.06.18";
 
   src = fetchurl {
     url = "https://raw.github.com/timkay/aws/ac68eb5191c52f069b9aa0c9a99808f8a4430833/aws";
diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 475b97abdcc1..babcbcfc6c33 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-api-tools-1.7.5.1";
+  pname = "ec2-api-tools";
+  version = "1.7.5.1";
 
   src = fetchurl {
-    url = "http://tarballs.nixos.org/${name}.zip";
+    url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip";
     sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5";
   };
 

From d956de3b62620b58ec5040a951fbd52acea492ca Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Fri, 30 Jul 2021 19:57:59 +0100
Subject: [PATCH 04/11] profile-cleaner: 2.41 -> 2.42

---
 pkgs/tools/misc/profile-cleaner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 59bbe2c2ab1f..0a50ff49f653 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, parallel, sqlite, bc, file }:
 
 stdenv.mkDerivation rec {
-  version = "2.41";
+  version = "2.42";
   pname = "profile-cleaner";
 
   src = fetchFromGitHub {
     owner = "graysky2";
     repo = "profile-cleaner";
     rev = "v${version}";
-    sha256 = "11sjf4j9dr6ih9jkg6vqq6gkfg6wly4182bi1008bsm1zdmm5iz7";
+    sha256 = "1d94lp91i4y896vyc7fc3ysha700cwzsdjmmmwlm6h2zp652c73y";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 20da7e698283cb15f02ce9d4ad724ad6ee64ea0f Mon Sep 17 00:00:00 2001
From: Josh Moller-Mara <jmm@cns.nyu.edu>
Date: Fri, 30 Jul 2021 14:42:15 -0700
Subject: [PATCH 05/11] obs-studio-plugins.obs-websocket: fix attribute name

obs-websocket.nix existed, but no attribute was made for it.
---
 pkgs/applications/video/obs-studio/plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index ef360487a6b1..67425e2fee04 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -5,6 +5,7 @@
   obs-move-transition = callPackage ./obs-move-transition.nix {};
   obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {};
   obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {};
+  obs-websocket = libsForQt5.callPackage ./obs-websocket.nix {};
   wlrobs = callPackage ./wlrobs.nix {};
   looking-glass-obs = callPackage ./looking-glass-obs.nix {};
 }

From 1437fd4a855f19f2b9686f9864bd22e356c02171 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 1 Aug 2021 04:02:18 -0300
Subject: [PATCH 06/11] dialog: 1.3-20210324 -> 1.3-20210621

---
 pkgs/tools/misc/dialog/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix
index 744f55aed10b..dd31fed35832 100644
--- a/pkgs/tools/misc/dialog/default.nix
+++ b/pkgs/tools/misc/dialog/default.nix
@@ -12,11 +12,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   pname = "dialog";
-  version = "1.3-20210324";
+  version = "1.3-20210621";
 
   src = fetchurl {
     url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz";
-    hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM=";
+    hash = "sha256-w68izPzZuso4QGIQjdk1ToaZCSnuJwwjnu9pUYxdp8g=";
   };
 
   buildInputs = [
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
     "--with-libtool-opts=${lib.optionalString enableShared "-shared"}"
   ];
 
-  installTargets = [ "install${lib.optionalString withLibrary "-full"}" ];
+  installTargets = [
+    "install${lib.optionalString withLibrary "-full"}"
+  ];
 
   meta = with lib; {
     homepage = "https://invisible-island.net/dialog/dialog.html";

From 0e43bf2e5c1d7960edcfdce49df6fb4b30b322a5 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Sun, 1 Aug 2021 15:54:54 +0100
Subject: [PATCH 07/11] coursera-dl: fix tests

---
 pkgs/applications/misc/coursera-dl/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix
index 954501c0b7fe..13386699ecbf 100644
--- a/pkgs/applications/misc/coursera-dl/default.nix
+++ b/pkgs/applications/misc/coursera-dl/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, glibcLocales, pandoc, python3 }:
+{ lib, fetchFromGitHub, fetchpatch, glibcLocales, pandoc, python3 }:
 
 let
   pythonPackages = python3.pkgs;
@@ -36,6 +36,13 @@ in pythonPackages.buildPythonApplication rec {
     py.test -k 'not test_get_credentials_with_keyring' .
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/coursera-dl/coursera-dl/pull/789.patch";
+      sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv";
+    })
+  ];
+
   meta = with lib; {
     description = "CLI for downloading Coursera.org videos and naming them";
     homepage = "https://github.com/coursera-dl/coursera-dl";

From a9b07d1cb70ff23d9f251e3b9323af3dd6222195 Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Sun, 1 Aug 2021 18:48:48 +0300
Subject: [PATCH 08/11] renderdoc: 1.14 -> 1.15

---
 pkgs/applications/graphics/renderdoc/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index d6a2658d8626..c48441b66c4e 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -2,6 +2,7 @@
 , qtbase, qtx11extras, qtsvg, makeWrapper
 , vulkan-loader, libglvnd, xorg, python3, python3Packages
 , bison, pcre, automake, autoconf, addOpenGLRunpath
+, waylandSupport ? false, wayland
 }:
 let
   custom_swig = fetchFromGitHub {
@@ -11,22 +12,24 @@ let
     sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
   };
   pythonPackages = python3Packages;
+  cmakeBool = b: if b then "ON" else "OFF";
 in
 mkDerivation rec {
-  version = "1.14";
+  version = "1.15";
   pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${version}";
-    sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw=";
+    sha256 = "HSWl3FC5YDIADO3h6oHxHdwsrFQKKj2zTtH2e3cc5iI=";
   };
 
   buildInputs = [
     qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
-  ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
+  ] # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2])
   # TODO: figure out how to make cmake recognise pyside2
+  ++ (lib.optional waylandSupport wayland);
 
   nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
 
@@ -42,6 +45,7 @@ mkDerivation rec {
     "-DBUILD_VERSION_DIST_VER=${version}"
     "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
     "-DBUILD_VERSION_STABLE=ON"
+    "-DENABLE_WAYLAND=${cmakeBool waylandSupport}"
   ];
 
   # TODO: define these in the above array via placeholders, once those are widely supported

From f95d9678a9d5444fa7c95665b9cad5eac654e2f2 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 1 Aug 2021 22:48:53 +0200
Subject: [PATCH 09/11] tools/networking: replace name with pname&version

---
 pkgs/tools/networking/ahcpd/default.nix            | 5 +++--
 pkgs/tools/networking/aircrack-ng/default.nix      | 5 +++--
 pkgs/tools/networking/arpoison/default.nix         | 5 +++--
 pkgs/tools/networking/bsd-finger/default.nix       | 5 +++--
 pkgs/tools/networking/cadaver/default.nix          | 5 +++--
 pkgs/tools/networking/carddav-util/default.nix     | 4 ++--
 pkgs/tools/networking/cksfv/default.nix            | 5 +++--
 pkgs/tools/networking/curl-unix-socket/default.nix | 3 ++-
 pkgs/tools/networking/dhcpdump/default.nix         | 7 ++++---
 pkgs/tools/networking/dnstop/default.nix           | 5 +++--
 pkgs/tools/networking/dropbear/default.nix         | 5 +++--
 pkgs/tools/networking/email/default.nix            | 3 ++-
 pkgs/tools/networking/filegive/default.nix         | 5 +++--
 pkgs/tools/networking/flvstreamer/default.nix      | 6 +++---
 pkgs/tools/networking/fping/default.nix            | 5 +++--
 pkgs/tools/networking/gftp/default.nix             | 7 ++++---
 pkgs/tools/networking/hyenae/default.nix           | 7 ++++---
 pkgs/tools/networking/iftop/default.nix            | 7 ++++---
 pkgs/tools/networking/imapproxy/default.nix        | 8 +++++---
 pkgs/tools/networking/imapsync/default.nix         | 6 ++++--
 pkgs/tools/networking/jnettop/default.nix          | 7 ++++---
 pkgs/tools/networking/jwhois/default.nix           | 7 ++++---
 pkgs/tools/networking/lsh/default.nix              | 6 ++++--
 pkgs/tools/networking/maildrop/default.nix         | 7 ++++---
 pkgs/tools/networking/miniupnpd/default.nix        | 7 ++++---
 pkgs/tools/networking/mpack/default.nix            | 5 +++--
 pkgs/tools/networking/nbd/default.nix              | 9 +++++----
 pkgs/tools/networking/ndisc6/default.nix           | 5 +++--
 pkgs/tools/networking/netboot/default.nix          | 6 ++++--
 pkgs/tools/networking/netcat/default.nix           | 7 ++++---
 pkgs/tools/networking/netkit/tftp/default.nix      | 9 +++++----
 pkgs/tools/networking/nss-mdns/default.nix         | 5 +++--
 pkgs/tools/networking/ntp/default.nix              | 5 +++--
 33 files changed, 114 insertions(+), 79 deletions(-)

diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix
index 75a7fc83858a..83647d17ae3c 100644
--- a/pkgs/tools/networking/ahcpd/default.nix
+++ b/pkgs/tools/networking/ahcpd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ahcpd-0.53";
+  pname = "ahcpd";
+  version = "0.53";
 
   src = fetchurl {
-    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
+    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/ahcpd-${version}.tar.gz";
     sha256 = "0lhdmky3zdyk51hclv2lrhw3hzymbdc8bw2khs3rnaibgn0jwqm4";
   };
 
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 33a90636659a..f836fdf052f9 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -3,10 +3,11 @@
 , autoreconfHook, usbutils }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.6";
+  pname = "aircrack-ng";
+  version = "1.6";
 
   src = fetchurl {
-    url = "https://download.aircrack-ng.org/${name}.tar.gz";
+    url = "https://download.aircrack-ng.org/aircrack-ng-${version}.tar.gz";
     sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg";
   };
 
diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix
index 6268d958204f..64b3229fad6b 100644
--- a/pkgs/tools/networking/arpoison/default.nix
+++ b/pkgs/tools/networking/arpoison/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchzip, libnet }:
 
 stdenv.mkDerivation rec {
-  name = "arpoison-0.7";
+  pname = "arpoison";
+  version = "0.7";
 
   buildInputs = [ libnet ];
 
   src = fetchzip {
-    url = "http://www.arpoison.net/${name}.tar.gz";
+    url = "http://www.arpoison.net/arpoison-${version}.tar.gz";
     sha256 = "0krhszx3s0qwfg4rma5a51ak71nnd9xfs2ibggc3hwiz506s2x37";
   };
 
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index 189f636cd1fb..354c669b3366 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -3,10 +3,11 @@
 # !!! Duplication: this package is almost exactly the same as `bsd-finger'.
 
 stdenv.mkDerivation rec {
-  name = "bsd-finger-0.17";
+  pname = "bsd-finger";
+  version = "0.17";
 
   src = fetchurl {
-    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz";
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
     sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
   };
 
diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix
index 70c7972bd65f..7ded22f01032 100644
--- a/pkgs/tools/networking/cadaver/default.nix
+++ b/pkgs/tools/networking/cadaver/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "cadaver-0.23.3";
+  pname = "cadaver";
+  version = "0.23.3";
 
   src = fetchurl {
-    url = "http://www.webdav.org/cadaver/${name}.tar.gz";
+    url = "http://www.webdav.org/cadaver/cadaver-${version}.tar.gz";
     sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x";
   };
 
diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix
index 300e03761a65..ed3f78d4da4a 100644
--- a/pkgs/tools/networking/carddav-util/default.nix
+++ b/pkgs/tools/networking/carddav-util/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchgit, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation {
-
-  name = "carddav-0.1-2014-02-26";
+  pname = "carddav";
+  version = "0.1-2014-02-26";
 
   src = fetchgit {
     url = "git://github.com/ljanyst/carddav-util";
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 581d39636fa7..cef09241420d 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "cksfv-1.3.15";
+  pname = "cksfv";
+  version = "1.3.15";
 
   src = fetchurl {
-    url = "http://zakalwe.fi/~shd/foss/cksfv/files/${name}.tar.bz2";
+    url = "http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-${version}.tar.bz2";
     sha256 = "0k06aq94cn5xp4knjw0p7gz06hzh622ql2xvnrlr3q8rcmdvwwx1";
   };
 
diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix
index ab4c3292ea51..3366001042d7 100644
--- a/pkgs/tools/networking/curl-unix-socket/default.nix
+++ b/pkgs/tools/networking/curl-unix-socket/default.nix
@@ -1,7 +1,8 @@
 { buildGoPackage, lib, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "curl-unix-socket-2015-04-10";
+  pname = "curl-unix-socket";
+  version = "unstable-2015-04-10";
 
   src = fetchFromGitHub {
     owner = "Soulou";
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index dba08fea7956..b8bd1d88bf20 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libpcap, perl }:
 
-stdenv.mkDerivation {
-  name = "dhcpdump-1.8";
+stdenv.mkDerivation rec {
+  pname = "dhcpdump";
+  version = "1.8";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_1.8.orig.tar.gz";
+    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz";
     sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd";
   };
 
diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix
index cee24f1976ff..7669f6eec8f9 100644
--- a/pkgs/tools/networking/dnstop/default.nix
+++ b/pkgs/tools/networking/dnstop/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libpcap, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dnstop-20140915";
+  pname = "dnstop";
+  version = "2014-09-15";
 
   src = fetchurl {
-    url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz";
+    url = "http://dns.measurement-factory.com/tools/dnstop/src/dnstop-${lib.replaceStrings ["-"] [""] version}.tar.gz";
     sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l";
   };
 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index f922a70344c4..1fd686735b7e 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -4,10 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2020.81";
+  pname = "dropbear";
+  version = "2020.81";
 
   src = fetchurl {
-    url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
+    url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${version}.tar.bz2";
     sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8";
   };
 
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
index 5c24acb912f9..2a6faa9c1731 100644
--- a/pkgs/tools/networking/email/default.nix
+++ b/pkgs/tools/networking/email/default.nix
@@ -20,7 +20,8 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "email-git-2016-01-31";
+  pname = "email-git";
+  version = "unstable-2016-01-31";
   src = eMailSrc;
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 1d7bf884edd5..60dbd1c323b7 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,10 +1,11 @@
 { buildGoPackage, lib, fetchurl }:
 
 buildGoPackage rec {
-  name = "filegive-0.7.4";
+  pname = "filegive";
+  version = "0.7.4";
 
   src = fetchurl {
-    url = "http://viric.name/soft/filegive/${name}.tar.gz";
+    url = "http://viric.name/soft/filegive/filegive-${version}.tar.gz";
     sha256 = "1z3vyqfdp271qa5ah0i6jmn9gh3gb296wcm33sd2zfjqapyh12hy";
   };
 
diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix
index d31751e7d5ca..2829b3967f91 100644
--- a/pkgs/tools/networking/flvstreamer/default.nix
+++ b/pkgs/tools/networking/flvstreamer/default.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-
-  name = "flvstreamer-2.1c1";
+  pname = "flvstreamer";
+  version = "2.1c1";
 
   src = fetchurl {
-    url = "mirror://savannah/flvstreamer/source/${name}.tar.gz";
+    url = "mirror://savannah/flvstreamer/source/flvstreamer-${version}.tar.gz";
     sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee";
   };
 
diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 7974fdd244bd..8e87eaf6942f 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-5.0";
+  pname = "fping";
+  version = "5.0";
 
   src = fetchurl {
-    url = "https://www.fping.org/dist/${name}.tar.gz";
+    url = "https://www.fping.org/dist/fping-${version}.tar.gz";
     sha256 = "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d";
   };
 
diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix
index b228967a73b5..ab956a45b492 100644
--- a/pkgs/tools/networking/gftp/default.nix
+++ b/pkgs/tools/networking/gftp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkg-config }:
 
-stdenv.mkDerivation {
-  name = "gftp-2.0.19";
+stdenv.mkDerivation rec {
+  pname = "gftp";
+  version = "2.0.19";
 
   src = fetchurl {
-    url = "https://www.gftp.org/gftp-2.0.19.tar.bz2";
+    url = "https://www.gftp.org/gftp-${version}.tar.bz2";
     sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk";
   };
 
diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix
index 5007a69fb9b7..b0e579de2209 100644
--- a/pkgs/tools/networking/hyenae/default.nix
+++ b/pkgs/tools/networking/hyenae/default.nix
@@ -1,12 +1,13 @@
 {lib, stdenv, fetchurl, libdnet, pkg-config, libpcap}:
 
-stdenv.mkDerivation {
-  name = "hyenae-0.36-1";
+stdenv.mkDerivation rec {
+  pname = "hyenae";
+  version = "0.36-1";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz";
+    url = "mirror://sourceforge/hyenae/${version}/hyenae-${version}.tar.gz";
     sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg";
   };
 
diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix
index c3e71e6132de..abdb7d05b28b 100644
--- a/pkgs/tools/networking/iftop/default.nix
+++ b/pkgs/tools/networking/iftop/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, ncurses, libpcap, automake, nixosTests }:
 
-stdenv.mkDerivation {
-  name = "iftop-1.0pre4";
+stdenv.mkDerivation rec {
+  pname = "iftop";
+  version = "1.0pre4";
 
   src = fetchurl {
-    url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz";
+    url = "http://ex-parrot.com/pdw/iftop/download/iftop-${version}.tar.gz";
     sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp";
   };
 
diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix
index dd149f57432b..ca0ce6f933fc 100644
--- a/pkgs/tools/networking/imapproxy/default.nix
+++ b/pkgs/tools/networking/imapproxy/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, fetchurl, openssl, ncurses}:
 
-stdenv.mkDerivation {
-  name = "imapproxy-1.2.7";
+stdenv.mkDerivation rec {
+  pname = "imapproxy";
+  version = "1.2.7";
+
   src = fetchurl {
-    url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2";
+    url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-${version}.tar.bz2";
     sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx";
   };
 
diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix
index bec0b197c184..4c91fb9096b6 100644
--- a/pkgs/tools/networking/imapsync/default.nix
+++ b/pkgs/tools/networking/imapsync/default.nix
@@ -1,9 +1,11 @@
 {lib, stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "imapsync-1.727";
+  pname = "imapsync";
+  version = "1.727";
+
   src = fetchurl {
-    url = "https://releases.pagure.org/imapsync/${name}.tgz";
+    url = "https://releases.pagure.org/imapsync/imapsync-${version}.tgz";
     sha256 = "1axacjw2wyaphczfw3kfmi5cl83fyr8nb207nks40fxkbs8q5dlr";
   };
 
diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix
index bd31235b6f94..91f92236ecf8 100644
--- a/pkgs/tools/networking/jnettop/default.nix
+++ b/pkgs/tools/networking/jnettop/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, fetchpatch, lib, stdenv, autoconf, libpcap, ncurses, pkg-config, glib }:
 
-stdenv.mkDerivation {
-  name = "jnettop-0.13.0";
+stdenv.mkDerivation rec {
+  pname = "jnettop";
+  version = "0.13.0";
 
   src = fetchurl {
-    url = "http://jnettop.kubs.info/dist/jnettop-0.13.0.tar.gz";
+    url = "http://jnettop.kubs.info/dist/jnettop-${version}.tar.gz";
     sha256 = "1855np7c4b0bqzhf1l1dyzxb90fpnvrirdisajhci5am6als31z9";
   };
 
diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index 6eb26de82fc9..5a79a09281c3 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, lynx, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "jwhois-4.0";
+stdenv.mkDerivation rec {
+  pname = "jwhois";
+  version = "4.0";
 
   src = fetchurl {
-    url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz";
+    url = "mirror://gnu/jwhois/jwhois-${version}.tar.gz";
     sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs";
   };
 
diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix
index b03098d540a3..5893579b1a7b 100644
--- a/pkgs/tools/networking/lsh/default.nix
+++ b/pkgs/tools/networking/lsh/default.nix
@@ -2,9 +2,11 @@
 , nettools, lsof, procps }:
 
 stdenv.mkDerivation rec {
-  name = "lsh-2.0.4";
+  pname = "lsh";
+  version = "2.0.4";
+
   src = fetchurl {
-    url = "mirror://gnu/lsh/${name}.tar.gz";
+    url = "mirror://gnu/lsh/lsh-${version}.tar.gz";
     sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091";
   };
 
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index b258c638df52..143172735919 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, pkg-config, pcre, perl }:
 
-stdenv.mkDerivation {
-  name = "maildrop-2.6.0";
+stdenv.mkDerivation rec {
+  pname = "maildrop";
+  version = "2.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/courier/maildrop/2.6.0/maildrop-2.6.0.tar.bz2";
+    url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
     sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
   };
 
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index aea0faddf5d7..da950cdd2b8e 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -7,12 +7,13 @@ let
   scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ];
 in
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.1.20190502";
+  pname = "miniupnpd";
+  version = "2.1.20190502";
 
   src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz";
     sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b";
-    name = "${name}.tar.gz";
+    name = "miniupnpd-${version}.tar.gz";
   };
 
   buildInputs = [ iptables libuuid ];
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 3aca81596e08..2c9bf4ff2d30 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mpack-1.6";
+  pname = "mpack";
+  version = "1.6";
 
   src = fetchurl {
-    url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz";
+    url = "http://ftp.andrew.cmu.edu/pub/mpack/mpack-${version}.tar.gz";
     sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
   };
 
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 6478a15aa1a4..3f3a9b2b7235 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, pkg-config, glib, which }:
 
 stdenv.mkDerivation rec {
-  name = "nbd-3.21";
+  pname = "nbd";
+  version = "3.21";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nbd/${name}.tar.xz";
+    url = "mirror://sourceforge/nbd/nbd-${version}.tar.xz";
     sha256 = "sha256-52iK852Rczu80tsIBixE/lA9AE5RUodAE5xEr/amvvk=";
   };
 
@@ -14,8 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config which ];
 
   postInstall = ''
-    mkdir -p "$out/share/doc/${name}"
-    cp README.md "$out/share/doc/${name}/"
+    mkdir -p "$out/share/doc/nbd-${version}"
+    cp README.md "$out/share/doc/nbd-${version}/"
   '';
 
   doCheck = true;
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
index 6612315c6f2d..6a728ec30bfe 100644
--- a/pkgs/tools/networking/ndisc6/default.nix
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "ndisc6-1.0.4";
+  pname = "ndisc6";
+  version = "1.0.4";
 
   src = fetchurl {
-    url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
+    url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${version}.tar.bz2";
     sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb";
   };
 
diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix
index e7d984a798b3..fdd1857ef10e 100644
--- a/pkgs/tools/networking/netboot/default.nix
+++ b/pkgs/tools/networking/netboot/default.nix
@@ -1,9 +1,11 @@
 { lib, stdenv, fetchurl, bison, lzo, db4 }:
 
 stdenv.mkDerivation rec {
-  name = "netboot-0.10.2";
+  name = "netboot";
+  version = "0.10.2";
+
   src = fetchurl {
-    url = "mirror://sourceforge/netboot/${name}.tar.gz";
+    url = "mirror://sourceforge/netboot/netboot-${version}.tar.gz";
     sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
   };
 
diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix
index 7b325b2f4840..ef035d3c671a 100644
--- a/pkgs/tools/networking/netcat/default.nix
+++ b/pkgs/tools/networking/netcat/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "netcat-gnu-0.7.1";
+stdenv.mkDerivation rec {
+  pname = "netcat-gnu";
+  version = "0.7.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2";
+    url = "mirror://sourceforge/netcat/netcat-${version}.tar.bz2";
     sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
   };
 
diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix
index 3a7a3a1deb49..3ebfa3b96bc1 100644
--- a/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/pkgs/tools/networking/netkit/tftp/default.nix
@@ -1,13 +1,14 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "netkit-tftp-0.17";
+  pname = "netkit-tftp";
+  version = "0.17";
 
   src = fetchurl {
     urls = [
-      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
-      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${name}.tar.gz"
-      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_0.17.orig.tar.gz"
+      "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
+      "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz"
+      "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz"
     ];
     sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs";
   };
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index 212f7bfc2877..6faf1f06dbb8 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "nss-mdns-0.10";
+  pname = "nss-mdns";
+  version = "0.10";
 
   src = fetchurl {
-    url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
+    url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz";
     sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
   };
 
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 8c62e3b0d646..c8af08a3a30d 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,10 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p15";
+  pname = "ntp";
+  version = "4.2.8p15";
 
   src = fetchurl {
-    url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
+    url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${lib.versions.majorMinor version}/ntp-${version}.tar.gz";
     sha256 = "06cwhimm71safmwvp6nhxp6hvxsg62whnbgbgiflsqb8mgg40n7n";
   };
 

From 1fd29a27e9ad2845599eb8ac7a29126522c07a00 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Mon, 26 Jul 2021 20:22:35 -0700
Subject: [PATCH 10/11] phosh: 0.12.0 -> 0.12.1

---
 pkgs/applications/window-managers/phosh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 9fa0959ed505..985814a0a132 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -37,14 +37,14 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "phosh";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1s0lgq04qz562iri535wpwvfkmmngdpclyl329cf7rc9ihy1kjvs";
+    sha256 = "048g5sp9jgfiwq6n8my4msm7wy3pdhbg0wxqxvps4m8qf8wa7ffq";
   };
 
   nativeBuildInputs = [

From acbf47a239bbd44a0805810570bd82fc91487f12 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sun, 1 Aug 2021 13:03:19 -0700
Subject: [PATCH 11/11] phoc: 0.7.1 -> 0.8.0

---
 pkgs/applications/misc/phoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix
index aad2a4d0e48c..e599ffa39d78 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/applications/misc/phoc/default.nix
@@ -36,14 +36,14 @@ let
   });
 in stdenv.mkDerivation rec {
   pname = "phoc";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0n188xa2pwl4258naxhz45cvipcid8y1zvlbddll9xydrrh9bwqn";
+    sha256 = "sha256-QAnJlpFjWJvwxGyenmN4IaI9VFn2jwdXpa8VqAmH7Xw=";
   };
 
   nativeBuildInputs = [