From 2018658a6a32cff74b5bd52a5501e1f9343eac94 Mon Sep 17 00:00:00 2001 From: Dominic Date: Wed, 12 Feb 2025 23:22:46 +0100 Subject: [PATCH 01/38] librewolf: 134.0.1-1 -> 135.0-1 --- .../networking/browsers/librewolf/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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=" } } From 36e10e883f13daf62835b3d230aae83434cd62f9 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 13 Feb 2025 19:53:47 +0100 Subject: [PATCH 02/38] nodejs_23: 23.7.0 -> 23.8.0 --- pkgs/development/web/nodejs/v23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From a8d4b83956479f183cfb7b086f57d7a8c41179d0 Mon Sep 17 00:00:00 2001 From: Tim Quelch Date: Fri, 14 Feb 2025 13:38:18 +1100 Subject: [PATCH 03/38] bash-my-aws: 2020-01-11 -> 2025-01-22 and refactor Pull to latest commit and refactor the derivation. --- .../0001-update-paths-to-placeholders.patch | 39 +++++++ .../ba/bash-my-aws/0002-fix-tests.patch | 52 +++++++++ pkgs/by-name/ba/bash-my-aws/package.nix | 105 ++++++++++-------- 3 files changed, 151 insertions(+), 45 deletions(-) create mode 100644 pkgs/by-name/ba/bash-my-aws/0001-update-paths-to-placeholders.patch create mode 100644 pkgs/by-name/ba/bash-my-aws/0002-fix-tests.patch 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 < Date: Fri, 14 Feb 2025 09:21:03 +0000 Subject: [PATCH 04/38] filebeat8: 8.17.1 -> 8.17.2 --- pkgs/by-name/fi/filebeat8/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index b9ae646a3a87..27fdc4a54142 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "filebeat"; - version = "8.17.1"; + version = "8.17.2"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-I245j8Atnp7r0ZL6Lfew0I4uluSodeNnYWFs3x/JYUc="; + hash = "sha256-Gk+F4OOe/n3SdiycKwJe4nPwfEKAVesKj5Fmvbe9Q5U="; }; - vendorHash = "sha256-eGvpeik7kU/OC1bI4hjavEyF7GvQWXHsNlF+1Smn22c="; + vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts="; subPackages = [ "filebeat" ]; From ec3f5a021bc12d32bee8f33828f7daa20a9d24c6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 16:06:47 +0800 Subject: [PATCH 05/38] petsc: simplify configurePhase --- pkgs/by-name/pe/petsc/package.nix | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 3db7a522fff6..5645677df27d 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation rec { lapack ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optionals withParmetis [ metis parmetis ]; - prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + 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 ''; @@ -67,6 +69,15 @@ stdenv.mkDerivation rec { "--with-metis-dir=${metis}" "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" + ] ++ lib.optionals petsc-withp4est [ + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=[-L${zlib}/lib,-lz]" + ] ++ lib.optionals hdf5-support [ + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-include=${hdf5.dev}/include" + "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" ] ++ lib.optionals petsc-optimized [ "--with-debugging=0" "COPTFLAGS=-O3" @@ -74,22 +85,6 @@ stdenv.mkDerivation rec { "CXXOPTFLAGS=-O3" "CXXFLAGS=-O3" ]; - preConfigure = '' - patchShebangs ./lib/petsc/bin - '' + lib.optionalString petsc-withp4est '' - configureFlagsArray+=( - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=-L${zlib}/lib -lz" - ) - '' + lib.optionalString hdf5-support '' - configureFlagsArray+=( - "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=-L${hdf5}/lib -lhdf5" - ) - ''; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From e6bda1731a4851ef920168fcc8e4e8f8cef8f441 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 16:48:17 +0800 Subject: [PATCH 06/38] petsc: reformat with nixfmt-rfc-style --- pkgs/by-name/pe/petsc/package.nix | 97 ++++++++++++++++++------------- 1 file changed, 56 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 5645677df27d..c83df800ca11 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -42,49 +42,64 @@ stdenv.mkDerivation rec { 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 ]; + buildInputs = + [ + blas + lapack + ] + ++ lib.optional hdf5-support hdf5 + ++ lib.optional petsc-withp4est p4est + ++ lib.optionals withParmetis [ + metis + parmetis + ]; - 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 - ''; + 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.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-withp4est [ - "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=[-L${zlib}/lib,-lz]" - ] ++ lib.optionals hdf5-support [ - "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${hdf5.dev}/include" - "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" - ] ++ lib.optionals petsc-optimized [ - "--with-debugging=0" - "COPTFLAGS=-O3" - "FOPTFLAGS=-O3" - "CXXOPTFLAGS=-O3" - "CXXFLAGS=-O3" - ]; + 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-withp4est [ + "--with-p4est=1" + "--with-zlib-include=${zlib.dev}/include" + "--with-zlib-lib=[-L${zlib}/lib,-lz]" + ] + ++ lib.optionals hdf5-support [ + "--with-hdf5=1" + "--with-hdf5-fortran-bindings=1" + "--with-hdf5-include=${hdf5.dev}/include" + "--with-hdf5-lib=[-L${hdf5}/lib,-lhdf5]" + ] + ++ lib.optionals petsc-optimized [ + "--with-debugging=0" + "COPTFLAGS=-O3" + "FOPTFLAGS=-O3" + "CXXOPTFLAGS=-O3" + "CXXFLAGS=-O3" + ]; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From 602e8d527b3277770acc30bcc6801f2889a1f07b Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 19:53:26 +0800 Subject: [PATCH 07/38] petsc: add standalone metis support --- pkgs/by-name/pe/petsc/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index c83df800ca11..6ad696a539cf 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -14,6 +14,7 @@ hdf5-support ? false, hdf5, metis, + withMetis ? false, parmetis, withParmetis ? false, pkg-config, @@ -27,6 +28,9 @@ # This version of PETSc does not support a non-MPI p4est build assert petsc-withp4est -> p4est.mpiSupport; +# Package parmetis depend on metis and mpi support +assert withParmetis -> (withMetis && mpiSupport); + stdenv.mkDerivation rec { pname = "petsc"; version = "3.21.4"; @@ -49,10 +53,8 @@ stdenv.mkDerivation rec { ] ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est - ++ lib.optionals withParmetis [ - metis - parmetis - ]; + ++ lib.optional withMetis metis + ++ lib.optional withParmetis parmetis; postPatch = '' @@ -76,9 +78,11 @@ stdenv.mkDerivation rec { "--with-cxx=mpicxx" "--with-fc=mpif90" ] - ++ lib.optionals (mpiSupport && withParmetis) [ + ++ lib.optionals withMetis [ "--with-metis=1" "--with-metis-dir=${metis}" + ] + ++ lib.optionals withParmetis [ "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" ] From f4bba88df7414956e652134e198762d619d657cc Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 20:10:36 +0800 Subject: [PATCH 08/38] petsc: add ptscotch support --- pkgs/by-name/pe/petsc/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6ad696a539cf..2c29bfd2129a 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -17,6 +17,8 @@ withMetis ? false, parmetis, withParmetis ? false, + scotch, + withPtscotch ? false, pkg-config, p4est, zlib, # propagated by p4est but required by petsc @@ -31,6 +33,8 @@ assert petsc-withp4est -> p4est.mpiSupport; # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); +assert withPtscotch -> mpiSupport; + stdenv.mkDerivation rec { pname = "petsc"; version = "3.21.4"; @@ -54,7 +58,8 @@ stdenv.mkDerivation rec { ++ lib.optional hdf5-support hdf5 ++ lib.optional petsc-withp4est p4est ++ lib.optional withMetis metis - ++ lib.optional withParmetis parmetis; + ++ lib.optional withParmetis parmetis + ++ lib.optional withPtscotch scotch; postPatch = '' @@ -86,6 +91,11 @@ stdenv.mkDerivation rec { "--with-parmetis=1" "--with-parmetis-dir=${parmetis}" ] + ++ lib.optionals withPtscotch [ + "--with-ptscotch=1" + "--with-ptscotch-include=${scotch.dev}/include" + "--with-ptscotch-lib=[-L${scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" + ] ++ lib.optionals petsc-withp4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" From 0b2160ea3cbdfa033401a5716ad094b9d76aeacf Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 20:14:57 +0800 Subject: [PATCH 09/38] petsc: add scalapack and mumps support --- pkgs/by-name/pe/petsc/package.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 2c29bfd2129a..6a13227e4031 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -19,6 +19,10 @@ withParmetis ? false, scotch, withPtscotch ? false, + scalapack, + withScalapack ? false, + mumps_par, + withMumps ? false, pkg-config, p4est, zlib, # propagated by p4est but required by petsc @@ -34,6 +38,8 @@ assert petsc-withp4est -> p4est.mpiSupport; assert withParmetis -> (withMetis && mpiSupport); assert withPtscotch -> mpiSupport; +assert withScalapack -> mpiSupport; +assert withMumps -> withScalapack; stdenv.mkDerivation rec { pname = "petsc"; @@ -59,7 +65,9 @@ stdenv.mkDerivation rec { ++ lib.optional petsc-withp4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis - ++ lib.optional withPtscotch scotch; + ++ lib.optional withPtscotch scotch + ++ lib.optional withScalapack scalapack + ++ lib.optional withMumps mumps_par; postPatch = '' @@ -96,6 +104,14 @@ stdenv.mkDerivation rec { "--with-ptscotch-include=${scotch.dev}/include" "--with-ptscotch-lib=[-L${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 petsc-withp4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" From ad4db6e3abc06917e8dc171f401b2ece716ce757 Mon Sep 17 00:00:00 2001 From: qbisi Date: Tue, 4 Feb 2025 19:42:47 +0800 Subject: [PATCH 10/38] python312Packages.petsc4py: init at 3.22.3 --- .../petsc/fix-petsc4py-install-prefix.patch | 22 ++++++++++++++ pkgs/by-name/pe/petsc/package.nix | 30 +++++++++++++++---- pkgs/top-level/python-packages.nix | 6 ++++ 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch diff --git a/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch b/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch new file mode 100644 index 000000000000..dd3a50114f07 --- /dev/null +++ b/pkgs/by-name/pe/petsc/fix-petsc4py-install-prefix.patch @@ -0,0 +1,22 @@ +diff --git a/config/BuildSystem/config/packages/petsc4py.py b/config/BuildSystem/config/packages/petsc4py.py +index 4a58243..831aa04 100644 +--- a/config/BuildSystem/config/packages/petsc4py.py ++++ b/config/BuildSystem/config/packages/petsc4py.py +@@ -37,7 +37,7 @@ class Configure(config.package.Package): + + def Install(self): + import os +- installLibPath = os.path.join(self.installDir, 'lib') ++ installLibPath = os.path.join(self.installDir, 'lib', '@PYTHON_SITEPACKAGES@') + if self.setCompilers.isDarwin(self.log): + apple = 'You may need to\n (csh/tcsh) setenv MACOSX_DEPLOYMENT_TARGET 10.X\n (sh/bash) MACOSX_DEPLOYMENT_TARGET=10.X; export MACOSX_DEPLOYMENT_TARGET\nbefore running make on PETSc' + else: +@@ -70,7 +70,7 @@ class Configure(config.package.Package): + newdir += 'NUMPY_INCLUDE="'+numpy_include+'" ' + + self.addDefine('HAVE_PETSC4PY',1) +- self.addDefine('PETSC4PY_INSTALL_PATH','"'+os.path.join(self.installdir.dir,'lib')+'"') ++ self.addDefine('PETSC4PY_INSTALL_PATH','"'+installLibPath+'"') + self.addMakeMacro('PETSC4PY','yes') + self.addMakeRule('petsc4pybuild','', \ + ['@echo "*** Building petsc4py ***"',\ diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6a13227e4031..87009b8a8f91 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -4,7 +4,10 @@ fetchzip, cctools, gfortran, + replaceVars, python3, + python3Packages, + withPetsc4py ? false, blas, lapack, mpiSupport ? true, @@ -51,11 +54,19 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ - python3 - gfortran - pkg-config - ] ++ lib.optional mpiSupport mpi; + + nativeBuildInputs = + [ + python3 + gfortran + pkg-config + ] + ++ lib.optional mpiSupport mpi + ++ lib.optionals withPetsc4py [ + python3Packages.setuptools + python3Packages.cython + ]; + buildInputs = [ blas @@ -69,6 +80,14 @@ stdenv.mkDerivation rec { ++ 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; + }) + ]; + postPatch = '' patchShebangs ./lib/petsc/bin @@ -86,6 +105,7 @@ stdenv.mkDerivation rec { "--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" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b98d245a8297..85ddafd5b6fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10342,6 +10342,12 @@ self: super: with self; { pesq = callPackage ../development/python-modules/pesq { }; + petsc4py = toPythonModule (pkgs.petsc.override { + python3 = python; + python3Packages = self; + withPetsc4py = true; + }); + pex = callPackage ../development/python-modules/pex { }; pexif = callPackage ../development/python-modules/pexif { }; From 3389354ca5c3f51eca33025f73eaf36aaa23ab31 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 5 Feb 2025 15:32:48 +0800 Subject: [PATCH 11/38] petsc: add withFullDeps option --- pkgs/by-name/pe/petsc/package.nix | 15 ++++++++------- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 87009b8a8f91..9c6e64d6e409 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -13,25 +13,26 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - petsc-withp4est ? false, - hdf5-support ? false, + petsc-withp4est ? withFullDeps, + hdf5-support ? withFullDeps, hdf5, metis, - withMetis ? false, + withMetis ? withFullDeps, parmetis, - withParmetis ? false, + withParmetis ? false, # parmetis is unfree and should be enabled manualy scotch, - withPtscotch ? false, + withPtscotch ? withFullDeps, scalapack, - withScalapack ? false, + withScalapack ? withFullDeps, mumps_par, - withMumps ? false, + withMumps ? withFullDeps, pkg-config, p4est, zlib, # propagated by p4est but required by petsc petsc-optimized ? false, petsc-scalar-type ? "real", petsc-precision ? "double", + withFullDeps ? false }: # This version of PETSc does not support a non-MPI p4est build diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85ddafd5b6fe..dbabff224391 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10346,6 +10346,8 @@ self: super: with self; { python3 = python; python3Packages = self; withPetsc4py = true; + withFullDeps = true; + petsc-optimized = true; }); pex = callPackage ../development/python-modules/pex { }; From 291a201097ee67aafd3157149ab29d4e6a049e8a Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 5 Feb 2025 15:48:27 +0800 Subject: [PATCH 12/38] petsc: rename some optional dependency flags --- pkgs/by-name/pe/petsc/package.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 9c6e64d6e409..82b0f396a992 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -13,8 +13,8 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - petsc-withp4est ? withFullDeps, - hdf5-support ? withFullDeps, + withP4est ? withFullDeps, + withHdf5 ? withFullDeps, hdf5, metis, withMetis ? withFullDeps, @@ -36,7 +36,7 @@ }: # This version of PETSc does not support a non-MPI p4est build -assert petsc-withp4est -> p4est.mpiSupport; +assert withP4est -> (p4est.mpiSupport && mpiSupport); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); @@ -73,8 +73,8 @@ stdenv.mkDerivation rec { blas lapack ] - ++ lib.optional hdf5-support hdf5 - ++ lib.optional petsc-withp4est p4est + ++ lib.optional withHdf5 hdf5 + ++ lib.optional withP4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis ++ lib.optional withPtscotch scotch @@ -133,12 +133,12 @@ stdenv.mkDerivation rec { "--with-mumps=1" "--with-mumps-dir=${mumps_par}" ] - ++ lib.optionals petsc-withp4est [ + ++ lib.optionals withP4est [ "--with-p4est=1" "--with-zlib-include=${zlib.dev}/include" "--with-zlib-lib=[-L${zlib}/lib,-lz]" ] - ++ lib.optionals hdf5-support [ + ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" "--with-hdf5-include=${hdf5.dev}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb3618d837a1..1144d59a2f83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17075,7 +17075,7 @@ with pkgs; ### SCIENCE/GEOLOGY pflotran = callPackage ../by-name/pf/pflotran/package.nix { petsc = petsc.override { - hdf5-support = true; + withHdf5 = true; hdf5 = hdf5-fortran-mpi; petsc-optimized = true; }; From d3b3d83b0fcd2d0e7fd7922a3da66e6a1c9491db Mon Sep 17 00:00:00 2001 From: qbisicwate Date: Thu, 6 Feb 2025 17:46:19 +0800 Subject: [PATCH 13/38] petsc: use lib.{getDev,getLib} instead *.{dev,lib} --- pkgs/by-name/pe/petsc/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 82b0f396a992..552416df8ec2 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -122,8 +122,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withPtscotch [ "--with-ptscotch=1" - "--with-ptscotch-include=${scotch.dev}/include" - "--with-ptscotch-lib=[-L${scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" + "--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" @@ -135,14 +135,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withP4est [ "--with-p4est=1" - "--with-zlib-include=${zlib.dev}/include" - "--with-zlib-lib=[-L${zlib}/lib,-lz]" + "--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}/include" + "--with-hdf5-lib=[-L${lib.getLib hdf5}/lib,-lhdf5]" ] ++ lib.optionals petsc-optimized [ "--with-debugging=0" From 92dc787ceca4c86d4df79e1d53caaa4e32a882f0 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 18:00:55 +0800 Subject: [PATCH 14/38] petsc: reorder build options and external dependency --- pkgs/by-name/pe/petsc/package.nix | 44 ++++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 552416df8ec2..9d5e412fad7b 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -7,32 +7,38 @@ replaceVars, python3, python3Packages, - withPetsc4py ? false, blas, lapack, - mpiSupport ? true, + zlib, # propagated by p4est but required by petsc mpi, # generic mpi dependency mpiCheckPhaseHook, - withP4est ? withFullDeps, - withHdf5 ? withFullDeps, - hdf5, - metis, - withMetis ? withFullDeps, - parmetis, - withParmetis ? false, # parmetis is unfree and should be enabled manualy - scotch, - withPtscotch ? withFullDeps, - scalapack, - withScalapack ? withFullDeps, - mumps_par, - withMumps ? withFullDeps, - pkg-config, - p4est, - zlib, # propagated by p4est but required by petsc + + # Build options petsc-optimized ? false, petsc-scalar-type ? "real", petsc-precision ? "double", - withFullDeps ? false + mpiSupport ? true, + withPetsc4py ? false, # petsc python binding + withFullDeps ? false, # full External libraries support + + # External libraries options + withHdf5 ? withFullDeps, + withMetis ? withFullDeps, + withParmetis ? false, # parmetis is unfree and should be enabled manualy + withPtscotch ? withFullDeps, + withScalapack ? withFullDeps, + withMumps ? withFullDeps, + withP4est ? withFullDeps, + + # External libraries + hdf5, + metis, + parmetis, + scotch, + scalapack, + mumps_par, + pkg-config, + p4est, }: # This version of PETSc does not support a non-MPI p4est build From 3c01afec0a69da281268e5a921c087e08c6f7222 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 19:05:03 +0800 Subject: [PATCH 15/38] petsc: add hdf5 fortran binding --- pkgs/by-name/pe/petsc/package.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 9d5e412fad7b..22735cacece5 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -31,7 +31,7 @@ withP4est ? withFullDeps, # External libraries - hdf5, + hdf5-fortran-mpi, metis, parmetis, scotch, @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { blas lapack ] - ++ lib.optional withHdf5 hdf5 + ++ lib.optional withHdf5 hdf5-fortran-mpi ++ lib.optional withP4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis @@ -147,8 +147,8 @@ stdenv.mkDerivation rec { ++ lib.optionals withHdf5 [ "--with-hdf5=1" "--with-hdf5-fortran-bindings=1" - "--with-hdf5-include=${lib.getDev hdf5}/include" - "--with-hdf5-lib=[-L${lib.getLib 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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1144d59a2f83..f18c29a4280e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17076,7 +17076,6 @@ with pkgs; pflotran = callPackage ../by-name/pf/pflotran/package.nix { petsc = petsc.override { withHdf5 = true; - hdf5 = hdf5-fortran-mpi; petsc-optimized = true; }; }; From 120cb83d3bd82c0ade523344e6fe0e7edf2e156d Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 14 Feb 2025 19:06:55 +0800 Subject: [PATCH 16/38] petsc: set optimized and withHdf5 default to true Petsc is commonly optimized built with hdf5 support to be used as a component of other software and project. See 1. https://sources.debian.org/src/petsc/3.22.2%2Bdfsg1-1/debian/rules/#L154 2. https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=petsc --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 -------- pkgs/top-level/python-packages.nix | 1 - 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 22735cacece5..cec3dda54341 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -14,7 +14,7 @@ mpiCheckPhaseHook, # Build options - petsc-optimized ? false, + petsc-optimized ? true, petsc-scalar-type ? "real", petsc-precision ? "double", mpiSupport ? true, @@ -22,7 +22,7 @@ withFullDeps ? false, # full External libraries support # External libraries options - withHdf5 ? withFullDeps, + withHdf5 ? true, withMetis ? withFullDeps, withParmetis ? false, # parmetis is unfree and should be enabled manualy withPtscotch ? withFullDeps, diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18c29a4280e..77e4a06b3c69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17072,14 +17072,6 @@ with pkgs; ### SCIENCE/PROGRAMMING - ### SCIENCE/GEOLOGY - pflotran = callPackage ../by-name/pf/pflotran/package.nix { - petsc = petsc.override { - withHdf5 = true; - 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 dbabff224391..f1e9cc7f6a70 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10347,7 +10347,6 @@ self: super: with self; { python3Packages = self; withPetsc4py = true; withFullDeps = true; - petsc-optimized = true; }); pex = callPackage ../development/python-modules/pex { }; From 68e78b27a0e8639e3ad1066173bac71cd68ebdf2 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 9 Feb 2025 21:24:58 +0100 Subject: [PATCH 17/38] calibre: 7.24.0 -> 7.26.0 https://github.com/kovidgoyal/calibre/releases/tag/v7.26.0 --- pkgs/by-name/ca/calibre/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 2d1ca03a1177..69a5e3b7d0c9 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.24.0"; + version = "7.26.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-ftqi6ANY/w4CdcMUAzRn9GOpNbSz36mnNcGHv8ffKbQ="; + hash = "sha256-Cps2x3ZV68jaZ+cIJgQEeh++GG81Y9yX7mC7WKvFcCc="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-9hi4T9LB7aklWASMR8hIuKBgZm2arDvORfmk9S8wgCA="; + hash = "sha256-V/ZUTH0l4QSfM0dHrgLGdJjF/CCQ0S/fnCP/ZKD563U="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From 3f8e227f543b31a20dd35e35bd9396530f7deebe Mon Sep 17 00:00:00 2001 From: Aos Dabbagh <25783780+aos@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:06:11 -0500 Subject: [PATCH 18/38] python3Packages.llm-anthropic: init at 0.12 Closes #327800 Closes #372713 (Note: This is just #373495 upgraded to `0.12`. Seems like something happened with git/Github and my PR was automatically closed.) This is a plugin for the already packaged `llm` software. There exists 2 PRs related to this: - #327800: the original - #372713: forks the original and updates as it had no activity for multiple months As helpfully pointed out by @ShaddyDC (https://github.com/NixOS/nixpkgs/pull/372713#issuecomment-2586795561) this is now superseded by `llm-anthropic`, of which this is meant to package. (We also have other PRs that have been commited that add similr plugins at #359379 and #344746.) --- .../python-modules/llm-anthropic/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/llm-anthropic/default.nix 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 782cf2c469a9..7a2a51d130e0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7697,6 +7697,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 { }; From d2239872cc54353a0ff1669f62c2b6c21e7c6fc4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 15 Feb 2025 19:16:04 +0100 Subject: [PATCH 19/38] gromacs: 2024.5 -> 2025.0 --- .../molecular-dynamics/gromacs/default.nix | 6 ++-- .../{pkgconfig.patch => pkgconfig-2024.patch} | 0 .../gromacs/pkgconfig-2025.patch | 36 +++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) rename pkgs/applications/science/molecular-dynamics/gromacs/{pkgconfig.patch => pkgconfig-2024.patch} (100%) create mode 100644 pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig-2025.patch diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 5867656b2cbc..a62e716248e0 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.5"; - hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; + version = "2025.0"; + hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI="; }; in stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ 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} 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 From 8bad41cc0f0f1d452147412fed6110d6abc660ad Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 15 Feb 2025 19:17:29 +0100 Subject: [PATCH 20/38] gromacs: apply nixfmt --- .../molecular-dynamics/gromacs/default.nix | 163 ++++++++++-------- 1 file changed, 95 insertions(+), 68 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a62e716248e0..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 @@ -49,7 +57,8 @@ let hash = "sha256-onrTWmRilbvsEpq+aE2dA9Hi4L12sNYl6QVXRqrvroI="; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "gromacs"; version = source.version; @@ -64,58 +73,73 @@ in stdenv.mkDerivation rec { 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 + ]; }; } From 14c812068fbbd7c40fce2f2f46c312ffa35cd0cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 13:27:53 +0000 Subject: [PATCH 21/38] librime: 1.13.0 -> 1.13.1 --- pkgs/by-name/li/librime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index 6024dd411230..401b584ad24a 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-vkliraMsBLX05gae834R0LX4uT+XaxrfHmDkFPh1XIQ="; + sha256 = "sha256-pv1I/YFzPLOmBDcT4HcrJWSikPEErEB5UzGrGqfJBvg="; }; nativeBuildInputs = [ From 38dd3d76db02fc52e9e544d9f0dfefe23dc95dbd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 15:26:10 +0000 Subject: [PATCH 22/38] python312Packages.weblate-language-data: 2024.16 -> 2025.2 --- .../python-modules/weblate-language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 12c26e81e323..b1301c6237be 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2024.16"; + version = "2025.2"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-zPYUsOkYizkaGcN+orrR7mZKAq+4KuSXTZc1arsu/Xw="; + hash = "sha256-T3O107CQ01loE68vlQtcCjeytxCSiu0m5Oj5P06z2NU="; }; build-system = [ setuptools ]; From 220ccaf34801a29626352abd7fd370f36700240d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sun, 16 Feb 2025 22:13:43 +0100 Subject: [PATCH 23/38] python3Packages.owslib: 3.32.0 -> 3.32.1 --- pkgs/development/python-modules/owslib/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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; }; From dd3a29696846795609d422e1709187fc66c91312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 21:38:04 +0000 Subject: [PATCH 24/38] qownnotes: 25.2.1 -> 25.2.7 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = From 4119f477bd06efa314714239dea90fbe76aa9d65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 23:37:41 +0000 Subject: [PATCH 25/38] release-plz: 0.3.113 -> 0.3.120 --- pkgs/by-name/re/release-plz/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From c81bea025a337f6dc51f404bba426b3c859ae369 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 02:20:15 +0000 Subject: [PATCH 26/38] snpguest: 0.8.0 -> 0.8.3 --- pkgs/by-name/sn/snpguest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 5692c291e1ab6304c6b02f7fd27e15e62c7d4795 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Mon, 17 Feb 2025 03:54:02 +0100 Subject: [PATCH 27/38] vencord: 1.11.4 -> 1.11.5 --- pkgs/by-name/ve/vencord/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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="; } From cac2f0ab8c52aaab1297c58c56357531ea075cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 03:28:50 +0000 Subject: [PATCH 28/38] tparse: 0.16.0 -> 0.17.0 --- pkgs/by-name/tp/tparse/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From 787763a6796b08330d18d112ad674abb61894299 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Mon, 17 Feb 2025 04:19:41 +0000 Subject: [PATCH 29/38] ast-grep: 0.34.4 -> 0.35.0 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ]; From 2563d8e2f72da38781074ffb1275f850d087414b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 04:51:35 +0000 Subject: [PATCH 30/38] typos: 1.29.4 -> 1.29.7 --- pkgs/by-name/ty/typos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 { }; From 8612d22fc7fb0bb928199e4f5c11e0cd97adfdd8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 24 Jan 2025 23:40:14 +0800 Subject: [PATCH 31/38] calligraplan: init at 3.3.0 --- pkgs/by-name/ca/calligraplan/package.nix | 59 ++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/ca/calligraplan/package.nix diff --git a/pkgs/by-name/ca/calligraplan/package.nix b/pkgs/by-name/ca/calligraplan/package.nix new file mode 100644 index 000000000000..89394f1c697d --- /dev/null +++ b/pkgs/by-name/ca/calligraplan/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + qt5, + libsForQt5, + cmake, + extra-cmake-modules, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "calligraplan"; + version = "3.3.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "office"; + repo = "calligraplan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-szPdRxbzJ2+nmgp+1FwmKZwHEDV8EtbDW/3jsw4J6HI="; + }; + + buildInputs = [ + qt5.qtbase + libsForQt5.kdbusaddons + libsForQt5.kguiaddons + libsForQt5.ki18n + libsForQt5.kiconthemes + libsForQt5.kitemviews + libsForQt5.kjobwidgets + libsForQt5.kio + libsForQt5.knotifications + libsForQt5.kparts + libsForQt5.kinit + libsForQt5.kdiagram + libsForQt5.qt5.qtx11extras + ]; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + cmake + extra-cmake-modules + ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + homepage = "https://www.calligra.org/plan/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + description = "Project Management Application"; + mainProgram = "calligraplan"; + changelog = "https://invent.kde.org/office/calligraplan/-/tags/v${finalAttrs.version}"; + }; +}) From 52b94287f52b645098d5f663d8ab01688a527edc Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Mon, 17 Feb 2025 06:40:13 +0000 Subject: [PATCH 32/38] windsurf: 1.2.6 -> 1.3.4 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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" } } From 7dd3605083e895fe47419400a6d97197697e88ee Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 13 Feb 2025 19:15:22 +0800 Subject: [PATCH 33/38] greed: init at 4.3 --- pkgs/by-name/gr/greed/package.nix | 55 +++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 pkgs/by-name/gr/greed/package.nix diff --git a/pkgs/by-name/gr/greed/package.nix b/pkgs/by-name/gr/greed/package.nix new file mode 100644 index 000000000000..1b55c221fabf --- /dev/null +++ b/pkgs/by-name/gr/greed/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchFromGitLab, + ncurses, + asciidoctor, + gitUpdater, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "greed"; + version = "4.3"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "greed"; + tag = finalAttrs.version; + hash = "sha256-NmX0hYHODe55N0edhdfdm0a/Yqm/UwkU/RREjYl3ePc="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "-lcurses" "-lncurses" \ + --replace-fail "BIN=/usr/games" "BIN=$out/bin" \ + --replace-fail "/usr/share" "$out/share" \ + --replace-fail "/usr/games/lib/greed.hs" "/var/lib/greed/greed.hs" + ''; + + buildInputs = [ + ncurses + ]; + + nativeBuildInputs = [ + asciidoctor + ]; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man6 + ''; + + passthru = { + updateScript = gitUpdater { }; + }; + + meta = { + homepage = "http://www.catb.org/~esr/"; + platforms = lib.platforms.unix; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + description = "Game of Consumption"; + changelog = "https://gitlab.com/esr/greed/-/blob/${finalAttrs.version}/NEWS.adoc?ref_type=tags"; + mainProgram = "greed"; + }; +}) From 16415b03d4444c377ea51410837de12f1008c753 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 08:06:35 +0000 Subject: [PATCH 34/38] jjui: 0.3 -> 0.4 --- pkgs/by-name/jj/jjui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 23f714a34e30..ff554a3e3ae1 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "jjui"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${version}"; - hash = "sha256-J6Bw7/OtKuQ28gUxc7h+gdKmt98TmNqj5XZ6kLzvg3o="; + hash = "sha256-PAquHh3VVAhc4Tw1XkyKmwFbpLVkDRCMT+FGtqiydCA="; }; - vendorHash = "sha256-czUD0+1ZJJBpp+vYYEBBuWro6InokiPriKFyKvLSGD0="; + vendorHash = "sha256-MxTwe0S2wvkIy8VJl1p8utTX98zfcwpNgCdnpFAMxO0="; postFixup = '' mv $out/bin/cmd $out/bin/jjui From e78a48a4240e7a4f2a1d873a8eeacd68e83c7901 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Feb 2025 08:30:51 +0000 Subject: [PATCH 35/38] mago: 0.0.18 -> 0.10.0 --- pkgs/by-name/ma/mago/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index 51350e112414..691fa58d9964 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "mago"; - version = "0.0.18"; + version = "0.10.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = version; - hash = "sha256-QSb+5wlv8uFT2wTeJyfsz+vE4Kegqgi7Dqyl1KZU//U="; + hash = "sha256-NYAlLJsKI+twrlryVumjsOnY3xvEeLTO/rAFTZtE+KU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-XpLVe7ln3ZYs8HGE/52xI7op9ZGa4S5u419gE3nVgz0="; + cargoHash = "sha256-0AnJIrA15WC3LPiokwuX9w9riaaL5s2vqwhj4XRa6LM="; env = { # Get openssl-sys to use pkg-config From 4b13f0723830f7af086a123a5e5e2c5ab91732da Mon Sep 17 00:00:00 2001 From: misilelab Date: Mon, 17 Feb 2025 17:34:01 +0900 Subject: [PATCH 36/38] pnpm: 10.4.0 -> 10.4.1 Signed-off-by: misilelab --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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="; }; }; From 11c21de1bc52af6f29e7a6e929886bb3108b5f80 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 17 Feb 2025 09:30:32 +0000 Subject: [PATCH 37/38] snapcraft: 8.6.1 -> 8.7.0 --- pkgs/by-name/sn/snapcraft/package.nix | 20 ++++++------------- .../sn/snapcraft/snapcraft-data-dirs.patch | 20 +++++-------------- 2 files changed, 11 insertions(+), 29 deletions(-) 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] From eaee7b7a4515246c0316e9ef053b64cba6d6929c Mon Sep 17 00:00:00 2001 From: Tim <16214296+Tim-Wsm@users.noreply.github.com> Date: Sun, 9 Feb 2025 22:54:29 +0100 Subject: [PATCH 38/38] glibc_multi: add output "static" This change enables static compilation with glibc in a multilib setup. For building a nix shell the output can now be referenced as follows: devShells.default = pkgs.mkShell { packages = [ pkgs.glibc_multi.static ]; }; In the implementation I was forced to make two design decisions: 1. The directory `$static/lib64` has to be a "real" directory and not a symlink. Otherwise, the path to this directory is not added to $NIX_LDFLAGS, which in turn causes the files to not be visible to gcc and ld during the build process (for details see `pkgs/build-support/bintools-wrapper/setup-hook.sh` line 16). 2. The directories `$static/lib` and `$static/lib64` have to contain symlinks to both the files used for static and for dynamic linking (i.e. the outputs of `static` and `out` of the 32 and 64 bit variant of glibc). Without this, dynamic linking still works, however the resulting binaries will segfault. --- pkgs/development/libraries/glibc/multi.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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" ''