Merge master into staging-next

Changed files
+25 -18
pkgs
applications
video
clapper
by-name
lm
lmstudio
si
simdutf
development
compilers
zig
python-modules
marimo
tools
misc
top-level
+8 -5
pkgs/applications/video/clapper/default.nix
···
, gobject-introspection
, pkg-config
, ninja
-
, wayland
-
, wayland-protocols
, desktop-file-utils
, makeWrapper
, shared-mime-info
···
libGL
libadwaita
libsoup_3
-
wayland
-
wayland-protocols
libmicrodns
];
···
patchShebangs --build build-aux/meson/postinstall.py
'';
+
# The package uses "clappersink" provided by itself
+
preFixup = ''
+
gappsWrapperArgs+=(
+
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $out/lib/gstreamer-1.0
+
)
+
'';
+
meta = with lib; {
description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering";
longDescription = ''
···
'';
homepage = "https://github.com/Rafostar/clapper";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ ];
+
maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux;
};
})
+2 -2
pkgs/by-name/lm/lmstudio/package.nix
···
let
pname = "lmstudio";
-
version = "0.2.18";
+
version = "0.2.20";
src = fetchurl {
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
-
hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4=";
+
hash = "sha256-T92ZDqGvxJfBkAWsK8EgHdQZnLefK3gDP2vCTL8X+eM=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
+2 -2
pkgs/by-name/si/simdutf/package.nix
···
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
-
version = "5.2.5";
+
version = "5.2.6";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
-
hash = "sha256-X/mpVmZ9FyN5MOcQRT1CjH5wsirSQ4rqdPE0lM5meT8=";
+
hash = "sha256-fbDQPHoGqbojvhsMOrg/gMMQJ8bODV/P53F05yIHcTQ=";
};
# Fix build on darwin
+3 -1
pkgs/development/compilers/zig/hook.nix
···
zig_default_flags =
let
releaseType =
-
if lib.versionAtLeast zig.version "0.11" then
+
if lib.versionAtLeast zig.version "0.12" then
+
"--release=safe"
+
else if lib.versionAtLeast zig.version "0.11" then
"-Doptimize=ReleaseSafe"
else
"-Drelease-safe=true";
+2 -2
pkgs/development/python-modules/marimo/default.nix
···
buildPythonPackage rec {
pname = "marimo";
-
version = "0.4.4";
+
version = "0.4.7";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
-
hash = "sha256-M6zvr3F67++UOjBVPVTuCJIRikNK/daV5Aq6x/LTreI=";
+
hash = "sha256-shB7TIllXRja0RNLu+IyvFBQViee4Ypj5KGWh3AlMB4=";
};
build-system = [
+5 -5
pkgs/tools/misc/ncdu/default.nix
···
, stdenv
, fetchurl
, ncurses
-
, zig_0_11
+
, zig
, installShellFiles
, testers
, pie ? stdenv.isDarwin
···
stdenv.mkDerivation (finalAttrs: {
pname = "ncdu";
-
version = "2.3";
+
version = "2.4";
src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-
hash = "sha256-u84dHHDxJHZxvk6iE12MUs0ppwivXtYs7Np9xqgACjw=";
+
hash = "sha256-Sj0AAjCc9qfOp5GTjayb7N7OTVKdDW3I2RtztOaFVQk=";
};
nativeBuildInputs = [
-
zig_0_11.hook
+
zig.hook
installShellFiles
];
···
changelog = "https://dev.yorhel.nl/ncdu/changes2";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pSub rodrgz ];
-
inherit (zig_0_11.meta) platforms;
+
inherit (zig.meta) platforms;
mainProgram = "ncdu";
};
})
+3 -1
pkgs/top-level/all-packages.nix
···
netcoredbg = callPackage ../development/tools/misc/netcoredbg { };
-
ncdu = callPackage ../tools/misc/ncdu { };
+
ncdu = callPackage ../tools/misc/ncdu {
+
zig = zig_0_12;
+
};
ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };