diff --git a/lib/path/tests/default.nix b/lib/path/tests/default.nix index 6b8e515f4330..50d40cdfa476 100644 --- a/lib/path/tests/default.nix +++ b/lib/path/tests/default.nix @@ -18,7 +18,14 @@ pkgs.runCommand "lib-path-tests" { ]; } '' # Needed to make Nix evaluation work - export NIX_STATE_DIR=$(mktemp -d) + export TEST_ROOT=$(pwd)/test-tmp + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat cp -r ${libpath} lib export TEST_LIB=$PWD/lib diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4cce336eea7..bf83d959b9c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1282,6 +1282,12 @@ githubId = 56009; name = "Arcadio Rubio GarcĂ­a"; }; + arcayr = { + email = "nix@arcayr.online"; + github = "arcayr"; + githubId = 11192354; + name = "Elliot Speck"; + }; archer-65 = { email = "mario.liguori.056@gmail.com"; github = "archer-65"; @@ -3287,6 +3293,15 @@ email = "jupiter@m.rdis.dev"; name = "Scott Little"; }; + codifryed = { + email = "gb@guyboldon.com"; + name = "Guy Boldon"; + github = "codifryed"; + githubId = 27779510; + keys = [{ + fingerprint = "FDF5 EF67 8CC1 FE22 1845 6A22 CF7B BB5B C756 1BD3"; + }]; + }; codsl = { email = "codsl@riseup.net"; github = "codsl"; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 87fdc02beb65..df5d4fbef1af 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -34,13 +34,13 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.3.0"; + version = "5.5.0"; src = fetchurl { - url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-YGSHEvanWek6qiWvKs6g+HneGbuuqJn/DBfhawjQi5M="; + url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; + sha256 = "sha256-pUQgTz7KZt4icD4lDAs4Wg095HxYEAifTM8a4cDejQM="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -104,18 +104,18 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" ''; - meta = with lib; { + meta = { + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${finalAttrs.version}"; description = "The web version of Tidal running in electron with hifi support thanks to widevine"; homepage = "https://github.com/Mastermindzh/tidal-hifi"; - changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ qbit ]; - platforms = [ "x86_64-linux" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qbit ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 1ef5d436ffc8..53b0de40cbb4 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -1,30 +1,55 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git -, bison, flex, postgresql, ripgrep, libunwind }: +{ autoconf +, automake +, bison +, fetchFromGitHub +, flex +, git +, lib +, libtool +, libunwind +, pkg-config +, postgresql +, ripgrep +, stdenv +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "19.12.0"; + version = "19.13.0"; src = fetchFromGitHub { owner = "stellar"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k="; + repo = "stellar-core"; + rev = "v${finalAttrs.version}"; + hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk="; fetchSubmodules = true; }; - nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ]; + nativeBuildInputs = [ + automake + autoconf + git + libtool + pkg-config + ripgrep + ]; - buildInputs = [ libunwind ]; + buildInputs = [ + libunwind + ]; - propagatedBuildInputs = [ bison flex postgresql ]; + propagatedBuildInputs = [ + bison + flex + postgresql + ]; enableParallelBuilding = true; preConfigure = '' # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on # having the .git directory present, so directly provide the version - substituteInPlace src/Makefile.am --replace '$$vers' '${pname} ${version}'; + substituteInPlace src/Makefile.am --replace '$$vers' 'stellar-core ${finalAttrs.version}'; # Everything needs to be staged in git because the build uses # `git ls-files` to search for source files to compile. @@ -34,17 +59,17 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = with lib; { + meta = { description = "Implements the Stellar Consensus Protocol, a federated consensus protocol"; + homepage = "https://www.stellar.org/"; + license = lib.licenses.asl20; longDescription = '' Stellar-core is the backbone of the Stellar network. It maintains a local copy of the ledger, communicating and staying in sync with other instances of stellar-core on the network. Optionally, stellar-core can store historical records of the ledger and participate in consensus. ''; - homepage = "https://www.stellar.org/"; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - license = licenses.asl20; + maintainers = [ ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 559695c342b1..4f541e7a2f94 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1133,6 +1133,7 @@ https://github.com/jparise/vim-phabricator/,, https://github.com/justinj/vim-pico8-syntax/,, https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, +https://github.com/hasundue/vim-pluto/,HEAD, https://github.com/sheerun/vim-polyglot/,, https://github.com/jakwings/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 80070e9c8d8e..7e28366b94cc 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "kbt"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "bloznelis"; repo = "kbt"; rev = version; - hash = "sha256-v0xbW1xlOhaLf19a6gFpd16RjYfXIK6FDBSWVWPlK3c="; + hash = "sha256-AhMl8UuSVKLiIj+EnnmJX8iURjytLByDRLqDkgHGBr0="; }; - cargoHash = "sha256-rBThJqaemtPAHqiWDILJZ7j+NL5+6+4tsXrFPcEiFL0="; + cargoHash = "sha256-pgdI+BoYrdSdQpVN0pH4QMcNAKbjbnrUbAmMpmtfd2s="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 68f904f1db20..7a466b0e5d86 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -21,11 +21,11 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.15.0"; + version = "5.15.3"; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-1Qo6ffMtVRtZDPCHvHEl7T0dPdDUxP4TP2hkSVSdQpo"; + sha256 = "sha256-unAic6GTgvZFFJwPERh164vfDiFE0zLEUjgADR94w5w="; }; nativeBuildInputs = with python3Packages; [ @@ -120,6 +120,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aaronjanse ]; + maintainers = with maintainers; [ aaronjanse sebtm ]; }; } diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index fada6321bf87..c6474336eb10 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-UieMY+YoMjOYUGwkSWxuC+91YfGHhMdhSJFwA+kG4PU="; + sha256 = "sha256-l5WW6Wos/FLxJsyrWnLhb1vAztGT1QYl8tKhiBgNGbw="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f7b906074752..3bdf3a3df077 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-nqKswIq7cOEvGuoRA9Fv5j84Ob/z2C+Ux5ecdhTW0RY=", + "hash": "sha256-lo3DxEXa0nSm+KXBmWwulyNNsctrFvZJLHVJ087BsoU=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.5", + "rev": "v1.14.6", "spdx": "MIT", "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc=" }, @@ -436,11 +436,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-Y70HJEUArUCT1XM3F02bUNPwB1bW4N/Gg/M6aW7XcMM=", + "hash": "sha256-9U3vF8xunpTKbOTytUEscMeS3ya6u+PVkNVJjufhpZ0=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.32.0", + "rev": "v5.33.0", "spdx": "MIT", "vendorHash": null }, @@ -664,11 +664,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-gXpnYX4G+KYEPr4385VgbVfbfkNRc0z2txaaH16nJqI=", + "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" }, @@ -1061,11 +1061,11 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-eZiWhMtsrys64NjN12BDaxL2b2GynIJMhWe+D33wgsw=", + "hash": "sha256-g0qkUzLcMZZQrYtRbpyNWkpYLzJskP7Be+tGs3SGyVo=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.132.0", + "rev": "v1.133.0", "spdx": "MPL-2.0", "vendorHash": "sha256-5F8A8v8YQXrYAgWGYjO5G+sY3SY+O2oiYo3zVLZ9LUc=" }, @@ -1115,11 +1115,11 @@ "vendorHash": "sha256-32ENfzBep97Wn0FvMIEuqxIAmxjTtw2UvDvYJTmJJNc=" }, "tencentcloud": { - "hash": "sha256-RipntxK8i/uyTolf6Z8DJDkNYMsEYcdDpDQfNnGORxQ=", + "hash": "sha256-T98RZ775nXIjqanqWhZfz+IKJIXvDEkVnqHhznilYe0=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.19", + "rev": "v1.81.20", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0f9238509bcc..535f9f32df95 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.8.3"; + version = "3.8.5"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-qGc5L9hL4KbcHGZvhvzqBg1ATFHWGKM72O/aDhrCV4Q="; + hash = "sha256-lvZVezg5MORsNkWGo7iqtyRlo68JcVLiG+2hhiSdRZ8="; }; postPatch = '' diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 134c3733ead4..965c3d5e6155 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.6"; + version = "1.23.7"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-1NULZ3i3gR5RRegHJHH3OmxXU0d293GSTcky9+B4mJ4="; + hash = "sha256-LwjqMEfCdMvNoxn88H3+VyX31G5IlRohpfp++oNCfEc="; }; - vendorHash = "sha256-sj0XXEkcTfv24OuUeOoOLKHjaYMEuoh1Vg8k8T1Fp1o="; + vendorHash = "sha256-nk80Y5RBoUCp+xYNYYnVWVBkCLCgvgKZFpV5CfS2p/s="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index a6919d3836a9..05f5a69f75f3 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -1,24 +1,24 @@ -{ lib -, stdenv -, fetchFromGitHub +{ aria2 , cmake -, wrapQtAppsHook -, qtbase -, aria2 +, fetchFromGitHub , ffmpeg +, lib , python3 +, qtbase +, stdenv +, wrapQtAppsHook , yt-dlp }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mhogomchungu"; - repo = pname; - rev = version; - hash = "sha256-+wLVF0UKspVll+dYZGSk5dUbPBc/2Y0cqTuaeepxw+k="; + repo = "media-downloader"; + rev = finalAttrs.version; + hash = "sha256-UmNaosunkNUTm4rsf4q29H+0cJAccUDx+ulcS2octIo="; }; nativeBuildInputs = [ @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { ]}" ]; - meta = with lib; { + meta = { description = "A Qt/C++ GUI front end to youtube-dl"; homepage = "https://github.com/mhogomchungu/media-downloader"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ zendo ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 134c9e114370..573c18cd9284 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "22.01.6"; + version = "22.01.7"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "sha256-dpRW+DRGJZPIvUv6/y1TLAFjrPOldKBtpwn87nOgIt8="; + sha256 = "sha256-PctyVKlV2cnHoBSAXjMTSPvWY7op9D6kIMypYDRgvGw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -54,9 +54,10 @@ stdenv.mkDerivation rec { allowing modularity, separate compilation, and numerous optimization/time trade-offs. ''; - homepage = "http://mercurylang.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + homepage = "https://mercurylang.org/"; + changelog = "https://dl.mercurylang.org/release/release-notes-${version}.html"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; maintainers = [ ]; }; } diff --git a/pkgs/development/interpreters/gpython/default.nix b/pkgs/development/interpreters/gpython/default.nix new file mode 100644 index 000000000000..8bb432e839ea --- /dev/null +++ b/pkgs/development/interpreters/gpython/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, gpython +}: + +buildGoModule rec { + pname = "gpython"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "go-python"; + repo = "gpython"; + rev = "v${version}"; + hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc="; + }; + + vendorHash = "sha256-NXPllEhootdB8m5Wvfy8MW899oQnjWAQj7yCC2oDvqE="; + + subPackages = [ + "." + ]; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=1970-01-01" + ]; + + passthru.tests = { + version = testers.testVersion { + package = gpython; + command = "gpython < /dev/null"; + }; + }; + + meta = with lib; { + description = "A Python interpreter written in Go"; + homepage = "https://github.com/go-python/gpython"; + changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}"; + license = licenses.bsd3; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 7ba6ec214cd0..7435ac723f7d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.54.2"; # N.B: if you change this, please update: + version = "1.57.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-OIRqH+h8Kjbw3X5slpdCfNN0f027WuvHG3q7KUuSWo8="; + hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/gupnp/1.6.nix b/pkgs/development/libraries/gupnp/1.6.nix index da830a6366c9..8f5e002653fd 100644 --- a/pkgs/development/libraries/gupnp/1.6.nix +++ b/pkgs/development/libraries/gupnp/1.6.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.6.4"; + version = "1.6.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-1sPQNYOET6UqvgAwQxhgB/DIQUX+OwD6slmVvtqb5Vo="; + hash = "sha256-Q33/lwFC6EBwh6iYVfcX4g0nydduBbTNUX32IcfYiM0="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 4bff529a5156..4a8b250d2644 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -35,9 +35,18 @@ stdenv.mkDerivation rec { # Bring .pc file in line with our patched pkg-config. ./0001-pkg-config-Declare-header-dependencies-as-public.patch + # Unbreak build with Meson 1.2.0 + # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/33 + (fetchpatch2 { + name = "meson-1.2-fix.patch"; + url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/85c0244cfbf933d3e90d50ab68394c68d86f9ed5.patch"; + hash = "sha256-poDhkEgDTpgGnTbbZLPwx8Alf0h81vmzJyx3izWmDGw="; + }) + # Fix build against libxml2 2.11 # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 (fetchpatch2 { + name = "libxml2-2.11-fix.patch"; url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; }) diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index 08a5139e5979..0077cfdde150 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -4,7 +4,9 @@ , findutils , pytestCheckHook , pythonOlder +, pip , setuptools-scm +, wheel }: buildPythonPackage rec { @@ -21,12 +23,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + wheel ]; patches = [ ./permissions.patch ]; nativeCheckInputs = [ findutils + pip pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix new file mode 100644 index 000000000000..603fd25e9b2a --- /dev/null +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, pytimeparse +, pyyaml +, pytestCheckHook +, pytest-mock +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dataclass-wizard"; + version = "0.22.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rnag"; + repo = "dataclass-wizard"; + rev = "v${version}"; + hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50="; + }; + + propagatedBuildInputs = [ + ] ++ lib.optionals (pythonOlder "3.9") [ + typing-extensions + ]; + + passthru.optional-dependencies = { + timedelta = [ + pytimeparse + ]; + yaml = [ + pyyaml + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ] ++ passthru.optional-dependencies.timedelta + ++ passthru.optional-dependencies.yaml; + + disabledTests = [ + ] ++ lib.optionals (pythonAtLeast "3.11") [ + # Any/None internal changes, tests need adjusting upstream + "without_type_hinting" + "default_dict" + "test_frozenset" + "test_set" + "date_times_with_custom_pattern" + "from_dict_handles_identical_cased_json_keys" + ]; + + pythonImportsCheck = [ "dataclass_wizard" ]; + + meta = with lib; { + description = "A set of simple, yet elegant wizarding tools for interacting with the Python dataclasses module"; + homepage = "https://github.com/rnag/dataclass-wizard"; + changelog = "https://github.com/rnag/dataclass-wizard/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ codifryed ]; + }; +} diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index 27a2fb54da8d..991549ea9ed9 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.54.2"; + version = "1.57.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MlXL7Ft8cGyqPU3VhGBsCA5kFeFWMbsvYhXitwBVg20="; + hash = "sha256-sJjamd8e6+WDN/j3jlDfmQJzzKzBIm/d60fFkOPfngI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 6012a9eb135c..78e3cdaae7f1 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.54.2"; + version = "1.57.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-4RwsKu5T80CZLo5NalkXLLu9AZPxNR3pjE+BClBB1co="; + hash = "sha256-LxYTDYac4n7NYjGUVHtkndZXMz7H6GRMxXHGRXgam4U="; }; postPatch = '' diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 7b40b674b4cb..267b6065ed73 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi , flit-core , matplotlib @@ -24,6 +25,24 @@ buildPythonPackage rec { hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk="; }; + patches = [ + (fetchpatch { + name = "fix-test-using-matplotlib-3.7.patch"; + url = "https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd.patch"; + hash = "sha256-LbieI0GeC/0NpFVxV/NRQweFjP/lj/TR2D/SLMPYqJg="; + }) + (fetchpatch { + name = "fix-pandas-deprecation.patch"; + url = "https://github.com/mwaskom/seaborn/commit/a48601d6bbf8381f9435be48624f1a77d6fbfced.patch"; + hash = "sha256-LuN8jn6Jo9Fvdl5iGZ2LgINYujSDvvs+hSclnadV1F4="; + }) + (fetchpatch { + name = "fix-tests-using-numpy-1.25.patch"; + url = "https://github.com/mwaskom/seaborn/commit/b6737d5aec9a91bb8840cdda896a7970e1830d56.patch"; + hash = "sha256-Xj82yyB5Vy2xKRl0ideDmJ5Zr4Xc+8cEHU/liVwMSvE="; + }) + ]; + nativeBuildInputs = [ flit-core ]; @@ -41,12 +60,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # incompatible with matplotlib 3.7 - # https://github.com/mwaskom/seaborn/issues/3288 - "test_subplot_kws" - # requires internet connection "test_load_dataset_string_error" + + # per https://github.com/mwaskom/seaborn/issues/3431, we can enable this + # once matplotlib releases version > 3.7.2 + "test_share_xy" ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" @@ -54,7 +73,7 @@ buildPythonPackage rec { # All platforms should use Agg. Let's set it explicitly to avoid probing GUI # backends (leads to crashes on macOS). - MPLBACKEND="Agg"; + env.MPLBACKEND="Agg"; pythonImportsCheck = [ "seaborn" diff --git a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch deleted file mode 100644 index 4c6f869c0c27..000000000000 --- a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch +++ /dev/null @@ -1,21 +0,0 @@ -From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" -Date: Mon, 6 Dec 2021 15:26:19 -0600 -Subject: [PATCH] set poetry-core - ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index d3fdc52..bd7ddc2 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -27,4 +27,4 @@ black = "^19.10b0" - - [build-system] - requires = ["poetry>=0.12"] --build-backend = "poetry.masonry.api" -+build-backend = "poetry.core.masonry.api" --- -2.33.1 diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix index b1ba4adfa120..53989afe94f8 100644 --- a/pkgs/development/python-modules/single-version/default.nix +++ b/pkgs/development/python-modules/single-version/default.nix @@ -1,4 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +}: buildPythonPackage rec { pname = "single-version"; @@ -13,7 +19,12 @@ buildPythonPackage rec { }; patches = [ - ./0001-set-poetry-core.patch + # https://github.com/hongquan/single-version/pull/4 + (fetchpatch { + name = "use-poetry-core.patch"; + url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch"; + hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik="; + }) ]; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index d5e633bfd16d..0b9365aa233b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-DSuBON5EXQlAEqiCitAtDxOcdGNu0ubisIbuWmAfElw="; + hash = "sha256-HoCCgPny6XHz1uUTto6xJ56I6D3HhzLH2rBh9iKI1a8="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index ababbc9b3753..c7073c422c48 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -188,6 +188,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + [[package]] name = "bitflags" version = "1.3.2" @@ -365,6 +371,30 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -374,6 +404,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "csv" version = "1.2.2" @@ -561,6 +597,22 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "exr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + [[package]] name = "fancy-regex" version = "0.11.0" @@ -623,6 +675,19 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] + [[package]] name = "fnv" version = "1.0.7" @@ -776,8 +841,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -815,6 +882,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1114,11 +1190,14 @@ dependencies = [ "bytemuck", "byteorder", "color_quant", + "exr", "gif", "jpeg-decoder", "num-rational", "num-traits", "png", + "qoi", + "tiff", ] [[package]] @@ -1135,6 +1214,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1249,6 +1329,9 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" @@ -1274,6 +1357,12 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + [[package]] name = "libc" version = "0.2.147" @@ -1298,6 +1387,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1379,6 +1477,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + [[package]] name = "mime" version = "0.3.17" @@ -1406,6 +1513,15 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + [[package]] name = "native-tls" version = "0.2.11" @@ -1491,6 +1607,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "oklab" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11" +dependencies = [ + "rgb", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -1696,9 +1821,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pdf-writer" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6" +checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204" dependencies = [ "bitflags 1.3.2", "itoa", @@ -1782,6 +1907,20 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "plist" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +dependencies = [ + "base64", + "indexmap 1.9.3", + "line-wrap", + "quick-xml", + "serde", + "time", +] + [[package]] name = "png" version = "0.17.9" @@ -1869,6 +2008,24 @@ dependencies = [ "cc", ] +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-xml" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.32" @@ -1908,6 +2065,28 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + [[package]] name = "rctree" version = "0.5.0" @@ -2022,8 +2201,11 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf" dependencies = [ + "gif", + "jpeg-decoder", "log", "pico-args", + "png", "rgb", "svgtypes", "tiny-skia", @@ -2048,7 +2230,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -2154,6 +2336,12 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + [[package]] name = "same-file" version = "1.0.6" @@ -2377,6 +2565,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -2467,8 +2664,9 @@ dependencies = [ [[package]] name = "svg2pdf" -version = "0.5.0" -source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24" dependencies = [ "image", "miniz_oxide", @@ -2532,11 +2730,13 @@ dependencies = [ "flate2", "fnv", "once_cell", + "plist", "regex-syntax", "serde", "serde_json", "thiserror", "walkdir", + "yaml-rust", ] [[package]] @@ -2610,6 +2810,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + [[package]] name = "time" version = "0.3.25" @@ -2972,8 +3183,8 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typst" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "bitflags 2.3.3", "bytemuck", @@ -2986,6 +3197,7 @@ dependencies = [ "indexmap 1.9.3", "log", "miniz_oxide", + "oklab", "once_cell", "pdf-writer", "pixglyph", @@ -3004,6 +3216,7 @@ dependencies = [ "tracing", "ttf-parser", "typst-macros", + "typst-syntax", "unicode-general-category", "unicode-ident", "unicode-math-class", @@ -3015,8 +3228,8 @@ dependencies = [ [[package]] name = "typst-library" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "az", "chinese-number", @@ -3054,7 +3267,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.8.1" +version = "0.9.0" dependencies = [ "anyhow", "async-compression", @@ -3097,8 +3310,8 @@ dependencies = [ [[package]] name = "typst-macros" -version = "0.6.0" -source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ "heck", "proc-macro2", @@ -3106,6 +3319,22 @@ dependencies = [ "syn 2.0.28", ] +[[package]] +name = "typst-syntax" +version = "0.7.0" +source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" +dependencies = [ + "comemo", + "ecow", + "once_cell", + "serde", + "tracing", + "unicode-ident", + "unicode-math-class", + "unicode-segmentation", + "unscanny", +] + [[package]] name = "unic-langid" version = "0.9.1" @@ -3686,3 +3915,12 @@ dependencies = [ "syn 1.0.109", "synstructure", ] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index 732c979bbefb..e730ab24ce8b 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -9,20 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-Aq9KP9L9s42NmX45YVnGUMpP0MXKB1Pjd4W0f0U8T7o="; + hash = "sha256-XV/LlibO+2ORle0lVcqqHrDdH75kodk9yOU3OsHFA+A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE="; - "typst-0.6.0" = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A="; + "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; }; }; @@ -36,11 +35,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - patches = [ - # `rustPlatform.importCargoLock` has trouble parsing the `??` in the url - ./remove-svg2pdf-patch.patch - ]; - checkFlags = [ # requires internet access "--skip=workspace::package::external::repo::test::full_download" diff --git a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch b/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch deleted file mode 100644 index ad277caa81b5..000000000000 --- a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2468,7 +2468,7 @@ dependencies = [ - [[package]] - name = "svg2pdf" - version = "0.5.0" --source = "git+https://github.com/typst/svg2pdf.git??tag=v0.5.0#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" -+source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b" - dependencies = [ - "image", - "miniz_oxide", ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -84,13 +84,5 @@ reqwest = { version = "0.11.18", default-features = false, features = [ - "rustls-tls", - ] } - -- --# Typst 0.6.0 does not specify a tag or ref for svg2pdf, so provide one... --# ...but Cargo doesn't want to make our lives too easy, and we can't replace the --# dependency with another at the same URL. Use a workaroud inspired by --# StackOverflow: https://stackoverflow.com/a/72261235 --[patch."https://github.com/typst/svg2pdf"] --svg2pdf = { git = "https://github.com/typst/svg2pdf.git?", tag = "v0.5.0" } -- - [dev-dependencies] - temp-dir = "0.1.11" diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 8f390befa923..fc61e0ae376f 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "runme"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-WsYaOaXaNGztVqHMURn/96lWA9grccoKw6AJOhqUdfQ="; + hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0="; }; - vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM="; + vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 544c8c75ef9e..4f5eb0a5a6ec 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-vKjSpjbjTY9YxJGtqyoat6qI9ipmou+HQt35Dhpgk4E="; + hash = "sha256-Ftr0YMrY6tPpfg25swYntBXLWGKT00PEz79aOiSgLsU="; }; - cargoHash = "sha256-dnQttsI6v90TJD8MekaLV63ltl147zBCe3mmfWj6cxs="; + cargoHash = "sha256-VIPIFdbyPcflqHHLkzpDugmw9+9CJRIv+Oy7PoaUZ5g="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 4c9c694d541e..57b23899155e 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.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-64cVDW5sScQCpBsP/dyHbWppYuGRQwXloRsMHFKT4yw="; + hash = "sha256-/LEE+54ppv/jkUgpuMReorQA9D4KAuPG04E8lIk7upA="; }; - cargoHash = "sha256-Sad28iwsCpZPo/V6DlLA+pjq0T3yv8fRHXDCnRfFzPg="; + cargoHash = "sha256-hvFDmtNweTXQEgu5ng/lBVu7OPnA8hA8h6HFvGxCJIE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index 2da905e1ffd3..bae1b5232c7d 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kk9SDGDTCq1qHew9yrf1HmYAhse5mB4AqH/Oo/lc0dc="; + sha256 = "sha256-AdcoyBtPgTK94VDBsCGozPU5enqCquY7r5IuEm3oW/g="; }; - cargoHash = "sha256-6YTdOb1JvP5yTD1FVpHGG3C+hgiuTUiy05s+e3k8cdI="; + cargoHash = "sha256-VJjXwvMDSnDedcxJTjg6tVjPUxjRGTSOnx2nXgXCdzI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/tools/security/mitm6/default.nix new file mode 100644 index 000000000000..a7587330e7b9 --- /dev/null +++ b/pkgs/tools/security/mitm6/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchPypi +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mitm6"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-g+eFcJdgP7CQ6ntN17guJa4LdkGIb91mr/NKRPIukP8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + scapy + future + twisted + netifaces + ]; + + # No tests exist for mitm6. + doCheck = false; + + pythonImportsCheck = [ + "mitm6" + ]; + + meta = { + description = "DHCPv6 network spoofing application"; + homepage = "https://github.com/dirkjanm/mitm6"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ arcayr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17cf988d94a1..0adfa9829cc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4856,6 +4856,8 @@ with pkgs; dasher = callPackage ../applications/accessibility/dasher { }; + dataclass-wizard = with python3Packages; toPythonApplication dataclass-wizard; + datafusion-cli = callPackage ../development/misc/datafusion { }; datamash = callPackage ../tools/misc/datamash { }; @@ -9950,6 +9952,8 @@ with pkgs; ministat = callPackage ../tools/misc/ministat { }; + mitm6 = callPackage ../tools/security/mitm6 { }; + mjolnir = callPackage ../servers/mjolnir { matrix-sdk-crypto-nodejs = matrix-sdk-crypto-nodejs-0_1_0-beta_3; }; @@ -17595,6 +17599,8 @@ with pkgs; mpi = mpich; }; + gpython = callPackage ../development/interpreters/gpython { }; + graphql-client = callPackage ../development/tools/graphql-client { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba0d9134f647..3bac57f991b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2421,6 +2421,8 @@ self: super: with self; { databricks-sql-connector = callPackage ../development/python-modules/databricks-sql-connector { }; + dataclass-wizard = callPackage ../development/python-modules/dataclass-wizard { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; dataclasses-serialization = callPackage ../development/python-modules/dataclasses-serialization { };