From 7adf1db45066efa315c3488eeed92c53b778d2aa Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 26 May 2022 18:26:21 +0200 Subject: [PATCH 01/31] maintainers: add pbsds --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6647f94f8f83..ef93fca44fbc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9848,6 +9848,12 @@ githubId = 6498458; name = "pebble kite"; }; + pbsds = { + name = "Peder Bergebakken Sundt"; + email = "pbsds@hotmail.com"; + github = "pbsds"; + githubId = 140964; + }; pcarrier = { email = "pc@rrier.ca"; github = "pcarrier"; From dbe99b573cdf265f201165f45e025b4d325b582c Mon Sep 17 00:00:00 2001 From: David Richey Date: Sun, 5 Jun 2022 21:02:14 -0500 Subject: [PATCH 02/31] vscode-extensions.haskell.haskell: 1.8.0 -> 2.2.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ad934c705440..1e22ec4dff90 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1157,8 +1157,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.8.0"; - sha256 = "sha256-+k8XT2COe9Z8HvZvcrzfVuocRcxXBrVoNHDT/uKK7Hs="; + version = "2.2.0"; + sha256 = "sha256-YGPytmI4PgH6GQuWaRF5quiKGoOabkv7On+WVupI92E="; }; meta = with lib; { license = licenses.mit; From c6c20f53439548ad8a52ba56e8af9d4c4662cc7b Mon Sep 17 00:00:00 2001 From: David Richey Date: Sun, 5 Jun 2022 23:27:24 -0500 Subject: [PATCH 03/31] vscode-extensions.justusadam.language-haskell: 3.4.0 -> 3.6.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1e22ec4dff90..cfcbade1a909 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1371,8 +1371,8 @@ let mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.4.0"; - sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y"; + version = "3.6.0"; + sha256 = "sha256-rZXRzPmu7IYmyRWANtpJp3wp0r/RwB7eGHEJa7hBvoQ="; }; meta = { license = lib.licenses.bsd3; From 558f045240d6ab234f1d0217b868ea46b2ccf604 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 7 Jun 2022 15:13:51 +0200 Subject: [PATCH 04/31] vscode-extensions.sanaajani.taskrunnercode: init at 0.3.0 --- .../editors/vscode/extensions/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 21c1187c4ad4..53371dfd29b5 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1804,6 +1804,26 @@ let }; }; + sanaajani.taskrunnercode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "taskrunnercode"; + publisher = "sanaajani"; + version = "0.3.0"; + sha256 = "NVGMM9ugmYZNCWhNmclcGuVJPhJ9h4q2G6nNzVUEpes="; + }; + meta = { + description = "Extension to view and run tasks from Explorer pane"; + longDescription = '' + This extension adds an additional "Task Runner" view in your Explorer Pane + to visualize and individually run the auto-detected or configured tasks + in your project. + ''; + homepage = "https://github.com/sana-ajani/taskrunner-code"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; From 71d8d2dbb6cf4233c09d789907513f07996947dd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 7 Jun 2022 15:15:22 +0200 Subject: [PATCH 05/31] vscode-extensions.shd101wyy.markdown-preview-enhanced : init at 0.6.3 --- .../editors/vscode/extensions/default.nix | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 53371dfd29b5..bb493e685a84 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1873,6 +1873,26 @@ let }; }; + shd101wyy.markdown-preview-enhanced = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shd101wyy"; + name = "markdown-preview-enhanced"; + version = "0.6.3"; + sha256 = "dCWERQ5rHnmYLtYl12gJ+dXLnpMu55WnmF1VfdP0x34="; + }; + meta = { + description = "Provides a live preview of markdown using either markdown-it or pandoc"; + longDescription = '' + Markdown Preview Enhanced provides you with many useful functionalities + such as automatic scroll sync, math typesetting, mermaid, PlantUML, + pandoc, PDF export, code chunk, presentation writer, etc. + ''; + homepage = "https://github.com/shd101wyy/vscode-markdown-preview-enhanced"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-spotify"; From 30e3db6365d6a44c3f88f3e6db93bad751240498 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 7 Jun 2022 15:20:29 +0200 Subject: [PATCH 06/31] vscode-extenions.tomoki1207.pdf: add metadata --- pkgs/applications/editors/vscode/extensions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bb493e685a84..a301351f953e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2136,6 +2136,8 @@ let sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; }; meta = { + description = "Show PDF preview in VSCode"; + homepage = "https://github.com/tomoki1207/vscode-pdfviewer"; license = lib.licenses.mit; }; }; From 670457fbdce33243bf75d3bcab66bdf905a1db9d Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 17 Jul 2022 10:25:07 +0200 Subject: [PATCH 07/31] mautrix-whatsapp: 0.5.0 -> 0.6.0 https://github.com/mautrix/whatsapp/releases/tag/v0.6.0 --- 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 52fac7f963cd..493f067f0f92 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.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "xKj1iKKzFQFjzXZGqoCDyuwXs55QNmnPdojgxy0dQTY="; + sha256 = "zhFc6BAurjrp0pHa48Eb8Iypww6o6YXPXp2ba2CXB6Q="; }; buildInputs = [ olm ]; - vendorSha256 = "svpUQQI9dDNQoL+LDoxhEch7dtNd20ojG3YHga1r15c="; + vendorSha256 = "EiaQDEsysTiXNHKhbfGVgVdMKgfdUHm48eooGR1rtQg="; doCheck = false; From 18a5275c3d6781044caaab73200aa30bd3cdcf55 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 18 Jul 2022 15:25:40 +0200 Subject: [PATCH 08/31] sogo: 5.5.0 -> 5.7.0 --- pkgs/servers/web-apps/sogo/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index f94436c1f372..502ba734f39d 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -3,26 +3,18 @@ , oath-toolkit }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.5.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "1kyfn3qw299qsyivbrm487h68va99rrb3gmhpgjpwqd2xdg9aypk"; + hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ]; - patches = [ - # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches - (fetchpatch { - url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch"; - sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25"; - }) - ]; - postPatch = '' # Exclude NIX_ variables sed -i 's/grep GNUSTEP_/grep ^GNUSTEP_/g' configure From 7bd91bca24b0f6e758ce21ba4c3ad965ddbeeef8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 18 Jul 2022 15:28:05 +0200 Subject: [PATCH 09/31] sogo: add optional (off by default) EAS/ActiveSync support --- pkgs/servers/web-apps/sogo/default.nix | 11 ++++++++-- .../web-apps/sogo/enable-activesync.patch | 21 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/web-apps/sogo/enable-activesync.patch diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 502ba734f39d..94672ffe6f10 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,6 +1,8 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests -, oath-toolkit }: +, oath-toolkit +, enableActiveSync ? false +, libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; version = "5.7.0"; @@ -13,7 +15,10 @@ gnustep.stdenv.mkDerivation rec { }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ]; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ] + ++ lib.optional enableActiveSync libwbxml; + + patches = lib.optional enableActiveSync ./enable-activesync.patch; postPatch = '' # Exclude NIX_ variables @@ -60,6 +65,8 @@ gnustep.stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf done + + rmdir $out/nix ''; passthru.tests.sogo = nixosTests.sogo; diff --git a/pkgs/servers/web-apps/sogo/enable-activesync.patch b/pkgs/servers/web-apps/sogo/enable-activesync.patch new file mode 100644 index 000000000000..2c2aba26a211 --- /dev/null +++ b/pkgs/servers/web-apps/sogo/enable-activesync.patch @@ -0,0 +1,21 @@ +--- a/ActiveSync/NSData+ActiveSync.m ++++ b/ActiveSync/NSData+ActiveSync.m +@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #import + #import + +-#include ++#include + + #define WBXMLDEBUG 0 + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -11,6 +11,7 @@ SUBPROJECTS = \ + UI \ + Tools \ + Tests/Unit \ ++ ActiveSync \ + + + include $(GNUSTEP_MAKEFILES)/aggregate.make From ace8d4a21f8791d1458c0821ca865660acc8582c Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Mon, 18 Jul 2022 13:40:15 -0400 Subject: [PATCH 10/31] geos: 3.10.2 -> 3.11.0 --- pkgs/development/libraries/geos/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 32b3155b8c56..cfcccc571818 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -6,21 +6,13 @@ stdenv.mkDerivation rec { pname = "geos"; - version = "3.10.2"; + version = "3.11.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; + sha256 = "sha256-eauMq/SqhgTRYVV7UuPk2EV1rNwNCMsJqz96rvpNhYo="; }; - patches = [ - # Fix paths with absolute CMAKE_INSTALL_*DIR - (fetchpatch { - url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch"; - hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc="; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with lib; { From 71cae3ecc2112e1d2223a59da1eb61a933f26a04 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Mon, 18 Jul 2022 14:48:50 -0400 Subject: [PATCH 11/31] python3Packages.shapely: fix build for geos 3.11 --- pkgs/development/python-modules/shapely/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 49f5dcc822b6..a41381fe35bf 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , substituteAll , pythonOlder , geos @@ -43,6 +44,12 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) + (fetchpatch { + name = "fix-tests-geos-3.11.patch"; + url = "https://github.com/shapely/shapely/commit/21c8e8a7909e7fb3cce6daa5c5b8284ac927fcb0.patch"; + includes = [ "tests/test_parallel_offset.py" ]; + sha256 = "sha256-85c8NlmAzzfCgepe/411ug5Sq+665dFMb3ySaUt9Kew="; + }) ]; preCheck = '' From 7bde45f469d865719209ac9d285c263a8b90159d Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Mon, 18 Jul 2022 17:22:00 -0400 Subject: [PATCH 12/31] python3Packages.pygeos: fix build for geos 3.11 --- .../python-modules/pygeos/default.nix | 6 ++++ .../pygeos/fix-for-geos-3-11.patch | 29 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch diff --git a/pkgs/development/python-modules/pygeos/default.nix b/pkgs/development/python-modules/pygeos/default.nix index 57970ad2f348..c02400fd1970 100644 --- a/pkgs/development/python-modules/pygeos/default.nix +++ b/pkgs/development/python-modules/pygeos/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { sha256 = "sha256-PEFULvZ8ZgFfRDrj5uaDUDqKIh+cJPsjgPauQq7RYAo="; }; + patches = [ + # Adapt https://github.com/shapely/shapely/commit/4889bd2d72ff500e51ba70d5b954241878349562, + # backporting to pygeos + ./fix-for-geos-3-11.patch + ]; + nativeBuildInputs = [ geos # for geos-config cython diff --git a/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch b/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch new file mode 100644 index 000000000000..fe81c0769c18 --- /dev/null +++ b/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch @@ -0,0 +1,29 @@ +From ea82dbefeb573150935eb78a6916813775512e76 Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Tue, 26 Apr 2022 22:17:00 +0200 +Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs) + +--- + pygeos/tests/test_constructive.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py +index 87c0a9f..b3459d1 100644 +--- a/pygeos/tests/test_constructive.py ++++ b/pygeos/tests/test_constructive.py +@@ -48,7 +48,11 @@ def test_no_args_array(geometry, func): + @pytest.mark.parametrize("geometry", all_types) + @pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG) + def test_float_arg_array(geometry, func): +- if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]: ++ if ( ++ func is pygeos.offset_curve ++ and pygeos.get_type_id(geometry) not in [1, 2] ++ and pygeos.geos_version < (3, 11, 0) ++ ): + with pytest.raises(GEOSException, match="only accept linestrings"): + func([geometry, geometry], 0.0) + return +-- +2.36.1 + From b3df13e2d72be5d93131f8f32f80f1b14724a9bc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 18 Jul 2022 23:14:15 -0400 Subject: [PATCH 13/31] root: 6.24.06 -> 6.26.04 --- .../science/misc/root/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 872438158d66..3316284349bc 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -40,13 +40,27 @@ , noSplash ? false }: +let + + _llvm_9 = llvm_9.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; + stripLen = 3; + hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; + }) + ]; + }); + +in + stdenv.mkDerivation rec { pname = "root"; - version = "6.24.06"; + version = "6.26.04"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI="; + hash = "sha256-onHPgngtbtLIfqXu9mgYA/LmnhezA2352GNjbpNYQh4="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -59,7 +73,7 @@ stdenv.mkDerivation rec { zstd lapack libxml2 - llvm_9 + _llvm_9 lz4 xz gsl @@ -80,13 +94,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # Fix builtin_llvm=OFF support - (fetchpatch { - url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff"; - excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ]; - sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM="; - }) ]; # Fix build against vanilla LLVM 9 From d99c2fb447990ed86f15069c5ac7207aa738622b Mon Sep 17 00:00:00 2001 From: Roberto Di Remigio Date: Tue, 19 Jul 2022 12:57:04 +0200 Subject: [PATCH 14/31] simdjson: 1.0.2 -> 2.2.0 --- pkgs/development/libraries/simdjson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 56b76ba8875f..3bef58cf212e 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "1.0.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-WuqBR1/Iqly+Y8kJxTuZLTVkR3ltXdyr+/6J3zhBNkQ="; + sha256 = "sha256-n+W5xvWC3sPSX0SF5x1ArUtWZayoyQRThgWWhRG4Fac="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIMDJSON_JUST_LIBRARY=ON" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON"; + "-DSIMDJSON_DEVELOPER_MODE=OFF" + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; meta = with lib; { homepage = "https://simdjson.org/"; From f0f635a4343fed09b7582799f2f6929067970bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 19 Jul 2022 14:37:00 +0200 Subject: [PATCH 15/31] vscode-extensions: properly split marketplace ref attributes So that e.g. `postPatch` isn't passed to `mktplcExtRefToFetchArgs.nix` --- .../editors/vscode/extensions/vscode-utils.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 49b730361af1..8f0112e5f608 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -43,7 +43,7 @@ let }); fetchVsixFromVscodeMarketplace = mktplcExtRef: - fetchurl((import ./mktplcExtRefToFetchArgs.nix mktplcExtRef)); + fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); buildVscodeMarketplaceExtension = a@{ name ? "", @@ -65,11 +65,12 @@ let "publisher" "version" "sha256" + "arch" ]; mktplcExtRefToExtDrv = ext: - buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { - mktplcRef = ext; + buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // { + mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; }); extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; From 39c0694709db9a9b31505f39aecffa06367cc172 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 19 Jul 2022 16:08:15 +0200 Subject: [PATCH 16/31] nixos/prometheus-mail-exporter: support storing `passphrase` outside of the store --- .../monitoring/prometheus/exporters/mail.nix | 18 +++++++++++++++--- nixos/tests/prometheus-exporters.nix | 8 +++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 956bd96aa454..c0b8b3570c07 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.prometheus.exporters.mail; + configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile); + configurationFile = pkgs.writeText "prometheus-mail-exporter.conf" (builtins.toJSON ( # removes the _module attribute, null values and converts attrNames to lowercase mapAttrs' (name: value: @@ -137,6 +139,13 @@ in { port = 9225; extraOpts = { + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + File containing env-vars to be substituted into the exporter's config. + ''; + }; configFile = mkOption { type = types.nullOr types.path; default = null; @@ -162,13 +171,16 @@ in serviceOpts = { serviceConfig = { DynamicUser = false; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + RuntimeDirectory = "prometheus-mail-exporter"; + ExecStartPre = [ + "${pkgs.envsubst}/bin/envsubst -i ${configFile} -o \${RUNTIME_DIRECTORY}/mail-exporter.json" + ]; ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --config.file ${ - if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile) - } \ + --config.file ''${RUNTIME_DIRECTORY}/mail-exporter.json \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index a3092d101d87..0a1ec824986a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -557,10 +557,12 @@ let systemd.services.prometheus-mail-exporter = { after = [ "postfix.service" ]; requires = [ "postfix.service" ]; - preStart = '' - mkdir -p -m 0700 mail-exporter/new - ''; serviceConfig = { + ExecStartPre = [ + "${pkgs.writeShellScript "create-maildir" '' + mkdir -p -m 0700 mail-exporter/new + ''}" + ]; ProtectHome = true; ReadOnlyPaths = "/"; ReadWritePaths = "/var/spool/mail"; From 8dbbc14b9e6bfe0a6540ad53b236bd8aacd1c455 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Jul 2022 22:26:55 +0000 Subject: [PATCH 17/31] python310Packages.aiobotocore: 2.3.0 -> 2.3.4 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 199495494ab4..81977915fd52 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.3.0"; + version = "2.3.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/D09YGFBC8GU0J7FReMLRGnV90dw+TespfaqReYqG/4="; + sha256 = "sha256-ZVTr6ldk9m9L5USk/KoJU+6A5gDde9gYukiT1yvxK/s="; }; # relax version constraints: aiobotocore works with newer botocore versions From 7519d550fabdee47ef113185bc57bb434933162a Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 19 Jul 2022 15:34:13 +0800 Subject: [PATCH 18/31] hal-hardware-analyzer: fix build with python 3.10 The build fails with Python 3.10. Applied upstream pr to fix it. --- .../electronics/hal-hardware-analyzer/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index f1d34062d2aa..6b5f04fe7349 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , graphviz, llvmPackages, z3 }: @@ -13,6 +13,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; }; + + patches = [ + (fetchpatch { + # Fix build with python 3.10 + # https://github.com/emsec/hal/pull/463 + name = "hal-fix-python-3.10.patch"; + url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; + sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; + includes = [ "plugins/gui/src/python/python_context.cpp" ]; + }) + ]; + # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package postPatch = '' From 5b2bf60e0b0a32669cef4d61179f3ad2887f056a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 6 Jul 2022 22:41:19 -0400 Subject: [PATCH 19/31] arrow-cpp-glib: init at 8.0.0 --- .../libraries/arrow-glib/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/arrow-glib/default.nix diff --git a/pkgs/development/libraries/arrow-glib/default.nix b/pkgs/development/libraries/arrow-glib/default.nix new file mode 100644 index 000000000000..9c396f89d11c --- /dev/null +++ b/pkgs/development/libraries/arrow-glib/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, arrow-cpp +, fetchurl +, glib +, gobject-introspection +, lib +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "arrow-glib"; + inherit (arrow-cpp) src version; + sourceRoot = "apache-arrow-${version}/c_glib"; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + arrow-cpp + glib + gobject-introspection + ]; + + meta = with lib; { + inherit (arrow-cpp.meta) license platforms; + description = "GLib bindings for Apache Arrow"; + homepage = "https://arrow.apache.org/docs/c_glib/"; + maintainers = with maintainers; [ amarshall ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 353bb602ec6f..a46a5f07a823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16957,6 +16957,8 @@ with pkgs; arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + arrow-glib = callPackage ../development/libraries/arrow-glib {}; + arsenal = callPackage ../tools/security/arsenal { }; assimp = callPackage ../development/libraries/assimp { }; From 92a0505c2637f4a2778dbecf403a0e2bf95d2049 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 20 Jul 2022 09:22:28 -0400 Subject: [PATCH 20/31] arrow-cpp: Adjust homepage to specific variant There are lots of Arrow implementations, so instead go to the one that this implements. --- pkgs/development/libraries/arrow-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index c88afbe6a0fc..64fc6a165c47 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; - homepage = "https://arrow.apache.org/"; + homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; From ed0793c2d41f7519a851ed4284cde56a3a551e99 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 20 Jul 2022 15:23:13 +0200 Subject: [PATCH 21/31] ungoogled-chromium: 103.0.5060.114 -> 103.0.5060.134 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3ed40359ed3b..a740ba70dfaf 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", + "version": "103.0.5060.134", + "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", + "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", "deps": { "gn": { "version": "2022-05-11", @@ -56,8 +56,8 @@ "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "103.0.5060.114-1", - "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" + "rev": "103.0.5060.134-1", + "sha256": "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r" } } } From 41093cc18c09f03e4b9cef0ff918846b1e8e86de Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 20 Jul 2022 16:57:57 +0200 Subject: [PATCH 22/31] crun: 1.4.5 -> 1.5 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/crun/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index c0c53b9c6ae1..f224e03de04f 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,25 +39,16 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.5"; + version = "1.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; + sha256 = "sha256-eirCENgt25VRPub7c9cxYQ1uFxYbzm75cJ1v4r6O/+k="; fetchSubmodules = true; }; - patches = [ - # Should dropped in next release after 1.4.5 - (fetchpatch { - name = "usrbin-paths.patch"; - url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch"; - sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk="; - }) - ]; - nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] From f4b02d9b1be2f3db84b049f3be485ceb101b88d4 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 20 Jul 2022 10:52:22 -0600 Subject: [PATCH 23/31] matrix-synapse: 1.63.0 -> 1.63.1 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a85cfe432b9d..366720b01bb7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.63.0"; + version = "1.63.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RiW2D3nkEK4EUiNoYGhkHqtWZfUfXMqFKakTNNmSp3A="; + sha256 = "sha256-AjxvZye3bRjGT355eAnwuP2lvTU/RSnOPxxKqaUxN9g="; }; buildInputs = [ openssl ]; From 81add6600cba1e6a896fd0dc413e44f52bb0d601 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 20 Jul 2022 20:12:46 +0200 Subject: [PATCH 24/31] nixos/privacyidea-ldap-proxy: umask to avoid accidental world-readability --- nixos/modules/services/security/privacyidea.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 13e27f255068..1f5639d475e8 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -332,6 +332,7 @@ in [ cfg.ldap-proxy.environmentFile ]; ExecStartPre = "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst \ -i ${ldapProxyConfig} \ -o $STATE_DIRECTORY/ldap-proxy.ini From 590e60d124fb93934d03e8c740ca738657cc1816 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 20 Jul 2022 20:15:53 +0200 Subject: [PATCH 25/31] nixos/mxisd: umask to avoid accidental world-readability --- nixos/modules/services/networking/mxisd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/mxisd.nix b/nixos/modules/services/networking/mxisd.nix index 5b1e0dee8e35..1509671bc54a 100644 --- a/nixos/modules/services/networking/mxisd.nix +++ b/nixos/modules/services/networking/mxisd.nix @@ -130,6 +130,7 @@ in { EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; ExecStart = "${cfg.package}/bin/${executable} -c ${cfg.dataDir}/mxisd-config.yaml"; ExecStartPre = "${pkgs.writeShellScript "mxisd-substitute-secrets" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst -o ${cfg.dataDir}/mxisd-config.yaml \ -i ${configFile} ''}"; From 92bd77e85e024c4a58e00cb9f6ff1e6e501ddf02 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 20 Jul 2022 20:21:16 +0200 Subject: [PATCH 26/31] nixos/prometheus-mail-exporter: umask to avoid accidental world-readability --- .../services/monitoring/prometheus/exporters/mail.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index c0b8b3570c07..a60f47f63932 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -174,7 +174,10 @@ in EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; RuntimeDirectory = "prometheus-mail-exporter"; ExecStartPre = [ - "${pkgs.envsubst}/bin/envsubst -i ${configFile} -o \${RUNTIME_DIRECTORY}/mail-exporter.json" + "${pkgs.writeShellScript "subst-secrets-mail-exporter" '' + umask 0077 + ${pkgs.envsubst}/bin/envsubst -i ${configFile} -o ''${RUNTIME_DIRECTORY}/mail-exporter.json + ''}" ]; ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ From 5fbeebb56b7ff374164576a1b397598e3ff00f08 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 20 Jul 2022 11:35:44 -0700 Subject: [PATCH 27/31] haskellPackages.fast-tags: unbreak The patch we were holding got merged, and instead of the patch being removed, the package was marked broken. So I deleted the patch and unbroke. --- .../development/haskell-modules/configuration-common.nix | 9 --------- .../configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50c88622c46b..d3ace213c00b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2553,15 +2553,6 @@ self: super: { }) super.polynomial); - fast-tags = appendPatches [ - (fetchpatch { - name = "fast-tags-ghc-9.0-fix-test-nondeterminism.patch"; - url = "https://github.com/elaforge/fast-tags/commit/af861acc2dd239fedd8b169ddc5e3fa694e7af57.patch"; - sha256 = "0ml678q1n29daqnxsb5p94s5lf7a6dk4lqbbgmiayxrbyxnlbi4f"; - excludes = [ ".github/**" ]; - }) - ] super.fast-tags; - # lucid-htmx has restrictive upper bounds on lucid and servant: # # Setup: Encountered missing or private dependencies: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0ca1c789d545..b141152f7f1e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1424,7 +1424,6 @@ broken-packages: - fast-nats - fastpbkdf2 - FastPush - - fast-tags - FastxPipe - fathead-util - fb diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 42718c37a1fe..e1f5638b58a1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -95044,9 +95044,7 @@ self: { ]; description = "Fast incremental vi and emacs tags"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "fast-tags"; - broken = true; }) {}; "fast-tagsoup" = callPackage From 161e4838fd22dd8fc3eb93f8bdbbf3d5aee2ce62 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 20 Jul 2022 19:37:02 +0200 Subject: [PATCH 28/31] atlassian-crowd: 4.4.0 -> 5.0.1 CVE-2022-26136, CVE-2022-26137 --- pkgs/servers/atlassian/crowd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index f62abe805c27..7714fccf5d82 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "4.4.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "0ipfvdjs8v02y37rmihljy9lkb3ycz5hyc14mcg65ilsscsq3x91"; + sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M="; }; buildPhase = '' From 9e393ee5dd54dc2d86118875d1d1efd7238eee2f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 Jul 2022 21:37:21 +0200 Subject: [PATCH 29/31] chromiumBeta: 104.0.5112.48 -> 104.0.5112.57 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a740ba70dfaf..ad3445aa2193 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "104.0.5112.48", - "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", - "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", + "version": "104.0.5112.57", + "sha256": "1fvcmnxfw65c2dgis2vwhzg671y62irzvcl609vxwxcslhwwqc4r", + "sha256bin64": "0nx4ca2v1bgk25yjlfgn8vgdwwplyim6a0ai1hppy4yhm9mhppk7", "deps": { "gn": { "version": "2022-06-08", From 247f871b4d63a79dbf317622fc4bc2fa380431f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 20 Jul 2022 21:37:20 +0200 Subject: [PATCH 30/31] chromium: 103.0.5060.114 -> 103.0.5060.134 https://chromereleases.googleblog.com/2022/07/stable-channel-update-for-desktop_19.html This update includes 11 security fixes. CVEs: CVE-2022-2477 CVE-2022-2478 CVE-2022-2479 CVE-2022-2480 CVE-2022-2481 CVE-2022-2163 --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index a740ba70dfaf..dda27d955e86 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", + "version": "103.0.5060.134", + "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", + "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", "deps": { "gn": { "version": "2022-05-11", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "103.0.5060.53", - "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", - "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", - "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" + "version": "103.0.5060.134", + "sha256_linux": "13ld47n16b9adb6gh9bc7gr0vi3afyz5pn15rq1w983yqab49vwb", + "sha256_darwin": "0rpnny902h8il8wvxh4ccrvviqfpds28zgqv1v0vhlbgzgykcw3z", + "sha256_darwin_aarch64": "19v7q2wnvp5yfhh8x73p9shayar5yddf22rzqnlvy59saygcc7wa" } }, "beta": { From 41e371106b9fe2032e2d58ab7e1adbeccba54e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Wed, 20 Jul 2022 16:43:13 +0200 Subject: [PATCH 31/31] kubectx: pin to go 1.17 The build with go 1.18 is broken on Darwin. Fixes #182108. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4221ad132814..87cfd0a43652 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16115,7 +16115,9 @@ with pkgs; kubeaudit = callPackage ../tools/security/kubeaudit { }; - kubectx = callPackage ../development/tools/kubectx { }; + kubectx = callPackage ../development/tools/kubectx { + buildGoModule = buildGo117Module; + }; kube-linter = callPackage ../development/tools/kube-linter { };