From 3c190ee25a519fb39901ca2b8a69d1e062f5022f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 11:49:54 +0200 Subject: [PATCH 01/10] python3Packages.typer: 0.3.2 -> 0.4.0 --- .../python-modules/typer/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 620ec7ce6892..bc55e3ab8ff7 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/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 ]; }; } From ead3028db029d577f6dd4b2983eb093a2919a28a Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Sun, 29 Aug 2021 22:08:36 +0200 Subject: [PATCH 02/10] nixos/syncthing: fix escapes interpreted in config Dash `echo` interprets backslash escapes. This causes two consecutive backslashes in JSON to turn into a single one before the string is passed to jq, resulting in a parsing error. --- nixos/modules/services/networking/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d77562701492..1a1b12f979c2 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/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}') From 9b861bd3b0389c2095beb55f5795f820c1a70982 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:40:46 +0000 Subject: [PATCH 03/10] linuxPackages.vhba: enable PIC When this was added in 21282246208 ("linuxPackages.vhba: disable PIC hardening"), it was necessary to prevent a build failure. Since it now builds fine with PIC enabled, I think it's safe to enable it. --- pkgs/misc/emulators/cdemu/vhba.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 182469310c41..5f65dca11052 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { 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/"; From 067da6cc0ba13786ee93a03a50892f1f124aa6a5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 12:37:56 +0000 Subject: [PATCH 04/10] linuxPackages.vhba: 20190831 -> 20210418 --- pkgs/misc/emulators/cdemu/vhba.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 5f65dca11052..1a4357b543b1 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ 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)" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 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 ]; From 8d0364eeaefda67e8c7a39693c857c20e06db50e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:11:01 +0000 Subject: [PATCH 05/10] libmirage: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/base.nix | 5 +++-- pkgs/misc/emulators/cdemu/libmirage.nix | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 6db1089a37f5..7c7c370b571d 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,10 +1,11 @@ { pkgName, version, pkgSha256 }: { lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; + ext = if lib.versionAtLeast version "3.2.5" then ".xz" else ".bz2"; in stdenv.mkDerivation ({ inherit name buildInputs; src = fetchurl { - url = "mirror://sourceforge/cdemu/${name}.tar.bz2"; + url = "mirror://sourceforge/cdemu/${name}.tar${ext}"; sha256 = pkgSha256; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -29,7 +30,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 ]; diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index 9813c906befc..0025226d2087 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/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 ]; From a08181ed7298e89ec9b3cb079a37a00d20f82df9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:12:12 +0000 Subject: [PATCH 06/10] image-analyzer: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/analyzer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index dddcc3a74682..21ec032f5cca 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/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 From 1c6e1eb81e223702afe20d24132f7eb1b457bc37 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:13:51 +0000 Subject: [PATCH 07/10] cdemu-client: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/client.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/misc/emulators/cdemu/client.nix index 087b15cecd16..0572dda59546 100644 --- a/pkgs/misc/emulators/cdemu/client.nix +++ b/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 From 346fd57a3703183a641f5bbc1e212bb9f88f6fd8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:14:48 +0000 Subject: [PATCH 08/10] cdemu-daemon: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/misc/emulators/cdemu/daemon.nix index db6ed7ddb47a..4fc3ea211993 100644 --- a/pkgs/misc/emulators/cdemu/daemon.nix +++ b/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 ]; From 8a2ec31e224de9461390cdd03e5e0b0290cdad0b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 15:17:00 +0000 Subject: [PATCH 09/10] gcdemu: 3.2.3 -> 3.2.5 --- pkgs/misc/emulators/cdemu/base.nix | 3 +-- pkgs/misc/emulators/cdemu/gui.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 7c7c370b571d..1754f2ad4bbc 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,11 +1,10 @@ { pkgName, version, pkgSha256 }: { lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; - ext = if lib.versionAtLeast version "3.2.5" then ".xz" else ".bz2"; in stdenv.mkDerivation ({ inherit name buildInputs; src = fetchurl { - url = "mirror://sourceforge/cdemu/${name}.tar${ext}"; + url = "mirror://sourceforge/cdemu/${name}.tar.xz"; sha256 = pkgSha256; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 8ce84ccae204..6f5313c4cca7 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/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 { From d24e724084e69ea4b2bb8b283a97d4d6076778db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 30 Aug 2021 11:30:09 +0200 Subject: [PATCH 10/10] ipcalc: 0.4.1 -> 1.0.1 --- pkgs/tools/networking/ipcalc/default.nix | 46 ++++++++++++++++-------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 5fec55899e46..2237c739ec14 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/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; [ ]; }; }