From 97ef39efbc5798b457fe766aac28f6d914e1f8e6 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Wed, 10 Feb 2021 14:57:59 +0100 Subject: [PATCH 1/9] nixos/matomo: add periodicArchiveProcessingUrl option --- nixos/modules/services/web-apps/matomo.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 75da474dc446..79a0354e22b4 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -77,6 +77,16 @@ in { ''; }; + periodicArchiveProcessingUrl = mkOption { + type = types.str; + default = "${user}.${fqdn}"; + example = "matomo.yourdomain.org"; + description = '' + URL of the host, without https prefix. By default, this is ${user}.${fqdn}, but you may want to change it if you + run Matomo on a different URL than matomo.yourdomain. + ''; + }; + nginx = mkOption { type = types.nullOr (types.submodule ( recursiveUpdate @@ -190,7 +200,7 @@ in { UMask = "0007"; CPUSchedulingPolicy = "idle"; IOSchedulingClass = "idle"; - ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${user}.${fqdn}"; + ExecStart = "${cfg.package}/bin/matomo-console core:archive --url=https://${cfg.periodicArchiveProcessingUrl}"; }; }; From 5faa7056f9ee3dc11096742da4d2eda627b6514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 2 Jun 2021 13:07:50 +0200 Subject: [PATCH 2/9] nixos/virtualbox-image: add exportParams This allows the user to specify custom export parameters like adding a vendor to the exported VM --- .../modules/virtualisation/virtualbox-image.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 071edda82693..272c696807aa 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -58,7 +58,19 @@ in { Run VBoxManage modifyvm --help to see more options. ''; - }; + }; + exportParams = mkOption { + type = with types; listOf (oneOf [ str int bool (listOf str) ]); + example = [ + "--vsys" "0" "--vendor" "ACME Inc." + ]; + default = []; + description = '' + Parameters passed to the Virtualbox export command. + + Run VBoxManage export --help to see more options. + ''; + }; extraDisk = mkOption { description = '' Optional extra disk/hdd configuration. @@ -158,7 +170,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" --options manifest + VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} rm -v $diskImage From 572c9219ad1f4ecffa2ff0459f2e0b1355c78dc5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 27 Jun 2021 01:35:41 -0300 Subject: [PATCH 3/9] wio:0.0.0+unstable=2021-06-01 -> 0.0.0+unstable=2021-06-27 --- pkgs/applications/window-managers/wio/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index 0f7402b3710c..03ec26f6fb8b 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromBitbucket -, fetchpatch , meson , ninja , pkg-config @@ -20,23 +19,15 @@ stdenv.mkDerivation rec { pname = "wio"; - version = "0.0.0+unstable=2021-06-01"; + version = "0.0.0+unstable=2021-06-27"; src = fetchFromBitbucket { owner = "anderson_torres"; repo = pname; - rev = "ad57eb45ba0459cd0b16ba486cb6e01626079c29"; - sha256 = "sha256-mCggAscQ+Ej3SNwhA6QxecV1nH6Rw8RDf8yAsbadqjE="; + rev = "e0b258777995055d69e61a0246a6a64985743f42"; + sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI="; }; - patches = [ - # Fix the build with wlroots 0.14: - (fetchpatch { - url = "https://git.sr.ht/~primeos/wio/commit/9d5093c019f6966b8ee0dba1da3361a761d04bcc.patch"; - sha256 = "08hfmcs1fbz8pdxwcaidrhvydf19482i6wics75a41ilrdh0dpi1"; - }) - ]; - nativeBuildInputs = [ meson ninja From 74281b9faa2f5cf64f43573b04e7a30fdf559a80 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 27 Jun 2021 21:55:09 -0400 Subject: [PATCH 4/9] globalprotect-vpn: add missing 'mkIf cfg.enable' spotted by @lopsided98 --- nixos/modules/services/networking/globalprotect-vpn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/globalprotect-vpn.nix b/nixos/modules/services/networking/globalprotect-vpn.nix index 80183f55d320..367a42687e13 100644 --- a/nixos/modules/services/networking/globalprotect-vpn.nix +++ b/nixos/modules/services/networking/globalprotect-vpn.nix @@ -26,7 +26,7 @@ in }; }; - config = { + config = mkIf cfg.enable { services.dbus.packages = [ pkgs.globalprotect-openconnect ]; systemd.services.gpservice = { From 110a85fd367e6e0d2443a403863548247abe1be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 28 Apr 2021 03:59:32 +0200 Subject: [PATCH 5/9] distrobuilder: 2019_10_07 -> 1.2 Co-authored-by: Sandro --- .../virtualization/distrobuilder/default.nix | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index d06a2b4a17ef..a6f479dc71ab 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,31 +1,51 @@ -{ lib, pkg-config, buildGoPackage, fetchFromGitHub -, makeWrapper, coreutils, gnupg, gnutar, squashfsTools, debootstrap +{ lib +, pkg-config +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, gnupg +, gnutar +, squashfsTools +, debootstrap }: -let binPath = lib.makeBinPath [ - coreutils gnupg gnutar squashfsTools debootstrap -]; +let + bins = [ + coreutils + gnupg + gnutar + squashfsTools + debootstrap + ]; in -buildGoPackage rec { +buildGoModule rec { pname = "distrobuilder"; - version = "2019_10_07"; - rev = "d686c88c21838f5505c3ec14711b2413604d7f5c"; + version = "1.2"; - goPackagePath = "github.com/lxc/distrobuilder"; + vendorSha256 = "sha256-G5FUO6Ul4dA4MZZI9Ho1kE9ptX31tAWak9rWAoD/iuU="; src = fetchFromGitHub { - inherit rev; owner = "lxc"; repo = "distrobuilder"; - sha256 = "0k59czgasy4d58bkrin6hvgmh7y3nf177lwd0y4g47af27bgnyc4"; + rev = "distrobuilder-${version}"; + sha256 = "CE3Tq0oWpVZnSfBBY3/2E2GdZLFsO0NzkPABT8lu+TY="; + fetchSubmodules = false; }; - goDeps = ./deps.nix; + buildInputs = bins; + + # tests require a local keyserver (mkg20001/nixpkgs branch distrobuilder-with-tests) but gpg is currently broken in tests + doCheck = false; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ] ++ bins; postInstall = '' - wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${lib.makeBinPath bins} ''; - nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with lib; { description = "System container image builder for LXC and LXD"; @@ -35,4 +55,3 @@ buildGoPackage rec { platforms = platforms.linux; }; } - From 83c727719024f6d0a0e88dd30041a55f8702c6a3 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 28 Jun 2021 01:17:11 +0200 Subject: [PATCH 6/9] python3Packages.lmnotify: init at 0.0.4 --- .../python-modules/lmnotify/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/lmnotify/default.nix diff --git a/pkgs/development/python-modules/lmnotify/default.nix b/pkgs/development/python-modules/lmnotify/default.nix new file mode 100644 index 000000000000..653527ee422b --- /dev/null +++ b/pkgs/development/python-modules/lmnotify/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, oauthlib +, requests +, requests_oauthlib +}: + +buildPythonPackage rec { + pname = "lmnotify"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l0h4yab7ix8psf65iygc1wy5xwq3v2rwwjixvd8rwk46d2477dx"; + }; + + propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; + + doCheck = false; # no tests exist + + pythonImportsCheck = [ "lmnotify" ]; + + meta = with lib; { + description = "lmnotify is a package for sending notifications to LaMetric Time."; + homepage = "https://github.com/keans/lmnotify"; + maintainers = with maintainers; [ rhoriguchi ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a98a42ed327..4225ab4e0a7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4171,6 +4171,8 @@ in { lml = callPackage ../development/python-modules/lml { }; + lmnotify = callPackage ../development/python-modules/lmnotify { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; localimport = callPackage ../development/python-modules/localimport { }; From 23e3724a11f9e1119d717fde53e4f3ac8a42e5ca Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 28 Jun 2021 01:17:21 +0200 Subject: [PATCH 7/9] home-assistant: update component-packages.nix --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index ae0e00535857..c99121c05d3d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -436,7 +436,7 @@ "kulersky" = ps: with ps; [ pykulersky ]; "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ pylacrosse ]; - "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify + "lametric" = ps: with ps; [ lmnotify ]; "lannouncer" = ps: with ps; [ ]; "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches From 875e4abc7dd81a90837c31e7df1b2ead161c8b5d Mon Sep 17 00:00:00 2001 From: V Date: Sat, 12 Jun 2021 03:47:38 +0200 Subject: [PATCH 8/9] vsce/asciidoctor.asciidoctor-vscode: init at 2.8.9 --- pkgs/misc/vscode-extensions/default.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index e145543855aa..19b816fbc77e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -109,6 +109,28 @@ let }; }; + asciidoctor.asciidoctor-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "asciidoctor-vscode"; + publisher = "asciidoctor"; + version = "2.8.9"; + sha256 = "1xkxx5i3nhd0dzqhhdmx0li5jifsgfhv0p5h7xwsscz3gzgsdcyb"; + }; + + postPatch = '' + substituteInPlace dist/src/text-parser.js \ + --replace "get('asciidoctor_command', 'asciidoctor')" \ + "get('asciidoctor_command', '${asciidoctor}/bin/asciidoctor')" + substituteInPlace dist/src/commands/exportAsPDF.js \ + --replace "get('asciidoctorpdf_command', 'asciidoctor-pdf')" \ + "get('asciidoctorpdf_command', '${asciidoctor}/bin/asciidoctor-pdf')" + ''; + + meta = with lib; { + license = licenses.mit; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; From e13f126c4be4068b216845d19e4852f7799c067e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 19 May 2021 09:55:40 +0300 Subject: [PATCH 9/9] =?UTF-8?q?python3Packages.geopandas:=200.8.1=20?= =?UTF-8?q?=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/geopandas/default.nix | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 70963a85d41d..7bd45a2b46ee 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -1,45 +1,33 @@ -{ lib, stdenv, buildPythonPackage, fetchFromGitHub, isPy27 -, pandas, shapely, fiona, descartes, pyproj -, pytestCheckHook, Rtree, fetchpatch }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, pandas, shapely, fiona, pyproj +, pytestCheckHook, Rtree }: buildPythonPackage rec { pname = "geopandas"; - version = "0.8.1"; - disabled = isPy27; + version = "0.9.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0618p0s0biisxk2s0h43hkc3bs1nwjk84rxbfyd6brfvs9yx4vq7"; + sha256 = "sha256-58X562OkRzZ4UTNMTwXW4U5czoa5tbSMBCcE90DqbaE="; }; - patches = [ - # Fix for test test_numerical_operations: https://github.com/geopandas/geopandas/issues/1541 - (fetchpatch { - url = "https://github.com/geopandas/geopandas/pull/1544/commits/6ce868a33a2f483b071089d51e178030fa4414d0.patch"; - sha256 = "1sjgxrqgbhz5krx51hrv230ywszcdl6z8q3bj6830kfad8n8b5dq"; - }) - # Fix GeoJSON for Fiona>=1.8.16 (Sep. 7, 2020). - # https://github.com/geopandas/geopandas/issues/1606 - # Will be included in next upstream release after 0.8.1 - (fetchpatch { - url = "https://github.com/geopandas/geopandas/commit/72427d3d8c128039bfce1d54a76c0b652887b276.patch"; - sha256 = "1726mrpddgmba0ngff73a5bsb6ywpsg63a2pdd2grp9339bgvi4a"; - }) - ]; - propagatedBuildInputs = [ pandas shapely fiona - descartes pyproj ]; doCheck = !stdenv.isDarwin; checkInputs = [ pytestCheckHook Rtree ]; - disabledTests = [ "web" ]; + disabledTests = [ + # requires network access + "test_read_file_remote_geojson_url" + "test_read_file_remote_zipfile_url" + ]; pytestFlagsArray = [ "geopandas" ]; meta = with lib; {