Merge master into staging-next

nixos/modules/services/networking/syncthing.nix

@@ -46,7 +46,7 @@ let
     old_cfg=$(curl ${cfg.guiAddress}/rest/config)
 
     # generate the new config by merging with the NixOS config options
-    new_cfg=$(echo "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
+    new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
         "devices": (${builtins.toJSON devices}${optionalString (! cfg.overrideDevices) " + .devices"}),
         "folders": (${builtins.toJSON folders}${optionalString (! cfg.overrideFolders) " + .folders"})
     } * ${builtins.toJSON cfg.extraOptions}')

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

@@ -4,29 +4,32 @@
 , click
 , pytestCheckHook
 , shellingham
-, pytest-cov
 , pytest-xdist
 , pytest-sugar
 , coverage
 , mypy
 , black
 , isort
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "typer";
-  version = "0.3.2";
+  version = "0.4.0";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00v3h63dq8yxahp9vg3yb9r27l2niwv8gv0dbds9dzrc298dfmal";
+    sha256 = "1pgm0zsylbmz1r96q4n3rfi0h3pn4jss2yfs83z0yxa90nmsxhv3";
   };
 
-  propagatedBuildInputs = [ click ];
+  propagatedBuildInputs = [
+    click
+  ];
 
   checkInputs = [
     pytestCheckHook
-    pytest-cov
     pytest-xdist
     pytest-sugar
     shellingham
@@ -35,18 +38,17 @@ buildPythonPackage rec {
     black
     isort
   ];
-  pytestFlagsArray = [
-    "--ignore=tests/test_completion/test_completion.py"
-    "--ignore=tests/test_completion/test_completion_install.py"
-  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d);
+  '';
+
+  pythonImportsCheck = [ "typer" ];
 
   meta = with lib; {
+    description = "Python library for building CLI applications";
     homepage = "https://typer.tiangolo.com/";
-    description = "Typer, build great CLIs. Easy to code. Based on Python type hints.";
     license = licenses.mit;
-    # is incompatible with click8
-    # https://github.com/tiangolo/typer/issues/280
-    broken = true;
-    maintainers = [ maintainers.winpat ];
+    maintainers = with maintainers; [ winpat ];
   };
 }

pkgs/misc/emulators/cdemu/analyzer.nix

@@ -1,9 +1,9 @@
 { callPackage, makeWrapper, gobject-introspection, cmake
 , python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }:
 let pkg = import ./base.nix {
-  version = "3.2.3";
+  version = "3.2.5";
   pkgName = "image-analyzer";
-  pkgSha256 = "17yfjmf65s77214qassz6l01cjcni4cv06nzfsm7qrzw172fmci4";
+  pkgSha256 = "00906lky0z1m0bdqnjmzxgcb19dzvljhddhh42lixyr53sjp94cc";
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper

pkgs/misc/emulators/cdemu/base.nix

@@ -4,7 +4,7 @@ let name = "${pkgName}-${version}";
 in stdenv.mkDerivation ({
   inherit name buildInputs;
   src = fetchurl {
-    url = "mirror://sourceforge/cdemu/${name}.tar.bz2";
+    url = "mirror://sourceforge/cdemu/${name}.tar.xz";
     sha256 = pkgSha256;
   };
   nativeBuildInputs = [ pkg-config cmake ];
@@ -29,7 +29,7 @@ in stdenv.mkDerivation ({
 
       Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed.
     '';
-    homepage = "http://cdemu.sourceforge.net/";
+    homepage = "https://cdemu.sourceforge.io/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with lib.maintainers; [ bendlas ];

pkgs/misc/emulators/cdemu/client.nix

@@ -1,8 +1,8 @@
 { callPackage, python3Packages, intltool, makeWrapper }:
 let pkg = import ./base.nix {
-  version = "3.2.3";
+  version = "3.2.5";
   pkgName = "cdemu-client";
-  pkgSha256 = "1bvc2m63fx03rbp3ihgl2n7k24lwg5ydwkmr84gsjfcxp46q10zq";
+  pkgSha256 = "1prrdhv0ia0axc6b73crszqzh802wlkihz6d100yvg7wbgmqabd7";
 };
 in callPackage pkg {
   buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3

pkgs/misc/emulators/cdemu/daemon.nix

@@ -1,8 +1,8 @@
 { callPackage, glib, libao, intltool, libmirage }:
 let pkg = import ./base.nix {
-  version = "3.2.3";
+  version = "3.2.5";
   pkgName = "cdemu-daemon";
-  pkgSha256 = "022xzgwmncswb9md71w3ly3mjkdfc93lbij2llp2jamq8grxjjxr";
+  pkgSha256 = "16g6fv1lxkdmbsy6zh5sj54dvgwvm900fd18aq609yg8jnqm644d";
 };
 in callPackage pkg {
   buildInputs = [ glib libao libmirage intltool ];

pkgs/misc/emulators/cdemu/gui.nix

@@ -2,9 +2,9 @@
 , python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
-    version = "3.2.3";
+    version = "3.2.5";
     pkgName = "gcdemu";
-    pkgSha256 = "19vy1awha8s7cfja3a6npaf3rfy3pl3cbsh4vd609q9jz4v4lyg4";
+    pkgSha256 = "1nvpbq4mz8caw91q5ny9gf206g9bypavxws9nxyfcanfkc4zfkl4";
   };
   inherit (python3Packages) python pygobject3;
 in callPackage pkg {

pkgs/misc/emulators/cdemu/libmirage.nix

@@ -3,9 +3,9 @@
 , pcre, util-linux, libselinux, libsepol }:
 
 let pkg = import ./base.nix {
-  version = "3.2.3";
+  version = "3.2.5";
   pkgName = "libmirage";
-  pkgSha256 = "08mfvqyk3833ksfd47i4j3ppmrw5ry219km6h7lywdh9hm9x14yf";
+  pkgSha256 = "0f8i2ha44rykkk3ac2q8zsw3y1zckw6qnf6zvkyrj3qqbzhrf3fm";
 };
 in callPackage pkg {
   buildInputs = [ glib libsndfile zlib bzip2 xz libsamplerate intltool ];

pkgs/misc/emulators/cdemu/vhba.nix

@@ -2,21 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "vhba";
-  version = "20190831";
+  version = "20210418";
 
   src  = fetchurl {
-    url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
-    sha256 = "1ybbk6l06n0y11n5wnfmvdz0baizmq55l458ywimghdyz0n7g0ws";
+    url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz";
+    sha256 = "119zgav6caialmf3hr096wkf72l9h76sqc9w5dhx26kj4yp85g8q";
   };
 
   makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
-  hardeningDisable = [ "pic" ];
-
   meta = with lib; {
     description = "Provides a Virtual (SCSI) HBA";
-    homepage = "http://cdemu.sourceforge.net/about/vhba/";
+    homepage = "https://cdemu.sourceforge.io/about/vhba/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ bendlas ];

pkgs/tools/networking/ipcalc/default.nix

@@ -1,20 +1,38 @@
-{lib, stdenv, fetchurl, perl}:
+{ lib
+, stdenv
+, fetchFromGitLab
+, glib
+, meson
+, ninja
+, libmaxminddb
+, pkg-config
+, ronn
+}:
+
 stdenv.mkDerivation rec {
   pname = "ipcalc";
-  version = "0.41";
-  src = fetchurl {
-    url = "http://jodies.de/ipcalc-archive/${pname}-${version}.tar.gz";
-    sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
+  version = "1.0.1";
+
+  src = fetchFromGitLab {
+    owner = "ipcalc";
+    repo = "ipcalc";
+    rev = version;
+    sha256 = "0qg516jv94dlk0qj0bj5y1dd0i31ziqcjd6m00w8xp5wl97bj2ji";
   };
-  buildInputs = [perl];
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ipcalc $out/bin
-  '';
-  meta = {
+
+  nativeBuildInputs = [
+    glib
+    meson
+    ninja
+    pkg-config
+    libmaxminddb
+    ronn
+  ];
+
+  meta = with lib; {
     description = "Simple IP network calculator";
-    homepage = "http://jodies.de/ipcalc";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.all;
+    homepage = "https://gitlab.com/ipcalc/ipcalc";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
   };
 }