From e5b24e6da2b638a4519ba2cda380cfe8d47c2ba2 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 4 Jan 2022 08:14:36 +0100 Subject: [PATCH 01/32] nixos/prometheus-node-exporter: do not protect home Set ProtectHome to false for the node exporter. This allows free space monitoring under /home. --- nixos/modules/services/monitoring/prometheus/exporters/node.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 5e5fc7cd5524..417920402f34 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -44,6 +44,8 @@ in ]; # The timex collector needs to access clock APIs ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors; + # Allow space monitoring under /home + ProtectHome = true; }; }; } From d1dcbade3dbe4ed018c8f25d58c8e02b282d1348 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:03:02 +0200 Subject: [PATCH 02/32] python3Packages.humanize: add Luflosi as maintainer --- pkgs/development/python-modules/humanize/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 299bd9685940..37adab72168e 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; license = licenses.mit; - maintainers = with maintainers; [ rmcgibbo ]; + maintainers = with maintainers; [ rmcgibbo Luflosi ]; }; } From 228c2d6c1c3e7f76a630ba1c7fb69d09c3227c27 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:27:18 +0200 Subject: [PATCH 03/32] python3Packages.humanize: include generated translations Without this, localization doesn't work and only english is available. --- pkgs/development/python-modules/humanize/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 37adab72168e..4bbec306cc71 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , freezegun +, gettext , importlib-metadata , pytestCheckHook , pythonOlder @@ -27,6 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + gettext ]; propagatedBuildInputs = [ @@ -35,6 +37,14 @@ buildPythonPackage rec { importlib-metadata ]; + postBuild = '' + scripts/generate-translation-binaries.sh + ''; + + postInstall = '' + cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/' + ''; + checkInputs = [ freezegun pytestCheckHook From dcc323e1f181f670904185a08b791f27991c6dea Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:30:48 +0200 Subject: [PATCH 04/32] python3Packages.humanize: 4.1.0 -> 4.2.3 https://github.com/python-humanize/humanize/releases/tag/4.2.3 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 4bbec306cc71..b64b26844d18 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.3"; pname = "humanize"; format = "pyproject"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "python-humanize"; repo = pname; rev = version; - hash = "sha256-5xL3gfEohDjnF085Pgx/PBXWWM76X4FU2KR+8OGshMw="; + hash = "sha256-cAlNtN9sUnDAkCQj2bJfT72B2TQDYRBB4P4NJY9mUU0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b3aee32add2396c1521b83b5c6c92e4c53108bcc Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 4 Jul 2022 14:53:28 +0800 Subject: [PATCH 05/32] hdf5_1_10: 1.10.6 -> 1.10.9 pythonPackages.tables is updated, the version pin is removed. The bin-mv.patch is applied upstream. --- pkgs/tools/misc/hdf5/1.10.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 74d8fce599a8..fbfac18414c8 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -12,12 +12,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - # pinned to 1.10.6 for pythonPackages.tables v3.6.1. tables has test errors for hdf5 > 1.10.6. https://github.com/PyTables/PyTables/issues/845 - version = "1.10.6"; + version = "1.10.9"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE="; }; outputs = [ "out" "dev" ]; @@ -31,9 +30,7 @@ stdenv.mkDerivation rec { configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; - patches = [ - ./bin-mv.patch - ]; + patches = [ ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + From 4d6eacab55e0afef2ed16a6ca05302b46b1e3caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 22:14:38 +0200 Subject: [PATCH 06/32] canon-cups-ufr2: fix libdir pointing to bindir, little format --- pkgs/misc/cups/drivers/canon/default.nix | 35 ++++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index f20f31049111..07b81ce9bc28 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -27,7 +27,6 @@ }: let - i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { }; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -46,31 +45,31 @@ let }; buildInputs = [ cups zlib jbigkit glib gtk3 pkg-config gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ]; - in - - stdenv.mkDerivation rec { pname = "canon-cups-ufr2"; inherit version; src = src_canon; postUnpack = '' - (cd $sourceRoot; tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz) - (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am) - (cd $sourceRoot; sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am) - (cd $sourceRoot; patchShebangs cnrdrvcups-common-${version}) + ( + cd $sourceRoot + tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am + sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am + patchShebangs cnrdrvcups-common-${version} - (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile) - (cd $sourceRoot; patchShebangs cnrdrvcups-lb-${version}) + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh + sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile + patchShebangs cnrdrvcups-lb-${version} + ) ''; nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 ]; From b1cb8f33f72a43025d85ef341cab36429f4de478 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Jul 2022 22:41:10 +0200 Subject: [PATCH 07/32] roundcube: 1.5.2 -> 1.5.3 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.5.3 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 285db86a133c..9376a024eceb 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg="; + sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 19a442aae7cb5c3b2d59d53570f042fc3a40c6c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:11:13 +0000 Subject: [PATCH 08/32] discordchatexporter-cli: 2.34.1 -> 2.35 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index e8ebbee66056..b9499fa8fd0f 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.34.1"; + version = "2.35"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs="; + sha256 = "xPHXs7lk7WaSTr5jH7q8mN1O6Z9cdD2EACx2CmLelJ8="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index bdc388c18270..b00bd4c074c4 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,5 +1,7 @@ { fetchNuGet }: [ + (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) (fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; }) + (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.3.1"; sha256 = "0zsicyizachdam64mjm1brh5a3nzf7j8nalyhwnw26wk3v3rgmc9"; }) (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; }) @@ -7,4 +9,5 @@ (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) + (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.9.0"; sha256 = "1m184n0zdfxzk9vi2q9y8c8987a0c044vy97i9iginndzxvwazgg"; }) ] From bf67d1e09d0192646de77f3182d86984a34a6bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:53:39 +0200 Subject: [PATCH 09/32] git-extras: fix lazy bash-completion loading when loaded through XDG_DATA_DIRS --- .../git-and-tools/git-extras/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f0932fde2d5e..6e2377bbec4b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, unixtools, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, unixtools +, which +}: stdenv.mkDerivation rec { pname = "git-extras"; @@ -11,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; }; + patches = [ + (fetchpatch { + url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; + sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; + }) + ]; + postPatch = '' patchShebangs check_dependencies.sh ''; From e9fe7c8aab9d5401104bf3664d5cfcb8c8c2cae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:54:25 +0200 Subject: [PATCH 10/32] python310Packages.python-swiftclient: fix lazy bash-completion loading when loaded through XDG_DATA_DIRS, install man pages --- .../python-modules/python-swiftclient/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 357ba701d18f..bf0149e9e17e 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchPypi +, installShellFiles , mock , openstacksdk , pbr @@ -21,6 +22,10 @@ buildPythonApplication rec { hash = "sha256-V7bx/yO0ZoQ4AqaBb0trvGiWtq0F1ld6/udiK+OilTg="; }; + nativeBuildInputs = [ + installShellFiles + ]; + propagatedBuildInputs = [ pbr python-keystoneclient @@ -33,7 +38,9 @@ buildPythonApplication rec { ]; postInstall = '' - install -Dm644 tools/swift.bash_completion $out/share/bash_completion.d/swift + installShellCompletion --cmd swift \ + --bash tools/swift.bash_completion + installManPage doc/manpages/* ''; checkPhase = '' From 4a05028cd674b710b3912bea43b43cfc584e7601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:54:37 +0200 Subject: [PATCH 11/32] python310Packages.swift: install man pages --- pkgs/development/python-modules/swift/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index e06e7917be18..6457a4521a40 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -6,6 +6,7 @@ , eventlet , greenlet , iana-etc +, installShellFiles , libredirect , lxml , mock @@ -35,7 +36,10 @@ buildPythonPackage rec { rm test/functional/s3api/{__init__.py,s3_test_client.py} ''; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + installShellFiles + pbr + ]; propagatedBuildInputs = [ cryptography @@ -51,6 +55,10 @@ buildPythonPackage rec { xattr ]; + postInstall = '' + installManPage doc/manpages/* + ''; + checkInputs = [ boto3 mock From 478940e2c7cfc1d21418e4e78c81734636b9a190 Mon Sep 17 00:00:00 2001 From: squalus Date: Fri, 8 Jul 2022 17:40:24 -0700 Subject: [PATCH 12/32] librewolf: add nixos test - support librewolf in the firefox nixos test - use the correct binary name - ensure autoplay is always on for the audio test, since librewolf disables it by default --- nixos/tests/all-tests.nix | 1 + nixos/tests/firefox.nix | 19 ++++++++++++++----- .../networking/browsers/librewolf/default.nix | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5164451cbe03..3253a3c750be 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -278,6 +278,7 @@ in { libreddit = handleTest ./libreddit.nix {}; libresprite = handleTest ./libresprite.nix {}; libreswan = handleTest ./libreswan.nix {}; + librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; }; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 63ccc6efb5bb..9bb78a97f36d 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,5 +1,14 @@ -import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { - name = "firefox"; +import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: +let firefoxPackage' = firefoxPackage.override (args: { + extraPrefsFiles = (args.extraPrefsFiles or []) ++ [ + # make sure that autoplay is enabled by default for the audio test + (builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);'')) + ]; + }); + +in +{ + name = firefoxPackage'.unwrapped.binaryName; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -9,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { { imports = [ ./common/x11.nix ]; environment.systemPackages = [ - firefoxPackage + firefoxPackage' pkgs.xdotool ]; @@ -88,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { with subtest("Wait until Firefox has finished loading the Valgrind docs page"): machine.execute( - "xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" + "xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" ) machine.wait_for_window("Valgrind") machine.sleep(40) @@ -96,7 +105,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { with subtest("Check whether Firefox can play sound"): with record_audio(machine): machine.succeed( - "firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" + "${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" ) wait_for_sound(machine) machine.copy_from_vm("/tmp/record.wav") diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index bec0c3a9eda9..55451167e0a8 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, buildMozillaMach }: +{ stdenv, lib, callPackage, buildMozillaMach, nixosTests }: let librewolf-src = callPackage ./librewolf.nix { }; @@ -22,6 +22,7 @@ in maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; }; + tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { attrPath = "librewolf-unwrapped"; }; From 47f9f047883996aa54defa9cda7ccd7e04df7901 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 9 Jul 2022 10:29:40 +0900 Subject: [PATCH 13/32] linux-kernel config: disable DEBUG_INFO_REDUCED Linux's aarch64 defconfig has been updated in 5.13 to enable "reduced" debug infos (upstream commit ed938a4bfc58 ("arm64: defconfig: Use DEBUG_INFO_REDUCED"), but that commits locks DEBUG_INFO_BTF as noticed in #175467 This disables it back which should fix bpftrace usage of BTF not working on newer kernels. --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5f0d5d380991..59f89296dcd9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -41,6 +41,9 @@ let (whenBetween "5.2" "5.18" yes) ]; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; + # Reduced debug info conflict with BTF and have been enabled in + # aarch64 defconfig since 5.13 + DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); # Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22` DEBUG_INFO_BTF = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes)); BPF_LSM = whenAtLeast "5.7" (option yes); From 8f00857bf94b1bd4027e7de8ae213a5f5d392cc4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Jul 2022 09:35:25 +0100 Subject: [PATCH 14/32] pkgsMusl.gcc12: backport build fix (PR106102) Without the change gcc-12 on musl fails to build due to system headers poisoning: /build/build/./prev-gcc/xg++ ... ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc In file included from /<>/musl-1.2.3-dev/include/pthread.h:30, from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/x86_64-unknown-linux-musl/bits/gthr-default.h:35, .... from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/memory:77, from ../../gcc-13-20220626/gcc/../libcody/cody.hh:24, from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.h:25, from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.cc:23, from ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc:32: /<>/musl-1.2.3-dev/include/sched.h:84:7: error: attempt to use poisoned "calloc" 84 | void *calloc(size_t, size_t); | ^ /<>/musl-1.2.3-dev/include/sched.h:124:36: error: attempt to use poisoned "calloc" 124 | #define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n))) | ^ The change pulls upstream fix as is. --- .../gcc/12/PR106102-musl-poison-cpp.patch | 52 ++++++++++++++ .../gcc/12/PR106102-musl-poison-jit.patch | 67 +++++++++++++++++++ pkgs/development/compilers/gcc/12/default.nix | 3 + 3 files changed, 122 insertions(+) create mode 100644 pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch create mode 100644 pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch diff --git a/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch new file mode 100644 index 000000000000..05677f5cf85c --- /dev/null +++ b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch @@ -0,0 +1,52 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3 +https://gcc.gnu.org/PR106102 +--- a/gcc/cp/mapper-client.cc ++++ b/gcc/cp/mapper-client.cc +@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_STRING + #define INCLUDE_VECTOR + #define INCLUDE_MAP ++#define INCLUDE_MEMORY + #include "system.h" + + #include "line-map.h" +--- a/gcc/cp/mapper-resolver.cc ++++ b/gcc/cp/mapper-resolver.cc +@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_VECTOR + #define INCLUDE_ALGORITHM + #define INCLUDE_MAP ++#define INCLUDE_MEMORY + #include "system.h" + + // We don't want or need to be aware of networking +--- a/gcc/cp/module.cc ++++ b/gcc/cp/module.cc +@@ -206,6 +206,7 @@ Classes used: + + #define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */ + #include "config.h" ++#define INCLUDE_MEMORY + #define INCLUDE_STRING + #define INCLUDE_VECTOR + #include "system.h" +--- a/libcc1/libcc1plugin.cc ++++ b/libcc1/libcc1plugin.cc +@@ -31,6 +31,7 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#define INCLUDE_MEMORY + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +--- a/libcc1/libcp1plugin.cc ++++ b/libcc1/libcp1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#define INCLUDE_MEMORY + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" diff --git a/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch new file mode 100644 index 000000000000..e4ff25be512c --- /dev/null +++ b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch @@ -0,0 +1,67 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=49d508065bdd36fb1a9b6aad9666b1edb5e06474 +https://gcc.gnu.org/PR106102 +--- a/gcc/jit/jit-playback.cc ++++ b/gcc/jit/jit-playback.cc +@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "target.h" +@@ -41,8 +42,6 @@ along with GCC; see the file COPYING3. If not see + #include "diagnostic.h" + #include "stmt.h" + +-#include +- + #include "jit-playback.h" + #include "jit-result.h" + #include "jit-builtins.h" +--- a/gcc/jit/jit-recording.cc ++++ b/gcc/jit/jit-recording.cc +@@ -19,13 +19,13 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "tm.h" + #include "pretty-print.h" + #include "toplev.h" + +-#include + + #include "jit-builtins.h" + #include "jit-recording.h" +--- a/gcc/jit/libgccjit.cc ++++ b/gcc/jit/libgccjit.cc +@@ -19,12 +19,12 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "timevar.h" + #include "typed-splay-tree.h" + #include "cppbuiltin.h" +-#include + + #include "libgccjit.h" + #include "jit-recording.h" +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list); + #endif + #endif + ++#ifdef INCLUDE_PTHREAD_H ++#include ++#endif ++ + #ifdef INCLUDE_ISL + #ifdef HAVE_isl + #include diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 13d040fc4957..20bc9dcf44bb 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -69,6 +69,9 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch + # Backports. Should be removed with 12.2.0 release: + ./PR106102-musl-poison-cpp.patch + ./PR106102-musl-poison-jit.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff"; sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0="; From ad36639f4759e607cc5e51f7e03f3b279d23eaed Mon Sep 17 00:00:00 2001 From: WeebSorceress Date: Tue, 5 Jul 2022 13:05:20 -0300 Subject: [PATCH 15/32] trackma: fix bug with qt option --- pkgs/tools/misc/trackma/default.nix | 56 ++++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index bebadd5db47f..ae63230c5e56 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -6,10 +6,22 @@ , gobject-introspection , glib , gtk3 +, qt5 +, makeDesktopItem +, copyDesktopItems , withCurses ? false -, withGtk ? false +, withGTK ? false +, withQT ? false }: - +let + mkDesktopItem = name: desktopName: comment: terminal: makeDesktopItem { + inherit name desktopName comment terminal; + icon = "trackma"; + exec = name + " %u"; + type = "Application"; + categories = [ "Network" ]; + }; +in python3.pkgs.buildPythonApplication rec { pname = "trackma"; version = "0.8.4"; @@ -19,36 +31,46 @@ python3.pkgs.buildPythonApplication rec { repo = "trackma"; rev = "v${version}"; sha256 = "sha256-drc39ID4WYBQ/L2py57CB5OkQNfRKNigPQW0Lp8GIMc="; + fetchSubmodules = true; # for anime-relations submodule }; - nativeBuildInputs = lib.optionals withGtk [ wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems ] + ++ lib.optionals withGTK [ wrapGAppsHook ] + ++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; - buildInputs = lib.optionals withGtk [ glib gobject-introspection gtk3 ]; + buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ]; - propagatedBuildInputs = [ python3.pkgs.urllib3 python3.pkgs.dbus-python ] - ++ lib.optionals withGtk [ python3.pkgs.pillow python3.pkgs.pygobject3 python3.pkgs.pycairo ] - ++ lib.optionals withCurses [ python3.pkgs.urwid ] - ++ lib.optionals stdenv.isLinux [ python3.pkgs.pyinotify ]; + propagatedBuildInputs = with python3.pkgs; ([ urllib3 ] + ++ lib.optionals withQT [ pyqt5 ] + ++ lib.optionals withGTK [ pycairo ] + ++ lib.optionals withCurses [ urwid ] + ++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ] + ++ lib.optionals (withGTK || withQT) [ pillow ]); # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - dontWrapGApps = true; # prevent double wrapping + dontWrapQtApps = true; + dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + preFixup = lib.optional withQT "wrapQtApp $out/bin/trackma-qt" + ++ lib.optional withGTK "wrapGApp $out/bin/trackma-gtk"; + + desktopItems = lib.optional withQT (mkDesktopItem "trackma-qt" "Trackma (Qt)" "Trackma Updater (Qt-frontend)" false) + ++ lib.optional withGTK (mkDesktopItem "trackma-gtk" "Trackma (GTK)" "Trackma Updater (Gtk-frontend)" false) + ++ lib.optional withCurses (mkDesktopItem "trackma-curses" "Trackma (ncurses)" "Trackma Updater (ncurses frontend)" true); + + postInstall = '' + install -Dvm444 $src/trackma/data/icon.png $out/share/pixmaps/trackma.png ''; doCheck = false; pythonImportsCheck = [ "trackma" ]; - # FIXME(trackma-qt): https://github.com/NixOS/nixpkgs/pull/179715#issuecomment-1171371059 - postDist = '' - rm $out/bin/trackma-qt - ${lib.optionalString (!withGtk) "rm $out/bin/trackma-gtk"} - ${lib.optionalString (!withCurses) "rm $out/bin/trackma-curses"} - ''; + postDist = lib.optional (!withQT) "rm $out/bin/trackma-qt" + ++ lib.optional (!withGTK) "rm $out/bin/trackma-gtk" + ++ lib.optional (!withCurses) "rm $out/bin/trackma-curses"; passthru.updateScript = ./update.sh; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b2d834436f5..06cb4126a373 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11214,7 +11214,9 @@ with pkgs; trackma-curses = trackma.override { withCurses = true; }; - trackma-gtk = trackma.override { withGtk = true; }; + trackma-gtk = trackma.override { withGTK = true; }; + + trackma-qt = trackma.override { withQT = true; }; tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; From b3db8355ca23aa716da5bb0b3e1785cf0af2e0b4 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 10 Jul 2022 10:10:27 +0200 Subject: [PATCH 16/32] papirus-icon-theme: 20220606 -> 20220710 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d00da5cf478d..35ccd3764331 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220606"; + version = "20220710"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-HJb77ArzwMX9ZYTp0Ffxxtst1/xhPAa+eEP5n950DSs="; + sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; From ada1d87767b8826ea6233952279a1d6c77784bc0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Jul 2022 07:07:48 +0000 Subject: [PATCH 17/32] python3.pkgs.graphite_beacon: remove Due to lack of maintenance. It is not compatible with the default Python version (due to the tornado 5) dependency, and doesn't look like it will be any time soon. --- .../from_md/release-notes/rl-2211.section.xml | 7 ++++ .../manual/release-notes/rl-2211.section.md | 3 ++ .../modules/services/monitoring/graphite.nix | 28 ++-------------- nixos/tests/graphite.nix | 2 -- .../graphite_beacon/default.nix | 33 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +-- 7 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/python-modules/graphite_beacon/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2aa88d4bd93d..06aed6cca9e2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -250,6 +250,13 @@ maintainer to update the package. + + + The services.graphite.beacon NixOS option, + and the python3.pkgs.graphite_beacon + package, has been removed due to lack of upstream maintenance. + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 15c95c9206b2..ea3aea8f542f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,6 +97,9 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. +- The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` + package, has been removed due to lack of upstream maintenance. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index baa943302a00..9098cc797edf 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -72,6 +72,7 @@ let in { imports = [ + (mkRemovedOptionModule ["services" "graphite" "beacon"] "") (mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; @@ -354,16 +355,6 @@ in { ''; }; }; - - beacon = { - enable = mkEnableOption "graphite beacon"; - - config = mkOption { - description = "Graphite beacon configuration."; - default = {}; - type = types.attrs; - }; - }; }; ###### implementation @@ -550,25 +541,10 @@ in { services.mongodb.enable = mkDefault true; }) - (mkIf cfg.beacon.enable { - systemd.services.graphite-beacon = { - description = "Grpahite Beacon Alerting Daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = '' - ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \ - --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} - ''; - User = "graphite"; - Group = "graphite"; - }; - }; - }) - (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable || - cfg.seyren.enable || cfg.beacon.enable + cfg.seyren.enable ) { users.users.graphite = { uid = config.ids.uids.graphite; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 496f16846ea6..ce6b667bd344 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ... } : }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure - beacon.enable = true; }; }; }; @@ -29,7 +28,6 @@ import ./make-test-python.nix ({ pkgs, ... } : one.wait_for_unit("default.target") one.wait_for_unit("graphiteWeb.service") one.wait_for_unit("graphiteApi.service") - one.wait_for_unit("graphite-beacon.service") one.wait_for_unit("carbonCache.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix deleted file mode 100644 index 20522d283045..000000000000 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, tornado_5, pyyaml, funcparserlib -, nixosTests -}: - -buildPythonPackage rec { - pname = "graphite_beacon"; - version = "0.27.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; - }; - - propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ]; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - pythonImportsCheck = [ "graphite_beacon" ]; - - passthru.tests = { - nixos = nixosTests.graphite; - }; - - meta = with lib; { - description = "A simple alerting application for Graphite metrics"; - homepage = "https://github.com/klen/graphite-beacon"; - maintainers = [ maintainers.offline ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c1e4d27d3ff3..941ecc82c7bb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..18b543d73f1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3755,8 +3755,6 @@ in { graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - graphite-web = callPackage ../development/python-modules/graphite-web { }; graphene = callPackage ../development/python-modules/graphene { }; @@ -10656,7 +10654,7 @@ in { # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - # Used by streamlit, graphite_beacon, 2021-01-29 + # Used by streamlit, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; torrequest = callPackage ../development/python-modules/torrequest { }; From 032655547ad188e054f8a7c3a4b779df0f9abf32 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 10 Jul 2022 11:21:44 +0200 Subject: [PATCH 18/32] notepad-next: 0.5.2 -> 0.5.3 --- pkgs/applications/editors/notepad-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index aaa751ea503c..06d5997af1e8 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-LyUV85wW6FGlkV0qSIfkLMHpXXj1qvRnGZuYy8ASwZ8="; + sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; From 9f2c91667dd687fef9b92b2b5b04c610e94bf907 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 10 Jul 2022 09:42:49 +0000 Subject: [PATCH 19/32] python3.pkgs.influxgraph: remove Due to lack of maintenance. Last upstream commit was in 2018, and graphite_api doesn't build, is also unmaintained upstream, and will also be removed. --- .../from_md/release-notes/rl-2211.section.xml | 5 ++-- .../manual/release-notes/rl-2211.section.md | 3 ++- .../python-modules/influxgraph/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/influxgraph/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 06aed6cca9e2..5ce32f86a2cb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -253,8 +253,9 @@ The services.graphite.beacon NixOS option, - and the python3.pkgs.graphite_beacon - package, has been removed due to lack of upstream maintenance. + and the python3.pkgs.graphite_beacon and + python3.pkgs.influxgraph packages, have + been removed due to lack of upstream maintenance. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index ea3aea8f542f..02f46e411e49 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -98,7 +98,8 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. - The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` - package, has been removed due to lack of upstream maintenance. + and `python3.pkgs.influxgraph` packages, have been removed due to lack of + upstream maintenance. - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix deleted file mode 100644 index 7f24e1fd87e5..000000000000 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, python-memcached -}: - -buildPythonPackage rec { - pname = "influxgraph"; - version = "1.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; - }; - - propagatedBuildInputs = [ influxdb graphite_api python-memcached ]; - - passthru.moduleName = "influxgraph.InfluxDBFinder"; - - meta = with lib; { - description = "InfluxDB storage plugin for Graphite-API"; - homepage = "https://github.com/InfluxGraph/influxgraph"; - license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 941ecc82c7bb..90e0b066047f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -88,6 +88,7 @@ mapAliases ({ hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 + influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18b543d73f1c..ce2da3d990b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4276,8 +4276,6 @@ in { influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - influxgraph = callPackage ../development/python-modules/influxgraph { }; - inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { }; From 1f18d441063208968f38bed0fe5ddbcdb8f6cf34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 10 Jul 2022 09:03:35 +0000 Subject: [PATCH 20/32] python3.pkgs.graphite_api: remove Due to lack of maintenance. It doesn't build, the last upstream commit was in 2017, and last significant change in Nixpkgs was in 2018. --- .../from_md/release-notes/rl-2211.section.xml | 6 +- .../manual/release-notes/rl-2211.section.md | 7 +- .../modules/services/monitoring/graphite.nix | 134 +----------------- nixos/tests/graphite.nix | 10 -- .../python-modules/graphite-api/default.nix | 46 ------ .../graphite-api/flask-caching-rebased.patch | 132 ----------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 8 files changed, 11 insertions(+), 327 deletions(-) delete mode 100644 pkgs/development/python-modules/graphite-api/default.nix delete mode 100644 pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5ce32f86a2cb..d99d32938342 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -252,8 +252,10 @@ - The services.graphite.beacon NixOS option, - and the python3.pkgs.graphite_beacon and + The services.graphite.api and + services.graphite.beacon NixOS options, and + the python3.pkgs.graphite_api, + python3.pkgs.graphite_beacon and python3.pkgs.influxgraph packages, have been removed due to lack of upstream maintenance. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 02f46e411e49..0304a08e94c2 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,9 +97,10 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. -- The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` - and `python3.pkgs.influxgraph` packages, have been removed due to lack of - upstream maintenance. +- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and + the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and + `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream + maintenance. - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 9098cc797edf..1dc2cee479ac 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -24,16 +24,6 @@ let + cfg.web.extraConfig ); - graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - search_index: ${dataDir}/index - ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"} - ${optionalString (cfg.api.finders != []) "finders:"} - ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} - ${optionalString (cfg.api.functions != []) "functions:"} - ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions} - ${cfg.api.extraConfig} - ''; - seyrenConfig = { SEYREN_URL = cfg.seyren.seyrenUrl; MONGO_URL = cfg.seyren.mongoUrl; @@ -72,6 +62,7 @@ let in { imports = [ + (mkRemovedOptionModule ["services" "graphite" "api"] "") (mkRemovedOptionModule ["services" "graphite" "beacon"] "") (mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; @@ -116,88 +107,6 @@ in { }; }; - api = { - enable = mkOption { - description = '' - Whether to enable graphite api. Graphite api is lightweight alternative - to graphite web, with api and without dashboard. It's advised to use - grafana as alternative dashboard and influxdb as alternative to - graphite carbon. - - For more information visit - - ''; - default = false; - type = types.bool; - }; - - finders = mkOption { - description = "List of finder plugins to load."; - default = []; - example = literalExpression "[ pkgs.python3Packages.influxgraph ]"; - type = types.listOf types.package; - }; - - functions = mkOption { - description = "List of functions to load."; - default = [ - "graphite_api.functions.SeriesFunctions" - "graphite_api.functions.PieFunctions" - ]; - type = types.listOf types.str; - }; - - listenAddress = mkOption { - description = "Graphite web service listen address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Graphite api service port."; - default = 8080; - type = types.int; - }; - - package = mkOption { - description = "Package to use for graphite api."; - default = pkgs.python3Packages.graphite_api; - defaultText = literalExpression "pkgs.python3Packages.graphite_api"; - type = types.package; - }; - - extraConfig = mkOption { - description = "Extra configuration for graphite api."; - default = '' - whisper: - directories: - - ${dataDir}/whisper - ''; - defaultText = literalExpression '' - ''' - whisper: - directories: - - ''${config.${opt.dataDir}}/whisper - ''' - ''; - example = '' - allowed_origins: - - dashboard.example.com - cheat_times: true - influxdb: - host: localhost - port: 8086 - user: influxdb - pass: influxdb - db: metrics - cache: - CACHE_TYPE: 'filesystem' - CACHE_DIR: '/tmp/graphite-api-cache' - ''; - type = types.lines; - }; - }; - carbon = { config = mkOption { description = "Content of carbon configuration file."; @@ -480,44 +389,6 @@ in { environment.systemPackages = [ pkgs.python3Packages.graphite-web ]; })) - (mkIf cfg.api.enable { - systemd.services.graphiteApi = { - description = "Graphite Api Interface"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - PYTHONPATH = let - aenv = pkgs.python3.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders; - }; - in "${aenv}/${pkgs.python3.sitePackages}"; - GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; - }; - serviceConfig = { - ExecStart = '' - ${pkgs.python3Packages.waitress}/bin/waitress-serve \ - --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \ - graphite_api.app:app - ''; - User = "graphite"; - Group = "graphite"; - PermissionsStartOnly = true; - }; - preStart = '' - if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir}/cache/ - chmod 0700 ${dataDir}/cache/ - - chown graphite:graphite ${cfg.dataDir} - chown -R graphite:graphite ${cfg.dataDir}/cache - - touch ${dataDir}/db-created - fi - ''; - }; - }) - (mkIf cfg.seyren.enable { systemd.services.seyren = { description = "Graphite Alerting Dashboard"; @@ -543,8 +414,7 @@ in { (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || - cfg.web.enable || cfg.api.enable || - cfg.seyren.enable + cfg.web.enable || cfg.seyren.enable ) { users.users.graphite = { uid = config.ids.uids.graphite; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index ce6b667bd344..c534d45428e1 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -12,11 +12,6 @@ import ./make-test-python.nix ({ pkgs, ... } : SECRET_KEY = "abcd"; ''; }; - api = { - enable = true; - port = 8082; - finders = [ ]; - }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure }; @@ -27,20 +22,15 @@ import ./make-test-python.nix ({ pkgs, ... } : start_all() one.wait_for_unit("default.target") one.wait_for_unit("graphiteWeb.service") - one.wait_for_unit("graphiteApi.service") one.wait_for_unit("carbonCache.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) - one.wait_for_open_port(8082) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.wait_until_succeeds( "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" ) - one.wait_until_succeeds( - "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" - ) ''; }) diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix deleted file mode 100644 index 34b8c271d932..000000000000 --- a/pkgs/development/python-modules/graphite-api/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml -, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy -}: - -buildPythonPackage rec { - pname = "graphite-api"; - version = "1.1.3"; - - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "brutasse"; - repo = "graphite-api"; - rev = version; - sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass"; - }; - - # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3 - patches = [ ./flask-caching-rebased.patch ]; - - checkPhase = "nosetests"; - - propagatedBuildInputs = [ - flask - flask-caching - cairocffi - pyparsing - pytz - pyyaml - raven - six - structlog - tzlocal - ]; - - checkInputs = [ nose mock ]; - - LD_LIBRARY_PATH = "${cairo.out}/lib"; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = "https://github.com/brutasse/graphite-api"; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch deleted file mode 100644 index 2d4a2f29bc43..000000000000 --- a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/graphite_api/config.py b/graphite_api/config.py -index 5e1e382..dc033a8 100644 ---- a/graphite_api/config.py -+++ b/graphite_api/config.py -@@ -112,11 +112,11 @@ def configure(app): - app.cache = None - if 'cache' in config: - try: -- from flask.ext.cache import Cache -+ from flask_caching import Cache - except ImportError: - warnings.warn("'cache' is provided in the configuration but " -- "Flask-Cache is not installed. Please `pip install " -- "Flask-Cache`.") -+ "flask-caching is not installed. Please `pip " -+ "install flask-caching`.") - else: - cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60, - 'CACHE_KEY_PREFIX': 'graphite-api:'} -diff --git a/requirements.txt b/requirements.txt -index c68b446..7826b0c 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ - Flask --Flask-Cache -+Flask-Caching - cairocffi - pyparsing>=1.5.7 - pytz -diff --git a/setup.py b/setup.py -index 0337cbe..df07989 100644 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ setup( - extras_require={ - 'sentry': ['raven[flask]'], - 'cyanite': ['cyanite'], -- 'cache': ['Flask-Cache'], -+ 'cache': ['Flask-Caching'], - 'statsd': ['statsd'], - }, - zip_safe=False, -diff --git a/tests/test_render.py b/tests/test_render.py -index be5609d..a0e7190 100644 ---- a/tests/test_render.py -+++ b/tests/test_render.py -@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper - from . import TestCase, WHISPER_DIR - - try: -- from flask.ext.cache import Cache -+ from flask_caching import Cache - except ImportError: - Cache = None - -diff --git a/tox.ini b/tox.ini -index 85a0abb..c820393 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -47,7 +47,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -56,7 +56,7 @@ basepython = python3.3 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:py34] -@@ -66,7 +66,7 @@ commands = - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:py35] -@@ -76,7 +76,7 @@ commands = - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:pyparsing1] -@@ -84,7 +84,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing==1.5.7 - mock - -@@ -93,7 +93,7 @@ basepython = pypy - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -102,7 +102,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask<0.9 -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -111,7 +111,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask<0.10 -- Flask-Cache -+ Flask-Caching - pyparsing - mock - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 90e0b066047f..087417c9fb35 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10 graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce2da3d990b6..39eb6f690992 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3753,8 +3753,6 @@ in { grapheme = callPackage ../development/python-modules/grapheme { }; - graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite-web = callPackage ../development/python-modules/graphite-web { }; graphene = callPackage ../development/python-modules/graphene { }; From 6089b88a23a30f43f79d3105ae47f4201c9555e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:56:17 +0200 Subject: [PATCH 21/32] python310Packages.aioaladdinconnect: init 0.1.20 --- .../aioaladdinconnect/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/aioaladdinconnect/default.nix diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix new file mode 100644 index 000000000000..7229f5a1e3fb --- /dev/null +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioaladdinconnect"; + version = "0.1.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkmer"; + repo = "AIOAladdinConnect"; + rev = version; + hash = "sha256-JHGAJx1Hb/NKWZ+y1ACmVUiesYj1VVHnYCcP+XZGADs="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "AIOAladdinConnect" + ]; + + meta = with lib; { + description = "Library for controlling Genie garage doors connected to Aladdin Connect devices"; + homepage = "https://github.com/mkmer/AIOAladdinConnect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..27e885d0a854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -247,6 +247,8 @@ in { aioairzone = callPackage ../development/python-modules/aioairzone { }; + aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { }; + aioambient = callPackage ../development/python-modules/aioambient { }; aioapns = callPackage ../development/python-modules/aioapns { }; From af480a0ff3765c2d76bd44201cec7a1498a340fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:58:21 +0200 Subject: [PATCH 22/32] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c65fce6e7fe..a6e2ee6b77cf 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -61,7 +61,8 @@ aioairzone ]; "aladdin_connect" = ps: with ps; [ - ]; # missing inputs: AIOAladdinConnect + aioaladdinconnect + ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ @@ -3231,6 +3232,7 @@ "airtouch4" "airvisual" "airzone" + "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" From ef26741ec00ca7ebd8474da0e688fb2a63456a6f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 10 Jul 2022 12:47:46 +0200 Subject: [PATCH 23/32] jadx: 1.3.5 -> 1.4.2 --- pkgs/tools/security/jadx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 654104ada73e..21a0a3c61241 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA="; + hash = "sha256-WSQyym9RMrCiWlb2O4Cd7/ra2UNTL8XsaSNnSTAmhjs="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM="; + outputHash = "sha256-LCF03nTC7T2YxlLIWO3zgrbJVTCQOU8Who9NIqvicb4="; }; in stdenv.mkDerivation { inherit pname version src; From 5f42ffd1bcba535f4df44d73278c0a9e14c5c836 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 13:11:24 +0200 Subject: [PATCH 24/32] python310Packages.aioaladdinconnect: 0.1.20 -> 0.1.21 --- .../python-modules/aioaladdinconnect/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 7229f5a1e3fb..3b32cb3f2aab 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -1,22 +1,21 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.20"; + version = "0.1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "mkmer"; - repo = "AIOAladdinConnect"; - rev = version; - hash = "sha256-JHGAJx1Hb/NKWZ+y1ACmVUiesYj1VVHnYCcP+XZGADs="; + src = fetchPypi { + pname = "AIOAladdinConnect"; + inherit version; + hash = "sha256-Zr9QLiQNmphPpAVnFVpoOlVbuWUVtWXIacYKAnth+E4="; }; propagatedBuildInputs = [ From cd8baca3bcbca45390d9da2e0603845c2e666243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 11:13:37 +0000 Subject: [PATCH 25/32] python310Packages.aiomusiccast: 0.14.4 -> 0.14.5 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 1ca2cdcb519b..470e84eb6cce 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.4"; + version = "0.14.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = "refs/tags/${version}"; - hash = "sha256-vSf4Fcioz+ZrXCaFQQbHzhz7vOknCOEFJXduXJlO/wE="; + hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec="; }; postPatch = '' From dd899b3c745b5d046f3ed21382638d614551edee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 05:47:49 +0000 Subject: [PATCH 26/32] libadwaita: 1.1.2 -> 1.1.3 --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 0ea75e2a2529..ef2daeb7074c 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.2"; + version = "1.1.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y="; + hash = "sha256-Mjv4Z9YaIT9atD8ekepBAA1ZV30kWnMnV8+kOuGULnw="; }; nativeBuildInputs = [ From 429fc9aaf74ac1bbdaaf8d561d736d536a06a5ef Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 2 Jun 2022 10:38:06 -0500 Subject: [PATCH 27/32] nixos/hedgedoc: convert to settings-style configuration Replace "services.hedgedoc.configuration" with ".settings" to be consistent with RFC0042. This allows control of settings not declared in the module. --- nixos/modules/services/web-apps/hedgedoc.nix | 32 +++++++++++++++----- nixos/tests/hedgedoc.nix | 4 +-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 22270609dbcc..909b51750d85 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -13,17 +13,22 @@ let then "hedgedoc" else "codimd"; + settingsFormat = pkgs.formats.json {}; + prettyJSON = conf: pkgs.runCommandLocal "hedgedoc-config.json" { nativeBuildInputs = [ pkgs.jq ]; } '' - echo '${builtins.toJSON conf}' | jq \ - '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out + jq '{production:del(.[]|nulls)|del(.[][]?|nulls)}' \ + < ${settingsFormat.generate "hedgedoc-ugly.json" cfg.settings} \ + > $out ''; in { imports = [ (mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ]) + (mkRenamedOptionModule + [ "services" "hedgedoc" "configuration" ] [ "services" "hedgedoc" "settings" ]) ]; options.services.hedgedoc = { @@ -45,7 +50,7 @@ in ''; }; - configuration = { + settings = let options = { debug = mkEnableOption "debug mode"; domain = mkOption { type = types.nullOr types.str; @@ -960,6 +965,16 @@ in default = null; description = "Configure the SAML integration."; }; + }; in lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + inherit options; + }; + description = '' + HedgeDoc configuration, see + + for documentation. + ''; }; environmentFile = mkOption { @@ -1000,12 +1015,13 @@ in Package that provides HedgeDoc. ''; }; + }; config = mkIf cfg.enable { assertions = [ - { assertion = cfg.configuration.db == {} -> ( - cfg.configuration.dbURL != "" && cfg.configuration.dbURL != null + { assertion = cfg.settings.db == {} -> ( + cfg.settings.dbURL != "" && cfg.settings.dbURL != null ); message = "Database configuration for HedgeDoc missing."; } ]; @@ -1026,12 +1042,12 @@ in preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o ${cfg.workDir}/config.json \ - -i ${prettyJSON cfg.configuration} - mkdir -p ${cfg.configuration.uploadsPath} + -i ${prettyJSON cfg.settings} + mkdir -p ${cfg.settings.uploadsPath} ''; serviceConfig = { WorkingDirectory = cfg.workDir; - StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ]; + StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ]; ExecStart = "${cfg.package}/bin/hedgedoc"; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ diff --git a/nixos/tests/hedgedoc.nix b/nixos/tests/hedgedoc.nix index 657d49c555e9..410350d83627 100644 --- a/nixos/tests/hedgedoc.nix +++ b/nixos/tests/hedgedoc.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { hedgedoc = { enable = true; - configuration.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db"; + settings.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db"; }; }; }; @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { hedgedoc = { enable = true; - configuration.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb"; + settings.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb"; /* * Do not use pkgs.writeText for secrets as From b0c5f3dd4c186fd630336b8cf171ff06b58ed65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20Hagstr=C3=B6m?= Date: Sun, 10 Jul 2022 13:29:50 +0300 Subject: [PATCH 28/32] dhall-grafana: Update dhall-grafana version Updated to 49a3ee4801cf64f479e3f0bad839a5dd8e5b4932 --- pkgs/development/dhall-modules/dhall-grafana.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix index d91b9c21895d..3314beb225d1 100644 --- a/pkgs/development/dhall-modules/dhall-grafana.nix +++ b/pkgs/development/dhall-modules/dhall-grafana.nix @@ -4,8 +4,8 @@ buildDhallGitHubPackage { name = "grafana"; owner = "weeezes"; repo = "dhall-grafana"; - # 2021-11-12 - rev = "d5630dc55deacf5100a99802a4df1d9680b263b3"; - sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz"; + # 2022-07-10 + rev = "49a3ee4801cf64f479e3f0bad839a5dd8e5b4932"; + sha256 = "1i8b98xx20b73afkmr78l4x4ci3dk2sc737hxkcaxp3sgncwnz1b"; dependencies = [ Prelude ]; } From 49548cace627e0ac5dbfda31c5100f669c27324d Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 7 Jul 2022 10:57:56 +0200 Subject: [PATCH 29/32] ocamlformat_0_23_0: init New release with no changes to the dependencies. --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 +++++- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 84d3b850a5ff..a441d9745200 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -27,5 +27,9 @@ rec { version = "0.22.4"; }; - ocamlformat = ocamlformat_0_22_4; + ocamlformat_0_23_0 = mkOCamlformat { + version = "0.23.0"; + }; + + ocamlformat = ocamlformat_0_23_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 97cc9699920b..5e58699fa745 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -12,6 +12,7 @@ let src = "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; + "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; }."${version}"; }; ocamlPackages = ocaml-ng.ocamlPackages; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da06166c8993..802cb1ccf30b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13895,7 +13895,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4; + ocamlformat_0_22_4 ocamlformat_0_23_0; orc = callPackage ../development/compilers/orc { }; From 3ea8ed7d7e3fcba3d8e9286175077544c6f5faf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 6 Jul 2022 20:40:19 +0200 Subject: [PATCH 30/32] Split out CoqIDE by default when Coq >= 8.14. --- .../science/logic/coq/default.nix | 5 +- .../coq-modules/coqide/default.nix | 61 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/coq-modules/coqide/default.nix diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5e516ca56385..06d4a915c91d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -8,10 +8,10 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses -, buildIde ? true +, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null -, version, coq-version ? null, +, version, coq-version ? null }@args: let lib' = lib; in let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in @@ -59,6 +59,7 @@ let version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix new file mode 100644 index 000000000000..a827057a118b --- /dev/null +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -0,0 +1,61 @@ +{ lib +, makeDesktopItem +, copyDesktopItems +, wrapGAppsHook +, glib +, gnome +, mkCoqDerivation +, coq +, version ? null }: + +with lib; mkCoqDerivation rec { + pname = "coqide"; + inherit version; + + inherit (coq) src; + release."${coq.version}" = {}; + + defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + + preConfigure = '' + patchShebangs dev/tools/ + ''; + prefixKey = "-prefix "; + + useDune2 = true; + + buildInputs = [ + copyDesktopItems + wrapGAppsHook + coq.ocamlPackages.lablgtk3-sourceview3 + glib + gnome.adwaita-icon-theme + ]; + + buildPhase = '' + runHook preBuild + dune build -p ${pname} -j $NIX_BUILD_CORES + runHook postBuild + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out ${pname} + runHook postInstall + ''; + + desktopItems = makeDesktopItem { + name = "coqide"; + exec = "coqide"; + icon = "coq"; + desktopName = "CoqIDE"; + comment = "Graphical interface for the Coq proof assistant"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; + }; + + meta = with lib; { + homepage = "https://coq.inria.fr"; + description = "The CoqIDE user interface for the Coq proof assistant"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.Zimmi48 ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 91894bfaa9e7..e013bf7cd1bc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,6 +36,7 @@ let coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; + coqide = callPackage ../development/coq-modules/coqide {}; coqprime = callPackage ../development/coq-modules/coqprime {}; coqtail-math = callPackage ../development/coq-modules/coqtail-math {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; From d921864be3076cdd20c4bca546da0852b0114e60 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 11:23:28 +0200 Subject: [PATCH 31/32] python310Packages.softlayer: 5.9.9 -> 6.1.0 --- .../python-modules/softlayer/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index b66009639773..6c3df4eb6f98 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -14,20 +14,28 @@ , testtools , tkinter , urllib3 +, prettytable +, rich +, zeep }: buildPythonPackage rec { pname = "softlayer"; - version = "5.9.9"; + version = "6.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "v${version}"; - sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0="; + sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'rich == 12.3.0' 'rich >= 12.3.0' + ''; + propagatedBuildInputs = [ click prompt-toolkit @@ -35,6 +43,8 @@ buildPythonPackage rec { pygments requests urllib3 + prettytable + rich ]; checkInputs = [ @@ -43,15 +53,26 @@ buildPythonPackage rec { sphinx testtools tkinter + zeep + ]; + + # Otherwise soap_tests.py will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Test fails with ConnectionError trying to connect to api.softlayer.com + "tests/transports/soap_tests.py" ]; pythonImportsCheck = [ "SoftLayer" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } From 60d0de8a48b3f1f45d1881079348d506039c5f10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 10 Jul 2022 15:59:33 +0200 Subject: [PATCH 32/32] =?UTF-8?q?ocamlPackages.erm=5Fxmpp:=200.3+20200317?= =?UTF-8?q?=20=E2=86=92=200.3+20220404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 1507154d2f64..452499aa401f 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "0.3+20200317"; + version = "0.3+20220404"; pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "7fa5bea252671fd88625c6af109998b879ca564f"; - sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; + rev = "e54d54e142ac9770c37e144693473692bf473530"; + sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];