nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 08:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-24.05 into staging-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-09-10 00:16:29 +00:00
committed by GitHub
parent 3df953a16f de997828be
commit 01ac90e2fd
22 changed files with 890 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@@ -15948,6 +15948,13 @@
githubId = 74465;
name = "James Fargher";
};
progrm_jarvis = {
email = "mrjarviscraft+nix@gmail.com";
github = "JarvisCraft";
githubId = 7693005;
name = "Petr Portnov";
keys = [ { fingerprint = "884B 08D2 8DFF 6209 1857 C1C7 7E8F C8F7 D1BB 84A3"; } ];
};
progval = {
email = "progval+nix@progval.net";
github = "progval";

1
nixos/modules/installer/tools/nixos-install.sh
View File

@@ -197,6 +197,7 @@ if [[ -z $noBootLoader ]]; then
ln -sfn /proc/mounts "$mountPoint"/etc/mtab
export mountPoint
NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF'
set -e
# Create a bind mount for each of the mount points inside the target file
# system. This preserves the validity of their absolute paths after changing
# the root with `nixos-enter`.

56
pkgs/applications/audio/musescore/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, wrapQtAppsHook
, pkg-config
@@ -18,15 +19,16 @@
, portmidi
, qtbase
, qtdeclarative
, qtgraphicaleffects
, flac
, qtquickcontrols
, qtquickcontrols2
, qtscript
, libopusenc
, libopus
, tinyxml-2
, qt5compat
, qtwayland
, qtsvg
, qtxmlpatterns
, qtscxml
, qtnetworkauth
, qtx11extras
, qttools
, nixosTests
, darwin
}:
@@ -47,27 +49,36 @@ let
} else portaudio;
in stdenv'.mkDerivation (finalAttrs: {
pname = "musescore";
version = "4.3.0";
version = "4.4.1";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${finalAttrs.version}";
sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g=";
sha256 = "sha256-eLtpLgXSc8L5y1Mg3s1wrxr09+/vBxNqJEtl9IoKYSM=";
};
patches = [
# https://github.com/musescore/MuseScore/pull/24326
(fetchpatch {
name = "fix-menubar-with-qt6.5+.patch";
url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch";
hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0=";
})
];
cmakeFlags = [
"-DMUSESCORE_BUILD_MODE=release"
"-DMUSE_APP_BUILD_MODE=release"
# Disable the build and usage of the `/bin/crashpad_handler` utility - it's
# not useful on NixOS, see:
# https://github.com/musescore/MuseScore/issues/15571
"-DMUE_BUILD_CRASHPAD_CLIENT=OFF"
# Use our freetype
"-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF"
# Use our versions of system libraries
"-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"
# From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake,
# upstream defaults to compiling to x86_64 only, unless this cmake flag is
# set
"-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON"
"-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON"
"-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"
# Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
"-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON"
"-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"
# Don't bundle qt qml files, relevant really only for darwin, but we set
# this for all platforms anyway.
"-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF"
@@ -87,6 +98,7 @@ in stdenv'.mkDerivation (finalAttrs: {
nativeBuildInputs = [
wrapQtAppsHook
cmake
qttools
pkg-config
ninja
];
@@ -102,18 +114,20 @@ in stdenv'.mkDerivation (finalAttrs: {
portaudio'
portmidi
flac
libopusenc
libopus
tinyxml-2
qtbase
qtdeclarative
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2
qtscript
qt5compat
qtsvg
qtxmlpatterns
qtscxml
qtnetworkauth
qtx11extras
] ++ lib.optionals stdenv.isLinux [
alsa-lib
qtwayland
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Cocoa
];
postInstall = ''

108
pkgs/applications/blockchains/monero-cli/default.nix
View File

@@ -1,9 +1,30 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, boost, miniupnpc, openssl, unbound
, zeromq, pcsclite, readline, libsodium, hidapi
, randomx, rapidjson
, CoreData, IOKit, PCSC
, trezorSupport ? true, libusb1, protobuf, python3
{
lib,
stdenv,
fetchFromGitHub,
cmake,
ninja,
pkg-config,
boost,
libsodium,
miniupnpc,
openssl,
python3,
randomx,
rapidjson,
readline,
unbound,
zeromq,
# darwin
CoreData,
IOKit,
trezorSupport ? true,
hidapi,
libusb1,
protobuf_21,
udev,
}:
let
@@ -25,18 +46,16 @@ in
stdenv.mkDerivation rec {
pname = "monero-cli";
version = "0.18.3.3";
version = "0.18.3.4";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
hash = "sha256-1LkKIrud317BEE+713t5wiJV6FcDlJdj4ypXPR0bKTs=";
hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM=";
};
patches = [
./use-system-libraries.patch
];
patches = [ ./use-system-libraries.patch ];
postPatch = ''
# manually install submodules
@@ -47,31 +66,60 @@ stdenv.mkDerivation rec {
cp -r . $source
'';
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
boost miniupnpc openssl unbound
zeromq pcsclite readline
libsodium hidapi randomx rapidjson
protobuf
] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]
++ lib.optionals trezorSupport [ libusb1 protobuf python3 ];
buildInputs =
[
boost
libsodium
miniupnpc
openssl
randomx
rapidjson
readline
unbound
zeromq
]
++ lib.optionals stdenv.isDarwin [
IOKit
CoreData
]
++ lib.optionals trezorSupport [
python3
hidapi
libusb1
protobuf_21
]
++ lib.optionals (trezorSupport && stdenv.isLinux) [
udev
];
cmakeFlags = [
"-DUSE_DEVICE_TREZOR=ON"
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
"-DRandomX_ROOT_DIR=${randomx}"
] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
cmakeFlags =
[
# skip submodules init
"-DMANUAL_SUBMODULES=ON"
# required by monero-gui
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
]
++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"
++ lib.optional trezorSupport [
"-DUSE_DEVICE_TREZOR=ON"
# fix build on recent gcc versions
"-DCMAKE_CXX_FLAGS=-fpermissive"
];
outputs = [ "out" "source" ];
meta = with lib; {
meta = {
description = "Private, secure, untraceable currency";
homepage = "https://getmonero.org/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ rnhmjoj ];
homepage = "https://getmonero.org/";
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ rnhmjoj ];
mainProgram = "monero-wallet-cli";
};
}

24
pkgs/applications/blockchains/monero-cli/use-system-libraries.patch
View File

@@ -1,11 +1,12 @@
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 5b7f69a56..5536debe8 100644
index 5b7f69a56..cc4b0a346 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -36,22 +36,9 @@
@@ -35,25 +35,14 @@
# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
# others.
find_package(Miniupnpc REQUIRED)
-find_package(Miniupnpc REQUIRED)
-
-message(STATUS "Using in-tree miniupnpc")
-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
@@ -22,22 +23,27 @@ index 5b7f69a56..5536debe8 100644
-endif()
-
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
+set(UPNP_STATIC false PARENT_SCOPE)
+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(MINIUPNPC REQUIRED miniupnpc)
+link_libraries(${MINIUPNPC_LIBRARIES})
+include_directories(${MINIUPNPC_INCLUDE_DIRS})
+find_package(RapidJSON)
find_package(Unbound)
+find_library(RANDOMX_LIBRARY randomx)
@@ -69,4 +56,3 @@ endif()
if(NOT UNBOUND_INCLUDE_DIR)
die("Could not find libunbound")
@@ -69,4 +58,3 @@ endif()
add_subdirectory(db_drivers)
add_subdirectory(easylogging++)
add_subdirectory(qrcodegen)
-add_subdirectory(randomx EXCLUDE_FROM_ALL)
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index d4b39869c..13071d898 100644
index 71f5393e8..bb48083d0 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -61,9 +61,9 @@
@@ -60,9 +60,9 @@
#include "cryptonote_core/cryptonote_core.h"
#include "net/parse.h"

118
pkgs/applications/blockchains/monero-gui/default.nix
View File

@@ -1,43 +1,88 @@
{ lib, stdenv, wrapQtAppsHook, makeDesktopItem
, fetchFromGitHub
, cmake, qttools, pkg-config
, qtbase, qtdeclarative, qtgraphicaleffects
, qtmultimedia, qtxmlpatterns
, qtquickcontrols, qtquickcontrols2
, qtmacextras
, monero-cli, miniupnpc, unbound, readline
, boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpg-error
, hidapi, rapidjson, quirc
, trezorSupport ? true, libusb1, protobuf, python3
{
lib,
fetchFromGitHub,
makeDesktopItem,
boost,
cmake,
libgcrypt,
libgpg-error,
libsodium,
miniupnpc,
monero-cli,
pkg-config,
qtbase,
qtdeclarative,
qtgraphicaleffects,
qtmacextras,
qtmultimedia,
qtquickcontrols,
qtquickcontrols2,
qttools,
qtxmlpatterns,
quirc,
randomx,
rapidjson,
stdenv,
unbound,
wrapQtAppsHook,
zeromq,
trezorSupport ? true,
hidapi,
libusb1,
protobuf_21,
python3,
udev,
}:
stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.18.3.3";
version = "0.18.3.4";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
hash = "sha256-6qadBm4bPui11OVY1tLFcHsfswXWBFiJvutIsF6EfX8=";
hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM=";
};
nativeBuildInputs = [
cmake pkg-config wrapQtAppsHook
cmake
pkg-config
wrapQtAppsHook
(lib.getDev qttools)
];
buildInputs = [
qtbase qtdeclarative qtgraphicaleffects
qtmultimedia qtquickcontrols qtquickcontrols2
qtxmlpatterns
monero-cli miniupnpc unbound readline
randomx libgcrypt libgpg-error
boost libunwind libsodium pcsclite
zeromq hidapi rapidjson quirc
] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]
++ lib.optionals stdenv.isDarwin [ qtmacextras ];
buildInputs =
[
boost
libgcrypt
libgpg-error
libsodium
miniupnpc
qtbase
qtdeclarative
qtgraphicaleffects
qtmultimedia
qtquickcontrols
qtquickcontrols2
qtxmlpatterns
quirc
randomx
rapidjson
unbound
zeromq
]
++ lib.optionals stdenv.isDarwin [ qtmacextras ]
++ lib.optionals trezorSupport [
hidapi
libusb1
protobuf_21
python3
]
++ lib.optionals (trezorSupport && stdenv.isLinux) [
udev
];
postUnpack = ''
# copy monero sources here
@@ -68,7 +113,12 @@ stdenv.mkDerivation rec {
--replace 'add_subdirectory(external)' ""
'';
cmakeFlags = [ "-DARCH=default" ];
cmakeFlags =
[ "-DARCH=default" ]
++ lib.optional trezorSupport [
# fix build on recent gcc versions
"-DCMAKE_CXX_FLAGS=-fpermissive"
];
desktopItem = makeDesktopItem {
name = "monero-wallet-gui";
@@ -76,7 +126,7 @@ stdenv.mkDerivation rec {
icon = "monero";
desktopName = "Monero";
genericName = "Wallet";
categories = [ "Network" "Utility" ];
categories = [ "Network" "Utility" ];
};
postInstall = ''
@@ -93,12 +143,12 @@ stdenv.mkDerivation rec {
done;
'';
meta = with lib; {
description = "Private, secure, untraceable currency";
homepage = "https://getmonero.org/";
license = licenses.bsd3;
platforms = platforms.all;
maintainers = with maintainers; [ rnhmjoj ];
mainProgram = "monero-wallet-gui";
meta = {
description = "Private, secure, untraceable currency";
homepage = "https://getmonero.org/";
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ rnhmjoj ];
mainProgram = "monero-wallet-gui";
};
}

4
pkgs/applications/networking/instant-messengers/wavebox/default.nix
View File

@@ -156,11 +156,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "wavebox";
version = "10.127.10-2";
version = "10.128.5-2";
src = fetchurl {
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
hash = "sha256-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew=";
hash = "sha256-eIiFiRlmnARtyd8YHUHrjDaaF8kQYvcOa2AwT3071Ho=";
};
nativeBuildInputs = [

8
pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix
View File

@@ -7,23 +7,23 @@
}:
rustPlatform.buildRustPackage rec {
pname = "notmuch-mailmover";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "michaeladler";
repo = pname;
rev = "v${version}";
hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0=";
hash = "sha256-b+6vQ7m49+9RQ+GA75VgOAJej/2zeu5JAje/OazsEsk=";
};
cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ=";
cargoHash = "sha256-qHSmfR5iUBXq8OQJkGCVA4JnExXisN2OIAVKiVMUaZo=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = [ notmuch ];
postInstall = ''
installManPage share/notmuch-mailmover.1
installManPage share/notmuch-mailmover.1.gz
installShellCompletion --cmd notmuch-mailmover \
--bash share/notmuch-mailmover.bash \
--fish share/notmuch-mailmover.fish \

3
pkgs/applications/virtualization/podman/default.nix
View File

@@ -33,6 +33,7 @@
, aardvark-dns
, netavark
, passt
, vfkit
, testers
, podman
}:
@@ -44,6 +45,8 @@ let
util-linux
iptables
iproute2
] ++ lib.optionals stdenv.isDarwin [
vfkit
] ++ extraPackages);
helpersBin = symlinkJoin {

74
pkgs/by-name/ch/chatzone-desktop/package.nix Normal file
View File

@@ -0,0 +1,74 @@
{
lib,
appimageTools,
fetchurl,
stdenvNoCC,
makeDesktopItem,
copyDesktopItems,
makeWrapper,
}:
let
pname = "chatzone-desktop";
version = "5.2.1";
src = fetchurl {
url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/31072024-1/407/chatzone-desktop-linux-5.2.1.AppImage";
hash = "sha256-IXn7mAY3+2q+/PKcNQbRVW+wbAPMWLUh/DGAic6M898=";
};
appimageContents = appimageTools.extract { inherit pname version src; };
in
stdenvNoCC.mkDerivation {
inherit pname version;
src = appimageTools.wrapType2 { inherit pname version src; };
nativeBuildInputs = [
copyDesktopItems
makeWrapper
];
desktopItems = [
(makeDesktopItem {
name = "chatzone";
exec = "chatzone-desktop";
icon = "chatzone-desktop";
terminal = false;
desktopName = "Chatzone";
genericName = "Ozon corporate messenger";
comment = "Mattermost Desktop application for Linux";
categories = [
"Network"
"InstantMessaging"
"Chat"
];
mimeTypes = [ "x-scheme-handler/mattermost" ];
})
];
installPhase = ''
runHook preInstall
mkdir -p $out/
cp -r bin $out/bin
mkdir -p $out/share/chatzone-desktop/
cp ${appimageContents}/app_icon.png $out/share/chatzone-desktop/
cp -r ${appimageContents}/usr/share/icons $out/share
wrapProgram $out/bin/chatzone-desktop \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
runHook postInstall
'';
meta = {
description = "Ozon corporate messenger";
mainProgram = "chatzone-desktop";
homepage = "https://apps.o3team.ru/";
downloadPage = "https://apps.o3team.ru/";
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
license = lib.licenses.unfreeRedistributable;
maintainers = [ lib.maintainers.progrm_jarvis ];
platforms = [ "x86_64-linux" ];
};
}

44
pkgs/by-name/ra/radio-cli/package.nix Normal file
View File

@@ -0,0 +1,44 @@
{
lib,
rustPlatform,
fetchFromGitHub,
makeWrapper,
pkg-config,
openssl,
mpv,
}:
rustPlatform.buildRustPackage rec {
pname = "radio-cli";
version = "2.3.1";
src = fetchFromGitHub {
owner = "margual56";
repo = "radio-cli";
rev = "v${version}";
hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E=";
};
cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s=";
buildInputs = [ openssl ];
nativeBuildInputs = [
pkg-config
makeWrapper
];
postInstall = ''
wrapProgram "$out/bin/radio-cli" \
--suffix PATH : ${lib.makeBinPath [ mpv ]}
'';
meta = {
description = "Simple radio CLI written in rust";
homepage = "https://github.com/margual56/radio-cli";
changelog = "https://github.com/margual56/radio-cli/releases/tag/v${version}";
license = lib.licenses.gpl2Only;
maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
mainProgram = "radio-cli";
platforms = lib.platforms.linux;
};
}

42
pkgs/by-name/vf/vfkit/package.nix Normal file
View File

@@ -0,0 +1,42 @@
{
lib,
fetchurl,
stdenvNoCC,
testers,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "vfkit";
version = "0.5.1";
src = fetchurl {
url = "https://github.com/crc-org/vfkit/releases/download/v${finalAttrs.version}/vfkit";
hash = "sha256-at+KsvsKO359d4VUvcSuio2ej5hM6//U4Mj/jqXwhEc=";
};
dontUnpack = true;
installPhase = ''
runHook preInstall
install -Dm755 $src $out/bin/vfkit
runHook postInstall
'';
passthru.tests = {
version = testers.testVersion { package = finalAttrs.finalPackage; };
};
meta = {
description = "Simple command line tool to start VMs through the macOS Virtualization framework";
homepage = "https://github.com/crc-org/vfkit";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ sarcasticadmin ];
platforms = lib.platforms.darwin;
# Source build will be possible after darwin SDK 12.0 bump
# https://github.com/NixOS/nixpkgs/pull/229210
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
mainProgram = "vfkit";
};
})

6
pkgs/data/fonts/gdouros/default.nix
View File

@@ -17,7 +17,7 @@ let
inherit pname version;
src = fetchzip {
url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
url = "https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}";
stripRoot = false;
inherit hash;
};
@@ -34,12 +34,12 @@ let
meta = {
inherit description;
# see https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
# see https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf
# quite draconian: non-commercial, no modifications,
# no redistribution, "a single instantiation and no
# network installation"
license = lib.licenses.unfree;
homepage = "https://dn-works.com/ufas/";
homepage = "https://web.archive.org/web/20240212172059/https://dn-works.com/ufas/";
};
};
in

12
pkgs/development/python-modules/notebook/default.nix
View File

@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "notebook";
version = "7.2.0";
disabled = pythonOlder "3.8";
version = "7.2.2";
pyproject = true;
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-NKK6SwitXRnskw23SE+3l0aheEvp4aX4IY+a+GVqFB8=";
hash = "sha256-LvB9QiBCFiOtP+iBGNaHvARQBVVwzdFggUpZzzocUW4=";
};
postPatch = ''
@@ -32,13 +32,13 @@ buildPythonPackage rec {
--replace "timeout = 300" ""
'';
nativeBuildInputs = [
build-system = [
hatch-jupyter-builder
hatchling
jupyterlab
];
propagatedBuildInputs = [
dependencies = [
jupyter-server
jupyterlab
jupyterlab-server

25
pkgs/development/python-modules/quantities/default.nix
View File

@@ -1,7 +1,8 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
fetchpatch2,
numpy,
pytestCheckHook,
pythonOlder,
@@ -12,21 +13,31 @@
buildPythonPackage rec {
pname = "quantities";
version = "0.15.0";
format = "setuptools";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-nqMeKg11F88k1UaxQUbe+SkmOZk6YWzKYbh173lrSys=";
src = fetchFromGitHub {
owner = "python-quantities";
repo = "python-quantities";
rev = "refs/tags/v${version}";
hash = "sha256-N20xfzGtM0VnfkJtzMytNLySTkgVz2xf1nEJxlwBSCI=";
};
nativeBuildInputs = [
patches = [
(fetchpatch2 {
name = "prevent-arbitrary-code-eval.patch";
url = "https://github.com/python-quantities/python-quantities/pull/236.patch";
hash = "sha256-H1tOfXqNMIKY01m6o2PsfZG0CvnWNxW2qIWA5ce1lRk=";
})
];
build-system = [
setuptools
setuptools-scm
];
propagatedBuildInputs = [ numpy ];
dependencies = [ numpy ];
nativeCheckInputs = [ pytestCheckHook ];

4
pkgs/os-specific/linux/firmware/linux-firmware/default.nix
View File

@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20240811";
version = "20240909";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
hash = "sha256-sfQIXXBU5oIDmTpWExDc0drO8QH9lBL8opPO3mSk98E=";
hash = "sha256-3nwo4lGTV5PlsxZXa5D/7upaB+5XfXFZHbgEO5jnRrw=";
};
nativeBuildInputs = [

4
pkgs/servers/computing/slurm/default.nix
View File

@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "23.11.9.1";
version = "23.11.10.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
hash = "sha256-LPv+1/cJbN1jrG0lGlIX1xg+1iBtWIGMsPoY3AhfcQM=";
hash = "sha256-TOfEQTo4DEIGBJOsfVG1ejieGbZHkePIamZz73QTWDs=";
};
outputs = [ "out" "dev" ];

8
pkgs/tools/admin/meshcentral/default.nix
View File

@@ -7,11 +7,11 @@
}:
yarn2nix-moretea.mkYarnPackage {
version = "1.1.27";
version = "1.1.29";
src = fetchzip {
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.27.tgz";
sha256 = "1m9wsny6b2lwis2ppalmc9qzn3b8pblgv1cszqbaywb835ll516g";
url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.29.tgz";
sha256 = "0ghwcndv753n3xkhi93jv0k9s0ch553g5q6b39fiv78ixa1f4h57";
};
patches = [ ./fix-js-include-paths.patch ];
@@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage {
offlineCache = fetchYarnDeps {
yarnLock = ./yarn.lock;
hash = "sha256-XQTHIFMxtb4G7gkksAU/oHajdNf0McFbubumW/8Gn1w=";
hash = "sha256-9fW6nZElij7P7rSS0xVxISpPpKdi9eOxQdmJ79jGSgw=";
};
# Tarball has CRLF line endings. This makes patching difficult, so let's convert them.

7
pkgs/tools/admin/meshcentral/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "meshcentral",
"version": "1.1.27",
"version": "1.1.29",
"keywords": [
"Remote Device Management",
"Remote Device Monitoring",
@@ -45,7 +45,7 @@
"cookie-session": "2.0.0",
"express": "4.19.2",
"express-handlebars": "5.3.5",
"express-ws": "4.0.0",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
"minimist": "1.2.8",
"multiparty": "4.2.3",
@@ -79,7 +79,7 @@
"cookie-session": "2.0.0",
"express": "4.19.2",
"express-handlebars": "5.3.5",
"express-ws": "4.0.0",
"express-ws": "5.0.2",
"ipcheck": "0.1.0",
"minimist": "1.2.8",
"multiparty": "4.2.3",
@@ -120,6 +120,7 @@
"archiver-zip-encrypted": "1.0.11",
"googleapis": "128.0.0",
"webdav": "4.11.3",
"minio": "8.0.1",
"wildleek": "2.0.0",
"yubikeyotp": "0.2.0",
"otplib": "10.2.3",

803
pkgs/tools/admin/meshcentral/yarn.lock
View File

File diff suppressed because it is too large Load Diff

4
pkgs/tools/graphics/exiftags/default.nix
View File

@@ -23,5 +23,9 @@ stdenv.mkDerivation rec {
license = lib.licenses.free;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; unix;
knownVulnerabilities = [
"CVE-2023-50671"
"CVE-2024-42851"
];
};
}

4
pkgs/top-level/all-packages.nix
View File

@@ -32999,7 +32999,7 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
musescore = libsForQt5.callPackage ../applications/audio/musescore { };
musescore = qt6Packages.callPackage ../applications/audio/musescore { };
music-player = callPackage ../applications/audio/music-player { };
@@ -36054,7 +36054,7 @@ with pkgs;
lndmanage = callPackage ../applications/blockchains/lndmanage { };
monero-cli = callPackage ../applications/blockchains/monero-cli {
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
inherit (darwin.apple_sdk.frameworks) CoreData IOKit;
};
haven-cli = callPackage ../applications/blockchains/haven-cli {