From 314c2806ccfece9eec5e2ae7eb475f9e8865ea30 Mon Sep 17 00:00:00 2001 From: Valentin Chassignol Date: Thu, 29 Feb 2024 10:30:05 +0100 Subject: [PATCH 01/37] kmeet: init at 2.0.1 --- pkgs/by-name/km/kmeet/package.nix | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/km/kmeet/package.nix diff --git a/pkgs/by-name/km/kmeet/package.nix b/pkgs/by-name/km/kmeet/package.nix new file mode 100644 index 000000000000..8c928e434123 --- /dev/null +++ b/pkgs/by-name/km/kmeet/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchurl +, appimageTools +}: + +appimageTools.wrapType2 rec { + pname = "kmeet"; + version = "2.0.1"; + + src = fetchurl { + url = "https://download.storage5.infomaniak.com/meet/kmeet-desktop-${version}-linux-x86_64.AppImage"; + name = "kmeet-${version}.AppImage"; + hash = "sha256-0lygBbIwaEydvFEfvADiL2k5GWzVpM1jX4orweriBYw="; + }; + + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/lib/kmeet" + cp -r ${contents}/{locales,resources} "$out/share/lib/kmeet" + cp -r ${contents}/usr/* "$out" + cp "${contents}/kMeet.desktop" "$out/share/applications/" + mv "$out/bin/kmeet-${version}" "$out/bin/${meta.mainProgram}" + substituteInPlace $out/share/applications/kMeet.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' + ''; + + meta = with lib; { + description = "Organise secure online meetings via your web browser, your mobile, your tablet or your computer."; + homepage = "https://www.infomaniak.com/en/apps/download-kmeet"; + license = licenses.unfree; + maintainers = [ maintainers.vinetos ]; + mainProgram = "kmeet"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + longDescription = '' + kMeet allows you to organise secure online meetings via your web browser, your mobile, your tablet or your + computer. + ''; + }; +} From 7aa588cc962d5c2fb4cbcedd548f444621292cce Mon Sep 17 00:00:00 2001 From: Joseph Stahl <1269177+josephst@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:43:26 -0400 Subject: [PATCH 02/37] llama-cpp: rename cuBLAS to CUDA Matches change from upstream https://github.com/ggerganov/llama.cpp/commit/280345968dabc00d212d43e31145f5c9961a7604 --- pkgs/by-name/ll/llama-cpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ca2f4d5149d6..928fbf6dfe27 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -107,7 +107,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "BUILD_SHARED_LIBS" true) (cmakeBool "LLAMA_BLAS" blasSupport) (cmakeBool "LLAMA_CLBLAST" openclSupport) - (cmakeBool "LLAMA_CUBLAS" cudaSupport) + (cmakeBool "LLAMA_CUDA" cudaSupport) (cmakeBool "LLAMA_HIPBLAS" rocmSupport) (cmakeBool "LLAMA_METAL" metalSupport) (cmakeBool "LLAMA_MPI" mpiSupport) From e1ef3aaaccb554da9c581d684e96071b2f8cea95 Mon Sep 17 00:00:00 2001 From: Joseph Stahl <1269177+josephst@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:48:11 -0400 Subject: [PATCH 03/37] llama-cpp: embed (don't pre-compile) metal shaders port of https://github.com/ggerganov/llama.cpp/pull/6118, although compiling shaders with XCode disabled as it requires disabling sandbox (and only works on MacOS anyways) --- pkgs/by-name/ll/llama-cpp/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 928fbf6dfe27..ecd3167b9d93 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -131,7 +131,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { # Should likely use `rocmPackages.clr.gpuTargets`. "-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" ] - ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ]; + ++ optionals metalSupport [ + (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") + (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) + ]; # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that From 29d96cc43ae211ee9c40f212df4d71a0ae367b89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 09:24:01 +0000 Subject: [PATCH 04/37] zircolite: 2.10.0 -> 2.20.0 --- pkgs/by-name/zi/zircolite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zircolite/package.nix b/pkgs/by-name/zi/zircolite/package.nix index 13583df1b912..9b97b1857ae5 100644 --- a/pkgs/by-name/zi/zircolite/package.nix +++ b/pkgs/by-name/zi/zircolite/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zircolite"; - version = "2.10.0"; + version = "2.20.0"; format = "other"; src = fetchFromGitHub { owner = "wagga40"; repo = "Zircolite"; rev = "refs/tags/${version}"; - hash = "sha256-r5MIoP+6CnAGsOtK4YLshLBVSZN2NVrwnkuHHDdLZrQ="; + hash = "sha256-a7xwF0amsh2SycOjtZpk3dylcBGG9uYd7vmbnz/f9Ug="; }; __darwinAllowLocalNetworking = true; From adedd3a3016bd493fb92e957afc5b273a6839835 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 02:32:28 +0000 Subject: [PATCH 05/37] php82Extensions.mongodb: 1.17.3 -> 1.18.0 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index e3f79cee61f1..7e83041da136 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -15,13 +15,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.17.3"; + version = "1.18.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-5luaCrrnL7l9zhbxYUMSlID7Sx0MQhgFKgl8F6GkGsE="; + hash = "sha256-KrRWogmGMGaMRhU5D5xF5LTvJ6g9XSoDA5KfJxftvws="; fetchSubmodules = true; }; From 8fc2f26f4d1fca0f5f0d95c304ffebfe68a0458e Mon Sep 17 00:00:00 2001 From: Martin Madsen Date: Thu, 28 Mar 2024 21:44:09 +0100 Subject: [PATCH 06/37] dynamodb-local: add java.naming module for JRE Version 2.3.0 of DynamoDB Local depends on the java.naming module. --- pkgs/by-name/dy/dynamodb-local/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index b22a5c2fd8c7..846f8cac68b4 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -19,6 +19,7 @@ let "java.xml" "java.desktop" "java.management" + "java.naming" ]; jdk = jdk_headless; }; From e27adc4072288593b20f1c520494ca2d694fd47c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:05:10 +0100 Subject: [PATCH 07/37] python312Packages.claripy: fix z3-solver issue --- .../python-modules/claripy/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index b5c0dcd06150..44c5ef27d603 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage -, setuptools , cachetools , decorator , fetchFromGitHub -, future , pysmt -, pythonOlder , pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, setuptools , z3-solver }: @@ -25,17 +25,22 @@ buildPythonPackage rec { hash = "sha256-wgCWMngda0gB+AEDFpRxQ2ots5YXE4bkBSxMtYJqLEo="; }; - nativeBuildInputs = [ + # z3 does not provide a dist-info, so python-runtime-deps-check will fail + pythonRemoveDeps = [ + "z3-solver" + ]; + + build-system = [ + pythonRelaxDepsHook setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cachetools decorator - future pysmt z3-solver - ]; + ] ++ z3-solver.requiredPythonModules; nativeCheckInputs = [ pytestCheckHook From 316633a60f6be22e04759537ccefaf70e6b22ebf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:06:40 +0100 Subject: [PATCH 08/37] python311Packages.ailment: 9.2.84 -> 9.2.96 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.84...v9.2.96 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 1131a4b9c93f..77e86c49aa7c 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-I4lZrp4coJOBB8gREmeQsCiNhMC0MqhYxd5BmYXq9BA="; + hash = "sha256-xc9/J360ftynKT5HYNcjR/0WX04DUDmszaAHb8h3Iao="; }; nativeBuildInputs = [ From bb920bf9ff05bab7c77669b6d2768e6f951e2f8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:07:31 +0100 Subject: [PATCH 09/37] python311Packages.claripy: 9.2.84 -> 9.2.96 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.84...v9.2.96 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 44c5ef27d603..b9526b9faa7c 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-wgCWMngda0gB+AEDFpRxQ2ots5YXE4bkBSxMtYJqLEo="; + hash = "sha256-rXJzJCyhsScFW1L/mVARciGDlOOBCFT69VBivjV6oig="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 1e430af6e4bf50dd78243fb9f8c4e1dc88f987b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:08:17 +0100 Subject: [PATCH 10/37] python311Packages.ailment: refactor --- pkgs/development/python-modules/ailment/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 77e86c49aa7c..348d4e8e6237 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "ailment"; rev = "refs/tags/v${version}"; hash = "sha256-xc9/J360ftynKT5HYNcjR/0WX04DUDmszaAHb8h3Iao="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyvex ]; From 208705bdd638af7d8f85c63bcbf435756e8cd3ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:09:16 +0100 Subject: [PATCH 11/37] python311Packages.archinfo: refactor --- pkgs/development/python-modules/archinfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 35fc62a91b76..0017fbbd5a85 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "archinfo"; rev = "refs/tags/v${version}"; hash = "sha256-drZuQRQ2XukCimH/SG6CRCL4avyMEcKxuj+Rinp7lJQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ]; From 1f6ac2ecebfd6a65eadccd0bbca573288ce36e94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:09:39 +0100 Subject: [PATCH 12/37] python311Packages.archinfo: 9.2.84 -> 9.2.96 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.84...v9.2.96 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 0017fbbd5a85..3bee9cd94282 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-drZuQRQ2XukCimH/SG6CRCL4avyMEcKxuj+Rinp7lJQ="; + hash = "sha256-g/fxj/6dMVLoW4hFtVDEjHjdJiB3KE2XB3c0ihclqeM="; }; build-system = [ From 8c93cec3778908e0d3295c31da6fa62f315dd71c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:10:54 +0100 Subject: [PATCH 13/37] python311Packages.cle: refactor --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 20ac0c60435d..f67ad6c24e49 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -41,11 +41,11 @@ buildPythonPackage rec { hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cffi minidump pefile From e4daa76528288450144d0389631b04103dd75921 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:14:39 +0100 Subject: [PATCH 14/37] python311Packages.pyvex: refactor --- pkgs/development/python-modules/cle/default.nix | 6 +++--- pkgs/development/python-modules/pyvex/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index f67ad6c24e49..75209568d84e 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.84"; + version = "9.2.96"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-sU9Rv2kTLYMpaalrkcOv6HlHt1u4oG482M+d7OSjJ3Y="; + hash = "sha256-eC9qQCrms4pSXYTrKJlfdejhl/kzUmmyfYhjlEPpgzA="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-N0z5wgaeWkoPuhIUj7bj1kDKgZ7pWChm1uEU4MjXjqI="; + hash = "sha256-osClaoAzjf3mOng38disxxSFncbc/V7Uuc1HCTdX4SQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 3259d3133d87..1e51c7693830 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ archinfo bitstring cffi @@ -37,7 +37,7 @@ buildPythonPackage rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace vex/Makefile-gcc \ - --replace '/usr/bin/ar' 'ar' + --replace-fail '/usr/bin/ar' 'ar' ''; setupPyBuildFlags = lib.optionals stdenv.isLinux [ From 0e347b1a77a08ef429ea2bdf878eab6af99f90dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Thu, 28 Mar 2024 18:22:25 +0100 Subject: [PATCH 15/37] nixos/xserver: respect module order Reimplement the `ModulePath` generation logic by only adding the `/lib/xorg/modules` subpath for each module, in the specified order. In particular, hardware-specific drivers are listed *before* `xorgserver`, which fixes https://github.com/NixOS/nixpkgs/issues/299684. This also keeps the list reproducible, as wanted by https://github.com/NixOS/nixpkgs/pull/230186. I have confirmed that X is able to find `.so` files recursively within the `ModulePath`, so that there is no need to include subdirectories of `/lib/xorg/modules`. Furthermore, I don't expect there to be a need to include directories *outside* of `/lib/xorg/modules`, as the default `ModulePath` on standard distributions is `/usr/lib/xorg/modules`. (see https://www.x.org/releases/current/doc/man/man5/xorg.conf.5.xhtml#heading4) --- nixos/modules/services/x11/xserver.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 453f414e2a86..c5b168e608a4 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -111,7 +111,7 @@ let } '' echo 'Section "Files"' >> $out - echo $fontpath >> $out + echo "$fontpath" >> $out for i in ${toString fontsForXServer}; do if test "''${i:0:''${#NIX_STORE}}" == "$NIX_STORE"; then @@ -121,11 +121,9 @@ let fi done - for i in $(find ${toString cfg.modules} -type d | sort); do - if test $(echo $i/*.so* | wc -w) -ne 0; then - echo " ModulePath \"$i\"" >> $out - fi - done + ${concatMapStrings (m: '' + echo " ModulePath \"${m}/lib/xorg/modules\"" >> "$out" + '') cfg.modules} echo '${cfg.filesSection}' >> $out echo 'EndSection' >> $out From 61c9c6cd03cbb22919b68c7556349f74df55d118 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 22:18:31 +0000 Subject: [PATCH 16/37] remind: 04.03.03 -> 04.03.04 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index d3ac44b71364..00daec1e4913 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -15,11 +15,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.03.03"; + version = "04.03.04"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-+/vX6Nu0F84mZcEnd9jFlaVKbJIQQOJiPsxspKF+klQ="; + sha256 = "sha256-XkF/silBwDlQt9T2wmUMPh7MiE9yB+vXrSQmEnBEpC8="; }; propagatedBuildInputs = tclLibraries; From b3922bf9a89cdfd6811e3285cf292f8a7ce7acbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:25:36 +0100 Subject: [PATCH 17/37] python311Packages.pyvex: 9.2.93 -> 9.2.96 --- pkgs/development/python-modules/pyvex/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 1e51c7693830..9a3f6d00dc6e 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -1,11 +1,9 @@ { lib , stdenv -, archinfo , bitstring , buildPythonPackage , cffi , fetchPypi -, future , pycparser , pythonOlder , setuptools @@ -13,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.93"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-44F1EE8TRsmYRnMNQakxIaFdAuZKpHIDsq+M1cK/pQk="; + hash = "sha256-60aOAm7eUlYHTCqIILz4l0oF1jvttDZUs4jSrF5+IJI="; }; build-system = [ @@ -28,10 +26,8 @@ buildPythonPackage rec { ]; dependencies = [ - archinfo bitstring cffi - future pycparser ]; From c2706010acdbb4962e8b48a3d18c817d8447aae7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:28:50 +0100 Subject: [PATCH 18/37] python311Packages.cle: 9.2.84 -> 9.2.96 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.84...v9.2.96 --- pkgs/development/python-modules/cle/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 75209568d84e..df4594f76170 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -1,4 +1,5 @@ { lib +, archinfo , buildPythonPackage , cffi , fetchFromGitHub @@ -46,6 +47,7 @@ buildPythonPackage rec { ]; dependencies = [ + archinfo cffi minidump pefile From e74a30a73775c05df668c4e15d76800f88f3bc06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:40:32 +0100 Subject: [PATCH 19/37] python311Packages.nampa: refactor --- .../python-modules/nampa/default.nix | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix index d5d411728315..abeedb716ad5 100644 --- a/pkgs/development/python-modules/nampa/default.nix +++ b/pkgs/development/python-modules/nampa/default.nix @@ -2,41 +2,49 @@ , buildPythonPackage , fetchFromGitHub , future -, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nampa"; version = "1.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "thebabush"; - repo = pname; - rev = version; - sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a"; + repo = "nampa"; + rev = "refs/tags/${version}"; + hash = "sha256-ylDthh6fO0jKiYib0bed31Dxt4afiD0Jd5mfRKrsZpE="; }; - propagatedBuildInputs = [ - future - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' # https://github.com/thebabush/nampa/pull/13 substituteInPlace setup.py \ --replace "0.1.1" "${version}" ''; - pythonImportsCheck = [ "nampa" ]; + build-system = [ + setuptools + ]; + + dependencies = [ + future + ]; + + # Not used for binaryninja as plugin + doCheck = false; + + pythonImportsCheck = [ + "nampa" + ]; meta = with lib; { description = "Python implementation of the FLIRT technology"; - mainProgram = "dumpsig.py"; homepage = "https://github.com/thebabush/nampa"; + changelog = "https://github.com/thebabush/nampa/releases/tag/${version}"; license = licenses.lgpl3Only; maintainers = with maintainers; [ fab ]; }; From 735f815f29de2e4873fd15f7f88b1f60682408ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:41:08 +0100 Subject: [PATCH 20/37] python311Packages.angr: refactor --- pkgs/development/python-modules/angr/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 3fee462c620b..1a8fef6fcb49 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -24,6 +24,7 @@ , pyvex , rich , rpyc +, setuptools , sortedcontainers , sqlalchemy , sympy @@ -44,7 +45,11 @@ buildPythonPackage rec { hash = "sha256-qav9SUvQtcEad9lvgyrMhOcFhPAhzU/9s7ekTfohqRc="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ ailment archinfo cachetools From aa3de91b56004496fc47f1b4569ccd56d2ec65c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:44:06 +0100 Subject: [PATCH 21/37] python311Packages.angrcli: refactor --- .../python-modules/angrcli/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/angrcli/default.nix b/pkgs/development/python-modules/angrcli/default.nix index 368ea4c9a27e..cd2bf2f5508f 100644 --- a/pkgs/development/python-modules/angrcli/default.nix +++ b/pkgs/development/python-modules/angrcli/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , angr , buildPythonPackage , cmd2 @@ -8,28 +7,34 @@ , pygments , pytestCheckHook , pythonOlder +, setuptools +, stdenv }: buildPythonPackage rec { pname = "angrcli"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "fmagin"; repo = "angr-cli"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s="; }; postPatch = '' substituteInPlace tests/test_derefs.py \ - --replace "/bin/ls" "${coreutils}/bin/ls" + --replace-fail "/bin/ls" "${coreutils}/bin/ls" ''; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ angr cmd2 pygments From 917ccf988fe713a65d5b9d29f66f23b477baf912 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:47:42 +0100 Subject: [PATCH 22/37] python311Packages.unique-log-filter: refactor --- pkgs/development/python-modules/unique-log-filter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unique-log-filter/default.nix b/pkgs/development/python-modules/unique-log-filter/default.nix index 07b2a9a305e0..2b91ab437adf 100644 --- a/pkgs/development/python-modules/unique-log-filter/default.nix +++ b/pkgs/development/python-modules/unique-log-filter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-av1pVPDsO2dto5fhBK74jKfVsVY2ChyUE5NNja2B1Qw="; }; - nativeBuildInputs = [ + build-system = [ flit-core ]; From 112fdbb2c1986fa58f00e8b6af292f2c57b3d8d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:50:21 +0100 Subject: [PATCH 23/37] python311Packages.pyformlang: refactor --- .../python-modules/pyformlang/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index ce3923e0f8a6..f5cc07c29e74 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -1,12 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, setuptools -, wheel , networkx , numpy , pydot , pytestCheckHook +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { @@ -14,17 +15,19 @@ buildPythonPackage rec { version = "1.0.9"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-oCwYM4yQ1KYZpC7vVpeHSIDH2Q930JAuTDq9mds9zoc="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ networkx numpy pydot @@ -39,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python framework for formal grammars"; + description = "Framework for formal grammars"; homepage = "https://github.com/Aunsiels/pyformlang"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; From c0b4ed846ee8f5941549ba2467816add05997e62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:50:54 +0100 Subject: [PATCH 24/37] python311Packages.angr: 9.2.84 -> 9.2.96 --- pkgs/development/python-modules/angr/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1a8fef6fcb49..06a884aaa0b3 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -20,7 +20,9 @@ , protobuf , psutil , pycparser +, pyformlang , pythonOlder +, pythonRelaxDepsHook , pyvex , rich , rpyc @@ -29,11 +31,12 @@ , sqlalchemy , sympy , unicorn +, unique-log-filter }: buildPythonPackage rec { pname = "angr"; - version = "9.2.84"; + version = "9.2.96"; pyproject = true; disabled = pythonOlder "3.11"; @@ -42,10 +45,15 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-qav9SUvQtcEad9lvgyrMhOcFhPAhzU/9s7ekTfohqRc="; + hash = "sha256-eyXjmU/K8zv5nxrt+oKkyxS00tHOYrkbTc2X9esTSSA="; }; + pythonRelaxDeps = [ + "capstone" + ]; + build-system = [ + pythonRelaxDepsHook setuptools ]; @@ -68,6 +76,7 @@ buildPythonPackage rec { protobuf psutil pycparser + pyformlang pyvex rich rpyc @@ -75,6 +84,7 @@ buildPythonPackage rec { sqlalchemy sympy unicorn + unique-log-filter ]; setupPyBuildFlags = lib.optionals stdenv.isLinux [ From b086f1406d7da6bb90ce256d1e8b0160f3e20c19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:52:01 +0100 Subject: [PATCH 25/37] python311Packages.angrop: refactor --- pkgs/development/python-modules/angrop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 69b06e58784d..1d26565b1b96 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -11,22 +11,22 @@ buildPythonPackage rec { pname = "angrop"; version = "9.2.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "angrop"; rev = "refs/tags/v${version}"; hash = "sha256-zmWdGbFzwLDP7MUqEprZcIgA7lAdCrafWYohAehJyh0="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ angr progressbar tqdm From b403964bb9806bbc09125ca09b97adc9d432cf23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:58:17 +0100 Subject: [PATCH 26/37] python312Packages.aioraven: 0.5.2 -> 0.5.3 Diff: https://github.com/cottsay/aioraven/compare/refs/tags/0.5.2...0.5.3 Changelog: https://github.com/cottsay/aioraven/blob/0.5.3/CHANGELOG.md --- pkgs/development/python-modules/aioraven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix index 227e0b62becf..d44db366df99 100644 --- a/pkgs/development/python-modules/aioraven/default.nix +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioraven"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cottsay"; repo = "aioraven"; rev = "refs/tags/${version}"; - hash = "sha256-ysmIxWy+gufX5oUfQ7Zw5xv0t/yxihFB+eAdYAWAmXs="; + hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M="; }; nativeBuildInputs = [ From 1ab78293f2bce42f3bb9a16ce0d4e46179e10456 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 23:58:48 +0100 Subject: [PATCH 27/37] python312Packages.aioraven: refactor --- pkgs/development/python-modules/aioraven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix index d44db366df99..ca64f111e35e 100644 --- a/pkgs/development/python-modules/aioraven/default.nix +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { hash = "sha256-kGCFwpMaLWxLUp8k5H5AnL21KrwohbUYLswLcLqmc3M="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ iso4217 pyserial pyserial-asyncio From a06a03ed7c92c5482f6d260c596a4b593f201318 Mon Sep 17 00:00:00 2001 From: Joseph Stahl <1269177+josephst@users.noreply.github.com> Date: Thu, 28 Mar 2024 20:56:55 -0400 Subject: [PATCH 28/37] llama-cpp: update from b2481 to b2568 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ecd3167b9d93..74be7dc68541 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -71,13 +71,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2481"; + version = "2568"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-40GSZZEnjM9L9KVVKdSKtBoSRy996l98ORM4NeltsSM="; + hash = "sha256-yBlLChtzfAi2TAGUO1zdnpHCvi5YDCzjdflQgTWh98Y="; }; postPatch = '' From d55346fe37617b13b34b2ad8d7cfbcd6b22a26bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 02:02:28 +0000 Subject: [PATCH 29/37] panoply: 5.3.3 -> 5.3.4 --- pkgs/tools/misc/panoply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 2238cafe6983..b79d6b7d8e35 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.3.3"; + version = "5.3.4"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-h2MJqbouPSciOdChLNIskYm3YLpJYK9gjTDB8StmBqg="; + sha256 = "sha256-v7ieTtm2W8Sc/zhQ7QPh8rkMUgaqgfGYYXc6Ly+9iMg="; }; nativeBuildInputs = [ makeWrapper ]; From b28320100bc5ae95de0abee748c3d89aadd065ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 02:10:19 +0000 Subject: [PATCH 30/37] open-policy-agent: 0.62.1 -> 0.63.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 7346b9bea1d9..c175d788b355 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.62.1"; + version = "0.63.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-iR3/6tqB6jwjy87D6xkKu/N61oenWzU3tEPTYTeEv7c="; + hash = "sha256-yXYyRl0ZDgS6eB2pB0Iqi3DiBGcIO3Vdet9RLSOczkU="; }; vendorHash = null; From 41df62c66c64ff39c5394ecc3a03e4a89abf9e3d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 29 Mar 2024 09:43:37 +0100 Subject: [PATCH 31/37] vscode-extensions.myriad-dreamin.tinymist: init at 0.11.1 --- .../editors/vscode/extensions/default.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6f61a18d8358..36aae165e6a7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -20,6 +20,7 @@ , millet , craftos-pc , shfmt +, tinymist , typst-lsp , typst-preview , autoPatchelfHook @@ -3169,6 +3170,37 @@ let }; }; + myriad-dreamin.tinymist = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tinymist"; + publisher = "myriad-dreamin"; + # Please update the corresponding binary (tinymist) when updating + # this extension. + version = "0.11.1"; + sha256 = "sha256-jyZBnT8UW94TVnZKZna1cJa/UIj+DwYwlAbU4pnaf04="; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ + tinymist + ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."tinymist.serverPath".default = "${lib.getExe tinymist}"' package.json | sponge package.json + ''; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; + description = "A VSCode extension for providing a language server for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; + homepage = "https://github.com/myriad-dreamin/tinymist"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.drupol ]; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; From 3bb6d54ec31886b70ee7e8871611b131046966d4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 29 Mar 2024 09:59:08 +0100 Subject: [PATCH 32/37] vscode-extensions.myriad-dreamin.tinymist: init at 0.11.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 36aae165e6a7..e7b8eb96c328 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3193,10 +3193,10 @@ let meta = { changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog"; - description = "A VSCode extension for providing a language server for Typst"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp"; + description = "A VSCode extension for providing an integration solution for Typst"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist"; homepage = "https://github.com/myriad-dreamin/tinymist"; - license = lib.licenses.mit; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.drupol ]; }; }; From ea72831f39ba7a5b75a6dd4f0a23bbfeb7021128 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 29 Mar 2024 09:59:12 +0100 Subject: [PATCH 33/37] tinymist: add code comment --- pkgs/by-name/ti/tinymist/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 19473454839a..9cd26ccf8fcc 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; + # Please update the corresponding vscode extension when updating + # this derivation. version = "0.11.1"; src = fetchFromGitHub { From 2ef96f0ba025d72c0f3093c2c5cdf147d9b94581 Mon Sep 17 00:00:00 2001 From: eymeric Date: Sat, 24 Feb 2024 19:28:45 +0100 Subject: [PATCH 34/37] httpy-cli: init at 1.1.0 --- pkgs/by-name/ht/httpy-cli/package.nix | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pkgs/by-name/ht/httpy-cli/package.nix diff --git a/pkgs/by-name/ht/httpy-cli/package.nix b/pkgs/by-name/ht/httpy-cli/package.nix new file mode 100644 index 000000000000..2b59b54ef213 --- /dev/null +++ b/pkgs/by-name/ht/httpy-cli/package.nix @@ -0,0 +1,53 @@ +{ lib +, python3Packages +, fetchPypi +, curl + }: + +python3Packages.buildPythonPackage rec { + pname = "httpy-cli"; + version = "1.1.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "httpy-cli"; + hash = "sha256-uhF/jF4buHMDiXOuuqjskynioz4qVBevQhdcUbH+91Q="; + }; + + propagatedBuildInputs = with python3Packages; [ + colorama + pygments + requests + urllib3 + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + pythonImportsCheck = [ + "httpy" + ]; + + nativeCheckInputs = [ + python3Packages.pytest + curl + ]; + + checkPhase = '' + runHook preCheck + echo "line1\nline2\nline3" > tests/test_file.txt + # ignore the test_args according to pytest.ini in the repo + pytest tests/ --ignore=tests/test_args.py + runHook postCheck + ''; + + meta = with lib; { + description = "Modern, user-friendly, programmable command-line HTTP client for the API"; + homepage = "https://github.com/knid/httpy"; + license = licenses.mit; + mainProgram = "httpy"; + maintainers = with maintainers; [ eymeric ]; + }; +} From 40bc2bcb2d7f71cbc4e50fa682c0690956dfd029 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 10:17:14 +0100 Subject: [PATCH 35/37] zircolite: refactor --- pkgs/by-name/zi/zircolite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zircolite/package.nix b/pkgs/by-name/zi/zircolite/package.nix index 9b97b1857ae5..c6b73bb71603 100644 --- a/pkgs/by-name/zi/zircolite/package.nix +++ b/pkgs/by-name/zi/zircolite/package.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; - nativeBuildInputs = [ + build-system = [ makeWrapper ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ aiohttp colorama elastic-transport From df1427ed2b34397d30df24689062208188d2ef6d Mon Sep 17 00:00:00 2001 From: Patka Date: Fri, 29 Mar 2024 10:18:59 +0100 Subject: [PATCH 36/37] phpPackages.phpstan: 1.10.65 -> 1.10.66 Release notes: https://github.com/phpstan/phpstan/releases/tag/1.10.66 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index d2e28b0a1b2c..c206a881eb15 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.65"; + version = "1.10.66"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-mKNix5TEnr0aUHxn9cYvFafU7yLhTe8AVkHZcu0/a1M="; + hash = "sha256-ZEQ6oP6zyi0cL69J9ck8gAht5taPkzH+iW5ALC4saAQ="; }; - vendorHash = "sha256-NezEoraSomeeMbY7qz2pH2EwLr/VXO1tmWJ5/2fS/qU="; + vendorHash = "sha256-Qp/eMhcKK32N1EMgeIspBDs28Oofwn6n2bEFKqvSx9E="; composerStrictValidation = false; meta = { From 1bcfec89272ac5241e59972631fa96ad468e22c4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 29 Mar 2024 10:44:08 +0100 Subject: [PATCH 37/37] vscode-extensions.jbockle.jbockle-format-files: init at 3.4.0 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6f61a18d8358..2db5f8759b9e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2345,6 +2345,22 @@ let }; }; + jbockle.jbockle-format-files = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jbockle-format-files"; + publisher = "jbockle"; + version = "3.4.0"; + sha256 = "sha256-BHw+T2EPdQq/wOD5kzvSln5SBFTYUXip8QDjnAGBfFY="; + }; + meta = { + description = "A VSCode extension to formats all files in the current workspace"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jbockle.jbockle-format-files"; + homepage = "https://github.com/jbockle/format-files"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + jdinhlife.gruvbox = buildVscodeMarketplaceExtension { mktplcRef = { name = "gruvbox";