diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-02 14:41:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 12:41:45 +0000 |
| commit | db15bbc3d5d80ef43ed21f1f0a6ce84a9058780c (patch) | |
| tree | 7c6d8d13a3616269da30b7f5a87754819f110247 /pkgs | |
| parent | 79f4b5b1050caed092629308c698b9e3ee8b32dc (diff) | |
treewide: remove unreferenced patch files (#308127)
Found with `fd \\.patch$ pkgs/ -x bash -c 'rg -F "{/}" pkgs/ -q || echo {}'`Diffstat (limited to 'pkgs')
20 files changed, 0 insertions, 1969 deletions
diff --git a/pkgs/applications/audio/cmus/option-debugging.patch b/pkgs/applications/audio/cmus/option-debugging.patch deleted file mode 100644 index 84115e1480e13..0000000000000 --- a/pkgs/applications/audio/cmus/option-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -Shows build and link errors in configure for ease of debugging which -options require what. -diff --git a/scripts/checks.sh b/scripts/checks.sh -index 64cbbf3..fab4d9b 100644 ---- a/scripts/checks.sh -+++ b/scripts/checks.sh -@@ -425,7 +425,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC -c $CFLAGS $@ $__src -o $__obj" -- $CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CC -c $CFLAGS "$@" $__src -o $__obj - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -433,7 +433,7 @@ try_compile() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj" -- $CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null -+ $CXX -c $CXXFLAGS "$@" $__src -o $__obj - ;; - esac - return $? -@@ -451,7 +451,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@" -- $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null -+ $CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" - ;; - cxx) - __src=`tmp_file prog.cc` -@@ -459,7 +459,7 @@ try_compile_link() - echo "$1" > $__src || exit 1 - shift - __cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@" -- $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null -+ $CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" - ;; - esac - return $? diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch deleted file mode 100644 index 91e080aa294a0..0000000000000 --- a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd -index 7794c9edc3..1753277b1f 100644 ---- a/src/sage/libs/linbox/conversion.pxd -+++ b/src/sage/libs/linbox/conversion.pxd -@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in - - v -- linbox vector - """ - cdef Vector_integer_dense res = P() -- cdef cppvector[Integer] * vec = &v.refRep() - cdef size_t i - for i in range(<size_t> res._degree): -- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) -+ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) - - return res -diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd -index 9112d151f8..dcc482960c 100644 ---- a/src/sage/libs/linbox/linbox.pxd -+++ b/src/sage/libs/linbox/linbox.pxd -@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_double Field - ctypedef double Element - DenseMatrix_Modular_double(Field F, size_t m, size_t n) -- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": - ctypedef Modular_float Field - ctypedef float Element - DenseMatrix_Modular_float(Field F, size_t m, size_t n) -- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) -+ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) - void setEntry(size_t i, size_t j, Element& a) - Element &getEntry(size_t i, size_t j) - -@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": - DenseVector_integer (Field &F) - DenseVector_integer (Field &F, long& m) - DenseVector_integer (Field &F, cppvector[Integer]&) -- cppvector[Element]& refRep() - size_t size() - void resize(size_t) - void resize(size_t n, const Element&) -diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi -index 010365d76f..3d60726ff9 100644 ---- a/src/sage/matrix/matrix_modn_dense_template.pxi -+++ b/src/sage/matrix/matrix_modn_dense_template.pxi -@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ - return 0,[] - - cdef ModField *F = new ModField(<long>modulus) -- cdef DenseMatrix *A = new DenseMatrix(F[0], <ModField.Element*>entries,<Py_ssize_t>nrows, <Py_ssize_t>ncols) -+ cdef DenseMatrix *A = new DenseMatrix(F[0], <Py_ssize_t>nrows, <Py_ssize_t>ncols, <ModField.Element*>entries) - cdef Py_ssize_t r = reducedRowEchelonize(A[0]) - cdef Py_ssize_t i,j - for i in range(nrows): diff --git a/pkgs/applications/science/misc/gplates/boost-placeholders.patch b/pkgs/applications/science/misc/gplates/boost-placeholders.patch deleted file mode 100644 index 7166b92f646af..0000000000000 --- a/pkgs/applications/science/misc/gplates/boost-placeholders.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc ---- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200 -+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100 -@@ -3448,7 +3448,7 @@ - std::find_if( - d_visible_boundary_section_seq.begin(), - d_visible_boundary_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_boundary_section_seq.end()) -@@ -3467,7 +3467,7 @@ - std::find_if( - d_visible_interior_section_seq.begin(), - d_visible_interior_section_seq.end(), -- boost::bind(&VisibleSection::d_section_info_index, _1) == -+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) == - boost::cref(section_index)); - - if (visible_section_iter == d_visible_interior_section_seq.end()) -diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc ---- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100 -@@ -274,7 +274,7 @@ - GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params( - const ReconstructVisualLayerParams ¶ms) - { -- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2); -+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2); - d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error(); - d_render_params.fill_polygons = params.get_fill_polygons(); - d_render_params.fill_polylines = params.get_fill_polylines(); -diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc ---- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200 -+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100 -@@ -448,7 +448,7 @@ - &GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create, - boost::bind( - &ReconstructScalarCoverageVisualLayerParams::create, -- _1), -+ boost::placeholders::_1), - true); - - registry.register_visual_layer_type( -@@ -498,7 +498,7 @@ - // NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from - // ViewportWindow, because ViewportWindow is not yet available (a reference to - // it not yet been initialised inside ViewState) so accessing it would crash... -- _1, boost::ref(view_state)), -+ boost::placeholders::_1, boost::ref(view_state)), - true); - - // DERIVED_DATA group. -@@ -549,7 +549,7 @@ - &GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create, - boost::bind( - &VelocityFieldCalculatorVisualLayerParams::create, -- _1, boost::cref(view_state.get_rendered_geometry_parameters())), -+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())), - true); - - using namespace GPlatesUtils; -diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc ---- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200 -+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100 -@@ -326,7 +326,7 @@ - *d_geometry_operation_state_ptr, - *d_modify_geometry_state, - *d_measure_distance_state_ptr, -- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1), -+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1), - get_view_state(), - *this); - diff --git a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch b/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch deleted file mode 100644 index 6e90faf9f0373..0000000000000 --- a/pkgs/applications/science/misc/graphia/breakpad-sigstksz.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -index ca353c4099..499be0a986 100644 ---- a/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -+++ b/source/thirdparty/breakpad/src/client/linux/handler/exception_handler.cc -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch b/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch deleted file mode 100644 index c2c9a7ed7be31..0000000000000 --- a/pkgs/development/compilers/cairo/ensure-consistency-of-cargo-lock.patch +++ /dev/null @@ -1,1165 +0,0 @@ -From c99824dd005062d1df8c6df79a36dc4e368159f3 Mon Sep 17 00:00:00 2001 -From: Raito Bezarius <masterancpp@gmail.com> -Date: Fri, 8 Dec 2023 23:32:20 +0100 -Subject: [PATCH] packaging: ensure consistency of Cargo.lock with Cargo.toml - -2.4.0 failed to generate a consistent Cargo.lock, which made impossible -offline installs of Cairo 2.4.0. ---- - Cargo.lock | 384 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 223 insertions(+), 161 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 17d139184..67c438c18 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -57,9 +57,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - - [[package]] - name = "anstream" --version = "0.6.4" -+version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" - dependencies = [ - "anstyle", - "anstyle-parse", -@@ -77,30 +77,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - - [[package]] - name = "anstyle-parse" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" - dependencies = [ - "utf8parse", - ] - - [[package]] - name = "anstyle-query" --version = "1.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" - dependencies = [ -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] - name = "anstyle-wincon" --version = "3.0.1" -+version = "3.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" - dependencies = [ - "anstyle", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -395,7 +395,7 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - - [[package]] - name = "cairo-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -419,7 +419,7 @@ dependencies = [ - - [[package]] - name = "cairo-format" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-formatter", -@@ -432,7 +432,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -452,7 +452,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-compiler" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-defs", -@@ -473,7 +473,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-debug" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-proc-macros", - "cairo-lang-utils", -@@ -484,7 +484,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-defs" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-diagnostics", -@@ -504,7 +504,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-diagnostics" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -518,7 +518,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-eq-solver" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "env_logger", -@@ -528,7 +528,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-filesystem" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-utils", -@@ -543,7 +543,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-formatter" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-diagnostics", -@@ -563,7 +563,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -591,7 +591,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-lowering" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -621,7 +621,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-parser" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-diagnostics", - "cairo-lang-filesystem", -@@ -643,7 +643,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-plugins" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -665,7 +665,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-proc-macros" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "quote", -@@ -674,7 +674,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-project" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-filesystem", - "cairo-lang-utils", -@@ -687,7 +687,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "ark-ff", - "ark-secp256k1", -@@ -714,7 +714,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-semantic" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -742,7 +742,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "bimap", -@@ -772,7 +772,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-ap-change" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -785,7 +785,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-gas" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-eq-solver", - "cairo-lang-sierra", -@@ -803,7 +803,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-generator" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-defs", -@@ -833,7 +833,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-to-casm" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -856,7 +856,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-sierra-type-size" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-sierra", - "cairo-lang-utils", -@@ -864,7 +864,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-starknet" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -905,7 +905,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-debug", - "cairo-lang-filesystem", -@@ -922,7 +922,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-syntax-codegen" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "genco", -@@ -932,7 +932,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-plugin" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -957,7 +957,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-runner" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-felt", -@@ -978,7 +978,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-test-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-utils", - "colored", -@@ -990,7 +990,7 @@ dependencies = [ - - [[package]] - name = "cairo-lang-utils" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "env_logger", - "indexmap 2.1.0", -@@ -1009,7 +1009,7 @@ dependencies = [ - - [[package]] - name = "cairo-language-server" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-language-server", - "cairo-lang-utils", -@@ -1019,7 +1019,7 @@ dependencies = [ - - [[package]] - name = "cairo-run" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1032,7 +1032,7 @@ dependencies = [ - - [[package]] - name = "cairo-test" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -1051,7 +1051,7 @@ dependencies = [ - "bitvec", - "cairo-felt", - "generic-array", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "hex", - "keccak", - "lazy_static", -@@ -1081,9 +1081,9 @@ dependencies = [ - - [[package]] - name = "cc" --version = "1.0.84" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" -+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" - dependencies = [ - "libc", - ] -@@ -1096,9 +1096,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clap" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -+checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" - dependencies = [ - "clap_builder", - "clap_derive", -@@ -1106,9 +1106,9 @@ dependencies = [ - - [[package]] - name = "clap_builder" --version = "4.4.8" -+version = "4.4.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -+checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" - dependencies = [ - "anstream", - "anstyle", -@@ -1249,9 +1249,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - - [[package]] - name = "crypto-bigint" --version = "0.5.3" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" -+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" - dependencies = [ - "generic-array", - "subtle", -@@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" - dependencies = [ - "cfg-if", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.9", -@@ -1283,9 +1283,9 @@ dependencies = [ - - [[package]] - name = "deranged" --version = "0.3.9" -+version = "0.3.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" - dependencies = [ - "powerfmt", - ] -@@ -1396,12 +1396,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - - [[package]] - name = "errno" --version = "0.3.6" -+version = "0.3.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" -+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" - dependencies = [ - "libc", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -1418,9 +1418,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "form_urlencoded" --version = "1.2.0" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" - dependencies = [ - "percent-encoding", - ] -@@ -1550,7 +1550,7 @@ dependencies = [ - - [[package]] - name = "generate-syntax" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "cairo-lang-syntax-codegen", - "cairo-lang-utils", -@@ -1582,9 +1582,9 @@ dependencies = [ - - [[package]] - name = "gimli" --version = "0.28.0" -+version = "0.28.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" -+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - - [[package]] - name = "glob" -@@ -1594,15 +1594,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - - [[package]] - name = "globset" --version = "0.4.13" -+version = "0.4.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" -+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" - dependencies = [ - "aho-corasick", - "bstr", -- "fnv", - "log", -- "regex", -+ "regex-automata", -+ "regex-syntax 0.8.2", - ] - - [[package]] -@@ -1635,9 +1635,9 @@ dependencies = [ - - [[package]] - name = "hashbrown" --version = "0.14.2" -+version = "0.14.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" -+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - dependencies = [ - "ahash 0.8.6", - "allocator-api2", -@@ -1700,9 +1700,9 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" - - [[package]] - name = "idna" --version = "0.4.0" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" - dependencies = [ - "unicode-bidi", - "unicode-normalization", -@@ -1710,17 +1710,16 @@ dependencies = [ - - [[package]] - name = "ignore" --version = "0.4.20" -+version = "0.4.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" -+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" - dependencies = [ -+ "crossbeam-deque", - "globset", -- "lazy_static", - "log", - "memchr", -- "regex", -+ "regex-automata", - "same-file", -- "thread_local", - "walkdir", - "winapi-util", - ] -@@ -1760,7 +1759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" - dependencies = [ - "equivalent", -- "hashbrown 0.14.2", -+ "hashbrown 0.14.3", - "serde", - ] - -@@ -1829,9 +1828,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - - [[package]] - name = "js-sys" --version = "0.3.65" -+version = "0.3.66" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -+checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" - dependencies = [ - "wasm-bindgen", - ] -@@ -1915,9 +1914,9 @@ dependencies = [ - - [[package]] - name = "linux-raw-sys" --version = "0.4.11" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" -+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" - - [[package]] - name = "lock_api" -@@ -2017,9 +2016,9 @@ dependencies = [ - - [[package]] - name = "mio" --version = "0.8.9" -+version = "0.8.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" - dependencies = [ - "libc", - "wasi", -@@ -2179,9 +2178,9 @@ dependencies = [ - - [[package]] - name = "once_cell" --version = "1.18.0" -+version = "1.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - - [[package]] - name = "oorandom" -@@ -2197,9 +2196,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - - [[package]] - name = "parity-scale-codec" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" -+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" - dependencies = [ - "arrayvec", - "bitvec", -@@ -2210,9 +2209,9 @@ dependencies = [ - - [[package]] - name = "parity-scale-codec-derive" --version = "3.6.5" -+version = "3.6.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" -+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" - dependencies = [ - "proc-macro-crate", - "proc-macro2", -@@ -2282,9 +2281,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" - - [[package]] - name = "percent-encoding" --version = "2.3.0" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] - name = "petgraph" -@@ -2345,9 +2344,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - - [[package]] - name = "portable-atomic" --version = "1.5.1" -+version = "1.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - - [[package]] - name = "powerfmt" -@@ -2379,12 +2378,11 @@ dependencies = [ - - [[package]] - name = "proc-macro-crate" --version = "1.3.1" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" - dependencies = [ -- "once_cell", -- "toml_edit 0.19.15", -+ "toml_edit 0.20.7", - ] - - [[package]] -@@ -2413,9 +2411,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.69" -+version = "1.0.70" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -+checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" - dependencies = [ - "unicode-ident", - ] -@@ -2623,15 +2621,15 @@ dependencies = [ - - [[package]] - name = "rustix" --version = "0.38.21" -+version = "0.38.27" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -+checksum = "bfeae074e687625746172d639330f1de242a178bf3189b51e35a7a21573513ac" - dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", -- "windows-sys 0.48.0", -+ "windows-sys 0.52.0", - ] - - [[package]] -@@ -2739,18 +2737,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" -+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.192" -+version = "1.0.193" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" -+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" - dependencies = [ - "proc-macro2", - "quote", -@@ -2822,7 +2820,7 @@ dependencies = [ - - [[package]] - name = "sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -2901,7 +2899,7 @@ dependencies = [ - - [[package]] - name = "starknet-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-compiler", -@@ -2992,7 +2990,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-compile" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-sierra", -@@ -3005,7 +3003,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-extract-code" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3015,7 +3013,7 @@ dependencies = [ - - [[package]] - name = "starknet-sierra-upgrade-validate" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "anyhow", - "cairo-lang-starknet", -@@ -3093,30 +3091,29 @@ dependencies = [ - - [[package]] - name = "termcolor" --version = "1.3.0" -+version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -+checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" - dependencies = [ - "winapi-util", - ] - - [[package]] - name = "test-case" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425" -+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" - dependencies = [ - "test-case-macros", - ] - - [[package]] - name = "test-case-core" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462" -+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" - dependencies = [ - "cfg-if", -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3124,11 +3121,10 @@ dependencies = [ - - [[package]] - name = "test-case-macros" --version = "3.2.1" -+version = "3.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257" -+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" - dependencies = [ -- "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -@@ -3137,9 +3133,19 @@ dependencies = [ - - [[package]] - name = "test-log" --version = "0.2.13" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" -+checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b" -+dependencies = [ -+ "env_logger", -+ "test-log-macros", -+] -+ -+[[package]] -+name = "test-log-macros" -+version = "0.2.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d" - dependencies = [ - "proc-macro2", - "quote", -@@ -3148,7 +3154,7 @@ dependencies = [ - - [[package]] - name = "tests" --version = "2.4.0-rc5" -+version = "2.4.0" - dependencies = [ - "assert_matches", - "cairo-felt", -@@ -3220,16 +3226,6 @@ dependencies = [ - "thiserror-impl-no-std", - ] - --[[package]] --name = "thread_local" --version = "1.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" --dependencies = [ -- "cfg-if", -- "once_cell", --] -- - [[package]] - name = "time" - version = "0.3.30" -@@ -3352,9 +3348,9 @@ dependencies = [ - - [[package]] - name = "toml_edit" --version = "0.19.15" -+version = "0.20.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" - dependencies = [ - "indexmap 2.1.0", - "toml_datetime", -@@ -3473,18 +3469,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - - [[package]] - name = "unescaper" --version = "0.1.2" -+version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a96a44ae11e25afb520af4534fd7b0bd8cd613e35a78def813b8cf41631fa3c8" -+checksum = "d8f0f68e58d297ba8b22b8b5a96a87b863ba6bb46aaf51e19a4b02c5a6dd5b7f" - dependencies = [ - "thiserror", - ] - - [[package]] - name = "unicode-bidi" --version = "0.3.13" -+version = "0.3.14" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -+checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - - [[package]] - name = "unicode-ident" -@@ -3521,9 +3517,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - - [[package]] - name = "url" --version = "2.4.1" -+version = "2.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" - dependencies = [ - "form_urlencoded", - "idna", -@@ -3561,9 +3557,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - - [[package]] - name = "wasm-bindgen" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -+checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" - dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -@@ -3571,9 +3567,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-backend" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -+checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" - dependencies = [ - "bumpalo", - "log", -@@ -3586,9 +3582,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -+checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" - dependencies = [ - "quote", - "wasm-bindgen-macro-support", -@@ -3596,9 +3592,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-macro-support" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -+checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" - dependencies = [ - "proc-macro2", - "quote", -@@ -3609,9 +3605,9 @@ dependencies = [ - - [[package]] - name = "wasm-bindgen-shared" --version = "0.2.88" -+version = "0.2.89" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" -+checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - - [[package]] - name = "winapi" -@@ -3662,6 +3658,15 @@ dependencies = [ - "windows-targets 0.48.5", - ] - -+[[package]] -+name = "windows-sys" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -+dependencies = [ -+ "windows-targets 0.52.0", -+] -+ - [[package]] - name = "windows-targets" - version = "0.42.2" -@@ -3692,6 +3697,21 @@ dependencies = [ - "windows_x86_64_msvc 0.48.5", - ] - -+[[package]] -+name = "windows-targets" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -+dependencies = [ -+ "windows_aarch64_gnullvm 0.52.0", -+ "windows_aarch64_msvc 0.52.0", -+ "windows_i686_gnu 0.52.0", -+ "windows_i686_msvc 0.52.0", -+ "windows_x86_64_gnu 0.52.0", -+ "windows_x86_64_gnullvm 0.52.0", -+ "windows_x86_64_msvc 0.52.0", -+] -+ - [[package]] - name = "windows_aarch64_gnullvm" - version = "0.42.2" -@@ -3704,6 +3724,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -+[[package]] -+name = "windows_aarch64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" -+ - [[package]] - name = "windows_aarch64_msvc" - version = "0.42.2" -@@ -3716,6 +3742,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -+[[package]] -+name = "windows_aarch64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" -+ - [[package]] - name = "windows_i686_gnu" - version = "0.42.2" -@@ -3728,6 +3760,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -+[[package]] -+name = "windows_i686_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" -+ - [[package]] - name = "windows_i686_msvc" - version = "0.42.2" -@@ -3740,6 +3778,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -+[[package]] -+name = "windows_i686_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" -+ - [[package]] - name = "windows_x86_64_gnu" - version = "0.42.2" -@@ -3752,6 +3796,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -+[[package]] -+name = "windows_x86_64_gnu" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" -+ - [[package]] - name = "windows_x86_64_gnullvm" - version = "0.42.2" -@@ -3764,6 +3814,12 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -+[[package]] -+name = "windows_x86_64_gnullvm" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" -+ - [[package]] - name = "windows_x86_64_msvc" - version = "0.42.2" -@@ -3776,11 +3832,17 @@ version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -+[[package]] -+name = "windows_x86_64_msvc" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -+ - [[package]] - name = "winnow" --version = "0.5.19" -+version = "0.5.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" -+checksum = "b67b5f0a4e7a27a64c651977932b9dc5667ca7fc31ac44b03ed37a0cf42fdfff" - dependencies = [ - "memchr", - ] -@@ -3817,18 +3879,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - - [[package]] - name = "zerocopy" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" -+checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" - dependencies = [ - "zerocopy-derive", - ] - - [[package]] - name = "zerocopy-derive" --version = "0.7.25" -+version = "0.7.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" -+checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" - dependencies = [ - "proc-macro2", - "quote", -@@ -3837,9 +3899,9 @@ dependencies = [ - - [[package]] - name = "zeroize" --version = "1.6.0" -+version = "1.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" -+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - dependencies = [ - "zeroize_derive", - ] --- -2.42.0 - diff --git a/pkgs/development/compilers/dotnet/record-downloaded-packages.patch b/pkgs/development/compilers/dotnet/record-downloaded-packages.patch deleted file mode 100644 index 4c5b45939d763..0000000000000 --- a/pkgs/development/compilers/dotnet/record-downloaded-packages.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001 -From: David McFarland <corngood@gmail.com> -Date: Sun, 31 Dec 2023 01:48:31 -0400 -Subject: [PATCH 2/2] record downloaded packages - ---- - .../buildBootstrapPreviouslySB.csproj | 6 +++++ - repo-projects/Directory.Build.targets | 27 +++++++++++++++++++ - 2 files changed, 33 insertions(+) - -diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -index d85e32ca76..280c9eaf89 100644 ---- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj -+++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj -@@ -102,6 +102,12 @@ - </ItemGroup> - </Target> - -+ <Target Name="NuGetToNix" AfterTargets="Restore"> -+ <Exec -+ Command="nuget-to-nix $(RestorePackagesPath) >$(ArchiveDir)deps.nix 2>&1" -+ WorkingDirectory="$(MSBuildProjectDirectory)"/> -+ </Target> -+ - <Target Name="BuildBoostrapPreviouslySourceBuilt" - AfterTargets="Restore" - DependsOnTargets="GetPackagesToDownload"> -diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets -index 3fa15da862..afd7b87088 100644 ---- a/repo-projects/Directory.Build.targets -+++ b/repo-projects/Directory.Build.targets -@@ -471,6 +497,7 @@ - <ItemGroup> - <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" /> - <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" /> -+ <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/deps.nix" /> - <ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" /> - </ItemGroup> - <MakeDir Directories="$(BuildLogsDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/> --- -2.40.1 - diff --git a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch b/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch deleted file mode 100644 index 9edf6efa85176..0000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks-1.16.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index d8fd91f1fe..8bc08e6fed 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if semver.Compare(index.goVersionV, "v1.14") < 0 { -+ if semver.Compare(index.goVersionV, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch b/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch deleted file mode 100644 index 3b507bf26d775..0000000000000 --- a/pkgs/development/compilers/julia/patches/1.9/0001-skip-building-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ce73c82ebadeb2e358e1a8e244eef723ffa96c76 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 20 Sep 2022 18:42:31 +0800 -Subject: [PATCH 1/2] skip building doc - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 94df626014..418f6ff268 100644 ---- a/Makefile -+++ b/Makefile -@@ -229,7 +229,7 @@ define stringreplace - endef - - --install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html -+install: $(build_depsbindir)/stringreplace - ifeq ($(BUNDLE_DEBUG_LIBS),1) - @$(MAKE) $(QUIET_MAKE) all - else --- -2.38.1 - diff --git a/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch b/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch deleted file mode 100644 index 93504316edf30..0000000000000 --- a/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 37ec73468570..b73e75aa6e59 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -370,8 +370,8 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - #endif - - SmallString<1024> Plugin; -- llvm::sys::path::native(Twine(ToolChain.getDriver().Dir) + -- "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" + -+ llvm::sys::path::native(Twine("@libllvmLibdir@" -+ "/LLVMgold") + - Suffix, - Plugin); - CmdArgs.push_back(Args.MakeArgString(Plugin)); diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch b/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch deleted file mode 100644 index 890230cc14ee9..0000000000000 --- a/pkgs/development/compilers/llvm/common/compiler-rt/libsanitizer-no-cyclades-11.patch +++ /dev/null @@ -1,80 +0,0 @@ -https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.patch -https://reviews.llvm.org/D102059 ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ static void ioctl_table_fill() { - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> - #include <linux/lp.h> -@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz; - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch b/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch deleted file mode 100644 index 787f3e16500e2..0000000000000 --- a/pkgs/development/compilers/llvm/common/libcxxabi/no-threads.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4138acf..41b4763 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) - " is also set to ON.") - endif() - add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) -+ add_definitions(-D_LIBCPP_HAS_NO_THREADS) - endif() - - if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch b/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch deleted file mode 100644 index cd344f0cbd193..0000000000000 --- a/pkgs/development/compilers/sbcl/fix-2.4.0-aarch64-darwin.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aed233638604b46c9a0c51e08d096d47303375ca Mon Sep 17 00:00:00 2001 -From: Douglas Katzman <dougk@google.com> -Date: Tue, 2 Jan 2024 09:20:48 -0500 -Subject: [PATCH] Fix multiple def error - -reported by Hraban Luyat ---- - src/runtime/gc-common.c | 1 + - src/runtime/gc.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c -index 51963b8ff..07536f628 100644 ---- a/src/runtime/gc-common.c -+++ b/src/runtime/gc-common.c -@@ -2999,6 +2999,7 @@ void recompute_gen_bytes_allocated() { - #endif - - #ifdef LISP_FEATURE_DARWIN_JIT -+_Atomic(char) *page_execp; - #include "sys_mmap.inc" - #include <errno.h> - /* darwin-jit has another reason to remap besides just zeroing, namely, -diff --git a/src/runtime/gc.h b/src/runtime/gc.h -index 804e6fce2..5fdc215c2 100644 ---- a/src/runtime/gc.h -+++ b/src/runtime/gc.h -@@ -151,7 +151,7 @@ extern void prepare_pages(bool commit, page_index_t start, page_index_t end, - * squeeze a bit into the 'type' field of the page table, but it's clearer to - * have this externally so that page type 0 remains as "free" */ - #ifdef LISP_FEATURE_DARWIN_JIT --_Atomic(char) *page_execp; -+extern _Atomic(char) *page_execp; - static inline void set_page_executable(page_index_t i, bool val) { page_execp[i] = val; } - #endif - --- -2.42.0 - diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch b/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37c81..0000000000000 --- a/pkgs/development/compilers/swift/sourcekit-lsp/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev <paveloom@riseup.net> -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch b/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch deleted file mode 100644 index 0f886a8a63a57..0000000000000 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt -index 3f68e6dd..822de4e5 100644 ---- a/avogadro/qtplugins/templatetool/CMakeLists.txt -+++ b/avogadro/qtplugins/templatetool/CMakeLists.txt -@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool - ) - - # Install the fragments --set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments") -+set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments") - - # Look in parallel directory for the molecule fragment repository - if(NOT EXISTS "${_fragments}") diff --git a/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch b/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch deleted file mode 100644 index 614a41f0a9785..0000000000000 --- a/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py -index db55958..c27b81f 100644 ---- a/eventlet/hubs/hub.py -+++ b/eventlet/hubs/hub.py -@@ -21,7 +21,7 @@ else: - - import eventlet.hubs - from eventlet.hubs import timer --from eventlet.support import greenlets as greenlet, clear_sys_exc_info -+from eventlet.support import greenlets as greenlet - try: - from monotonic import monotonic - except ImportError: -@@ -309,7 +309,6 @@ class BaseHub(object): - cur.parent = self.greenlet - except ValueError: - pass # gets raised if there is a greenlet parent cycle -- clear_sys_exc_info() - return self.greenlet.switch() - - def squelch_exception(self, fileno, exc_info): -@@ -397,13 +396,11 @@ class BaseHub(object): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def squelch_timer_exception(self, timer, exc_info): - if self.debug_exceptions: - traceback.print_exception(*exc_info) - sys.stderr.flush() -- clear_sys_exc_info() - - def add_timer(self, timer): - scheduled_time = self.clock() + timer.seconds -@@ -478,7 +475,6 @@ class BaseHub(object): - raise - except: - self.squelch_timer_exception(timer, sys.exc_info()) -- clear_sys_exc_info() - - # for debugging: - -diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py -index bad4a87..8438805 100644 ---- a/eventlet/hubs/kqueue.py -+++ b/eventlet/hubs/kqueue.py -@@ -109,4 +109,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py -index 1bbd401..d3f9c6a 100644 ---- a/eventlet/hubs/poll.py -+++ b/eventlet/hubs/poll.py -@@ -113,7 +113,6 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() - - if self.debug_blocking: - self.block_detect_post() -diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py -index 0ead5b8..0386a1e 100644 ---- a/eventlet/hubs/selects.py -+++ b/eventlet/hubs/selects.py -@@ -61,4 +61,3 @@ class Hub(hub.BaseHub): - raise - except: - self.squelch_exception(fileno, sys.exc_info()) -- support.clear_sys_exc_info() -diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py -index 43bac91..b1c1607 100644 ---- a/eventlet/support/__init__.py -+++ b/eventlet/support/__init__.py -@@ -30,15 +30,6 @@ def get_errno(exc): - return None - - --if sys.version_info[0] < 3 and not greenlets.preserves_excinfo: -- from sys import exc_clear as clear_sys_exc_info --else: -- def clear_sys_exc_info(): -- """No-op In py3k. -- Exception information is not visible outside of except statements. -- sys.exc_clear became obsolete and removed.""" -- pass -- - if sys.version_info[0] < 3: - def bytes_to_str(b, encoding='ascii'): - return b -diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py -index d4e1793..b939328 100644 ---- a/eventlet/support/greenlets.py -+++ b/eventlet/support/greenlets.py -@@ -1,8 +1,4 @@ --import distutils.version -- - import greenlet - getcurrent = greenlet.greenlet.getcurrent - GreenletExit = greenlet.greenlet.GreenletExit --preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) -- >= distutils.version.LooseVersion('0.3.2')) - greenlet = greenlet.greenlet -diff --git a/setup.py b/setup.py -index a8f4684..9b927e0 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,7 +19,7 @@ setuptools.setup( - packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']), - install_requires=( - 'dnspython >= 1.15.0', -- 'greenlet >= 0.3', -+ 'greenlet >= 1.0', - 'monotonic >= 1.4;python_version<"3.5"', - 'six >= 1.10.0', - ), -diff --git a/tests/hub_test.py b/tests/hub_test.py -index a531b75..05c0024 100644 ---- a/tests/hub_test.py -+++ b/tests/hub_test.py -@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase): - - class TestExceptionInGreenthread(tests.LimitedTestCase): - -- @skip_unless(greenlets.preserves_excinfo) - def test_exceptionpreservation(self): - # events for controlling execution order - gt1event = eventlet.Event() -diff --git a/tests/test__refcount.py b/tests/test__refcount.py -index 1090a1f..5c1c002 100644 ---- a/tests/test__refcount.py -+++ b/tests/test__refcount.py -@@ -57,7 +57,6 @@ def run_interaction(run_client): - - def run_and_check(run_client): - w = run_interaction(run_client=run_client) -- # clear_sys_exc_info() - gc.collect() - fd = w() - print('run_and_check: weakref fd:', fd) diff --git a/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch b/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch deleted file mode 100644 index b9bc53e0b84df..0000000000000 --- a/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001 -From: Ralf Gommers <ralf.gommers@gmail.com> -Date: Thu, 26 Oct 2023 16:57:03 +0200 -Subject: [PATCH] BLD: remove last usage of `distutils` in - `_core/code_generators/` - ---- - numpy/core/code_generators/genapi.py | 9 --------- - numpy/core/code_generators/generate_numpy_api.py | 7 +------ - numpy/core/code_generators/generate_ufunc_api.py | 7 +------ - 3 files changed, 2 insertions(+), 21 deletions(-) - -diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py -index 2cdaba52d..d9d7862b2 100644 ---- a/numpy/core/code_generators/genapi.py -+++ b/numpy/core/code_generators/genapi.py -@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'): - fo.close() - return functions - --def should_rebuild(targets, source_files): -- from distutils.dep_util import newer_group -- for t in targets: -- if not os.path.exists(t): -- return True -- sources = API_FILES + list(source_files) + [__file__] -- if newer_group(sources, targets[0], missing='newer'): -- return True -- return False - - def write_file(filename, data): - """ -diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py -index ae38c4efc..640bae9e5 100644 ---- a/numpy/core/code_generators/generate_numpy_api.py -+++ b/numpy/core/code_generators/generate_numpy_api.py -@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = numpy_api.multiarray_api -- -- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): -diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py -index e03299a52..3734cbd6a 100644 ---- a/numpy/core/code_generators/generate_ufunc_api.py -+++ b/numpy/core/code_generators/generate_ufunc_api.py -@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False): - targets = (h_file, c_file) - - sources = ['ufunc_api_order.txt'] -- -- if (not force and not genapi.should_rebuild(targets, sources + [__file__])): -- return targets -- else: -- do_generate_api(targets, sources) -- -+ do_generate_api(targets, sources) - return targets - - def do_generate_api(targets, sources): --- -2.42.0 - diff --git a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch b/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch deleted file mode 100644 index e21b53b3cc536..0000000000000 --- a/pkgs/games/doom-ports/doomseeker/qt_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -r c2c7f37b1afb src/core/gui/irc/ircdock.cpp ---- a/src/core/gui/irc/ircdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/irc/ircdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -32,6 +32,7 @@ - #include <QInputDialog> - #include <QMessageBox> - #include <QToolBar> -+#include <QTabBar> - - DClass<IRCDock> : public Ui::IRCDock - { -diff -r c2c7f37b1afb src/core/gui/logdock.cpp ---- a/src/core/gui/logdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/logdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,8 @@ - // Copyright (C) 2009 "Zalewa" <zalewapl@gmail.com> - //------------------------------------------------------------------------------ - -+#include <QAction> -+ - #include "clipboard.h" - #include "logdock.h" - #include "log.h" -diff -r c2c7f37b1afb src/core/gui/serverdetailsdock.cpp ---- a/src/core/gui/serverdetailsdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverdetailsdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -21,6 +21,7 @@ - // Copyright (C) 2014 Braden "Blzut3" Obrzut <admin@maniacsvault.net> - //------------------------------------------------------------------------------ - -+#include <QAction> - #include <QBoxLayout> - - #include "serverdetailsdock.h" -diff -r c2c7f37b1afb src/core/gui/serverfilterdock.cpp ---- a/src/core/gui/serverfilterdock.cpp Tue Mar 06 00:14:23 2018 +0100 -+++ b/src/core/gui/serverfilterdock.cpp Sat Jul 28 16:53:04 2018 -0700 -@@ -20,6 +20,9 @@ - //------------------------------------------------------------------------------ - // Copyright (C) 2011 "Zalewa" <zalewapl@gmail.com> - //------------------------------------------------------------------------------ -+ -+#include <QAction> -+ - #include "serverfilterdock.h" - #include "ui_serverfilterdock.h" - diff --git a/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch b/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch deleted file mode 100644 index fd40d27ca8b5a..0000000000000 --- a/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb -index 3fee4259af9..53cc3107f46 100644 ---- a/lib/discourse_js_processor.rb -+++ b/lib/discourse_js_processor.rb -@@ -111,8 +111,6 @@ class DiscourseJsProcessor - - def self.generate_js_processor - Discourse::Utils.execute_command( -- "yarn", -- "--silent", - "esbuild", - "--log-level=warning", - "--bundle", diff --git a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch b/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch deleted file mode 100644 index 30493b543e38c..0000000000000 --- a/pkgs/servers/web-apps/discourse/use_mv_instead_of_rename.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/discourse.rb b/lib/discourse.rb -index ea2a3cbafd..66454d9157 100644 ---- a/lib/discourse.rb -+++ b/lib/discourse.rb -@@ -62,7 +62,7 @@ module Discourse - fd.fsync() - end - -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end -@@ -76,7 +76,7 @@ module Discourse - FileUtils.mkdir_p(File.join(Rails.root, 'tmp')) - temp_destination = File.join(Rails.root, 'tmp', SecureRandom.hex) - execute_command('ln', '-s', source, temp_destination) -- File.rename(temp_destination, destination) -+ FileUtils.mv(temp_destination, destination) - - nil - end diff --git a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch b/pkgs/tools/admin/gam/signal_files_as_env_vars.patch deleted file mode 100644 index 640a416d8a3ab..0000000000000 --- a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/gam/__init__.py b/gam/__init__.py -index 1c187ce..b2de793 100755 ---- a/gam/__init__.py -+++ b/gam/__init__.py -@@ -549,22 +549,16 @@ def SetGlobalVariables(): - _getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION') - _getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION') - _getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE') -- _getOldSignalFile(GC_DEBUG_LEVEL, -- 'debug.gam', -- filePresentValue=4, -- fileAbsentValue=0) -- _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt') -- _getOldSignalFile(GC_NO_TDEMAIL, 'notdemail.txt') -- _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt') -+ _getOldEnvVar(GC_DEBUG_LEVEL, 'GAM_DEBUG') -+ _getOldEnvVar(GC_NO_BROWSER, 'GAM_NO_BROWSER') -+ _getOldEnvVar(GC_NO_TDEMAIL, 'GAM_NO_TDEMAIL') -+ _getOldEnvVar(GC_OAUTH_BROWSER, 'GAM_OAUTH_BROWSER') - # _getOldSignalFile(GC_NO_CACHE, u'nocache.txt') - # _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True) -- _getOldSignalFile(GC_NO_CACHE, -- 'allcache.txt', -- filePresentValue=False, -- fileAbsentValue=True) -- _getOldSignalFile(GC_NO_SHORT_URLS, 'noshorturls.txt') -- _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt') -- _getOldSignalFile(GC_ENABLE_DASA, FN_ENABLEDASA_TXT) -+ _getOldEnvVar(GC_NO_CACHE, 'GAM_NO_CACHE') -+ _getOldEnvVar(GC_NO_SHORT_URLS, 'GAM_NO_SHORT_URLS') -+ GC_Defaults[GC_NO_UPDATE_CHECK] = True -+ _getOldEnvVar(GC_ENABLE_DASA, FN_ENABLEDASA_TXT) - # Assign directories first - for itemName in GC_VAR_INFO: - if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY: --- -2.36.0 - |