From 4f27b3cea1798a6b312d42a91db44de364017776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Jun 2023 23:59:07 -0700 Subject: [PATCH 001/174] python310Packages.ocrmypdf: 14.2.1 -> 14.3.0 Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v14.2.1...v14.3.0 Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v14.3.0/docs/release_notes.rst --- pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 33f1ccedbe5b..a9eeef0c55de 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "14.2.1"; + version = "14.3.0"; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-i09FPyplYhBqgHWWSXZrvI+7f31yzc5KvgAqVJ3WtWU="; + hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 18bbf33b382828c495c33619e692f5978fa7c8a2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Thu, 29 Jun 2023 17:52:08 -0700 Subject: [PATCH 002/174] test.cross.mbuffer: init This adds a test case for the tricky issue encountered in https://github.com/NixOS/nixpkgs/issues/213453 --- pkgs/test/cross/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index beb64df19577..a5144fe2cef6 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -110,4 +110,14 @@ let in { gcc = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = false;})) tests); llvm = (lib.mapAttrs (_: mapMultiPlatformTest (system: system // {useLLVM = true;})) tests); + + # see https://github.com/NixOS/nixpkgs/issues/213453 + # this is a good test of a lot of tricky glibc/libgcc corner cases + mbuffer = let + mbuffer = pkgs.pkgsCross.aarch64-multiplatform.mbuffer; + emulator = with lib.systems; (elaborate examples.aarch64-multiplatform).emulator pkgs; + in + pkgs.runCommand "test-mbuffer" {} '' + echo hello | ${emulator} ${mbuffer}/bin/mbuffer + ''; } From 6f43859a3a55d05167d50a244c9e4c79e009e873 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 30 Jun 2023 11:43:00 -0700 Subject: [PATCH 003/174] CODEOWNERS: ping @amjoseph-nixpkgs on certain trees I don't claim ownership of anything, but I would like to be notified of PRs opened against the following paths where I've put a lot of work into cleanup and deduplication: lib/systems pkgs/stdenv pkgs/build-support/cc-wrapper pkgs/development/compilers/gcc Apparently CODEOWNERS is how you tell github you want to be notified of such things. --- .github/CODEOWNERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9af62d2f9d7a..2ef607d0ff80 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -23,7 +23,7 @@ # Libraries /lib @edolstra @infinisil -/lib/systems @alyssais @ericson2314 @matthewbauer +/lib/systems @alyssais @ericson2314 @matthewbauer @amjoseph-nixpkgs /lib/generators.nix @edolstra @Profpatsch /lib/cli.nix @edolstra @Profpatsch /lib/debug.nix @edolstra @Profpatsch @@ -37,10 +37,10 @@ /pkgs/top-level/stage.nix @Ericson2314 @matthewbauer /pkgs/top-level/splice.nix @Ericson2314 @matthewbauer /pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer +/pkgs/stdenv/generic @Ericson2314 @matthewbauer @amjoseph-nixpkgs /pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde -/pkgs/stdenv/cross @Ericson2314 @matthewbauer -/pkgs/build-support/cc-wrapper @Ericson2314 +/pkgs/stdenv/cross @Ericson2314 @matthewbauer @amjoseph-nixpkgs +/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @layus @@ -124,7 +124,7 @@ /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers -/pkgs/development/compilers/gcc @matthewbauer +/pkgs/development/compilers/gcc @matthewbauer @amjoseph-nixpkgs /pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius # Compatibility stuff From dbb11d0990bdae1fa6466e91ce345ecf135a8717 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 1 Jul 2023 19:05:29 +0200 Subject: [PATCH 004/174] grass: alphabetical reordering of dependencies Code cleanup, no functional changes. --- pkgs/applications/gis/grass/default.nix | 92 ++++++++++++++++++------- 1 file changed, 68 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 19b42b6b7ad7..a3255658cfb5 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,7 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, libxml2, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid -, zstd, pdal, wrapGAppsHook +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, wrapGAppsHook + +, bison +, blas +, cairo +, ffmpeg +, fftw +, flex +, gdal +, geos +, libiconv +, libmysqlclient +, libpng +, libtiff +, libxml2 +, netcdf +, pdal +, pkg-config +, postgresql +, proj +, proj-datumgrid +, python3Packages +, readline +, sqlite +, wxGTK32 +, zlib +, zstd }: stdenv.mkDerivation rec { @@ -16,22 +43,39 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config bison flex makeWrapper wrapGAppsHook + makeWrapper + wrapGAppsHook + + bison + flex gdal # for `gdal-config` geos # for `geos-config` - netcdf # for `nc-config` libmysqlclient # for `mysql_config` + netcdf # for `nc-config` + pkg-config ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ - cairo zlib proj libtiff libpng libxml2 fftw sqlite - readline ffmpeg postgresql blas wxGTK32 - proj-datumgrid zstd + blas + cairo + ffmpeg + fftw gdal geos - netcdf libmysqlclient + libpng + libtiff + libxml2 + netcdf pdal + postgresql + proj + proj-datumgrid + readline + sqlite + wxGTK32 + zlib + zstd ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; strictDeps = true; @@ -46,24 +90,24 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-proj-share=${proj}/share/proj" - "--with-proj-includes=${proj.dev}/include" - "--with-proj-libs=${proj}/lib" - "--without-opengl" - "--with-readline" - "--with-wxwidgets" - "--with-netcdf" + "--with-blas" + "--with-fftw" "--with-geos" - "--with-postgres" - "--with-postgres-libs=${postgresql.lib}/lib/" - # it complains about missing libmysqld but doesn't really seem to need it + # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" "--with-mysql-libs=${libmysqlclient}/lib/mysql" - "--with-blas" - "--with-zstd" - "--with-fftw" + "--with-netcdf" + "--with-postgres" + "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-proj-includes=${proj.dev}/include" + "--with-proj-libs=${proj}/lib" + "--with-proj-share=${proj}/share/proj" "--with-pthread" + "--with-readline" + "--with-wxwidgets" + "--with-zstd" + "--without-opengl" ] ++ lib.optionals stdenv.isLinux [ "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ @@ -97,8 +141,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://grass.osgeo.org/"; description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; + homepage = "https://grass.osgeo.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; platforms = platforms.all; From 3ea8390db35bc464c08800884f0305d9a3cd16f8 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Sun, 2 Jul 2023 01:04:36 +0100 Subject: [PATCH 005/174] perl: use makeBinaryWrapper for perl.withPackages --- pkgs/development/interpreters/perl/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/wrapper.nix b/pkgs/development/interpreters/perl/wrapper.nix index e1909a15e059..8e4630b48e76 100644 --- a/pkgs/development/interpreters/perl/wrapper.nix +++ b/pkgs/development/interpreters/perl/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, perl, buildEnv, makeWrapper +{ lib, perl, buildEnv, makeBinaryWrapper , extraLibs ? [] , extraOutputsToInstall ? [] , postBuild ? "" @@ -17,7 +17,7 @@ let inherit ignoreCollisions; extraOutputsToInstall = [ "out" ] ++ extraOutputsToInstall; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; # we create wrapper for the binaries in the different packages postBuild = '' From 79dffec139fdfc7d086e360762f1815b86eae7c4 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sun, 2 Jul 2023 23:36:36 +0200 Subject: [PATCH 006/174] grass: add package tests --- pkgs/applications/gis/grass/default.nix | 9 +++++++-- pkgs/applications/gis/grass/tests.nix | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/gis/grass/tests.nix diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index a3255658cfb5..0d16ba036a9c 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, callPackage , fetchFromGitHub , makeWrapper , wrapGAppsHook @@ -31,7 +32,7 @@ , zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "grass"; version = "8.3.0"; @@ -140,6 +141,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; }; + }; + meta = with lib; { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; homepage = "https://grass.osgeo.org/"; @@ -147,4 +152,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/gis/grass/tests.nix b/pkgs/applications/gis/grass/tests.nix new file mode 100644 index 000000000000..1a38d07de789 --- /dev/null +++ b/pkgs/applications/gis/grass/tests.nix @@ -0,0 +1,18 @@ +{ runCommand, grass }: + +let + inherit (grass) pname version; + +in +runCommand "${pname}-tests" { meta.timeout = 60; } + '' + HOME=$(mktemp -d) + + ${grass}/bin/grass --tmp-location EPSG:3857 --exec g.version \ + | grep 'GRASS ${version}' + + ${grass}/bin/grass --tmp-location EPSG:3857 --exec g.mapset -l \ + | grep 'PERMANENT' + + touch $out + '' From c30b80d36146dba83ef3eec172acbb84e4057bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 3 Jul 2023 23:23:57 +0200 Subject: [PATCH 007/174] sysdig: 0.31.5 -> 0.32.0 --- pkgs/os-specific/linux/sysdig/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1a59244f8d4c..582dd939689d 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,8 +5,8 @@ let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.11.0"; - libsSha256 = "sha256-QvRTz3yMS6i+qdiSG51wvho9D7w/dMQhY72OYd3qOgU="; + libsRev = "0.11.3"; + libsSha256 = "sha256-ph4ErNfgVv2aesZawCj+7kdqcYAnRgeNHfSrDMgm6Lo="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -27,23 +27,15 @@ let in stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.31.5"; + version = "0.32.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "sha256-RuoPqVulATtn7jSga/8fECs7weNfjt/YFh7iHmfCKjw="; + sha256 = "sha256-R14uQdcZ2BnlgWjqvRQP8MDaKMk4Kfw17qTKYYlBg7o="; }; - # to fix the build against the latest kernel - patches = [ - (fetchpatch { - url = "https://github.com/draios/sysdig/compare/35ded9aab87801281e22898242e24e0bc63873b2...954e6fc6238f21d4870a491395d68a7dd3062aa9.patch"; - sha256 = "sha256-gnLURnv8FW5LvqjbreCf9DPGdBcn7rfizGeznFqJ+Fk="; - }) - ]; - nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; buildInputs = [ luajit From 39762cefc6eb0990d8764b1fab9b6b5716d8c3f1 Mon Sep 17 00:00:00 2001 From: Maximilian Wende Date: Tue, 4 Jul 2023 09:58:48 +0200 Subject: [PATCH 008/174] astc-encoder: 4.4.0 -> 4.5.0 --- pkgs/tools/graphics/astc-encoder/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index 2909a2c12510..5e63038e67db 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -16,11 +16,9 @@ with rec { else if isAarch64 then [ "NEON" ] else [ "NONE" ]; - archFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "-DARCH=aarch64" ]; - # CMake Build flags for the selected ISAs. For a list of flags, see # https://github.com/ARM-software/astc-encoder/blob/main/Docs/Building.md - isaFlags = map ( isa: "-DISA_${isa}=ON" ) isas; + isaFlags = map ( isa: "-DASTCENC_ISA_${isa}=ON" ) isas; # The suffix of the binary to link as 'astcenc' mainBinary = builtins.replaceStrings @@ -31,25 +29,26 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-pJmMquORG+vN2uLPywAZY1iZTuHB4SdMP/eriAjnyUU="; + sha256 = "sha256-pNoBOp//xa5F6/T1cwtdHsAWLZeIHgxZ7UKaB60fg4M="; }; nativeBuildInputs = [ cmake ]; - cmakeFlags = isaFlags ++ archFlags ++ [ + cmakeFlags = isaFlags ++ [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DASTCENC_UNIVERSAL_BUILD=OFF" ]; # Set a fixed build year to display within help output (otherwise, it would be 1980) postPatch = '' substituteInPlace Source/cmake_core.cmake \ - --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2022")' + --replace 'string(TIMESTAMP astcencoder_YEAR "%Y")' 'set(astcencoder_YEAR "2023")' ''; # Provide 'astcenc' link to main executable From 10247a1e16b5a4c7b1a520f0254e6086849d9293 Mon Sep 17 00:00:00 2001 From: Freya Arbjerg Date: Tue, 4 Jul 2023 21:40:14 +0200 Subject: [PATCH 009/174] Darktable: 4.4.0 -> 4.4.1 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 8488e4c6d153..7c8d48e6cf94 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -58,12 +58,12 @@ }: stdenv.mkDerivation rec { - version = "4.4.0"; + version = "4.4.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "8887fc34abd97c4998b0888c3197e0c509d63bdeab2238906915319811f3b080"; + sha256 = "e043d38d2e8adb67af7690b12b535a40e8ec7bea05cfa8684db8b21a626e0f0d"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; From 88a717c5c00b997fbb4c9028d49b9bf3ba14b0b7 Mon Sep 17 00:00:00 2001 From: Freya Arbjerg Date: Tue, 4 Jul 2023 21:55:01 +0200 Subject: [PATCH 010/174] maintainers: add freyacodes --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/graphics/darktable/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 616eadb95473..82a235a94cba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5593,6 +5593,12 @@ githubId = 609279; name = "Isaac Shapira"; }; + freyacodes = { + email = "freya@arbjerg.dev"; + github = "freyacodes"; + githubId = 2582617; + name = "Freya Arbjerg"; + }; fricklerhandwerk = { email = "valentin@fricklerhandwerk.de"; github = "fricklerhandwerk"; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 7c8d48e6cf94..1a7427772672 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -147,6 +147,6 @@ stdenv.mkDerivation rec { homepage = "https://www.darktable.org"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits ]; + maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits freyacodes ]; }; } From f8db5a813ce14a94544012471445861c2841eb16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 16:37:05 +0200 Subject: [PATCH 011/174] python311Packages.maxminddb: 2.3.0 -> 2.4.0 Changelog: https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v2.4.0/HISTORY.rst --- .../python-modules/maxminddb/default.nix | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index b9ff8bf437bb..90acdef2d363 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -1,34 +1,40 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage -, pythonOlder -, pythonAtLeast , fetchPypi , libmaxminddb -, mock -, nose +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "maxminddb"; - version = "2.3.0"; - disabled = pythonOlder "3.6"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Egkg3d2VXzKuSMIHxs72/V3Ih0qIm6lLDywfc27N8wg="; + hash = "sha256-geVOU0CL1QJlDllpzLoWeAr2WewdscRLLJl+QzCl7ZY="; }; - buildInputs = [ libmaxminddb ]; + buildInputs = [ + libmaxminddb + ]; - nativeCheckInputs = [ nose mock ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # Tests are broken for macOS on python38 - doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); + pythonImportsCheck = [ + "maxminddb" + ]; meta = with lib; { description = "Reader for the MaxMind DB format"; homepage = "https://github.com/maxmind/MaxMind-DB-Reader-python"; + changelog = "https://github.com/maxmind/MaxMind-DB-Reader-python/blob/v${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 1e16a937ca4c148841c15760ddc02f47ce487735 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Fri, 7 Jul 2023 15:40:29 -0400 Subject: [PATCH 012/174] vmware-guest module: work under aarch64 --- nixos/modules/virtualisation/vmware-guest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index b8f0a4cf668e..6880a257c2be 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -24,12 +24,12 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = pkgs.stdenv.hostPlatform.isx86; + assertion = pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isAarch64; message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; boot.initrd.availableKernelModules = [ "mptspi" ]; - boot.initrd.kernelModules = [ "vmw_pvscsi" ]; + boot.initrd.kernelModules = lib.optionals pkgs.stdenv.hostPlatform.isx86 [ "vmw_pvscsi" ]; environment.systemPackages = [ open-vm-tools ]; From 55c09fa5069d9ef00b1ed521eb4065a2104db1e8 Mon Sep 17 00:00:00 2001 From: sefidel Date: Sat, 8 Jul 2023 12:24:39 +0900 Subject: [PATCH 013/174] dendrite: 0.12.0 -> 0.13.1 --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 67b91bbe5cd6..4faa08142cf5 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-syOLrw4ig8rmFDkxJ9KSAuzUVO8UokekV17mT1bJNNM="; + hash = "sha256-2DqEfTXD3W6MxfBb6aHaKH+zpxLc2tHaGuWGQuncySo="; }; - vendorHash = "sha256-nvGhKCUiyHSD0VpE4OtT9YQSHxv0d7iwOChCJl2D3zk="; + vendorHash = "sha256-dc0zpKh7J+fi2b5GD/0BQ120UXbBvJLUF74RmYMSOMw="; subPackages = [ # The server From 0378e2e65ec8bdac95f56bbe54694bf148702fc5 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sat, 8 Jul 2023 13:34:04 +0200 Subject: [PATCH 014/174] invoice: init at 0.1.0 --- pkgs/tools/misc/invoice/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/invoice/default.nix diff --git a/pkgs/tools/misc/invoice/default.nix b/pkgs/tools/misc/invoice/default.nix new file mode 100644 index 000000000000..cffdec4063e3 --- /dev/null +++ b/pkgs/tools/misc/invoice/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "invoice"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "invoice"; + rev = "v${version}"; + hash = "sha256-WtQ4nF31uIoplY18GZNs41ZOCxmbIu71YpEGk8aTGww="; + }; + + vendorHash = "sha256-8VhBflnpsJ5h8S6meDFZKCcS2nz5u4kPE9W710gJG4U="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Command line invoice generator"; + homepage = "https://github.com/maaslalani/invoice"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbd930189032..0506a087c197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5288,6 +5288,8 @@ with pkgs; interlock = callPackage ../servers/interlock { }; + invoice = callPackage ../tools/misc/invoice { }; + invoiceplane = callPackage ../servers/web-apps/invoiceplane { }; iotas = callPackage ../applications/office/iotas { }; From 49e2fb7aaefe9f37c86d46d9e1c56edde3f4e2cc Mon Sep 17 00:00:00 2001 From: huantian Date: Sat, 1 Jul 2023 13:50:25 -0700 Subject: [PATCH 015/174] webcord: 4.2.0 -> 4.3.0, add updateScript --- .../instant-messengers/webcord/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webcord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/default.nix index 67e99f540b1d..00361a7e368a 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -1,18 +1,28 @@ -{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems -, python3, pipewire, libpulseaudio, xdg-utils, electron_24, makeDesktopItem }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, copyDesktopItems +, python3 +, pipewire +, libpulseaudio +, xdg-utils +, electron_25 +, makeDesktopItem +, nix-update-script +}: buildNpmPackage rec { pname = "webcord"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - sha256 = "sha256-530iWNvehImwSYt5HnZaqa4TAslrwxAOZi3gRm1K2/w="; + hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E="; }; - npmDepsHash = "sha256-YguZtGn8CT4EqOQWS0GeNGBdZSC3Lj1gFR0ZiegWTJU="; + npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks="; nativeBuildInputs = [ copyDesktopItems @@ -46,7 +56,7 @@ buildNpmPackage rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${electron_24}/bin/electron' $out/bin/webcord \ + makeWrapper '${electron_25}/bin/electron' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ @@ -66,6 +76,8 @@ buildNpmPackage rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A Discord and Fosscord electron-based client implemented without Discord API"; homepage = "https://github.com/SpacingBat3/WebCord"; @@ -73,6 +85,6 @@ buildNpmPackage rec { changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ huantian ]; - platforms = electron_24.meta.platforms; + platforms = electron_25.meta.platforms; }; } From d08c422dfb907036a9c2ab3dd5845ae0b12d2c92 Mon Sep 17 00:00:00 2001 From: huantian Date: Mon, 3 Jul 2023 20:33:53 -0700 Subject: [PATCH 016/174] webcord-vencord: override electron to use electron_24 Webcord has updated to electron 25, but that causes a segfault when launching webcord-vencord on wayland, so downgrade it for now. Co-authored-by: FlafyDev --- .../webcord/webcord-vencord/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix b/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix index 1bac19630fc0..d55af49f1154 100644 --- a/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix +++ b/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix @@ -2,8 +2,10 @@ , substituteAll , lib , vencord-web-extension +, electron_24 }: -webcord.overrideAttrs (old: { + +(webcord.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ (substituteAll { src = ./add-extension.patch; @@ -15,4 +17,8 @@ webcord.overrideAttrs (old: { description = "Webcord with Vencord web extension"; maintainers = with maintainers; [ FlafyDev NotAShelf ]; }; -}) +})).override { + # Webcord has updated to electron 25, but that causes a segfault + # when launching webcord-vencord on wayland, so downgrade it for now. + electron_25 = electron_24; +} From b8c4608033012f2ebd1f6a3e16b91fb61a3e0016 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Sun, 9 Jul 2023 22:26:32 +0200 Subject: [PATCH 017/174] tunwg: init at 23.06.14+dbfe3aa --- pkgs/tools/networking/tunwg/default.nix | 27 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/tunwg/default.nix diff --git a/pkgs/tools/networking/tunwg/default.nix b/pkgs/tools/networking/tunwg/default.nix new file mode 100644 index 000000000000..25cf5a0a9be6 --- /dev/null +++ b/pkgs/tools/networking/tunwg/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tunwg"; + version = "23.06.14+dbfe3aa"; + + src = fetchFromGitHub { + owner = "ntnj"; + repo = "tunwg"; + rev = "v${version}"; + hash = "sha256-w7rx2Q0VXQBETmHROcVWzh0TIEjiITpI5CR9jvtXF7E="; + }; + + vendorHash = "sha256-3vDcCOrhYTHvr8ck0WxZPRUQNsKtEVyUKTD5Epbno6I="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Secure private tunnel to your local servers"; + homepage = "https://github.com/ntnj/tunwg"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcf46a01bb4..996d783882a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13526,6 +13526,8 @@ with pkgs; tuntox = callPackage ../tools/networking/tuntox { }; + tunwg = callPackage ../tools/networking/tunwg { }; + omapd = callPackage ../tools/security/omapd { }; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; From b7594b7f8f6a0e97eb6c98079e0443bdfb2ce1f3 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Mon, 10 Jul 2023 11:18:41 +0200 Subject: [PATCH 018/174] rauc: 1.9 -> 1.10 Changelog: https://github.com/rauc/rauc/blob/master/CHANGES --- pkgs/tools/misc/rauc/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index c6bb154ab229..72cc8d8945f5 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -18,22 +18,15 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-VpHcJUTRZ5aJyfYypjVsYyRNrK0+9ci42mmlZQSkWAk="; + sha256 = "sha256-WiN2lTS6LCVCeVyX0/2rSDLL2tKsAhWSMa95fK05UOg="; }; - patches = [ - (fetchpatch { - # Patch to install the man page when using meson, remove on package bump - url = "https://github.com/rauc/rauc/commit/756c677d031c435070a6900e6778d06961822261.patch"; - hash = "sha256-QgIUagioRo61PeC0JyKjZtnauFiYP1Fz9wrxGEikBGI="; - }) - ]; passthru = { updateScript = nix-update-script { }; }; From 6d6e7bcfc70d086371b85f7d8194575e8f20b335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 10 Jul 2023 15:39:15 +0200 Subject: [PATCH 019/174] weechatScripts.multiline: 0.6.3 -> 0.6.4 --- .../networking/irc/weechat/scripts/multiline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix b/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix index 447d415c163c..f61b4391e18d 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/multiline/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "multiline"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://raw.githubusercontent.com/weechat/scripts/945315bed4bc2beaf1e47f9b946ffe8f638f77fe/perl/multiline.pl"; - sha256 = "1smialb21ny7brhij4sbw46xvsmrdv6ig2da0ip63ga2afngwsy4"; + url = "https://raw.githubusercontent.com/weechat/scripts/5f073d966e98d54344a91be4f5afc0ec9e2697dc/perl/multiline.pl"; + sha256 = "sha256-TXbU2Q7Tm8iTwOQqrWpqHXuKrjoBFLyUWRsH+TsR9Lo="; }; dontUnpack = true; From 6984a7201cbae604cb6fb9e7bb6f39c5dd3278c5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 10 Jul 2023 18:30:19 +0300 Subject: [PATCH 020/174] zsh: enable function subdirs and patch script shebangs --- pkgs/shells/zsh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 890817dd4077..1297e622269f 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation { "--enable-pcre" "--enable-zshenv=${placeholder "out"}/etc/zshenv" "--disable-site-fndir" + "--enable-function-subdirs" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [ # Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba "zsh_cv_shared_environ=yes" @@ -112,6 +113,10 @@ EOF ''; # XXX: patch zsh to take zwc if newer _or equal_ + postFixup = '' + HOST_PATH=$out/bin:$HOST_PATH patchShebangs --host $out/share/zsh/*/functions + ''; + meta = { description = "The Z shell"; longDescription = '' From 20912be33e6203cd80080e1228880e029244adf0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 11 Jul 2023 10:33:57 +0800 Subject: [PATCH 021/174] pdns: 4.8.0 -> 4.8.1 Changelog: https://doc.powerdns.com/authoritative/changelog/4.8.html#change-4.8.1 --- pkgs/servers/dns/pdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index fcd218a1f3cc..ab95b5cedbba 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-YalruviwykmpIloiVLlEPE/44FDTN0N9ha9N6InhASc="; + hash = "sha256-Zt0+4mVPQrTrgCYPlOy0jjE6gYF/WBJc5IwUwtJuMJ4="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; From 89d9a1318d2bb4418a5eec0d24ad1d002a2bf0fd Mon Sep 17 00:00:00 2001 From: Evan Richter Date: Tue, 11 Jul 2023 08:54:01 -0500 Subject: [PATCH 022/174] gex: add evanrichter as maintainer --- pkgs/applications/version-management/gex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index 7bb39ef94e7f..fa187aef3b11 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; homepage = "https://github.com/Piturnah/gex"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 Br1ght0ne ]; + maintainers = with maintainers; [ azd325 Br1ght0ne evanrichter ]; }; } From 5ccabab1053d8a7caaf8fb92a91e6b51a8bcac67 Mon Sep 17 00:00:00 2001 From: Evan Richter Date: Mon, 10 Jul 2023 22:33:57 -0500 Subject: [PATCH 023/174] gex: 0.4.0 -> 0.5.0 --- pkgs/applications/version-management/gex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index fa187aef3b11..553f50661f15 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-eRforLvRVSrFWnI5UZEWr1L4UM3ABjAIvui1E1hzk5s="; + hash = "sha256-//sQ0s8bBQzuu5aO3RjPRjFuVYiGW6BwSPoCWKAx9DQ="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 ]; - cargoHash = "sha256-OEaNERozmJL8gYe33V/m4HQNHi2I4KHpI6PTwFQkPSs="; + cargoHash = "sha256-rkhkFnRDtMTWFM+E5C4jR7TWtHdy3WUtIzvGDDLHqtE="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; From 9d62c8b22c22137201cf194c8e04b7bfe8d2475a Mon Sep 17 00:00:00 2001 From: Evan Richter Date: Tue, 11 Jul 2023 09:00:15 -0500 Subject: [PATCH 024/174] gex: add meta.changelog --- pkgs/applications/version-management/gex/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index 553f50661f15..d0b0708ad976 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; homepage = "https://github.com/Piturnah/gex"; + changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ azd325 Br1ght0ne evanrichter ]; }; From 44763a1e4ea4d8dc03c01a280f2f87360a46431e Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Tue, 11 Jul 2023 22:47:47 +0300 Subject: [PATCH 025/174] obs-studio-plugins.advanced-scene-switcher: allow write access to `deps/libremidi`. --- .../video/obs-studio/plugins/advanced-scene-switcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index 428f5167907b..f2df05ceca30 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { postUnpack = '' cp -r ${libremidi.src}/* $sourceRoot/deps/libremidi + chmod -R +w $sourceRoot/deps/libremidi ''; postInstall = '' From 15f0d2fb4feb64e24c66294ae93b9f2d162d857e Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Tue, 11 Jul 2023 22:17:25 +0300 Subject: [PATCH 026/174] libremidi: unstable-2023-05-05 -> 3.0 --- pkgs/development/libraries/libremidi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index 63a7f0ce5287..d88ebeea3fb5 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -9,15 +9,15 @@ , stdenv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libremidi"; - version = "unstable-2023-05-05"; + version = "3.0"; src = fetchFromGitHub { owner = "jcelerier"; repo = "libremidi"; - rev = "cd2e52d59c8ecc97d751619072c4f4271fa82455"; - hash = "sha256-CydoCprxqDl5FXjtgT+AckaRTqQAlCDwwrnPDK17A6o="; + rev = "v${version}"; + hash = "sha256-aO83a0DmzwjYXDlPIsn136EkDF0406HadTXPoGuVF6I="; }; nativeBuildInputs = [ cmake ]; From 000003825d39e7b81d213317cb30ee308d2ddf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Jul 2023 22:11:54 +0200 Subject: [PATCH 027/174] yarn2nix: cleanups --- .../tools/yarn2nix-moretea/yarn2nix/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index e0bd54fd11a9..e711828cfea7 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -71,7 +71,7 @@ in rec { yarnFlags ? [ ], ignoreScripts ? true, nodejs ? inputs.nodejs, - yarn ? inputs.yarn.override { nodejs = nodejs; }, + yarn ? inputs.yarn.override { inherit nodejs; }, pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -88,7 +88,7 @@ in rec { (key: pkgConfig.${key}.buildInputs or []) (builtins.attrNames pkgConfig); - postInstall = (builtins.map (key: + postInstall = builtins.map (key: if (pkgConfig.${key} ? postInstall) then '' for f in $(find -L -path '*/node_modules/${key}' -type d); do @@ -97,7 +97,7 @@ in rec { '' else "" - ) (builtins.attrNames pkgConfig)); + ) (builtins.attrNames pkgConfig); # build-time JSON generation to avoid IFD # see https://nixos.wiki/wiki/Import_From_Derivation @@ -180,7 +180,7 @@ in rec { packageJSON ? src + "/package.json", yarnLock ? src + "/yarn.lock", nodejs ? inputs.nodejs, - yarn ? inputs.yarn.override { nodejs = nodejs; }, + yarn ? inputs.yarn.override { inherit nodejs; }, packageOverrides ? {}, ... }@attrs: @@ -254,7 +254,7 @@ in rec { yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, nodejs ? inputs.nodejs, - yarn ? inputs.yarn.override { nodejs = nodejs; }, + yarn ? inputs.yarn.override { inherit nodejs; }, yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", @@ -403,7 +403,7 @@ in rec { mkFilter = { dirsToInclude, filesToInclude, root }: path: type: let - inherit (pkgs.lib) any flip elem hasSuffix hasPrefix elemAt splitString; + inherit (lib) elem elemAt splitString; subpath = elemAt (splitString "${toString root}/" path) 1; spdir = elemAt (splitString "/" subpath) 0; From 0000005bd643dea469b7212af3eec8cf3dce9cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 11 Jul 2023 22:12:59 +0200 Subject: [PATCH 028/174] mkYarnPackage: use provided pname Before it was unexpectedly overwritten to the name in package.json which breaks meta.mainProgram and through that nix run nixpkgs#prettierd --- .../yarn2nix-moretea/yarn2nix/default.nix | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index e711828cfea7..914296d70953 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -267,8 +267,8 @@ in rec { }@attrs: let package = lib.importJSON packageJSON; - pname = package.name; - safeName = reformatPackageName pname; + pname = attrs.pname or package.name; + safeName = reformatPackageName package.name; version = attrs.version or package.version; baseName = unlessNull name "${safeName}-${version}"; @@ -278,14 +278,15 @@ in rec { ); deps = mkYarnModules { + pname = package.name; name = "${safeName}-modules-${version}"; preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions; + inherit packageJSON version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions; }; - publishBinsFor_ = unlessNull publishBinsFor [pname]; + publishBinsFor_ = unlessNull publishBinsFor [ package.name ]; linkDirFunction = '' linkDirToDirLinks() { @@ -307,17 +308,17 @@ in rec { workspaceDependencyCopy = lib.concatMapStringsSep "\n" (dep: '' # ensure any existing scope directory is not a symlink - linkDirToDirLinks "$(dirname node_modules/${dep.pname})" - mkdir -p "deps/${dep.pname}" - tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.pname}" --strip-components=1 - if [ ! -e "deps/${dep.pname}/node_modules" ]; then - ln -s "${deps}/deps/${dep.pname}/node_modules" "deps/${dep.pname}/node_modules" + linkDirToDirLinks "$(dirname node_modules/${dep.package.name})" + mkdir -p "deps/${dep.package.name}" + tar -xf "${dep}/tarballs/${dep.name}.tgz" --directory "deps/${dep.package.name}" --strip-components=1 + if [ ! -e "deps/${dep.package.name}/node_modules" ]; then + ln -s "${deps}/deps/${dep.package.name}/node_modules" "deps/${dep.package.name}/node_modules" fi '') workspaceDependenciesTransitive; in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // { - inherit src version pname; + inherit pname version src; name = baseName; @@ -335,27 +336,27 @@ in rec { fi done - # move convent of . to ./deps/${pname} + # move convent of . to ./deps/${package.name} mv $PWD $NIX_BUILD_TOP/temp - mkdir -p "$PWD/deps/${pname}" - rm -fd "$PWD/deps/${pname}" - mv $NIX_BUILD_TOP/temp "$PWD/deps/${pname}" + mkdir -p "$PWD/deps/${package.name}" + rm -fd "$PWD/deps/${package.name}" + mv $NIX_BUILD_TOP/temp "$PWD/deps/${package.name}" cd $PWD - ln -s ${deps}/deps/${pname}/node_modules "deps/${pname}/node_modules" + ln -s ${deps}/deps/${package.name}/node_modules "deps/${package.name}/node_modules" cp -r $node_modules node_modules chmod -R +w node_modules ${linkDirFunction} - linkDirToDirLinks "$(dirname node_modules/${pname})" - ln -s "deps/${pname}" "node_modules/${pname}" + linkDirToDirLinks "$(dirname node_modules/${package.name})" + ln -s "deps/${package.name}" "node_modules/${package.name}" ${workspaceDependencyCopy} # Help yarn commands run in other phases find the package - echo "--cwd deps/${pname}" > .yarnrc + echo "--cwd deps/${package.name}" > .yarnrc runHook postConfigure ''; @@ -364,11 +365,11 @@ in rec { installPhase = attrs.installPhase or '' runHook preInstall - mkdir -p $out/{bin,libexec/${pname}} - mv node_modules $out/libexec/${pname}/node_modules - mv deps $out/libexec/${pname}/deps + mkdir -p $out/{bin,libexec/${package.name}} + mv node_modules $out/libexec/${package.name}/node_modules + mv deps $out/libexec/${package.name}/deps - node ${./internal/fixup_bin.js} $out/bin $out/libexec/${pname}/node_modules ${lib.concatStringsSep " " publishBinsFor_} + node ${./internal/fixup_bin.js} $out/bin $out/libexec/${package.name}/node_modules ${lib.concatStringsSep " " publishBinsFor_} runHook postInstall ''; @@ -378,13 +379,13 @@ in rec { distPhase = attrs.distPhase or '' # pack command ignores cwd option rm -f .yarnrc - cd $out/libexec/${pname}/deps/${pname} + cd $out/libexec/${package.name}/deps/${package.name} mkdir -p $out/tarballs/ yarn pack --offline --ignore-scripts --filename $out/tarballs/${baseName}.tgz ''; passthru = { - inherit pname package packageJSON deps; + inherit package packageJSON deps; workspaceDependencies = workspaceDependenciesTransitive; } // (attrs.passthru or {}); From ad38070be80ee67953a622ba9f0951f6ce3fe58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 11 Jul 2023 16:42:59 -0600 Subject: [PATCH 029/174] linux/hardened/patches/6.4: init at 6.4.3-hardened1 --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/config.nix | 2 +- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 82d9118c6fb1..76deb0f0aa1d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_3_hardened + linux_6_4_hardened linux_testing; }; diff --git a/pkgs/os-specific/linux/kernel/hardened/config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 3f23b8c1344d..92192eb79f89 100644 --- a/pkgs/os-specific/linux/kernel/hardened/config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix @@ -28,7 +28,7 @@ assert (versionAtLeast version "4.9"); # # We set SECURITY_WRITABLE_HOOKS n primarily for documentation purposes; the # config builder fails to detect that it has indeed been unset. - SECURITY_SELINUX_DISABLE = no; + SECURITY_SELINUX_DISABLE = whenOlder "6.4" no; # On 6.4: error: unused option: SECURITY_SELINUX_DISABLE SECURITY_WRITABLE_HOOKS = option no; STRICT_KERNEL_RWX = yes; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 361f3dc80cd2..d61e13b25aec 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -68,5 +68,15 @@ }, "sha256": "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb", "version": "6.3.12" + }, + "6.4": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.4.3-hardened1.patch", + "sha256": "1xwy9088f8qy7algv1gad90gd6sv03diz16jvfnk2yb01k4f87wv", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.3-hardened1/linux-hardened-6.4.3-hardened1.patch" + }, + "sha256": "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i", + "version": "6.4.3" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6bfc26b6075..300bf97423c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27605,6 +27605,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_3_hardened = linuxKernel.packages.linux_6_3_hardened; linux_6_3_hardened = linuxKernel.kernels.linux_6_3_hardened; + linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; + linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index c2492acfe9bf..72840c945e15 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -268,6 +268,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_3_hardened = hardenedKernelFor kernels.linux_6_3 { }; + linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -614,6 +615,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_3_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_3_hardened); + linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From b724ae4d0c6bd84f4c962a86b4fd2e57c380a8d4 Mon Sep 17 00:00:00 2001 From: Evan Richter Date: Tue, 11 Jul 2023 18:06:32 -0500 Subject: [PATCH 030/174] gex: remove Br1ght0ne as maintainer --- pkgs/applications/version-management/gex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index d0b0708ad976..c2866e536750 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Piturnah/gex"; changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 Br1ght0ne evanrichter ]; + maintainers = with maintainers; [ azd325 evanrichter ]; }; } From a74251a00abaddd8f83fdb28edea526df739eaba Mon Sep 17 00:00:00 2001 From: Peter Hebden Date: Tue, 11 Jul 2023 18:03:54 -0500 Subject: [PATCH 031/174] maintainers: add piturnah --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8ad4e9724cb..fedf0b131fec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12945,6 +12945,12 @@ githubId = 1830959; name = "Piper McCorkle"; }; + piturnah = { + email = "peterhebden6@gmail.com"; + github = "piturnah"; + githubId = 20472367; + name = "Peter Hebden"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "pjbarnoy"; From 08f19df3e79d822bac929bb64a764763ca23804c Mon Sep 17 00:00:00 2001 From: Peter Hebden Date: Tue, 11 Jul 2023 18:07:58 -0500 Subject: [PATCH 032/174] gex: add piturnah as maintainer closes #241326 --- pkgs/applications/version-management/gex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix index c2866e536750..4675b22a6192 100644 --- a/pkgs/applications/version-management/gex/default.nix +++ b/pkgs/applications/version-management/gex/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Piturnah/gex"; changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 evanrichter ]; + maintainers = with maintainers; [ azd325 evanrichter piturnah ]; }; } From 96b23c36e8b074d3060af0060067324fd1a01cb1 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 11 Jul 2023 22:30:47 -0400 Subject: [PATCH 033/174] =?UTF-8?q?openafs:=201.8.9=20=E2=86=92=201.8.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Anders Kaseorg --- pkgs/servers/openafs/1.8/cross-build.patch | 2 +- pkgs/servers/openafs/1.8/module.nix | 48 ---------------------- pkgs/servers/openafs/1.8/srcs.nix | 6 +-- 3 files changed, 4 insertions(+), 52 deletions(-) diff --git a/pkgs/servers/openafs/1.8/cross-build.patch b/pkgs/servers/openafs/1.8/cross-build.patch index 62254164a1b1..7244b1dd48af 100644 --- a/pkgs/servers/openafs/1.8/cross-build.patch +++ b/pkgs/servers/openafs/1.8/cross-build.patch @@ -144,7 +144,7 @@ diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs @@ -38,11 +38,14 @@ compile_et: compile_et.o error_table.o $(Q)case $(SYS_NAME) in \ - *_linux* | *_umlinux* | *_darwin* ) \ + *_linux* | *_umlinux* | *_darwin* | rs_aix72 | rs_aix73 ) \ - $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \ + $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \ * ) \ diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 4485f86c7f76..3af259d0e726 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -37,54 +37,6 @@ stdenv.mkDerivation { buildInputs = [ libkrb5 ]; - patches = [ - # LINUX: Run the 'sparse' checker if available - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=2cf76b31ce4c912b1151c141818f6e8c5cddcab2"; - hash = "sha256-//7HSlotx70vWDEMB8P8or4ZmmXZthgioUOkvOcJpgk="; - }) - # cf: Detect how to pass CFLAGS to linux kbuild - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=57df4dff496ca9bea04510759b8fdd9cd2cc0009"; - hash = "sha256-pJnW9bVz2ZQZUvZ+PcZ5gEgCL5kcbTGxsyMNvM2IseU="; - }) - # cf: Handle autoconf linux checks with -Werror - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b17625959386459059f6f43875d8817383554481"; - hash = "sha256-Kqx5QEX1p4UoIsWxqvJVX4IyCQFiWxtAOgvAtk+ULuQ="; - }) - # Linux: Fix functions without prototypes - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=3084117f10bd62acb1182cb54fc85b1d96738f70"; - hash = "sha256-nNyqDQfS9zzlS2i3dbfud2tQOaTQ1x/rZcQEsaLu3qc="; - }) - # Linux: Check for block_dirty_folio - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=f0fee2c7752d18ff183d60bcfba4c98c3348cd5f"; - hash = "sha256-tnNlVjZ5exC+jo78HC/y8yp0L8KQroFvVRzTC+O6vlY="; - }) - # Linux: Replace lru_cache_add with folio_add_lru - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b885159cc2bc6c746aec1d54cdd8a515d1115d14"; - hash = "sha256-ptPALSbZPSGu8PMmZiOkHUd5x0UItqIM7U7wJlxtSL8="; - }) - # LINUX 5.13: set .proc_lseek in proc_ops - (fetchpatch { - url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f"; - hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8="; - }) - # Linux 6.3: Include linux/filelock.h if available - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/15388/revisions/ddb99d32012c43c76ae37f6a7563f1ca32f0e964/patch"; - hash = "sha256-0Cql4+0ISfW4J4D7PhlSYNfIKAeDVWEz57PHOu5TRXg="; - }) - # Linux 6.3: Use mnt_idmap for inode op functions - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/15389/revisions/ff0d53d2fb38fc3b262f02fb1c5f49b286ff13dd/patch"; - hash = "sha256-KyVAI/A+/lNrLyKY6O8DgMKzgnF6P5sOfSq3qcs6Qq0="; - }) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 507ce99957ce..a80ad726dbe5 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,16 +1,16 @@ { fetchurl }: rec { - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - hash = "sha256-0SYXi+H0LMoYy3wMJpGsNUUY43kBcBUKdrvSX00VHwY="; + hash = "sha256-n+wRNkYjVJ6NtzdAcvXI8BuEH2v+foVnPLzjX/Q/+wc="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - hash = "sha256-75HoVOq0qnQmhSWVSkHCoq0KLq9TDqoiu55L9FOxWTk="; + hash = "sha256-nDgJ6K/qAX2K8lKPYM8OD5+oRU+shlM6PmciHy61+10="; }) ]; } From cb6c8e3526fc08b76c72eb942ac94747d8b7d191 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 12 Jul 2023 02:52:50 +0000 Subject: [PATCH 034/174] plik,plikd: 1.3.6 -> 1.3.7 --- pkgs/servers/plik/default.nix | 4 ++-- pkgs/servers/plik/programs.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/plik/default.nix b/pkgs/servers/plik/default.nix index c79a48ad123c..bcd5ca8c87c8 100644 --- a/pkgs/servers/plik/default.nix +++ b/pkgs/servers/plik/default.nix @@ -1,13 +1,13 @@ { lib, fetchurl, makeWrapper, runCommand, callPackage }: let - version = "1.3.6"; + version = "1.3.7"; programs = callPackage ./programs.nix { }; webapp = fetchurl { url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-UGzevhZDfQBoFgPZQIs5Ftgz1cUHGfY/IRSEWQHFVSQ="; + hash = "sha256-Uj3I/ohgMr/Ud5xAZiBjsIW8bSdUeXXv9NYKLu8Aym8="; }; in diff --git a/pkgs/servers/plik/programs.nix b/pkgs/servers/plik/programs.nix index 5e64f92c52a5..edb6e11d2c7b 100644 --- a/pkgs/servers/plik/programs.nix +++ b/pkgs/servers/plik/programs.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }: let - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "root-gg"; repo = "plik"; rev = version; - sha256 = "sha256-Xfk7+60iB5/qJh/6j6AxW0aKXuzdINRfILXRzOFejW4="; + hash = "sha256-Agkwo1oat1LDP6EJBVOoq+d+p80BGOLS4K7WTue5Nbg="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { homepage = "https://plik.root.gg/"; @@ -29,7 +29,7 @@ in plik = buildGoModule { pname = "plik"; - inherit version meta src vendorSha256 postPatch; + inherit version meta src vendorHash postPatch; subPackages = [ "client" ]; postInstall = '' @@ -39,7 +39,7 @@ in plikd-unwrapped = buildGoModule { pname = "plikd-unwrapped"; - inherit version src vendorSha256 postPatch; + inherit version src vendorHash postPatch; subPackages = [ "server" ]; postFixup = '' From df366a59420d880ed9d8146d7749c09976354d3b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 12 Jul 2023 04:20:00 +0000 Subject: [PATCH 035/174] millet: 0.12.5 -> 0.12.6 Diff: https://github.com/azdavis/millet/compare/v0.12.5...v0.12.6 Changelog: https://github.com/azdavis/millet/raw/v0.12.6/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 7d9ebf6b19b6..c26e8a0b3651 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.5" +version = "0.12.6" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.12.5" +version = "0.12.6" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.5" +version = "0.12.6" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.5" +version = "0.12.6" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.5" +version = "0.12.6" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.5" +version = "0.12.6" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.5" +version = "0.12.6" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.5" +version = "0.12.6" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.5" +version = "0.12.6" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.12.5" +version = "0.12.6" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.5" +version = "0.12.6" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.5" +version = "0.12.6" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.5" +version = "0.12.6" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.5" +version = "0.12.6" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.5" +version = "0.12.6" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.5" +version = "0.12.6" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.5" +version = "0.12.6" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.5" +version = "0.12.6" [[package]] name = "sml-parse" -version = "0.12.5" +version = "0.12.6" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.5" +version = "0.12.6" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.5" +version = "0.12.6" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.5" +version = "0.12.6" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.5" +version = "0.12.6" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.5" +version = "0.12.6" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.5" +version = "0.12.6" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.5" +version = "0.12.6" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.5" +version = "0.12.6" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.5" +version = "0.12.6" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index cd668d42da23..495d234c9438 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.5"; + version = "0.12.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-sG4mowQMBiFAgTO1Rf+NCD2/GRgaqmmEQ1oSxn3hGTM="; + hash = "sha256-HYnBzAR994LSjsyUkwfkxHXi+f+KOFy/5z+RpwKbEdQ="; }; cargoLock = { From 0927c0815c48e8f949ee208a3ce2cc1f35468919 Mon Sep 17 00:00:00 2001 From: Tom Jankauski Date: Mon, 3 Jul 2023 22:21:47 -0700 Subject: [PATCH 036/174] tandoor-recipes: 1.4.12 -> 1.5.4 Change log: https://github.com/TandoorRecipes/recipes/releases/tag/1.5.4 --- pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index ffa3101ae11c..6ae3ede11b1a 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.4.12"; + version = "1.5.4"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - sha256 = "sha256-ZGPXcpicDYCE+J9mC2Dk/Ds2NYfUETuKXqHxpAGH86w="; + sha256 = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA="; }; - yarnSha256 = "sha256-LJ0uL66tcK6zL8Mkd2UB8dHsslMTtf8wQmgbZdvOT6s="; + yarnSha256 = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE="; meta = with lib; { homepage = "https://tandoor.dev/"; From f9e1d0bd66f92807506303ebc0609ff7ab513c93 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 12 Jul 2023 13:55:49 +0800 Subject: [PATCH 037/174] xmake: 2.7.9 -> 2.8.1 --- pkgs/development/tools/build-managers/xmake/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 4ad117ab93f7..55dc84d9f164 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.7.9"; + version = "2.8.1"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-m0LYY0gz9IhbBbiUKd1gBE3KmSMvYJYyC42Ff7M9Ku8="; + hash = "sha256-nM0LV3CVaLNbB1EKjc+Ywir2aQ/xWgET2Cu+kh908l8="; }; nativeBuildInputs = [ @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { xmake-core-sv ]; + strictDeps = true; + configureFlags = [ "--external=y" ]; meta = with lib; { From 853be697f59f64c342269e81e34ca375e8b3e7aa Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 12 Jul 2023 06:55:05 +0000 Subject: [PATCH 038/174] komikku: 1.21.1 -> 1.22.0 changelog: - RTL/LTR/Vertical pager: Added zoom - [Servers] JapScan: Update - [Servers] MangaFreak: Update - [Servers] MangaKawaii: Update - [Servers] Mangapill: Update - [Servers] Xoxocomics: Update - [L10n] Updated Arabic, French, Russian and Turkish translations --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 8676883628c4..008cfc5d2ba2 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.21.1"; + version = "1.22.0"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-1VqV0tTI8XVwGJhaGWEdSxtWDhQFmrsncvhC4ftJ7Jg="; + hash = "sha256-6Pqa3qNnH8WF/GK4CLyEmLoPm4A6Q3Gri2x0whf6WTY="; }; nativeBuildInputs = [ From b853c706613e4c9b9e80b306e5ddc1882d7780ad Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 12 Jul 2023 10:19:05 +0100 Subject: [PATCH 039/174] nixos/prowlarr: add package option --- nixos/modules/services/misc/prowlarr.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/prowlarr.nix b/nixos/modules/services/misc/prowlarr.nix index 77b8ec989479..cd2c98fc5dfb 100644 --- a/nixos/modules/services/misc/prowlarr.nix +++ b/nixos/modules/services/misc/prowlarr.nix @@ -11,6 +11,8 @@ in services.prowlarr = { enable = mkEnableOption (lib.mdDoc "Prowlarr"); + package = mkPackageOptionMD pkgs "prowlarr" { }; + openFirewall = mkOption { type = types.bool; default = false; @@ -29,7 +31,7 @@ in Type = "simple"; DynamicUser = true; StateDirectory = "prowlarr"; - ExecStart = "${pkgs.prowlarr}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr"; + ExecStart = "${cfg.package}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr"; Restart = "on-failure"; }; }; From dd73f358ab30754f52b97aed9f023ae5ef70c077 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 12 Jul 2023 11:36:25 -0400 Subject: [PATCH 040/174] xq-xml: init at 1.2.1 https://github.com/sibprogrammer/xq --- pkgs/tools/text/xml/xq/default.nix | 41 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/text/xml/xq/default.nix diff --git a/pkgs/tools/text/xml/xq/default.nix b/pkgs/tools/text/xml/xq/default.nix new file mode 100644 index 000000000000..9c6db5bd5fe7 --- /dev/null +++ b/pkgs/tools/text/xml/xq/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, xq +}: + +buildGoModule rec { + pname = "xq"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "sibprogrammer"; + repo = "xq"; + rev = "v${version}"; + hash = "sha256-Z14x1b25wKNm9fECkNqGJglK/Z8Xq8VHmYfp5aEvvMU="; + }; + + vendorHash = "sha256-CP4QsrTkFcOLDxnFc0apevXRmXHA9aJSU4AK9+TAxOU="; + + ldflags = [ + "-s" + "-w" + "-X=main.commit=${src.rev}" + "-X=main.version=${version}" + ]; + + passthru.tests = { + version = testers.testVersion { + package = xq; + }; + }; + + meta = with lib; { + description = "Command-line XML and HTML beautifier and content extractor"; + homepage = "https://github.com/sibprogrammer/xq"; + changelog = "https://github.com/sibprogrammer/xq/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c585a3a0eeb4..06172b42116f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14486,6 +14486,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + xq-xml = callPackage ../tools/text/xml/xq { }; + xsecurelock = callPackage ../tools/X11/xsecurelock { }; xsel = callPackage ../tools/misc/xsel { }; From 1611394719fccb25163f1934d3ba93fb6cbcece7 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 18:30:55 +0200 Subject: [PATCH 041/174] peering-manager: add meta section --- pkgs/servers/web-apps/peering-manager/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index 8b6e77ec0f1f..eb07edabf4de 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchpatch , nixosTests +, lib , plugins ? ps: [] }: @@ -93,4 +94,12 @@ in py.pkgs.buildPythonApplication rec { inherit (nixosTests) peering-manager; }; }; + + meta = with lib; { + homepage = "https://peering-manager.net/"; + license = licenses.asl20; + description = "BGP sessions management tool"; + maintainers = with maintainers; [ yuka ]; + platforms = platforms.linux; + }; } From 041e9a8e7a0087da7f357967f39eaff230a17c61 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 18:35:48 +0200 Subject: [PATCH 042/174] nixos/peering-manager: add meta section --- nixos/modules/services/web-apps/peering-manager.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index 666b82621268..c5c080cb1ed0 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -262,4 +262,6 @@ in { users.groups.peering-manager = {}; users.groups."${config.services.redis.servers.peering-manager.user}".members = [ "peering-manager" ]; }; + + meta.maintainers = with lib.maintainers; [ yuka ]; } From 593423154249c41cf725b3ebfea3e21abdcc4620 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 18:37:49 +0200 Subject: [PATCH 043/174] nixos/peering-manager: remove global 'with lib;' --- .../services/web-apps/peering-manager.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index c5c080cb1ed0..641a3644614f 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, buildEnv, ... }: -with lib; - let cfg = config.services.peering-manager; configFile = pkgs.writeTextFile { @@ -41,24 +39,24 @@ let pkg = (pkgs.peering-manager.overrideAttrs (old: { postInstall = '' ln -s ${configFile} $out/opt/peering-manager/peering_manager/configuration.py - '' + optionalString cfg.enableLdap '' + '' + lib.optionalString cfg.enableLdap '' ln -s ${cfg.ldapConfigPath} $out/opt/peering-manager/peering_manager/ldap_config.py ''; })).override { inherit (cfg) plugins; }; - peeringManagerManageScript = with pkgs; (writeScriptBin "peering-manager-manage" '' - #!${stdenv.shell} + peeringManagerManageScript = pkgs.writeScriptBin "peering-manager-manage" '' + #!${pkgs.stdenv.shell} export PYTHONPATH=${pkg.pythonPath} sudo -u peering-manager ${pkg}/bin/peering-manager "$@" - ''); + ''; in { - options.services.peering-manager = { + options.services.peering-manager = with lib; { enable = mkOption { - type = lib.types.bool; + type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Enable Peering Manager. This module requires a reverse proxy that serves `/static` separately. @@ -69,7 +67,7 @@ in { listenAddress = mkOption { type = types.str; default = "[::1]"; - description = lib.mdDoc '' + description = mdDoc '' Address the server will listen on. ''; }; @@ -77,7 +75,7 @@ in { port = mkOption { type = types.port; default = 8001; - description = lib.mdDoc '' + description = mdDoc '' Port the server will listen on. ''; }; @@ -88,14 +86,14 @@ in { defaultText = literalExpression '' python3Packages: with python3Packages; []; ''; - description = lib.mdDoc '' + description = mdDoc '' List of plugin packages to install. ''; }; secretKeyFile = mkOption { type = types.path; - description = lib.mdDoc '' + description = mdDoc '' Path to a file containing the secret key. ''; }; @@ -103,7 +101,7 @@ in { peeringdbApiKeyFile = mkOption { type = with types; nullOr path; default = null; - description = lib.mdDoc '' + description = mdDoc '' Path to a file containing the PeeringDB API key. ''; }; @@ -111,7 +109,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = lib.mdDoc '' + description = mdDoc '' Additional lines of configuration appended to the `configuration.py`. See the [documentation](https://peering-manager.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options. ''; @@ -120,7 +118,7 @@ in { enableLdap = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = mdDoc '' Enable LDAP-Authentication for Peering Manager. This requires a configuration file being pass through `ldapConfigPath`. @@ -129,15 +127,15 @@ in { ldapConfigPath = mkOption { type = types.path; - description = lib.mdDoc '' + description = mdDoc '' Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`. See the [documentation](https://peering-manager.readthedocs.io/en/stable/setup/6-ldap/#configuration) for possible options. ''; }; }; - config = mkIf cfg.enable { - services.peering-manager.plugins = mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); + config = lib.mkIf cfg.enable { + services.peering-manager.plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); system.build.peeringManagerPkg = pkg; From cc59ede27254be108512895b601777c376cba791 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 19:05:41 +0200 Subject: [PATCH 044/174] nixos/tests/peering-manager: fix 'nodes.machine.config' eval warning --- nixos/tests/web-apps/peering-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/web-apps/peering-manager.nix b/nixos/tests/web-apps/peering-manager.nix index 56b7eebfadff..3f0acd560d13 100644 --- a/nixos/tests/web-apps/peering-manager.nix +++ b/nixos/tests/web-apps/peering-manager.nix @@ -34,7 +34,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: { "sudo -u postgres psql -c 'ALTER USER \"peering-manager\" WITH SUPERUSER;'" ) machine.succeed( - "cd ${nodes.machine.config.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input" + "cd ${nodes.machine.system.build.peeringManagerPkg}/opt/peering-manager ; peering-manager-manage test --no-input" ) ''; }) From a52f9770b0af4f5d9676849524e1dd1e4fd6f2e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jul 2023 19:44:32 +0200 Subject: [PATCH 045/174] python311Packages.praw: 7.7.0 -> 7.7.1 Diff: https://github.com/praw-dev/praw/compare/refs/tags/v7.7.0...v7.7.1 Changelog: https://github.com/praw-dev/praw/blob/v7.7.1/CHANGES.rst --- pkgs/development/python-modules/praw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index a554ceec910d..0ce6027c1bfe 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "praw"; - version = "7.7.0"; + version = "7.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "praw-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-reJW1M1yDSQ1SvZJeOc0jwHj6ydl1AmMl5VZqRHxXZA="; + hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo="; }; propagatedBuildInputs = [ From ba4dab06a0a05adbb4f2e963493c3518007d5409 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jul 2023 17:46:53 +0000 Subject: [PATCH 046/174] ryujinx: 1.1.958 -> 1.1.960 --- pkgs/applications/emulators/ryujinx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index c55f3eff2033..0042c8f8729a 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.958"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "fa32ef92755a51a2567a1bcbb35fb34886b5f979"; - sha256 = "1g7q5c4cx2l41vs92p6a8rw1c0wvrydm9p962mjddckk6hf1bixq"; + rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c"; + sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; From fd29c6c5fe78cdf4c95f1872f118120fe69fcd21 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jul 2023 19:54:48 +0200 Subject: [PATCH 047/174] python311Packages.pysmartthings: 0.7.7 -> 0.7.8 Diff: https://github.com/andrewsayre/pysmartthings/compare/0.7.7...0.7.8 Changelog: https://github.com/andrewsayre/pysmartthings/releases/tag/0.7.8 --- pkgs/development/python-modules/pysmartthings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmartthings/default.nix b/pkgs/development/python-modules/pysmartthings/default.nix index 5f878839693a..369cd6ecea6e 100644 --- a/pkgs/development/python-modules/pysmartthings/default.nix +++ b/pkgs/development/python-modules/pysmartthings/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmartthings"; - version = "0.7.7"; + version = "0.7.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "andrewsayre"; repo = pname; rev = version; - hash = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs="; + hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc="; }; propagatedBuildInputs = [ From 083a4cf6d552fbe50269c5093c4651ec940a754e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jul 2023 20:19:15 +0200 Subject: [PATCH 048/174] python311Packages.dsmr-parser: 1.2.3 -> 1.2.4 Diff: https://github.com/ndokter/dsmr_parser/compare/refs/tags/v1.2.3...v1.2.4 Changelog: https://github.com/ndokter/dsmr_parser/releases/tag/v1.2.4 --- pkgs/development/python-modules/dsmr-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index eea6e4894a39..21e24275c448 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-M6ztqENIeD5foagKUXtJiGfFZPHsczlB0/AH4FMIsLY="; + hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI="; }; propagatedBuildInputs = [ From 41083ee4cf5970ad247858f00823c13117f1dd44 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Thu, 13 Jul 2023 09:44:30 +0200 Subject: [PATCH 049/174] python3Packages.ducc0: 0.30.0 -> 0.31.0 --- pkgs/development/python-modules/ducc0/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index 491e274bf798..14289caae466 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.30.0"; + version = "0.31.0"; disabled = pythonOlder "3.7"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-xYjgJGtWl9AjnzlFvdj/0chnIUDmoH85AtKXsNBwWUU="; + hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo="; }; buildInputs = [ pybind11 ]; From c7b6f8071d9569993e510dc4de06997885816ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= Date: Mon, 10 Jul 2023 13:45:46 +0300 Subject: [PATCH 050/174] melange: init at 0.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Apaydın --- pkgs/development/tools/melange/default.nix | 72 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/development/tools/melange/default.nix diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix new file mode 100644 index 000000000000..f5a5eb8ee85a --- /dev/null +++ b/pkgs/development/tools/melange/default.nix @@ -0,0 +1,72 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "melange"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "chainguard-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-sEmbfX7W1juymAxcWwDNxI8d/o7NS2S+0TJM6Vi9aQo="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # in format of 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorHash = "sha256-IkbXZu6iHRXjWFsLtRBDxwJio5sVVZvHylk1al0S+/c="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + + postInstall = '' + installShellCompletion --cmd melange \ + --bash <($out/bin/melange completion bash) \ + --fish <($out/bin/melange completion fish) \ + --zsh <($out/bin/melange completion zsh) + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/melange --help + $out/bin/melange version 2>&1 | grep "v${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/chainguard-dev/melange"; + changelog = "https://github.com/chainguard-dev/melange/blob/${src.rev}/NEWS.md"; + description = "Build APKs from source code"; + license = licenses.asl20; + maintainers = with maintainers; [ developer-guy ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 139c8be63087..2c9d938e8595 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -290,6 +290,8 @@ with pkgs; apko = callPackage ../development/tools/apko { }; + melange = callPackage ../development/tools/melange { }; + appthreat-depscan = callPackage ../development/tools/appthreat-depscan { }; activate-linux = callPackage ../applications/misc/activate-linux { }; From b1cf2cb35928d994ebb13d2f8faa6440e2ef18a1 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 12 Jul 2023 16:37:15 +0100 Subject: [PATCH 051/174] homepage-dashboard: init at 0.6.21 --- pkgs/servers/homepage-dashboard/default.nix | 82 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/servers/homepage-dashboard/default.nix diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix new file mode 100644 index 000000000000..1c8c283e9c3e --- /dev/null +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -0,0 +1,82 @@ +{ buildNpmPackage +, fetchFromGitHub +, nodePackages +, python3 +, lib +, fetchpatch +, makeBinaryWrapper +, nixosTests +}: + +buildNpmPackage rec { + pname = "homepage-dashboard"; + version = "0.6.21"; + + src = fetchFromGitHub { + owner = "benphelps"; + repo = "homepage"; + rev = "v${version}"; + hash = "sha256-kjxA02hJj/GAQ0fM1xTtXAnZSQgVyE+EMRrXis1Vr+o="; + }; + + npmDepsHash = "sha256-O6SQYx5vxscMsbWv0ynUYqdUkOp/nMtdvlZ/Mp95sBY="; + + patches = [ + (fetchpatch { + name = "env-config-dir.patch"; + url = "https://github.com/benphelps/homepage/commit/ca396ce96bce52f6c06a321f292aa94a66ceeb97.patch"; + hash = "sha256-eNnW/ce4ytoKR6jH1Ztc4UTWOmL0uGRdY6nYBIVYM6k="; + }) + ]; + + preBuild = '' + mkdir -p config + ''; + + postBuild = '' + # Add a shebang to the server js file, then patch the shebang. + sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js + patchShebangs .next/standalone/server.js + ''; + + buildInputs = [ + nodePackages.node-gyp-build + ]; + + env.PYTHON = "${python3}/bin/python"; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r .next/standalone $out/bin + cp -r public $out/bin/public + + mkdir -p $out/bin/.next + cp -r .next/static $out/bin/.next/static + + mv $out/bin/server.js $out/bin/homepage + chmod +x $out/bin/homepage + + wrapProgram $out/bin/homepage \ + --set-default PORT 3000 \ + --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard + + runHook postInstall + ''; + + doDist = false; + + passthru.tests = { + inherit (nixosTests) homepage; + }; + + meta = { + description = "A highly customisable dashboard with Docker and service API integrations."; + mainProgram = "homepage"; + homepage = "https://gethomepage.dev"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c585a3a0eeb4..272103caf624 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5362,6 +5362,8 @@ with pkgs; home-manager = callPackage ../tools/package-management/home-manager { }; + homepage-dashboard = callPackage ../servers/homepage-dashboard { }; + hostsblock = callPackage ../tools/misc/hostsblock { }; hottext = callPackage ../tools/text/hottext { }; From 3de6be09518a97066b358da98b153a421aae8d24 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 12 Jul 2023 16:43:32 +0100 Subject: [PATCH 052/174] nixos/homepage-dashboard: init --- nixos/modules/module-list.nix | 1 + .../services/misc/homepage-dashboard.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 nixos/modules/services/misc/homepage-dashboard.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1bdeb126fc36..0e748a7467ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -646,6 +646,7 @@ ./services/misc/greenclip.nix ./services/misc/headphones.nix ./services/misc/heisenbridge.nix + ./services/misc/homepage-dashboard.nix ./services/misc/ihaskell.nix ./services/misc/input-remapper.nix ./services/misc/irkerd.nix diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix new file mode 100644 index 000000000000..e68571253433 --- /dev/null +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -0,0 +1,55 @@ +{ config +, pkgs +, lib +, ... +}: + +let + cfg = config.services.homepage-dashboard; +in +{ + options = { + services.homepage-dashboard = { + enable = lib.mkEnableOption (lib.mdDoc "Homepage Dashboard"); + + package = lib.mkPackageOptionMD pkgs "homepage-dashboard" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Open ports in the firewall for Homepage."; + }; + + listenPort = lib.mkOption { + type = lib.types.int; + default = 8082; + description = lib.mdDoc "Port for Homepage to bind to."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.homepage-dashboard = { + description = "Homepage Dashboard"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + HOMEPAGE_CONFIG_DIR = "/var/lib/homepage-dashboard"; + PORT = "${toString cfg.listenPort}"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "homepage-dashboard"; + ExecStart = "${lib.getExe cfg.package}"; + Restart = "on-failure"; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listenPort ]; + }; + }; +} From f94b38be98b9b9df4a964b019257d511f65b0c13 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 12 Jul 2023 16:46:28 +0100 Subject: [PATCH 053/174] tests/homepage-dashboard: add tests for homepage --- nixos/tests/all-tests.nix | 1 + nixos/tests/homepage-dashboard.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 nixos/tests/homepage-dashboard.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 790de7bbdc47..723b030072e1 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -337,6 +337,7 @@ in { hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; + homepage-dashboard = handleTest ./homepage-dashboard.nix {}; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix new file mode 100644 index 000000000000..56e077f5ff6d --- /dev/null +++ b/nixos/tests/homepage-dashboard.nix @@ -0,0 +1,14 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "homepage-dashboard"; + meta.maintainers = with lib.maintainers; [ jnsgruk ]; + + nodes.machine = { pkgs, ... }: { + services.homepage-dashboard.enable = true; + }; + + testScript = '' + machine.wait_for_unit("homepage-dashboard.service") + machine.wait_for_open_port(8082) + machine.succeed("curl --fail http://localhost:8082/") + ''; +}) From 296e58b815f70413c3969b5fa33d3f4e86c75f54 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Jul 2023 17:05:45 +0800 Subject: [PATCH 054/174] python3Packages.datrie: set format --- pkgs/development/python-modules/datrie/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index 920e31c7f11e..414474af6ccb 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , cython , pytestCheckHook , hypothesis @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "datrie"; version = "0.8.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; @@ -16,17 +18,17 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools cython ]; - buildInputs = [ - hypothesis + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner", ' "" - ''; + checkInputs = [ + hypothesis + ]; pythonImportsCheck = [ "datrie" ]; From 16745af614230e092f853caf08ef02da84c48179 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 13 Jul 2023 13:38:42 +0200 Subject: [PATCH 055/174] matrix-sliding-sync: 0.99.3 -> 0.99.4 https://github.com/matrix-org/sliding-sync/releases/tag/v0.99.4 diff: https://github.com/matrix-org/sliding-sync/compare/v0.99.3...v0.99.4 --- pkgs/servers/matrix-synapse/sliding-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/sliding-sync/default.nix b/pkgs/servers/matrix-synapse/sliding-sync/default.nix index a2c6f79fb338..a83846e6a099 100644 --- a/pkgs/servers/matrix-synapse/sliding-sync/default.nix +++ b/pkgs/servers/matrix-synapse/sliding-sync/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "matrix-sliding-sync"; - version = "0.99.3"; + version = "0.99.4"; src = fetchFromGitHub { owner = "matrix-org"; repo = "sliding-sync"; rev = "v${version}"; - hash = "sha256-lmmOq0gkvrIXQmy3rbTga0cC85t0LWjDOqrH1NWUpdA="; + hash = "sha256-s7hQ4qCOhkNS8Mc2HZjFqedtj0KqXMAxVMZRIjPyvOA="; }; vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4="; From 2d3a5a99e10808bd03f7fdacc5d4a5cbfe71ed54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jul 2023 13:28:33 +0000 Subject: [PATCH 056/174] jackett: 0.21.456 -> 0.21.462 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index eef777be1356..98444d7ba054 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.456"; + version = "0.21.462"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-4As4WLtGyMC+zqRd7BUSC/4lLthde+BKWUNF+qleD2MpX7H/D+84ATDn0H8rMxRDP6SkuI0agRnxSJ8ygYzjbw=="; + hash = "sha512-45R+vOo/aJR0WotL2VlynlTSZbN9UqOh6SngDciOrKtj1mctGI9NmfXcKyWMXiDNQniCkNi9suIupuY8nVcbsg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 1aea47f67865a0e786dd114107627dc714941046 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 13 Jul 2023 22:48:44 +0800 Subject: [PATCH 057/174] qrcode: unstable-2016-08-04 -> unstable-2022-01-10 --- pkgs/tools/graphics/qrcode/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index c759b23b79a7..3f1404404005 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "qrcode"; - version = "unstable-2016-08-04"; + version = "unstable-2022-01-10"; src = fetchFromGitHub { owner = "qsantos"; repo = "qrcode"; - rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73"; - sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf"; + rev = "f4475866bbf963ad118db936060f606eedc224d5"; + hash = "sha256-IbWYSAc0PvSWcxKaPUXDldGDCK/lPZjptepYtLppPmA="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; @@ -23,6 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A small QR-code tool"; + homepage = "https://github.com/qsantos/qrcode"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; platforms = with platforms; unix; From 4619083f80018aa02ebe30c7542200c787d23338 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Jul 2023 18:39:48 +0200 Subject: [PATCH 058/174] python310Packages.pydaikin: 2.9.1 -> 2.10.5 --- pkgs/development/python-modules/pydaikin/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 70a305450176..8e51bf8d085f 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.9.1"; + version = "2.10.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA="; + hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc="; }; propagatedBuildInputs = [ @@ -30,6 +30,8 @@ buildPythonPackage rec { urllib3 ]; + doCheck = false; # tests fail and upstream does not seem to run them either + nativeCheckInputs = [ freezegun pytest-aiohttp From dd4054b93dd7653483e3f446ef1269bfe96b643a Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Mon, 10 Jul 2023 22:31:45 +0100 Subject: [PATCH 059/174] jetbrains.clion: remove redundant wrapper --- pkgs/applications/editors/jetbrains/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index cb356d67d15f..b78da5da3f1d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -77,8 +77,6 @@ let --replace-needed libcrypto.so.10 libcrypto.so autoPatchelf $PWD/bin - wrapProgram $out/bin/clion \ - --set CL_JDK "${jdk}" ) ''; }); From dd47be7ec8f22070dd44739c3edbd01c2d287d9e Mon Sep 17 00:00:00 2001 From: GenericNerdyUsername Date: Mon, 10 Jul 2023 22:46:04 +0100 Subject: [PATCH 060/174] jetbrains.*: replace `jbr` directory instead of removing --- pkgs/applications/editors/jetbrains/linux.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index eaaa3c4adedc..1c00e408aeac 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -71,6 +71,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec { } rm -rf jbr + # When using the IDE as a remote backend using gateway, it expects the jbr directory to contain the jdk + ln -s ${jdk.home} jbr interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then From 26003af2ece60329b25dc6c9872bf11cb0afb1d3 Mon Sep 17 00:00:00 2001 From: netali Date: Thu, 13 Jul 2023 22:53:35 +0200 Subject: [PATCH 061/174] vbam: 2.1.5 -> 2.1.6 --- pkgs/applications/emulators/vbam/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index acf7b26d9478..2b252f0f10de 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1sc3gdn7dqkipjsvlzchgd98mia9ic11169dw8v341vr9ppb1b6m"; + sha256 = "1fph8phbswq6d9lgw1y1767wdp316w5hn5bws6h2dj75gvsqf221"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -43,13 +43,6 @@ stdenv.mkDerivation rec { gtk3 ]; - patches = [ - (fetchpatch { - url = "https://github.com/visualboyadvance-m/visualboyadvance-m/commit/1d7e8ae4edc53a3380dfea88329b8b8337db1c52.patch"; - sha256 = "sha256-SV1waz2JSKiM6itwkqwlE3aOZCcOl8iyBr06tyYlefo="; - }) - ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" From 775f683a5a08ea58d012b034e48b651d70b1d8a4 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 13 Jul 2023 02:51:08 +0100 Subject: [PATCH 062/174] nixos-option: fix expression position calculation This was causing null pointer dereferences. Pattern copied from Nix source code. --- pkgs/tools/nix/nixos-option/nixos-option.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/nix/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc index e4f7bff3c662..e2a73866d0ed 100644 --- a/pkgs/tools/nix/nixos-option/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/nixos-option.cc @@ -119,7 +119,7 @@ Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy Value evaluateValue(Context & ctx, Value & v) { - ctx.state.forceValue(v, v.attrs->pos); + ctx.state.forceValue(v, [&]() { return v.determinePos(nix::noPos); }); if (ctx.autoArgs.empty()) { return v; } From ec05aa83bc52853435dfdb8480a087929e3bb17b Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 14 Jul 2023 01:11:28 +0300 Subject: [PATCH 063/174] komorebi: init at 2.2.1 --- .../graphics/komorebi/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/graphics/komorebi/default.nix diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix new file mode 100644 index 000000000000..2d099b5eb7c9 --- /dev/null +++ b/pkgs/applications/graphics/komorebi/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, vala +, pkg-config +, glib +, gtk3 +, libgee +, webkitgtk +, clutter-gtk +, clutter-gst +, ninja +, wrapGAppsHook +, testers +, komorebi +}: + +stdenv.mkDerivation rec { + pname = "komorebi"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "Komorebi-Fork"; + repo = "komorebi"; + rev = "v${version}"; + hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk="; + }; + + nativeBuildInputs = [ + meson + vala + pkg-config + ninja + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + webkitgtk + clutter-gtk + clutter-gst + ]; + + passthru.tests.version = testers.testVersion { package = komorebi; }; + + meta = with lib; { + description = "A beautiful and customizable wallpaper manager for Linux"; + homepage = "https://github.com/Komorebi-Fork/komorebi"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ kranzes ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37f3bfb16be2..420e6a424ad4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5488,6 +5488,8 @@ with pkgs; komga = callPackage ../servers/komga { }; + komorebi = callPackage ../applications/graphics/komorebi { }; + krapslog = callPackage ../tools/misc/krapslog { }; krelay = callPackage ../applications/networking/cluster/krelay { }; From 45590adc026030d831a667f3fc17e6a6aea7ef97 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 13 Jul 2023 18:31:00 -0400 Subject: [PATCH 064/174] cargo-temp: 0.2.17 -> 0.2.18 Diff: https://github.com/yozhgoor/cargo-temp/compare/v0.2.17...v0.2.18 Changelog: https://github.com/yozhgoor/cargo-temp/releases/tag/v0.2.18 --- pkgs/development/tools/rust/cargo-temp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-temp/default.nix b/pkgs/development/tools/rust/cargo-temp/default.nix index e19f091be80a..c138fb6292d1 100644 --- a/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${version}"; - hash = "sha256-nDUtmCbvWK6bdcKvlx3KYMy9w8IOLL6jMWOafX704eQ="; + hash = "sha256-JUpXLdFaG653u9a4Nq7TC1ZNEcZ0QzgYMjGS8Kam0ec="; }; - cargoHash = "sha256-DxeZGQqi681JoCZo0Iq8+TgyF7a8No9Crm4NypUeDDA="; + cargoHash = "sha256-7yPvHCmdokb/oJqR3h+RJOQbE/pcrIDBltnG5zfoqMk="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; From 7a6c92317438abc10285b333707f220b3aac4200 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 13 Jul 2023 18:38:05 -0400 Subject: [PATCH 065/174] tui-journal: 0.2.0 -> 0.3.0 Diff: https://github.com/AmmarAbouZor/tui-journal/compare/v0.2.0...v0.3.0 Changelog: https://github.com/AmmarAbouZor/tui-journal/blob/v0.3.0/CHANGELOG.ron --- pkgs/applications/misc/tui-journal/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index f1d5e059d45d..1d4abdf5c68f 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-B3GxxkFT2Z7WtV9RSmtKBjvzRRqmcoukUKc6LUZ/JyM="; + hash = "sha256-4fa41kzDGefqxfCcxe1/9iEZHVC8MIzcOG8RUiLW5bw="; }; - cargoHash = "sha256-DCKW8eGLSTx9U7mkGruPphzFpDlpL8ULCOKhj6HJwhw="; + cargoHash = "sha256-Uz9Od9hXM6EGZ+MsZ7uCYvA4aoF3E9uSNjjtxd1ssCs="; nativeBuildInputs = [ pkg-config @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "tjournal"; }; } From 5a67e7be68d6d59a57a3befec252329a492d126e Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Fri, 14 Jul 2023 01:44:47 +0300 Subject: [PATCH 066/174] mpvScripts.youtube-quality: replace with mpvScripts.quality-menu v4.1.0 While at it also moved scripts attrset out of all-packages.nix so we don't set the alias there. --- .../video/mpv/scripts/default.nix | 30 ++++++++++++++ .../video/mpv/scripts/quality-menu.nix | 38 ++++++++++++++++++ .../video/mpv/scripts/youtube-quality.nix | 39 ------------------- pkgs/top-level/all-packages.nix | 21 +--------- 4 files changed, 69 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/video/mpv/scripts/default.nix create mode 100644 pkgs/applications/video/mpv/scripts/quality-menu.nix delete mode 100644 pkgs/applications/video/mpv/scripts/youtube-quality.nix diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix new file mode 100644 index 000000000000..1a2bb9260840 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -0,0 +1,30 @@ +{ lib +, callPackage +, config +}: + +lib.recurseIntoAttrs + ({ + acompressor = callPackage ./acompressor.nix { }; + autocrop = callPackage ./autocrop.nix { }; + autodeint = callPackage ./autodeint.nix { }; + autoload = callPackage ./autoload.nix { }; + convert = callPackage ./convert.nix { }; + inhibit-gnome = callPackage ./inhibit-gnome.nix { }; + mpris = callPackage ./mpris.nix { }; + mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; + mpvacious = callPackage ./mpvacious.nix { }; + quality-menu = callPackage ./quality-menu.nix { }; + simple-mpv-webui = callPackage ./simple-mpv-webui.nix { }; + sponsorblock = callPackage ./sponsorblock.nix { }; + thumbfast = callPackage ./thumbfast.nix { }; + thumbnail = callPackage ./thumbnail.nix { }; + uosc = callPackage ./uosc.nix { }; + vr-reversal = callPackage ./vr-reversal.nix { }; + webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; + cutter = callPackage ./cutter.nix { }; + } + // (callPackage ./occivink.nix { })) + // lib.optionalAttrs config.allowAliases { + youtube-quality = throw "'youtube-quality' is no longer maintained, use 'quality-menu' instead"; # added 2023-07-14 +} diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix new file mode 100644 index 000000000000..45d358843b37 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, oscSupport ? false +}: + +stdenvNoCC.mkDerivation rec { + pname = "mpv-quality-menu"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "christoph-heinrich"; + repo = "mpv-quality-menu"; + rev = "v${version}"; + hash = "sha256-93WoTeX61xzbjx/tgBgUVuwyR9MkAUzCfVSrbAC7Ddc="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp quality-menu.lua $out/share/mpv/scripts + '' + lib.optionalString oscSupport '' + cp quality-menu-osc.lua $out/share/mpv/scripts + '' + '' + runHook postInstall + ''; + + passthru.scriptName = "quality-menu.lua"; + + meta = with lib; { + description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; + homepage = "https://github.com/christoph-heinrich/mpv-quality-menu"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ lunik1 ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/youtube-quality.nix b/pkgs/applications/video/mpv/scripts/youtube-quality.nix deleted file mode 100644 index 5301e4232a06..000000000000 --- a/pkgs/applications/video/mpv/scripts/youtube-quality.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, oscSupport ? false -}: - -stdenvNoCC.mkDerivation rec { - pname = "mpv-youtube-quality"; - version = "unstable-2020-02-11"; - - src = fetchFromGitHub { - owner = "jgreco"; - repo = "mpv-youtube-quality"; - rev = "1f8c31457459ffc28cd1c3f3c2235a53efad7148"; - sha256 = "voNP8tCwCv8QnAZOPC9gqHRV/7jgCAE63VKBd/1s5ic="; - }; - - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp youtube-quality.lua $out/share/mpv/scripts - '' + lib.optionalString oscSupport '' - cp youtube-quality-osc.lua $out/share/mpv/scripts - '' + '' - runHook postInstall - ''; - - passthru.scriptName = "youtube-quality.lua"; - - meta = with lib; { - description = "A userscript for MPV that allows you to change youtube video quality (ytdl-format) on the fly"; - homepage = "https://github.com/jgreco/mpv-youtube-quality"; - license = licenses.unfree; - platforms = platforms.all; - maintainers = with maintainers; [ lunik1 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37f3bfb16be2..af571dcb6786 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33288,26 +33288,7 @@ with pkgs; mpvpaper = callPackage ../tools/wayland/mpvpaper { }; - mpvScripts = recurseIntoAttrs ({ - acompressor = callPackage ../applications/video/mpv/scripts/acompressor.nix {}; - autocrop = callPackage ../applications/video/mpv/scripts/autocrop.nix { }; - autodeint = callPackage ../applications/video/mpv/scripts/autodeint.nix { }; - autoload = callPackage ../applications/video/mpv/scripts/autoload.nix { }; - convert = callPackage ../applications/video/mpv/scripts/convert.nix { }; - inhibit-gnome = callPackage ../applications/video/mpv/scripts/inhibit-gnome.nix { }; - mpris = callPackage ../applications/video/mpv/scripts/mpris.nix { }; - mpv-playlistmanager = callPackage ../applications/video/mpv/scripts/mpv-playlistmanager.nix { }; - mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { }; - simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { }; - sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { }; - thumbfast = callPackage ../applications/video/mpv/scripts/thumbfast.nix { }; - thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; - uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { }; - vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { }; - webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { }; - youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; - cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; - } // (callPackage ../applications/video/mpv/scripts/occivink.nix {})); + mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; open-in-mpv = callPackage ../applications/video/open-in-mpv { }; From 68ab7ff2ef96e242bd5f671b3baa3e33c4a4e749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jul 2023 23:08:32 +0000 Subject: [PATCH 067/174] python310Packages.python-crontab: 2.7.1 -> 3.0.0 --- pkgs/development/python-modules/python-crontab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix index c75dc71e0fc0..99cf1c63ca8f 100644 --- a/pkgs/development/python-modules/python-crontab/default.nix +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "python-crontab"; - version = "2.7.1"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k="; + hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k="; }; propagatedBuildInputs = [ From 02b05fb704dfcadcac85e754c79c90e9a338359f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Jul 2023 01:04:26 +0200 Subject: [PATCH 068/174] python310Packages.zigpy: 0.56.1 -> 0.56.2 https://github.com/zigpy/zigpy/releases/tag/0.56.2 --- .../development/python-modules/zigpy/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 94a91a9a955f..e852746d7b69 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -12,13 +12,14 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, setuptools , voluptuous }: buildPythonPackage rec { pname = "zigpy"; - version = "0.56.1"; - format = "setuptools"; + version = "0.56.2"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,9 +27,18 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-xOvRsnTv/5GhGRVM9M6zjkEWI5dq9rGVcoi5G+0LpDE="; + hash = "sha256-VUnt2rk1nQZqmoS8ytBCX2q3E4zxSz2A0Hg7AUXmtJo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiosqlite From 718f12075484042c3d314669fa7fd81da45bbc3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Jul 2023 01:10:34 +0200 Subject: [PATCH 069/174] home-assistant: 2023.7.1 -> 2023.7.2 https://github.com/home-assistant/core/releases/tag/2023.7.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 9e632d9bf747..31dfa15c5dd2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.7.1"; + version = "2023.7.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6596fb15aa72..74aad1b6a26a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -287,7 +287,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.7.1"; + hassVersion = "2023.7.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -303,7 +303,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-YYuIVEAWLOIW1xiUGzq6TeFfCSj5rxn6H8W7XhgAhF8="; + hash = "sha256-fESzpOOEGFOJJ0ldI/VaVN0kH/zbCCq25s8vNnCUOFs="; }; # Secondary source is git for tests @@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-ovboX1tixBDZEA2phmdE6LxnvpWDhdTeEWVw6xJiSMU="; + hash = "sha256-HW+XO84enAA3BH4nppkXvAERT74y5m5jvz0uHWkkS6k="; }; nativeBuildInputs = with python.pkgs; [ From ab155b06badf00218717af1dbd98380d3b4b42bb Mon Sep 17 00:00:00 2001 From: lunik1 Date: Fri, 14 Jul 2023 00:41:04 +0100 Subject: [PATCH 070/174] iosevka: 24.1.4 -> 25.0.1 Diff: https://github.com/be5invis/iosevka/compare/v25.0.1...v25.0.1 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 1e92a49a96ba..47081a05a062 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "24.1.4"; + version = "25.0.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-+b+13D6dKHx9kvAKeN/ePcWGtDPpFB/dVwHTTprw7Co="; + hash = "sha256-clbqr4hGtIkbgPYovYXHGW+FUTEjAn3Oq7aoPFMgGJU="; }; - npmDepsHash = "sha256-+LZQY64SdcEx+Mqb5qGelC7zbXdStJkDvcFWgUVTDnE="; + npmDepsHash = "sha256-TxMmUgwQPbSV+1qe0FEtSPAYwJRnpuQ+qOmWvrq9xKY="; nativeBuildInputs = [ remarshal From f3783908dd381e5abc2a34daffcb8b4d816562e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Thu, 13 Jul 2023 13:11:45 -0300 Subject: [PATCH 071/174] johnny-reborn: init at unstable-2020-12-06 --- .../misc/johnny-reborn/default.nix | 38 +++++++++++ .../misc/johnny-reborn/with-data.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 105 insertions(+) create mode 100644 pkgs/applications/misc/johnny-reborn/default.nix create mode 100644 pkgs/applications/misc/johnny-reborn/with-data.nix diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix new file mode 100644 index 000000000000..5a512b0466e7 --- /dev/null +++ b/pkgs/applications/misc/johnny-reborn/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +}: + +stdenv.mkDerivation { + pname = "johnny-reborn-engine"; + version = "unstable-2020-12-06"; + + src = fetchFromGitHub { + owner = "jno6809"; + repo = "jc_reborn"; + rev = "524a5803e4fa65f840379c781f40ce39a927032e"; + hash = "sha256-YKAOCgdRnvNMzL6LJVXN0pLvjyJk4Zv/RCqGtDPFR90="; + }; + + makefile = "Makefile.linux"; + + buildInputs = [ SDL2 ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp jc_reborn $out/ + + runHook postInstall + ''; + + meta = { + description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)"; + homepage = "https://github.com/jno6809/jc_reborn"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pedrohlc ]; + inherit (SDL2.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/johnny-reborn/with-data.nix b/pkgs/applications/misc/johnny-reborn/with-data.nix new file mode 100644 index 000000000000..1e53edaa5b85 --- /dev/null +++ b/pkgs/applications/misc/johnny-reborn/with-data.nix @@ -0,0 +1,63 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, fetchzip +, johnny-reborn-engine +, makeWrapper +}: + +stdenvNoCC.mkDerivation { + pname = "johnny-reborn"; + inherit (johnny-reborn-engine) version; + + srcs = + let + sounds = fetchFromGitHub { + owner = "nivs1978"; + repo = "Johnny-Castaway-Open-Source"; + rev = "be6afefd43a3334acc66fc9d777c162c8bfb9558"; + hash = "sha256-rtZVCn4KbEBVwaSQ4HZhMoDEI5Q9IPj9SZywgAx0MPY="; + }; + + resources = fetchzip { + name = "scrantic-source"; + url = "https://archive.org/download/johnny-castaway-screensaver/scrantic-run.zip"; + hash = "sha256-Q9chCYReOQEmkTyIkYo+D+OXYUqxPNOOEEmiFh8yaw4="; + stripRoot = false; + }; + in + [ + sounds + resources + ]; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "source"; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -t $out/ \ + ../scrantic-source/RESOURCE.* \ + JCOS/Resources/sound*.wav + + makeWrapper \ + ${johnny-reborn-engine}/jc_reborn \ + $out/jc_reborn \ + --chdir $out + + runHook postInstall + ''; + + meta = { + description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ pedrohlc ]; + inherit (johnny-reborn-engine.meta) homepage platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5e4eae918a2..4b5814767abb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2740,6 +2740,10 @@ with pkgs; ytree = callPackage ../applications/file-managers/ytree { }; + johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { }; + + johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { From 8983401a0faf77fc5fe27c5b246bab5334f1839d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 9 Jul 2023 19:58:41 -0300 Subject: [PATCH 072/174] txr: 288 -> 289 --- pkgs/tools/text/txr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix index f8dc97c4a979..17f351247909 100644 --- a/pkgs/tools/text/txr/default.nix +++ b/pkgs/tools/text/txr/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "txr"; - version = "288"; + version = "289"; src = fetchurl { - url = "http://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ieqBM9pnwWQHdpHAczCMXqYqpP0Zv6AfL2DsHiUnF/8="; + url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2"; + hash = "sha256-1m3QXY1qlVMFpehAYifHkDNQ4hAlO45/6+bbpbMAo3M="; }; buildInputs = [ libffi ]; From 078d8d5efe27b28d918b9a240accc6509b470869 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 11 Jul 2023 21:14:49 -0300 Subject: [PATCH 073/174] txr: mark as broken on Apple Intel Because ofborg fails to check it. --- pkgs/tools/text/txr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix index 17f351247909..2b9c306406a8 100644 --- a/pkgs/tools/text/txr/default.nix +++ b/pkgs/tools/text/txr/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ AndersonTorres dtzWill ]; platforms = lib.platforms.all; + broken = stdenv.isDarwin && stdenv.isx86_64; # ofborg fails while testing }; }) From 395fa502763eb34e295de0d1d7e2853d4ba6bdf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 01:03:46 +0000 Subject: [PATCH 074/174] oh-my-posh: 17.6.0 -> 17.9.0 --- pkgs/development/tools/oh-my-posh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index efc3ac76c84d..06e3ff5b81ef 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "17.6.0"; + version = "17.9.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mWHoiFal9WdASMe/Q7EJBp1Z2xu7Wq0i06xyqmi8q24="; + hash = "sha256-Wcn+3hb90QFlQ/jf4jHQubmCH4P/cA0xP8ZWU7h5xd8="; }; - vendorHash = "sha256-fHwaCcN47+LkJYqRFSQgVddVuR1QfdFuSNDYFh1edM4="; + vendorHash = "sha256-FDVzJQuxrzypqke9gbDdQfMR3dM/y8msAvZYyrlMv+o="; sourceRoot = "source/src"; From 82fc0c6e96d98857323ded85505461b5e8a0c365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?= Date: Thu, 13 Jul 2023 22:10:42 -0300 Subject: [PATCH 075/174] pritunl-client: refactor, add service and electron app --- .../networking/pritunl-client/default.nix | 132 ++++++++++++++++-- 1 file changed, 120 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/pritunl-client/default.nix b/pkgs/tools/networking/pritunl-client/default.nix index 4dfdebf30a68..0ba02d84e6de 100644 --- a/pkgs/tools/networking/pritunl-client/default.nix +++ b/pkgs/tools/networking/pritunl-client/default.nix @@ -1,9 +1,22 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "pritunl-client"; +{ lib +, stdenv +, fetchFromGitHub +, runtimeShell +, runCommand +, makeWrapper +, installShellFiles +, buildGoModule +, coreutils +, which +, gnugrep +, gnused +, openresolv +, systemd +, iproute2 +, openvpn +, electron +}: let version = "1.3.3584.5"; - src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; @@ -11,25 +24,120 @@ buildGoModule rec { sha256 = "sha256-wWpP2u+oQSESjkRvAn5by7efvssYtKBYg2E+FZ/+tg0="; }; - modRoot = "cli"; - vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk="; + cli = buildGoModule { + pname = "pritunl-cli"; + inherit version src; + + modRoot = "cli"; + vendorHash = "sha256-miwGLWpoaavg/xcw/0pNBYCdovBnvjP5kdaaGPcRuWk="; + + postInstall = '' + mv $out/bin/cli $out/bin/pritunl-client + ''; + }; + + service = buildGoModule { + pname = "pritunl-client-service"; + inherit version src; + + modRoot = "service"; + vendorHash = "sha256-9Fv8m3eWlxv4WWDSdI0VMavgy+0OSIVZ98dkDBwm4Gc="; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + sed -Ei service/profile/scripts.go \ + -e 's|#!\s*(/usr)?/bin/(env )?bash\b|#! ${runtimeShell}|g' + '' + lib.optionalString stdenv.isLinux '' + sed -Ei service/profile/scripts.go \ + -e 's|(/usr)?/s?bin/busctl\b|busctl|g' \ + -e 's|(/usr)?/s?bin/resolvectl\b|resolvectl|g' \ + -e 's|(/usr)?/s?bin/ip\b|ip|g' + ''; + + postInstall = '' + mv $out/bin/service $out/bin/pritunl-client-service + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $out/lib/systemd/system/ + cp $src/resources_linux/pritunl-client.service $out/lib/systemd/system/ + substituteInPlace $out/lib/systemd/system/pritunl-client.service \ + --replace "/usr" "$out" + ''; + + postFixup = let + hookScriptsDeps = [ + coreutils + which + gnused + gnugrep + ] ++ lib.optionals stdenv.isLinux [ + openresolv + systemd + iproute2 + ]; + openvpn-wrapped = runCommand "openvpn-wrapped" { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${openvpn}/bin/openvpn $out/bin/openvpn \ + --prefix PATH : ${lib.makeBinPath hookScriptsDeps} \ + --add-flags "--setenv PATH \$PATH" + ''; + in lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/pritunl-client-service \ + --prefix PATH : "${lib.makeBinPath ([ openvpn-wrapped ])}" + ''; + }; +in stdenv.mkDerivation { + pname = "pritunl-client"; + inherit version src; + + dontBuild = true; + dontConfigure = true; nativeBuildInputs = [ + makeWrapper installShellFiles ]; - postInstall = '' - mv $out/bin/cli $out/bin/pritunl-client + installPhase = '' + runHook preInstall + + mkdir -p $out/bin/ + ln -s ${cli}/bin/pritunl-client $out/bin/ + ln -s ${service}/bin/pritunl-client-service $out/bin/ + + mkdir -p $out/lib/ + cp -r client $out/lib/pritunl_client_electron + + makeWrapper ${electron}/bin/electron $out/bin/pritunl-client-electron \ + --add-flags $out/lib/pritunl_client_electron + + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $out/lib/systemd/system/ + ln -s ${service}/lib/systemd/system/pritunl-client.service $out/lib/systemd/system/ + + mkdir -p $out/share/icons/ + cp -r resources_linux/icons $out/share/icons/hicolor + + mkdir -p $out/share/applications/ + cp resources_linux/pritunl-client-electron.desktop $out/share/applications/ + substituteInPlace $out/share/applications/pritunl-client-electron.desktop \ + --replace "/usr/lib/pritunl_client_electron/Pritunl" "$out/bin/pritunl-client-electron" + '' + '' + # install shell completions for pritunl-client installShellCompletion --cmd pritunl-client \ --bash <($out/bin/pritunl-client completion bash) \ --fish <($out/bin/pritunl-client completion fish) \ --zsh <($out/bin/pritunl-client completion zsh) + + runHook postInstall ''; meta = with lib; { - description = "Pritunl OpenVPN client CLI"; - homepage = "https://github.com/pritunl/pritunl-client-electron/tree/master/cli"; + description = "Pritunl OpenVPN client"; + homepage = "https://client.pritunl.com/"; license = licenses.unfree; - maintainers = with maintainers; [ minizilla ]; + maintainers = with maintainers; [ minizilla andrevmatos ]; }; } From c7501c10414229b8cb7e895e233dd3f98cfff83c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 02:09:21 +0000 Subject: [PATCH 076/174] cnspec: 8.17.0 -> 8.18.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index a25891641788..6bd060154fa0 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "8.17.0"; + version = "8.18.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-pirU9mJnycr3wlc6lOAVSo0Wpb6q37ewdVcFzFPlr7s="; + hash = "sha256-JlFPJ4tbpxt/UBXpQCod3zythOHP9wQ8yqAMqKAyqoU="; }; proxyVendor = true; - vendorHash = "sha256-y63IWmBJaSUk1A5WRC9sokH+pNDhsc/Es1j50k5or8w="; + vendorHash = "sha256-RDQQVl3AxdZaF4ISQiQ8ZliZi6TWwIzYLZLxs0yPkJc="; subPackages = [ "apps/cnspec" From 3f13f26e937ebf78bb4a091d221d609ae71eaef7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 02:12:42 +0000 Subject: [PATCH 077/174] numix-icon-theme-circle: 23.06.21 -> 23.07.08 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 0c37cd29cb87..b06b6b35f37f 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.06.21"; + version = "23.07.08"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-FoyBO/4AB1tEHTFyQoYB/rDK+HZfFAE9c3nVULTaWpM="; + sha256 = "sha256-JToou95HIrfqdT0IVh0colgGFXq3GR2D3FQU0Qc57Y4="; }; nativeBuildInputs = [ gtk3 ]; From 84d052b76c418de215b00353446357f4919bfb34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 02:33:38 +0000 Subject: [PATCH 078/174] oauth2c: 1.9.0 -> 1.10.0 --- pkgs/tools/security/oauth2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/oauth2c/default.nix b/pkgs/tools/security/oauth2c/default.nix index e73aed4dfe8e..4f9c32183916 100644 --- a/pkgs/tools/security/oauth2c/default.nix +++ b/pkgs/tools/security/oauth2c/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-+R3NViAnrHg/9dthF0e2dEppX5MLzHeRMYFiZutE1mU="; + hash = "sha256-IOZjZgZk6upeFgQ0/KqrNKM15/EggvCSrSCSCTFNGVA="; }; vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE="; From 0cac0b03f79e4291a7770a7a009bbb4c9ad15050 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 14 Jul 2023 02:42:50 +0000 Subject: [PATCH 079/174] honeytrap: unstable-2020-12-10 -> unstable-2021-12-20 --- pkgs/tools/security/honeytrap/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/tools/security/honeytrap/default.nix index 91d1c367182b..e0252d06f154 100644 --- a/pkgs/tools/security/honeytrap/default.nix +++ b/pkgs/tools/security/honeytrap/default.nix @@ -4,21 +4,21 @@ }: buildGoModule { pname = "honeytrap"; - version = "unstable-2020-12-10"; + version = "unstable-2021-12-20"; src = fetchFromGitHub { owner = "honeytrap"; repo = "honeytrap"; - rev = "affd7b21a5aa1b57f086e6871753cb98ce088d76"; - sha256 = "y1SWlBFgX3bFoSRGJ45DdC1DoIK5BfO9Vpi2h57wWtU="; + rev = "05965fc67deab17b48e43873abc5f509067ef098"; + hash = "sha256-KSVqjHlXl85JaqKiW5R86HCMdtFBwTMJkxFoySOcahs="; }; + vendorHash = "sha256-W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8="; + # Otherwise, will try to install a "scripts" binary; it's only used in # dockerize.sh, which we don't care about. subPackages = [ "." ]; - vendorSha256 = "W8w66weYzCpZ+hmFyK2F6wdFz6aAZ9UxMhccNy1X1R8="; - meta = with lib; { description = "Advanced Honeypot framework"; homepage = "https://github.com/honeytrap/honeytrap"; From 1e6d25efaf0b1b510e5e823209fe268fcc9842fd Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 13 Jul 2023 20:02:47 -0700 Subject: [PATCH 080/174] python310Packages.rstcheck-core: disable failing darwin tests --- .../development/python-modules/rstcheck-core/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 1126a61ff6ae..0a250a83fa5b 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , docutils , fetchFromGitHub @@ -45,6 +46,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. + "test_error_without_config_file_macos" + "test_file_1_is_bad_without_config_macos" + ]; + pythonImportsCheck = [ "rstcheck_core" ]; From e457874b992d95543cbeb04c7f0ff5091e2a4467 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 13 Jul 2023 20:04:46 -0700 Subject: [PATCH 081/174] python310Packages.rstcheck: disable failing darwin tests --- pkgs/development/python-modules/rstcheck/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 2ad2e206b6c4..22f160000830 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , docutils , fetchFromGitHub @@ -53,6 +54,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. + "test_error_without_config_file_macos" + "test_file_1_is_bad_without_config_macos" + ]; + pythonImportsCheck = [ "rstcheck" ]; From 239ae48dd354e202cd82666848a1ae6779007ede Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 12 Jul 2023 09:43:48 +0800 Subject: [PATCH 082/174] python310Packages.brotli-asgi: init at 1.4.0 --- .../python-modules/brotli-asgi/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/brotli-asgi/default.nix diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix new file mode 100644 index 000000000000..8bdd814cfe5e --- /dev/null +++ b/pkgs/development/python-modules/brotli-asgi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +# build inputs +, starlette +, brotli +# check inputs +, requests +, mypy +, brotlipy +}: +let + pname = "brotli-asgi"; + version = "1.4.0"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "fullonic"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y="; + }; + + propagatedBuildInputs = [ + starlette + brotli + ]; + + pythonImportsCheck = [ "brotli_asgi" ]; + + nativeCheckInputs = [ + requests + mypy + brotlipy + ]; + + meta = with lib; { + description = "A compression AGSI middleware using brotli"; + homepage = "https://github.com/fullonic/brotli-asgi"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb51a01b6ce2..ba0bc6d7a065 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1535,6 +1535,8 @@ self: super: with self; { brotli = callPackage ../development/python-modules/brotli { }; + brotli-asgi = callPackage ../development/python-modules/brotli-asgi { }; + brotlicffi = callPackage ../development/python-modules/brotlicffi { inherit (pkgs) brotli; }; From c625352b5326f9b52d20b2a6c6d9bd1c5aa6bfe3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 12 Jul 2023 09:49:00 +0800 Subject: [PATCH 083/174] python310Packages.argilla: 1.8.0 -> 1.12.0 --- .../python-modules/argilla/default.nix | 171 ++++++++++++------ 1 file changed, 119 insertions(+), 52 deletions(-) diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index ee1f6c7de6cc..c04310d28b0d 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , deprecated , rich , backoff @@ -14,33 +15,106 @@ , httpx , pandas , monotonic -# test dependencies -, pytestCheckHook +# optional-dependencies , fastapi -, sqlalchemy , opensearch-py -, factory_boy , elasticsearch8 -, elastic-transport -, luqum -, pytest-asyncio -, passlib -, python-jose -, alembic , uvicorn +, smart-open +, brotli-asgi +, alembic +, sqlalchemy +, greenlet +, aiosqlite +, luqum +, scikit-learn +, aiofiles +, pyyaml +, python-multipart +, python-jose +, passlib +, psutil +# , segment-analytics-python +, asyncpg +, psycopg2 , schedule , prodict -, datasets -, psutil -, spacy , cleanlab -, snorkel -, transformers +, datasets +, huggingface-hub +# , flair , faiss +, flyingsquid +, pgmpy +, plotly +, snorkel +, spacy +, transformers +, evaluate +, seqeval +# , setfit +# , span_marker +, openai +, peft +# test dependencies +, pytestCheckHook +, pytest-cov +, pytest-mock +, pytest-asyncio +, factory_boy }: let pname = "argilla"; - version = "1.8.0"; + version = "1.12.0"; + optional-dependencies = { + server = [ + fastapi + opensearch-py + elasticsearch8 + uvicorn + smart-open + brotli-asgi + alembic + sqlalchemy + greenlet + aiosqlite + luqum + scikit-learn + aiofiles + pyyaml + python-multipart + python-jose + passlib + psutil + # segment-analytics-python + ] ++ + elasticsearch8.optional-dependencies.async ++ + uvicorn.optional-dependencies.standard ++ + python-jose.optional-dependencies.cryptography ++ + passlib.optional-dependencies.bcrypt; + postgresql = [ asyncpg psycopg2 ]; + listeners = [ schedule prodict ]; + integrations = [ + pyyaml + cleanlab + datasets + huggingface-hub + # flair + faiss + flyingsquid + pgmpy + plotly + snorkel + spacy + transformers + evaluate + seqeval + # setfit + # span_marker + openai + peft + ] ++ transformers.optional-dependencies.torch; + }; in buildPythonPackage { inherit pname version; @@ -52,64 +126,57 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "v${version}"; - hash = "sha256-pUfuwA/+fe1VVWyGxEkvSuJLNxw3sHmp8cQZecW8GWY="; + hash = "sha256-NImtS2bbCfbhbrw12xhGdZp/JVfrB6cHnUHYX3xJ7tw="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"rich <= 13.0.1"' '"rich"' \ - --replace '"numpy < 1.24.0"' '"numpy"' - ''; + pythonRelaxDeps = [ + "typer" + "rich" + "numpy" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ + httpx deprecated - rich - backoff packaging + pandas pydantic - typer - tqdm wrapt numpy - pandas - httpx + tqdm + backoff monotonic + rich + typer ]; + # still quite a bit of optional dependencies missing + doCheck = false; + preCheck = '' export HOME=$(mktemp -d) ''; - # tests require an opensearch instance running and flyingsquid to be packaged - doCheck = false; - nativeCheckInputs = [ pytestCheckHook - fastapi - sqlalchemy - opensearch-py - factory_boy - elasticsearch8 - elastic-transport - luqum + pytest-cov + pytest-mock pytest-asyncio - passlib - python-jose - alembic - uvicorn - schedule - prodict - datasets - psutil - spacy - cleanlab - snorkel - transformers - faiss - ] ++ opensearch-py.optional-dependencies.async; + factory_boy + ] + ++ optional-dependencies.server + ++ optional-dependencies.postgresql + ++ optional-dependencies.listeners + ++ optional-dependencies.integrations; pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ]; + passthru.optional-dependencies = optional-dependencies; + meta = with lib; { description = "Argilla: the open-source data curation platform for LLMs"; homepage = "https://github.com/argilla-io/argilla"; From cb697b86b1513dc02b6441d0f63dcb5437f4d243 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 13 Jul 2023 19:12:01 +0800 Subject: [PATCH 084/174] edge-runtime: init at 1.6.7 --- pkgs/development/web/edge-runtime/default.nix | 72 +++++++++++++++++++ .../web/edge-runtime/librusty_v8.nix | 20 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 94 insertions(+) create mode 100644 pkgs/development/web/edge-runtime/default.nix create mode 100644 pkgs/development/web/edge-runtime/librusty_v8.nix diff --git a/pkgs/development/web/edge-runtime/default.nix b/pkgs/development/web/edge-runtime/default.nix new file mode 100644 index 000000000000..644349697c85 --- /dev/null +++ b/pkgs/development/web/edge-runtime/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, lib +, callPackage +, fetchFromGitHub +, rustPlatform +, nix-update-script +, darwin +, openssl +, pkg-config +}: + +let + pname = "edge-runtime"; + version = "1.6.7"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "supabase"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Jq9UXFgbTDKe1AWyg4fxn62ODqWu0AUqzlUOo+JUYpo="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-fOqo9aPgpW6oAEHtZIE7iHjTIRrgDPbdSFBaq4s0r94="; + + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + + buildInputs = lib.optionals stdenv.isLinux [ openssl ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation ]); + + # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem + # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE + RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { }; + + passthru.updateScript = nix-update-script { }; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = [ + # tries to make a network access + "--skip=deno_runtime::test::test_main_rt_fs" + "--skip=deno_runtime::test::test_main_runtime_creation" + "--skip=deno_runtime::test::test_os_env_vars" + "--skip=deno_runtime::test::test_os_ops" + "--skip=deno_runtime::test::test_user_runtime_creation" + "--skip=test_custom_readable_stream_response" + "--skip=test_import_map_file_path" + "--skip=test_import_map_inline" + "--skip=test_main_worker_options_request" + "--skip=test_main_worker_post_request" + "--skip=test_null_body_with_204_status" + "--skip=test_null_body_with_204_status_post" + "--skip=test_file_upload" + "--skip=test_oak_server" + "--skip=test_tls_throw_invalid_data" + "--skip=test_user_worker_json_imports" + "--skip=node::analyze::tests::test_esm_code_with_node_globals" + "--skip=node::analyze::tests::test_esm_code_with_node_globals_with_shebang" + ]; + + meta = with lib; { + description = "A server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services"; + homepage = "https://github.com/supabase/edge-runtime"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix new file mode 100644 index 000000000000..30f6aebc2960 --- /dev/null +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -0,0 +1,20 @@ +{ rust, stdenv, fetchurl }: + +let + arch = rust.toRustTarget stdenv.hostPlatform; + fetch_librusty_v8 = args: fetchurl { + name = "librusty_v8-${args.version}"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + sha256 = args.shas.${stdenv.hostPlatform.system}; + meta = { inherit (args) version; }; + }; +in +fetch_librusty_v8 { + version = "0.68.0"; + shas = { + x86_64-linux = "sha256-yq7YPD2TM6Uw0EvCqIsZ/lbE1RLgIg7a42qDVrr5fX4="; + aarch64-linux = "sha256-uZFm3hAeyEUUXqRJFLM3OBVfglH3AecjFKVgeJZu3L0="; + x86_64-darwin = "sha256-YkxoggK0I4rT/KNJ30StDPLUc02Mdjwal3JH+s/YTQo="; + aarch64-darwin = "sha256-aXE7W3sSzbhvC661BYTTHyHlihmVVtFSv85nSjGOLkU="; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b5814767abb..41f34b6f1fce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,6 +573,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; + edge-runtime = callPackage ../development/web/edge-runtime { }; + efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; eludris = callPackage ../tools/misc/eludris { From e8a6acb8d475a99f485c31f00e8bf0a64c9663de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 03:43:03 +0000 Subject: [PATCH 085/174] pdns-recursor: 4.8.4 -> 4.9.0 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index da0890e8e4d0..7bd5f874b143 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.4"; + version = "4.9.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-8KY/0I4D2oL6INMz6lF50bkln0JkVGz0mVKGZ32UWMc="; + sha256 = "sha256-028WKEPjZ2RqZhp4XKC+zem2hVKFW/QFMq66+hA5ZvM="; }; nativeBuildInputs = [ pkg-config ]; From bec99c5ae490d47b817c8b0c81246ad045a797d0 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Wed, 12 Jul 2023 17:32:00 -0500 Subject: [PATCH 086/174] femtolisp: init at 2023-07-12 --- .../interpreters/femtolisp/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/interpreters/femtolisp/default.nix diff --git a/pkgs/development/interpreters/femtolisp/default.nix b/pkgs/development/interpreters/femtolisp/default.nix new file mode 100644 index 000000000000..06a4f635b3a6 --- /dev/null +++ b/pkgs/development/interpreters/femtolisp/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromSourcehut +, unstableGitUpdater +}: + +stdenv.mkDerivation { + pname = "femtolisp"; + version = "unstable-2023-07-12"; + + src = fetchFromSourcehut { + owner = "~ft"; + repo = "femtolisp"; + rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f"; + hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y="; + }; + + strictDeps = true; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm755 -t $out/bin/ flisp + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "A compact interpreter for a minimal lisp/scheme dialect"; + homepage = "https://git.sr.ht/~ft/femtolisp"; + license = with lib.licenses; [ mit bsd3 ]; + maintainers = with lib.maintainers; [ moody ]; + broken = stdenv.isDarwin; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f34b6f1fce..87ca7b7d29b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -591,6 +591,8 @@ with pkgs; faq = callPackage ../development/tools/faq { }; + femtolisp = callPackage ../development/interpreters/femtolisp { }; + figma-agent = callPackage ../applications/graphics/figma-agent { }; figma-linux = callPackage ../applications/graphics/figma-linux { }; From 10314c8fc05d5748fea73d8c33096d9417978d4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 04:17:48 +0000 Subject: [PATCH 087/174] python310Packages.azure-containerregistry: 1.1.0 -> 1.2.0 --- .../python-modules/azure-containerregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-containerregistry/default.nix b/pkgs/development/python-modules/azure-containerregistry/default.nix index 5bc1bde1ad83..7b6d8ba17915 100644 --- a/pkgs/development/python-modules/azure-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-containerregistry"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6IU+fzMIL8HJv4rCrWlcJSuYre6cdBa7BjS9KrIbIRU="; + hash = "sha256-Ss0ygh0IZVPqvV3f7Lsh+5FbXRPvg3XRWvyyyAvclqM="; extension = "zip"; }; From b422c3de45f56a49abc7965708cd0cb6a8810148 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:04:08 +0200 Subject: [PATCH 088/174] python311Packages.yalexs-ble: 2.1.18 -> 2.2.0 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.1.18...v2.2.0 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.2.0/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 4cf4906e09eb..2431a9101a5e 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.1.18"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bLxKq/MNbVIv9CV67NeOqn49cYu7gwcBnbZEtlreQzQ="; + hash = "sha256-ei/+QfDjuzbKFZ8Nl+KnCJB6xu7xZh0m6LnzHUEg790="; }; nativeBuildInputs = [ From 50984aa3017f02fdba92d0353bb7bbb58a626a37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:08:19 +0200 Subject: [PATCH 089/174] python311Packages.opower: 0.0.13 -> 0.0.14 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.0.13...v0.0.14 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index f6941970a08d..26342ab42db3 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.13"; + version = "0.0.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-WZRJnvZYycOoLNhtShXQ3HPNqyoJymUx+Xwg5gPWGKg="; + hash = "sha256-eTlFb/v88jaEzx5H8ofHMNkqPunDvXcXGvg5ThripeA="; }; pythonRemoveDeps = [ From 956cf5dd028031621ea315e523a848ffd7e55f37 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:08:52 +0200 Subject: [PATCH 090/174] python311Packages.mypy-boto3-s3: 1.28.0 -> 1.28.3 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 628d0b322090..78f7f1acfda5 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.0"; + version = "1.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J4Z8oyWoRXAKAI8/yplQBrMvLg0Yr+Z2NStJRT9HfWk="; + hash = "sha256-wrRUQTEmB5pkNKPgWnXLTK2UfHYk5TujhGy4KaIjDEs="; }; propagatedBuildInputs = [ From dda15a62256013c1b4aa5aac3cc29b5fa876bce2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:09:26 +0200 Subject: [PATCH 091/174] python311Packages.metar: 1.10.0 -> 1.11.0 Diff: https://github.com/python-metar/python-metar/compare/refs/tags/v1.10.0...v1.11.0 Changelog: https://github.com/python-metar/python-metar/blob/v1.11.0/CHANGELOG.md --- pkgs/development/python-modules/metar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index dca7c5359a04..b130672810ec 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "metar"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python-metar"; repo = "python-metar"; rev = "refs/tags/v${version}"; - hash = "sha256-53vgnViEYuMVKEnIZ2BNyIUrURR2rwopx7RWyFmF5PA="; + hash = "sha256-ZDjlXcSTUcSP7oRdhzLpXf/fLUA7Nkc6nj2I6vovbHg="; }; nativeCheckInputs = [ From 82873ae29e73ddcf4e0ed7e98103a502ef85bad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:40:00 +0200 Subject: [PATCH 092/174] python311Packages.devolo-plc-api: 1.3.1 -> 1.3.2 Diff: https://github.com/2Fake/devolo_plc_api/compare/refs/tags/v1.3.1...v1.3.2 Changelog: https://github.com/2Fake/devolo_plc_api/releases/tag/v1.3.2 --- pkgs/development/python-modules/devolo-plc-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 8170601914a5..d352925308cb 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "refs/tags/v${version}"; - hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg="; + hash = "sha256-viOyxgFydPrTPFz6JsjJT6IiUIeoIwd+bcrAJfomDI8="; }; postPatch = '' From f6901b6171d81827dbf6c439094c6c72ef8dcba9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 08:49:51 +0200 Subject: [PATCH 093/174] python311Packages.androidtvremote2: 0.0.10 -> 0.0.11 Diff: https://github.com/tronikos/androidtvremote2/compare/refs/tags/v0.0.10...v0.0.11 Changelog: https://github.com/tronikos/androidtvremote2/releases/tag/v0.0.11 --- pkgs/development/python-modules/androidtvremote2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/androidtvremote2/default.nix b/pkgs/development/python-modules/androidtvremote2/default.nix index 8cbf32a6bd6e..a876cf5e1813 100644 --- a/pkgs/development/python-modules/androidtvremote2/default.nix +++ b/pkgs/development/python-modules/androidtvremote2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "androidtvremote2"; - version = "0.0.10"; + version = "0.0.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "androidtvremote2"; rev = "refs/tags/v${version}"; - hash = "sha256-LjYXQTPTFS80gI3WeJOLrKZ0C0JhGb5p1M70P7n29hc="; + hash = "sha256-mjhohkAC6g2UJgPbq/29Awyy6c4M8SnLqr5v5g7+IeE="; }; nativeBuildInputs = [ From 1df733d83081fe79c109b066c90badece6b8d8b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jul 2023 04:38:22 +0000 Subject: [PATCH 094/174] gemrb: 0.9.1.1 -> 0.9.2 --- pkgs/games/gemrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 66b6faa32552..7768ccf76253 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.1.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-pC83LgAy1aQxUhS2qa57hm03B37bj6dcRVRn7SI5I+k="; + hash = "sha256-riea48Jc9zYb19mf5sBunTp5l27PGRFd/B5KdCUWr6Y="; }; buildInputs = [ From 03c4db6f96db675df3958a4dccd9dd4fdffb3c28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:11:02 +0200 Subject: [PATCH 095/174] python311Packages.google-cloud-pubsub: 2.17.1 -> 2.18.0 Changelog: https://github.com/googleapis/python-pubsub/blob/v2.18.0/CHANGELOG.md --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 3a94d6d7ef29..6472f1fc32fa 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.17.1"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BZNCjsuwJJy150G0A+lcPUIbRpfIPrftTBaE3/F2x1M="; + hash = "sha256-enDfQRHZy2lKJc7N0jKIJxWcUhOuHmMEyzq7OPN53Sk="; }; propagatedBuildInputs = [ From a086370d9d0aacd006a5f30ee77d91f9e9cbfbee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:15:46 +0000 Subject: [PATCH 096/174] terraform-providers.aiven: 4.6.0 -> 4.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 17141a50582c..96e438dac77e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-rmXfUMP1CWKV7ahxfmCr2FvWYcEWKh+V3fWSQWvcUDU=", + "hash": "sha256-T9d1iMuFqewDVK4EOsF4uCsqZAsThMHaRa7ilGnYXCo=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.6.0", + "rev": "v4.7.0", "spdx": "MIT", - "vendorHash": "sha256-oUUl7m7+r10xSklrcsTYOU8wk8n7TLu6Qt50wTKLULk=" + "vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM=" }, "akamai": { "hash": "sha256-gQZ5yH3sV5DTpSE+/bZM12+PHitmUm/TtpAdPijF+Lk=", From 80ce0991a8d3daeef44241334381f2909f80961c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:17:15 +0000 Subject: [PATCH 097/174] terraform-providers.azuread: 2.39.0 -> 2.40.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 96e438dac77e..d0ede98c2600 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -119,11 +119,11 @@ "vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I=" }, "azuread": { - "hash": "sha256-wBNS2a6O1QJgssbAWhSRSfxaVZ35zgT/qNdpE++NQ8U=", + "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.39.0", + "rev": "v2.40.0", "spdx": "MPL-2.0", "vendorHash": null }, From 3c65e305f31c84a52f34066ecd201e351760f849 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:34:17 +0000 Subject: [PATCH 098/174] terraform-providers.azurerm: 3.64.0 -> 3.65.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d0ede98c2600..a121074694e7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-PwAwVpLoMq5DNIiY5wt+n9oqNGInJ+C0JfiFagtrAEA=", + "hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.64.0", + "rev": "v3.65.0", "spdx": "MPL-2.0", "vendorHash": null }, From 5e2daa491c90e28e1831258434b9e62443fbae3c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:36:11 +0000 Subject: [PATCH 099/174] terraform-providers.buildkite: 0.19.2 -> 0.20.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a121074694e7..eb6811099c5a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-yxL08Eysj/w9uLmuqDKx1ZcYQZSy91pDgR84BdpsF88=", + "hash": "sha256-1cKRsOuwYu3DV8uArrrf1hJdJ+C54D2awKmJm5ECEG4=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.19.2", + "rev": "v0.20.0", "spdx": "MIT", - "vendorHash": "sha256-AJcPxiuglHpsHUIa5sJMtY7MRN5JrW/tfkz3+5Bv9AU=" + "vendorHash": "sha256-QJ8bZU6K0UAduUjFmyGHjsaHm2e5U8rlPqlK6xM8m3I=" }, "checkly": { "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=", From 20cc1bd39cdc74715b7b5edd94afe083f3182883 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:44:11 +0000 Subject: [PATCH 100/174] terraform-providers.google: 4.73.0 -> 4.73.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eb6811099c5a..4c693b2f903e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -445,12 +445,12 @@ "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" }, "google": { - "hash": "sha256-2c50Ul57IeI7NzH0qYRIw8aKoB/5edCEsurc7JcojgQ=", + "hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.73.0", + "rev": "v4.73.1", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From 103b432d8e569b9e70b40a6745d1175d60e8fc3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:45:46 +0000 Subject: [PATCH 101/174] terraform-providers.aws: 5.7.0 -> 5.8.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4c693b2f903e..7d473576e3dd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-LFOlSmsnV7opt9Z3b15Lyi8sFYjx2WkvvB8vpJBjfWQ=", + "hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.7.0", + "rev": "v5.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-x8f1sTVB1FaoPKgTGEoZaNVKCpNbTrQ7F0PVfwEWe/I=" + "vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU=" }, "azuread": { "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=", From b354b2c492aad2baf773c0665c2ed4b026af6dfb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:49:11 +0000 Subject: [PATCH 102/174] terraform-providers.lxd: 1.10.0 -> 1.10.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7d473576e3dd..89ffa41d26af 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -700,11 +700,11 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-qJp/RekJBsXx5Ic6J6CKs/oBcyqHB/sSjpzjAZUf2iE=", + "hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MPL-2.0", "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw=" }, From fe03c327fd591e9d4231eb52c1b7bc3c826546d2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:49:51 +0000 Subject: [PATCH 103/174] terraform-providers.google-beta: 4.73.0 -> 4.73.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 89ffa41d26af..71b25ff8635b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -455,12 +455,12 @@ "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, "google-beta": { - "hash": "sha256-2fiwPrmd/PHFNksfpo/TQQsuFz7RttAea5C8LJTrMAg=", + "hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.73.0", + "rev": "v4.73.1", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From 32f902021b71e444f71334de9d6d14382c460681 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:51:11 +0000 Subject: [PATCH 104/174] terraform-providers.mongodbatlas: 1.10.0 -> 1.10.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 71b25ff8635b..19c53b48ad4b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -745,13 +745,13 @@ "vendorHash": "sha256-4OVNcAG+/JhVQX4eW5jUkrJeIPPZatq3SvQERdRPtl0=" }, "mongodbatlas": { - "hash": "sha256-z/bRdyXrjMn98DtQAnEuuJX4dr3SItbOQlvST/p7jCY=", + "hash": "sha256-vhzidHQzWrLQ2fGZ0A7aGKwvrqWi6GJ3JCdoCX/dZkc=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-QSRo/lloloaUtGTv8fauO+6biroTlIteM1KsadvFZtg=" + "vendorHash": "sha256-7wrN2BoFY0I9dV52x9LJ43PgUSOVnhJULm1EY+LEZOI=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", From f35bebb301822c98cd3d69eba270d53d8782cc88 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:52:26 +0000 Subject: [PATCH 105/174] terraform-providers.opsgenie: 0.6.27 -> 0.6.28 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 19c53b48ad4b..b367f6e96eae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -872,11 +872,11 @@ "vendorHash": "sha256-TKYKKw6Mrq7hhM+at9VAiVxIpjYeg7AmEIEzfDIJA5M=" }, "opsgenie": { - "hash": "sha256-3W53oONyPoXSp7fnB2EG512rBXac07nGVevdZ9gezig=", + "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.27", + "rev": "v0.6.28", "spdx": "MPL-2.0", "vendorHash": null }, From 5d07e594c4cc2e47356c7ac9f20ddbdd4593b2ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:52:41 +0000 Subject: [PATCH 106/174] terraform-providers.opentelekomcloud: 1.35.2 -> 1.35.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b367f6e96eae..6ae3b6f96d9d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -863,13 +863,13 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-VPXuM1w6A/dNJcdpEQsi9wmp93urJclWN5jLMBme9h8=", + "hash": "sha256-SM6WG7igvFlIbi5AYj/1JXxjbpGgBkz2dKUnR4ZjQb8=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.2", + "rev": "v1.35.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-TKYKKw6Mrq7hhM+at9VAiVxIpjYeg7AmEIEzfDIJA5M=" + "vendorHash": "sha256-zlviJb2EYw/9NiD64xLFY8cd4H9Nb63tSbBUzFhW8Qo=" }, "opsgenie": { "hash": "sha256-fZidZFpusgO1PTXArsxn/omo+DC1nfVu6649BvBzj+k=", From 6b48a31e43fafdbf3995d99e853cbe450a80119e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:54:32 +0000 Subject: [PATCH 107/174] terraform-providers.scaleway: 2.23.0 -> 2.24.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6ae3b6f96d9d..3c29d639b34d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -971,13 +971,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-coscd4w+x7+Klp4j1Wb9z092WqWUhZTnREEq+RdgFLw=", + "hash": "sha256-AA9ctS5YQ36mvxfXSU77rfOWL5UXynVN+TUjpjBR40I=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.23.0", + "rev": "v2.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-8MjVOibZuPlZHP3fIIcr17Siz0VAZ5SX8TUpj5L/YXc=" + "vendorHash": "sha256-g/hNdUharGRTOIJZMk8lRAwO9PdMAbwJYTNcxTpfaV0=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 40cf4a3b18d32cd36cc15e13f5557782f178b060 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 03:56:31 +0000 Subject: [PATCH 108/174] terraform-providers.yandex: 0.94.0 -> 0.95.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3c29d639b34d..2e5c2398dffd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1261,12 +1261,12 @@ "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs=" }, "yandex": { - "hash": "sha256-FsbwylRyUFDZ9n40D36bnchYCax9hKyDLTPF7UV85y4=", + "hash": "sha256-03lZMLD2Iq9o9ijvMD7JNnaGNdn5OpB/s3509YdYRfQ=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.94.0", + "rev": "v0.95.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/HrijkUpJmeCjk6SCH2TE9MThjnimskOjztzRygd5fE=" + "vendorHash": "sha256-IdRgtPUAYYR55MiT/2wqGzYhuMfThUmhnGGYoPQlHW0=" } } From fb99b39503bf201ee2a2955920258117b5b75226 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jul 2023 09:27:55 +0200 Subject: [PATCH 109/174] python310Packages.xarray-einstats: 0.5.1 -> 0.6.0 Diff: arviz-devs/xarray-einstats@refs/tags/v0.5.1...v0.6.0 --- pkgs/development/python-modules/xarray-einstats/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xarray-einstats/default.nix b/pkgs/development/python-modules/xarray-einstats/default.nix index c795568149ea..78f7c101fd3f 100644 --- a/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "arviz-devs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oDrNR7iVDg7Piti6JNaXGekfrUfK5GWJYbH/g6m4570="; + hash = "sha256-TXuNqXsny7VpJqV5/3riKzXLheZl+qF+zf4SCMipzmw="; }; nativeBuildInputs = [ From 9a064200068f2b8549fa07acd56d6f26b58ff7d6 Mon Sep 17 00:00:00 2001 From: David Dunn <26876072+doubledup@users.noreply.github.com> Date: Wed, 12 Jul 2023 13:49:06 +0300 Subject: [PATCH 110/174] go-ethereum: 1.11.6 -> 1.12.0 Release notes: https://github.com/ethereum/go-ethereum/releases/tag/v1.12.0 --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ pkgs/applications/blockchains/go-ethereum/default.nix | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 28330764418a..2998256f5189 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -82,6 +82,8 @@ - mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. +- The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147). + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 7e00aa33a220..cc1c6b161083 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.11.6"; + version = "1.12.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mZ11xan3MGgaUORbiQczKrXSrxzjvQMhZbpHnEal11Y="; + sha256 = "sha256-u1p9k12tY79kA/2Hu109czQZnurHuDJQf/w7J0c8SuU="; }; - vendorHash = "sha256-rjSGR2ie5sFK2OOo4HUZ6+hrDlQuUDtyTKn0sh8jFBY="; + vendorHash = "sha256-k5MbOiJDvWFnaAPViNRHeqFa64XPZ3ImkkvkmTTscNA="; doCheck = false; @@ -33,7 +33,6 @@ in buildGoModule rec { "cmd/abidump" "cmd/abigen" "cmd/bootnode" - "cmd/checkpoint-admin" "cmd/clef" "cmd/devp2p" "cmd/ethkey" From f6f0ccd6c9b4aab06997354dd423bca9efc489db Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Fri, 14 Jul 2023 11:18:41 +0200 Subject: [PATCH 111/174] lib.systems.bluefield2: init Add support for Nvidia's Bluefield 2 plattform as a compilation target. There exists a version with and without crypto support, while the crypto supported version is the most common one. Support for the non-crypto version can be easily added in the future, if needed. For a datasheet of the hardware, see: https://www.nvidia.com/content/dam/en-zz/Solutions/Data-Center/documents/datasheet-nvidia-bluefield-2-dpu.pdf Signed-off-by: Markus Theil --- lib/systems/examples.nix | 4 ++++ lib/systems/platforms.nix | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9ad7c3e422d8..8d9c09561ddb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -37,6 +37,10 @@ rec { config = "armv6l-unknown-linux-gnueabihf"; } // platforms.raspberrypi; + bluefield2 = { + config = "aarch64-unknown-linux-gnu"; + } // platforms.bluefield2; + remarkable1 = { config = "armv7l-unknown-linux-gnueabihf"; } // platforms.zero-gravitas; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index d574943e47df..0b6a9f3891da 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -209,6 +209,14 @@ rec { # Legacy attribute, for compatibility with existing configs only. raspberrypi2 = armv7l-hf-multiplatform; + # Nvidia Bluefield 2 (w. crypto support) + bluefield2 = { + gcc = { + arch = "armv8-a+fp+simd+crc+crypto"; + cpu = "cortex-a72"; + }; + }; + zero-gravitas = { linux-kernel = { name = "zero-gravitas"; From d70459bd36d7c64c73b3898d55e7831bc4253278 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 8 Jul 2023 22:07:46 +0200 Subject: [PATCH 112/174] python3Packages.semaphore-bot: init at 0.16.0 --- .../python-modules/semaphore-bot/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/semaphore-bot/default.nix diff --git a/pkgs/development/python-modules/semaphore-bot/default.nix b/pkgs/development/python-modules/semaphore-bot/default.nix new file mode 100644 index 000000000000..7725b48adac4 --- /dev/null +++ b/pkgs/development/python-modules/semaphore-bot/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, attrs +, anyio +}: + +buildPythonPackage rec { + pname = "semaphore-bot"; + version = "0.16.0"; + format = "setuptools"; + + src = fetchPypi { + inherit version pname; + hash = "sha256-EOUvzW4a8CgyQSxb2fXnIWfOYs5Xe0v794vDIruSHmI="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "anyio>=3.5.0,<=3.6.2" "anyio" + ''; + + propagatedBuildInputs = [ + anyio + attrs + python-dateutil + ]; + + # Upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "semaphore" ]; + + meta = with lib; { + description = "Simple rule-based bot library for Signal Private Messenger"; + homepage = "https://github.com/lwesterhof/semaphore"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b2fe97d01705..67b32499c3f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11231,6 +11231,8 @@ self: super: with self; { semantic-version = callPackage ../development/python-modules/semantic-version { }; + semaphore-bot = callPackage ../development/python-modules/semaphore-bot { }; + semver = callPackage ../development/python-modules/semver { }; send2trash = callPackage ../development/python-modules/send2trash { }; From b093cb4cd8a971ab77993f77152fac31e5ccdf2f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 14 Jul 2023 21:47:34 +1200 Subject: [PATCH 113/174] go-ethereum: remove adisbladis as maintainer --- pkgs/applications/blockchains/go-ethereum/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 7e00aa33a220..18a5724bbd1f 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -58,6 +58,6 @@ in buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ adisbladis RaghavSood ]; + maintainers = with maintainers; [ RaghavSood ]; }; } From c033b637a367240a2cd84282ec0f7f1857ec6359 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 12 Jul 2023 23:58:25 +0200 Subject: [PATCH 114/174] raylib: 4.2.0 -> 4.5.0 --- pkgs/development/libraries/raylib/default.nix | 30 +++++-------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index c2655a6a380f..7dbd272e436f 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -8,15 +8,15 @@ , raylib-games }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "raylib"; - version = "4.2.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "raysan5"; - repo = pname; - rev = version; - sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM="; + repo = "raylib"; + rev = finalAttrs.version; + hash = "sha256-Uqqzq5shDp0AgSBT5waHBNUkEu0LRj70SNOlR5R2yAM="; }; nativeBuildInputs = [ cmake ]; @@ -27,16 +27,6 @@ stdenv.mkDerivation rec { ++ lib.optional pulseSupport libpulseaudio; propagatedBuildInputs = [ libGLU libX11 ]; - patches = [ - # fixes glfw compile error; - # remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released. - (fetchpatch { - url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch"; - sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY="; - name = "raylib-glfw-fix.patch"; - }) - ]; - # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DUSE_EXTERNAL_GLFW=ON" @@ -45,12 +35,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; - # fix libasound.so/libpulse.so not being found - preFixup = '' - ${lib.optionalString alsaSupport "patchelf --add-needed ${alsa-lib}/lib/libasound.so $out/lib/libraylib.so.${version}"} - ${lib.optionalString pulseSupport "patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/libraylib.so.${version}"} - ''; - passthru.tests = [ raylib-games ]; meta = with lib; { @@ -59,6 +43,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ adamlwgriffiths ]; platforms = platforms.linux; - changelog = "https://github.com/raysan5/raylib/blob/${version}/CHANGELOG"; + changelog = "https://github.com/raysan5/raylib/blob/${finalAttrs.version}/CHANGELOG"; }; -} +}) From 0f1222faf7fc84aae54777c9334aca4e9ddcc558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 10:07:23 +0000 Subject: [PATCH 115/174] cairo-lang: 2.0.1 -> 2.0.2 --- pkgs/development/compilers/cairo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 26d39ca7690f..46eeaec16782 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-bqLkCP1hzdOMrVyyyiOZYN0BKPe8OjKMfpFGCr1/anU="; + hash = "sha256-tFWY4bqI+YVVu0E9EPl+c0UAsSn/cjgvEOQtyT9tkYg="; }; - cargoHash = "sha256-FzQkAlNKFFLK8XmLafm37MvLekGE24BoLliaDpc+44w="; + cargoHash = "sha256-fnkzR07MIwzjvg2ZRhhzYIUhuidEBZt0mGfxwHyhyVE="; nativeCheckInputs = [ rustfmt From e4db1840dcf3c73085ad72a4ef13fbbe788f5a20 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 13 Jul 2023 22:28:27 -0500 Subject: [PATCH 116/174] mold: patch an upstream bug in --strip-debug Mold currently has a bug where `--strip-debug` is treated the same as `--strip-all`; this causes things like Rust backtraces to stop working because the symbol tables get stripped. The fix is trivial and obvious, and comes from an upstream patch that needs to be merged and release. GitHub Issue: rui314/mold#1038 Signed-off-by: Austin Seipp --- pkgs/development/tools/mold/default.nix | 4 ++++ .../tools/mold/fix-debug-strip.patch | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/mold/fix-debug-strip.patch diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 04ed7db71147..ac60a01a1ae9 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { mimalloc ]; + patches = [ + ./fix-debug-strip.patch # fix --debug-strip; https://github.com/rui314/mold/pull/1038 + ]; + postPatch = '' sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d' ''; diff --git a/pkgs/development/tools/mold/fix-debug-strip.patch b/pkgs/development/tools/mold/fix-debug-strip.patch new file mode 100644 index 000000000000..78906efc73ac --- /dev/null +++ b/pkgs/development/tools/mold/fix-debug-strip.patch @@ -0,0 +1,23 @@ +From b699b73451c57ac01c2680c0b86e1f56ca19e51c Mon Sep 17 00:00:00 2001 +From: Jakub Konka +Date: Sat, 6 May 2023 07:55:46 +0200 +Subject: [PATCH] Fix handling of --debug-strip + +Signed-off-by: Jakub Konka +--- + elf/cmdline.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/elf/cmdline.cc b/elf/cmdline.cc +index 3ac19f237..731af63ab 100644 +--- a/elf/cmdline.cc ++++ b/elf/cmdline.cc +@@ -994,7 +994,7 @@ std::vector parse_nonpositional_args(Context &ctx) { + } else if (read_flag("strip-all") || read_flag("s")) { + ctx.arg.strip_all = true; + } else if (read_flag("strip-debug") || read_flag("S")) { +- ctx.arg.strip_all = true; ++ ctx.arg.strip_debug = true; + } else if (read_flag("warn-unresolved-symbols")) { + ctx.arg.unresolved_symbols = UNRESOLVED_WARN; + } else if (read_flag("error-unresolved-symbols")) { From 4bb75693711a53b7a25cf9c27f35146fa0666280 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 10:57:00 +0000 Subject: [PATCH 117/174] python310Packages.python-manilaclient: 4.4.0 -> 4.5.0 --- .../python-modules/python-manilaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 88a11a121960..de841e5f1fe2 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iKBbR4h9J9OiQMHjUHxUVk+NbCRUYmIPtWxRwVVGQtY="; + hash = "sha256-voeJkwe/7nta2B19+Y5d27XTkhQ/nbWt6MXOicYQZnU="; }; nativeBuildInputs = [ From 971ef1a8e011a865583c4d2fa7d2ee618e0cbc95 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 9 Jul 2023 19:15:00 +0200 Subject: [PATCH 118/174] pforth: allow cross-compile --- pkgs/development/compilers/pforth/default.nix | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index 59994b26aeed..d0766fe13768 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, buildPackages }: stdenv.mkDerivation (finalAttrs: { @@ -14,14 +15,26 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vEjFeHSJl+yAtatYJEnu+r9hmOr/kZOgIbSUXR/c8WU="; }; - dontConfigure = true; - - preBuild = '' - cd platforms/unix + # We build the dictionary in a cross-compile compatible way. + # For that, we perform steps, that the Makefile would otherwise do. + buildPhase = '' + runHook preBuild + make -C platforms/unix pfdicapp + pushd fth/ + ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -i system.fth + ${stdenv.hostPlatform.emulator buildPackages} ../platforms/unix/pforth -d pforth.dic <<< "include savedicd.fth sdad bye" + mv pforth.dic pfdicdat.h ../platforms/unix/ + popd + make -C platforms/unix pforthapp + runHook postBuild ''; installPhase = '' - install -Dm755 pforth_standalone $out/bin/pforth + runHook preInstall + install -Dm755 platforms/unix/pforth_standalone $out/bin/pforth + mkdir -p $out/share/pforth + cp -r fth/* $out/share/pforth/ + runHook postInstall ''; meta = { From 89c65139211957aee5b8fcc39887bfe4c7a4bd28 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 19:06:16 +0200 Subject: [PATCH 119/174] python3.pkgs.before-after: init at 1.0.1 --- .../python-modules/before-after/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/before-after/default.nix diff --git a/pkgs/development/python-modules/before-after/default.nix b/pkgs/development/python-modules/before-after/default.nix new file mode 100644 index 000000000000..919914d7fd7a --- /dev/null +++ b/pkgs/development/python-modules/before-after/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage, fetchPypi, fetchpatch, pytestCheckHook, lib }: + +buildPythonPackage rec { + pname = "before-after"; + version = "1.0.1"; + + src = fetchPypi { + pname = "before_after"; + inherit version; + hash = "sha256-x9T5uLi7UgldoUxLnFnqaz9bnqn9zop7/HLsrg9aP4U="; + }; + + patches = [ + # drop 'mock' dependency for python >=3.3 + (fetchpatch { + url = "https://github.com/c-oreills/before_after/commit/cf3925148782c8c290692883d1215ae4d2c35c3c.diff"; + hash = "sha256-FYCpLxcOLolNPiKzHlgrArCK/QKCwzag+G74wGhK4dc="; + }) + (fetchpatch { + url = "https://github.com/c-oreills/before_after/commit/11c0ecc7e8a2f90a762831e216c1bc40abfda43a.diff"; + hash = "sha256-8YJumF/U8H+hc7rLZLy3UhXHdYJmcuN+O8kMx8yqMJ0="; + }) + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "before_after" ]; + + meta = with lib; { + description = "sugar over the Mock library to help test race conditions"; + homepage = "https://github.com/c-oreills/before_after"; + maintainers = with maintainers; [ yuka ]; + license = licenses.gpl2Only; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba0bc6d7a065..a94ab6135041 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1274,6 +1274,8 @@ self: super: with self; { beaker = callPackage ../development/python-modules/beaker { }; + before-after = callPackage ../development/python-modules/before-after { }; + beancount = callPackage ../development/python-modules/beancount { }; beancount-black = callPackage ../development/python-modules/beancount-black { }; From 1f8e1307f74d4c119fe08496f469ec847d721597 Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 12 Jul 2023 19:06:55 +0200 Subject: [PATCH 120/174] python3.pkgs.django-cacheops: update, fix build, refactor to run all tests --- .../django-cacheops/default.nix | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 971a65eeb1d5..23b0aad4c5a7 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,27 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , django , funcy , redis -, pytest-django -, pytestCheckHook -, pythonOlder , six +, pytestCheckHook +, pytest-django +, mock +, dill +, jinja2 +, before-after +, pythonOlder +, nettools +, pkgs }: buildPythonPackage rec { pname = "django-cacheops"; - version = "6.2"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zHP9ChwUeZJT/yCopFeRo8jSgCIXswHnDPoIroGeQ48="; + hash = "sha256-Ed3qh90DlWiXikCD2JyJ37hm6lWnpI+2haaPwZiotlA="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ "funcy" ]; + propagatedBuildInputs = [ django funcy @@ -32,23 +44,21 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-django + mock + dill + jinja2 + before-after + nettools + pkgs.redis ]; - disabledTests = [ - # Tests require networking - "test_cached_as" - "test_invalidation_signal" - "test_queryset" - "test_queryset_empty" - "test_lock" - "test_context_manager" - "test_decorator" - "test_in_transaction" - "test_nested" - "test_unhashable_args" - "test_db_agnostic_by_default" - "test_db_agnostic_disabled" - ]; + preCheck = '' + redis-server & + while ! redis-cli --scan ; do + echo waiting for redis to be ready + sleep 1 + done + ''; DJANGO_SETTINGS_MODULE = "tests.settings"; @@ -58,8 +68,5 @@ buildPythonPackage rec { changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; - # No support for funcy > 2 - # https://github.com/Suor/django-cacheops/issues/454 - broken = true; }; } From 974afd4a60a38ef72043ba3438c82f98e6cf3da9 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 14 Jul 2023 12:17:37 +0200 Subject: [PATCH 121/174] django-cacheops: mark broken on darwin --- pkgs/development/python-modules/django-cacheops/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 23b0aad4c5a7..f7ce71a84f64 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , pythonRelaxDepsHook @@ -68,5 +69,7 @@ buildPythonPackage rec { changelog = "https://github.com/Suor/django-cacheops/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; + # Times out for unknown reasons + broken = stdenv.isDarwin; }; } From 5a9f33efbfe544f03225fc6779c5c920f9095571 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 12:04:27 +0000 Subject: [PATCH 122/174] fnm: 1.34.0 -> 1.35.0 --- pkgs/development/tools/fnm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 338371e36c72..26f64661beda 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ttzfyTfv0835w4BaSWxT17/e/fjNCxWABW/kZKpy7q8="; + sha256 = "sha256-EqaEbPMjDybsl8IsLyjDXVPaF9oH1DYRjNb94uBOxL8="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoHash = "sha256-hYRVlCQ9+FCQFtT6uku7FynzHMdHvKATqkr5tCJoZCU="; + cargoHash = "sha256-MkfgK+fm0kKZpFobNFtv6cVvTF/76U2Kzs/MxMwXHjs="; doCheck = false; From 15640652bf2903019885d336493e975a5fa24f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:07:27 +0200 Subject: [PATCH 123/174] python310Packages.cliff: fix passthru.tests --- pkgs/development/python-modules/cliff/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cliff/tests.nix b/pkgs/development/python-modules/cliff/tests.nix index 56a29a6ef6ab..a2738cc590e8 100644 --- a/pkgs/development/python-modules/cliff/tests.nix +++ b/pkgs/development/python-modules/cliff/tests.nix @@ -5,11 +5,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "cliff"; - inherit (cliff) version; - - src = cliff.src; + inherit (cliff) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From f22fdf5d72e99e6ac5dd69992fd89acf0fa82ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:07:39 +0200 Subject: [PATCH 124/174] python310Packages.debtcollector: fix passthru.tests --- pkgs/development/python-modules/debtcollector/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/debtcollector/tests.nix b/pkgs/development/python-modules/debtcollector/tests.nix index 5c10dc90904d..19386cdb53b8 100644 --- a/pkgs/development/python-modules/debtcollector/tests.nix +++ b/pkgs/development/python-modules/debtcollector/tests.nix @@ -3,11 +3,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "debtcollector-tests"; - inherit (debtcollector) version; - - src = debtcollector.src; + inherit (debtcollector) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From d4166c312f1097b67b35bab18f6f8f4d6399e374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:07:58 +0200 Subject: [PATCH 125/174] python310Packages.ipykernel: fix passthru.tests --- pkgs/development/python-modules/ipykernel/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index 49208b30fe37..edbb13912ad9 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -10,11 +10,10 @@ }: -buildPythonPackage rec { +buildPythonPackage { pname = "ipykernel-tests"; - inherit (ipykernel) version; - - src = ipykernel.src; + inherit (ipykernel) version src; + format = "other"; dontBuild = true; dontInstall = true; From a2a2f4838e822ced5af9439ed5dc20772ddc0e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:06 +0200 Subject: [PATCH 126/174] python310Packages.openstacksdk: fix passthru.tests --- pkgs/development/python-modules/openstacksdk/tests.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index aa96ed5ae843..148f76d03529 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -15,11 +15,9 @@ buildPythonPackage { pname = "openstacksdk-tests"; - inherit (openstacksdk) version; + inherit (openstacksdk) version src; format = "other"; - src = openstacksdk.src; - dontBuild = true; dontInstall = true; From f8ca471ef65ca5234fa527eeea966680bd22b8b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:18 +0200 Subject: [PATCH 127/174] python310Packages.os-service-types: fix passthru.tests --- pkgs/development/python-modules/os-service-types/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/os-service-types/tests.nix b/pkgs/development/python-modules/os-service-types/tests.nix index 5958d824d58d..a0996765cb6b 100644 --- a/pkgs/development/python-modules/os-service-types/tests.nix +++ b/pkgs/development/python-modules/os-service-types/tests.nix @@ -7,11 +7,10 @@ , testscenarios }: -buildPythonPackage rec { +buildPythonPackage { pname = "os-service-types-tests"; - inherit (os-service-types) version; - - src = os-service-types.src; + inherit (os-service-types) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From 36340bf60124ee415a123e15f09b197118452677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:25 +0200 Subject: [PATCH 128/174] python310Packages.oslo-config: fix passthru.tests --- pkgs/development/python-modules/oslo-config/tests.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/oslo-config/tests.nix b/pkgs/development/python-modules/oslo-config/tests.nix index b2a730928b8f..0540760e57a0 100644 --- a/pkgs/development/python-modules/oslo-config/tests.nix +++ b/pkgs/development/python-modules/oslo-config/tests.nix @@ -9,11 +9,10 @@ , testscenarios }: -buildPythonPackage rec { - pname = "oslo-config-tests"; - inherit (oslo-config) version; - - src = oslo-config.src; +buildPythonPackage { +pname = "oslo-config-tests"; + inherit (oslo-config) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From b9d0814f509b7e5c41622279848dd7697890821a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:36 +0200 Subject: [PATCH 129/174] python310Packages.oslotest: fix passthru.tests --- pkgs/development/python-modules/oslotest/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/oslotest/tests.nix b/pkgs/development/python-modules/oslotest/tests.nix index fb18e64bb9d9..f80073e1c1bd 100644 --- a/pkgs/development/python-modules/oslotest/tests.nix +++ b/pkgs/development/python-modules/oslotest/tests.nix @@ -4,11 +4,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "oslotest-tests"; - inherit (oslotest) version; - - src = oslotest.src; + inherit (oslotest) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From aecf7364ccfaf3d2dbca3418e9a5ecd20b8ac4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:41 +0200 Subject: [PATCH 130/174] python310Packages.pbr: fix passthru.tests --- pkgs/development/python-modules/pbr/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index 47be8ef19f07..05266a0eb7df 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -10,11 +10,10 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "pbr"; - inherit (pbr) version; - - src = pbr.src; + inherit (pbr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From f5dd81423af44759701f1c0dde4b9735ccc8da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:47 +0200 Subject: [PATCH 131/174] python310Packages.python-manilaclient: fix passthru.tests --- .../python-modules/python-manilaclient/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-manilaclient/tests.nix b/pkgs/development/python-modules/python-manilaclient/tests.nix index 37357d779b16..d1ceb5ed7431 100644 --- a/pkgs/development/python-modules/python-manilaclient/tests.nix +++ b/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -7,11 +7,10 @@ , python-openstackclient }: -buildPythonPackage rec { +buildPythonPackage { pname = "python-manilaclient-tests"; - inherit (python-manilaclient) version; - - src = python-manilaclient.src; + inherit (python-manilaclient) version src; + format = "other"; dontBuild = true; dontInstall = true; From e052d608cbd3f5e5ac1b6eeed2cf7e20dcfa5d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:08:57 +0200 Subject: [PATCH 132/174] python310Packages.stestr: fix passthru.tests --- pkgs/development/python-modules/stestr/tests.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/stestr/tests.nix b/pkgs/development/python-modules/stestr/tests.nix index b66310f2dc63..f4964fa8f66e 100644 --- a/pkgs/development/python-modules/stestr/tests.nix +++ b/pkgs/development/python-modules/stestr/tests.nix @@ -2,11 +2,10 @@ , stestr }: -buildPythonPackage rec { +buildPythonPackage { pname = "stestr-tests"; - inherit (stestr) version; - - src = stestr.src; + inherit (stestr) version src; + format = "other"; postPatch = '' # only a small portion of the listed packages are actually needed for running the tests From 9c6a7f93e24b87a625f9e0d34a8fd1ee3137b86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:08 +0200 Subject: [PATCH 133/174] python310Packages.dm-haiku: remove unused input, rec --- pkgs/development/python-modules/dm-haiku/tests.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/tests.nix b/pkgs/development/python-modules/dm-haiku/tests.nix index 208fb14e76be..dec909729dcf 100644 --- a/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/pkgs/development/python-modules/dm-haiku/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , chex , cloudpickle @@ -16,9 +15,10 @@ , rlax , distrax , tensorflow-probability -, optax }: +, optax +}: -buildPythonPackage rec { +buildPythonPackage { pname = "dm-haiku-tests"; inherit (dm-haiku) version; From b42f54435eda8496d47fc41ad9e84eab85ea1182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:17 +0200 Subject: [PATCH 134/174] python310Packages.flit-core: remove unused rec --- pkgs/development/python-modules/flit-core/tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flit-core/tests.nix b/pkgs/development/python-modules/flit-core/tests.nix index dd05212407bc..49d6ac89fce6 100644 --- a/pkgs/development/python-modules/flit-core/tests.nix +++ b/pkgs/development/python-modules/flit-core/tests.nix @@ -5,7 +5,7 @@ , testpath }: -buildPythonPackage rec { +buildPythonPackage { pname = "flit-core"; inherit (flit-core) version; From 5cfde70626511d645cb8e701a82d75d881c0b87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:25 +0200 Subject: [PATCH 135/174] python310Packages.optax: remove unused input, rec --- pkgs/development/python-modules/optax/tests.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/optax/tests.nix b/pkgs/development/python-modules/optax/tests.nix index 59fed40bdf08..1ab548f2f399 100644 --- a/pkgs/development/python-modules/optax/tests.nix +++ b/pkgs/development/python-modules/optax/tests.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildPythonPackage +{ buildPythonPackage , dm-haiku , pytest-xdist , pytestCheckHook @@ -9,7 +8,7 @@ , optax }: -buildPythonPackage rec { +buildPythonPackage { pname = "optax-tests"; inherit (optax) version; @@ -31,5 +30,4 @@ buildPythonPackage rec { # See https://github.com/deepmind/optax/issues/323 "examples/lookahead_mnist_test.py" ]; - } From 09cb8467e6aeb47fe06007379e82031482ba3261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:31 +0200 Subject: [PATCH 136/174] python310Packages.pytest-asyncio: remove unused rec --- pkgs/development/python-modules/pytest-asyncio/tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-asyncio/tests.nix b/pkgs/development/python-modules/pytest-asyncio/tests.nix index 6a471513112a..94e6e1855afb 100644 --- a/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -6,7 +6,7 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "pytest-asyncio-tests"; inherit (pytest-asyncio) version; From 91ae0efefd244b4fd5aea8f3f730bd6112508a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:37 +0200 Subject: [PATCH 137/174] python310Packages.setuptools-scm: remove unused rec, use inherit --- pkgs/development/python-modules/setuptools-scm/tests.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/setuptools-scm/tests.nix b/pkgs/development/python-modules/setuptools-scm/tests.nix index 9bbdb1c6946c..b679a0f5ca4c 100644 --- a/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -7,13 +7,11 @@ , virtualenv }: -buildPythonPackage rec { +buildPythonPackage { pname = "setuptools-scm-tests"; - inherit (setuptools-scm) version; + inherit (setuptools-scm) version src; format = "other"; - src = setuptools-scm.src; - dontBuild = true; dontInstall = true; From af947b57a87ddba37f107de0339b7276ae9260af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:45 +0200 Subject: [PATCH 138/174] python310Packages.uvicorn: remove unused rec --- pkgs/development/python-modules/uvicorn/tests.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uvicorn/tests.nix b/pkgs/development/python-modules/uvicorn/tests.nix index cb8e479377a8..4ada58e1d992 100644 --- a/pkgs/development/python-modules/uvicorn/tests.nix +++ b/pkgs/development/python-modules/uvicorn/tests.nix @@ -12,10 +12,9 @@ , wsproto }: -buildPythonPackage rec { +buildPythonPackage { pname = "uvicorn-tests"; inherit (uvicorn) version; - format = "other"; src = uvicorn.testsout; From aad1458981045216fa19e30859087a132ccb9d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 14:09:51 +0200 Subject: [PATCH 139/174] python310Packages.wasmer: remove unused rec --- pkgs/development/python-modules/wasmer/tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wasmer/tests.nix b/pkgs/development/python-modules/wasmer/tests.nix index 523d06a401ad..e46c9f7ac670 100644 --- a/pkgs/development/python-modules/wasmer/tests.nix +++ b/pkgs/development/python-modules/wasmer/tests.nix @@ -6,7 +6,7 @@ , wasmer-compiler-singlepass }: -buildPythonPackage rec { +buildPythonPackage { pname = "wasmer-tests"; inherit (wasmer) version; From 824bc780b268308eeb0f9e59c8df8d4b9e9305a8 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 11 Jul 2023 15:14:05 -0400 Subject: [PATCH 140/174] tango: init at 1.1.0 --- pkgs/applications/misc/tango/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/misc/tango/default.nix diff --git a/pkgs/applications/misc/tango/default.nix b/pkgs/applications/misc/tango/default.nix new file mode 100644 index 000000000000..d6278c7f79cc --- /dev/null +++ b/pkgs/applications/misc/tango/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tango"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "masakichi"; + repo = "tango"; + rev = "v${version}"; + hash = "sha256-e/M2iRm/UwfnRVnMo1PmQTkz4IGTxnsCXNSSUkhsiHk="; + }; + + vendorHash = "sha256-83nKtiEy1na1HgAQcbTEfl+0vGg6BkCLBK1REN9fP+k="; + + meta = with lib; { + description = "A local command-line Japanese dictionary tool using yomichan's dictionary files"; + homepage = "https://github.com/masakichi/tango"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc3904692e41..f3b4d23f9d97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13136,6 +13136,8 @@ with pkgs; tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; + tango = callPackage ../applications/misc/tango { }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; t1utils = callPackage ../tools/misc/t1utils { }; From 9d8053e2bb508de621247a0aeb1a480ba7339c1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 13:03:28 +0000 Subject: [PATCH 141/174] otpclient: 3.1.8 -> 3.1.9 --- pkgs/applications/misc/otpclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index cfda9e4e88e3..b313ab2fa1a2 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wwK8JI/IP89aRmetUXE+RlrqU8bpfIkzMZ9nF7qFe1Q="; + hash = "sha256-FSXUqnES/YxONwLza4N2C4Ks02OOfRaXHbdBxr85sFg="; }; nativeBuildInputs = [ From b17ee5fe402aec3c64c09723bb7ed46d7f3863b2 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 14 Jul 2023 13:38:57 +0000 Subject: [PATCH 142/174] prowlarr: add 'meta.mainProgram' --- pkgs/servers/prowlarr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index fb227da87a19..5c2ccd491fc8 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -63,6 +63,7 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/Prowlarr/Prowlarr/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ jdreaver ]; + mainProgram = "Prowlarr"; platforms = [ "aarch64-darwin" "aarch64-linux" From 5b5b04c560b11183d24457eeb1e1cfe9532f7cd5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Jul 2023 15:39:19 +0200 Subject: [PATCH 143/174] ansible-language-server: 1.1.0 -> 1.2.0 Diff: https://github.com/ansible/ansible-language-server/compare/refs/tags/v1.1.0...v1.2.0 Changelog: https://github.com/ansible/ansible-language-server/releases/tag/v1.2.0 --- .../language-servers/ansible-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/ansible-language-server/default.nix b/pkgs/development/tools/language-servers/ansible-language-server/default.nix index 40cb2e1df28e..a20f5886271d 100644 --- a/pkgs/development/tools/language-servers/ansible-language-server/default.nix +++ b/pkgs/development/tools/language-servers/ansible-language-server/default.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "ansible-language-server"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ansible"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kyyYHA0+n8zo1GOzC5lW+QnAn2EtLq0bB1L11yONJbE="; + hash = "sha256-5QzwDsWjuq/gMWFQEkl4sqvsqfxTOZhaFBMhjiiOZSY="; }; - npmDepsHash = "sha256-0mOj0HV6fbImuYDKr3S2SUO8nHN7R0FX9Ihi0GtoSR4="; + npmDepsHash = "sha256-bzffCAGn0aYVoG8IDaXd5I3x3AnGl5urX7BaBKf0tVI="; npmBuildScript = "compile"; # We remove/ignore the prepare and prepack scripts because they run the From b5f28477aa938cb6099ea6c6444b528caa221037 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 14 Jul 2023 13:43:26 +0000 Subject: [PATCH 144/174] nixos/prowlarr: make use of 'lib.getExe' --- nixos/modules/services/misc/prowlarr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/prowlarr.nix b/nixos/modules/services/misc/prowlarr.nix index cd2c98fc5dfb..836280d3e5fe 100644 --- a/nixos/modules/services/misc/prowlarr.nix +++ b/nixos/modules/services/misc/prowlarr.nix @@ -31,7 +31,7 @@ in Type = "simple"; DynamicUser = true; StateDirectory = "prowlarr"; - ExecStart = "${cfg.package}/bin/Prowlarr -nobrowser -data=/var/lib/prowlarr"; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data=/var/lib/prowlarr"; Restart = "on-failure"; }; }; From 6ead38d5c536c793d3cc3da23c81d5d155ee7cce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 14:02:52 +0000 Subject: [PATCH 145/174] bosh-cli: 7.2.4 -> 7.3.0 --- pkgs/applications/networking/cluster/bosh-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index f618b2c70515..791df5177d8e 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.2.4"; + version = "7.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LVDWgyIBVp7UVnEuQ42eVfxDZB3BZn5InnPX7WN6MrA="; + sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc="; }; vendorHash = null; From ff0e55ff2267ea973a7bcd4a92c99c73513e65fc Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 13 Jul 2023 15:25:54 +0000 Subject: [PATCH 146/174] vimPlugins.cmp-beancount: init at 2022-11-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 718ea55aaa62..5846883418ed 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1373,6 +1373,18 @@ final: prev: meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; + cmp-beancount = buildVimPluginFrom2Nix { + pname = "cmp-beancount"; + version = "2022-11-27"; + src = fetchFromGitHub { + owner = "crispgm"; + repo = "cmp-beancount"; + rev = "da154ea94d598e6649d6ad01efa0a8611eff460d"; + sha256 = "14y2h8g5ddcf2rqwgrrsk8m3j4wmk26vdlqzx439n893dzmzd2yg"; + }; + meta.homepage = "https://github.com/crispgm/cmp-beancount/"; + }; + cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; version = "2022-08-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 23c8e2a0cde6..0c09fcba9917 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -114,6 +114,7 @@ https://github.com/bbchung/clighter8/,, https://github.com/ekickx/clipboard-image.nvim/,, https://github.com/asheq/close-buffers.vim/,HEAD, https://github.com/winston0410/cmd-parser.nvim/,, +https://github.com/crispgm/cmp-beancount/,HEAD, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, https://github.com/vappolinario/cmp-clippy/,HEAD, From cef4da0bd832977025725a895ea07e09a08174e0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:20:17 +0200 Subject: [PATCH 147/174] bitcoin: don't override boost --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b38eed7e6f2a..4bd79f196856 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36377,13 +36377,11 @@ with pkgs; bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - boost = boost179; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; bitcoind = callPackage ../applications/blockchains/bitcoin { - boost = boost179; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; From da4f87c04df48a9fcc649214d28f7a5d39d3ec88 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:20:38 +0200 Subject: [PATCH 148/174] bitcoind-knots: don't override boost --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd79f196856..590072343283 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36387,7 +36387,6 @@ with pkgs; }; bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { - boost = boost179; withGui = false; inherit (darwin) autoSignDarwinBinariesHook; }; From 430210502a1a963f197a15a867bea65b03bab8bb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:20:59 +0200 Subject: [PATCH 149/174] bitcoind-abc: don't override boost --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 590072343283..b16b35f58bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36408,11 +36408,9 @@ with pkgs; besu = callPackage ../applications/blockchains/besu { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc { - boost = boost179; withGui = true; }; bitcoind-abc = callPackage ../applications/blockchains/bitcoin-abc { - boost = boost179; mkDerivation = stdenv.mkDerivation; withGui = false; }; From 5c6057d946bdf351ae86466ac0810702c78008a4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:21:15 +0200 Subject: [PATCH 150/174] dogecoin: don't override boost --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b16b35f58bd6..6435853e4116 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36437,11 +36437,9 @@ with pkgs; dcrwallet = callPackage ../applications/blockchains/dcrwallet { }; dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { - boost = boost179; withGui = true; }; dogecoind = callPackage ../applications/blockchains/dogecoin { - boost = boost179; withGui = false; }; From 5aefc56fb85cca599a79467587a5acdce2779a39 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:21:28 +0200 Subject: [PATCH 151/174] groestlcoin: don't override boost --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6435853e4116..9b838c09dd1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36486,13 +36486,11 @@ with pkgs; groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { stdenv = darwin.apple_sdk_11_0.stdenv; - boost = boost179; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; }; groestlcoind = callPackage ../applications/blockchains/groestlcoin { - boost = boost179; inherit (darwin) autoSignDarwinBinariesHook; }; From 230170eecabc4f249dcea111cb9ea29c0510a12f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:21:47 +0200 Subject: [PATCH 152/174] monero-gui: don't override boost --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b838c09dd1d..6400feb139d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36526,9 +36526,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; }; - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { - boost = boost179; - }; + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { }; oxen = callPackage ../applications/blockchains/oxen { stdenv = gcc10StdenvCompat; boost = boost179; }; From 639dfdecd031c4deff056f2964536c1bdb9cd1f4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:22:33 +0200 Subject: [PATCH 153/174] vertcoin: don't override boost --- pkgs/top-level/all-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6400feb139d7..65afb7a67b16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36584,11 +36584,9 @@ with pkgs; torq = callPackage ../applications/blockchains/torq { }; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { - boost = boost179; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin { - boost = boost179; withGui = false; }; From aa23f04560b8e15d69095c1b0bba0e4aed1c24c6 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 14 Jul 2023 16:22:42 +0200 Subject: [PATCH 154/174] sumokoin: don't override boost --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65afb7a67b16..1dc6869bfd39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36557,9 +36557,7 @@ with pkgs; stellar-core = callPackage ../applications/blockchains/stellar-core { }; - sumokoin = callPackage ../applications/blockchains/sumokoin { - boost = boost179; - }; + sumokoin = callPackage ../applications/blockchains/sumokoin { }; solana-cli = callPackage ../applications/blockchains/solana { }; From aae4350c5bedcc3ef1a312b378b5febc65fc9328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 14 Jul 2023 07:50:47 -0700 Subject: [PATCH 155/174] openipmi: use Python 3.10 --- pkgs/tools/system/openipmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index 560f05529689..cc5a544aa02d 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, popt, ncurses, python39, readline, lib }: +{ stdenv, fetchurl, popt, ncurses, python3, readline, lib }: stdenv.mkDerivation rec { pname = "OpenIPMI"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-+1Pp6l4mgc+K982gJLGgBExnX4QRbKJ66WFsi3rZW0k="; }; - buildInputs = [ ncurses popt python39 readline ]; + buildInputs = [ ncurses popt python3 readline ]; outputs = [ "out" "lib" "dev" "man" ]; From f3a1c560c60c980ab605a2c42cbaa8ab8a14cbe7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 13 Jul 2023 11:11:57 +0200 Subject: [PATCH 156/174] vscode-extensions.mgt19937.typst-preview: 0.6.0 -> 0.6.1 --- .../editors/vscode/extensions/default.nix | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 40ad5f5cdf85..804f3bb6e13e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2195,12 +2195,37 @@ let }; mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29"; + }; + }; + in + { name = "typst-preview"; publisher = "mgt19937"; - version = "0.6.0"; - sha256 = "sha256-ZrsTtbD3oIUjxSC1osGYwTynwvDFQxuGeDglopBJGxA="; - }; + version = "0.6.1"; + } // sources.${stdenv.system}; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + meta = { description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; From 88c4aa0c1e364a1e6593ace8c46c997754fa70ca Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 14 Jul 2023 13:05:25 +0000 Subject: [PATCH 157/174] reindeer: unstable-2023-06-20 -> unstable-2023-07-14 Signed-off-by: Austin Seipp --- pkgs/development/tools/reindeer/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index ead54bb3c637..f2b934187e54 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "unstable-2023-06-20"; + version = "unstable-2023-07-14"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "43a317cad6e7205bd4aee067539bf613971a5624"; - sha256 = "sha256-y2/tQR8kYLpBwhow59F9pvyh/pgZ0fAGYd5zow2N1Es="; + rev = "381fe232bcab77b432e2f29dbbd685e013d19c76"; + sha256 = "sha256-xyoGmleJAZA/tdB2Q11vPe9rcn74SCBPiTR//Cpx1Lw="; }; - cargoSha256 = "sha256-mzQHEtKEiP/COHgeZnRN1CfFPcK+RaD7WuvWJO0OJHs="; + cargoSha256 = "sha256-GVOkZcleKakXE58LbJthAa5ZWArKkIok/RawLXcwGPw="; nativeBuildInputs = [ pkg-config ]; buildInputs = From 07919ff7215444b0087832a6665cac14daf5d9d6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 11 Jul 2023 11:30:30 +0900 Subject: [PATCH 158/174] doq: init at 0.9.1 --- pkgs/development/tools/misc/doq/default.nix | 38 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/tools/misc/doq/default.nix diff --git a/pkgs/development/tools/misc/doq/default.nix b/pkgs/development/tools/misc/doq/default.nix new file mode 100644 index 000000000000..bf7be5dda755 --- /dev/null +++ b/pkgs/development/tools/misc/doq/default.nix @@ -0,0 +1,38 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "doq"; + version = "0.9.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "heavenshell"; + repo = "py-doq"; + rev = "refs/tags/${version}"; + hash = "sha256-6ff7R/2Jo4jYm1hA70yopjklpKIMWlj7DH9eKxOlfgU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + jinja2 + parso + toml + ]; + + nativeCheckInputs = with python3.pkgs; [ + parameterized + unittestCheckHook + ]; + + pythonImportsCheck = [ "doq" ]; + + meta = with lib; { + description = "Docstring generator for Python"; + homepage = "https://github.com/heavenshell/py-doq"; + changelog = "https://github.com/heavenshell/py-doq/releases/tag/${src.rev}"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae7e3454538e..9a45a420316d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17996,6 +17996,8 @@ with pkgs; dbus-test-runner = callPackage ../development/tools/dbus-test-runner { }; + doq = callPackage ../development/tools/misc/doq { }; + phpunit = callPackage ../development/tools/misc/phpunit { }; teller = callPackage ../development/tools/teller { }; From 1fa18909cab5f385f54b450ac2b3e72f324fd60e Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sat, 24 Jun 2023 14:40:45 +1000 Subject: [PATCH 159/174] python3Packages.python3-application 3.0.4 -> 3.0.6 --- .../python-modules/python3-application/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index f4b162a14ab7..9170ce798115 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "python3-application"; - version = "3.0.4"; + version = "3.0.6"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = pname; rev = "release-${version}"; - hash = "sha256-XXAKp/RlBVs3KmcnuiexdYfxf0zt2A/DrsJzdC9I4vA="; + hash = "sha256-L7KN6rKkbjNmkSoy8vdMYpXSBkWN7afNpreJO0twjq8="; }; propagatedBuildInputs = [ zope_interface twisted ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "application" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; description = "A collection of modules that are useful when building python applications"; homepage = "https://github.com/AGProjects/python3-application"; license = licenses.lgpl21Plus; From 3d37f6e0c162b2351fc52405dd2f0231335fa073 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 14 Jul 2023 11:55:11 -0400 Subject: [PATCH 160/174] popsicle: 1.3.1 -> 1.3.2 Diff: https://github.com/pop-os/popsicle/compare/1.3.1...1.3.2 Changelog: https://github.com/pop-os/popsicle/releases/tag/1.3.2 --- pkgs/tools/misc/popsicle/Cargo.lock | 1580 +++++++++++++++----------- pkgs/tools/misc/popsicle/default.nix | 17 +- 2 files changed, 930 insertions(+), 667 deletions(-) diff --git a/pkgs/tools/misc/popsicle/Cargo.lock b/pkgs/tools/misc/popsicle/Cargo.lock index 177d8ee900cc..5b7fcfac9b9a 100644 --- a/pkgs/tools/misc/popsicle/Cargo.lock +++ b/pkgs/tools/misc/popsicle/Cargo.lock @@ -2,17 +2,11 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - [[package]] name = "addr2line" -version = "0.14.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -25,33 +19,73 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.11.0" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "winapi", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "as-result" @@ -61,9 +95,9 @@ checksum = "3702cac3c1601410cd655ae41650c4c87f7c3183dca6d1cd9acc4220ed56a8b7" [[package]] name = "async-channel" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -72,77 +106,67 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ + "async-lock", "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell", "slab", ] [[package]] name = "async-global-executor" -version = "2.0.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" +checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", "async-io", - "async-mutex", + "async-lock", "blocking", "futures-lite", - "num_cpus", "once_cell", ] [[package]] name = "async-io" -version = "1.4.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ + "async-lock", + "autocfg", + "cfg-if", "concurrent-queue", - "fastrand", "futures-lite", - "libc", "log", - "once_cell", "parking", "polling", + "rustix 0.37.23", "slab", "socket2", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.4.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" dependencies = [ "event-listener", ] [[package]] name = "async-std" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel", "async-global-executor", @@ -157,7 +181,6 @@ dependencies = [ "kv-log-macro", "log", "memchr", - "num_cpus", "once_cell", "pin-project-lite", "pin-utils", @@ -167,27 +190,27 @@ dependencies = [ [[package]] name = "async-task" -version = "4.0.3" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "atk" -version = "0.15.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +checksum = "6ba16453d10c712284061a05f6510f75abeb92b56ba88dfeb48c74775020cc22" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] [[package]] name = "atk-sys" -version = "0.15.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "e3bf0a7ca572fbd5762fd8f8cd65a581e06767bc1234913fe1f43e370cff6e90" dependencies = [ "glib-sys", "gobject-sys", @@ -197,18 +220,15 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" -dependencies = [ - "autocfg", -] +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -216,22 +236,22 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.58" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88fb5a785d6b44fd9d6700935608639af1b8356de1e55d5f7c2740f4faa15d82" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -244,26 +264,51 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "better-panic" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d12a680cc74d8c4a44ee08be4a00dedf671b089c2440b2e3fdaa776cd468476" +checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036" dependencies = [ "backtrace", "console", ] +[[package]] +name = "bindgen" +version = "0.59.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block" version = "0.1.6" @@ -272,32 +317,33 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] name = "blocking" -version = "1.0.2" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", + "log", ] [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytes" @@ -307,34 +353,29 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytesize" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da" - -[[package]] -name = "cache-padded" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +checksum = "38fcc2979eff34a4b84e1cf9a1e3da42a7d44b3b690a40cdcb23e3d556cfb2e5" [[package]] name = "cairo-rs" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a" +checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" dependencies = [ "glib-sys", "libc", @@ -343,23 +384,33 @@ dependencies = [ [[package]] name = "cascade" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18c6a921baae2d947e4cf96f6ef1b5774b3056ae8edbdf5c5cfce4f33260921" +checksum = "d499b43edbf784dd81e16f0395f5b4350a35b477da8a074251087adefc11cb52" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] [[package]] name = "cfg-expr" -version = "0.9.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571" +checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -369,70 +420,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "2.33.3" +name = "clang-sys" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "glob", + "libc", + "libloading", ] [[package]] -name = "clicolors-control" -version = "1.0.1" +name = "clap" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" dependencies = [ - "atty", - "lazy_static", - "libc", - "winapi", + "clap_builder", ] +[[package]] +name = "clap_builder" +version = "4.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "concurrent-queue" -version = "1.2.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "cache-padded", + "crossbeam-utils", ] [[package]] name = "console" -version = "0.9.2" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ - "clicolors-control", "encode_unicode", "lazy_static", "libc", - "regex", - "termios", - "winapi", + "windows-sys 0.45.0", ] [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -440,52 +505,45 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.4" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "autocfg", "cfg-if", - "lazy_static", ] [[package]] name = "crypto-common" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", -] - -[[package]] -name = "ctor" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" -dependencies = [ - "quote", - "syn", + "typenum", ] [[package]] name = "dashmap" -version = "4.0.2" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] name = "dbus" -version = "0.9.2" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f597e08dfa79b593f23bbfc7840b23b2c5aa2e3a98d8e68b67b5b9ff800dc0db" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" dependencies = [ "libc", "libdbus-sys", + "winapi", ] [[package]] @@ -497,17 +555,6 @@ dependencies = [ "num_enum", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "derive-new" version = "0.5.9" @@ -516,18 +563,28 @@ checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "digest" -version = "0.10.1" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", - "generic-array", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", ] [[package]] @@ -537,10 +594,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "errno" -version = "0.2.7" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", @@ -548,57 +611,46 @@ dependencies = [ ] [[package]] -name = "errno-dragonfly" -version = "0.1.1" +name = "errno" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ - "gcc", + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", "libc", ] [[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.4.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] name = "field-offset" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", "rustc_version", @@ -610,14 +662,14 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml", + "toml 0.5.11", ] [[package]] name = "fluent" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4d7142005e2066e4844caf9f271b93fc79836ee96ec85057b8c109687e629a" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" dependencies = [ "fluent-bundle", "unic-langid", @@ -625,16 +677,16 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acf044eeb4872d9dbf2667541fbf461f5965c57e343878ad0fb24b5793fa007" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" dependencies = [ "fluent-langneg", "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "ouroboros", "rustc-hash", + "self_cell", "smallvec", "unic-langid", ] @@ -659,15 +711,15 @@ dependencies = [ [[package]] name = "fomat-macros" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe56556a8c9f9f556150eb6b390bc1a8b3715fd2ddbb4585f36b6a5672c6a833" +checksum = "3f722aa875298d34a0ebb6004699f6f4ea830d36dec8ac2effdbbc840248a096" [[package]] name = "futures" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -680,9 +732,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -690,15 +742,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -707,15 +759,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -728,33 +780,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 2.0.25", ] [[package]] name = "futures-sink" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.14" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -765,8 +816,6 @@ dependencies = [ "memchr", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] @@ -782,19 +831,13 @@ dependencies = [ "pin-project", ] -[[package]] -name = "gcc" -version = "0.3.55" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" - [[package]] name = "gdk" -version = "0.15.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614258e81ec35ed8770e64a0838f3a47f95b398bc51e724d3b3fa09c1ee0f8d5" +checksum = "be1df5ea52cccd7e3a0897338b5564968274b52f5fd12601e0afa44f454c74d3" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -806,22 +849,23 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172dfe1d9dfb62936bf7ad3ede2913a1b21b1e3db56990e46e00789201de9070" +checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171" +checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" dependencies = [ "gio-sys", "glib-sys", @@ -832,9 +876,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.15.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +checksum = "2152de9d38bc67a17b3fe49dc0823af5bf874df59ea088c5f28f31cf103de703" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -858,9 +902,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -868,32 +912,35 @@ dependencies = [ [[package]] name = "gimli" -version = "0.23.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "gio" -version = "0.15.2" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e14e0166f772d6295cfda361d227a63194497641a42da81b9e531c9f5a4d77f" +checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", "glib", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c" +checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" dependencies = [ "glib-sys", "gobject-sys", @@ -904,19 +951,22 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.2" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a3e6b2e5ef2ecfb10c1e083074a81160b8f6408fcc08195c872e9de37a361b" +checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", "futures-task", + "futures-util", + "gio-sys", "glib-macros", "glib-sys", "gobject-sys", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -924,47 +974,52 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c7194ee4c597b334e3ce84d22d929405e94497828e1c54da762cbe8e3d93" +checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" dependencies = [ "anyhow", - "heck 0.4.0", - "proc-macro-crate 1.0.0", + "heck", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-sys" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac" +checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" dependencies = [ "libc", "system-deps", ] [[package]] -name = "gloo-timers" -version = "0.2.1" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gloo-timers" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ "futures-channel", "futures-core", "js-sys", "wasm-bindgen", - "web-sys", ] [[package]] name = "gobject-sys" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab" +checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" dependencies = [ "glib-sys", "libc", @@ -973,12 +1028,12 @@ dependencies = [ [[package]] name = "gtk" -version = "0.15.2" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fa27087b0773dbf10d4d434fc38261f2df9a606571462fc13e61bea7bf2b8e" +checksum = "b6c4222ab92b08d4d0bab90ddb6185b4e575ceeea8b8cdf00b938d7b6661d966" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -996,9 +1051,9 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.15.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013419d486809ebafd7d8c2450afcfcf384c1a52dd079660f88c2a3b2e19f82f" +checksum = "4d8eb6a4b93e5a7e6980f7348d08c1cd93d31fae07cf97f20678c5ec41de3d7e" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1014,42 +1069,45 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.15.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c891188af69e77a1e8a0b1746fbd03b9b396e7d34d518c5331b15950259f541" +checksum = "3efb84d682c9a39c10bd9f24f5a4b9c15cc8c7edc45c19cb2ca2c4fc38b2d95e" dependencies = [ "anyhow", - "proc-macro-crate 1.0.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] -name = "heck" -version = "0.3.2" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + [[package]] name = "hex-view" version = "0.1.3" @@ -1058,24 +1116,25 @@ checksum = "494e16c9fe4dd02a88f3fe9ec0f27e38045691ea0ceb11603670f220ff5ca97f" [[package]] name = "i18n-config" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62affcd43abfb51f3cbd8736f9407908dc5b44fc558a9be07460bbfd104d983" +checksum = "b987084cadad6e2f2b1e6ea62c44123591a3c044793a1beabf71a8356ea768d5" dependencies = [ "log", "serde", "serde_derive", "thiserror", - "toml", + "toml 0.7.6", "unic-langid", ] [[package]] name = "i18n-embed" -version = "0.12.0" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76146ceb86e5b4128a7d4f8716508841b6156bb231bf138f45235fe985aa79e0" +checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" dependencies = [ + "arc-swap", "fluent", "fluent-langneg", "fluent-syntax", @@ -1093,9 +1152,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.5.0" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91f4951bd0bc19624a06781bf8cd05bdd59057622e5d4240823b42a5f102d2" +checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" dependencies = [ "dashmap", "find-crate", @@ -1107,29 +1166,39 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim 0.10.0", - "syn", + "strsim", + "syn 2.0.25", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2757ae6d1dd47fba009e86795350186fc4740a6e53a1b4f336a8a6725d20eb53" +checksum = "e9a95d065e6be4499e50159172395559a388d20cf13c84c77e4a1e341786f219" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn", + "syn 1.0.109", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] name = "instant" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -1146,29 +1215,50 @@ dependencies = [ [[package]] name = "intl_pluralrules" -version = "7.0.1" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" dependencies = [ - "tinystr", "unic-langid", ] [[package]] -name = "iso9660" -version = "0.1.0" -source = "git+https://github.com/ids1024/iso9660-rs#241b8743f4b131e0cf45ebbb85eab000219af027" +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "bitflags", + "hermit-abi 0.3.2", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix 0.38.4", + "windows-sys 0.48.0", +] + +[[package]] +name = "iso9660" +version = "0.1.1" +source = "git+https://github.com/ids1024/iso9660-rs#2e29b9150d7a75c328f67bce5fc0253f23c96f2b" +dependencies = [ + "bitflags 2.3.3", "nom", "time", ] [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1189,33 +1279,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.6" +name = "lazycell" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if", - "ryu", - "static_assertions", -] +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.112" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdbus-sys" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "locale_config" version = "0.3.0" @@ -1231,30 +1336,31 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" dependencies = [ - "cfg-if", "value-bag", ] [[package]] name = "loopdev" -version = "0.2.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9e35cfb6646d67059f2ca8913a90e6c60633053c103df423975297f33d6fcc" +checksum = "5bfa0855b04611e38acaff718542e9e809cddfc16535d39f9d9c694ab19f7388" dependencies = [ - "errno", + "bindgen", + "errno 0.2.8", "libc", ] @@ -1269,36 +1375,41 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ "digest", ] [[package]] name = "memchr" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] -name = "miniz_oxide" -version = "0.4.4" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg", ] [[package]] @@ -1312,45 +1423,33 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ - "lexical-core", "memchr", - "version_check", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", + "minimal-lexical", ] [[package]] name = "num_enum" -version = "0.5.1" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "derivative", "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.1" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1384,46 +1483,27 @@ dependencies = [ [[package]] name = "object" -version = "0.23.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] [[package]] name = "once_cell" -version = "1.7.2" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - -[[package]] -name = "ouroboros" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8234affc3c31a8b744cc236fd3dc7443f57c6370cbb7d61f41f9c7dcc6c2530" -dependencies = [ - "ouroboros_macro", - "stable_deref_trait", -] - -[[package]] -name = "ouroboros_macro" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3633332cd8c0b6a865e2e0e705fad9cde25fe458cd0c693629b58a7b15e4d852" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "pango" -version = "0.15.2" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94" +checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "gio", "glib", "libc", "once_cell", @@ -1432,9 +1512,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.15.1" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2" +checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" dependencies = [ "glib-sys", "gobject-sys", @@ -1444,81 +1524,75 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", + "windows-targets 0.48.1", ] [[package]] name = "pbr" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2" +checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" dependencies = [ "crossbeam-channel", "libc", - "time", "winapi", ] [[package]] -name = "pest" -version = "2.1.3" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1528,26 +1602,29 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "polling" -version = "2.0.3" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-sys", - "winapi", + "pin-project-lite", + "windows-sys 0.48.0", ] [[package]] name = "popsicle" -version = "1.3.0" +version = "1.3.2" dependencies = [ "anyhow", "as-result", @@ -1567,7 +1644,7 @@ dependencies = [ [[package]] name = "popsicle_cli" -version = "1.3.0" +version = "1.3.2" dependencies = [ "anyhow", "async-std", @@ -1589,7 +1666,7 @@ dependencies = [ [[package]] name = "popsicle_gtk" -version = "1.3.0" +version = "1.3.2" dependencies = [ "anyhow", "async-std", @@ -1614,7 +1691,6 @@ dependencies = [ "md-5", "once_cell", "pango", - "parking_lot", "popsicle", "pwd", "rust-embed", @@ -1625,21 +1701,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" -dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -1651,7 +1718,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1666,60 +1733,60 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "pwd" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ca0304857594109dca88140120427c7a65027be6b77d86a5938588e79cb07b" +checksum = "72c71c0c79b9701efe4e1e4b563b2016dd4ee789eb99badcb09d61ac4b92e4a2" dependencies = [ - "failure", "libc", + "thiserror", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.5.3" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -1728,26 +1795,26 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "ron" -version = "0.6.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064ea8613fb712a19faf920022ec8ddf134984f100090764a4e1d768f3827f1f" +checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] [[package]] name = "rust-embed" -version = "5.9.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" +checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1756,31 +1823,32 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "5.9.0" +version = "6.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" +checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn", + "syn 2.0.25", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "5.1.0" +version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" +checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ + "sha2", "walkdir", ] [[package]] name = "rustc-demangle" -version = "0.1.19" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -1790,18 +1858,39 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "rustix" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno 0.3.1", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno 0.3.1", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys 0.48.0", +] [[package]] name = "same-file" @@ -1819,48 +1908,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" +name = "self_cell" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.125" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.25", +] + +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", ] [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", @@ -1879,9 +1971,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.1" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1889,22 +1981,42 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.3" +name = "shlex" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.6.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -1923,24 +2035,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -1949,115 +2043,179 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.72" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] -name = "synstructure" -version = "0.12.4" +name = "syn" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] name = "sys-mount" -version = "1.2.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f5703caf67c45ad3450104001b4620a605e9def0cef13dde3c9add23f73cee" +checksum = "d8b080a2fff4d267282506b4d5f2efe0dfa732fb2a5715f30662eed1c4f13390" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "loopdev", + "smart-default", + "thiserror", + "tracing", ] [[package]] name = "system-deps" -version = "6.0.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", - "heck 0.3.2", + "heck", "pkg-config", - "toml", + "toml 0.7.6", "version-compare", ] [[package]] -name = "termios" -version = "0.3.3" +name = "target-lexicon" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.25", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ - "libc", - "wasi", - "winapi", + "serde", + "time-core", ] [[package]] -name = "tinystr" -version = "0.3.4" +name = "time-core" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "tinystr" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +dependencies = [ + "displaydoc", +] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", +] + [[package]] name = "type-map" version = "0.4.0" @@ -2069,52 +2227,34 @@ dependencies = [ [[package]] name = "typenum" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unic-langid" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" dependencies = [ "serde", "tinystr", ] [[package]] -name = "unicode-segmentation" -version = "1.7.1" +name = "unicode-ident" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "usb-disk-probe" @@ -2128,31 +2268,28 @@ dependencies = [ ] [[package]] -name = "value-bag" -version = "1.0.0-alpha.6" +name = "utf8parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1" -dependencies = [ - "ctor", -] +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "vec_map" -version = "0.8.2" +name = "value-bag" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "version-compare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" @@ -2162,26 +2299,19 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2189,24 +2319,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.25", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2216,9 +2346,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2226,42 +2356,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "wepoll-sys" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" -dependencies = [ - "cc", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2292,3 +2413,144 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" +dependencies = [ + "memchr", +] diff --git a/pkgs/tools/misc/popsicle/default.nix b/pkgs/tools/misc/popsicle/default.nix index 555a72d4ff3a..fd3600cacd3c 100644 --- a/pkgs/tools/misc/popsicle/default.nix +++ b/pkgs/tools/misc/popsicle/default.nix @@ -1,40 +1,41 @@ { lib , stdenv , fetchFromGitHub -, cargo , rustPlatform -, rustc +, cargo , glib , pkg-config +, rustc +, wrapGAppsHook , gdk-pixbuf , gtk3 -, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "popsicle"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "pop-os"; - repo = pname; + repo = "popsicle"; rev = version; - sha256 = "sha256-NqzuZmVabQ5WHOlBEsJhL/5Yet3TMSuo/gofSabCjTY="; + hash = "sha256-2RkptzUX0G17HJMTHVqjbRHIIc8+NcSRUvE+S9nmtLs="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "dbus-udisks2-0.3.0" = "sha256-VtwUUXVPyqvcOtphBH42CkRmW5jI+br9oDJ9wY40hsE="; - "iso9660-0.1.0" = "sha256-A2C7DbtyJhOW+rjtAcO9YufQ5VjMfdypJAAmBlHpwn4="; + "iso9660-0.1.1" = "sha256-amegb0ULjYHGTHJoyXlqkyhky10JjmoR1iR4grKzyHY="; }; }; nativeBuildInputs = [ + cargo glib pkg-config + rustPlatform.bindgenHook rustPlatform.cargoSetupHook - cargo rustc wrapGAppsHook ]; From 4fae5e769a2f5ddd313e9bf27de791a2f6a9f941 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 14 Jul 2023 09:13:24 -0500 Subject: [PATCH 161/174] buck2: add passthru.tests I think this will help with the `update.nix` script logic, to ensure that builds work properly afterwords. Signed-off-by: Austin Seipp --- .../tools/build-managers/buck2/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix index d2bb4fbee1cb..97eaf76ee488 100644 --- a/pkgs/development/tools/build-managers/buck2/default.nix +++ b/pkgs/development/tools/build-managers/buck2/default.nix @@ -1,5 +1,6 @@ { fetchurl, lib, stdenv, zstd , autoPatchelfHook, gcc-unwrapped +, testers, buck2 # for passthru.tests }: let @@ -65,15 +66,31 @@ stdenv.mkDerivation { doInstallCheck = true; installCheckPhase = "$out/bin/buck2 --version"; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests = testers.testVersion { + package = buck2; + + # NOTE (aseipp): the buck2 --version command doesn't actually print out + # the given version tagged in the release, but a hash, but not the git + # hash; the entire version logic is bizarrely specific to buck2, and needs + # to be reworked the open source build to behave like expected. in the + # mean time, it *does* always print out 'buck2 ...' so we can just + # match on "buck2" + version = "buck2"; + }; + }; + meta = with lib; { description = "Fast, hermetic, multi-language build system"; homepage = "https://buck2.build"; + changelog = "https://github.com/facebook/buck2/releases/tag/${buck2-version}"; license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "buck2"; + maintainers = with maintainers; [ thoughtpolice ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ thoughtpolice ]; }; } From 9115395261bf5b8d38d1075bba03744601084361 Mon Sep 17 00:00:00 2001 From: Feyorsh <44840644+Feyorsh@users.noreply.github.com> Date: Sat, 24 Jun 2023 09:32:18 -0400 Subject: [PATCH 162/174] brave: add kerberos authentication --- .../networking/browsers/brave/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d234a1f65316..cf77fb1fb55a 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper -, dpkg , alsa-lib , at-spi2-atk , at-spi2-core @@ -7,6 +6,7 @@ , cairo , cups , dbus +, dpkg , expat , fontconfig , freetype @@ -15,32 +15,33 @@ , gnome , gsettings-desktop-schemas , gtk3 -, libuuid -, libdrm , libX11 +, libXScrnSaver , libXcomposite , libXcursor , libXdamage , libXext , libXfixes , libXi -, libxkbcommon , libXrandr , libXrender -, libXScrnSaver -, libxshmfence , libXtst +, libdrm +, libkrb5 +, libuuid +, libxkbcommon +, libxshmfence , mesa , nspr , nss , pango , pipewire +, snappy , udev , wayland +, xdg-utils , xorg , zlib -, xdg-utils -, snappy # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -73,7 +74,7 @@ let libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libxshmfence libXtst libuuid mesa nspr nss pango pipewire udev wayland - xorg.libxcb zlib snappy + xorg.libxcb zlib snappy libkrb5 ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva; From e7ec942dea0ee69c24e46a8b70bc4c3993eef634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Fri, 14 Jul 2023 18:06:36 +0200 Subject: [PATCH 163/174] fsuae-launcher: fix find executable --- pkgs/applications/emulators/fs-uae/launcher.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 570b439f4a1e..63ff7eee2ea6 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -34,8 +34,11 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' wrapQtApp "$out/bin/fs-uae-launcher" \ - --set PYTHONPATH "$PYTHONPATH" \ - --prefix PATH : ${lib.makeBinPath [ fsuae ]} + --set PYTHONPATH "$PYTHONPATH" + + # fs-uae-launcher search side by side for fs-uae + # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable + ln -s ${fsuae}/bin/fs-uae $out/bin ''; meta = { From 8980fdd9b57b2b43592058cbda2e866148e14ab5 Mon Sep 17 00:00:00 2001 From: schnusch Date: Thu, 13 Jul 2023 12:57:23 +0200 Subject: [PATCH 164/174] nixos/cgit: fix \v and \f in regexEscape --- nixos/modules/services/networking/cgit.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/cgit.nix b/nixos/modules/services/networking/cgit.nix index 672b0b030eee..7d1f12fa9146 100644 --- a/nixos/modules/services/networking/cgit.nix +++ b/nixos/modules/services/networking/cgit.nix @@ -14,7 +14,9 @@ let # taken from https://github.com/python/cpython/blob/05cb728d68a278d11466f9a6c8258d914135c96c/Lib/re.py#L251-L266 special = [ "(" ")" "[" "]" "{" "}" "?" "*" "+" "-" "|" "^" "$" "\\" "." "&" "~" - "#" " " "\t" "\n" "\r" "\v" "\f" + "#" " " "\t" "\n" "\r" + " " # \v / 0x0B + " " # \f / 0x0C ]; in replaceStrings special (map (c: "\\${c}") special); From 2a9010bfb42d4f9d4ad082fde409e39255f174a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Jul 2023 21:27:43 +0200 Subject: [PATCH 165/174] betterbird: inherit from correct thunderbird --- .../networking/mailreaders/betterbird/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index 1b08cc3eb082..d08bd5dfcc4a 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -6,10 +6,12 @@ , git , libdbusmenu-gtk3 , runtimeShell -, thunderbird-unwrapped +, thunderbirdPackages }: let + thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; + version = "102.12.0"; majVer = lib.versions.major version; From 2376ec3971b4081dac65fa7d4675b3ba3d8fee6a Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 14 Jul 2023 15:45:52 -0400 Subject: [PATCH 166/174] typos: 1.16.0 -> 1.16.1 Diff: https://github.com/crate-ci/typos/compare/v1.16.0...v1.16.1 Changelog: https://github.com/crate-ci/typos/blob/v1.16.1/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 042fa4d200b0..9ab8a36b742d 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-pF4zMHuNwrabIJ2kmnCVUWu7V2aEhROAskSxY8j71fQ="; + hash = "sha256-Hs/fvsQCp3QrkqjYYE5oLYfhuJyvyMKXa/EGDmFL254="; }; - cargoHash = "sha256-Bc7+ydHMWRwkhBN+dfaIIx5wwXkENDw2F1tyb/VcDhY="; + cargoHash = "sha256-SgZK8U1j5dNhjueFriVL3Zb4YrnznaqOoEfDZjAKCmE="; meta = with lib; { description = "Source code spell checker"; From 996c95449c0819c512197f72f274727f6fb06473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 20:14:29 +0000 Subject: [PATCH 167/174] dolt: 1.7.4 -> 1.7.5 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 9da25e22eaa9..62757b5457e3 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-6rjcoruv+egIDL3kZPIVEMpigDV1j5jjRer3bDvCjjU="; + sha256 = "sha256-nAcwH4RVvRPZfPnXyPDOO5GFpUxIBmJzl3QH+5G6jcY="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-lYf3ARw2TX9dfX2z8W3OY7h+AqocfSdYcGgjvf8h5Bc="; + vendorHash = "sha256-ODOAxH73AflCp9tLeYMU46bqr3MAS1casuGAFWuLYjA="; proxyVendor = true; doCheck = false; From f448f0959c70879c8950094f42652a5888947ee8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 20:20:50 +0000 Subject: [PATCH 168/174] bun: 0.6.13 -> 0.6.14 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 72a85fb5b4a8..7c35fb29a942 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "0.6.13"; + version = "0.6.14"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -33,19 +33,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - sha256 = "6d4pDuAJCgUIFpmp8gGLn2rHvpQ54I6vCXU2WmIYe0M="; + sha256 = "adXsZjg2dmUzaKTBARfS195y3eTUgiOep5pr6y36c6g="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - sha256 = "Hr3c0840fz47jDNjigTsz7HEUSP6btXVDFUUtDtdO5I="; + sha256 = "IHGYARyeRHN3vORW/fBX7+j3vpfQX+ZQWX2TcIOrMHc="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - sha256 = "H7pjr6ySoxYOGrOpLjzMb/b3BiG50XSmMi6atQooRN4="; + sha256 = "uESJFXTVXpK2HPUszU0l5Jgnvz28toBP/0DgVFvqYGY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - sha256 = "f3VysZdTfs4G4a48AahbaEACVpiKPG7OfbAYTCGHi1k="; + sha256 = "5iU+1FevTjjzo/qN0zjIoCQflbWCmdfMXkx+6BOEEcc="; }; }; updateScript = writeShellScript "update-bun" '' From d1a9aa51f7159ea548d687801f34f99735311c83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 00:43:13 +0000 Subject: [PATCH 169/174] grails: 5.3.2 -> 5.3.3 --- pkgs/development/web/grails/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 9f09e1b74aac..51bc4396c6e4 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-UdRtrQiHbBc8VoVUulDCZmAfZ1YTVdgNfeF91HomSqc="; + sha256 = "sha256-uNp6jQAlSOQlZ26PBYofBWANhKEnkYN+PTOSy8bQQ/o="; }; nativeBuildInputs = [ unzip ]; From c48d319ac6d676bf56cf29c2362e61e705e43d77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jul 2023 03:21:29 +0000 Subject: [PATCH 170/174] jenkins: 2.401.1 -> 2.401.2 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3aa53619666d..174f2e0eae81 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.401.1"; + version = "2.401.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-YAtz6r95eFLjmRlUG4T3aG/2Abl8d7ROsAhD65HH3Ww="; + hash = "sha256-hr2OCytRB1yZsA1DYDwoWEQL8BHs0Imlx5HQyWTUBoI="; }; nativeBuildInputs = [ makeWrapper ]; From 7e9f41c295c2fae84fa0d40efacf1bfa933220d2 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 15 Jul 2023 03:08:18 +0530 Subject: [PATCH 171/174] scrcpy: 2.1 -> 2.1.1 Diff: https://github.com/Genymobile/scrcpy/compare/v2.1...v2.1.1 --- pkgs/misc/scrcpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index d6fb53dd86d9..78d37b9480a4 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -16,10 +16,10 @@ }: let - version = "2.1"; + version = "2.1.1"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-W4vxlAJkuTDHGhxhTFfaIkf1Ky1CQLyoZcxtNm3/Zog="; + sha256 = "sha256-lVjbbFZ0Oh3AOzj1mAH7QOkcyJH4/AyJ5bCwZ3YfFI4="; }; in stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M5zOKwqQ0y70gsI+c0Or7hUzz4fH/8DqcOeKq4Vryc4="; + sha256 = "sha256-SRIQqmvqB1kudUvt0HTFPMdk7MLWEcK2jOT0on1rh+E="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. From dfdbcc428f365071f0ca3888f6ec8c25c3792885 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Fri, 14 Jul 2023 17:30:57 -0500 Subject: [PATCH 172/174] 9pfs: 2015-09-18 -> 0.3 (#241801) * _9pfs: 2015-09-18 -> 0.3 * _9pfs: add updateScript --- pkgs/tools/filesystems/9pfs/default.nix | 36 +++++--------- .../filesystems/9pfs/fix-darwin-build.patch | 47 ------------------- 2 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 pkgs/tools/filesystems/9pfs/fix-darwin-build.patch diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index 5ca592aa4565..abb8f695ebcc 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -1,39 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, fuse }: +{ lib, stdenv, fetchFromGitHub, pkg-config, fuse, gitUpdater }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "9pfs"; - version = "unstable-2015-09-18"; + version = "0.3"; src = fetchFromGitHub { - owner = "mischief"; + owner = "ftrvxmtrx"; repo = "9pfs"; - rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; - sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; + rev = version; + sha256 = "sha256-ywWG/H2ilt36mjlDSgIzYpardCFXpmbLiml6wy47XuA="; }; - # Upstream development has stopped and is no longer accepting patches - # https://github.com/mischief/9pfs/pull/3 - patches = [ ./fix-darwin-build.patch ]; - - preConfigure = - '' - substituteInPlace Makefile --replace '-g bin' "" - installFlagsArray+=(BIN=$out/bin MAN=$out/share/man/man1) - mkdir -p $out/bin $out/share/man/man1 - ''; - + makeFlags = [ "BIN=$(out)/bin" "MAN=$(out)/share/man/man1" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: lib/auth_rpc.o:/build/source/lib/../9pfs.h:35: multiple definition of - # `logfile'; 9pfs.o:/build/source/9pfs.h:35: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - enableParallelBuilding = true; + passthru.updateScript = gitUpdater { }; + meta = { - homepage = "https://github.com/mischief/9pfs"; + homepage = "https://github.com/ftrvxmtrx/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch b/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch deleted file mode 100644 index a565248f19d5..000000000000 --- a/pkgs/tools/filesystems/9pfs/fix-darwin-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6b7863b51c97f8ecd9a93fc4347f8938f9b5c05f Mon Sep 17 00:00:00 2001 -From: midchildan -Date: Tue, 30 Mar 2021 22:21:51 +0900 -Subject: [PATCH] build: fix build for macOS - ---- - 9pfs.c | 4 ++-- - libc.h | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/9pfs.c b/9pfs.c -index 2c481bd..f5c487c 100644 ---- a/9pfs.c -+++ b/9pfs.c -@@ -30,7 +30,7 @@ - enum - { - CACHECTLSIZE = 8, /* sizeof("cleared\n") - 1 */ -- MSIZE = 8192 -+ MSIZE_9P = 8192 - }; - - void dir2stat(struct stat*, Dir*); -@@ -505,7 +505,7 @@ main(int argc, char *argv[]) - freeaddrinfo(ainfo); - - init9p(); -- msize = _9pversion(MSIZE); -+ msize = _9pversion(MSIZE_9P); - if(doauth){ - authfid = _9pauth(AUTHFID, user, NULL); - ai = auth_proxy(authfid, auth_getkey, "proto=p9any role=client"); -diff --git a/libc.h b/libc.h -index 099adba..aac03c5 100644 ---- a/libc.h -+++ b/libc.h -@@ -61,6 +61,10 @@ typedef unsigned char uchar; - typedef unsigned long long uvlong; - typedef long long vlong; - -+#ifndef __GLIBC__ -+typedef unsigned long ulong; -+#endif -+ - typedef - struct Qid - { From 3d19582ebe18c4b9a710d30ce666ce44d403cae2 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 13 Jul 2023 17:45:50 +0800 Subject: [PATCH 173/174] python310Packages.pyre-extensions: init at 0.0.30 --- .../pyre-extensions/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyre-extensions/default.nix diff --git a/pkgs/development/python-modules/pyre-extensions/default.nix b/pkgs/development/python-modules/pyre-extensions/default.nix new file mode 100644 index 000000000000..dd9868d2078d --- /dev/null +++ b/pkgs/development/python-modules/pyre-extensions/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +# build inputs +, typing-extensions +, typing-inspect +}: +let + pname = "pyre-extensions"; + version = "0.0.30"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-unkjxIbgia+zehBiOo9K6C1zz/QkJtcRxIrwcOW8MbI="; + }; + + propagatedBuildInputs = [ + typing-extensions + typing-inspect + ]; + + pythonImportsCheck = [ "pyre_extensions" ]; + + meta = with lib; { + description = "This module defines extensions to the standard “typing” module that are supported by the Pyre typechecker"; + homepage = "https://pypi.org/project/pyre-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 133088f8f9fa..1e941f872775 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7961,6 +7961,8 @@ self: super: with self; { pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; + pyre-extensions = callPackage ../development/python-modules/pyre-extensions { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; From 7764e28784180311051541497bc19a7ec890dbda Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 13 Jul 2023 18:48:49 +0800 Subject: [PATCH 174/174] python310Packages.xformers: init at 0.0.20 --- .../python-modules/xformers/default.nix | 85 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/python-modules/xformers/default.nix diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix new file mode 100644 index 000000000000..cd6c6aa0ebdb --- /dev/null +++ b/pkgs/development/python-modules/xformers/default.nix @@ -0,0 +1,85 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pythonRelaxDepsHook +, which +# runtime dependencies +, numpy +, torch +, pyre-extensions +# check dependencies +, pytestCheckHook +, pytest-cov +# , pytest-mpi +, pytest-timeout +# , pytorch-image-models +, hydra-core +, fairscale +, scipy +, cmake +, openai-triton +, networkx +}: +let + version = "0.0.20"; +in +buildPythonPackage { + pname = "xformers"; + inherit version; + format = "setuptools"; + + disable = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "xformers"; + rev = "v${version}"; + hash = "sha256-OFH4I3eTKw1bQEKHh1AvkpcoShKK5R5674AoJ/mY85I="; + fetchSubmodules = true; + }; + + preBuild = '' + cat << EOF > ./xformers/version.py + # noqa: C801 + __version__ = "${version}" + EOF + ''; + + nativeBuildInputs = [ + pythonRelaxDepsHook + which + ]; + + pythonRelaxDeps = [ + "pyre-extensions" + ]; + + propagatedBuildInputs = [ + numpy + torch + pyre-extensions + ]; + + pythonImportsCheck = [ "xformers" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + pytest-timeout + hydra-core + fairscale + scipy + cmake + networkx + openai-triton + ]; + + meta = with lib; { + description = "XFormers: A collection of composable Transformer building blocks"; + homepage = "https://github.com/facebookresearch/xformers"; + changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e941f872775..52f5d9859b4e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13487,6 +13487,8 @@ self: super: with self; { inherit (pkgs) graphviz; }; + xformers = callPackage ../development/python-modules/xformers { }; + xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; };