Merge staging-next into staging

.editorconfig

@@ -47,9 +47,10 @@ indent_style = space
 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

@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, perl, perlPackages }:
+{ stdenv, lib, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation {
   name = "nixpkgs-lint-1";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
       wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
     '';
 
-  meta = {
+  meta = with lib; {
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    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

@@ -1,11 +1,9 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 {
   options = {
-    gnu = mkOption {
+    gnu = lib.mkOption {
-      type = types.bool;
+      type = lib.types.bool;
       default = false;
       description = ''
         When enabled, GNU software is chosen by default whenever a there is
@@ -15,7 +13,7 @@ with lib;
     };
   };
 
-  config = mkIf config.gnu {
+  config = lib.mkIf config.gnu {
 
     environment.systemPackages = with pkgs;
       # TODO: Adjust `requiredPackages' from `system-path.nix'.
@@ -26,7 +24,7 @@ with lib;
         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

@@ -4,8 +4,8 @@ stdenv.mkDerivation rec {
   src = ./.;
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ boost nix ];
-  meta = {
+  meta = with lib; {
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ chkno ];
+    maintainers = with maintainers; [ chkno ];
   };
 }

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

@@ -19,18 +19,16 @@ nix-shell -E 'with import <nixpkgs> { }; brscan4-etc-files.override{netDevices=[
 
 */
 
-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 {
@@ -61,11 +59,11 @@ 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;
+    platforms = platforms.linux;
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
+    maintainers = with maintainers; [ jraygauthier ];
   };
 }

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

@@ -43,7 +43,7 @@ in
     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

@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
 
 {
   name = "searx";
-  meta = with pkgs.stdenv.lib.maintainers; {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [ rnhmjoj ];
   };
 

pkgs/applications/editors/texmaker/default.nix

@@ -24,10 +24,10 @@ mkDerivation rec {
   meta = with lib; {
     description = "TeX and LaTeX editor";
     longDescription=''
-	This editor is a full fledged IDE for TeX and
+      This editor is a full fledged IDE for TeX and
-	LaTeX editing with completion, structure viewer, preview,
+      LaTeX editing with completion, structure viewer, preview,
-	spell checking and support of any compilation chain.
+      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

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

pkgs/applications/misc/sidequest/default.nix

@@ -1,69 +1,69 @@
 { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
-	let
+  let
-		pname = "sidequest";
+    pname = "sidequest";
-		version = "0.10.11";
+    version = "0.10.11";
 
-		desktopItem = makeDesktopItem rec {
+    desktopItem = makeDesktopItem rec {
-			name = "SideQuest";
+      name = "SideQuest";
-			exec = "SideQuest";
+      exec = "SideQuest";
-			desktopName = name;
+      desktopName = name;
-			genericName = "VR App Store";
+      genericName = "VR App Store";
-			categories = "Settings;PackageManager;";
+      categories = "Settings;PackageManager;";
-		};
+    };
 
-		sidequest = stdenv.mkDerivation {
+    sidequest = stdenv.mkDerivation {
-			inherit pname version;
+      inherit pname version;
 
-			src = fetchurl {
+      src = fetchurl {
-				url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
+        url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
-				sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
+        sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9";
-			};
+      };
 
-			buildInputs = [ makeWrapper ];
+      buildInputs = [ makeWrapper ];
 
-			buildCommand = ''
+      buildCommand = ''
-				mkdir -p "$out/lib/SideQuest" "$out/bin"
+        mkdir -p "$out/lib/SideQuest" "$out/bin"
-				tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1
+        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"
+        # mkdir -p "$out/share/applications"
-				# ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
+        # ln -s "${desktopItem}/share/applications/*" "$out/share/applications"
 
-				patchelf \
+        patchelf \
-					--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-					--set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
+          --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \
-					"$out/lib/SideQuest/sidequest"
+          "$out/lib/SideQuest/sidequest"
-			'';
+      '';
-		};
+    };
-	in buildFHSUserEnv {
+  in buildFHSUserEnv {
-		name = "SideQuest";
+    name = "SideQuest";
 
-		passthru = {
+    passthru = {
-			inherit pname version;
+      inherit pname version;
 
-			meta = with lib; {
+      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";
+        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";
+        homepage = "https://github.com/the-expanse/SideQuest";
-				downloadPage = "https://github.com/the-expanse/SideQuest/releases";
+        downloadPage = "https://github.com/the-expanse/SideQuest/releases";
-				license = licenses.mit;
+        license = licenses.mit;
-				maintainers = with maintainers; [ joepie91 rvolosatovs ];
+        maintainers = with maintainers; [ joepie91 rvolosatovs ];
-				platforms = [ "x86_64-linux" ];
+        platforms = [ "x86_64-linux" ];
-			};
+      };
-		};
+    };
 
-		targetPkgs = pkgs: [
+    targetPkgs = pkgs: [
-			sidequest
+      sidequest
-			# Needed in the environment on runtime, to make QuestSaberPatch work
+      # Needed in the environment on runtime, to make QuestSaberPatch work
-			icu openssl zlib
+      icu openssl zlib
-		];
+    ];
 
-		extraInstallCommands = ''
+    extraInstallCommands = ''
-			mkdir -p "$out/share/applications"
+      mkdir -p "$out/share/applications"
-			ln -s ${desktopItem}/share/applications/* "$out/share/applications"
+      ln -s ${desktopItem}/share/applications/* "$out/share/applications"
-		'';
+    '';
 
-		runScript = "sidequest";
+    runScript = "sidequest";
-	}
+  }

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

@@ -2,16 +2,16 @@
 
 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

@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
       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

@@ -0,0 +1,28 @@
+{ 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

@@ -14,11 +14,11 @@
 
 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

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     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

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

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

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     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

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     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

@@ -9,7 +9,7 @@ in
     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

@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  
+
   buildInputs = [ unzip gsettings-desktop-schemas gtk3 ];
-  
+
   installPhase = ''
     mkdir -p $out/bin \
              $out/opt/${pname}
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     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

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

pkgs/applications/search/grepm/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
       -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

@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   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

@@ -454,7 +454,7 @@ in {
     })
   ];
 
-	# 4.5
+  # 4.5
   XSA_248_45 = [
     (xsaPatch {
       name = "248-4.5";

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

@@ -3,7 +3,7 @@
 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

@@ -2,21 +2,21 @@
 
 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

@@ -3,7 +3,7 @@ libvterm}:
 
 stdenv.mkDerivation rec {
   name = "vwm-2.1.3";
- 
+
   src = fetchurl {
     url = "mirror://sourceforge/vwm/${name}.tar.gz";
     sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
   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

@@ -10,6 +10,6 @@ stdenvNoCC.mkDerivation {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = sha256;
-  
+
   inherit url rev;
 }

pkgs/build-support/fetchmtn/default.nix

@@ -4,7 +4,7 @@
 # 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

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   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

@@ -15,7 +15,7 @@ in fetchzip rec {
 
   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

@@ -16,7 +16,7 @@ gsmakeDerivation {
   # 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

@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   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

@@ -189,7 +189,7 @@ stdenv.mkDerivation (rec {
   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

@@ -194,7 +194,7 @@ stdenv.mkDerivation (rec {
   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

@@ -198,7 +198,7 @@ stdenv.mkDerivation (rec {
   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

@@ -203,7 +203,7 @@ stdenv.mkDerivation (rec {
   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

@@ -5,7 +5,7 @@ let
 in stdenv.mkDerivation {
   pname = "manticore";
   version = "2019.12.03";
- 
+
   src = fetchFromGitHub {
     owner = "ManticoreProject";
     repo = "manticore";
@@ -14,9 +14,9 @@ in stdenv.mkDerivation {
   };
 
   enableParallelBuilding = false;
- 
+
   nativeBuildInputs = [ autoreconfHook ];
-  
+
   buildInputs = [ coreutils smlnj ];
 
   autoreconfFlags = "-Iconfig -vfi";
@@ -28,8 +28,8 @@ in stdenv.mkDerivation {
     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'
@@ -40,14 +40,14 @@ in stdenv.mkDerivation {
   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

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     [ (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

@@ -8,7 +8,7 @@ build-idris-package  {
   version = "2020-02-11";
 
   ipkgName = "TParsec";
-  
+
   idrisDeps = [ contrib ];
 
   src = fetchFromGitHub {

pkgs/development/libraries/SDL_Pango/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     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

@@ -17,23 +17,23 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "SDL graphics drawing primitives and support functions";
 
-    longDescription =
+    longDescription = ''
-      '' The SDL_gfx library evolved out of the SDL_gfxPrimitives code
+      The SDL_gfx library evolved out of the SDL_gfxPrimitives code
-	 which provided basic drawing routines such as lines, circles or
+      which provided basic drawing routines such as lines, circles or
-	 polygons and SDL_rotozoom which implemented a interpolating
+      polygons and SDL_rotozoom which implemented a interpolating
-	 rotozoomer for SDL surfaces.
+      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)
+        * Graphic Primitives (SDL_gfxPrimitves.h)
-	    * Rotozoomer (SDL_rotozoom.h)
+        * Rotozoomer (SDL_rotozoom.h)
-	    * Framerate control (SDL_framerate.h)
+        * Framerate control (SDL_framerate.h)
-	    * MMX image filters (SDL_imageFilter.h)
+        * MMX image filters (SDL_imageFilter.h)
-	    * Custom Blit functions (SDL_gfxBlitFunc.h)
+        * Custom Blit functions (SDL_gfxBlitFunc.h)
 
-	 The library is backwards compatible to the above mentioned
+      The library is backwards compatible to the above mentioned
-         code. Its is written in plain C and can be used in C++ code.
+      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

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

pkgs/development/libraries/biblesync/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       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

@@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec {
 
   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

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
     + "PREFIX=$out ./make.sh install";
-  
+
   nativeBuildInputs = [
     pkg-config
   ];

pkgs/development/libraries/cdk/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cdk";
-  version ="5.0-20200923";
+  version ="5.0-20210109";
 
   buildInputs = [
     ncurses
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
       "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

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   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

@@ -2,7 +2,7 @@
 
 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

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     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

@@ -12,12 +12,12 @@ in
       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

@@ -12,12 +12,12 @@ in
       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

@@ -35,9 +35,9 @@ stdenvNoCC.mkDerivation {
     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
+      The Executable and Linkable Format (ELF, formerly named Extensible Linking
-	  Format), is usually defined in a header like this.
+      Format), is usually defined in a header like this.
-	'';
+    '';
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.ericson2314 ];
   };

pkgs/development/libraries/fastpbkdf2/default.nix

@@ -2,14 +2,14 @@
 
 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

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     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

@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
     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

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, libunwind }:
+{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, libunwind }:
 
 stdenv.mkDerivation rec {
   name = "gperftools-2.8";
@@ -20,21 +20,21 @@ stdenv.mkDerivation rec {
   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
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
-    "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable";
+    "-D_XOPEN_SOURCE";
 
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   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

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
       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

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

pkgs/development/libraries/jabcode/default.nix

@@ -3,7 +3,7 @@
 , 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

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

pkgs/development/libraries/jemalloc/jemalloc450.nix

@@ -1,4 +1,4 @@
 import ./common.nix {
   version = "4.5.0";
   sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-} 
+}

pkgs/development/libraries/levmar/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl }:
-        
+
 stdenv.mkDerivation rec {
   name = "levmar-2.6";
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     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

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip }:
-        
+
 stdenv.mkDerivation rec {
   name = "lib3ds-1.3.0";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   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

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   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

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     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

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   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

@@ -2,7 +2,7 @@
 
 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

@@ -4,7 +4,7 @@ with stdenv.lib;
 
 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

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   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

@@ -2,7 +2,7 @@
 
 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

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ] 
+  nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]
     ++ lib.optional enablePython swig;
 
   buildInputs = [ pcre2 ]

pkgs/development/libraries/libwpd/default.nix

@@ -2,12 +2,12 @@
 
 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

@@ -4,6 +4,6 @@ rec {
    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

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

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

@@ -2,7 +2,7 @@
 
 let
     version = "0.1.5";
-in 
+in
 stdenv.mkDerivation {
   pname = "opencore-amr";
   inherit version;
@@ -10,10 +10,10 @@ stdenv.mkDerivation {
     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

@@ -3,7 +3,7 @@
 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

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   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

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

pkgs/development/libraries/theft/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkTarget = "test";
-  
+
   installFlags = [ "PREFIX=$(out)" ];
 
   # fix the libtheft.pc file to use the right installation
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     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

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
      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";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   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

@@ -3,7 +3,7 @@
 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

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

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

@@ -11,7 +11,7 @@ buildOcaml rec {
 
   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

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   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

@@ -1,4 +1,4 @@
-{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";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   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

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
       sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";
     })
   ;
-  
+
   createFindlibDestdir = true;
 
   buildInputs = [ ocaml findlib ocamlbuild camlp4 ];

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   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

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 	buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   propagatedBuildInputs = [ result ];
-  
+
 	inherit (topkg) buildPhase installPhase;
 
 	meta = {

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

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     make all
     make opt
   '';
-  
+
   installPhase = ''
     make install_ocamlfind
     mkdir -p $out/share

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   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

@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools_scm ];
 
-  checkInputs = [ 
+  checkInputs = [
     pytest-cov
     pytestCheckHook
   ];

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

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

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

@@ -25,7 +25,7 @@ buildPythonPackage rec {
   disabled = pythonOlder "3.6";
 
   nativeBuildInputs = [ setuptools_scm ];
-  
+
   propagatedBuildInputs = [ packaging ]
     ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 

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

@@ -0,0 +1,45 @@
+{ 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

@@ -1,35 +1,27 @@
 { 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 = [
@@ -55,33 +47,10 @@ buildPythonPackage rec {
     ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch
   ];
 
-  checkInputs = [
+  meta = {
-    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; {
     description = "A tool to create isolated Python environments";
     homepage = "http://www.virtualenv.org";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ goibhniu ];
+    maintainers = with lib.maintainers; [ goibhniu ];
   };
 }

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

@@ -39,5 +39,5 @@ buildPythonPackage rec {
     homepage = "http://wrf-python.rtfd.org";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mhaselsteiner ];
-	};
+  };
 }

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

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