diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index c97fdea4af83..7d0234d7f06c 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "134.0.1-1", + "packageVersion": "135.0-1", "source": { - "rev": "134.0.1-1", - "hash": "sha256-YtZb+VaJu+zofIjJUUx6FjVsEb1sCgFsGlxgP++Yki0=" + "rev": "135.0-1", + "hash": "sha256-UyKfgu6/VAfPkLCjlGgG8SGAG/nOyoP3uyesXqLc5Dk" }, "firefox": { - "version": "134.0.1", - "hash": "sha512-P0DKWnU6ZuCK9OixLXX+q2ewVn7P/TT1zwE/Sa64CczUWMgBHpRW3JAsJOr2JgeBF4dFFOtAzuVXTq/Ok+53LQ==" + "version": "135.0", + "hash": "sha256-gn4SqWLvR1EQia9EmPZev0L6V8ox23kL/X6agg0WuWA=" } } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5867656b2cbc..f9e70d712b27 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,25 +1,25 @@ -{ lib -, stdenv -, fetchurl -, cmake -, hwloc -, fftw -, perl -, blas -, lapack -, llvmPackages -, mpi -, cudaPackages -, plumed -, singlePrec ? true -, config -, enableCuda ? config.cudaSupport -, enableMpi ? false -, enablePlumed ? false -, cpuAcceleration ? null +{ + lib, + stdenv, + fetchurl, + cmake, + hwloc, + fftw, + perl, + blas, + lapack, + llvmPackages, + mpi, + cudaPackages, + plumed, + singlePrec ? true, + config, + enableCuda ? config.cudaSupport, + enableMpi ? false, + enablePlumed ? false, + cpuAcceleration ? null, }: - # CUDA is only implemented for single precission assert enableCuda -> singlePrec; @@ -30,12 +30,20 @@ let # The possible values are defined in CMakeLists.txt: # AUTO None SSE2 SSE4.1 AVX_128_FMA AVX_256 AVX2_256 # AVX2_128 AVX_512 AVX_512_KNL MIC ARM_NEON ARM_NEON_ASIMD - SIMD = x: if (cpuAcceleration != null) then x else - if stdenv.hostPlatform.system == "i686-linux" then "SSE2" else - if stdenv.hostPlatform.system == "x86_64-linux" then "SSE4.1" else - if stdenv.hostPlatform.system == "x86_64-darwin" then "SSE4.1" else - if stdenv.hostPlatform.system == "aarch64-linux" then "ARM_NEON_ASIMD" else - "None"; + SIMD = + x: + if (cpuAcceleration != null) then + x + else if stdenv.hostPlatform.system == "i686-linux" then + "SSE2" + else if stdenv.hostPlatform.system == "x86_64-linux" then + "SSE4.1" + else if stdenv.hostPlatform.system == "x86_64-darwin" then + "SSE4.1" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "ARM_NEON_ASIMD" + else + "None"; source = if enablePlumed then @@ -45,11 +53,12 @@ let } else { - version = "2024.5"; - hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; + version = "2025.0"; + hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "gromacs"; version = source.version; @@ -58,64 +67,79 @@ in stdenv.mkDerivation rec { inherit (source) hash; }; - patches = [ ./pkgconfig.patch ]; + patches = [ (if enablePlumed then ./pkgconfig-2024.patch else ./pkgconfig-2025.patch) ]; postPatch = lib.optionalString enablePlumed '' plumed patch -p -e gromacs-${source.version} ''; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; nativeBuildInputs = [ cmake ] ++ lib.optional enablePlumed plumed ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]; - buildInputs = [ - fftw - perl - hwloc - blas - lapack - ] ++ lib.optional enableMpi mpi - ++ lib.optionals enableCuda [ - cudaPackages.cuda_cccl - cudaPackages.cuda_cudart - cudaPackages.libcufft - cudaPackages.cuda_profiler_api - ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + buildInputs = + [ + fftw + perl + hwloc + blas + lapack + ] + ++ lib.optional enableMpi mpi + ++ lib.optionals enableCuda [ + cudaPackages.cuda_cccl + cudaPackages.cuda_cudart + cudaPackages.libcufft + cudaPackages.cuda_profiler_api + ] + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; - cmakeFlags = [ - (lib.cmakeBool "GMX_HWLOC" true) - "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" - "-DGMX_OPENMP:BOOL=TRUE" - "-DBUILD_SHARED_LIBS=ON" - ] ++ ( - if singlePrec then [ - "-DGMX_DOUBLE=OFF" - ] else [ - "-DGMX_DOUBLE=ON" - "-DGMX_DEFAULT_SUFFIX=OFF" + cmakeFlags = + [ + (lib.cmakeBool "GMX_HWLOC" true) + "-DGMX_SIMD:STRING=${SIMD cpuAcceleration}" + "-DGMX_OPENMP:BOOL=TRUE" + "-DBUILD_SHARED_LIBS=ON" ] - ) ++ ( - if enableMpi - then [ - "-DGMX_MPI:BOOL=TRUE" - "-DGMX_THREAD_MPI:BOOL=FALSE" - ] - else [ - "-DGMX_MPI:BOOL=FALSE" - ] - ) ++ lib.optionals enableCuda [ - "-DGMX_GPU=CUDA" - (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) + ++ ( + if singlePrec then + [ + "-DGMX_DOUBLE=OFF" + ] + else + [ + "-DGMX_DOUBLE=ON" + "-DGMX_DEFAULT_SUFFIX=OFF" + ] + ) + ++ ( + if enableMpi then + [ + "-DGMX_MPI:BOOL=TRUE" + "-DGMX_THREAD_MPI:BOOL=FALSE" + ] + else + [ + "-DGMX_MPI:BOOL=FALSE" + ] + ) + ++ lib.optionals enableCuda [ + "-DGMX_GPU=CUDA" + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cmakeCudaArchitecturesString) - # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: - (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) - ]; + # Gromacs seems to ignore and override the normal variables, so we add this ad hoc: + (lib.cmakeFeature "GMX_CUDA_TARGET_COMPUTE" cmakeCudaArchitecturesString) + ]; postInstall = '' moveToOutput share/cmake $dev @@ -145,6 +169,9 @@ in stdenv.mkDerivation rec { See: https://www.gromacs.org/about.html for details. ''; platforms = platforms.unix; - maintainers = with maintainers; [ sheepforce markuskowa ]; + maintainers = with maintainers; [ + sheepforce + markuskowa + ]; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2024.patch similarity index 100% rename from pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch rename to pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2024.patch diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch new file mode 100644 index 000000000000..f5f5e117ed24 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch @@ -0,0 +1,36 @@ +diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in +index 646787cb53..d26e84de8f 100644 +--- a/src/external/muparser/muparser.pc.in ++++ b/src/external/muparser/muparser.pc.in +@@ -1,11 +1,9 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +- +-Name: @PACKAGE_NAME@ +-Description: Mathematical expressions parser library +-Version: @MUPARSER_VERSION@ +-Requires: +-Libs: -L${libdir} -lmuparser +-Cflags: -I${includedir} @PKG_CONFIG_FLAGS@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++ ++Name: @PACKAGE_NAME@ ++Description: Mathematical expressions parser library ++Version: @MUPARSER_VERSION@ ++Requires: ++Libs: -L${libdir} -lmuparser ++Cflags: -I${includedir} @PKG_CONFIG_FLAGS@ +diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein +index af9b5a6dc0..5f58d549bf 100644 +--- a/src/gromacs/libgromacs.pc.cmakein ++++ b/src/gromacs/libgromacs.pc.cmakein +@@ -1,5 +1,4 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR + + Name: libgromacs@GMX_LIBS_SUFFIX@ + Description: Gromacs library diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 85fe7124311d..c309a816fc27 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.34.4"; + version = "0.35.0"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = version; - hash = "sha256-fS2zuL0j/4Z24wvRIu2M47CafC/f0Ta3rMmQomB3P1Q="; + hash = "sha256-uiQYqVcSSQT32Vu8iE5ATIHFGDiyuxaQvg8hkBtB4DU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-b0t5t7qla4/xZiR3YqhLUDRCj+V2jEUjY4sGGA7L+hE="; + cargoHash = "sha256-B/egtLMBrlLobB1m04L1NlNmZ6+DdQIV9Ae0LVPmO2Y="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch b/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch new file mode 100644 index 000000000000..b853da3b1c73 --- /dev/null +++ b/pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch @@ -0,0 +1,39 @@ +diff --git a/bin/bma b/bin/bma +index 6144842..26965ce 100755 +--- a/bin/bma ++++ b/bin/bma +@@ -13,7 +13,7 @@ + # + # Assumes you have installed bash-my-aws to standard location + +-for f in "${BMA_HOME:-$HOME/.bash-my-aws}"/lib/*-functions; do source $f; done ++for f in @out@/lib/*-functions; do source $f; done + + # Disable awcli client side pager + # +diff --git a/scripts/build b/scripts/build +index 54a786b..37a05df 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -41,7 +41,7 @@ funcs_after_bma=$(compgen -A function) + exclusions=('region') + + for fnc in $(echo "${funcs_before_bma}" "${funcs_after_bma}" "${exclusions}" | tr ' ' '\n' | LC_ALL=C sort | uniq -u); do +- echo "alias $fnc='\${BMA_HOME:-\$HOME/.bash-my-aws}/bin/bma $fnc'" >> "$aliases_destination" ++ echo "alias $fnc='@out@/bin/bma $fnc'" >> "$aliases_destination" + done; + + +diff --git a/scripts/build-completions b/scripts/build-completions +index 2b5d49b..bf86af6 100755 +--- a/scripts/build-completions ++++ b/scripts/build-completions +@@ -6,7 +6,7 @@ cat < $out/bin/bma-init < p4est.mpiSupport; +assert withP4est -> (p4est.mpiSupport && mpiSupport); + +# Package parmetis depend on metis and mpi support +assert withParmetis -> (withMetis && mpiSupport); + +assert withPtscotch -> mpiSupport; +assert withScalapack -> mpiSupport; +assert withMumps -> withScalapack; stdenv.mkDerivation rec { pname = "petsc"; @@ -37,59 +61,102 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ - python3 - gfortran - pkg-config - ] ++ lib.optional mpiSupport mpi; - buildInputs = [ - blas - lapack - ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace config/install.py \ - --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool - ''; + nativeBuildInputs = + [ + python3 + gfortran + pkg-config + ] + ++ lib.optional mpiSupport mpi + ++ lib.optionals withPetsc4py [ + python3Packages.setuptools + python3Packages.cython + ]; - configureFlags = [ - "--with-blas=1" - "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" - "--with-mpi=${if mpiSupport then "1" else "0"}" - ] ++ lib.optionals mpiSupport [ - "--CC=mpicc" - "--with-cxx=mpicxx" - "--with-fc=mpif90" - ] ++ lib.optionals (mpiSupport && withParmetis) [ - "--with-metis=1" - "--with-metis-dir=${metis}" - "--with-parmetis=1" - "--with-parmetis-dir=${parmetis}" - ] ++ lib.optionals petsc-optimized [ - "--with-debugging=0" - "COPTFLAGS=-O3" - "FOPTFLAGS=-O3" - "CXXOPTFLAGS=-O3" - "CXXFLAGS=-O3" + buildInputs = + [ + blas + lapack + ] + ++ lib.optional withHdf5 hdf5-fortran-mpi + ++ lib.optional withP4est p4est + ++ lib.optional withMetis metis + ++ lib.optional withParmetis parmetis + ++ lib.optional withPtscotch scotch + ++ lib.optional withScalapack scalapack + ++ lib.optional withMumps mumps_par; + + propagatedBuildInputs = lib.optional withPetsc4py python3Packages.numpy; + + patches = [ + (replaceVars ./fix-petsc4py-install-prefix.patch { + PYTHON_SITEPACKAGES = python3.sitePackages; + }) ]; - preConfigure = '' - patchShebangs ./lib/petsc/bin - '' + lib.optionalString petsc-withp4est '' - configureFlagsArray+=( + + postPatch = + '' + patchShebangs ./lib/petsc/bin + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace config/install.py \ + --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool + ''; + + configureFlags = + [ + "--with-blas=1" + "--with-lapack=1" + "--with-scalar-type=${petsc-scalar-type}" + "--with-precision=${petsc-precision}" + "--with-mpi=${if mpiSupport then "1" else "0"}" + ] + ++ lib.optional withPetsc4py "--with-petsc4py=1" + ++ lib.optionals mpiSupport [ + "--CC=mpicc" + "--with-cxx=mpicxx" + "--with-fc=mpif90" + ] + ++ lib.optionals withMetis [ + "--with-metis=1" + "--with-metis-dir=${metis}" + ] + ++ lib.optionals withParmetis [ + "--with-parmetis=1" + "--with-parmetis-dir=${parmetis}" + ] + ++ lib.optionals withPtscotch [ + "--with-ptscotch=1" + "--with-ptscotch-include=${lib.getDev scotch}/include" + "--with-ptscotch-lib=[-L${lib.getLib scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" + ] + ++ lib.optionals withScalapack [ + "--with-scalapack=1" + "--with-scalapack-dir=${scalapack}" + ] + ++ lib.optionals withMumps [ + "--with-mumps=1" + "--with-mumps-dir=${mumps_par}" + ] + ++ lib.optionals withP4est [ "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ) - '' + lib.optionalString hdf5-support '' - configureFlagsArray+=( + "--with-zlib-include=${lib.getDev zlib}/include" + "--with-zlib-lib=[-L${lib.getLib zlib}/lib,-lz]" + ] + ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" - ) - ''; + "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include" + "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]" + ] + ++ lib.optionals petsc-optimized [ + "--with-debugging=0" + "COPTFLAGS=-O3" + "FOPTFLAGS=-O3" + "CXXOPTFLAGS=-O3" + "CXXFLAGS=-O3" + ]; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 94f49a28fd18..77480abffdc8 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.2.1"; + version = "25.2.7"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-hP2Q0VZfA6+jmUUqW0L/ufmw2vE9gFj5GSm2G8xRda0="; + hash = "sha256-OGXyyPlHop1xbFNVmq9s+qrC48GFNZkC77FdDdaLcVY="; }; nativeBuildInputs = diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index fa77c246f039..b42729c44cfc 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "release-plz"; - version = "0.3.113"; + version = "0.3.120"; src = fetchFromGitHub { owner = "MarcoIeni"; repo = "release-plz"; rev = "release-plz-v${version}"; - hash = "sha256-m33tBLNOU2+vjIICU0ggnNxLvD/fxJVSxT6bRih9e7U="; + hash = "sha256-5e00l84xKZVqOIDr+Jx0kLFaWEs/oe+EEnDp/obvwWM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XPe5lQMKTGWlt9E3JSsCT1g7VTFBo/aYrVSf0VNOpVk="; + cargoHash = "sha256-3sTeWE/qMOIR+TxGjL813bPpHou/8Zjt7i0+hEOep1c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index dd7d02d44775..e013ee94d03c 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pname = "snapcraft"; - version = "8.6.1"; + version = "8.7.0"; pyproject = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "canonical"; repo = "snapcraft"; tag = version; - hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ="; + hash = "sha256-AFqCIqU3XAITrnRp0VzFzvW1LGSJPTFS6VWSR3qF1Pc="; }; patches = [ @@ -43,15 +43,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace setup.py \ - --replace-fail 'version=determine_version()' 'version="${version}"' \ - --replace-fail 'gnupg' 'python-gnupg' - - substituteInPlace requirements.txt \ - --replace-fail 'gnupg==2.3.1' 'python-gnupg' - - substituteInPlace snapcraft/__init__.py \ - --replace-fail '__version__ = _get_version()' '__version__ = "${version}"' + substituteInPlace snapcraft/__init__.py --replace-fail "dev" "${version}" substituteInPlace snapcraft_legacy/__init__.py \ --replace-fail '__version__ = _get_version()' '__version__ = "${version}"' @@ -60,8 +52,7 @@ python3Packages.buildPythonApplication rec { --replace-fail 'arch_linker_path = Path(arch_config.dynamic_linker)' \ 'return str(Path("${glibc}/lib/ld-linux-x86-64.so.2"))' - substituteInPlace pyproject.toml \ - --replace-fail '"pytest-cov>=4.0",' "" + substituteInPlace pyproject.toml --replace-fail 'gnupg' 'python-gnupg' ''; nativeBuildInputs = [ makeWrapper ]; @@ -110,10 +101,11 @@ python3Packages.buildPythonApplication rec { validators ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools-scm ]; pythonRelaxDeps = [ "craft-parts" + "cryptography" "docutils" "jsonschema" "pygit2" diff --git a/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch b/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch index 1dc4ef6cdcdf..3f9ac77fa555 100644 --- a/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch +++ b/pkgs/by-name/sn/snapcraft/snapcraft-data-dirs.patch @@ -1,26 +1,16 @@ diff --git a/snapcraft_legacy/internal/common.py b/snapcraft_legacy/internal/common.py -index 6017b405..aacd99a5 100644 +index b3d40c265..c68c24d53 100644 --- a/snapcraft_legacy/internal/common.py +++ b/snapcraft_legacy/internal/common.py -@@ -34,14 +34,17 @@ from snaphelpers import SnapConfigOptions, SnapCtlError +@@ -36,7 +36,10 @@ from snapcraft_legacy.internal import errors - from snapcraft_legacy.internal import errors + SNAPCRAFT_FILES = ["parts", "stage", "prime"] +-_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins") +# Get the path to the Nix store entry for Snapcraft at runtime +drv = os.path.realpath(__file__).split("/")[3] + - SNAPCRAFT_FILES = ["parts", "stage", "prime"] --_DEFAULT_PLUGINDIR = os.path.join(sys.prefix, "share", "snapcraft", "plugins") +_DEFAULT_PLUGINDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "plugins") _plugindir = _DEFAULT_PLUGINDIR --_DEFAULT_SCHEMADIR = os.path.join(sys.prefix, "share", "snapcraft", "schema") -+_DEFAULT_SCHEMADIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "schema") - _schemadir = _DEFAULT_SCHEMADIR --_DEFAULT_EXTENSIONSDIR = os.path.join(sys.prefix, "share", "snapcraft", "extensions") -+_DEFAULT_EXTENSIONSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "extensions") - _extensionsdir = _DEFAULT_EXTENSIONSDIR --_DEFAULT_KEYRINGSDIR = os.path.join(sys.prefix, "share", "snapcraft", "keyrings") -+_DEFAULT_KEYRINGSDIR = os.path.join(os.sep, "nix", "store", drv, "share", "snapcraft", "keyrings") - _keyringsdir = _DEFAULT_KEYRINGSDIR - _DOCKERENV_FILE = "/.dockerenv" + _BASE_DIR = Path(__file__).parents[2] diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index f454bd7c516a..05402129249b 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; tag = "v${version}"; - hash = "sha256-NqessN2yo7H17zWsnnI1oNIRG5Z1Wxi8oTWETP9DHpk="; + hash = "sha256-Fu8A3n1vzA8y5ccyo785udOTTqumLQWCOy0RL/mQ/us="; }; useFetchCargoVendor = true; - cargoHash = "sha256-r0F/nTT0YTrkknI2wATvBnRxVyXT1mTM8Qt0rOgg8VM="; + cargoHash = "sha256-6AXpdm4Ge8j8w74YGEQYpj6r8gKp+Bim/6xA2WLjSC0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/tp/tparse/package.nix b/pkgs/by-name/tp/tparse/package.nix index 5441a1413cc8..338ab7df26f8 100644 --- a/pkgs/by-name/tp/tparse/package.nix +++ b/pkgs/by-name/tp/tparse/package.nix @@ -5,7 +5,7 @@ }: let pname = "tparse"; - version = "0.16.0"; + version = "0.17.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "mfridman"; repo = pname; rev = "v${version}"; - hash = "sha256-fljSjch09kQCpnZerI/h4SRCyxUydfFZGyOXsxmgYOk="; + hash = "sha256-yU4hP+EJ+Ci3Ms0dAoSuqZFT9RRwqmN1V0x5cV+87z0="; }; - vendorHash = "sha256-gGmPQ8YaTk7xG5B8UPK7vOui5YFeEnkuGrAsf0eylXQ="; + vendorHash = "sha256-m0YTGzzjr7/4+vTNhfPb7y2xtsI/y4Q2pbg+3yqSFaw="; ldflags = [ "-s" diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index d745d3b687ad..2a16ecd754e1 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.29.4"; + version = "1.29.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = "typos"; tag = "v${version}"; - hash = "sha256-4cCXh6fysunsc6MNb7YNx+1I1tnYJkBgpA30P6IzTcM="; + hash = "sha256-YCOSe0EsPQMvIF6wm1oqisAm7t7GUzL56D/TZcNMTIk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ISz65YPKgQ7W4pC6KM87xPr6Xt1g+Ve0L5nqShS3Ujc="; + cargoHash = "sha256-d5s+reeZjLrRLPJOpWbe0grFsng74o4CmWgI6ln+614="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 2b06481bb7d2..628247ff043b 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,19 +14,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-7bFn3+mpiXC4+PGhoJ10QN1oBjj7zS5U2MJf8cJm114="; + hash = "sha256-hdlFL95DFVeUs08/wg6EA5CfV6KeUGaS9kcLGRMyNgY="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src; - hash = "sha256-ZUwtNtOmxjhOBpYB7vuytunGBRSuVxdlQsceRmeyhhI="; + hash = "sha256-0afgeJkK0OQWoqF0b8pHPMsiTKox84YmwBhtNWGyVAg="; }; nativeBuildInputs = [ @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ESBUILD_BINARY_PATH = lib.getExe ( esbuild.overrideAttrs ( final: _: { - version = "0.15.18"; + version = "0.25.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${final.version}"; - hash = "sha256-b9R1ML+pgRg9j2yrkQmBulPuLHYLUQvW+WTyR/Cq6zE="; + hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 83356b1e12a7..494fb18bd478 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-arm64-1.2.6.zip", - "sha256": "b9a63785454003f7ccb3b6adebe232e24618247244b556ef61e9e974a4b77f65" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-darwin-arm64-1.3.4.zip", + "sha256": "3873c50e09500fe43ee78fe6c63b86311d4ea689173bc2660239466b3f2e4fa4" }, "x86_64-darwin": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-darwin-x64-1.2.6.zip", - "sha256": "4a4beae35117162b484521a64fc67cac044ced17a971553ab75ba8823b3cbb75" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-darwin-x64-1.3.4.zip", + "sha256": "2534839a0e026316cb4fd98b128c44d4c6cf938f47be9a5e7e67457d2f8bf61b" }, "x86_64-linux": { - "version": "1.2.6", + "version": "1.3.4", "vscodeVersion": "1.94.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/d08b8ea13d580d24be204c76e5dd1651d7234cd2/Windsurf-linux-x64-1.2.6.tar.gz", - "sha256": "ad71eb02b9302d4cf1413c0a83763f45fe455e5be74ee9e1477bea2e85a02caa" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/ff5014a12e72ceb812f9e7f61876befac66725e5/Windsurf-linux-x64-1.3.4.tar.gz", + "sha256": "6dcf686038c6587410b25dd041a748a59593164b6c3ffb31935abef1325bfa8c" } } diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix index 002c5aa35fb3..a57658520458 100644 --- a/pkgs/development/libraries/glibc/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -16,7 +16,8 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}" "out" "bin" "dev" - ]; # TODO: no static version here (yet) + "static" + ]; passthru = { libgcc = lib.lists.filter (x: x != null) [ (glibc64.libgcc or null) @@ -42,4 +43,13 @@ runCommand "${nameVersion.name}-multi-${nameVersion.version}" cp -rs '${glibc32.dev}'/include "$dev/" chmod +w -R "$dev" cp -rsf '${glibc64.dev}'/include "$dev/" + + mkdir -p "$static/lib" "$static/lib64" + # create symlinks for files used for dynamic linking + # -> removing this will cause dynamically linked programs to segfault + cp -rs '${glibc32.out}'/lib/* "$static/lib" + cp -rs '${glibc64.out}'/lib/* "$static/lib64" + # create symlinks for files used for static linking + cp -rs '${glibc32.static}'/lib/* "$static/lib" + cp -rs '${glibc64.static}'/lib/* "$static/lib64" '' diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix new file mode 100644 index 000000000000..d3788ffa7642 --- /dev/null +++ b/pkgs/development/python-modules/llm-anthropic/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + llm, + anthropic, + pytestCheckHook, + pytest-asyncio, + pytest-recording, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "llm-anthropic"; + version = "0.12"; + pyproject = true; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "llm-anthropic"; + tag = version; + hash = "sha256-7+5j5jZBFfaaqnfjvLTI+mz1PUuG8sB5nD59UCpJuR4="; + }; + + build-system = [ + setuptools + llm + ]; + dependencies = [ anthropic ]; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-recording + ]; + + pythonImportsCheck = [ "llm_anthropic" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "LLM access to models by Anthropic, including the Claude series"; + homepage = "https://github.com/simonw/llm-anthropic"; + changelog = "https://github.com/simonw/llm-anthropic/releases/tag/${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aos ]; + }; +} diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 0f0ea8c546e1..f0009dc378f7 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.32.0"; + version = "0.32.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,12 +23,13 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; tag = version; - hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk="; + hash = "sha256-yQ/QDTTZLgBoTpa+ssvVPvDotBo6HXMvM2ZgTtbzOcA="; }; postPatch = '' substituteInPlace tox.ini \ - --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" "" + --replace-fail "--doctest-modules" "" \ + --replace-fail "--doctest-glob='tests/**/*.txt'" "" ''; build-system = [ setuptools ]; @@ -65,7 +66,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 390d71445af4..8b475afebb23 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-hHIWjD4f0L/yh+aUsFP8y78gV5o/+VJrYzO+q432Wo0="; }; "10" = { - version = "10.4.0"; - hash = "sha256-5X6KVE96hCR8+nfdbZI+rlGZo3NHTlPqsfVAx5Yok4Y="; + version = "10.4.1"; + hash = "sha256-S3Aoh5hplZM9QwCDawTW0CpDvHK1Lk9+k6TKYIuVkZc="; }; }; diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 4929e6835a97..8e27e5e53608 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -16,8 +16,8 @@ let in buildNodejs { inherit enableNpm; - version = "23.7.0"; - sha256 = "8de192ef2fee2ee8a230dd8d0e9aee182ee9c9856ccdb5fd95188abe84f77242"; + version = "23.8.0"; + sha256 = "6ec5d54d0e8423fc5986f6efa4f661e8370659818b14f458cdc9d1b9f75d3b88"; patches = [ ./configure-emulator.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77d35be8faa..4401ad85e6be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17021,15 +17021,6 @@ with pkgs; ### SCIENCE/PROGRAMMING - ### SCIENCE/GEOLOGY - pflotran = callPackage ../by-name/pf/pflotran/package.nix { - petsc = petsc.override { - hdf5-support = true; - hdf5 = hdf5-fortran-mpi; - petsc-optimized = true; - }; - }; - ### SCIENCE/LOGIC abella = callPackage ../applications/science/logic/abella { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebb0f241785b..5d524cae7cd8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7695,6 +7695,8 @@ self: super: with self; { llm = callPackage ../development/python-modules/llm { }; + llm-anthropic = callPackage ../development/python-modules/llm-anthropic { }; + llm-cmd = callPackage ../development/python-modules/llm-cmd { }; llm-gguf = callPackage ../development/python-modules/llm-gguf { }; @@ -10346,6 +10348,13 @@ self: super: with self; { pesq = callPackage ../development/python-modules/pesq { }; + petsc4py = toPythonModule (pkgs.petsc.override { + python3 = python; + python3Packages = self; + withPetsc4py = true; + withFullDeps = true; + }); + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { };