gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-07-01 18:01:14 +00:00
committed by GitHub
parent 154ddc1cec cfdae65b07
commit 1addc8dd4c
53 changed files with 417 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maintainers/maintainer-list.nix
+1 -1
View File
@@ -12961,7 +12961,7 @@
name = "Merlin Humml";
};
mguentner = {
email = "code@klandest.in";
email = "code@mguentner.de";
github = "mguentner";
githubId = 668926;
name = "Maximilian Güntner";
nixos/modules/system/boot/initrd-ssh.nix
+9 -1
View File
@@ -166,6 +166,10 @@ in
UseDNS no
''}
${optionalString (!config.boot.initrd.systemd.enable) ''
SshdSessionPath /bin/sshd-session
''}
${cfg.extraConfig}
'';
in mkIf enabled {
@@ -191,6 +195,7 @@ in
boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
copy_bin_and_libs ${package}/bin/sshd
copy_bin_and_libs ${package}/libexec/sshd-session
cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
'';
@@ -265,7 +270,10 @@ in
config.boot.initrd.network.ssh.authorizedKeys ++
(map (file: lib.fileContents file) config.boot.initrd.network.ssh.authorizedKeyFiles));
};
storePaths = ["${package}/bin/sshd"];
storePaths = [
"${package}/bin/sshd"
"${package}/libexec/sshd-session"
];
services.sshd = {
description = "SSH Daemon";
pkgs/applications/blockchains/ledger-live-desktop/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
let
pname = "ledger-live-desktop";
version = "2.81.2";
version = "2.83.0";
src = fetchurl {
url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E=";
hash = "sha256-W7K6jRM248PCsUEVhIPeb2em70QwKJ/20RgKzuwj29g=";
};
appimageContents = appimageTools.extractType2 {
pkgs/applications/editors/vim/plugins/generated.nix
+12
View File
@@ -17515,5 +17515,17 @@ final: prev:
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
Preview-nvim = buildVimPlugin {
pname = "Preview.nvim";
version = "2024-06-01";
src = fetchFromGitHub {
owner = "henriklovhaug";
repo = "Preview.nvim";
rev = "388882f3bfd09bcb0d5b4ab3d0fa5bc2dacbbc2e";
sha256 = "sha256-Tnl2TkLY9QXk/5qX2LcX5G2aq/sysH6BnD2YqXlneIU=";
};
meta.homepage = "https://github.com/henriklovhaug/Preview.nvim/";
};
}
pkgs/applications/editors/vim/plugins/overrides.nix
+11
View File
@@ -79,6 +79,8 @@
, CoreServices
, # nvim-treesitter dependencies
callPackage
, # Preview-nvim dependencies
md-tui
, # sg.nvim dependencies
darwin
, # sved dependencies
@@ -1275,6 +1277,15 @@
nvimRequireCheck = "plenary";
};
Preview-nvim = super.Preview-nvim.overrideAttrs {
patches = [
(substituteAll {
src = ./patches/preview-nvim/hardcode-mdt-binary-path.patch;
mdt = lib.getExe md-tui;
})
];
};
range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
dependencies = with self; [ cmd-parser-nvim ];
};
pkgs/applications/editors/vim/plugins/patches/preview-nvim/hardcode-mdt-binary-path.patch
+22
View File
@@ -0,0 +1,22 @@
diff --git a/lua/preview.lua b/lua/preview.lua
index 6d9875d..729cc70 100644
--- a/lua/preview.lua
+++ b/lua/preview.lua
@@ -28,7 +28,7 @@ local function open_window(file)
vim.env.MDT_WIDTH = width
vim.cmd.vnew()
- vim.fn.termopen("mdt " .. file)
+ vim.fn.termopen("@mdt@ " .. file)
vim.cmd("setlocal nonumber norelativenumber")
vim.api.nvim_feedkeys("a", "t", false)
@@ -49,7 +49,7 @@ end
function M.setup()
-- Check if "mdt" is installed
if vim.fn.executable("mdt") == 0 then
- install()
+ -- install()
end
set_cmd()
pkgs/applications/editors/vim/plugins/vim-plugin-names
+1
View File
@@ -21,6 +21,7 @@ https://github.com/numToStr/Navigator.nvim/,,
https://github.com/overcache/NeoSolarized/,,
https://github.com/chrisbra/NrrwRgn/,,
https://github.com/vim-scripts/PreserveNoEOL/,,
https://github.com/henriklovhaug/Preview.nvim/,HEAD,
https://github.com/yssl/QFEnter/,,
https://github.com/chrisbra/Recover.vim/,,
https://github.com/vim-scripts/Rename/,,
pkgs/applications/graphics/shotwell/default.nix
+2 -2
View File
@@ -37,11 +37,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shotwell";
version = "0.32.6";
version = "0.32.7";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY=";
sha256 = "sha256-EvMl4BnD5jjCuWFXG8IEd2dh6CYUZ+8btodViJM11fc=";
};
nativeBuildInputs = [
pkgs/applications/networking/seaweedfs/default.nix
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "seaweedfs";
version = "3.68";
version = "3.69";
src = fetchFromGitHub {
owner = "seaweedfs";
repo = "seaweedfs";
rev = version;
hash = "sha256-ncA6YXa/focfmPMdEQWbeUxrLhwCqQiPqjP0SovLB2c=";
hash = "sha256-stbp4SqBXTZv5QXDwslsg/Y4lhkPGbwcslWZTR3c2v0=";
};
vendorHash = "sha256-YgrDzfcp1Lh8bOI1FF7bTBquaShhgE9nZ/+7mvFiQCc=";
vendorHash = "sha256-OfLC7a2+YM95F/anrwvhTw4mc72ogBZfLEPDUKMn9IE=";
subPackages = [ "weed" ];
pkgs/applications/science/math/qalculate-gtk/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-gtk";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${finalAttrs.version}";
hash = "sha256-yI+8TrNZJt4eJnDX5mk6RozBe2ZeP7sTyAjsgiYQPck=";
hash = "sha256-vH4GZaeQ6Ji9aWh8R5B6PE2fBBW7KTyCsFkpgHu6yg8=";
};
hardeningDisable = [ "format" ];
pkgs/applications/science/math/qalculate-qt/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "qalculate-qt";
version = "5.1.0";
version = "5.2.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-qt";
rev = "v${finalAttrs.version}";
hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow=";
hash = "sha256-jlzuLLEFi72ElVBJSRikrMMaHIVWKRUAWGyeqzuj7xw=";
};
nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
pkgs/applications/virtualization/cri-o/default.nix
+2 -2
View File
@@ -15,13 +15,13 @@
buildGoModule rec {
pname = "cri-o";
version = "1.30.2";
version = "1.30.3";
src = fetchFromGitHub {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc=";
hash = "sha256-Cv76S2Ylsjzjc6rjCcRJyFjrIrm76I5pqDa1FI+Oq9s=";
};
vendorHash = null;
pkgs/by-name/an/antimatter-dimensions/package.nix
+3 -3
View File
@@ -18,12 +18,12 @@ let
in
buildNpmPackage rec {
pname = "antimatter-dimensions";
version = "0-unstable-2024-05-11";
version = "0-unstable-2024-06-28";
src = fetchFromGitHub {
owner = "IvarK";
repo = "AntimatterDimensionsSourceCode";
rev = "b3a254af60207a03d04473bb81726e921f5b2c61";
hash = "sha256-+G9mNilt5Ewja5P+Bt312EcCJknMu7FOMn5b4FseAyQ=";
rev = "aeaa7a358f605073172ec9eaa28ff6544edca5a5";
hash = "sha256-rXFXoSOtYeLIBQzJ/J+FMSp9CKHOCzq3HxQMd2Bpm3E=";
};
nativeBuildInputs = [
copyDesktopItems
pkgs/by-name/ca/cargo-xwin/package.nix
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-xwin";
version = "0.17.0";
version = "0.17.1";
src = fetchFromGitHub {
owner = "rust-cross";
repo = "cargo-xwin";
rev = "v${version}";
hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g=";
hash = "sha256-6IPkNTwSh5aYQUd0MBmAeQ+iv0owxHwgdQWcjsdoEnA=";
};
cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY=";
cargoHash = "sha256-lhlqMaqrmEbv2btOf4awtZfEmMVeHGc1JhCpRRlnr90=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
pkgs/by-name/ko/kor/package.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kor";
version = "0.5.1";
version = "0.5.2";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
hash = "sha256-mGHSfOW40NTFK1csckSNriCYF2bEQD/M1Zs34i3PptI=";
hash = "sha256-iwulXSS6nRwoQUPkQMkBbgJM0ityrGx1T+1s1la/lnM=";
};
vendorHash = "sha256-9aZy1i0VrDRySt5A5aQHBXa0mPgD+rsyeqQrd6snWKc=";
pkgs/by-name/oh/oh-my-posh/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "21.9.1";
version = "21.17.2";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-QzIKxvG1fg6f4Xk18XBXYirvD1cPmvzwXZoaLhSeuTI=";
hash = "sha256-9+gzjDxkDMOy7r3M6MVepNJ44HJszyzYs5LrM8x3m6Q=";
};
vendorHash = "sha256-N71kM9T8EHh/i8NUSxfPaIRlWk/WADieCkObhVcSyEU=";
vendorHash = "sha256-yArae/1TxiQkNCkElFOHdujWzLCfltSV72I8tQKDyw8=";
sourceRoot = "${src.name}/src";
pkgs/by-name/pa/paper-plane/package.nix
+5
View File
@@ -16,6 +16,7 @@
, blueprint-compiler
, libxml2
, libshumate
, gst_all_1
, darwin
}:
@@ -96,6 +97,10 @@ stdenv.mkDerivation {
libadwaita-paperplane
tdlib-paperplane
rlottie-paperplane
gst_all_1.gstreamer
gst_all_1.gst-libav
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
];
pkgs/development/libraries/science/math/petsc/filter_mpi_warnings.patch → pkgs/by-name/pe/petsc/filter_mpi_warnings.patch
+36 -24
View File
@@ -1,12 +1,12 @@
diff --git a/src/snes/tutorials/makefile b/src/snes/tutorials/makefile
index 672a62a..a5fd1c4 100644
index fa15faad39e..7670e80931e 100644
--- a/src/snes/tutorials/makefile
+++ b/src/snes/tutorials/makefile
@@ -13,6 +13,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules
@@ -13,6 +13,7 @@ ex55: ex55.o ex55k.o
# these tests are used by the makefile in PETSC_DIR for basic tests of the install and should not be removed
testex5f: ex5f.PETSc
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex5f -snes_rtol 1e-4 > ex5f_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex5f_1.tmp; \
if (${DIFF} output/ex5f_1.testout ex5f_1.tmp > /dev/null 2>&1) then \
echo "Fortran example src/snes/tutorials/ex5f run successfully with 1 MPI process"; \
else \
@@ -14,7 +14,7 @@ index 672a62a..a5fd1c4 100644
${MAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} ex5f.rm;
testex19: ex19.PETSc
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 1 MPI process"; \
else \
@@ -22,7 +22,7 @@ index 672a62a..a5fd1c4 100644
${RM} -f ex19_1.tmp;
testex19_mpi:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with 2 MPI processes"; \
else \
@@ -30,71 +30,83 @@ index 672a62a..a5fd1c4 100644
#use unpreconditioned norm because HYPRE device installations use different AMG parameters
runex19_hypre:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE"; \
else \
@@ -57,6 +61,7 @@ runex19_hypre:
${RM} -f ex19_1.tmp
runex19_hypre_cuda:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type cuda -dm_mat_type aijcusparse -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/cuda"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/CUDA"; \
else \
@@ -66,6 +71,7 @@ runex19_hypre_cuda:
${RM} -f ex19_1.tmp
runex19_hypre_hip:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -dm_vec_type hip -da_refine 3 -snes_monitor_short -ksp_norm_type unpreconditioned -pc_type hypre > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_hypre.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with hypre/hip"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with HYPRE/HIP"; \
else \
@@ -75,6 +81,7 @@ runex19_hypre_hip:
${RM} -f ex19_1.tmp
runex19_cuda:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -pc_gamg_esteig_ksp_max_it 10 -ksp_monitor -mg_levels_ksp_max_it 3 > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -snes_monitor -dm_mat_type seqaijcusparse -dm_vec_type seqcuda -pc_type gamg -ksp_monitor -mg_levels_ksp_max_it 1 > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_cuda_1.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with cuda"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with CUDA"; \
else \
@@ -84,6 +91,7 @@ runex19_cuda:
${RM} -f ex19_1.tmp
runex19_ml:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type ml > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_ml.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with ml"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with ML"; \
else \
@@ -93,6 +101,7 @@ runex19_ml:
${RM} -f ex19_1.tmp
runex19_fieldsplit_mumps:
-@${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex19 -pc_type fieldsplit -pc_fieldsplit_block_size 4 -pc_fieldsplit_type SCHUR -pc_fieldsplit_0_fields 0,1,2 -pc_fieldsplit_1_fields 3 -fieldsplit_0_pc_type lu -fieldsplit_1_pc_type lu -snes_monitor_short -ksp_monitor_short -fieldsplit_0_pc_factor_mat_solver_type mumps -fieldsplit_1_pc_factor_mat_solver_type mumps > ex19_6.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_6.tmp; \
if (${DIFF} output/ex19_fieldsplit_5.out ex19_6.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with mumps"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with MUMPS"; \
else \
@@ -102,6 +111,7 @@ runex19_fieldsplit_mumps:
${RM} -f ex19_6.tmp
runex19_superlu_dist:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_grid_x 20 -da_grid_y 20 -pc_type lu -pc_factor_mat_solver_type superlu_dist > ex19.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19.tmp; \
if (${DIFF} output/ex19_superlu.out ex19.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with superlu_dist"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuperLU_DIST"; \
else \
@@ -111,6 +121,7 @@ runex19_superlu_dist:
${RM} -f ex19.tmp
runex19_suitesparse:
-@${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex19 -da_refine 3 -snes_monitor_short -pc_type lu -pc_factor_mat_solver_type umfpack > ex19_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex19_1.tmp; \
if (${DIFF} output/ex19_suitesparse.out ex19_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with suitesparse"; \
echo "C/C++ example src/snes/tutorials/ex19 run successfully with SuiteSparse"; \
else \
@@ -120,6 +131,7 @@ runex19_suitesparse:
${RM} -f ex19_1.tmp
runex3k_kokkos: ex3k.PETSc
-@OMP_PROC_BIND=false ${MPIEXEC} -n 2 ${MPIEXEC_TAIL} ./ex3k -view_initial -dm_vec_type kokkos -dm_mat_type aijkokkos -use_gpu_aware_mpi 0 -snes_monitor > ex3k_1.tmp 2>&1 ;\
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
+ sed -i '/hwloc\/linux/d ; /ERROR scandir(\/sys\/class\/net) failed/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex3k_1.tmp; \
if (${DIFF} output/ex3k_1.out ex3k_1.tmp) then \
echo "C/C++ example src/snes/tutorials/ex3k run successfully with kokkos-kernels"; \
echo "C/C++ example src/snes/tutorials/ex3k run successfully with Kokkos Kernels"; \
else \
diff --git a/src/vec/vec/tests/makefile b/src/vec/vec/tests/makefile
index d1f047820ec..aab400535dd 100644
--- a/src/vec/vec/tests/makefile
+++ b/src/vec/vec/tests/makefile
@@ -5,6 +5,7 @@ include ${PETSC_DIR}/lib/petsc/conf/rules
runex47: ex47.PETSc
-@H5OUT=`mktemp -t petsc.h5.XXXXXX`; ${MPIEXEC} -n 1 ${MPIEXEC_TAIL} ./ex47 -filename $${H5OUT} > ex47_1.tmp 2>&1; \
+ sed -i '/hwloc\/linux/d ; /ERROR opendir(\/sys\/class\/net) failed/d' ex47_1.tmp; \
if (${DIFF} output/ex47_1.out ex47_1.tmp) then \
echo "C/C++ example src/vec/vec/tests/ex47 run successfully with HDF5"; \
else \
pkgs/by-name/pe/petsc/package.nix
+131
View File
@@ -0,0 +1,131 @@
{
lib,
stdenv,
fetchzip,
darwin,
gfortran,
python3,
blas,
lapack,
mpiSupport ? true,
mpi, # generic mpi dependency
openssh, # required for openmpi tests
petsc-withp4est ? false,
hdf5-support ? false,
hdf5,
metis,
parmetis,
pkg-config,
p4est,
zlib, # propagated by p4est but required by petsc
petsc-optimized ? false,
petsc-scalar-type ? "real",
petsc-precision ? "double",
}:
# This version of PETSc does not support a non-MPI p4est build
assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.21.0";
src = fetchzip {
url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz";
hash = "sha256-2J6jtIKz1ZT9qwN8tuYQNBIeBJdE4Gt9cE3b5rTIeF4=";
};
inherit mpiSupport;
withp4est = petsc-withp4est;
strictDeps = true;
nativeBuildInputs = [
python3
gfortran
pkg-config
] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh;
buildInputs = [
blas
lapack
] ++ lib.optional hdf5-support hdf5 ++ lib.optional withp4est p4est;
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/install.py \
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
'';
# Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
# [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery.
# [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory
# These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages.
patches = [ ./filter_mpi_warnings.patch ];
preConfigure = ''
patchShebangs ./lib/petsc/bin
configureFlagsArray=(
$configureFlagsArray
${
if !mpiSupport then
''
"--with-mpi=0"
''
else
''
"--CC=mpicc"
"--with-cxx=mpicxx"
"--with-fc=mpif90"
"--with-mpi=1"
"--with-metis=1"
"--with-metis-dir=${metis}"
"--with-parmetis=1"
"--with-parmetis-dir=${parmetis}"
''
}
${lib.optionalString withp4est ''
"--with-p4est=1"
"--with-zlib-include=${zlib.dev}/include"
"--with-zlib-lib=-L${zlib}/lib -lz"
''}
${lib.optionalString hdf5-support ''
"--with-hdf5=1"
"--with-hdf5-fortran-bindings=1"
"--with-hdf5-lib=-L${hdf5}/lib -lhdf5"
"--with-hdf5-include=${hdf5.dev}/include"
''}
"--with-blas=1"
"--with-lapack=1"
"--with-scalar-type=${petsc-scalar-type}"
"--with-precision=${petsc-precision}"
${lib.optionalString petsc-optimized ''
"--with-debugging=0"
COPTFLAGS='-O3'
FOPTFLAGS='-O3'
CXXOPTFLAGS='-O3'
CXXFLAGS='-O3'
''}
)
'';
hardeningDisable = lib.optionals (!petsc-optimized) [
"fortify"
"fortify3"
];
configureScript = "python ./configure";
enableParallelBuilding = true;
# This is needed as the checks need to compile and link the test cases with
# -lpetsc, which is not available in the checkPhase, which is executed before
# the installPhase. The installCheckPhase comes after the installPhase, so
# the library is installed and available.
doInstallCheck = true;
installCheckTarget = "check_install";
meta = with lib; {
description = "Portable Extensible Toolkit for Scientific computation";
homepage = "https://petsc.org/release/";
license = licenses.bsd2;
maintainers = with maintainers; [ cburstedde ];
};
}
pkgs/by-name/pr/proto/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "proto";
version = "0.37.1";
version = "0.37.2";
src = fetchFromGitHub {
owner = "moonrepo";
repo = pname;
rev = "v${version}";
hash = "sha256-IqXxjR+M1OCRKUA2HCT6WQvdBMOa0efT8m+drhyQCoE=";
hash = "sha256-tzDh8LMxIRYJszgUvAMEWWiSjasSnyz2cOrmNnmaLOg=";
};
cargoHash = "sha256-NnTiT1jLMo9EfYau+U0FiAC+V67GnoI90vSsotwniio=";
cargoHash = "sha256-JxJlOcTqjQP5MA4em+8jArr0ewCbVibQvLjr+kzn7EM=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.SystemConfiguration
pkgs/by-name/st/stats/package.nix
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
version = "2.10.18";
version = "2.10.19";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
hash = "sha256-iBo6rP8V7jGTFaKyd3er3L2EWW3slCyV6eFoJT3w7z8=";
hash = "sha256-1mmKpcJJdEiX/KZkE/VnL/xMrNzlq1LSAr5z3CdoPMI=";
};
sourceRoot = ".";
pkgs/by-name/we/werf/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "werf";
version = "2.6.2";
version = "2.6.4";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-jZNypjCmMlDAthoLJiV/82vUbugGi4vP5SNZbasG7YE=";
hash = "sha256-dm4rzAP/sp6j8aCsZJbf7TBx7pmjetP2374IAury+kg=";
};
vendorHash = "sha256-x64PKLLkvHKW6lbxWSfAQ5xVy6JpGbCAslfz1seUQ2g=";
vendorHash = "sha256-3p8zoZyH042jmhOD6WGGcHnHhLqm7gMnlaiRZu1OWmE=";
proxyVendor = true;
pkgs/desktops/cinnamon/cinnamon-common/default.nix
+2 -2
View File
@@ -71,13 +71,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "6.2.2";
version = "6.2.3";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-iivrPSzmvhImfrOD2Ec6BjbtRpHAQs71N/UDSPoZwTE=";
hash = "sha256-u5QsUFRXPVsk9T7tVmuOpTaAxdMIJs5yPVcWM1olXz8=";
};
patches = [
pkgs/desktops/cinnamon/mint-l-theme/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-l-theme";
version = "1.9.7";
version = "1.9.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-pgb1lkrBRDYgfrLx0/afEuTz+5gZt/IG1u+dn4V7Spo=";
hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk=";
};
nativeBuildInputs = [
pkgs/desktops/cinnamon/mint-themes/default.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mint-themes";
version = "2.1.7";
version = "2.1.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-pakD7qVlivokFlIBNjibOkneS6WV4BBOBePWSOjVVy0=";
hash = "sha256-mkcIhZRaOUom1Rurz/IO646FSF50efLN6xfesPdyVHc=";
};
nativeBuildInputs = [
pkgs/desktops/cinnamon/nemo/default.nix
+2 -2
View File
@@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "6.2.1";
version = "6.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-c6asFiDpFctNn+ap0cRptdFbjv5blTaJqDuzZ1Je+3I=";
sha256 = "sha256-afK+iJ/WUtcs8Upid4AkbAZAIs/wimHFlXm717U0LHc=";
};
patches = [
pkgs/development/compilers/llvm/git/default.nix
+3 -3
View File
@@ -20,9 +20,9 @@
# LLVM release information; specify one of these but not both:
, gitRelease ? {
version = "19.0.0-git";
rev = "a9ac31910db3975d5e92a6265ab29dafd6a4691d";
rev-version = "19.0.0-unstable-2024-06-23";
sha256 = "sha256-MTt2FU84rgu6FqB9aCO6M54VZexoogkdx5RKS1NzSkk=";
rev = "9b9405621bcc55b74d2177c960c21f62cc95e6fd";
rev-version = "19.0.0-unstable-2024-06-30";
sha256 = "sha256-Tlk+caav7e7H6bha8YQyOl+x2iNk9iH7xKpHQkWQyJ4=";
}
# i.e.:
# {
pkgs/development/libraries/agda/generics/default.nix
+28
View File
@@ -0,0 +1,28 @@
{ lib, mkDerivation, fetchFromGitHub, standard-library }:
mkDerivation rec {
pname = "generics";
version = "1.0.1";
src = fetchFromGitHub {
owner = "flupe";
repo = pname;
rev = "v${version}";
sha256 = "sha256-B1eT6F0Dp2zto50ulf+K/KYMlMp8Pgc/tO9qkcqn+O8=";
};
buildInputs = [
standard-library
];
# everythingFile = "./README.agda";
meta = with lib; {
description =
"Library for datatype-generic programming in Agda";
homepage = src.meta.homepage;
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ turion ];
};
}
pkgs/development/libraries/igraph/default.nix
+2 -2
View File
@@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&
stdenv.mkDerivation (finalAttrs: {
pname = "igraph";
version = "0.10.12";
version = "0.10.13";
src = fetchFromGitHub {
owner = "igraph";
repo = finalAttrs.pname;
rev = finalAttrs.version;
hash = "sha256-ITXkdCyUtuFhgHHmy3P4ZX6GgzyxVUYz4knCCPHGClc=";
hash = "sha256-c5yZI5AfaO/NFyy88efu1COb+T2r1LpHhUTfilw2H1U=";
};
postPatch = ''
pkgs/development/libraries/nss/latest.nix
+2 -2
View File
@@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.101";
hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts=";
version = "3.101.1";
hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
}
pkgs/development/libraries/science/math/petsc/default.nix
-96
View File
@@ -1,96 +0,0 @@
{ lib
, stdenv
, fetchurl
, darwin
, gfortran
, python3
, blas
, lapack
, mpiSupport ? true
, mpi # generic mpi dependency
, openssh # required for openmpi tests
, petsc-withp4est ? false
, p4est
, zlib # propagated by p4est but required by petsc
, petsc-optimized ? false
, petsc-scalar-type ? "real"
, petsc-precision ? "double"
}:
# This version of PETSc does not support a non-MPI p4est build
assert petsc-withp4est -> p4est.mpiSupport;
stdenv.mkDerivation rec {
pname = "petsc";
version = "3.19.4";
src = fetchurl {
url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
sha256 = "sha256-fJQbcb5Sw7dkIU5JLfYBCdEvl/fYVMl6RN8MTZWLOQY=";
};
inherit mpiSupport;
withp4est = petsc-withp4est;
strictDeps = true;
nativeBuildInputs = [ python3 gfortran ]
++ lib.optional mpiSupport mpi
++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh
;
buildInputs = [ blas lapack ]
++ lib.optional withp4est p4est
;
prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/install.py \
--replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
'';
# Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
# [hwloc/linux] failed to find sysfs cpu topology directory, aborting linux discovery.
# [1684747490.391106] [localhost:14258:0] tcp_iface.c:837 UCX ERROR opendir(/sys/class/net) failed: No such file or directory
# These messages contaminate test output, which makes the quicktest suite to fail. The patch adds filtering for these messages.
patches = [ ./filter_mpi_warnings.patch ];
preConfigure = ''
patchShebangs ./lib/petsc/bin
configureFlagsArray=(
$configureFlagsArray
${if !mpiSupport then ''
"--with-mpi=0"
'' else ''
"--CC=mpicc"
"--with-cxx=mpicxx"
"--with-fc=mpif90"
"--with-mpi=1"
''}
${lib.optionalString withp4est ''
"--with-p4est=1"
"--with-zlib-include=${zlib.dev}/include"
"--with-zlib-lib=-L${zlib}/lib -lz"
''}
"--with-blas=1"
"--with-lapack=1"
"--with-scalar-type=${petsc-scalar-type}"
"--with-precision=${petsc-precision}"
${lib.optionalString petsc-optimized ''
"--with-debugging=0"
COPTFLAGS='-g -O3'
FOPTFLAGS='-g -O3'
CXXOPTFLAGS='-g -O3'
''}
)
'';
configureScript = "python ./configure";
enableParallelBuilding = true;
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
meta = with lib; {
description = "Portable Extensible Toolkit for Scientific computation";
homepage = "https://www.mcs.anl.gov/petsc/index.html";
license = licenses.bsd2;
maintainers = with maintainers; [ cburstedde ];
};
}
pkgs/development/python-modules/frigidaire/default.nix
+2 -2
View File
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "frigidaire";
version = "0.18.19";
version = "0.18.21";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "bm1549";
repo = "frigidaire";
rev = "refs/tags/${version}";
hash = "sha256-wbYijFiMk+EIAjD6+mKt/c6JwN9oQLfeL1Pk30RbKKs=";
hash = "sha256-7fpVFKhLXBD0ec2mGfbFHygaH8BtOIOd5NoYz03IKp8=";
};
postPatch = ''
pkgs/development/python-modules/polyswarm-api/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "polyswarm-api";
version = "3.7.0";
version = "3.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "polyswarm";
repo = "polyswarm-api";
rev = "refs/tags/${version}";
hash = "sha256-zEh8qus/+3mcAaY+SK6FLT6wB6UtGLKPoR1WVZdn9vM=";
hash = "sha256-AH0DJYmZL+EejIkhy97JyekdB6ywf49kka0C2sDbdlY=";
};
pythonRelaxDeps = [ "future" ];
pkgs/development/python-modules/sacn/default.nix
+2 -2
View File
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "sacn";
version = "1.9.1";
version = "1.10.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-ppXWRBZVm4QroxZ19S388sRuI5zpaDgJrJqhnwefr3k=";
hash = "sha256-Z2Td/tdXYfQ9/QvM1NeT/OgQ/TYa3CQtWo8O1Dl3+Ao=";
};
# no tests
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1177";
version = "3.0.1178";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-sGbbeyKwDjXvV+LFozBclS2lltrZnafBOy62GP6XDMA=";
hash = "sha256-5G+XVi1wmvWanBgra6JokLmfPaYIEETjQOAWV/mqTAI=";
};
build-system = [ setuptools ];
pkgs/development/python-modules/tesla-fleet-api/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.6.1";
version = "0.6.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}";
hash = "sha256-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE=";
hash = "sha256-kkyRQ2cYldx4vK5hAo6LOr+k3YqJihKreE+DTNVHYdM=";
};
build-system = [ setuptools ];
pkgs/development/tools/analysis/checkov/default.nix
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.156";
version = "3.2.159";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-RcYDvxqAyvXFdVo3NqISNJ2aDCUsRwN73r3ilc3IjCk=";
hash = "sha256-ZWJf499yr4aOrNHNaoaQ+t4zxCUZrw3FzEytEkGcAnk=";
};
patches = [ ./flake8-compat-5.x.patch ];
pkgs/development/tools/kubie/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kubie";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "sbstp";
repo = "kubie";
sha256 = "sha256-3sFtYUFUYYHDqF22XJ+pmg+fW2f03IS5CgIXjWg2+Bo=";
sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM=";
};
cargoHash = "sha256-9eUGGDBoeF6EM3Np95rFHU3luGuVZk5iE4kIYlUnEEw=";
cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk=";
nativeBuildInputs = [ installShellFiles ];
pkgs/development/tools/misc/act/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "act";
version = "0.2.63";
version = "0.2.64";
src = fetchFromGitHub {
owner = "nektos";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-umYP/U1UjqWbF1YDZYbQrlMubhxr80FFBDS1NeiI9wI=";
hash = "sha256-r/d961IQVZgKh1eT7tFE1KFVwMhp7E8z+jV1AaqBtiQ=";
};
vendorHash = "sha256-Dt6V1zngSra4ZMSboHzreqwxgH5ovMIB+Bq3eWK6tjA=";
vendorHash = "sha256-FveFo78LuTFKEch/5uqdwksS6c7MLbl+xQvZGSVmTko=";
doCheck = false;
pkgs/os-specific/linux/nvidia-x11/builder.sh
+4 -2
View File
@@ -217,8 +217,10 @@ installPhase() {
--set-rpath $out/lib:$libPath $bin/bin/$i
fi
done
# FIXME: needs PATH and other fixes
# install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
substituteInPlace nvidia-bug-report.sh \
--replace /bin/grep grep \
--replace /bin/ls ls
install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh
fi
runHook postInstall
pkgs/servers/misc/gobgpd/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "gobgpd";
version = "3.27.0";
version = "3.28.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "refs/tags/v${version}";
hash = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8=";
hash = "sha256-HdGRZrMukIQLxTmwTVB/zUlnrhDjq5b6ree7aqx8pRE=";
};
vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A=";
pkgs/servers/sql/dolt/default.nix
+3 -3
View File
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "dolt";
version = "1.41.0";
version = "1.41.1";
src = fetchFromGitHub {
owner = "dolthub";
repo = "dolt";
rev = "v${version}";
sha256 = "sha256-IeLG2IRHGrx5F3tIcvilhgC9BUFHpIpbzTo6vdQj+ZE=";
sha256 = "sha256-f2diF3mC+OlyCJ5mifC5ueQD2yWuHTGBMZiNvgUReGM=";
};
modRoot = "./go";
subPackages = [ "cmd/dolt" ];
vendorHash = "sha256-bqTw4k2WWE7vsp36Ldexnp/eoFOBUL5po8lZzsbv7D4=";
vendorHash = "sha256-3VP1uQ6AIZna1JH4L86JkW0udbE6miN1dVrQR4hE1u4=";
proxyVendor = true;
doCheck = false;
pkgs/tools/audio/spotdl/default.nix
+3
View File
@@ -20,6 +20,9 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = true;
# Remove when https://github.com/spotDL/spotify-downloader/issues/2119 is fixed
patches = [ ./is_lrc_valid-failure.patch ];
dependencies = with python3.pkgs; [
bandcamp-api
beautifulsoup4
pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch
+65
View File
@@ -0,0 +1,65 @@
From 0c1357470450d98b3b7fe5444ac460ba9ee04425 Mon Sep 17 00:00:00 2001
From: Jeremy Cutler <jerz4lunch@users.noreply.github.com>
Date: Mon, 17 Jun 2024 02:19:33 -0700
Subject: [PATCH 1/2] Update lrc.py for updated function in python-syncedlyrics
See syncedlyrics commit: [here](https://github.com/moehmeni/syncedlyrics/commit/64d3f9de3d17bec69cbc3b3b5acd1ab847fde4b2)
---
spotdl/utils/lrc.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py
index 726fefbee..e59490b53 100644
--- a/spotdl/utils/lrc.py
+++ b/spotdl/utils/lrc.py
@@ -7,7 +7,7 @@
from pathlib import Path
from syncedlyrics import search as syncedlyrics_search
-from syncedlyrics.utils import is_lrc_valid, save_lrc_file
+from syncedlyrics.utils import has_translation, save_lrc_file
from spotdl.types.song import Song
@@ -25,7 +25,7 @@ def generate_lrc(song: Song, output_file: Path):
- output_file: Path to the output file
"""
- if song.lyrics and is_lrc_valid(song.lyrics):
+ if song.lyrics and has_translation(song.lyrics):
lrc_data = song.lyrics
else:
try:
From bfa9456049132e64b5c83655bdeae7c9dcd1b532 Mon Sep 17 00:00:00 2001
From: Jeremy Cutler <jerz4lunch@users.noreply.github.com>
Date: Wed, 26 Jun 2024 18:06:59 -0700
Subject: [PATCH 2/2] Update lrc.py
Seems to have fixed the update of syncedlyrics to 1.0.0
---
spotdl/utils/lrc.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py
index e59490b53..cf7478214 100644
--- a/spotdl/utils/lrc.py
+++ b/spotdl/utils/lrc.py
@@ -7,7 +7,7 @@
from pathlib import Path
from syncedlyrics import search as syncedlyrics_search
-from syncedlyrics.utils import has_translation, save_lrc_file
+from syncedlyrics.utils import has_translation, Lyrics
from spotdl.types.song import Song
@@ -34,7 +34,7 @@ def generate_lrc(song: Song, output_file: Path):
lrc_data = None
if lrc_data:
- save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data)
+ Lyrics.save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data)
logger.debug("Saved lrc file for %s", song.display_name)
else:
logger.debug("No lrc file found for %s", song.display_name)
pkgs/tools/misc/open-pdf-sign/default.nix
+2 -2
View File
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation (finalAttrs: {
version = "0.2.0";
version = "0.2.1";
pname = "open-pdf-sign";
src = fetchurl {
url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${finalAttrs.version}/open-pdf-sign.jar";
hash = "sha256-W4WymhjLrHtNK5XY8aahpZOIIh/Qp9scE3zybXF6/9o=";
hash = "sha256-jtaEystCiZUK93HkVPuWzAUISO4RMMxjMmFbooWZJGU=";
};
nativeBuildInputs = [
pkgs/tools/misc/topgrade/default.nix
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "14.0.1";
version = "15.0.0";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
hash = "sha256-opTMV+OH8PR9SxBWj1o8xSngK0QdindDcXyd6TRjdvI=";
hash = "sha256-w3JsMUuARJ5UtA8Io3kzeNjXoa014YzyT8hHPwEgljQ=";
};
cargoHash = "sha256-pgYrUZAxoyllQp1HuVhbLR3za+Gx0l8Z2/Zq/KCOKZg=";
cargoHash = "sha256-DEZlpt9mOy/BOnvkkINz2+q3hUx2aBSzBfOVxv43w6g=";
nativeBuildInputs = [
installShellFiles
pkgs/tools/networking/gobgp/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gobgp";
version = "3.27.0";
version = "3.28.0";
src = fetchFromGitHub {
owner = "osrg";
repo = "gobgp";
rev = "v${version}";
sha256 = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8=";
sha256 = "sha256-HdGRZrMukIQLxTmwTVB/zUlnrhDjq5b6ree7aqx8pRE=";
};
vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A=";
pkgs/tools/networking/hysteria/default.nix
+3 -3
View File
@@ -4,16 +4,16 @@
}:
buildGoModule rec {
pname = "hysteria";
version = "2.4.5";
version = "2.5.0";
src = fetchFromGitHub {
owner = "apernet";
repo = pname;
rev = "app/v${version}";
hash = "sha256-dRVTlH+g/pwwacrdof3n8OeLMsgZswpOwvtAx13bZGo=";
hash = "sha256-vtGJRPQBOO8Ig794FJ3gTrR0LOZdWH1vAc7IcZSq/SE=";
};
vendorHash = "sha256-nrcREOp92jIB8CzdOevYufpIN6l9Tcg/B4tT15d5TOE=";
vendorHash = "sha256-1VLws98/iAW8BnxOhbshp01D6+kb4CJOvncC5floN5o=";
proxyVendor = true;
ldflags =
pkgs/tools/security/cariddi/default.nix
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "cariddi";
version = "1.3.4";
version = "1.3.5";
src = fetchFromGitHub {
owner = "edoardottt";
repo = "cariddi";
rev = "refs/tags/v${version}";
hash = "sha256-Hgz+/DEoCo4lxcFkawQgIc3ct7cc2NwpAnfBtZQruf0=";
hash = "sha256-mRrUTRknax3b4hs3frQMzg0GyB3WjMDZJk0RQSAC88U=";
};
vendorHash = "sha256-GgJyYDnlaFybf3Gu1gVcA12HkA0yUIjYEFj0G83GVGQ=";
vendorHash = "sha256-ML1aLbrYhs2IxnN2ywKFOpvAV6yuYb8GI+dtoxwJl4A=";
ldflags = [
"-w"
pkgs/tools/system/mediawriter/default.nix
+2 -2
View File
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "mediawriter";
version = "5.1.1";
version = "5.1.2";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = "MediaWriter";
rev = "refs/tags/${version}";
hash = "sha256-I4q9VARQiZf+Qz83EToyUj+eS3CTPsxEw0paACS8lmE=";
hash = "sha256-KyABM3XIHvd9kT7aayYivGw6kjLf55Gpkk041BQ4yw0=";
};
nativeBuildInputs = [
pkgs/tools/virtualization/jumppad/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "jumppad";
version = "0.12.0";
version = "0.12.1";
src = fetchFromGitHub {
owner = "jumppad-labs";
repo = "jumppad";
rev = version;
hash = "sha256-eO/BZ59MZI1zaRCkbhBks55Jbf1i0M4XFHjAV03xp9k=";
hash = "sha256-jG/XTMkedgDSncCW7YbII3g3ieB1i0Z9cOEVfZiczHI=";
};
vendorHash = "sha256-FPM0q1ZVDfo00Z6QEXqtqfx77qkq5HhB+3vF9z9zrM0=";
pkgs/top-level/agda-packages.nix
+2
View File
@@ -35,5 +35,7 @@ let
agdarsec = callPackage ../development/libraries/agda/agdarsec { };
_1lab = callPackage ../development/libraries/agda/1lab { };
generics = callPackage ../development/libraries/agda/generics { };
};
in mkAgdaPackages Agda
pkgs/top-level/all-packages.nix
-2
View File
@@ -38036,8 +38036,6 @@ with pkgs;
p4est-sc = p4est-sc-dbg;
};
petsc = callPackage ../development/libraries/science/math/petsc { };
parmetis = callPackage ../development/libraries/science/math/parmetis { };
QuadProgpp = callPackage ../development/libraries/science/math/QuadProgpp { };