From 075c5eb8d39f63a3fd9bcd903d7a19fe22a35224 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 1 Apr 2022 11:09:39 -0500 Subject: [PATCH 01/24] llvmPackages_14.clang: include clang-tools-extra in src for use Fixes #166833. The build creates a symlink for this assuming it's present, so be sure it's there when filtering the source for clang. Alternatively we could use LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR. --- pkgs/development/compilers/llvm/14/clang/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix index 9544494b356e..5ff02d68de42 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -15,6 +15,7 @@ let mkdir -p "$out" cp -r ${monorepoSrc}/cmake "$out" cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/clang-tools-extra "$out" ''; sourceRoot = "${src.name}/${pname}"; From fccd8f5131e598f88a20d425f679988d7d4dd6f2 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Fri, 1 Apr 2022 15:28:15 -0500 Subject: [PATCH 02/24] azuredatastudio: 1.33.1 -> 1.35.1 --- pkgs/applications/misc/azuredatastudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 458b0484af0b..aa7150bb6b0b 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -62,14 +62,14 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.33.1"; + version = "1.35.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-jgZ8iZkic26JSgFTXpu1u1+MM4G5AqyW6Mj1tx5QwcY="; + sha256 = "sha256-b/ha+81TlffnvSENzaePvfFugcKJffvjRU7y+x60OuQ="; }; nativeBuildInputs = [ @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.139"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.215"; rpath = lib.concatStringsSep ":" [ atomEnv.libPath From d2b1a168d6cf51ac37187b30c8c6a9d82b6fdbc3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 13 Apr 2022 23:43:51 +0200 Subject: [PATCH 03/24] syncplay: Allow disabling GUI The GUI brings a huge closure size with it, about 1.64GB, or 90.5% of the total. Turning the GUI off brings the closure size down to just 177MB --- pkgs/applications/networking/syncplay/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index b3c40b0f2fcd..4927bc51b232 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside2, twisted, certifi, qt5, enableGUI ? true }: buildPythonApplication rec { pname = "syncplay"; @@ -13,12 +13,14 @@ buildPythonApplication rec { sha256 = "0qm3qn4a1nahhs7q81liz514n9blsi107g9s9xfw2i8pzi7v9v0v"; }; - propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ twisted certifi ] + ++ twisted.extras.tls + ++ lib.optional enableGUI pyside2; + nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - postFixup = '' + postFixup = lib.optionalString enableGUI '' wrapQtApp $out/bin/syncplay ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e83d8d1e77..989fabbb92eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29309,6 +29309,8 @@ with pkgs; syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; + syncplay-nogui = syncplay.override { enableGUI = false; }; + syncterm = callPackage ../applications/terminal-emulators/syncterm { }; inherit (callPackages ../applications/networking/syncthing { }) From bf123996f91803bfa36945aa0b5e6036111da8d9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 13 Apr 2022 23:58:51 +0200 Subject: [PATCH 04/24] nixos/syncplay: Switch to version without GUI --- nixos/modules/services/networking/syncplay.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix index c17426ecced7..7694b4bf990b 100644 --- a/nixos/modules/services/networking/syncplay.nix +++ b/nixos/modules/services/networking/syncplay.nix @@ -89,7 +89,7 @@ in ${lib.optionalString (cfg.passwordFile != null) '' export SYNCPLAY_PASSWORD=$(cat "''${CREDENTIALS_DIRECTORY}/password") ''} - exec ${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs} + exec ${pkgs.syncplay-nogui}/bin/syncplay-server ${escapeShellArgs cmdArgs} ''; }; }; From 536b77fd501f6554a5739f161e72ad78e9001d99 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 15 Apr 2022 09:17:25 +0000 Subject: [PATCH 05/24] envoy: switch to headless JDK for compilation --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f232122938e6..ce7225de4e25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21261,7 +21261,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - jdk = openjdk11; + jdk = openjdk11_headless; gn = gn1924; }; From b23255a51c3faa1994f17b0cff36732f6e202723 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 15 Apr 2022 09:17:48 +0000 Subject: [PATCH 06/24] envoy: add fetch hash for aarch64-linux --- pkgs/servers/http/envoy/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 64565a57ff94..5a85c2c1ab64 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -74,7 +74,10 @@ buildBazelPackage rec { ]; fetchAttrs = { - sha256 = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; + sha256 = { + x86_64-linux = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; + aarch64-linux = "1l3ls47z20xrw6x9qps5jm7vq50xb1acv9gczfdrj9hw6jybgwgg"; + }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); dontUseCmakeConfigure = true; dontUseGnConfigure = true; preInstall = '' @@ -124,6 +127,7 @@ buildBazelPackage rec { "--noexperimental_strict_action_env" "--cxxopt=-Wno-maybe-uninitialized" "--cxxopt=-Wno-uninitialized" + "--cxxopt=-Wno-error=type-limits" ]; passthru.tests = { @@ -137,6 +141,6 @@ buildBazelPackage rec { description = "Cloud-native edge and service proxy"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; - platforms = [ "x86_64-linux" ]; # Other platforms will generate different fetch hashes. + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From 940ad02f7b4a89e33715dc1df258a2ae138eab1d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 15 Apr 2022 09:17:59 +0000 Subject: [PATCH 07/24] pomerium: note aarch64-linux as supported --- pkgs/servers/http/pomerium/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 49f489220606..b6de805a619b 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -86,6 +86,6 @@ buildGoModule rec { description = "Authenticating reverse proxy"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; - platforms = [ "x86_64-linux" ]; # Envoy derivation is x86_64-linux only. + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } From 8def4d308e66b3d145f26500d74c92e9d09a9320 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 15 Apr 2022 13:01:06 -0500 Subject: [PATCH 08/24] Revert "cln: fix darwin build" This reverts commit a3e1e9271e0ff87309d44f9817baadb09b305757. --- pkgs/development/libraries/cln/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 5c5edea0faec..23bbd84a2096 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,13 +1,12 @@ -{ lib, stdenv, fetchgit, gmp }: +{ lib, stdenv, fetchurl, gmp }: stdenv.mkDerivation rec { pname = "cln"; version = "1.3.6"; - src = fetchgit { - url = "git://www.ginac.de/cln.git"; - rev = "cln_${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-P32F4TIDhE2Dwzydq8iFK6ch3kICJcXeeXHs5PBQG88="; + src = fetchurl { + url = "${meta.homepage}${pname}-${version}.tar.bz2"; + sha256 = "0jlq9l4hphk7qqlgqj9ihjp4m3rwjbhk6q4v00lsbgbri07574pl"; }; buildInputs = [ gmp ]; From 0fd88ab06a630e960ba1d22f8e23f22157f4ba86 Mon Sep 17 00:00:00 2001 From: "Matthew \"strager\" Glazar" Date: Fri, 15 Apr 2022 18:22:08 -0700 Subject: [PATCH 09/24] quick-lint-js: 2.3.1 -> 2.4.0 --- pkgs/development/tools/quick-lint-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index b420d62daab5..47151dd1e662 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-3DiK7c+RuCIy9B2j6ozSaVIRf63o9S8uH27SZZJHjes="; + sha256 = "122z6wnmf5lk6pvwj5065470kvkbb8jqc32x0nw6103fnak5cyih"; }; nativeBuildInputs = [ cmake ninja ]; From b79e0a0e06578629b6cbc0a89a0ba62c0dc2f4f3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 8 Apr 2022 20:42:10 +0800 Subject: [PATCH 10/24] nixos/dendrite: set LimitNOFILE to 65535 --- nixos/modules/services/misc/dendrite.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index 89bb989a09ec..35bec40926ec 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -247,6 +247,7 @@ in WorkingDirectory = workingDir; RuntimeDirectory = "dendrite"; RuntimeDirectoryMode = "0700"; + LimitNOFILE = 65535; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; ExecStartPre = '' ${pkgs.envsubst}/bin/envsubst \ From 0d3082aa8c70a6febde55b1180f161b9395e73aa Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 16 Apr 2022 00:06:34 -0400 Subject: [PATCH 11/24] goreleaser: 1.7.0 -> 1.8.1 --- pkgs/tools/misc/goreleaser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index d0f44b933e94..64c7c9cebda3 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vTik6KFOkKOik78/H0hvAv6xI+QSALOHD4N6befPaT4="; + sha256 = "sha256-P4F/5n08vony4ed9o62NCK0UXjpRo+jjadQK1ke0Tl0="; }; - vendorSha256 = "sha256-ujtgcH5EF+PZAD/1Y0+yI4m7y2hNJ3w4KB2pvKbdgsU="; + vendorSha256 = "sha256-UAApPni4zIAQVOmPAah5vEE8kTrGaJ3irjtsukBNVHo="; ldflags = [ "-s" @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Deliver Go binaries as fast and easily as possible"; homepage = "https://goreleaser.com"; - maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin ]; + maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin techknowlogick ]; license = licenses.mit; }; } From 44ad2f72ec25f5e6245c32df5ecb67faf2bb648d Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 07:48:30 +0000 Subject: [PATCH 12/24] fsql: 0.3.1 -> 0.4.0 --- pkgs/tools/misc/fsql/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index dac33eaedb30..49211f416d67 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "fsql"; - version = "0.3.1"; - - goPackagePath = "github.com/kshvmdn/fsql"; + version = "0.4.0"; src = fetchFromGitHub { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "1accpxryk4744ydfrqc3la5k376ji11yr84n66dz5cx0f3n71vmz"; + sha256 = "sha256-/9X1ag18epFjEfB+TbRsHPCZRZblV0ohvDlZ523kXXc="; }; + vendorSha256 = "sha256-h75iQSpHZqc0QNOZWHU1l6xsHB8ClfWXYo1jVMzX72Q="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Search through your filesystem with SQL-esque queries"; homepage = "https://github.com/kshvmdn/fsql"; @@ -20,5 +22,4 @@ buildGoPackage rec { maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; - } From 20b225bf4c520ed927ee4cc60324a3e425ad2a6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Apr 2022 15:53:56 +0000 Subject: [PATCH 13/24] python310Packages.h3: 3.7.3 -> 3.7.4 --- pkgs/development/python-modules/h3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 6e5965053f4a..e638997be79e 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "h3"; - version = "3.7.3"; + version = "3.7.4"; # pypi version does not include tests src = fetchFromGitHub { owner = "uber"; repo = "h3-py"; - rev = "v${version}"; - sha256 = "0wc1fz8v59r97wlayr4lnsgwzd4fxm991xbs9690d4vwdkapafll"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/DtQD2M+5kBn1RxAOobVqtu32+1cxN8lZSuGH613Bwc="; }; dontConfigure = true; From db1cef7220ef8d97bbde06ee25e1b42c71ea22ac Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 16 Apr 2022 18:53:21 -0300 Subject: [PATCH 14/24] calcoo: init at 2.1.0 --- .../misc/calcoo/0001-javac-encoding.diff | 21 +++++++ pkgs/applications/misc/calcoo/default.nix | 58 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/applications/misc/calcoo/0001-javac-encoding.diff create mode 100644 pkgs/applications/misc/calcoo/default.nix diff --git a/pkgs/applications/misc/calcoo/0001-javac-encoding.diff b/pkgs/applications/misc/calcoo/0001-javac-encoding.diff new file mode 100644 index 000000000000..c16616b3dd04 --- /dev/null +++ b/pkgs/applications/misc/calcoo/0001-javac-encoding.diff @@ -0,0 +1,21 @@ +diff -Naur calcoo-2.1.0-old/build.xml calcoo-2.1.0-new/build.xml +--- calcoo-2.1.0-old/build.xml 1969-12-31 21:00:01.000000000 -0300 ++++ calcoo-2.1.0-new/build.xml 2022-04-16 15:41:59.763861191 -0300 +@@ -16,7 +16,7 @@ + + + +- ++ + + + +@@ -31,7 +31,7 @@ + + + +- ++ + + + diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix new file mode 100644 index 000000000000..4af71bae653e --- /dev/null +++ b/pkgs/applications/misc/calcoo/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchzip +, ant +, jdk +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "calcoo"; + version = "2.1.0"; + + src = fetchzip { + url = "mirror://sourceforge/project/calcoo/calcoo/${version}/${pname}-${version}.zip"; + hash = "sha256-Bdavj7RaI5CkWiOJY+TPRIRfNelfW5qdl/74J1KZPI0="; + }; + + patches = [ + # Sets javac encoding option on build.xml + ./0001-javac-encoding.diff + ]; + + nativeBuildInputs = [ + ant + jdk + makeWrapper + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + ant + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + mv dist/lib/calcoo.jar $out/share/${pname} + + makeWrapper ${jdk}/bin/java $out/bin/calcoo \ + --add-flags "-jar $out/share/${pname}/calcoo.jar" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://calcoo.sourceforge.net/"; + description = "RPN and algebraic scientific calculator"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (jdk.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd0f9e31565..2cf7136f34e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5730,6 +5730,8 @@ with pkgs; uniscribe = callPackage ../tools/text/uniscribe { }; + calcoo = callPackage ../applications/misc/calcoo { }; + galculator = callPackage ../applications/misc/galculator { gtk = gtk3; }; From c03e1141b95c589140ad9cdd198d946c67e946ae Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Sun, 17 Apr 2022 12:41:09 +0800 Subject: [PATCH 15/24] godns: 2.7.3 -> 2.7.4 --- pkgs/tools/networking/godns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index fba6b903365a..0e1096240abc 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-4QWcccJHvytZmWZJnPcI8W6pQCWgXz0FkTe8sX54Cbk="; + sha256 = "sha256-0aE+XcRqk/3/auscVdqdzehrpM6CeSdAJTugHXY8rek="; }; vendorSha256 = "sha256-vhByl9oJjFIvOskAgLubZ5RCcitKd2jjxi8D9nU6850="; From 97c708a87aaf81e2bab91f9798780bcd483f3491 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 06:05:38 +0000 Subject: [PATCH 16/24] python310Packages.plaid-python: 9.2.0 -> 9.3.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index ac635fe4db5e..efcdf3fd3a32 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.2.0"; + version = "9.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-3yFfANMkn8CXCheNHU77WGeYxPV4gs2jvOl/rV+/6vY="; + hash = "sha256-7H6fpJl192L8MEWrQW89Fa/BTZ2GZXjDRcy0yc17hDI="; }; propagatedBuildInputs = [ From 4961050a8fea68f3c65ddfb7cb03aeb760e36062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 06:59:31 +0000 Subject: [PATCH 17/24] python310Packages.types-freezegun: 1.1.8 -> 1.1.9 --- pkgs/development/python-modules/types-freezegun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index f1559fb27d4f..d34bac65a92d 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.8"; + version = "1.1.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-9LsIxUqkaBbHehtceipU9Tk8POWOfUAC5n+QgbQR6SE="; + hash = "sha256-bwUQjUaLrsrfmZhzvTfleyXOs1010/g+enQvJdb+iw4="; }; # Module doesn't have tests From 0340108ee0bdb408a8417ec1a8c8ce8de0e5af8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 07:39:26 +0000 Subject: [PATCH 18/24] python310Packages.tubeup: 0.0.27 -> 0.0.28 --- pkgs/development/python-modules/tubeup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 65553dc18834..e11aaa7d5559 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.27"; + version = "0.0.28"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "77affb4105fc319d82c56aa5706151a4976b8b504dd252fe3db01443e27cba50"; + sha256 = "sha256-+RvDwOHL+zwpM/nOWWS7pZIFEOx+jMrgt3FLYSshANo="; }; postPatch = '' From 54b98b1ec58b7a849f7ad28022d3201ac30a2a2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Apr 2022 08:21:50 +0000 Subject: [PATCH 19/24] python310Packages.types-toml: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/types-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index affdbbb2b447..263fc0edd7ba 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.4"; + version = "0.10.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k0DnwVh3FVgbsTkFs68wt5/mivrM/KN3Zl1eY7aUEpo="; + sha256 = "sha256-+UlGOjiCAL45Lvk5nbrT4eO75tRUPYStk9lsP9oCgIA="; }; # Module doesn't have tests From b46d7231859156b75be3b82b8a6a8fe6fb381fe8 Mon Sep 17 00:00:00 2001 From: Builditluc <37375448+Builditluc@users.noreply.github.com> Date: Sat, 16 Apr 2022 19:45:53 +0200 Subject: [PATCH 20/24] wiki-tui: 0.4.5 -> 0.4.7 --- pkgs/misc/wiki-tui/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 4ff3262d27a5..a93d814c85c3 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IMNHsmL1L+zfGxfdTxJ4HBGiQOzWmYVE0P3ZInbMVl0="; + sha256 = "sha256-qoj5rg0YeBWQuU/HU84wOSG9y9p4Q1DFbqsh61mYnUc="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-Q8Xl6L41cDeDN370owAAL9xZhdyUuDKrPlZxG3eg87c="; + cargoSha256 = "sha256-btSWvlObvn08cAWVMM4R0aciYz8swRFZjX+WDhALj3M="; + + # Tests fail with this error: `found argument --test-threads which was not expected` + doCheck = false; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; From c17f2305a8b84d2adc77b6c8c27778e52a8a575a Mon Sep 17 00:00:00 2001 From: Builditluc <37375448+Builditluc@users.noreply.github.com> Date: Sun, 17 Apr 2022 12:28:34 +0200 Subject: [PATCH 21/24] maintainers: add builditluc --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/misc/wiki-tui/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1bb79d0c44e6..2f21f2192741 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1794,6 +1794,12 @@ githubId = 7214361; name = "Roman Gerasimenko"; }; + builditluc = { + email = "builditluc@icloud.com"; + github = "builditluc"; + githubId = 37375448; + name = "Buildit"; + }; bburdette = { email = "bburdette@protonmail.com"; github = "bburdette"; diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index a93d814c85c3..1c954de3822e 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec { description = "A simple and easy to use Wikipedia Text User Interface"; homepage = "https://github.com/builditluc/wiki-tui"; license = licenses.mit; - maintainers = with maintainers; [ lom ]; + maintainers = with maintainers; [ lom builditluc ]; }; } From aaa165b6e5a356790896c86ac745e85ad9b1d56f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 17 Apr 2022 13:39:06 +0200 Subject: [PATCH 22/24] mautrix-whatsapp: 0.3.0 -> 0.3.1 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index e26743b9edf8..b20bd236c85d 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA="; + sha256 = "adsGPVG/EwpzOqhFJvn3anjTXwGY27a7Bc4NNkBeqJk="; }; buildInputs = [ olm ]; - vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc="; + vendorSha256 = "WT8oDtmUFrqfNK/RnEv8+jpGuQEGt+ppjtmcfUGYZv0="; doCheck = false; From 5f95bff4812281609d75af940376b10ba181d7ce Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 17 Apr 2022 12:00:00 +0000 Subject: [PATCH 23/24] nixos/nvidia: fix type of bus ID option to accept empty string --- nixos/modules/hardware/video/nvidia.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index c7c440bea19c..6899eb4e196a 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -24,6 +24,7 @@ let primeEnabled = syncCfg.enable || offloadCfg.enable; nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; nvidiaSettings = cfg.nvidiaSettings; + busIDType = types.strMatching "([[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; in { @@ -68,7 +69,7 @@ in }; hardware.nvidia.prime.nvidiaBusId = mkOption { - type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; + type = busIDType; default = ""; example = "PCI:1:0:0"; description = '' @@ -78,7 +79,7 @@ in }; hardware.nvidia.prime.intelBusId = mkOption { - type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; + type = busIDType; default = ""; example = "PCI:0:2:0"; description = '' @@ -88,7 +89,7 @@ in }; hardware.nvidia.prime.amdgpuBusId = mkOption { - type = types.strMatching "[[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9]"; + type = busIDType; default = ""; example = "PCI:4:0:0"; description = '' From 288c5c3b5ee5aefffed0584e288b14e23125b3ee Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Sat, 16 Apr 2022 23:52:05 +0900 Subject: [PATCH 24/24] sumneko-lua-language-server: 2.6.7 -> 3.1.0 --- .../tools/sumneko-lua-language-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 88fa62903dd8..f9f3e9eaab67 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.7"; + version = "3.1.0"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-m9vtopRjxT9Re8pDdzfFUpg3zYAFE8zqFemgaNAbsvM="; + sha256 = "sha256-P0ga7uXwxkihpuLdjT1VNbuspbYpOh3+U60u1Blppo4="; fetchSubmodules = true; }; @@ -73,10 +73,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Lua Language Server coded by Lua "; + description = "Lua Language Server coded by Lua"; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sei40kr ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; };