Merge master into staging-next

.editorconfig

···
 insert_final_newline = unset
 trim_trailing_whitespace = unset
 
-[*.{key,ovpn}]
+[*.{asc,key,ovpn}]
 insert_final_newline = unset
 end_of_line = unset
+trim_trailing_whitespace = unset
 
 [*.lock]
 indent_size = unset

maintainers/scripts/nixpkgs-lint.nix

···
-{ stdenv, makeWrapper, perl, perlPackages }:
+{ stdenv, lib, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation {
   name = "nixpkgs-lint-1";
···
       wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
     '';
 
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+  meta = with lib; {
+    maintainers = [ maintainers.eelco ];
     description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

nixos/modules/config/gnu.nix

···
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
   options = {
-    gnu = mkOption {
-      type = types.bool;
+    gnu = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = ''
         When enabled, GNU software is chosen by default whenever a there is
···
     };
   };
 
-  config = mkIf config.gnu {
+  config = lib.mkIf config.gnu {
 
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
···
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-      ++ stdenv.lib.optional (!stdenv.isAarch32) grub2;
+      ++ lib.optional (!stdenv.isAarch32) grub2;
 
 
     # GNU GRUB, where available.

nixos/modules/installer/tools/nixos-option/default.nix

···
   src = ./.;
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ boost nix ];
-  meta = {
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ chkno ];
+  meta = with lib; {
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ chkno ];
   };
 }

nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix

···
 
 */
 
-with lib;
-
 let
 
   addNetDev = nd: ''
     brsaneconfig4 -a \
     name="${nd.name}" \
     model="${nd.model}" \
-    ${if (hasAttr "nodename" nd && nd.nodename != null) then
+    ${if (lib.hasAttr "nodename" nd && nd.nodename != null) then
       ''nodename="${nd.nodename}"'' else
       ''ip="${nd.ip}"''}'';
-  addAllNetDev = xs: concatStringsSep "\n" (map addNetDev xs);
+  addAllNetDev = xs: lib.concatStringsSep "\n" (map addNetDev xs);
 in
 
 stdenv.mkDerivation {
···
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = {
+  meta = with lib; {
     description = "Brother brscan4 sane backend driver etc files";
     homepage = "http://www.brother.com";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+    platforms = platforms.linux;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ jraygauthier ];
   };
 }

nixos/modules/virtualisation/google-compute-image.nix

···
     system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
       name = "google-compute-image";
       postVM = ''
-        PATH=$PATH:${with pkgs; stdenv.lib.makeBinPath [ gnutar gzip ]}
+        PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
         pushd $out
         mv $diskImage disk.raw
         tar -Szcf nixos-image-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.raw.tar.gz disk.raw

nixos/tests/searx.nix

···
 
 {
   name = "searx";
-  meta = with pkgs.stdenv.lib.maintainers; {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [ rnhmjoj ];
   };
 

pkgs/applications/editors/texmaker/default.nix

···
   meta = with lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
-	This editor is a full fledged IDE for TeX and
-	LaTeX editing with completion, structure viewer, preview,
-	spell checking and support of any compilation chain.
-	'';
+      This editor is a full fledged IDE for TeX and
+      LaTeX editing with completion, structure viewer, preview,
+      spell checking and support of any compilation chain.
+    '';
     homepage = "http://www.xm1math.net/texmaker/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;

pkgs/applications/graphics/animbar/default.nix

···
   meta = with lib; {
     description = "Create your own animation on paper and transparancy";
     longDescription = ''
-	Animbar lets you easily create your own animation on paper and
-	transparancy. From a set of input images two output images are
-	computed, that are printed one on paper and one on
-	transparency. By moving the transparency over the paper you
-	create a fascinating animation effect. This kind of animation
-	technique is hundreds of years old and known under several
-	names: picket fence animation, barrier grid animation, Moiré
-	animation, to name a few.
+      Animbar lets you easily create your own animation on paper and
+      transparancy. From a set of input images two output images are
+      computed, that are printed one on paper and one on
+      transparency. By moving the transparency over the paper you
+      create a fascinating animation effect. This kind of animation
+      technique is hundreds of years old and known under several
+      names: picket fence animation, barrier grid animation, Moiré
+      animation, to name a few.
     '';
     homepage = "http://animbar.mnim.org";
     maintainers = with maintainers; [ leenaars ];

pkgs/applications/misc/sidequest/default.nix

···
 { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
-	let
-		pname = "sidequest";
-		version = "0.10.11";
+  let
+    pname = "sidequest";
+    version = "0.10.11";
 
-		desktopItem = makeDesktopItem rec {
-			name = "SideQuest";
-			exec = "SideQuest";
-			desktopName = name;
-			genericName = "VR App Store";
-			categories = "Settings;PackageManager;";
-		};
+    desktopItem = makeDesktopItem rec {
+      name = "SideQuest";
+      exec = "SideQuest";
+      desktopName = name;
+      genericName = "VR App Store";
+      categories = "Settings;PackageManager;";
+    };
 
-		sidequest = stdenv.mkDerivation {
-			inherit pname version;
+    sidequest = stdenv.mkDerivation {
+      inherit pname version;
 
-			src = fetchurl {
-				url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
-				sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
-			};
+      src = fetchurl {
+        url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+        sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
+      };
 
-			buildInputs = [ makeWrapper ];
+      buildInputs = [ makeWrapper ];
 
-			buildCommand = ''
-				mkdir -p "$out/lib/SideQuest" "$out/bin"
-				tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
+      buildCommand = ''
+        mkdir -p "$out/lib/SideQuest" "$out/bin"
+        tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
 
-				ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
+        ln -s "$out/lib/SideQuest/sidequest" "$out/bin"
 
-				fixupPhase
+        fixupPhase
 
-				# mkdir -p "$out/share/applications"
-				# ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
+        # mkdir -p "$out/share/applications"
+        # ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
 
-				patchelf \
-					--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-					--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
-					"$out/lib/SideQuest/sidequest"
-			'';
-		};
-	in buildFHSUserEnv {
-		name = "SideQuest";
+        patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
+          "$out/lib/SideQuest/sidequest"
+      '';
+    };
+  in buildFHSUserEnv {
+    name = "SideQuest";
 
-		passthru = {
-			inherit pname version;
+    passthru = {
+      inherit pname version;
 
-			meta = with lib; {
-				description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
-				homepage = "https://github.com/the-expanse/SideQuest";
-				downloadPage = "https://github.com/the-expanse/SideQuest/releases";
-				license = licenses.mit;
-				maintainers = with maintainers; [ joepie91 rvolosatovs ];
-				platforms = [ "x86_64-linux" ];
-			};
-		};
+      meta = with lib; {
+        description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300";
+        homepage = "https://github.com/the-expanse/SideQuest";
+        downloadPage = "https://github.com/the-expanse/SideQuest/releases";
+        license = licenses.mit;
+        maintainers = with maintainers; [ joepie91 rvolosatovs ];
+        platforms = [ "x86_64-linux" ];
+      };
+    };
 
-		targetPkgs = pkgs: [
-			sidequest
-			# Needed in the environment on runtime, to make QuestSaberPatch work
-			icu openssl zlib
-		];
+    targetPkgs = pkgs: [
+      sidequest
+      # Needed in the environment on runtime, to make QuestSaberPatch work
+      icu openssl zlib
+    ];
 
-		extraInstallCommands = ''
-			mkdir -p "$out/share/applications"
-			ln -s ${desktopItem}/share/applications/* "$out/share/applications"
-		'';
+    extraInstallCommands = ''
+      mkdir -p "$out/share/applications"
+      ln -s ${desktopItem}/share/applications/* "$out/share/applications"
+    '';
 
-		runScript = "sidequest";
-	}
+    runScript = "sidequest";
+  }

pkgs/applications/networking/cluster/kpt/default.nix

···
 
 buildGoModule rec {
   pname = "kpt";
-  version = "0.37.0";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "GoogleContainerTools";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1b1sgwax67pazcs1lly3h3bb7ww91lcd3nr0w3r3f46d1c6iy8mn";
+    sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM=";
   };
 
-  vendorSha256 = "0dn6nryf3vn7r0xna02va4wbgkq0z6x8sj6g2mskfywrk0mfhadv";
+  vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI=";
 
   subPackages = [ "." ];
 

pkgs/applications/office/csv2odf/default.nix

···
       creating reports from databases and other data sources that produce csv files.
       csv2odf can be combined with cron and shell scripts to automatically generate
       business reports.
-      
+
       The output format (fonts, number formatting, etc.) is controlled by a
       template file that you can design in your office application of choice.
     '';

pkgs/applications/radio/klog/default.nix

···
+{ stdenv, fetchurl, hamlib, pkg-config, qt5, qtbase, qttools, qtserialport, qtcharts, qmake, wrapQtAppsHook }:
+
+stdenv.mkDerivation rec {
+  pname = "klog";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "https://download.savannah.nongnu.org/releases/klog/${pname}-${version}.tar.gz";
+    sha256 = "1d5x7rq0mgfrqws3q1y4z8wh2qa3gvsmd0ssf2yqgkyq3fhdrb5c";
+  };
+
+  nativeBuildInputs = [ pkg-config wrapQtAppsHook qmake qttools ];
+  buildInputs = [ hamlib qtbase qtserialport qtcharts ];
+
+  qmakeFlags = [ "KLog.pro" ];
+
+  meta = with stdenv.lib; {
+    description = "A multiplatform free hamradio logger";
+    longDescription = ''
+      KLog provides QSO management, useful QSL management DX-Cluster client, DXCC management,
+      ClubLog integration, WSJT-X, DX-Marathon support and much more.
+      '';
+    homepage = "https://www.klog.xyz/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pulsation ];
+  };
+}

pkgs/applications/science/astronomy/kstars/default.nix

···
 
 mkDerivation rec {
   pname = "kstars";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz";
-    sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1";
+    sha256 = "sha256-gf+yaXiYQFuO1/nvdP6OOuD4QrRtPAQTwQZAbYNKxUU=";
   };
 
   patches = [

pkgs/applications/science/astronomy/xearth/default.nix

···
     longDescription =
       '' Xearth  sets  the X root window to an image of the Earth, as seen from your favorite vantage point in space,
          correctly shaded for the current position of the Sun.
-	 By default, xearth updates the displayed image every  five  minutes.
+         By default, xearth updates the displayed image every  five  minutes.
       '';
     maintainers = [ maintainers.mafo ];
     license = "xearth";

pkgs/applications/science/biology/ecopcr/default.nix

···
   buildInputs = [ gcc python27 zlib ];
 
   installPhase = ''
-	mkdir -p $out/bin
-	cp -v ecoPCR $out/bin
-	cp -v ecogrep $out/bin
-	cp -v ecofind $out/bin
-	cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
-	chmod a+x $out/bin/ecoPCRFormat
+    mkdir -p $out/bin
+    cp -v ecoPCR $out/bin
+    cp -v ecogrep $out/bin
+    cp -v ecofind $out/bin
+    cp -v ../tools/ecoPCRFormat.py $out/bin/ecoPCRFormat
+    chmod a+x $out/bin/ecoPCRFormat
   '';
 
   meta = with lib; {

pkgs/applications/science/biology/minimap2/default.nix

···
     mkdir -p $out/share/man/man1
     cp minimap2.1 $out/share/man/man1
   '';
-  
+
   meta = with lib; {
     description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences";
     homepage = "https://lh3.github.io/minimap2";

pkgs/applications/science/biology/prodigal/default.nix

···
     "CC=cc"
     "INSTALLDIR=$(out)/bin"
   ];
-  
+
   meta = with lib; {
     description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes";
     homepage = "https://github.com/hyattpd/Prodigal";

pkgs/applications/science/logic/cryptominisat/default.nix

···
     sha256 = "00hmxdlyhn7pwk9jlvc5g0l5z5xqfchjzf5jgn3pkj9xhl8yqq50";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
       # https://github.com/msoos/cryptominisat/pull/621
       url = "https://github.com/msoos/cryptominisat/commit/11a97003b0bfbfb61ed6c4e640212110d390c28c.patch";

pkgs/applications/science/machine-learning/sc2-headless/maps.nix

···
     sha256 = "19f873ilcdsf50g2v0s2zzmxil1bqncsk8nq99bzy87h0i7khkla";
     stripRoot = false;
   };
-  
+
   melee = fetchzip' {
     url = "http://blzdistsc2-a.akamaihd.net/MapPacks/Melee.zip";
     sha256 = "0z44pgy10jklsvgpr0kcn4c2mz3hw7nlcmvsy6a6lzpi3dvzf33i";

pkgs/applications/science/robotics/betaflight-configurator/default.nix

···
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  
+
   buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
-  
+
   installPhase = ''
     mkdir -p $out/bin \
              $out/opt/${pname}
···
     description = "The Betaflight flight control system configuration tool";
     longDescription = ''
       A crossplatform configuration tool for the Betaflight flight control system.
-      Various types of aircraft are supported by the tool and by Betaflight, e.g. 
+      Various types of aircraft are supported by the tool and by Betaflight, e.g.
       quadcopters, hexacopters, octocopters and fixed-wing aircraft.
     '';
     homepage    = "https://github.com/betaflight/betaflight/wiki";

pkgs/applications/science/robotics/sumorobot-manager/default.nix

···
 { lib, stdenv, python3, qt5, fetchFromGitHub, wrapPython, pyqt5, pyserial }:
- 
+
 stdenv.mkDerivation rec {
   pname = "sumorobot-manager";
   version = "0.9.0";

pkgs/applications/search/grepm/default.nix

···
       -e "s:^\( *\)mutt:\1${mutt}/bin/mutt:" \
       $out/bin/grepm
   '';
-  
+
   meta = with lib; {
     description = "Wrapper for grepmail utilizing mutt";
     homepage = "http://www.barsnick.net/sw/grepm.html";

pkgs/applications/video/kazam/default.nix

···
   ];
 
   propagatedBuildInputs = with python3.pkgs; [ pygobject3 pyxdg pycairo dbus-python ];
- 
+
   # workaround https://github.com/NixOS/nixpkgs/issues/56943
   strictDeps = false;
 

pkgs/applications/virtualization/xen/xsa-patches.nix

···
     })
   ];
 
-	# 4.5
+  # 4.5
   XSA_248_45 = [
     (xsaPatch {
       name = "248-4.5";

pkgs/applications/window-managers/jwm/jwm-settings-manager.nix

···
 stdenv.mkDerivation {
   pname = "jwm-settings-manager";
   version = "2018-10-19";
-  
+
   src = fetchFromGitHub {
     owner = "Israel-D";
     repo = "jwm-settings-manager";

pkgs/applications/window-managers/lemonbar/default.nix

···
 
 stdenv.mkDerivation {
   name = "lemonbar-1.4";
-  
+
   src = fetchurl {
     url    = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz";
     sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv";
   };
-  
+
   buildInputs = [ libxcb perl ];
-  
+
   prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-  
+
   meta = with lib; {
     description = "A lightweight xcb based bar";
     homepage = "https://github.com/LemonBoy/bar";
     maintainers = [ maintainers.meisternu ];
-    license = "Custom";   
+    license = "Custom";
     platforms = platforms.linux;
   };
 }

pkgs/applications/window-managers/vwm/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "vwm-2.1.3";
- 
+
   src = fetchurl {
     url = "mirror://sourceforge/vwm/${name}.tar.gz";
     sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
···
   preInstall = ''
     mkdir -p $out/bin $out/include
   '';
- 
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ];
- 
+
   meta = with lib; {
     homepage = "http://vwm.sourceforge.net/";
     description = "Dynamic window manager for the console";

pkgs/build-support/fetchbzr/default.nix

···
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = sha256;
-  
+
   inherit url rev;
 }

pkgs/build-support/fetchmtn/default.nix

···
 # each is an url for sync
 
 # selector is mtn selector, like h:org.example.branch
-# 
+#
 {name ? "mtn-checkout", dbs ? [], sha256
 , selector ? "h:" + branch, branch}:
 

pkgs/data/documentation/rnrs/common.nix

···
 
   buildInputs = [ texinfo ];
 
-  # Tell the builder about the name of the report.  
+  # Tell the builder about the name of the report.
   reportName = name;
 
   builder = ./builder.sh;

pkgs/data/fonts/mno16/default.nix

···
 
   meta = with lib; {
     description = "minimalist monospaced font";
-    homepage = "https://sev.dev/fonts/mno16"; 
+    homepage = "https://sev.dev/fonts/mno16";
     license = licenses.cc0;
   };
 }

pkgs/desktops/gnustep/projectcenter/default.nix

···
   # 1. Framework/PCProjectLauncher.m, locate gdb (say among NIX_GNUSTEP_SYSTEM_TOOLS)
   # 2. Framework/PCProjectBuilder.m, locate gmake (similar)
   propagatedBuildInputs = [ base back gui gnumake gdb gorm ];
-  
+
   meta = {
     description = "GNUstep's integrated development environment";
   };

pkgs/development/compilers/ghc/8.10.1.nix

···
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

pkgs/development/compilers/ghc/8.8.2.nix

···
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

pkgs/development/compilers/ghc/8.8.3.nix

···
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

pkgs/development/compilers/ghc/8.8.4.nix

···
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

pkgs/development/compilers/ghc/head.nix

···
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf autoreconfHook automake m4 python3 sphinx

pkgs/development/compilers/manticore/default.nix

···
 in stdenv.mkDerivation {
   pname = "manticore";
   version = "2019.12.03";
- 
+
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
···
   };
 
   enableParallelBuilding = false;
- 
+
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   buildInputs = [ coreutils smlnj ];
 
   autoreconfFlags = "-Iconfig -vfi";
···
     mv source repo_checkout
     cd repo_checkout
     chmod u+w . -R
-  ''; 
-  
+  '';
+
   postPatch = ''
     patchShebangs .
     substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
···
   meta = {
     description = "A parallel, pure variant of Standard ML";
 
-    longDescription = '' 
+    longDescription = ''
       Manticore is a high-level parallel programming language aimed at
       general-purpose applications running on multi-core
       processors. Manticore supports parallelism at multiple levels:
       explicit concurrency and coarse-grain parallelism via CML-style
       constructs and fine-grain parallelism via various light-weight
       notations, such as parallel tuple expressions and NESL/Nepal-style
-      parallel array comprehensions.  
+      parallel array comprehensions.
     '';
 
     homepage = "http://manticore.cs.uchicago.edu/";

pkgs/development/compilers/ocaml/3.11.2.nix

···
     [ (fetchurl {
         name = "0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch";
         url = "http://caml.inria.fr/mantis/file_download.php?file_id=418&type=bug";
-	sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
+        sha256 = "612a9ac108bbfce2238aa5634123da162f0315dedb219958be705e0d92dcdd8e";
       })
     ];
 

pkgs/development/idris-modules/tparsec.nix

···
   version = "2020-02-11";
 
   ipkgName = "TParsec";
-  
+
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {

pkgs/development/libraries/SDL_Pango/default.nix

···
     sha256 = "197baw1dsg0p4pljs5k0fshbyki00r4l49m1drlpqw6ggawx6xbz";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
       url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch";
       sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld";

pkgs/development/libraries/SDL_gfx/default.nix

···
   meta = with stdenv.lib; {
     description = "SDL graphics drawing primitives and support functions";
 
-    longDescription =
-      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
-	 which provided basic drawing routines such as lines, circles or
-	 polygons and SDL_rotozoom which implemented a interpolating
-	 rotozoomer for SDL surfaces.
+    longDescription = ''
+      The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+      which provided basic drawing routines such as lines, circles or
+      polygons and SDL_rotozoom which implemented a interpolating
+      rotozoomer for SDL surfaces.
 
-	 The current components of the SDL_gfx library are:
+      The current components of the SDL_gfx library are:
 
-	    * Graphic Primitives (SDL_gfxPrimitves.h)
-	    * Rotozoomer (SDL_rotozoom.h)
-	    * Framerate control (SDL_framerate.h)
-	    * MMX image filters (SDL_imageFilter.h)
-	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+        * Graphic Primitives (SDL_gfxPrimitves.h)
+        * Rotozoomer (SDL_rotozoom.h)
+        * Framerate control (SDL_framerate.h)
+        * MMX image filters (SDL_imageFilter.h)
+        * Custom Blit functions (SDL_gfxBlitFunc.h)
 
-	 The library is backwards compatible to the above mentioned
-         code. Its is written in plain C and can be used in C++ code.
-       '';
+      The library is backwards compatible to the above mentioned
+      code. Its is written in plain C and can be used in C++ code.
+    '';
 
     homepage = "https://sourceforge.net/projects/sdlgfx/";
     license = licenses.zlib;

pkgs/development/libraries/aften/default.nix

···
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-	pname = "aften";
-	version = "0.0.8";
-	src = fetchurl {
-		url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
-		sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
-	};
+  pname = "aften";
+  version = "0.0.8";
+  src = fetchurl {
+    url = "mirror://sourceforge/aften/${pname}-${version}.tar.bz2";
+    sha256 = "02hc5x9vkgng1v9bzvza9985ifrjd7fjr7nlpvazp4mv6dr89k47";
+  };
 
-	nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-	cmakeFlags = [ "-DSHARED=ON" ];
+  cmakeFlags = [ "-DSHARED=ON" ];
 
-	meta = {
-		description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
-		homepage = "http://aften.sourceforge.net/";
-		license = stdenv.lib.licenses.lgpl2;
-		platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
-	};
+  meta = {
+    description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification";
+    homepage = "http://aften.sourceforge.net/";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+  };
 }

pkgs/development/libraries/biblesync/default.nix

···
       navigation, and handling of incoming packets.
     '';
     license = licenses.publicDomain;
-    maintainers = [ maintainers.AndersonTorres ]; 
+    maintainers = [ maintainers.AndersonTorres ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/boost/1.71.nix

···
 
   src = fetchurl {
     #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
-    urls = [ 
+    urls = [
       "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
       "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
     ];

pkgs/development/libraries/capstone/default.nix

···
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
     + "PREFIX=$out ./make.sh install";
-  
+
   nativeBuildInputs = [
     pkg-config
   ];

pkgs/development/libraries/cdk/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20200923";
+  version ="5.0-20210109";
 
   buildInputs = [
     ncurses
···
       "ftp://ftp.invisible-island.net/cdk/cdk-${version}.tgz"
       "https://invisible-mirror.net/archives/cdk/cdk-${version}.tgz"
     ];
-    sha256 = "1vdakz119a13d7p7w53hk56fdmbkhv6y9xvdapcfnbnbh3l5szq0";
+    sha256 = "sha256-xBbJh793tPGycD18XkM7qUWMi+Uma/RUy/gBrYfnKTY=";
   };
 
   meta = with stdenv.lib; {

pkgs/development/libraries/classads/default.nix

···
   configureFlags = [
     "--enable-namespace" "--enable-flexible-member"
   ];
-  
+
   meta = {
     homepage = "http://www.cs.wisc.edu/condor/classad/";
     description = "The Classified Advertisements library provides a generic means for matching resources";

pkgs/development/libraries/cminpack/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "cminpack-1.3.6";
-  
+
   src = fetchurl {
     url = "http://devernay.free.fr/hacks/cminpack/${name}.tar.gz";
     sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";

pkgs/development/libraries/concurrencykit/default.nix

···
     url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
     sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
   };
-  
+
   #Deleting this line causes "Unknown option --disable-static"
   configurePhase = "./configure --prefix=$out";
 

pkgs/development/libraries/dotnetfx35/default.nix

···
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }

pkgs/development/libraries/dotnetfx40/default.nix

···
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
-  
+
   assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
-  
+
   wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
-  
+
   referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
-  
+
   referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
 }

pkgs/development/libraries/elf-header/default.nix

···
     outputsToInstall = [ "out" ];
     description = "The datastructures of ELF according to the target platform's libc";
     longDescription = ''
-	  The Executable and Linkable Format (ELF, formerly named Extensible Linking
-	  Format), is usually defined in a header like this.
-	'';
+      The Executable and Linkable Format (ELF, formerly named Extensible Linking
+      Format), is usually defined in a header like this.
+    '';
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.ericson2314 ];
   };

pkgs/development/libraries/fastpbkdf2/default.nix

···
 
 stdenv.mkDerivation {
   name = "fastpbkdf2-1.0.0";
-  
+
   src = fetchFromGitHub {
     owner = "ctz";
     repo = "fastpbkdf2";
     rev = "v1.0.0";
     sha256 = "09ax0h4ik3vhvp3s98lic93l3g9f4v1jkr5k6z4g1lvm7s3lrha2";
   };
-  
+
   buildInputs = [ openssl ];
 
   preBuild = ''

pkgs/development/libraries/frame/default.nix

···
     sha256 = "bc2a20cd3ac1e61fe0461bd3ee8cb250dbcc1fa511fad0686d267744e9c78f3a";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     stdenv pkg-config
   ] ++ stdenv.lib.optionals enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
 

pkgs/development/libraries/glfw/2.x.nix

···
     make x11-dist-install PREFIX=$out
     mv $out/lib/libglfw.so $out/lib/libglfw.so.2
     ln -s libglfw.so.2 $out/lib/libglfw.so
-  ''; 
-  
-  meta = with stdenv.lib; { 
+  '';
+
+  meta = with stdenv.lib; {
     description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = "http://glfw.sourceforge.net/";
     license = licenses.zlib;

pkgs/development/libraries/gperftools/default.nix

···
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
+{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
 
 stdenv.mkDerivation rec {
   name = "gperftools-2.8";
···
   nativeBuildInputs = [ autoreconfHook ];
 
   # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux
-  buildInputs = stdenv.lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
+  buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind;
 
   # Disable general dynamic TLS on AArch to support dlopen()'ing the library:
   # https://bugzilla.redhat.com/show_bug.cgi?id=1483558
-  configureFlags = stdenv.lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
+  configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64)
     "--disable-general-dynamic-tls";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.am --replace stdc++ c++
     substituteInPlace Makefile.in --replace stdc++ c++
     substituteInPlace libtool --replace stdc++ c++
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
-    "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
+    "-D_XOPEN_SOURCE";
 
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools
···
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/gperftools/gperftools";
     description = "Fast, multi-threaded malloc() and nifty performance analysis tools";
     platforms = with platforms; linux ++ darwin;

pkgs/development/libraries/hyperscan/default.nix

···
 
       Hyperscan uses hybrid automata techniques to allow simultaneous
       matching of large numbers (up to tens of thousands) of regular
-      expressions and for the matching of regular expressions across 
+      expressions and for the matching of regular expressions across
       streams of data.
 
       Hyperscan is typically used in a DPI library stack.

pkgs/development/libraries/irrlicht/mac.nix

···
   version = common.version;
 
   src = fetchFromGitHub {
-		owner = "quiark";
-		repo = "IrrlichtCMake";
-		rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
-		sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
+    owner = "quiark";
+    repo = "IrrlichtCMake";
+    rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
+    sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
   };
 
   postUnpack = ''
     cp -r ${common.src}/* $sourceRoot/
     chmod -R 777 $sourceRoot
-	'';
+  '';
 
   patches = [ ./mac_device.patch ];
   dontFixCmake = true;

pkgs/development/libraries/jabcode/default.nix

···
 , lib
 , subproject ? "library" # one of "library", "reader" or  "writer"
 , zlib, libpng, libtiff
-, jabcode 
+, jabcode
 }:
 let
   subdir = lib.getAttr subproject {

pkgs/development/libraries/java/geoipjava/default.nix

···
     sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd";
   };
   buildInputs = [ jdk unzip ];
-  buildPhase = 
+  buildPhase =
     ''
       cd source
       javac $(find . -name \*.java)

pkgs/development/libraries/jemalloc/jemalloc450.nix

···
 import ./common.nix {
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-} 
+}

pkgs/development/libraries/levmar/default.nix

···
 { stdenv, fetchurl }:
-        
+
 stdenv.mkDerivation rec {
   name = "levmar-2.6";
 
···
     cp liblevmar.a $out/lib
   '';
 
-  meta = { 
+  meta = {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
     license = stdenv.lib.licenses.gpl2Plus;

pkgs/development/libraries/lib3ds/default.nix

···
 { stdenv, fetchurl, unzip }:
-        
+
 stdenv.mkDerivation rec {
   name = "lib3ds-1.3.0";
 
···
 
   buildInputs = [ unzip ];
 
-  meta = { 
+  meta = {
     description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files";
     homepage = "http://lib3ds.sourceforge.net/";
     license = "LGPL";

pkgs/development/libraries/libavc1394/default.nix

···
   nativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = {
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = "https://sourceforge.net/projects/libavc1394/";
     license = stdenv.lib.licenses.lgpl21Plus;

pkgs/development/libraries/libcangjie/default.nix

···
   buildInputs = [ automake autoconf libtool m4 sqlite ];
 
   configureScript = "./autogen.sh";
-  
+
   preConfigure = ''
     find . -name '*.sh' -exec sed -e 's@#!/bin/bash@${bash}/bin/bash@' -i '{}' ';'
   '';

pkgs/development/libraries/libcutl/default.nix

···
     description = "C++ utility library from Code Synthesis";
     longDescription = ''
         libcutl is a C++ utility library.
-        It contains a collection of generic and independent components such as 
+        It contains a collection of generic and independent components such as
         meta-programming tests, smart pointers, containers, compiler building blocks, etc.
     '';
     homepage = "https://codesynthesis.com/projects/libcutl/";

pkgs/development/libraries/libdiscid/default.nix

···
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
-  
+
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";
     sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";

pkgs/development/libraries/libdvdread/4.9.9.nix

···
 
 stdenv.mkDerivation {
   name = "libdvdread-4.9.9";
-  
+
   src = fetchurl {
     url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz";
     sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a";

pkgs/development/libraries/libmcrypt/default.nix

···
 
 stdenv.mkDerivation {
   name = "libmcrypt-2.5.8";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz";
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";

pkgs/development/libraries/libofx/default.nix

···
   nativeBuildInputs = [ pkg-config libtool autoconf automake gengetopt ];
   buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
-  meta = { 
+  meta = {
     description = "Opensource implementation of the Open Financial eXchange specification";
     homepage = "http://libofx.sourceforge.net/";
     license = "LGPL";

pkgs/development/libraries/liboop/default.nix

···
 
 stdenv.mkDerivation {
   name = "liboop-1.0";
-  
+
   src = fetchurl {
     url = "http://download.ofb.net/liboop/liboop.tar.gz";
     sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c";

pkgs/development/libraries/libredwg/default.nix

···
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] 
+  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]
     ++ lib.optional enablePython swig;
 
   buildInputs = [ pcre2 ]

pkgs/development/libraries/libwpd/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "libwpd-0.10.0";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libwpd/${name}.tar.xz";
     sha256 = "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx";
   };
-  
+
   buildInputs = [ glib libgsf libxml2 zlib librevenge ];
 
   nativeBuildInputs = [ pkg-config ];

pkgs/development/libraries/libx86/src-for-default.nix

···
    hash="0j6h6bc02c6qi0q7c1ncraz4d1hkm5936r35rfsp4x1jrc233wav";
    url="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-${version}.tar.gz";
    advertisedUrl="http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-1.1.tar.gz";
-  
-  
+
+
 }

pkgs/development/libraries/martyr/default.nix

···
 {stdenv, fetchurl, ant, jdk}:
 
 stdenv.mkDerivation rec {
-	pname = "martyr";
+  pname = "martyr";
   version = "0.3.9";
-	src = fetchurl {
-		url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
-		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
-	};
+  src = fetchurl {
+    url = "mirror://sourceforge/martyr/${pname}-${version}.tar.gz";
+    sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
+  };
 
   buildInputs = [ ant jdk ];
 

pkgs/development/libraries/opencore-amr/default.nix

···
 
 let
     version = "0.1.5";
-in 
+in
 stdenv.mkDerivation {
   pname = "opencore-amr";
   inherit version;
···
     url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz";
     sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c";
   };
-  
+
   meta = {
     homepage = "https://opencore-amr.sourceforge.io/";
-    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. 
+    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
     Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
     license = stdenv.lib.licenses.asl20;
     maintainers = [ stdenv.lib.maintainers.kiloreux ];

pkgs/development/libraries/qxt/default.nix

···
 stdenv.mkDerivation rec {
   pname = "qxt";
   version = "0.6.2";
-  
+
   src = fetchzip {
     url = "https://bitbucket.org/libqxt/libqxt/get/v${version}.tar.gz";
     sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";

pkgs/development/libraries/science/biology/bpp-seq/default.nix

···
 
   doCheck = !stdenv.isDarwin;
 
-  meta = bpp-core.meta // { 
+  meta = bpp-core.meta // {
     changelog = "https://github.com/BioPP/bpp-seq/blob/master/ChangeLog";
   };
 }

pkgs/development/libraries/szip/default.nix

···
 { stdenv, fetchurl }:
-    
+
 stdenv.mkDerivation rec {
   pname = "szip";
   version = "2.1.1";

pkgs/development/libraries/theft/default.nix

···
 
   doCheck = true;
   checkTarget = "test";
-  
+
   installFlags = [ "PREFIX=$(out)" ];
 
   # fix the libtheft.pc file to use the right installation
···
     substituteInPlace $out/lib/pkgconfig/libtheft.pc \
       --replace "/usr/local" "$out"
   '';
-  
+
   meta = with stdenv.lib; {
     description = "A C library for property-based testing";
     homepage    = "https://github.com/silentbicycle/theft/";

pkgs/development/libraries/tix/default.nix

···
      url = "mirror://sourceforge/tix/tix/8.4.3/Tix8.4.3-src.tar.gz";
      sha256 = "1jq3dkyk9mqkj4cg7mdk5r0cclqsby9l2b7wrysi0zk5yw7h8bsn";
   };
-  patches = [ 
+  patches = [
   (fetchpatch {
     name = "tix-8.4.3-tcl8.5.patch";
     url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
···
   buildInputs = [ tcl tk ];
   # the configure script expects to find the location of the sources of
   # tcl and tk in {tcl,tk}Config.sh
-  # In fact, it only needs some private headers. We copy them in 
+  # In fact, it only needs some private headers. We copy them in
   # the private_headers folders and trick the configure script into believing
   # the sources are here.
   preConfigure = ''

pkgs/development/libraries/tnt/default.nix

···
 stdenv.mkDerivation {
   pname = "tnt";
   version = "3.0.12";
-  
+
   src = fetchurl {
     url = "https://math.nist.gov/tnt/tnt_3_0_12.zip";
     sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7";

pkgs/development/libraries/udunits/default.nix

···
 stdenv.mkDerivation rec {
   pname = "udunits";
   version = "2.2.27.6";
-  
+
   src = fetchFromGitHub {
     owner = "Unidata";
     repo = "UDUNITS-2";

pkgs/development/ocaml-modules/faillib/default.nix

···
 
   src = fetchurl {
     url = "https://github.com/janestreet/faillib/archive/${version}.tar.gz";
-    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v"; 
+    sha256 = "12dvaxkmgf7yzzvbadcyk1n17llgh6p8qr33867d21npaljy7l9v";
   };
 
   propagatedBuildInputs = [ camlp4 herelib ];

pkgs/development/ocaml-modules/lablgl/default.nix

···
   name = "${pname}-${version}";
   version = "1.05";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz";
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };

pkgs/development/ocaml-modules/ocamlsdl/default.nix

···
-{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: 
+{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
 
 let
   pname = "ocamlsdl";
···
   name = "${pname}-${version}";
   version = "0.9.1";
 
-  src = fetchurl { 
+  src = fetchurl {
     url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
     sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
   };

pkgs/development/ocaml-modules/optcomp/default.nix

···
       sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";
     })
   ;
-  
+
   createFindlibDestdir = true;
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];

pkgs/development/ocaml-modules/piqi/default.nix

···
   version = "0.6.15";
   pname = "piqi";
   name = "ocaml${ocaml.version}-${pname}-${version}";
- 
+
   src = fetchFromGitHub {
     owner = "alavrik";
     repo = pname;

pkgs/development/ocaml-modules/rresult/default.nix

···
 	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ result ];
-  
+
 	inherit (topkg) buildPhase installPhase;
 
 	meta = {

pkgs/development/ocaml-modules/xml-light/default.nix

···
     make all
     make opt
   '';
-  
+
   installPhase = ''
     make install_ocamlfind
     mkdir -p $out/share

pkgs/development/pure-modules/gsl/default.nix

···
   baseName = "gsl";
   version = "0.12";
   name = "pure-${baseName}-${version}";
-  
+
   src = fetchurl {
     url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
     sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";

pkgs/development/python-modules/cbor2/default.nix

···
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  checkInputs = [ 
+  checkInputs = [
     pytest-cov
     pytestCheckHook
   ];

pkgs/development/python-modules/deprecated/default.nix

···
 { lib, stdenv, fetchPypi, buildPythonPackage,
-	wrapt, pytest, tox }:
+  wrapt, pytest, tox }:
 
 buildPythonPackage rec {
   pname = "Deprecated";

pkgs/development/python-modules/pint/default.nix

···
   disabled = pythonOlder "3.6";
 
   nativeBuildInputs = [ setuptools_scm ];
-  
+
   propagatedBuildInputs = [ packaging ]
     ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 

pkgs/development/python-modules/url-normalize/default.nix

···
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry
+, pytest-cov
+, pytest-flakes
+, pytest-mock
+, pytest-socket
+, pytestCheckHook
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "url-normalize";
+  version = "1.4.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "niksite";
+    repo = pname;
+    rev = version;
+    sha256 = "09nac5nh94x0n4bfazjfxk96b20mfsx6r1fnvqv85gkzs0rwqkaq";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [
+    pytest-cov
+    pytest-flakes
+    pytest-mock
+    pytest-socket
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "url_normalize" ];
+
+  meta = with lib; {
+    description = "URL normalization for Python";
+    homepage = "https://github.com/niksite/url-normalize";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/development/python-modules/virtualenv/default.nix

···
 { buildPythonPackage
+, fetchPypi
+, lib
+, stdenv
+, pythonOlder
+, isPy27
 , appdirs
 , contextlib2
-, cython
 , distlib
-, fetchPypi
 , filelock
-, fish
-, flaky
 , importlib-metadata
 , importlib-resources
-, isPy27
-, lib
 , pathlib2
-, pytest-freezegun
-, pytest-mock
-, pytest-timeout
-, pytestCheckHook
-, pythonOlder
 , setuptools_scm
 , six
-, stdenv
-, xonsh
 }:
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "20.3.1";
+  version = "20.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-DBEaIjaxkUIrN/6MKLjIKM7TmqtL9WJ/pcMxrv+1cNk=";
+    sha256 = "e0aac7525e880a429764cefd3aaaff54afb5d9f25c82627563603f5d7de5a6e5";
   };
 
   nativeBuildInputs = [
···
     ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
   ];
 
-  checkInputs = [
-    cython
-    fish
-    flaky
-    pytest-freezegun
-    pytest-mock
-    pytest-timeout
-    pytestCheckHook
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    xonsh
-  ];
-
-  preCheck = "export HOME=$(mktemp -d)";
-
-  # Ignore tests which requires network access
-  pytestFlagsArray = [
-    "--ignore tests/unit/create/test_creator.py"
-    "--ignore tests/unit/seed/embed/test_bootstrap_link_via_app_data.py"
-  ];
-
-  disabledTests = [ "test_can_build_c_extensions" ];
-  pythonImportsCheck = [ "virtualenv" ];
-
-  meta = with lib; {
+  meta = {
     description = "A tool to create isolated Python environments";
     homepage = "http://www.virtualenv.org";
-    license = licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ goibhniu ];
   };
 }

pkgs/development/python-modules/wrf-python/default.nix

···
     homepage = "http://wrf-python.rtfd.org";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mhaselsteiner ];
-	};
+  };
 }

pkgs/development/tools/analysis/emma/default.nix

···
 
 stdenv.mkDerivation {
   name = "emma-2.0.5312";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/emma/emma-2.0.5312.zip";
     sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj";

pkgs/development/tools/documentation/mkdocs/default.nix

···
       MkDocs is a fast, simple and downright gorgeous static site generator that's
       geared towards building project documentation. Documentation source files
       are written in Markdown, and configured with a single YAML configuration file.
-      
+
       MkDocs can also be used to generate general-purpose Websites.
     '';
     homepage = "http://mkdocs.org/";

pkgs/development/tools/fmbt/default.nix

···
     python.pkgs.wrapPython ];
 
   buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
-    gnuplot graphviz tesseract gts 
+    gnuplot graphviz tesseract gts
     ];
 
   propagatedBuildInputs = with python.pkgs; [

pkgs/development/tools/ineffassign/default.nix

···
 buildGoPackage rec {
   pname = "ineffassign-unstable";
   version = "2018-09-09";
-	rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
+  rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514";
 
   goPackagePath = "github.com/gordonklaus/ineffassign";
   excludedPackages = ''testdata'';

pkgs/development/tools/makerpm/default.nix

···
-{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }: 
+{ stdenv, fetchFromGitHub, zlib, libarchive, openssl }:
 
-stdenv.mkDerivation rec { 
+stdenv.mkDerivation rec {
   version = "1.0";
   pname = "makerpm";
 

pkgs/development/tools/metals/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "metals";
-  version = "0.9.8";
+  version = "0.9.10";
 
   deps = stdenv.mkDerivation {
     name = "${pname}-deps-${version}";
···
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "1gn7v1478sqhz4hv53pgvaw2nqziyiavvhn5q152lkzyvghq08wk";
+    outputHash     = "1i91jq1p27kkzxk57mm438sablnrx8j5pfyl0yg64wzrashba1xa";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/misc/doclifter/default.nix

···
     sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2";
   };
   buildInputs = [ python ];
-  
+
   makeFlags = [ "PREFIX=$(out)" ];
-  
+
   preInstall = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1
     cp manlifter $out/bin
     cp manlifter.1 $out/share/man/man1
   '';
-  
+
   meta = {
     description = "Lift documents in nroff markups to XML-DocBook";
     homepage = "http://www.catb.org/esr/doclifter";

pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix

···
 #
 #  configureFlags = if transitional then "--transitional" else "--strict";
 #
-#  buildFlags = [ "world.opt" ];		
+#  buildFlags = [ "world.opt" ];
 
   meta = {
     description = "Omake build system";

pkgs/development/tools/unity3d/default.nix

···
   version = "${ver}x${build}";
 
   src = fetchurl {
-  	url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
+    url = "https://beta.unity3d.com/download/6e9a27477296/LinuxEditorInstaller/Unity.tar.xz";
     sha1 = "083imikkrgha5w9sihjvv1m74naxm5yv";
   };
 

pkgs/development/tools/yuicompressor/default.nix

···
 stdenv.mkDerivation rec {
   pname = "yuicompressor";
   version = "2.4.8";
-  
+
   src = fetchurl {
     url = "https://github.com/yui/yuicompressor/releases/download/v${version}/${pname}-${version}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
···
     makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
-  
+
   meta = with lib; {
     description = "A JavaScript and CSS minifier";
     homepage = "http://yui.github.io/yuicompressor/";

pkgs/development/web/kcgi/default.nix

···
   patchPhase = ''substituteInPlace configure \
     --replace /usr/local /
   '';
-  
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
 

pkgs/development/web/remarkjs/default.nix

···
     rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c";
     sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0";
   };
-  
+
   nodePackages = import ./nodepkgs.nix {
     inherit pkgs;
     inherit (stdenv.hostPlatform) system;

pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix

···
   inifile = "linux/v0.${dwarf-fortress.baseVersion}.${dwarf-fortress.patchVersion}_${platformSlug}.ini";
 
 in
-  
+
 stdenv.mkDerivation {
   name = "dwarf-therapist-${dwarf-therapist.version}";
-  
+
   wrapper = ./dwarf-therapist.in;
 
   paths = [ dwarf-therapist ];

pkgs/games/dwarf-fortress/legends-browser/default.nix

···
     url = "https://github.com/robertjanetzko/LegendsBrowser/releases/download/${version}/legendsbrowser-${version}.jar";
     sha256 = "05b4ksbl4481rh3ykfirbp6wvxhppcd5mvclhn9995gsrcaj8gx9";
   };
-  
+
   script = writeShellScriptBin "legends-browser" ''
     set -eu
     BASE="$HOME/.local/share/df_linux/legends-browser/"

pkgs/games/dwarf-fortress/wrapper/default.nix

···
   '' + lib.optionalString enableTWBT ''
     substituteInPlace $out/data/init/init.txt \
       --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TWBT]'
-  '' + 
+  '' +
  lib.optionalString enableTextMode ''
     substituteInPlace $out/data/init/init.txt \
       --replace '[PRINT_MODE:2D]' '[PRINT_MODE:TEXT]'

pkgs/games/frogatto/data.nix

···
 { lib, stdenv, fetchFromGitHub }:
-  
+
 stdenv.mkDerivation {
   pname = "frogatto-data";
   version = "unstable-2018-12-18";
-  
+
   src = fetchFromGitHub {
     owner = "frogatto";
     repo = "frogatto";

pkgs/games/globulation/default.nix

···
 
   patches = [ ./header-order.patch ./public-buildproject.patch
     (fetchpatch {
-	  url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
-	  sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
-	})
+      url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
+      sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
+    })
   ];
 
   postPatch = ''

pkgs/games/rimshot/default.nix

···
 
   unpackPhase = ''
     unzip -j $src
-  '';  
+  '';
 
   installPhase =
   ''

pkgs/games/snake4/default.nix

···
       --replace "-o \$(OWNER) -g \$(GROUP)" "" \
       --replace "4755" "755"
   '';
-  
+
   installFlags = [ "INSTLIBDIR=$(out)/lib"
                    "INSTBINDIR=$(out)/bin"
                    "INSTMANDIR=$(out)/man" ];

pkgs/misc/drivers/epson-201106w/default.nix

···
       # NOTE: Don't forget to update the webarchive link too!
       urls = [
         "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
-        "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"     
+        "https://web.archive.org/web/https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201106w-${version}-1lsb3.2.src.rpm"
       ];
 
       sha256 = "1yig1xrh1ikblbp7sx706n5nnc237wy4mbch23ymy6akbgqg4aig";

pkgs/misc/drivers/epson-escpr/default.nix

···
     # To find new versions, visit
     # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
     # some printer like for instance "WF-7110" to get to the most recent
-    # version.  
+    # version.
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
       "https://download3.ebz.epson.net/dsc/f/03/00/09/83/26/f90d0f70b33a9d7d77a2408364c47fba1ccbf943/epson-inkjet-printer-escpr-1.7.3-1lsb3.2.tar.gz"

pkgs/misc/drivers/epson-escpr2/default.nix

···
     # To find new versions, visit
     # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
     # some printer like for instance "WF-7210" to get to the most recent
-    # version.  
+    # version.
     # NOTE: Don't forget to update the webarchive link too!
     urls = [
       "https://download3.ebz.epson.net/dsc/f/03/00/12/09/63/b7d2bb6a97c9ad99a96ebc68f8abcb1254888e94/epson-inkjet-printer-escpr2-1.1.24-1lsb3.2.src.rpm"

pkgs/misc/drivers/epson_201207w/default.nix

···
            Epson L550 Series
            Epson L555 Series
 
-	To use the driver adjust your configuration.nix file:
-	  services.printing = {
-	    enable = true;
-	    drivers = [ pkgs.epson_201207w ];
-	  };
+        To use the driver adjust your configuration.nix file:
+          services.printing = {
+            enable = true;
+            drivers = [ pkgs.epson_201207w ];
+          };
       '';
       license = with licenses; [ lgpl21 epson ];
       maintainers = [ maintainers.romildo ];

pkgs/os-specific/linux/can-isotp/default.nix

···
   version = "20200910";
 
   hardeningDisable = [ "pic" ];
-  
+
   src = fetchFromGitHub {
     owner = "hartkopp";
     repo = "can-isotp";
···
   '';
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
-  
+
   meta = with lib; {
     description = "Kernel module for ISO-TP (ISO 15765-2)";
     homepage = "https://github.com/hartkopp/can-isotp";
···
     platforms = platforms.linux;
     maintainers = [ maintainers.evck ];
   };
-}  
+}

pkgs/os-specific/linux/cifs-utils/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
-  version = "6.9";
+  version = "6.12";
 
   src = fetchurl {
     url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
-    sha256 = "175cp509wn1zv8p8mv37hkf6sxiskrsxdnq22mhlsg61jazz3n0q";
+    sha256 = "1vw570pvir73kl4y6fhd6ns936ankimkhb1ii43yh8lr0p1xqbcj";
   };
 
   nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
 
   buildInputs = [ kerberos keyutils pam talloc ];
 
-  configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+  configureFlags = [ "ROOTSBINDIR=$(out)/sbin" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # AC_FUNC_MALLOC is broken on cross builds.
     "ac_cv_func_malloc_0_nonnull=yes"
     "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
-  makeFlags = [ "root_sbindir=$(out)/sbin" ];
-
   meta = with lib; {
-    homepage = "http://www.samba.org/linux-cifs/cifs-utils/";
+    homepage = "https://wiki.samba.org/index.php/LinuxCIFS_utils";
     description = "Tools for managing Linux CIFS client filesystems";
     platforms = platforms.linux;
     license = licenses.lgpl3;

pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix

···
     platforms = platforms.linux;
     maintainers = with maintainers; [ zraexy ];
   };
-} 
+}

pkgs/os-specific/linux/input-utils/default.nix

···
 stdenv.mkDerivation rec {
   pname = "input-utils";
   version = "1.3";
-  
+
   src = fetchurl {
     url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
     sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";

pkgs/os-specific/linux/mxu11x0/default.nix

···
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/mxconf
     sed -i -e 's|/lib/modules|${kernel.dev}/lib/modules|' driver/Makefile
   '';
-  
+
   installPhase = ''
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/usb/serial/mxu11x0.ko"
     install -v -D -m 644 ./driver/mxu11x0.ko "$out/lib/modules/${kernel.modDirVersion}/misc/mxu11x0.ko"

pkgs/os-specific/linux/powerstat/default.nix

···
 stdenv.mkDerivation rec {
   pname = "powerstat";
   version = "0.02.24";
-  
+
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
     sha256 = "0yrc1xi9flxn2mvmzp0b0vd0md5z4p8fd4y8bszc67xy12qiqy0j";
   };
-  
+
   installFlags = [ "DESTDIR=${placeholder "out"}" ];
-  
+
   postInstall = ''
     mv $out/usr/* $out
     rm -r $out/usr
   '';
-  
+
   meta = with lib; {
     description = "Laptop power measuring tool";
     homepage = "https://kernel.ubuntu.com/~cking/powerstat/";

pkgs/os-specific/linux/rewritefs/default.nix

···
-{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }: 
+{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, pcre }:
 
 stdenv.mkDerivation {
   pname = "rewritefs";
···
     rev    = "33fb844d8e8ff441a3fc80d2715e8c64f8563d81";
     sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla";
   };
- 
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ fuse pcre ];
 

pkgs/servers/gopher/gofish/default.nix

···
     url = "mirror://sourceforge/project/gofish/gofish/${version}/${pname}-${version}.tar.gz";
     sha256 = "0br5nvlna86k4ya4q13gz0i7nlmk225lqmpfiqlkldxkr473kf0s";
   };
-  	
+
   meta = with lib; {
     description = "A lightweight Gopher server";
     homepage = "http://gofish.sourceforge.net/";

pkgs/servers/home-assistant/component-packages.nix

···
     "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
     "http" = ps: with ps; [ aiohttp-cors ];
     "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense
-    "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize
+    "huawei_lte" = ps: with ps; [ getmac stringcase url-normalize ]; # missing inputs: huawei-lte-api
     "huawei_router" = ps: with ps; [ ];
     "hue" = ps: with ps; [ aiohue ];
     "humidifier" = ps: with ps; [ ];
···
     "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
     "switcher_kis" = ps: with ps; [ aioswitcher ];
     "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
-    "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize
+    "syncthru" = ps: with ps; [ url-normalize ]; # missing inputs: pysyncthru
     "synology" = ps: with ps; [ ]; # missing inputs: py-synology
     "synology_chat" = ps: with ps; [ ];
     "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api

pkgs/servers/sickbeard/sickrage.nix

···
   src = fetchFromGitHub {
     owner = "SickRage";
     repo = "SickRage";
-    rev = version; 
+    rev = version;
     sha256 = "0lzklpsxqrb73inbv8almnhbnb681pmi44gzc8i4sjwmdksiiif9";
   };
 

pkgs/servers/wsdd/default.nix

···
   buildInputs = [ python3 ];
 
   patches = [
-    (fetchpatch {	
+    (fetchpatch {
       # https://github.com/christgau/wsdd/issues/72
-      name = "fix_send_messages_using_correct_socket.patch";	
-      url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch";	
-      sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg";	
+      name = "fix_send_messages_using_correct_socket.patch";
+      url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch";
+      sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg";
     })
   ];
 

pkgs/servers/xmpp/pyMAILt/default.nix

···
   version = "20090101";
 
   src = fetchcvs {
-		cvsRoot = ":pserver:[e-mail]:/cvsroot/xmpppy";
-		module = "xmpppy/mail-transport";
-		date = "2009-01-01";
-		sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
-	};
+    cvsRoot = ":pserver:[e-mail]:/cvsroot/xmpppy";
+    module = "xmpppy/mail-transport";
+    date = "2009-01-01";
+    sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
+  };
 
   pythonPath = [ xmpppy ];
   buildInputs = [ pythonPackages.wrapPython ];

pkgs/shells/pash/default.nix

···
 buildDotnetPackage {
   baseName = "pash";
   version = "git-2016-07-06";
-  
+
   src = fetchFromGitHub {
     owner = "Pash-Project";
     repo = "Pash";

pkgs/shells/zsh/zsh-powerlevel10k/default.nix

···
 in
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.14.4";
+  version = "1.14.6";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk";
+    sha256 = "1z6xipd7bgq7fc03x9j2dmg3yv59xyjf4ic5f1l6l6pw7w3q4sq7";
   };
 
   patches = [

pkgs/tools/X11/alttab/default.nix

···
     sha256 = "026xd1bkg10fj2q1n6xx797xk1grpby25qj1pnw2lp4f3vc19qn6";
   };
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     autoconf
     automake
     pkg-config

pkgs/tools/X11/xsettingsd/default.nix

···
   buildPhase = ''
     scons -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
   '';
-  
+
   installPhase = ''
     install -D -t "$out"/bin xsettingsd dump_xsettings
     install -D -t "$out"/usr/share/man/man1 xsettingsd.1 dump_xsettings.1

pkgs/tools/archivers/rpmextract/default.nix

···
   buildCommand = ''
     install -Dm755 $script $out/bin/rpmextract
   '';
-    
+
   script = substituteAll {
     src = ./rpmextract.sh;
     isExecutable = true;

pkgs/tools/backup/hpe-ltfs/default.nix

···
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ 
+  buildInputs = [
     fuse icu libxml2 libuuid
   ];
 

pkgs/tools/backup/iceshelf/default.nix

···
 
   format = "other";
 
-	src = fetchFromGitHub {
-		owner = "mrworf";
-		repo = pname;
-		rev = "26768dde3fc54fa412e523eb8f8552e866b4853b";
-		sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm";
+  src = fetchFromGitHub {
+    owner = "mrworf";
+    repo = pname;
+    rev = "26768dde3fc54fa412e523eb8f8552e866b4853b";
+    sha256 = "08rcbd14vn7312rmk2hyvdzvhibri31c4r5lzdrwb1n1y9q761qm";
   };
 
   propagatedBuildInputs = [
···
     python3.pkgs.python-gnupg
   ];
 
-	installPhase = ''
-		mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages}
+  installPhase = ''
+    mkdir -p $out/bin $out/share/doc/${pname} $out/${python3.sitePackages}
     cp -v iceshelf iceshelf-restore $out/bin
     cp -v iceshelf.sample.conf $out/share/doc/${pname}/
     cp -rv modules $out/${python3.sitePackages}
-	'';
+  '';
 
   meta = with lib; {
     description = "A simple tool to allow storage of signed, encrypted, incremental backups using Amazon's Glacier storage";

pkgs/tools/backup/ori/default.nix

···
     sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca";
   };
 
-  buildInputs = [ 
+  buildInputs = [
     boost pkg-config scons util-linux fuse libevent openssl zlib
   ];
 

pkgs/tools/bluetooth/openobex/default.nix

···
 { lib, stdenv, fetchurl, pkg-config, bluez, libusb-compat-0_1, cmake }:
-   
+
 stdenv.mkDerivation rec {
   name = "openobex-1.7.2";
-   
+
   src = fetchurl {
     url = "mirror://sourceforge/openobex/${name}-Source.tar.gz";
     sha256 = "1z6l7pbwgs5pjx3861cyd3r6vq5av984bdp4r3hgrw2jxam6120m";

pkgs/tools/filesystems/bcache-tools/default.nix

···
       Bcache is a Linux kernel block layer cache. It allows one or more fast
       disk drives such as flash-based solid state drives (SSDs) to act as a
       cache for one or more slower hard disk drives.
-      
+
       This package contains the required user-space tools.
 
       User documentation is in Documentation/bcache.txt in the Linux kernel

pkgs/tools/filesystems/ext4magic/default.nix

···
 
       If the information in the journal are sufficient, ext4magic can
       recover the most file types, with original filename, owner and group,
-      file mode bits and also the old atime/mtime stamps. 
+      file mode bits and also the old atime/mtime stamps.
 
       It's much more effective and works much better than extundelete.
     '';

pkgs/tools/filesystems/genext2fs/default.nix

···
 
 stdenv.mkDerivation {
   name = "genext2fs-1.4.1";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz";
     sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";

pkgs/tools/graphics/cfdg/src-for-default.nix

···
    hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p";
    url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz";
    advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz";
-  
-  
+
+
 }

pkgs/tools/graphics/scanbd/default.nix

···
       scanbd polls a scanner's buttons, looking for button presses, function
       knob changes, or other scanner events such as paper inserts and removals,
       while at the same time allowing scan-applications to access the scanner.
-      
+
       Various actions can be submitted (scan, copy, email, ...) via action
       scripts. The function knob values are passed to the action scripts as
       well. Scan actions are also signaled via dbus. This can be useful for
       foreign applications. Scans can also be triggered via dbus from foreign
       applications.
-      
+
       On platforms which support signaling of dynamic device insertion/removal
       (libudev, dbus, hal), scanbd supports this as well.
 
       scanbd can use all sane-backends or some special backends from the (old)
-      scanbuttond project. 
+      scanbuttond project.
     '';
     homepage = "http://scanbd.sourceforge.net/";
     downloadPage = "https://sourceforge.net/projects/scanbd/";

pkgs/tools/inputmethods/fcitx/default.nix

···
 { callPackage, plugins ? [] }:
 
-let 
+let
   unwrapped = callPackage ./unwrapped.nix { };
   wrapped   = callPackage ./wrapper.nix {
     plugins = plugins;
     fcitx   = unwrapped;
   };
-in if plugins == [] 
+in if plugins == []
    then unwrapped
    else wrapped

pkgs/tools/misc/dumptorrent/default.nix

···
 stdenv.mkDerivation rec {
     pname = "dumptorrent";
     version = "1.2";
-    
+
     src = fetchurl {
       url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz";
       sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm";

pkgs/tools/misc/dvtm/default.nix

···
     })
   ];
 }
-    
+

pkgs/tools/misc/latex2html/default.nix

···
 
 stdenv.mkDerivation rec {
   pname = "latex2html";
-  version = "2020.2";
+  version = "2021";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1icyl6kl60wh7cavprgbd8q6lpjwr7wn24m34kpiif7ahknhcbcm";
+    sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU=";
   };
 
   buildInputs = [ ghostscript netpbm perl ];

pkgs/tools/misc/pg_top/default.nix

···
 
   meta = with lib; {
     description = "A 'top' like tool for PostgreSQL";
-    longDescription = '' 
-      pg_top allows you to: 
+    longDescription = ''
+      pg_top allows you to:
        * View currently running SQL statement of a process.
        * View query plan of a currently running SQL statement.
        * View locks held by a process.

pkgs/tools/misc/pubs/default.nix

···
   };
 
   propagatedBuildInputs = with python3Packages; [
-    argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six 
+    argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six
     beautifulsoup4
   ];
 
   checkInputs = with python3Packages; [ pyfakefs mock ddt ];
 
   # Disabling git tests because they expect git to be preconfigured
-  # with the user's details. See 
+  # with the user's details. See
   # https://github.com/NixOS/nixpkgs/issues/94663
   preCheck = ''
     rm tests/test_git.py

pkgs/tools/misc/rargs/default.nix

···
     description = "xargs + awk with pattern matching support";
     homepage    = "https://github.com/lolabout/rargs";
     license     = with licenses; [ mit ];
-    maintainers = with maintainers; [ pblkt ]; 
+    maintainers = with maintainers; [ pblkt ];
   };
 }

pkgs/tools/misc/teamocil/default.nix

···
     license         = licenses.mit;
     platforms       = platforms.all;
     maintainers     = with maintainers; [
-      zachcoyle 
+      zachcoyle
       nicknovitski
     ];
   };

pkgs/tools/misc/tty-clock/default.nix

···
     rev = "v${version}";
     sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
   };
-  
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ ncurses ];
 

pkgs/tools/networking/openconnect_pa/default.nix

···
 stdenv.mkDerivation {
   version = "unstable-2018-10-08";
   pname = "openconnect_pa";
-  
+
   outputs = [ "out" "dev" ];
 
   src = fetchFromGitHub {
     owner = "dlenski";
     repo = "openconnect";
     rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";
-    sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax"; 
+    sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
   };
 
   preConfigure = ''
···
 
   nativeBuildInputs = [ pkg-config autoreconfHook ];
   propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
-  
+
   meta = with lib; {
     description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";
     homepage = "https://github.com/dlenski/openconnect/";

pkgs/tools/networking/sshoogr/default.nix

···
     '';
     longDescription = ''
       The sshoogr (pronounced [ʃʊgə]) is a Groovy-based DSL library for working
-      with remote servers through SSH. The DSL allows: connecting, executing 
-      remote commands, copying files and directories, creating tunnels in a 
+      with remote servers through SSH. The DSL allows: connecting, executing
+      remote commands, copying files and directories, creating tunnels in a
       simple and concise way.
     '';
     homepage = "https://github.com/aestasit/sshoogr";
···
     platforms = platforms.all;
     maintainers = with maintainers; [ moaxcp ];
   };
-} 
+}

pkgs/tools/networking/uget-integrator/default.nix

···
       substituteInPlace $f --replace "/usr" "$out"
     done
 
-	  install -D -t $out/bin                                   bin/uget-integrator
-	  install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
-	  install -D -t $out/etc/chromium/native-messaging-hosts   conf/com.ugetdm.chrome.json
-	  install -D -t $out/etc/opera/native-messaging-hosts      conf/com.ugetdm.chrome.json
-	  install -D -t $out/lib/mozilla/native-messaging-hosts    conf/com.ugetdm.firefox.json
+    install -D -t $out/bin                                   bin/uget-integrator
+    install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
+    install -D -t $out/etc/chromium/native-messaging-hosts   conf/com.ugetdm.chrome.json
+    install -D -t $out/etc/opera/native-messaging-hosts      conf/com.ugetdm.chrome.json
+    install -D -t $out/lib/mozilla/native-messaging-hosts    conf/com.ugetdm.firefox.json
 
     wrapPythonPrograms
   '';

pkgs/tools/networking/wolfebin/default.nix

···
 stdenv.mkDerivation rec {
   version = "5.4";
   pname = "wolfebin";
-  
+
   src = fetchFromGitHub {
     owner = "thejoshwolfe";
     repo = "wolfebin";

pkgs/tools/package-management/python2nix/default.nix

···
 
 pythonPackages.buildPythonApplication {
   name = "python2nix-20140927";
- 
+
   src = fetchFromGitHub {
     owner = "proger";
     repo = "python2nix";

pkgs/tools/security/git-hound/default.nix

···
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "git-hound";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "tillson";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf";
+  };
+
+  vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma";
+
+  meta = with lib; {
+    description = "Reconnaissance tool for GitHub code search";
+    longDescription = ''
+      GitHound pinpoints exposed API keys and other sensitive information
+      across all of GitHub using pattern matching, commit history searching,
+      and a unique result scoring system.
+    '';
+    homepage = "https://github.com/tillson/git-hound";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/tools/security/gitleaks/default.nix

···
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "gitleaks";
+  version = "7.2.0";
+
+  src = fetchFromGitHub {
+    owner = "zricethezav";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1pdbkjx8h6ijypsxyv34lykymaqf8wnfyjk3ldp49apbx01bl34y";
+  };
+
+  vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9";
+
+  meta = with lib; {
+    description = "Scan git repos (or files) for secrets";
+    longDescription = ''
+      Gitleaks is a SAST tool for detecting hardcoded secrets like passwords,
+      API keys, and tokens in git repos.
+    '';
+    homepage = "https://github.com/zricethezav/gitleaks";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/tools/security/hashcash/default.nix

···
 stdenv.mkDerivation rec {
   pname = "hashcash";
   version = "1.22";
-  
+
   buildInputs = [ openssl ];
 
   src = fetchurl {
     url = "http://www.hashcash.org/source/hashcash-${version}.tgz";
     sha256 = "15kqaimwb2y8wvzpn73021bvay9mz1gqqfc40gk4hj6f84nz34h1";
   };
-  
+
   makeFlags = [
     "generic-openssl"
     "LIBCRYPTO=-lcrypto"
···
     "MAN_INSTALL_PATH=${placeholder "out"}/share/man/man1"
     "DOC_INSTALL_PATH=${placeholder "out"}/share/doc/hashcash-$(version)"
   ];
-  
+
   meta = with lib; {
     description = "Proof-of-work algorithm used as spam and denial-of-service counter measure";
     homepage = "http://hashcash.org";

pkgs/tools/security/libacr38u/default.nix

···
     maintainers = with maintainers; [ berce ];
     platforms = with platforms; unix;
   };
-} 
+}

pkgs/tools/security/metasploit/Gemfile

···
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.25"

pkgs/tools/security/metasploit/Gemfile.lock

···
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58
-  ref: refs/tags/6.0.12
+  revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c
+  ref: refs/tags/6.0.25
   specs:
-    metasploit-framework (6.0.12)
+    metasploit-framework (6.0.25)
       actionpack (~> 5.2.2)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
···
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 2.0.22)
+      metasploit-payloads (= 2.0.26)
       metasploit_data_models
       metasploit_payloads-mettle (= 1.0.2)
       mqtt
···
       pcaprub
       pdf-reader
       pg
+      puma
       railties
       rb-readline
       recog
···
       windows_error
       xdr
       xmlrpc
+      zeitwerk
 
 GEM
   remote: https://rubygems.org/
···
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     arel (9.0.0)
-    arel-helpers (2.11.0)
+    arel-helpers (2.12.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.1.0)
-    aws-partitions (1.385.0)
-    aws-sdk-core (3.109.1)
+    aws-partitions (1.415.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.202.0)
+    aws-sdk-ec2 (1.220.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-iam (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-kms (1.40.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-s3 (1.87.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.16)
-    bcrypt_pbkdf (1.0.1)
+    bcrypt_pbkdf (1.1.0)
     bindata (2.4.8)
     bit-struct (0.16)
-    bson (4.11.0)
+    bson (4.11.1)
     builder (3.2.4)
     concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
     crass (1.0.6)
     daemons (1.3.1)
-    dnsruby (1.61.4)
+    dnsruby (1.61.5)
       simpleidn (~> 0.1)
     ed25519 (1.2.4)
     em-http-request (1.1.7)
···
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    erubi (1.9.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
-    faker (2.14.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.0)
     faye-websocket (0.11.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
···
     hrr_rb_ssh (0.3.0.pre2)
       ed25519 (~> 1.2)
     http_parser.rb (0.6.0)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     io-console (0.5.6)
-    irb (1.2.7)
+    irb (1.3.0)
       reline (>= 0.1.5)
     jmespath (1.4.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.3.1)
-    loofah (2.7.0)
+    json (2.5.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     metasm (1.0.4)
-    metasploit-concern (3.0.0)
+    metasploit-concern (3.0.1)
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-credential (4.0.2)
+    metasploit-credential (4.0.3)
       metasploit-concern
       metasploit-model
       metasploit_data_models (>= 3.0.0)
···
       rex-socket
       rubyntlm
       rubyzip
-    metasploit-model (3.1.2)
+    metasploit-model (3.1.3)
       activemodel (~> 5.2.2)
       activesupport (~> 5.2.2)
       railties (~> 5.2.2)
-    metasploit-payloads (2.0.22)
-    metasploit_data_models (4.1.0)
+    metasploit-payloads (2.0.26)
+    metasploit_data_models (4.1.1)
       activerecord (~> 5.2.2)
       activesupport (~> 5.2.2)
       arel-helpers
···
       recog (~> 2.0)
     metasploit_payloads-mettle (1.0.2)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_portile2 (2.5.0)
+    minitest (5.14.3)
     mqtt (0.5.0)
     msgpack (1.3.3)
     multipart-post (2.1.1)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nessus_rest (0.1.6)
-    net-ldap (0.16.3)
+    net-ldap (0.17.0)
     net-ssh (6.1.0)
     network_interface (0.0.2)
     nexpose (7.2.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.19.0)
+    nio4r (2.5.4)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.2)
···
       ttfunk
     pg (1.2.3)
     public_suffix (4.0.6)
+    puma (5.1.1)
+      nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-protection (2.1.0)
       rack
···
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rb-readline (0.5.5)
-    recog (2.3.15)
+    recog (2.3.18)
       nokogiri
-    redcarpet (3.5.0)
-    reline (0.1.6)
+    redcarpet (3.5.1)
+    reline (0.2.0)
       io-console (~> 0.5)
-    rex-arch (0.1.13)
+    rex-arch (0.1.14)
       rex-text
-    rex-bin_tools (0.1.6)
+    rex-bin_tools (0.1.7)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.13)
-    rex-encoder (0.1.4)
+    rex-core (0.1.14)
+    rex-encoder (0.1.5)
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.24)
+    rex-exploitation (0.1.26)
       jsobfu
       metasm
       rex-arch
       rex-encoder
       rex-text
-    rex-java (0.1.5)
-    rex-mime (0.1.5)
+    rex-java (0.1.6)
+    rex-mime (0.1.6)
       rex-text
-    rex-nop (0.1.1)
+    rex-nop (0.1.2)
       rex-arch
-    rex-ole (0.1.6)
+    rex-ole (0.1.7)
       rex-text
-    rex-powershell (0.1.87)
+    rex-powershell (0.1.88)
       rex-random_identifier
       rex-text
       ruby-rc4
-    rex-random_identifier (0.1.4)
+    rex-random_identifier (0.1.5)
       rex-text
-    rex-registry (0.1.3)
-    rex-rop_builder (0.1.3)
+    rex-registry (0.1.4)
+    rex-rop_builder (0.1.4)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.24)
+    rex-socket (0.1.25)
       rex-core
     rex-sslscan (0.1.5)
       rex-core
       rex-socket
       rex-text
-    rex-struct2 (0.1.2)
-    rex-text (0.2.28)
-    rex-zip (0.1.3)
+    rex-struct2 (0.1.3)
+    rex-text (0.2.29)
+    rex-zip (0.1.4)
       rex-text
     rkelly-remix (0.0.7)
-    ruby-macho (2.3.0)
+    ruby-macho (2.5.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.2)
-    ruby_smb (2.0.6)
+    ruby_smb (2.0.7)
       bindata
       openssl-ccm
       openssl-cmac
···
       tilt (~> 2.0)
     sqlite3 (1.4.2)
     sshkey (2.0.0)
-    thin (1.7.2)
+    thin (1.8.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    ttfunk (1.6.2.1)
-    tzinfo (1.2.7)
+    ttfunk (1.7.0)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2020.4)
+    tzinfo-data (1.2020.6)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
···
     xdr (3.0.2)
       activemodel (>= 4.2, < 7.0)
       activesupport (>= 4.2, < 7.0)
-    xmlrpc (0.3.0)
+    xmlrpc (0.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

pkgs/tools/security/metasploit/default.nix

···
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.0.12";
+  version = "6.0.25";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
+    sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/tools/security/metasploit/gemset.nix

···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp";
+      sha256 = "12wgkhajfsm3fgk43zf7xyxrx7q2kc4ggq459p1az6p0b9jscarx";
       type = "gem";
     };
-    version = "2.11.0";
+    version = "2.12.0";
   };
   Ascii85 = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb";
+      sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08";
       type = "gem";
     };
-    version = "1.385.0";
+    version = "1.415.0";
   };
   aws-sdk-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx";
+      sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4";
       type = "gem";
     };
-    version = "3.109.1";
+    version = "3.110.0";
   };
   aws-sdk-ec2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08";
+      sha256 = "1x3hw3ld27gxj0mmbaj4dw6aw90kr06mkjfx5wxxb807krp5giza";
       type = "gem";
     };
-    version = "1.202.0";
+    version = "1.220.0";
   };
   aws-sdk-iam = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a";
+      sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4";
       type = "gem";
     };
-    version = "1.39.0";
+    version = "1.40.0";
   };
   aws-sdk-s3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv";
+      sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7";
       type = "gem";
     };
-    version = "1.83.1";
+    version = "1.87.0";
   };
   aws-sigv4 = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35";
+      sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   bindata = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm";
+      sha256 = "12v95l3v7n7lh3mk8k1jdrkpn2vjnkb8k636hcygaczzv4jdsdfp";
       type = "gem";
     };
-    version = "4.11.0";
+    version = "4.11.1";
   };
   builder = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x";
+      sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx";
       type = "gem";
     };
-    version = "1.61.4";
+    version = "1.61.5";
   };
   ed25519 = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+      sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.0";
   };
   eventmachine = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6";
+      sha256 = "1l0dvswigzxaz9558wmfix3v8cmwwkgdvrx1fmpd3qnr5hky1qrk";
       type = "gem";
     };
-    version = "2.14.0";
+    version = "2.15.1";
   };
   faraday = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35";
+      sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.3.0";
+  };
+  faraday-net_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   faye-websocket = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+      sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv";
       type = "gem";
     };
-    version = "1.8.5";
+    version = "1.8.7";
   };
   io-console = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g";
+      sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.3.0";
   };
   jmespath = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
       type = "gem";
     };
-    version = "2.3.1";
+    version = "2.5.1";
   };
   loofah = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq";
+      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
       type = "gem";
     };
-    version = "2.7.0";
+    version = "2.8.0";
   };
   metasm = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2";
+      sha256 = "19cz0g463wl35gpdy1630n88a9m7fhhlcylspvvwc0m01sipc33g";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.1";
   };
   metasploit-credential = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx";
+      sha256 = "1f6cjvk68yypciycp8vdvhc5hrwmc8qi4y06s1cd77zj4m2skkmn";
       type = "gem";
     };
-    version = "4.0.2";
+    version = "4.0.3";
   };
   metasploit-framework = {
     groups = ["default"];
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58";
-      sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs";
+      rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c";
+      sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.0.12";
+    version = "6.0.25";
   };
   metasploit-model = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig";
+      sha256 = "0gmh23c3hc4my244m5lpd4kiysrsprag4rn6kvnnphxiflxvi4f7";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.1.3";
   };
   metasploit-payloads = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb";
+      sha256 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb";
       type = "gem";
     };
-    version = "2.0.22";
+    version = "2.0.26";
   };
   metasploit_data_models = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl";
+      sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "4.1.1";
   };
   metasploit_payloads-mettle = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
+      sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v";
+      sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j";
       type = "gem";
     };
-    version = "5.14.2";
+    version = "5.14.3";
   };
   mqtt = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv";
+      sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n";
       type = "gem";
     };
-    version = "0.16.3";
+    version = "0.17.0";
   };
   net-ssh = {
     groups = ["default"];
···
     };
     version = "7.2.1";
   };
+  nio4r = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk";
+      type = "gem";
+    };
+    version = "2.5.4";
+  };
   nokogiri = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
+      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
       type = "gem";
     };
-    version = "1.10.10";
+    version = "1.11.1";
   };
   octokit = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24";
+      sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
       type = "gem";
     };
-    version = "4.19.0";
+    version = "4.20.0";
   };
   openssl-ccm = {
     groups = ["default"];
···
     };
     version = "4.0.6";
   };
+  puma = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13640p5fk19705ygp8j6p07lccag3d80bx8bmjgpd5zsxxsdc50b";
+      type = "gem";
+    };
+    version = "5.1.1";
+  };
+  racc = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
   rack = {
     groups = ["default"];
     platforms = [];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
+      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
       type = "gem";
     };
-    version = "13.0.1";
+    version = "13.0.3";
   };
   rb-readline = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7";
+      sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69";
       type = "gem";
     };
-    version = "2.3.15";
+    version = "2.3.18";
   };
   redcarpet = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
+      sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi";
       type = "gem";
     };
-    version = "3.5.0";
+    version = "3.5.1";
   };
   reline = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk";
+      sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.2.0";
   };
   rex-arch = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvdy2ysiphdig258lkicbxqq2y47bkl69kgj4kkj8w338rb5kwa";
+      sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp";
       type = "gem";
     };
-    version = "0.1.13";
+    version = "0.1.14";
   };
   rex-bin_tools = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19q4cj7cis29k3zx9j2gp4h3ib0zig2fa4rs56c1gjr32f192zzk";
+      sha256 = "16w219ashxrgrgb5via9k45h7whrib77rmwy0f7akqf409pzjdp7";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.1.7";
   };
   rex-core = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b9pf7f8m2zjck65dpp8h8v4n0a05kfas6cn9adv0w8d9z58aqvv";
+      sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw";
       type = "gem";
     };
-    version = "0.1.13";
+    version = "0.1.14";
   };
   rex-encoder = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zm5jdxgyyp8pkfqwin34izpxdrmglx6vmk20ifnvcsm55c9m70z";
+      sha256 = "0lnrlii8d3r35927wp42bpdzh37dx3jqgdxk6lk5d6xvz6h14kp7";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   rex-exploitation = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0inrf2vahmpxhjf84i8ak2b7gcirsrjrmb1rnvvqqr9kl0xw5xm3";
+      sha256 = "0z4dn579mxl22qdxcnbmxp0diia6kr7c20giv0bn4r0viavz49gc";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.26";
   };
   rex-java = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j58k02p5g9snkpak64sb4aymkrvrh9xpqh8wsnya4w7b86w2y6i";
+      sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys";
       type = "gem";
     };
-    version = "0.1.5";
+    version = "0.1.6";
   };
   rex-mime = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15a14kz429h7pn81ysa6av3qijxjmxagjff6dyss5v394fxzxf4a";
+      sha256 = "0wzw1qcdgbn3iyskppy5038mcdrzplyai45pilm5qjj4fwvjdl6m";
       type = "gem";
     };
-    version = "0.1.5";
+    version = "0.1.6";
   };
   rex-nop = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0aigf9qsqsmiraa6zvfy1a7cyvf7zc3iyhzxi6fjv5sb8f64d6ny";
+      sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.1.2";
   };
   rex-ole = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pnzbqfnvbs0vc0z0ryszk3fxhgxrjd6gzwqa937rhlphwp5jpww";
+      sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp";
       type = "gem";
     };
-    version = "0.1.6";
+    version = "0.1.7";
   };
   rex-powershell = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11wi8dpb2s8bvkqhbf80g16nyj2hscs3vz31ffzl1g0g6imcs0dl";
+      sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif";
       type = "gem";
     };
-    version = "0.1.87";
+    version = "0.1.88";
   };
   rex-random_identifier = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fg94sczff5c2rlvqqgw2dndlqyzjil5rjk3p9f46ss2hc8zxlbk";
+      sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "0.1.5";
   };
   rex-registry = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wv812ghnz143vx10ixmv32ypj1xrzr4rh4kgam8d8wwjwxsgw1q";
+      sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rex-rop_builder = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xjd3d6wnbq4ym0d0m268md8fb16f2hbwrahvxnl14q63fj9i3wy";
+      sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rex-socket = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y";
+      sha256 = "1601b7vhp56sif21lk7mqcn3bbkhdrp6zz0vag8yzma3ji707pqg";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.25";
   };
   rex-sslscan = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nbdn53264a20cr2m2nq2v4mg0n33dvrd1jj1sixl37qjzw2k452";
+      sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "0.1.3";
   };
   rex-text = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44";
+      sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536";
       type = "gem";
     };
-    version = "0.2.28";
+    version = "0.2.29";
   };
   rex-zip = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mbfryyhcw47i7jb8cs8vilbyqgyiyjkfl1ngl6wdbf7d87dwdw7";
+      sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   rkelly-remix = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8";
+      sha256 = "05nfdv5isk3g13qhzm6axg70bghg1z5nbsl04dwqqhaifjys0dhf";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.5.0";
   };
   ruby-rc4 = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66";
+      sha256 = "0px84i3d9kqb40ff7nk3k7hb3w3kk80w5zsgi61svgddp1dbzh1n";
       type = "gem";
     };
-    version = "2.0.6";
+    version = "2.0.7";
   };
   rubyntlm = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
+      sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.8.0";
   };
   thor = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn";
+      sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13";
       type = "gem";
     };
-    version = "1.6.2.1";
+    version = "1.7.0";
   };
   tzinfo = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+      sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj";
       type = "gem";
     };
-    version = "1.2.7";
+    version = "1.2.9";
   };
   tzinfo-data = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a";
+      sha256 = "131dgg2sz3j15vp71xaijlb72nlii9fn8v5dc4vr6q7hrdq4kjf4";
       type = "gem";
     };
-    version = "1.2020.4";
+    version = "1.2020.6";
   };
   unf = {
     groups = ["default"];
···
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s744iwblw262gj357pky3d9fcx9hisvla7rnw29ysn5zsb6i683";
+      sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.3.1";
+  };
+  zeitwerk = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
+      type = "gem";
+    };
+    version = "2.4.2";
   };
 }

pkgs/tools/system/stress/default.nix

···
 
 stdenv.mkDerivation rec {
   name = "stress-1.0.4";
- 
+
   src = fetchurl {
     url = "https://people.seas.harvard.edu/~apw/stress/${name}.tar.gz";
     sha256 = "0nw210jajk38m3y7h8s130ps2qsbz7j75wab07hi2r3hlz14yzh5";

pkgs/tools/text/cconv/default.nix

···
   stdenv.mkDerivation {
   pname = "cconv";
   inherit version;
-  
+
   src = fetchurl {
     url = "https://github.com/xiaoyjy/cconv/archive/v${version}.tar.gz";
     sha256 = "82f46a94829f5a8157d6f686e302ff5710108931973e133d6e19593061b81d84";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   meta = with lib; {
     description = "A iconv based simplified-traditional chinese conversion tool";
     homepage = "https://github.com/xiaoyjy/cconv";

pkgs/tools/text/diffstat/default.nix

···
 { fetchurl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "diffstat-1.63";
+  name = "diffstat-1.64";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
       "https://invisible-mirror.net/archives/diffstat/${name}.tgz"
     ];
-    sha256 = "0vyw200s5dv1257pmrh6c6fdkmw3slyz5szpqfx916xr04sdbpby";
+    sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w=";
   };
 
   meta = with lib; {

pkgs/tools/text/enca/default.nix

···
     '';
 
     license = licenses.gpl2;
-   
+
   };
 }

pkgs/tools/video/untrunc-anthwlock/default.nix

···
     sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp";
   };
 
-  
+
   buildInputs = [ ffmpeg libui ];
 
   postBuild = ''

pkgs/top-level/all-packages.nix

···
 
   klipper = callPackage ../servers/klipper { };
 
+  klog = qt5.callPackage ../applications/radio/klog { };
+
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
   languagetool = callPackage ../tools/text/languagetool {  };
···
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  git-hound = callPackage ../tools/security/git-hound { };
+
   git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
 
   git-ignore = callPackage ../applications/version-management/git-and-tools/git-ignore { };
···
   gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };
+
+  gitleaks = callPackage ../tools/security/gitleaks { };
 
   gitaly = callPackage ../applications/version-management/gitlab/gitaly {
     ruby = ruby_2_7;

pkgs/top-level/python-packages.nix

···
 
   uritools = callPackage ../development/python-modules/uritools { };
 
+  url-normalize = callPackage ../development/python-modules/url-normalize { };
+
   urlgrabber = callPackage ../development/python-modules/urlgrabber { };
 
   urllib3 = callPackage ../development/python-modules/urllib3 { };