From 9950cee4132ef31c1f49351cd6b4e72d18ed0ec5 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 6 Jul 2024 10:21:42 +0900 Subject: [PATCH 01/42] python311Packages.azure-search-documents: init at 11.4.0 --- .../azure-search-documents/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/azure-search-documents/default.nix diff --git a/pkgs/development/python-modules/azure-search-documents/default.nix b/pkgs/development/python-modules/azure-search-documents/default.nix new file mode 100644 index 000000000000..63672e0c69e2 --- /dev/null +++ b/pkgs/development/python-modules/azure-search-documents/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + azure-common, + azure-core, + isodate, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "azure-search-documents"; + version = "11.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-sdk-for-python"; + rev = "azure-search-documents_${version}"; + hash = "sha256-0J9AXDH7TOkcKDwFbICiMatLAwiFq3Jtoji8fJSOg8k="; + }; + + sourceRoot = "${src.name}/sdk/search/azure-search-documents"; + + build-system = [ setuptools ]; + + dependencies = [ + azure-common + azure-core + isodate + ]; + + pythonImportsCheck = [ "azure.search.documents" ]; + + # require devtools_testutils which is a internal package for azure-sdk + doCheck = false; + + meta = { + description = "Microsoft Azure Cognitive Search Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/search/azure-search-documents"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/${src.rev}/sdk/search/azure-search-documents/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3e6066cf77d..22a5e914921b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1302,6 +1302,8 @@ self: super: with self; { azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + azure-search-documents = callPackage ../development/python-modules/azure-search-documents { }; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; From a194071b8e7a9a2dd77894e1a4a9b3043db73849 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 6 Jul 2024 11:03:03 +0900 Subject: [PATCH 02/42] python311Packages.datashaper: init at 0.0.49 --- .../python-modules/datashaper/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/datashaper/default.nix diff --git a/pkgs/development/python-modules/datashaper/default.nix b/pkgs/development/python-modules/datashaper/default.nix new file mode 100644 index 000000000000..1da7346f2669 --- /dev/null +++ b/pkgs/development/python-modules/datashaper/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pythonRelaxDepsHook, + poetry-core, + dacite, + diskcache, + jsonschema, + pandas, + pyarrow, +}: + +buildPythonPackage rec { + pname = "datashaper"; + version = "0.0.49"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Bb+6WWRHSmK91SWew/oBc9AeNlIItqSv9OoOYwlqdTM="; + }; + + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "pyarrow" ]; + + dependencies = [ + dacite + diskcache + jsonschema + pandas + pyarrow + ]; + + pythonImportsCheck = [ "datashaper" ]; + + # pypi tarball has no tests + doCheck = false; + + meta = { + description = "Collection of utilities for doing lightweight data wrangling"; + homepage = "https://github.com/microsoft/datashaper/tree/main/python/datashaper"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 22a5e914921b..4bc81af04ad5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2841,6 +2841,8 @@ self: super: with self; { datashape = callPackage ../development/python-modules/datashape { }; + datashaper = callPackage ../development/python-modules/datashaper { }; + datatable = callPackage ../development/python-modules/datatable { }; datauri = callPackage ../development/python-modules/datauri { }; From 362ec3fa31ec5803af6eba104b34bcc9d2375d2b Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 7 Jul 2024 11:34:58 +0900 Subject: [PATCH 03/42] python312Packages.pyaml-env: init at 1.2.1 --- .../python-modules/pyaml-env/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pyaml-env/default.nix diff --git a/pkgs/development/python-modules/pyaml-env/default.nix b/pkgs/development/python-modules/pyaml-env/default.nix new file mode 100644 index 000000000000..dfbeb55112cd --- /dev/null +++ b/pkgs/development/python-modules/pyaml-env/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pyyaml, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "pyaml-env"; + version = "1.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mkaranasou"; + repo = "pyaml_env"; + rev = "refs/tags/v${version}"; + hash = "sha256-xSu+dksSVugShJwOqedXBrXIKaH0G5JAsynauOuP3OA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pyyaml ]; + + pythonImportsCheck = [ "pyaml_env" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Parse YAML configuration with environment variables in Python"; + homepage = "https://github.com/mkaranasou/pyaml_env"; + changelog = "https://github.com/mkaranasou/pyaml_env/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bc81af04ad5..ab43ac754e67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10825,6 +10825,8 @@ self: super: with self; { pyaml = callPackage ../development/python-modules/pyaml { }; + pyaml-env = callPackage ../development/python-modules/pyaml-env { }; + pyannotate = callPackage ../development/python-modules/pyannotate { }; pyannote-audio = callPackage ../development/python-modules/pyannote-audio { }; From f72bebe4afeea484c54f267876d10b64479680c9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 13 Jul 2024 09:13:44 +0900 Subject: [PATCH 04/42] python312Packages.swifter: init at 1.4.0 --- .../python-modules/swifter/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/swifter/default.nix diff --git a/pkgs/development/python-modules/swifter/default.nix b/pkgs/development/python-modules/swifter/default.nix new file mode 100644 index 000000000000..53c5ea5c508a --- /dev/null +++ b/pkgs/development/python-modules/swifter/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + dask, + pandas, + psutil, + tqdm, + ipywidgets, + ray, +}: + +buildPythonPackage rec { + pname = "swifter"; + version = "1.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jmcarpenter2"; + repo = "swifter"; + rev = "refs/tags/${version}"; + hash = "sha256-lgdf8E9GGjeLY4ERzxqtjQuYVtdtIZt2HFLSiNBbtX4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pandas + psutil + dask + tqdm + ] ++ dask.optional-dependencies.dataframe; + + optional-dependencies = { + groupby = [ ray ]; + notebook = [ ipywidgets ]; + }; + + pythonImportsCheck = [ "swifter" ]; + + # tests may hang due to ignoring cpu core limit + # https://github.com/jmcarpenter2/swifter/issues/221 + doCheck = false; + + meta = { + description = "Package which efficiently applies any function to a pandas dataframe or series in the fastest available manner"; + homepage = "https://github.com/jmcarpenter2/swifter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ab43ac754e67..828ccc82ecb3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14961,6 +14961,8 @@ self: super: with self; { swift = callPackage ../development/python-modules/swift { }; + swifter = callPackage ../development/python-modules/swifter { }; + swisshydrodata = callPackage ../development/python-modules/swisshydrodata { }; swspotify = callPackage ../development/python-modules/swspotify { }; From d2c2cc8e61831c65d929de41c782858123e7187e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 13 Jul 2024 10:15:49 +0900 Subject: [PATCH 05/42] python312Packages.graphrag: init at 0.1.1 --- .../python-modules/graphrag/default.nix | 122 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 124 insertions(+) create mode 100644 pkgs/development/python-modules/graphrag/default.nix diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix new file mode 100644 index 000000000000..204b7a747597 --- /dev/null +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -0,0 +1,122 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + poetry-dynamic-versioning, + aiofiles, + aiolimiter, + azure-identity, + azure-search-documents, + azure-storage-blob, + datashaper, + devtools, + environs, + fastparquet, + graspologic, + lancedb, + networkx, + nltk, + numba, + numpy, + openai, + pyaml-env, + pydantic, + python-dotenv, + pyyaml, + rich, + scipy, + swifter, + tenacity, + textual, + tiktoken, + typing-extensions, + uvloop, + nbformat, + pytest-asyncio, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "graphrag"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "graphrag"; + rev = "refs/tags/v${version}"; + hash = "sha256-hIAQOIqm9S9AtssE6UxcXfaIbSt3+506ueMrlathNaQ="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + pythonRelaxDeps = [ + "aiofiles" + "azure-identity" + "scipy" + "tiktoken" + ]; + + dependencies = [ + aiofiles + aiolimiter + azure-identity + azure-search-documents + azure-storage-blob + datashaper + devtools + environs + fastparquet + graspologic + lancedb + networkx + nltk + numba + numpy + openai + pyaml-env + pydantic + python-dotenv + pyyaml + rich + scipy + swifter + tenacity + textual + tiktoken + typing-extensions + uvloop + ]; + + env.NUMBA_CACHE_DIR = "$TMPDIR"; + + pythonImportsCheck = [ "graphrag" ]; + + nativeCheckInputs = [ + nbformat + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/unit" ]; + + disabledTests = [ + # touch the network + "test_child" + "test_dotprefix" + "test_find" + "test_run_extract_entities_multiple_documents" + "test_run_extract_entities_single_document" + ]; + + meta = { + description = "Modular graph-based Retrieval-Augmented Generation (RAG) system"; + homepage = "https://github.com/microsoft/graphrag"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 828ccc82ecb3..b5d5fe1f0c2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5218,6 +5218,8 @@ self: super: with self; { graphql-subscription-manager = callPackage ../development/python-modules/graphql-subscription-manager { }; + graphrag = callPackage ../development/python-modules/graphrag { }; + graph-tool = callPackage ../development/python-modules/graph-tool { }; graphtage = callPackage ../development/python-modules/graphtage { }; From 93682f498bf33b27fee7523b2a814cf82c4b7a8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 05:04:54 +0000 Subject: [PATCH 06/42] cargo-dist: 0.18.0 -> 0.19.1 --- pkgs/development/tools/rust/cargo-dist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index e8a97f906d05..9da50e4ac64a 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-r7f4Ev/ucOFo4cu8zy+UDb2aJh35IMjgwuQ96j0pnw8="; + hash = "sha256-7+z9TVeSwyYwdP+qlvm5CIiDcRGXsM+AyyZnugd3Xk8="; }; - cargoHash = "sha256-GvzYoCbpn/q+jXyIfNgZ7j0cyCiJk7ipICAeGgMfkyw="; + cargoHash = "sha256-BgU99C0SJuxEOmIYRX/iy4243tiMeKCvCwc0AvKMhsk="; nativeBuildInputs = [ pkg-config From ea889da7e6a16078e32f341bfbe24b5efad7cd53 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 13 May 2024 19:46:19 -0400 Subject: [PATCH 07/42] =?UTF-8?q?gcc:=20drop=20rpath=20from=20build=20on?= =?UTF-8?q?=20platforms=20that=20don=E2=80=99t=20set=20rpaths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Darwin uses absolute path install names, so setting rpaths is unnecessary. This fixes breakage on older versions of GCC that try to set a deployment target that does not support rpaths. --- .../compilers/gcc/common/builder.nix | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 25c564633865..9a254ef59c02 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -7,6 +7,14 @@ let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; + + # todo(@reckenrode) Remove in staging. This is ugly, but it avoid unwanted rebuilds on Darwin and Linux. + enableDarwinFixesForStagingNext = + version: + stdenv.buildPlatform.isDarwin + && stdenv.buildPlatform.isx86_64 + && lib.versionAtLeast version "6" + && lib.versionOlder version "10"; in originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { @@ -20,9 +28,20 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { if test "$staticCompiler" = "1"; then EXTRA_LDFLAGS="-static" - else - EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" - fi + ${ + if enableDarwinFixesForStagingNext finalAttrs.version then + '' + elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + else + EXTRA_LDFLAGS="" + '' + else + '' + else + EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib" + '' + }fi # GCC interprets empty paths as ".", which we don't want. if test -z "''${CPATH-}"; then unset CPATH; fi @@ -56,9 +75,24 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { extraLDFlags=("-L/usr/lib64" "-L/usr/lib") libc_libdir="/usr/lib" fi - extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" - "''${extraLDFlags[@]}") - for i in "''${extraLDFlags[@]}"; do + ${ + if enableDarwinFixesForStagingNext finalAttrs.version then + '' + extraLDFlags=("-L$libc_libdir") + nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post} + if test "''${!nixDontSetRpathVar-}" != "1"; then + extraLDFlags+=("-rpath" "$libc_libdir") + fi + extraLDFlags+=("''${extraLDFlags[@]}") + '' + else + '' + extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir" + "''${extraLDFlags[@]}") + '' +# The strange indentation with the next line is to ensure the string renders the same when the condition is false, +# which is necessary to prevent unwanted rebuilds in staging-next. +} for i in "''${extraLDFlags[@]}"; do declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i" done done From 621d0e188ec239e180dd53842da90ff15e1483cb Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 13 May 2024 19:47:52 -0400 Subject: [PATCH 08/42] gcc{6,7,8,9}: fix compatibility with Darwin headers The version of `AvailabilityInternal.h` used in newer SDKs does not work with older versions of GCC that do not support `__has_builtin`. Apply a fixinclude on those versions to allow them to build against the newer version of that header (also used in the source-based SDK after the ld64 update). --- .../AvailabilityInternal.h-fixincludes.patch | 105 ++++++++++++++++++ .../AvailabilityInternal.h-fixincludes.patch | 105 ++++++++++++++++++ .../AvailabilityInternal.h-fixincludes.patch | 105 ++++++++++++++++++ .../AvailabilityInternal.h-fixincludes.patch | 105 ++++++++++++++++++ .../compilers/gcc/patches/default.nix | 8 ++ 5 files changed, 428 insertions(+) create mode 100644 pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch create mode 100644 pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch create mode 100644 pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch create mode 100644 pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch diff --git a/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 000000000000..a29bb5eba98c --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 662dc97762c..5140a04f9dd 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3053,6 +3053,43 @@ static const char* apzDarwin_Stdint_7Patch[] = { + #endif", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -9855,9 +9892,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 277 ++#define REGEX_COUNT 278 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 241 ++#define FIX_COUNT 242 + + /* + * Enumerate the fixes +@@ -9933,6 +9970,7 @@ typedef enum { + DARWIN_STDINT_5_FIXIDX, + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -10457,6 +10495,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Stdint_7Tests, apzDarwin_Stdint_7Patch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 98fb5b61649..8aad418dff8 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1591,6 +1591,20 @@ fix = { + "#define UINTMAX_C(v) (v ## ULL)"; + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 000000000000..a8a995d030df --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index d12ba7c3e88..9f31b29c509 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3468,6 +3468,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10347,9 +10384,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 291 ++#define REGEX_COUNT 292 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 253 ++#define FIX_COUNT 254 + + /* + * Enumerate the fixes +@@ -10435,6 +10472,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11011,6 +11049,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 179e2f3c98a..70b681f35c8 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1793,6 +1793,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 000000000000..0a4f46bce066 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 9578c99ab7b..e0ae73496c6 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3428,6 +3428,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10356,9 +10393,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 294 ++#define REGEX_COUNT 295 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 255 ++#define FIX_COUNT 256 + + /* + * Enumerate the fixes +@@ -10445,6 +10482,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11027,6 +11065,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index 948ea1d9183..5eb403ac841 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1697,6 +1697,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch b/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch new file mode 100644 index 000000000000..8575f71912a1 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch @@ -0,0 +1,105 @@ +diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x +index 47a3578f017..6cf22d19b2a 100644 +--- a/fixincludes/fixincl.x ++++ b/fixincludes/fixincl.x +@@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = { + #endif\n", + (char*)NULL }; + ++/* * * * * * * * * * * * * * * * * * * * * * * * * * ++ * ++ * Description of Darwin_Nix_Sdk_Availabilityinternal fix ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] = ++ "darwin_nix_sdk_availabilityinternal"; ++ ++/* ++ * File name selection pattern ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] = ++ "AvailabilityInternal.h\0"; ++/* ++ * Machine/OS name selection pattern ++ */ ++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = { ++ "*-*-darwin*", ++ (const char*)NULL }; ++ ++/* ++ * content selection pattern - do fix if pattern found ++ */ ++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] = ++ "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ ++#define DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT 1 ++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = { ++ { TT_EGREP, zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, }; ++ ++/* ++ * Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal ++ */ ++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = { ++ "format", ++ "%10%2", ++ (char*)NULL }; ++ + /* * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Description of Dec_Intern_Asm fix +@@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = { + * + * List of all fixes + */ +-#define REGEX_COUNT 296 ++#define REGEX_COUNT 297 + #define MACH_LIST_SIZE_LIMIT 187 +-#define FIX_COUNT 257 ++#define FIX_COUNT 258 + + /* + * Enumerate the fixes +@@ -10535,6 +10572,7 @@ typedef enum { + DARWIN_STDINT_6_FIXIDX, + DARWIN_STDINT_7_FIXIDX, + DARWIN_UCRED__ATOMIC_FIXIDX, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX, + DEC_INTERN_ASM_FIXIDX, + DJGPP_WCHAR_H_FIXIDX, + ECD_CURSOR_FIXIDX, +@@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { + DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aDarwin_Ucred__AtomicTests, apzDarwin_Ucred__AtomicPatch, 0 }, + ++ { zDarwin_Nix_Sdk_AvailabilityinternalName, zDarwin_Nix_Sdk_AvailabilityinternalList, ++ apzDarwin_Nix_Sdk_AvailabilityinternalMachs, ++ DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, ++ aDarwin_Nix_Sdk_AvailabilityinternalTests, apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 }, ++ + { zDec_Intern_AsmName, zDec_Intern_AsmList, + apzDec_Intern_AsmMachs, + DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY, +diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def +index bf136fdaa20..89bceb46c26 100644 +--- a/fixincludes/inclhack.def ++++ b/fixincludes/inclhack.def +@@ -1727,6 +1727,20 @@ fix = { + test_text = ""; /* Don't provide this for wrap fixes. */ + }; + ++/* ++ * Newer versions of AvailabilityInternal.h use `__has_builtin`, ++ * which is not implemented in or compatible with GCC. ++ */ ++fix = { ++ hackname = darwin_nix_sdk_availabilityinternal; ++ mach = "*-*-darwin*"; ++ files = AvailabilityInternal.h; ++ c_fix = format; ++ c_fix_arg = "%10%2"; ++ select = "(.*)__has_builtin\\(__is_target_os\\)(.*)"; ++ test_text = "__has_builtin(__is_target_os)"; ++}; ++ + /* + * Fix on Digital UNIX V4.0: + * It contains a prototype for a DEC C internal asm() function, diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index c64e16753fc6..eabf034d9824 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -167,6 +167,14 @@ in }) ]; }.${majorVersion} or []) +# Work around newer AvailabilityInternal.h when building older versions of GCC. +++ optionals (stdenv.isDarwin) ({ + "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ]; + "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ]; + "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ]; + "6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ]; +}.${majorVersion} or []) + ## Windows From 33f416e434089dc3d2fa4389297d9f6c60c9373c Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 21 Jul 2024 22:57:11 -0400 Subject: [PATCH 09/42] gcc6: add x86_64-darwin to badPlatforms ld64 crashes when trying to link during the GCC bootstrap. --- pkgs/development/compilers/gcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 2105fe752dd5..24c65f8c7421 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -450,7 +450,7 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is48 || is49) then [ "aarch64-darwin" ] + else if !(is48 || is49 || is6) then [ "aarch64-darwin" ] else platforms.darwin; } // optionalAttrs is11 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; From 2b87db2b51f4961d4ff9cddb009b84097ca7de7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 23 Jul 2024 06:18:16 -0700 Subject: [PATCH 10/42] python312Packages.pdfminer-six: 20231228 -> 20240706 Diff: https://github.com/pdfminer/pdfminer.six/compare/20231228...20240706 Changelog: https://github.com/pdfminer/pdfminer.six/blob/20240706/CHANGELOG.md --- .../python-modules/pdfminer-six/default.nix | 27 +++++++------------ .../disable-setuptools-git-versioning.patch | 6 +++-- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index d07e11c8fcbf..1f736189e85c 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -2,12 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, - isPy3k, cryptography, charset-normalizer, pythonOlder, - typing-extensions, pytestCheckHook, setuptools, substituteAll, @@ -16,16 +13,16 @@ buildPythonPackage rec { pname = "pdfminer-six"; - version = "20231228"; + version = "20240706"; pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; - rev = version; - hash = "sha256-LXPECQQojD3IY9zRkrDBufy4A8XUuYiRpryqUx/I3qo="; + rev = "refs/tags/${version}"; + hash = "sha256-aY7GQADRxeiclr6/G3RRgrPcl8rGiC85JYEIjIa+vG0="; }; patches = [ @@ -35,17 +32,12 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = - [ - charset-normalizer - cryptography - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ]; + dependencies = [ + charset-normalizer + cryptography + ]; postInstall = '' for file in $out/bin/*.py; do @@ -67,6 +59,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/pdfminer/pdfminer.six/blob/${src.rev}/CHANGELOG.md"; description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch index 2dec0e147b9f..809cc024ff2e 100644 --- a/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch +++ b/pkgs/development/python-modules/pdfminer-six/disable-setuptools-git-versioning.patch @@ -1,13 +1,15 @@ +diff --git a/setup.py b/setup.py +index 42764e2..e7b93d3 100644 --- a/setup.py +++ b/setup.py -@@ -7,10 +7,7 @@ +@@ -19,10 +19,7 @@ if sys.version_info < (3, 12): setup( name="pdfminer.six", - setuptools_git_versioning={ - "enabled": True, - }, -- setup_requires=["setuptools-git-versioning<2"], +- setup_requires=["setuptools-git-versioning<3"], + version="@version@", packages=["pdfminer"], package_data={"pdfminer": ["cmap/*.pickle.gz", "py.typed"]}, From e2dc23646e37c366a752db56ee7085b1dd5efc9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 01:12:10 +0000 Subject: [PATCH 11/42] gitoxide: 0.36.0 -> 0.37.0 --- pkgs/applications/version-management/gitoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index c4ff74a86048..9909d9829cbd 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -19,16 +19,16 @@ let ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A="; + hash = "sha256-ZnfWIFphIdPHKvpzO0Cn5KCahpvKh56HZun09I1l8Vc="; }; - cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk="; + cargoHash = "sha256-oKcCodoMUaduxXXgUV+z7zlg5mc783PSsgoECdW/Uug="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From d954876d6bec1d5b00aee4f023201382951a3970 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Wed, 24 Jul 2024 12:42:57 +0200 Subject: [PATCH 12/42] perlPackages.XMLLibXML: 2.0209 -> 2.0210 and apply fix for tests --- .../perl-modules/XML-LibXML-clang16.patch | 47 ------ .../XML-LibXML-fix-tests-libxml-2.13.0.patch | 145 ++++++++++++++++++ pkgs/top-level/perl-packages.nix | 13 +- 3 files changed, 150 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/perl-modules/XML-LibXML-clang16.patch create mode 100644 pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch diff --git a/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/pkgs/development/perl-modules/XML-LibXML-clang16.patch deleted file mode 100644 index 9a19e32bc401..000000000000 --- a/pkgs/development/perl-modules/XML-LibXML-clang16.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 16 Jan 2023 18:50:10 -0800 -Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers - -This is now detected with latest clang16+ - -Fixes -error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] - xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); - -Signed-off-by: Khem Raj ---- - perl-libxml-mm.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c -index a3e78a2..ec2b5ea 100644 ---- a/perl-libxml-mm.c -+++ b/perl-libxml-mm.c -@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) - extern SV* PROXY_NODE_REGISTRY_MUTEX; - - /* Utility method used by PmmDumpRegistry */ --void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) -+void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) - { - LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; - ProxyNodePtr node = (ProxyNodePtr) lp->proxy; -@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) - /* PP: originally this was static inline void, but on AIX the compiler - did not chew it, so I'm removing the inline */ - static void --PmmRegistryHashDeallocator(void *payload, xmlChar *name) -+PmmRegistryHashDeallocator(void *payload, const xmlChar *name) - { - Safefree((LocalProxyNodePtr) payload); - } -@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) - * internal, used by PmmCloneProxyNodes - */ - void * --PmmRegistryHashCopier(void *payload, xmlChar *name) -+PmmRegistryHashCopier(void *payload, const xmlChar *name) - { - ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; - LocalProxyNodePtr lp; diff --git a/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch b/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch new file mode 100644 index 000000000000..330ea88f0d36 --- /dev/null +++ b/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch @@ -0,0 +1,145 @@ +From bee8338fd1cbd7aad4bf60c2965833343b6ead6f Mon Sep 17 00:00:00 2001 +From: Nick Wellnhofer +Date: Tue, 21 May 2024 15:17:30 +0200 +Subject: [PATCH] Fix test suite with libxml2 2.13.0 + +--- + t/02parse.t | 7 ++++++- + t/08findnodes.t | 8 +++++++- + t/19die_on_invalid_utf8_rt_58848.t | 2 +- + t/25relaxng.t | 4 ++-- + t/26schema.t | 4 ++-- + t/60error_prev_chain.t | 8 ++++---- + 6 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/t/02parse.t b/t/02parse.t +index b111507b..40aa5f13 100644 +--- a/t/02parse.t ++++ b/t/02parse.t +@@ -884,7 +884,12 @@ EOXML + eval { + $doc2 = $parser->parse_string( $xmldoc ); + }; +- isnt($@, '', "error parsing $xmldoc"); ++ # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b717abdd ++ if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) { ++ isnt($@, '', "error parsing $xmldoc"); ++ } else { ++ is( $doc2->documentElement()->firstChild()->nodeName(), "foo" ); ++ } + + $parser->validation(1); + +diff --git a/t/08findnodes.t b/t/08findnodes.t +index 016c85a1..e9417bc5 100644 +--- a/t/08findnodes.t ++++ b/t/08findnodes.t +@@ -123,7 +123,13 @@ my $docstring = q{ + my @ns = $root->findnodes('namespace::*'); + # TEST + +-is(scalar(@ns), 2, ' TODO : Add test name' ); ++# https://gitlab.gnome.org/GNOME/libxml2/-/commit/aca16fb3 ++# fixed xmlCopyNamespace with XML namespace. ++if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) { ++ is(scalar(@ns), 2, ' TODO : Add test name' ); ++} else { ++ is(scalar(@ns), 3, ' TODO : Add test name' ); ++} + + # bad xpaths + # TEST:$badxpath=4; +diff --git a/t/19die_on_invalid_utf8_rt_58848.t b/t/19die_on_invalid_utf8_rt_58848.t +index aa8ad105..4160cb27 100644 +--- a/t/19die_on_invalid_utf8_rt_58848.t ++++ b/t/19die_on_invalid_utf8_rt_58848.t +@@ -16,7 +16,7 @@ use XML::LibXML; + my $err = $@; + + # TEST +- like ("$err", qr{parser error : Input is not proper UTF-8}, ++ like ("$err", qr{not proper UTF-8|Invalid bytes in character encoding}, + 'Parser error.', + ); + } +diff --git a/t/25relaxng.t b/t/25relaxng.t +index 93e61883..71383b2a 100644 +--- a/t/25relaxng.t ++++ b/t/25relaxng.t +@@ -132,7 +132,7 @@ print "# 6 check that no_network => 1 works\n"; + { + my $rng = eval { XML::LibXML::RelaxNG->new( location => $netfile, no_network => 1 ) }; + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $rng, 'RNG from file location with external import and no_network => 1 is not loaded.' ); + } +@@ -152,7 +152,7 @@ print "# 6 check that no_network => 1 works\n"; + + EOF + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $rng, 'RNG from buffer with external import and no_network => 1 is not loaded.' ); + } +diff --git a/t/26schema.t b/t/26schema.t +index 17f641e4..c404cedd 100644 +--- a/t/26schema.t ++++ b/t/26schema.t +@@ -117,7 +117,7 @@ EOF + { + my $schema = eval { XML::LibXML::Schema->new( location => $netfile, no_network => 1 ) }; + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $schema, 'Schema from file location with external import and no_network => 1 is not loaded.' ); + } +@@ -129,7 +129,7 @@ EOF + + EOF + # TEST +- like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' ); ++ like( $@, qr{Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' ); + # TEST + ok( !defined $schema, 'Schema from buffer with external import and no_network => 1 is not loaded.' ); + } +diff --git a/t/60error_prev_chain.t b/t/60error_prev_chain.t +index e48215c4..55ac0b2e 100644 +--- a/t/60error_prev_chain.t ++++ b/t/60error_prev_chain.t +@@ -16,13 +16,11 @@ use XML::LibXML; + + { + my $parser = XML::LibXML->new(); +- $parser->validation(0); +- $parser->load_ext_dtd(0); + + eval + { + local $^W = 0; +- $parser->parse_file('example/JBR-ALLENtrees.htm'); ++ $parser->parse_string('“ ”'); + }; + + my $err = $@; +@@ -31,7 +29,7 @@ use XML::LibXML; + if( $err && !ref($err) ) { + plan skip_all => 'The local libxml library does not support errors as objects to $@'; + } +- plan tests => 1; ++ plan tests => 2; + + while (defined($err) && $count < 200) + { +@@ -44,6 +42,8 @@ use XML::LibXML; + + # TEST + ok ((!$err), "Reached the end of the chain."); ++ # TEST ++ is ($count, 3, "Correct number of errors reported") + } + + =head1 COPYRIGHT & LICENSE diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 76a44d4ec416..c38a20517317 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -28572,21 +28572,18 @@ with self; { XMLLibXML = buildPerlPackage { pname = "XML-LibXML"; - version = "2.0209"; + version = "2.0210"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0209.tar.gz"; - hash = "sha256-tKWrvNaJqi+7yLe0UznpYcSYTkgQhJTrbCgrR0giJCU="; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0210.tar.gz"; + hash = "sha256-opvz8Aq5ye4EIYFU4K/I95m/I2dOuZwantTeH0BZpI0="; }; SKIP_SAX_INSTALL = 1; buildInputs = [ AlienBuild AlienLibxml2 ] ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]); patches = [ - ../development/perl-modules/XML-LibXML-clang16.patch + # https://github.com/shlomif/perl-XML-LibXML/pull/87 + ../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch ]; - # Remove test that fails after LibXML 2.11 upgrade - postPatch = '' - rm t/35huge_mode.t - ''; propagatedBuildInputs = [ XMLSAX ]; meta = { description = "Perl Binding for libxml2"; From 29c65da2bcb985bb6b332fcc8089f3492d97d8b4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 24 Jul 2024 22:00:25 +0800 Subject: [PATCH 13/42] pantheon.elementary-wallpapers: 7.0.0 -> 8.0.0 https://github.com/elementary/wallpapers/compare/7.0.0...8.0.0 --- .../pantheon/artwork/elementary-wallpapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index addef5891d2c..1264eee4152b 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "elementary-wallpapers"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "wallpapers"; rev = version; - sha256 = "sha256-i9tIz5UckON8uwGlE62b/y0M0Neqt86rR3VdNUWBo04="; + sha256 = "sha256-qbqYr+3Vqwi1UBD0fRW6lI2rj5Iy51taZRGxDTpKfpg="; }; nativeBuildInputs = [ From b745525fea4d8a7bd6d1ddf00fed8be25208ad45 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Wed, 10 Jul 2024 19:24:07 +0200 Subject: [PATCH 14/42] protonmail-desktop: 1.0.4 -> 1.0.5 Includes refactoring for update-script --- .../by-name/pr/protonmail-desktop/package.nix | 83 +++++++++++-------- pkgs/by-name/pr/protonmail-desktop/update.sh | 30 +++++++ 2 files changed, 77 insertions(+), 36 deletions(-) create mode 100755 pkgs/by-name/pr/protonmail-desktop/update.sh diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 3a500fe0c769..590abd423381 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -10,27 +10,29 @@ let mainProgram = "proton-mail"; -in -stdenv.mkDerivation rec { - pname = "protonmail-desktop"; - version = "1.0.4"; + srcHashes = { + # Upstream info: It's intended to stay like this in further releases + # https://github.com/NixOS/nixpkgs/pull/326152#discussion_r1679558135 + universal-darwin = "sha256-JfZwHFp0aZtHcbP7tyG7uqFs2w+LWKfnfyuxxpxDJZ8="; + x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ="; + }; - src = - { - "x86_64-linux" = fetchurl { - url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/proton-mail_${version}_amd64.deb"; - hash = "sha256-KY/rjiJozOQW27FYljy5N1VKuKroJz3V485DPaH01JY="; - }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-x64-${version}.zip"; - hash = "sha256-I5Yj1JR3DaAmC6WKI4X/d/q9rvmsck9SE3Mx3AY6yvU="; - }; - "aarch64-darwin" = fetchurl { - url = "https://github.com/ProtonMail/inbox-desktop/releases/download/v${version}/Proton.Mail-darwin-arm64-${version}.zip"; - hash = "sha256-j1F8hhLSq/C1WQXGrYnvFK8nNz4qwoA1ohNzPsS3tiY="; - }; - } - .${stdenv.hostPlatform.system}; +in stdenv.mkDerivation rec { + pname = "protonmail-desktop"; + # Upstream info: "v"-prefix got dropped + version = "1.0.5"; + + src = fetchurl { + url = if stdenv.isDarwin then + "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" + else + "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; + sha256 = { + x86_64-linux = srcHashes.x86_64-linux; + x86_64-darwin = srcHashes.universal-darwin; + aarch64-darwin = srcHashes.universal-darwin; + }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + }; sourceRoot = lib.optionalString stdenv.isDarwin "."; @@ -39,24 +41,31 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - ] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip; + ] + ++ lib.optional stdenv.isLinux dpkg + ++ lib.optional stdenv.isDarwin unzip; - installPhase = - lib.optionalString stdenv.isLinux '' + installPhase = let + darwin = '' + mkdir -p $out/{Applications,bin} + cp -r "Proton Mail.app" $out/Applications/ + makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop + ''; + linux = '' runHook preInstall mkdir -p $out cp -r usr/share/ $out/ cp -r usr/lib/proton-mail/resources/app.asar $out/share/ - runHook postInstall - '' - + lib.optionalString stdenv.isDarwin '' - runHook preInstall - mkdir -p $out/{Applications,bin} - cp -r "Proton Mail.app" $out/Applications/ - makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop - runHook postInstall ''; + in '' + runHook preInstall + + ${if stdenv.isDarwin then darwin else linux} + + runHook postInstall + ''; + preFixup = lib.optionalString stdenv.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ @@ -66,17 +75,19 @@ stdenv.mkDerivation rec { --inherit-argv0 ''; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { description = "Desktop application for Mail and Calendar, made with Electron"; homepage = "https://github.com/ProtonMail/inbox-desktop"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ rsniezek sebtm matteopacini ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; inherit mainProgram; }; } diff --git a/pkgs/by-name/pr/protonmail-desktop/update.sh b/pkgs/by-name/pr/protonmail-desktop/update.sh new file mode 100755 index 000000000000..a640b40d49e3 --- /dev/null +++ b/pkgs/by-name/pr/protonmail-desktop/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts jq + +# shellcheck disable=SC1008 + +set -eu -o pipefail + +latestVersion=$(curl https://api.github.com/repos/ProtonMail/inbox-desktop/releases/latest | jq -r '.tag_name') + +declare -A platforms +platforms[x86_64-linux]="amd64" +platforms[x86_64-darwin]="x64" +platforms[aarch64-darwin]="arm64" + +for platform in "${!platforms[@]}" +do + arch=${platforms[$platform]} + os=$(echo "$platform" | cut -d "-" -f2) + + if [[ "$os" == "linux" ]]; then + downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/proton-mail_${latestVersion}_${arch}.deb" + else + downloadUrl="https://github.com/ProtonMail/inbox-desktop/releases/download/${latestVersion}/Proton.Mail-${os}-${arch}-${latestVersion}.zip" + fi + echo "$downloadUrl" + + latestSha=$(nix store prefetch-file "$downloadUrl" --json | jq -r '.hash') + + update-source-version "protonmail-desktop" "$latestVersion" "$latestSha" --system="$platform" --ignore-same-version --file=./pkgs/by-name/pr/protonmail-desktop/package.nix +done From dffdc50d992686f5cd5f43498f9cef30d8cf691f Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 23 Jul 2024 17:05:28 +0200 Subject: [PATCH 15/42] protonmail-desktop: nixfmt (rfc-style) --- .../by-name/pr/protonmail-desktop/package.nix | 72 ++++++++++--------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix index 590abd423381..815b0dc8fe8e 100644 --- a/pkgs/by-name/pr/protonmail-desktop/package.nix +++ b/pkgs/by-name/pr/protonmail-desktop/package.nix @@ -17,21 +17,25 @@ let x86_64-linux = "sha256-En5vkTHYtwN6GMgbtyhzsPqknOPRO9KlTqZfbBFaIFQ="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "protonmail-desktop"; # Upstream info: "v"-prefix got dropped version = "1.0.5"; src = fetchurl { - url = if stdenv.isDarwin then - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" - else - "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; - sha256 = { - x86_64-linux = srcHashes.x86_64-linux; - x86_64-darwin = srcHashes.universal-darwin; - aarch64-darwin = srcHashes.universal-darwin; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); + url = + if stdenv.isDarwin then + "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/Proton.Mail-darwin-universal-${version}.zip" + else + "https://github.com/ProtonMail/inbox-desktop/releases/download/${version}/proton-mail_${version}_amd64.deb"; + sha256 = + { + x86_64-linux = srcHashes.x86_64-linux; + x86_64-darwin = srcHashes.universal-darwin; + aarch64-darwin = srcHashes.universal-darwin; + } + .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; sourceRoot = lib.optionalString stdenv.isDarwin "."; @@ -41,31 +45,31 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - ] - ++ lib.optional stdenv.isLinux dpkg - ++ lib.optional stdenv.isDarwin unzip; + ] ++ lib.optional stdenv.isLinux dpkg ++ lib.optional stdenv.isDarwin unzip; - installPhase = let - darwin = '' - mkdir -p $out/{Applications,bin} - cp -r "Proton Mail.app" $out/Applications/ - makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop - ''; - linux = '' + installPhase = + let + darwin = '' + mkdir -p $out/{Applications,bin} + cp -r "Proton Mail.app" $out/Applications/ + makeWrapper $out/Applications/"Proton Mail.app"/Contents/MacOS/Proton\ Mail $out/bin/protonmail-desktop + ''; + linux = '' + runHook preInstall + mkdir -p $out + cp -r usr/share/ $out/ + cp -r usr/lib/proton-mail/resources/app.asar $out/share/ + ''; + + in + '' runHook preInstall - mkdir -p $out - cp -r usr/share/ $out/ - cp -r usr/lib/proton-mail/resources/app.asar $out/share/ + + ${if stdenv.isDarwin then darwin else linux} + + runHook postInstall ''; - in '' - runHook preInstall - - ${if stdenv.isDarwin then darwin else linux} - - runHook postInstall - ''; - preFixup = lib.optionalString stdenv.isLinux '' makeWrapper ${lib.getExe electron} $out/bin/${mainProgram} \ --add-flags $out/share/app.asar \ @@ -86,7 +90,11 @@ in stdenv.mkDerivation rec { sebtm matteopacini ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; inherit mainProgram; }; From 58bae1819e47fd9cfc6955871e31766f32e31c39 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 23 Jul 2024 16:10:18 +0200 Subject: [PATCH 16/42] sysdig: patch 'main.c' to fix build for 6.10-kernel --- pkgs/os-specific/linux/sysdig/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index f1abf6a7389c..f3cbaaded978 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -26,6 +26,7 @@ clang, libbpf, bpftools, + fetchurl, }: let @@ -49,6 +50,13 @@ let hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; + # "main.c" from master after (https://github.com/falcosecurity/libs/pull/1884) + # Remove when an upstream release includes the driver update + driverKernel610MainC = fetchurl { + url = "https://raw.githubusercontent.com/falcosecurity/libs/fa26daf65bb4117ecfe099fcad48ea75fe86d8bb/driver/main.c"; + hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM="; + }; + version = "0.38.0"; in stdenv.mkDerivation { @@ -109,6 +117,7 @@ stdenv.mkDerivation { cp -r ${driver} driver-src chmod -R +w driver-src + cp ${driverKernel610MainC} driver-src/driver/main.c cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" From 5947fd237644a0413a555b3067f074e99e9260eb Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 23 Jul 2024 17:23:57 +0200 Subject: [PATCH 17/42] sysdig: 0.38.0 -> 0.38.1 --- pkgs/os-specific/linux/sysdig/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index f3cbaaded978..38779e28ceb1 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -30,7 +30,7 @@ }: let - # Compare with https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/falcosecurity-libs.cmake + # Compare with https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/falcosecurity-libs.cmake libsRev = "0.17.2"; libsHash = "sha256-BTLXtdU7GjOJReaycHvXkSd2vtybnCn0rTR7OEsvaMQ="; @@ -42,7 +42,7 @@ let hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; }; - # https://github.com/draios/sysdig/blob/0.38.0/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.38.1/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; @@ -57,7 +57,7 @@ let hash = "sha256-VI/tOSXs5OcEDehSqICF3apmSnwe4QCmbkHz+DGH4uM="; }; - version = "0.38.0"; + version = "0.38.1"; in stdenv.mkDerivation { pname = "sysdig"; @@ -67,7 +67,7 @@ stdenv.mkDerivation { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-y6WArSz57w8vb3A3nHT37G6D8++6en2jQfeIS4YCD9U="; + hash = "sha256-oufRTr5TFdpF50pmem2L3bBFIfwxCR8f1xi0A328iHo="; }; nativeBuildInputs = [ From 09ecd173ec7e60275a8860da38f5e339ca823457 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Jul 2024 16:59:42 +0300 Subject: [PATCH 18/42] gnuradio3_8: don't use confusing `with python.pkgs;` (in 1 place) --- pkgs/applications/radio/gnuradio/3.8.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 37533bb05d34..b8123d112003 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -103,11 +103,11 @@ let runtime = [ thrift ]; - pythonRuntime = with python.pkgs; [ + pythonRuntime = [ python.pkgs.thrift # For gr-perf-monitorx - matplotlib - networkx + python.pkgs.matplotlib + python.pkgs.networkx ]; }; gnuradio-companion = { From 5b48a7c09a4bac4aa547bbaa1e54da4f49c59fc2 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Jul 2024 16:59:49 +0300 Subject: [PATCH 19/42] gnuradio3_9: don't use confusing `with python.pkgs;` (in 1 place) --- pkgs/applications/radio/gnuradio/3.9.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index b6a8ebd2dd8e..80be5b79c8aa 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -102,11 +102,11 @@ let libunwind thrift ]; - pythonRuntime = with python.pkgs; [ + pythonRuntime = [ python.pkgs.thrift # For gr-perf-monitorx - matplotlib - networkx + python.pkgs.matplotlib + python.pkgs.networkx ]; cmakeEnableFlag = "GR_CTRLPORT"; }; From 573be242982f863718159ec2cb98444aaa46b142 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Jul 2024 17:00:22 +0300 Subject: [PATCH 20/42] gnuradio: don't use confusing `with python.pkgs;` (in 1 place) --- pkgs/applications/radio/gnuradio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 9d05e1151bd8..964a4f0e2241 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -103,11 +103,11 @@ let libunwind thrift ]; - pythonRuntime = with python.pkgs; [ + pythonRuntime = [ python.pkgs.thrift # For gr-perf-monitorx - matplotlib - networkx + python.pkgs.matplotlib + python.pkgs.networkx ]; cmakeEnableFlag = "GR_CTRLPORT"; }; From 381d63b9f856c7256d7a3b95bae8445be43dca78 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Jul 2024 17:01:09 +0300 Subject: [PATCH 21/42] gnuradio{,3_9,3_8}: don't overuse with lib; in meta --- pkgs/applications/radio/gnuradio/shared.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index da3479777d4a..9cf8b22b4158 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -123,7 +123,7 @@ in { export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}" ''; - meta = with lib; { + meta = { description = "Software Defined Radio (SDR) software"; mainProgram = "gnuradio-config-info"; longDescription = '' @@ -136,8 +136,8 @@ in { real-world radio systems. ''; homepage = "https://www.gnuradio.org"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ doronbehar bjornfor fpletz jiegec ]; }; } From 6282c8d0c66ff0304ed4fdeacffe9a899e24a497 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Jul 2024 18:48:19 +0300 Subject: [PATCH 22/42] gnuradioMinimal: 3.10.10.0 -> 3.10.11.0 Diff: https://github.com/gnuradio/gnuradio/compare/v3.10.10.0...v3.10.11.0 --- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 964a4f0e2241..6a04491a5cee 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -44,11 +44,11 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, version ? "3.10.10.0" +, version ? "3.10.11.0" }: let - sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs="; + sourceSha256 = "sha256-QOZXUj+ZmfpazsrHEs8Gx3WSmoHG/zO43NEpyhIjpN8="; featuresInfo = { # Needed always basic = { From d1877bdca487b8a6e13dc819f53800a2fc6c7484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:11:04 -0400 Subject: [PATCH 23/42] previewqt: init at 3.0 --- pkgs/by-name/pr/previewqt/package.nix | 64 +++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/by-name/pr/previewqt/package.nix diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix new file mode 100644 index 000000000000..f493f6ec3dab --- /dev/null +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -0,0 +1,64 @@ +{ + lib, + vips, + resvg, + mpv, + libraw, + imagemagick, + libdevil, + stdenv, + fetchFromGitLab, + cmake, + libarchive, + qt6Packages, + extra-cmake-modules, + exiv2, +}: + +stdenv.mkDerivation rec { + pname = "previewqt"; + version = "3.0"; + + src = fetchFromGitLab { + owner = "lspies"; + repo = "previewqt"; + rev = "refs/tags/v${version}"; + hash = "sha256-cDtqgezKGgSdhw8x1mM4cZ0H3SfUPEyWP6rRD+kRwXc="; + }; + + # can't find qtquick3d + strictDeps = false; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + exiv2 + imagemagick + qt6Packages.poppler + qt6Packages.qtmultimedia + qt6Packages.qtquick3d + qt6Packages.qtsvg + qt6Packages.qttools + qt6Packages.qtwebengine + libarchive + libdevil + libraw + mpv + resvg + vips + ]; + + meta = { + description = "Qt-based file previewer"; + homepage = "https://photoqt.org/previewqt"; + changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "previewqt"; + platforms = lib.platforms.linux; + }; +} From f7f73482d1d33c7c1eff0e108f31b1b707c0615c Mon Sep 17 00:00:00 2001 From: Lenivaya Date: Wed, 24 Jul 2024 20:13:31 +0300 Subject: [PATCH 24/42] skippy-xd: 0.7.2 -> 0.8.0 --- pkgs/tools/X11/skippy-xd/default.nix | 33 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 27ee6ba88f30..38a4457b38e1 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -1,25 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub -, xorgproto -, libX11 -, libXft -, libXcomposite -, libXdamage -, libXext -, libXinerama -, libjpeg -, giflib -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + xorgproto, + libX11, + libXft, + libXcomposite, + libXdamage, + libXext, + libXinerama, + libjpeg, + giflib, + pkg-config, }: stdenv.mkDerivation rec { pname = "skippy-xd"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "felixfung"; repo = "skippy-xd"; - rev = "e033b9ea80b5bbe922b05c64ed6ba0bf31c3acf6"; - hash = "sha256-DsoRxbAF0DitgxknJVHDWH7VL5hWMhwH9I6m1SyItMM="; + rev = "30da57cb59ccf77f766718f7d533ddbe533ba241"; + hash = "sha256-YBUDbI1SHsBI/fA3f3W1sPu3wXSodMbTGvAMqOz7RCM="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 1813159b69ea4b232402b5d8a62b18f5bab856be Mon Sep 17 00:00:00 2001 From: Lenivaya Date: Wed, 24 Jul 2024 20:18:42 +0300 Subject: [PATCH 25/42] add link to the project homepage --- pkgs/tools/X11/skippy-xd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix index 38a4457b38e1..782dbd1ec0e6 100644 --- a/pkgs/tools/X11/skippy-xd/default.nix +++ b/pkgs/tools/X11/skippy-xd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Expose-style compositing-based standalone window switcher"; + homepage = "https://github.com/felixfung/skippy-xd"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; From 92c68739ef82131733cc1f4f045cef628f8e99f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 17:58:32 +0000 Subject: [PATCH 26/42] timetagger: 24.4.1 -> 24.07.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 20d70ed0c3b8..de944d5b26b3 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "24.4.1"; + version = "24.07.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qt6VKExigzMaEb5ZEEPHCe5DSYdx5KPIfVC0khx7pP4="; + hash = "sha256-zm+3vk2ZeaZjciANNVSVxDT5S2LhOAl3B4AE2RgA5Tw="; }; propagatedBuildInputs = [ From 06cba1f89ee582e0df3b8b6302e5b2d392759eaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Jul 2024 20:55:52 +0000 Subject: [PATCH 27/42] cargo-cyclonedx: 0.5.3 -> 0.5.4 --- pkgs/development/tools/rust/cargo-cyclonedx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index c9773cbc43cb..14ca5cd027df 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-Hq5yEYikov/+/Vgf4Bn0b23+K6yqefrJOoEbC0YdnFY="; + hash = "sha256-H/CFEz1+rFHiTEP8JBFH9W9OTHjRdIBOov9c0JO69xE="; }; - cargoHash = "sha256-Q6Qanjfu5rIIZw4KeZo0kHJML5aq+12Lkn7CTscK8yE="; + cargoHash = "sha256-OhkC8R/+mdjFI6WRisFYZk5PKxje3W9X5p9tGCgKQOw="; nativeBuildInputs = [ pkg-config From 7d63921e596f247b3bf9339b540709e2bccfbd39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Jul 2024 14:18:24 -0700 Subject: [PATCH 28/42] python312Packages.commoncode: don't fail if there is no /etc/os-release --- .../python-modules/commoncode/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 049cc4e09aa1..8df7ef380ab3 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -6,9 +6,9 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch2, pytest-xdist, pytestCheckHook, - pythonAtLeast, pythonOlder, requests, saneyaml, @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "commoncode"; version = "31.2.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,11 +30,19 @@ buildPythonPackage rec { hash = "sha256-4ZgyNlMj1i1fRru4wgDOyP3qzbne8D2eH/tFI60kgrE="; }; + patches = [ + # https://github.com/nexB/commoncode/pull/66 + (fetchpatch2 { + url = "https://github.com/nexB/commoncode/commit/4f87b3c9272dcf209b9c4b997e98b58e0edaf570.patch"; + hash = "sha256-loUtAww+SK7kMt5uqZmLQ8Wg/OqB7LWVA4BiztnwHsA="; + }) + ]; + dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs beautifulsoup4 click @@ -48,11 +56,6 @@ buildPythonPackage rec { pytest-xdist ]; - preCheck = '' - # prevent readout of /etc/os-release during tests - sed -i "s/is_on_ubuntu_22()/lambda _: False/" src/commoncode/system.py - ''; - disabledTests = [ # chinese character translates different into latin @@ -69,11 +72,6 @@ buildPythonPackage rec { "test_searchable_paths" ]; - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/nexB/commoncode/issues/36 - "src/commoncode/fetch.py" - ]; - pythonImportsCheck = [ "commoncode" ]; meta = with lib; { From 45c1e0ab1637e205db02620dd1ee9d0300932bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Jul 2024 14:20:46 -0700 Subject: [PATCH 29/42] python312Packages.debian-inspector: modernize --- .../python-modules/debian-inspector/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index 571040b89fa0..b5785b93132f 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -13,9 +13,9 @@ buildPythonPackage rec { pname = "debian-inspector"; version = "31.1.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "debian_inspector"; @@ -25,15 +25,17 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ chardet attrs - commoncode ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + commoncode + pytestCheckHook + ]; pythonImportsCheck = [ "debian_inspector" ]; From 76d0de1fc45b731eceb3749b80fbcd4b47579c4d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 24 Jul 2024 23:25:48 +0200 Subject: [PATCH 30/42] python311Packages.devito: 4.8.10 -> 4.8.11 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.10...v4.8.11 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.11 --- pkgs/development/python-modules/devito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 6075588f1173..759e96b34ad5 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.10"; + version = "4.8.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-n8mbhbW5zN8hQeVF6T3MbET9tJlIy99iwFiZCOh6xTg="; + hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0="; }; pythonRemoveDeps = [ From 94bc3c61faf8e7b8e964a8392f7996d42dadce4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 25 Jul 2024 02:58:34 +0200 Subject: [PATCH 31/42] esphome: 2024.7.1 -> 2024.7.2 https://github.com/esphome/esphome/releases/tag/2024.7.2 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index ea979101e93b..ee75498adeed 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.7.1"; + version = "2024.7.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-V44c4+bU3pUO6S8qhI7O4GvKqo3lXB8rqLrKNkuODVc="; + hash = "sha256-DnXPCcbDwWN+jve2YIeQ3dlugamAc6AR2/7c68bpct8="; }; nativeBuildInputs = with python.pkgs; [ From dc3b05d906ec6a4e24585bbae04c92a1379eaf36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 01:22:32 +0000 Subject: [PATCH 32/42] clboss: 0.13.1 -> 0.13.2 --- pkgs/applications/blockchains/clboss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix index da6e5b41aae1..fa94088bda8e 100644 --- a/pkgs/applications/blockchains/clboss/default.nix +++ b/pkgs/applications/blockchains/clboss/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "ZmnSCPxj"; repo = "clboss"; rev = "v${version}"; - hash = "sha256-DQvcf+y73QQYQanEvbOCOgwQzvNOXS1ZY+hVvS6N+G0="; + hash = "sha256-BMDeqAQGl2mSWyde5Pbai+1KHqPqcY+xzaY36L26olI="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; From 2f5fb56cb33f1c0a58fd2fe23c5bd0e8bf922835 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 02:34:45 +0000 Subject: [PATCH 33/42] cargo-semver-checks: 0.32.0 -> 0.33.0 --- pkgs/development/tools/rust/cargo-semver-checks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 82fa17b3405a..ee0376db72e5 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-2B9i9S6OY+7DEorZoXfQQx9cEU2Y8FoyIyytJ8C7dXU="; + hash = "sha256-E9jEZXD7nY90v35y4Wv1cUp2aoKzC7dR9bFOTI+2fqo="; }; - cargoHash = "sha256-S03fgnefhU6c5e9YtFMBart+nfBQj7f4O+lSPe8fgqg="; + cargoHash = "sha256-1lHF8S0Xf5iOLQyARoYeWGGC9i68GVpk3EvSHo21Q2w="; nativeBuildInputs = [ cmake From 06ed778c19b9d616fc593af576d9e2812ce0b561 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Thu, 25 Jul 2024 12:31:28 +0800 Subject: [PATCH 34/42] yt-dlp: 2024.7.16 -> 2024.7.25 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.7.25 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index a1c63b96f493..4e88175b9aa7 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -25,13 +25,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.7.16"; + version = "2024.7.25"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-xb1RekneoZI+yOFPUYWPEP2J3+zhTLcBOStIC0Gy9RY="; + hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw="; }; build-system = [ From 9bca10c7214cf10ce8aa8d7be7566c5c713eecec Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Thu, 25 Jul 2024 08:01:49 +0400 Subject: [PATCH 35/42] mdbook-alerts: init at 0.6.0 Add mdbook-alerts a pre-processor for mdbook to support the inclusion of Markdown alerts. https://github.com/lambdalisue/rs-mdbook-alerts Signed-off-by: Brian McGillion --- pkgs/by-name/md/mdbook-alerts/package.nix | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/md/mdbook-alerts/package.nix diff --git a/pkgs/by-name/md/mdbook-alerts/package.nix b/pkgs/by-name/md/mdbook-alerts/package.nix new file mode 100644 index 000000000000..1dbca74813ec --- /dev/null +++ b/pkgs/by-name/md/mdbook-alerts/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + darwin, + CoreServices ? darwin.apple_sdk.frameworks.CoreServices, +}: +let + version = "0.6.0"; +in +rustPlatform.buildRustPackage { + pname = "mdbook-alerts"; + inherit version; + + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "rs-mdbook-alerts"; + rev = "v${version}"; + hash = "sha256-LKNEI4dPXQwa+7JqLXpFZeKaQSSS5DFdeGuxEGNgPCU="; + }; + + cargoHash = "sha256-oycBTCjC58cO9q+eeO1nFGZGKdp6Bilgs8aFHW/4gXs="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = { + description = "Preprocessor for mdbook to support the inclusion of Markdown alerts"; + mainProgram = "mdbook-alerts"; + homepage = "https://github.com/lambdalisue/rs-mdbook-alerts"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + brianmcgillion + matthiasbeyer + ]; + }; +} From 1167f1975340028b6146867115eb4bac4ae987c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 05:34:44 +0000 Subject: [PATCH 36/42] numix-icon-theme-square: 24.04.22 -> 24.07.19 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 4b4c5305ffa9..cf666d13b5b5 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "24.04.22"; + version = "24.07.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-Co6tMvYFl0v4pZSGtamlIb6g6koAUyC0xyxcQig62J4="; + sha256 = "sha256-mHCQpFBBnJfmMA0o5BVt8IWhHIcMSaReCezVgVqVAw4="; }; nativeBuildInputs = [ gtk3 ]; From 894542eecb7e62b572a830b168854d518954cee4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 25 Jul 2024 07:38:44 +0200 Subject: [PATCH 37/42] codeium: 1.8.80 -> 1.10.0 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 80cbee9e371b..16d0f7b06209 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-ULHO7NrbW0DDlOYiSHGXwJ+NOa68Ma+HMHgq2WyAKBA="; - aarch64-linux = "sha256-WVqPV/D9jPADkxt5XmydqXjSG8461URPsk1+W/kyZV0="; - x86_64-darwin = "sha256-0P/eYZp0Wieza0btOA+yxqKtoIYlUN6MhN0dI6R8GEg="; - aarch64-darwin = "sha256-2Cv22+Ii+otKLDQ404l9R/x42PkKTEzPB72/gc9wfig="; + x86_64-linux = "sha256-EpmbqXLu+yShS86mXCTYpLuPVPIzvQIKVMcnVEN61OU="; + aarch64-linux = "sha256-rCglTEpIxGR0RjOSJgEgJGWhhJ/ZgI361AMkgBbnflU="; + x86_64-darwin = "sha256-C9xOdgNmapOgLVyrZGP03hcVwIpmHqFwpxQalZtbJSo="; + aarch64-darwin = "sha256-Gm5ZITOpsKNeWkqDPrn9BbPDH4AM3NkFG+nhc6hbZ+4="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.8.80"; + version = "1.10.0"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From 0905b34da67c145403f25fa09fb0fcc2b75c67e0 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 25 Jul 2024 09:01:18 +0100 Subject: [PATCH 38/42] python3Packages.craft-platforms: init at 0.1.1 --- .../craft-platforms/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/craft-platforms/default.nix diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix new file mode 100644 index 000000000000..3cd303990859 --- /dev/null +++ b/pkgs/development/python-modules/craft-platforms/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + annotated-types, + distro, + fetchFromGitHub, + nix-update-script, + pytest-check, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "craft-platforms"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "craft-platforms"; + rev = "refs/tags/${version}"; + hash = "sha256-KzskmSw7NsH1CAYjPf2281Ob71Jd6AhWxtp5tR3IqyU="; + }; + + postPatch = '' + substituteInPlace craft_platforms/__init__.py --replace-fail "dev" "${version}" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + annotated-types + distro + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-check + ]; + + pythonImportsCheck = [ "craft_platforms" ]; + + pytestFlagsArray = [ "tests/unit" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Manage platforms and architectures for charm applications"; + homepage = "https://github.com/canonical/craft-platforms"; + changelog = "https://github.com/canonical/craft-platforms/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ jnsgruk ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f2d7ec087df..494ad0860323 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2567,6 +2567,8 @@ self: super: with self; { craft-parts = callPackage ../development/python-modules/craft-parts { }; + craft-platforms = callPackage ../development/python-modules/craft-platforms { }; + craft-providers = callPackage ../development/python-modules/craft-providers { }; craft-store = callPackage ../development/python-modules/craft-store { }; From 53dede428741013cfedae8c528e532e8082a3d0d Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Thu, 25 Jul 2024 09:01:36 +0100 Subject: [PATCH 39/42] charmcraft: 2.7.0 -> 3.1.1 --- pkgs/by-name/ch/charmcraft/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 78f48f85a7c4..fc5ef145d1bc 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -30,7 +30,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "charmcraft"; - version = "2.7.0"; + version = "3.1.1"; pyproject = true; @@ -38,24 +38,22 @@ python.pkgs.buildPythonApplication rec { owner = "canonical"; repo = "charmcraft"; rev = "refs/tags/${version}"; - hash = "sha256-yMcGXi7OxEtfOv3zLEUlnZrR90TkFc0y9RB9jS34ZWs="; + hash = "sha256-oxNbAIf7ltdDYkGJj29zvNDNXT6vt1jWaIqHJoMr7gU="; }; postPatch = '' - substituteInPlace setup.py \ - --replace-fail 'version=determine_version()' 'version="${version}"' - - # TODO remove setuptools from dependencies once this is removed - substituteInPlace charmcraft/env.py \ - --replace-fail "distutils.util" "setuptools.dist" + substituteInPlace charmcraft/__init__.py --replace-fail "dev" "${version}" ''; dependencies = with python.pkgs; [ + craft-application craft-cli craft-parts + craft-platforms craft-providers craft-store distro + docker humanize jinja2 jsonschema @@ -65,19 +63,22 @@ python.pkgs.buildPythonApplication rec { requests requests-toolbelt requests-unixsocket - setuptools # see substituteInPlace above snap-helpers tabulate urllib3 ]; - build-system = with python.pkgs; [ setuptools ]; + build-system = with python.pkgs; [ + setuptools + setuptools-scm + ]; pythonRelaxDeps = [ "urllib3" ]; nativeCheckInputs = with python.pkgs; [ + hypothesis pyfakefs pytest-check pytest-mock From 84a75e9488894098ce8c51aabf23f10fa63fa67e Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 24 Jul 2024 15:01:12 -0700 Subject: [PATCH 40/42] fetchYarnDeps: fix broken fetching logic for github releases When a dependency references a github *release* URL, that dependency must be fetched using https rather than git, since github does not require that release tarballs have any relationship whatsoever to the git history. This commit causes them to be fetched using https, not git. A test case (which fails prior to this commit, and passes afterwards) is included. --- pkgs/build-support/node/fetch-yarn-deps/index.js | 9 ++++++--- .../build-support/node/fetch-yarn-deps/tests/default.nix | 4 ++++ .../node/fetch-yarn-deps/tests/github-release.lock | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/build-support/node/fetch-yarn-deps/tests/github-release.lock diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index e60fdeb54330..44af9c821f80 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -104,11 +104,14 @@ const downloadPkg = (pkg, verbose) => { const [ url, hash ] = pkg.resolved.split('#') if (verbose) console.log('downloading ' + url) const fileName = urlToName(url) + const s = url.split('/') if (url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/')) { - const s = url.split('/') return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1]) - } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz')) { - const s = url.split('/') + } else if (url.startsWith('https://github.com/') && url.endsWith('.tar.gz') && + ( + s.length <= 5 || // https://github.com/owner/repo.tgz#feedface... + s[5] == "archive" // https://github.com/owner/repo/archive/refs/tags/v0.220.1.tar.gz + )) { return downloadGit(fileName, `https://github.com/${s[3]}/${s[4]}.git`, s[s.length-1].replace(/.tar.gz$/, '')) } else if (isGitUrl(url)) { return downloadGit(fileName, url.replace(/^git\+/, ''), hash) diff --git a/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix b/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix index 8057d05ba72c..2d563dac87dc 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/tests/default.nix @@ -17,6 +17,10 @@ yarnLock = ./github.lock; sha256 = "sha256-DIKrhDKoqm7tHZmcuh9eK9VTqp6BxeW0zqDUpY4F57A="; }; + githubReleaseDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { + yarnLock = ./github-release.lock; + sha256 = "sha256-g+y/H6k8LZ+IjWvkkwV7JhKQH1ycfeqzsIonNv4fDq8="; + }; gitUrlDep = testers.invalidateFetcherByDrvHash fetchYarnDeps { yarnLock = ./giturl.lock; sha256 = "sha256-VPnyqN6lePQZGXwR7VhbFnP7/0/LB621RZwT1F+KzVQ="; diff --git a/pkgs/build-support/node/fetch-yarn-deps/tests/github-release.lock b/pkgs/build-support/node/fetch-yarn-deps/tests/github-release.lock new file mode 100644 index 000000000000..267a2510067d --- /dev/null +++ b/pkgs/build-support/node/fetch-yarn-deps/tests/github-release.lock @@ -0,0 +1,6 @@ +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz": + version "0.3.19" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz#221c1fc34fcc18601aea4ce1b733ebfa55af66ea" + dependencies: + cmake-js "^7.2.1" + node-addon-api "^6.1.0" From 9cac7a7475204ad62ce9a863f5e972224f8ddfc6 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 24 Jul 2024 14:59:35 -0700 Subject: [PATCH 41/42] fetch-yarn-deps: improve diagnostic messages When the hash of an url being fetched does not match the expected value, this commit will cause fetch-yarn-deps to include the url in the error message to assist debugging. --- pkgs/build-support/node/fetch-yarn-deps/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index 44af9c821f80..400b64d2e920 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -39,7 +39,7 @@ const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { const h = hash.read() if (expectedHash === undefined){ console.log(`Warning: lockfile url ${url} doesn't end in "#" to validate against. Downloaded file had hash ${h}.`); - } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h}`)) + } else if (h != expectedHash) return reject(new Error(`hash mismatch, expected ${expectedHash}, got ${h} for ${url}`)) resolve() }) res.on('error', e => reject(e)) From 6ae5cdb0eaa5b683b4378ee2c507d827178be5bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 09:46:02 +0000 Subject: [PATCH 42/42] renovate: 37.431.7 -> 37.440.7 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index afa41bcef68a..5a184e0f67df 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -21,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "37.431.7"; + version = "37.440.7"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-aaqsScfi0pXfrxOJ7xjPxtV9m9EUadhivagcAddP8HY="; + hash = "sha256-VMv55BVeauRa/hmg1Y7D15ltAbccdcMd4Azk5IInuH0="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-atTs7sYxiioCXO5r6C07UULztquKgWCi+A2iqq+30VQ="; + hash = "sha256-ZYQ7G2BKkRxuyg31dysim+P1Vje0VysJm+UFyy4xuKI="; }; env.COREPACK_ENABLE_STRICT = 0;