diff options
Diffstat (limited to 'pkgs')
35 files changed, 324 insertions, 134 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 010c0c89d5382..179d90c7199b9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3348,12 +3348,12 @@ final: prev: fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; - version = "2023-11-09"; + version = "2023-11-20"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "2f7c08f45639a64a5c0abcf67321d52c3f499ae6"; - sha256 = "0x4vbqbpzsw1pkqnm6l8hymm35vnfpl5vdaa91g6890q9q57csgh"; + rev = "a1493d94ecb3464ab3ae4d5855765310566dace4"; + sha256 = "sha256-701UBfmtSH/XyEq80EfoGlukLpAVdwRGHpIs4AcVGSY="; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2ecd1bdb171a2..4f7d3b2396338 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -278,7 +278,7 @@ https://github.com/freddiehaddad/feline.nvim/,, https://github.com/bakpakin/fennel.vim/,, https://github.com/lambdalisue/fern.vim/,, https://github.com/wincent/ferret/,, -https://github.com/j-hui/fidget.nvim/,legacy, +https://github.com/j-hui/fidget.nvim/,, https://github.com/bogado/file-line/,, https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index ef9be284b59d6..d8b81ce8bebcf 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.120.3"; + version = "0.120.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-96ikGGKw9IN/ch199oFcucp8aVR+fEiAWBeu39J2Osw="; + hash = "sha256-eBDlX+3Gb4bWRJ0ITwlx1c3q1RCFK2tyuKn9SALHbhI="; }; vendorHash = "sha256-kUKnoUQzLbi0ssxvK2viNTHLtqx8vaHLYXO8ZWU2rmw="; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 792d5c93a9e55..ae0ba30d559bc 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.18"; + version = "3.10.1"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-Wxi6+6c/PK990YCoFKBMxJbYgMkS9y46hNIlkVhjbA4="; + hash = "sha256-4r+PADMUpyvWNvA7MSgjx1VcCJKrYJLyvEn9esZKCRw="; }; postPatch = '' diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 154906bf2eea7..435a3e1060f3b 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.90.2"; + version = "1.92.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-VEO9LV6hzEd4IDnSPE5H0CDlwgRFEg4cheDx/RUGQug="; + hash = "sha256-yeKI8vOuYFhABz09awPuCmjrifLttvBq1kaxMf78/HI="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-R713WhFrWT7Cgstk3SLuvvyk3/ZtT1LOH0qqmFcWzKw="; + vendorHash = "sha256-odtCBLg04gG1ztyDLdBADhdEhMkrizNjOGymAtzXy9g="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 26a4352035828..6dfa848c7b880 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "3.7.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "sha256-k3U8ICnwMbR6vN+gELWytI2Etri5lvbE6AX6lUpr7dQ="; + sha256 = "sha256-2mO2ZMDxZ7sx2EVTN0tsAv8MisGxlK/1h61N+hOqyGI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index d4d8f0c3e0b8c..b7577888df23a 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "55"; + version = "56"; outputs = [ "out" "installedTests" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - hash = "sha256-n6NbNgl+2FOhly/BeR7I6BvPOYe7leAdeAegaqhcGJU="; + hash = "sha256-V2L65Fz1WcJE2ENE8uNgIuVSXLDHokcgM4Caz1sOdZM="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch index 894f5e0197bed..7fe5e33fa6ad7 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch @@ -11,29 +11,37 @@ index 3fb887c3..e8cbe1bd 100644 Terminal=false NoDisplay=true Icon=org.gnome.Shell.Extensions.GSConnect +diff --git a/src/__nix-prepend-search-paths.js b/src/__nix-prepend-search-paths.js +new file mode 100644 +index 00000000..d009dfd9 +--- /dev/null ++++ b/src/__nix-prepend-search-paths.js +@@ -0,0 +1,2 @@ ++import GIRepository from 'gi://GIRepository'; ++'@typelibPath@'.split(':').forEach(path => GIRepository.Repository.prepend_search_path(path)); diff --git a/src/extension.js b/src/extension.js -index 3fae443a..7aa19842 100644 +index 53ecd5fc..78782357 100644 --- a/src/extension.js +++ b/src/extension.js -@@ -4,6 +4,8 @@ +@@ -2,6 +2,8 @@ + // + // SPDX-License-Identifier: GPL-2.0-or-later - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++import './__nix-prepend-search-paths.js'; + - const Gio = imports.gi.Gio; - const GObject = imports.gi.GObject; - const Gtk = imports.gi.Gtk; + import Gio from 'gi://Gio'; + import GObject from 'gi://GObject'; + diff --git a/src/prefs.js b/src/prefs.js -index b8860c82..d6292606 100644 +index dd20fd20..5f82c53a 100644 --- a/src/prefs.js +++ b/src/prefs.js -@@ -4,6 +4,8 @@ +@@ -2,6 +2,8 @@ + // + // SPDX-License-Identifier: GPL-2.0-or-later - 'use strict'; - -+'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); ++import './__nix-prepend-search-paths.js'; + - const {Gio, GLib, Adw} = imports.gi; - - // Bootstrap + import Gio from 'gi://Gio'; + import GLib from 'gi://GLib'; + import Adw from 'gi://Adw'; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 0f5a330faa183..738ecc81a1561 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -18,25 +18,59 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "halide"; - version = "15.0.1"; + version = "16.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; rev = "v${version}"; - sha256 = "sha256-mnZ6QMqDr48bH2W+andGZj2EhajXKApjuW6B50xtzx0="; + sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8="; }; + postPatch = '' + # See https://github.com/halide/Halide/issues/7785 + substituteInPlace 'src/runtime/HalideRuntime.h' \ + --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \ + '#if defined(__x86_64__) || defined(__i386__) + #define HALIDE_CPP_COMPILER_HAS_FLOAT16' + '' + # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it. + # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether + # ::aligned_alloc is available. For us, it isn't. + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace 'src/runtime/HalideBuffer.h' \ + --replace '#ifdef __APPLE__ + #include <AvailabilityVersions.h> + #include <TargetConditionals.h> + #endif' \ + ' ' \ + --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \ + '1' \ + --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \ + '0' + ''; + cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" # Disable performance tests since they may fail on busy machines "-DWITH_TEST_PERFORMANCE=OFF" + # Disable fuzzing tests -- this has become the default upstream after the + # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba) + # These tests also fail to compile on Darwin because of some missing command line options... + "-DWITH_TEST_FUZZ=OFF" ]; doCheck = true; + # Note: disable mullapudi2016_fibonacci because it requires too much + # parallelism for remote builders + preCheck = '' + checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'") + ''; + # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 4b4172897e080..4adcf8ab0a3b7 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -308,7 +308,7 @@ qtModule { meta = with lib; { description = "A web engine based on the Chromium web browser"; - platforms = platforms.unix; + platforms = [ "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7a-linux" "armv7l-linux" "x86_64-linux" ]; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 6589fc0b9b648..c07250c660a33 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -6,11 +6,15 @@ , python3 , blas , lapack +, mpiSupport ? true , mpi # generic mpi dependency , openssh # required for openmpi tests -, petsc-withp4est ? true +, petsc-withp4est ? false , p4est , zlib # propagated by p4est but required by petsc +, petsc-optimized ? false +, petsc-scalar-type ? "real" +, petsc-precision ? "double" }: # This version of PETSc does not support a non-MPI p4est build @@ -18,14 +22,14 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.19.2"; + version = "3.19.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-EU82P3ebsWg5slwOcPiwrg2UfVDnL3xs3csRsAEHmxY="; + sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY="; }; - mpiSupport = !withp4est || p4est.mpiSupport; + inherit mpiSupport; withp4est = petsc-withp4est; strictDeps = true; @@ -49,7 +53,6 @@ stdenv.mkDerivation rec { patches = [ ./filter_mpi_warnings.patch ]; preConfigure = '' - export FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran" patchShebangs ./lib/petsc/bin configureFlagsArray=( $configureFlagsArray @@ -68,6 +71,14 @@ stdenv.mkDerivation rec { ''} "--with-blas=1" "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + ${lib.optionalString petsc-optimized '' + "--with-debugging=0" + COPTFLAGS='-g -O3' + FOPTFLAGS='-g -O3' + CXXOPTFLAGS='-g -O3' + ''} ) ''; diff --git a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch b/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch index 590528446f611..6a3c7bee051e6 100644 --- a/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch +++ b/pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch @@ -6,7 +6,7 @@ index 168febb34b6..71068469066 100644 # these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed testex5f: ex5f.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \ if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \ echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \ else \ @@ -14,7 +14,7 @@ index 168febb34b6..71068469066 100644 ${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm; testex19: ex19.PETSc -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \ else \ @@ -22,7 +22,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp; testex19_mpi: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \ else \ @@ -30,7 +30,7 @@ index 168febb34b6..71068469066 100644 #use unpreconditioned norm because HYPRE device installations use different AMG parameters runex19_hypre: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \ else \ @@ -38,7 +38,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_cuda: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \ else \ @@ -46,7 +46,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_hypre_hip: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \ else \ @@ -54,7 +54,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_cuda: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \ else \ @@ -62,7 +62,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_ml: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \ else \ @@ -70,7 +70,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex19_fieldsplit_mumps: -@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \ if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \ else \ @@ -78,7 +78,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_6.tmp runex19_superlu_dist: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \ if (${DIFF} output/ex19_superlu.out ex19.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \ else \ @@ -86,7 +86,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19.tmp runex19_suitesparse: -@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \ if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \ else \ @@ -94,7 +94,7 @@ index 168febb34b6..71068469066 100644 ${RM} -f ex19_1.tmp runex3k_kokkos: ex3k.PETSc -@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\ -+ sed -i '/\[hwloc\/linux\]/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ ++ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \ if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \ echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \ else \ diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix new file mode 100644 index 0000000000000..dc5b34aad95ec --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, python3, ...}: + +python3.pkgs.buildPythonPackage rec { + pname = "aiohttp_client_cache"; + version = "0.10.0"; + pyproject = true; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-FXU4QNqa8B8ZADmoEyJfd8gsUDI0HEjIR9B2CBP55wU="; + }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + attrs + itsdangerous + url-normalize + ]; + meta = with lib; { + description = "An async persistent cache for aiohttp requests"; + homepage = "https://pypi.org/project/aiohttp-client-cache/"; + license = licenses.mit; + maintainers = with maintainers; [ seirl ]; + }; +} diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 04cff63317d13..c72c54ffbdced 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "27.0.0"; + version = "28.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM="; + hash = "sha256-tVYFpEUV9v0OOk3CK/oPRA8+fhYl668Gqz6wa/NabNs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch b/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch new file mode 100644 index 0000000000000..15548b7aec1ca --- /dev/null +++ b/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch @@ -0,0 +1,42 @@ +From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001 +From: tali auster <taliauster@gmail.com> +Date: Wed, 15 Nov 2023 12:15:34 -0700 +Subject: [PATCH] use distro over ld + +The `ld` module (linux distribution) was renamed to `distro`, presumably +so as not to subsume binutils name. + +--- + setup.py | 2 +- + src/e3/os/platform.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index c32f46f..de1ada6 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"): + platform_string = ":sys_platform=='%s'" % p + extras_require[platform_string] = ["psutil"] + if p in ("linux", "linux2"): +- extras_require[platform_string].append("ld") ++ extras_require[platform_string].append("distro") + + # Get e3 version from the VERSION file. + version_file = os.path.join(os.path.dirname(__file__), "VERSION") +diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py +index 2d4e174..a9d12d3 100644 +--- a/src/e3/os/platform.py ++++ b/src/e3/os/platform.py +@@ -78,7 +78,7 @@ class SystemInfo: + + # Fetch linux distribution info on linux OS + if cls.uname.system == "Linux": # linux-only +- import ld ++ import distro as ld + + cls.ld_info = { + "name": ld.name(), +-- +2.40.1 + diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix new file mode 100644 index 0000000000000..95759b6a096c0 --- /dev/null +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -0,0 +1,65 @@ +{ buildPythonPackage +, colorama +, coverage +, distro +, fetchFromGitHub +, httpretty +, lib +, mock +, psutil +, pytest +, pytest-socket +, python-dateutil +, pyyaml +, requests +, requests-toolbelt +, stdenv +, setuptools +, stevedore +, tomlkit +, tox +, tqdm +, typeguard +}: + +buildPythonPackage rec { + pname = "e3-core"; + version = "22.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "e3-core"; + rev = "v${version}"; + hash = "sha256-4StHOJldfeqApdF6D14Euzg9HvZ2e7G4/OQ0UrEbEIw="; + }; + + patches = [ ./0001-use-distro-over-ld.patch ]; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + colorama pyyaml python-dateutil requests requests-toolbelt tqdm stevedore + ] ++ lib.optional stdenv.isLinux [ + # See setup.py:24. These are required only on Linux. Darwin has its own set + # of requirements. + psutil distro + ]; + + pythonImportsCheck = [ "e3" ]; + + # e3-core is tested with tox; it's hard to test without internet. + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/AdaCore/e3-core/releases/tag/${src.rev}"; + homepage = "https://github.com/AdaCore/e3-core/"; + description = "Core framework for developing portable automated build systems"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ atalii ]; + mainProgram = "e3"; + # See the comment regarding distro and psutil. Other platforms are supported + # upstream, but not by this package. + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 51653781c57d3..ca06ac2abfd77 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "humanize"; - version = "4.8.0"; + version = "4.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "python-humanize"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bKTzygQtZ/0UB+zM9735a/xwH4KaoU6C8kUGurbHs2Y="; + hash = "sha256-sLlgR6c65RmUNZdH2pHuxzo7dm71uUZXGqzcqyxCrk4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 7d22c167a356d..9d31fa9e93eed 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -9,6 +9,7 @@ , lzip , zpaq , gnutar +, unar # Free alternative to unrar , gnugrep , diffutils , file @@ -17,13 +18,11 @@ , xz }: -# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar) -# it will still use unrar if present in the path - let compression-utilities = [ p7zip gnutar + unar cabextract zip lzip @@ -38,7 +37,7 @@ let in buildPythonPackage rec { pname = "patool"; - version = "1.12"; + version = "2.0.0"; format = "setuptools"; #pypi doesn't have test data @@ -46,24 +45,9 @@ buildPythonPackage rec { owner = "wummel"; repo = pname; rev = "upstream/${version}"; - hash = "sha256-Xv4aCUnLi+b1T29tuKRADTIWwK2dO8iDP/D7UfU5mWw="; + hash = "sha256-Hjpifsi5Q1eoe/MFWuQBDyjoXi/aUG4VN84yNMkAZaE="; }; - patches = [ - # https://github.com/wummel/patool/pull/63 - (fetchpatch { - name = "apk-sometimes-has-mime-jar.patch"; - url = "https://github.com/wummel/patool/commit/a9f3ee3d639a1065be024001e89c0b153511b16b.patch"; - hash = "sha256-a4aWqHHc/cBs5T2QKZ08ky1K1tqKZEgqVmTmV11aTVE="; - }) - # https://github.com/wummel/patool/pull/130 - (fetchpatch { - name = "apk-sometimes-has-mime-android-package.patch"; - url = "https://github.com/wummel/patool/commit/e8a1eea1d273b278a1b6f5029d2e21cb18bc9ffd.patch"; - hash = "sha256-AVooVdU4FNIixUfwyrn39N2SDFHNs4CUYzS5Eey+DrU="; - }) - ]; - postPatch = '' substituteInPlace patoolib/util.py \ --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index a31f44b3ad681..c45d8394fa85a 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.23.0"; + version = "3.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk="; + hash = "sha256-jvLzZFlR2msyCc9C7WvYpXIGoKCDRxJI5lgNUtbGh/w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 36e453b9f7e61..784144909a368 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -41,8 +41,8 @@ buildRubyGem rec { The output is then usable by the bundlerEnv derivation to list all the dependencies of a ruby package. ''; - homepage = "https://github.com/manveru/bundix"; - license = "MIT"; + homepage = "https://github.com/nix-community/bundix"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ manveru marsam zimbatm ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 13a70a9f5131c..032d7d722c2ee 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jxhFBfz5CWycEXx86jL9inlP8nxNK7vbVn2U8EzQ7QA="; + hash = "sha256-yTCeltueOxGkOin6Cq6RzY7YNmHMz64wza8e0Pwr36E="; }; - vendorHash = "sha256-C2YXjfn3Pk0kL4G/cHsmr2VHUYGO+3s3eSiWVJZ2dX8="; + vendorHash = "sha256-BnfWivu7xRmgDQgPIkjF48dOpU7hkw+Qkvb11eASDEk="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 999ae8b5ebab8..3b20c948cb5fe 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.30.2"; + version = "0.31.0"; src = fetchCrate { inherit pname version; - hash = "sha256-nZ9c4Rog7dvlsnu4y33Yp+PJzwvBKvwyxF4V5UeJCVE="; + hash = "sha256-Ifi7KWq2jCSUvriKIVQ67a7Ow4aHriM2AjH6kW7+PGs="; }; - cargoHash = "sha256-wVv46yYlKsyxk+2eXwsd0jMC64Xk5+Krp18B2pKo0mo="; + cargoHash = "sha256-+aK+Uv0gDmCxvR4VqVM+nvoSJkldD1hE10QC3B25r0Y="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 92bd7e0bee5bb..444fcebe38fa9 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -141,7 +141,6 @@ in { platform = "rk3328"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; - platformCanUseHDCPBlob = true; }; armTrustedFirmwareRK3399 = buildArmTrustedFirmware rec { diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix index 6522924a31398..f7168d6d116dc 100644 --- a/pkgs/misc/jitsi-meet-prosody/default.nix +++ b/pkgs/misc/jitsi-meet-prosody/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-prosody"; - version = "1.0.7531"; + version = "1.0.7629"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "ppRjUhx/VBkbFNhQunaUfOnwckOqJRQUTVMhKYZ0StU="; + sha256 = "4D/E/TS1tyIoTOQ23LctBFbUyvFvsrr2ivvfEbMbAfc="; }; dontBuild = true; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 54a5f6be0920a..6f32434afaace 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -497,32 +497,28 @@ in { filesToInstall = ["u-boot.bin"]; }; - ubootRock64 = let - rkbin = fetchFromGitHub { - owner = "ayufan-rock64"; - repo = "rkbin"; - rev = "f79a708978232a2b6b06c2e4173c5314559e0d3a"; - sha256 = "0h7xm4ck3p3380c6bqm5ixrkxwcx6z5vysqdwvfa7gcqx5d6x5zz"; - }; - in buildUBoot { + ubootRock64 = buildUBoot { defconfig = "rock64-rk3328_defconfig"; - extraMeta = { - platforms = [ "aarch64-linux" ]; - license = lib.licenses.unfreeRedistributableFirmware; - }; + extraMeta.platforms = [ "aarch64-linux" ]; BL31="${armTrustedFirmwareRK3328}/bl31.elf"; - filesToInstall = [ "u-boot.itb" "idbloader.img"]; - # Derive MAC address from cpuid - # Submitted upstream: https://patchwork.ozlabs.org/patch/1203686/ - extraConfig = '' - CONFIG_MISC_INIT_R=y - ''; - # Close to being blob free, but the U-Boot TPL causes random memory - # corruption - postBuild = '' - ./tools/mkimage -n rk3328 -T rksd -d ${rkbin}/rk33/rk3328_ddr_786MHz_v1.13.bin idbloader.img - cat spl/u-boot-spl.bin >> idbloader.img + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; + }; + + # A special build with much lower memory frequency (666 vs 1600 MT/s) which + # makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing + # on that revision is marginal and not uncoditionally stable at the specified + # frequency. If your ROCK64 is unstable you can try this u-boot variant to + # see if it works better for you. The only disadvantage is lowered memory + # bandwidth. + ubootRock64v2 = buildUBoot { + prePatch = '' + substituteInPlace arch/arm/dts/rk3328-rock64-u-boot.dtsi \ + --replace rk3328-sdram-lpddr3-1600.dtsi rk3328-sdram-lpddr3-666.dtsi ''; + defconfig = "rock64-rk3328_defconfig"; + extraMeta.platforms = [ "aarch64-linux" ]; + BL31="${armTrustedFirmwareRK3328}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; }; ubootRockPro64 = buildUBoot { diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix index 3b14ac17c1c4f..2cd029501aaf8 100644 --- a/pkgs/servers/jitsi-videobridge/default.nix +++ b/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.3-44-g8983b11f"; + version = "2.3-59-g5c48e421"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "TUWACKQz4wEGv2VKqKsuQLjtJZr24gtVZ4l7LCXe7VE="; + sha256 = "yFFvdDOdG6/VloQV4VWBr2rv7dh7dNiL6D4cep2QIxE="; }; in stdenv.mkDerivation { diff --git a/pkgs/servers/monitoring/uptime-kuma/default.nix b/pkgs/servers/monitoring/uptime-kuma/default.nix index 572b83ba9cef1..f4ef35e4ead2d 100644 --- a/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "uptime-kuma"; - version = "1.23.6"; + version = "1.23.7"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = version; - hash = "sha256-E/iyusAZnEnfXQ63LZA+9dgE0MvhFOKmrIXCEZ+LGi8="; + hash = "sha256-XAtXfrsm9nWWOFJSbL/wWRgzmr2as9J/Y0SwPC0f65o="; }; - npmDepsHash = "sha256-AeN6+0DKd+Q2g3I960PeL3IBla5S7X0od9J244HiwLU="; + npmDepsHash = "sha256-ZAAHvpUBIj2TDGvzkfAEonQrX3AkEbaAL/pap5Q9j7c="; patches = [ # Fixes the permissions of the database being not set correctly diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index d4c20cf2dd7b0..bc8dbde498454 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,7 +6,7 @@ , fetchYarnDeps , nixosTests , brotli -, fixup_yarn_lock +, prefetch-yarn-deps , jq , nodejs , which @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU="; }; - nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ]; + nativeBuildInputs = [ brotli prefetch-yarn-deps jq nodejs which yarn ]; buildPhase = '' # Build node modules export HOME=$PWD - fixup_yarn_lock ~/yarn.lock - fixup_yarn_lock ~/server/tools/yarn.lock - fixup_yarn_lock ~/client/yarn.lock + fixup-yarn-lock ~/yarn.lock + fixup-yarn-lock ~/server/tools/yarn.lock + fixup-yarn-lock ~/client/yarn.lock yarn config --offline set yarn-offline-mirror $yarnOfflineCacheServer yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress cd ~/server/tools diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 6af250790d761..51b7d4fd70fab 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CLtLOzKRB9p6+SytMvWCYo7m7s/d+clAGOa2sWi6uZ0="; + sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; buildInputs = [ postgresql openssl zlib readline libkrb5 ] @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PostgreSQL extension and service for automated failover and high-availability"; homepage = "https://github.com/citusdata/pg_auto_failover"; - changelog = "https://github.com/citusdata/pg_auto_failover/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/citusdata/pg_auto_failover/blob/v${version}/CHANGELOG.md"; maintainers = [ maintainers.marsam ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/web-apps/jitsi-meet/default.nix b/pkgs/servers/web-apps/jitsi-meet/default.nix index d4d91a88c3473..c8172940576a3 100644 --- a/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.7531"; + version = "1.0.7629"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "lSntX5MRnp0GuimiqYGiBwi5wI62omvAN1ioyIz+Upc="; + sha256 = "v2KCpq/x8Zo3+KvhC4t8YnxPtBMP6vS4JeXmXZc62zc="; }; dontBuild = true; diff --git a/pkgs/tools/misc/mapcidr/default.nix b/pkgs/tools/misc/mapcidr/default.nix index 2cb179fac94dd..b998684d2a51f 100644 --- a/pkgs/tools/misc/mapcidr/default.nix +++ b/pkgs/tools/misc/mapcidr/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mapcidr"; - version = "1.1.14"; + version = "1.1.16"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Vhh/OS61dfArsowXMogr/bu/gg354nte9PuobD9lCaU="; + hash = "sha256-O0HVlrLOz4+hxhf/BTSZs0qDCbYokbzmg5KbzUD1UHg="; }; - vendorHash = "sha256-wqbAOoRQEE7CDmaH5MRzsSKOdyrxwBY/1wDz3MCfsBc="; + vendorHash = "sha256-j/3Z2KxbybJoE6/PXkwMLivzmTnZSi7tgO8IQKCoaEQ="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 9fd10a3aba081..461c0cacc06a6 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,12 +1,25 @@ -{lib, stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: +{lib, stdenv, fetchFromGitHub, fetchpatch, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation rec { pname = "DisnixWebService"; version = "0.10.1"; - src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-${version}/DisnixWebService-${version}.tar.gz"; - sha256 = "02jxbgn9a0c9cr6knzp78bp9wiywzczy89wav7yxhg79vff8a1gr"; + + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "DisnixWebService"; + rev = "refs/tags/DisnixWebService-${version}"; + hash = "sha256-zcYr2Ytx4pevSthTQLpnQ330wDxN9dWsZA20jbO6PxQ="; }; + + patches = [ + # Correct the DisnixWebService build for compatibility with Axis2 1.8.1 + # See https://github.com/svanderburg/DisnixWebService/pull/2 + (fetchpatch { + url = "https://github.com/svanderburg/DisnixWebService/commit/cee99c6af744b5dda16728a70ebd2800f61871a0.patch"; + hash = "sha256-4rSEN8AwivUXUCIUYFBRIoE19jVDv+Vpgakmy8fR06A="; + }) + ]; + buildInputs = [ apacheAnt jdk ]; PREFIX = "\${env.out}"; AXIS2_LIB = "${axis2}/lib"; @@ -22,6 +35,8 @@ stdenv.mkDerivation rec { meta = { description = "A SOAP interface and client for Disnix"; + homepage = "https://github.com/svanderburg/DisnixWebService"; + changelog = "https://github.com/svanderburg/DisnixWebService/blob/DisnixWebService-${version}/NEWS.txt"; license = lib.licenses.mit; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 3ff93ad230116..93c7b9f2a23a4 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -9,9 +9,14 @@ stdenv.mkDerivation rec { hash = "sha256-OFPreVhLqPvieoFUJbZan38Vsljg1DoFqFa9t11YiuQ="; }; + postPatch = '' + sed -i 's/void main/int main/' *.c + ''; + configurePhase = '' sed -e 's,/usr/local/bin/perl,${perl}/bin/perl,' \ -e "s,/usr/local,$out," \ + -e "s,CFLAGS =,CFLAGS = -std=c89," \ Makefile.unix > Makefile ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d08259807abf..44e8876d1977c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9123,7 +9123,7 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; halide = callPackage ../development/compilers/halide { - llvmPackages = llvmPackages_14; + llvmPackages = llvmPackages_16; }; harePackages = recurseIntoAttrs (callPackage ./hare-packages.nix { }); @@ -28876,6 +28876,7 @@ with pkgs; ubootRaspberryPi4_64bit ubootRaspberryPiZero ubootRock64 + ubootRock64v2 ubootRockPi4 ubootRockPro64 ubootROCPCRK3399 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35554ba70d382..c315cf14d374b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -228,6 +228,8 @@ self: super: with self; { aiohttp-basicauth = callPackage ../development/python-modules/aiohttp-basicauth { }; + aiohttp-client-cache = callPackage ../development/python-modules/aiohttp-client-cache { }; + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; @@ -3416,6 +3418,8 @@ self: super: with self; { dynd = callPackage ../development/python-modules/dynd { }; + e3-core = callPackage ../development/python-modules/e3-core { }; + eagle100 = callPackage ../development/python-modules/eagle100 { }; easydict = callPackage ../development/python-modules/easydict { }; |