Merge staging-next into staging
This commit is contained in:
commit
a81c54c930
|
@ -5,8 +5,6 @@
|
|||
, gobject-introspection
|
||||
, pkg-config
|
||||
, ninja
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, desktop-file-utils
|
||||
, makeWrapper
|
||||
, shared-mime-info
|
||||
|
@ -56,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libGL
|
||||
libadwaita
|
||||
libsoup_3
|
||||
wayland
|
||||
wayland-protocols
|
||||
libmicrodns
|
||||
];
|
||||
|
||||
|
@ -65,6 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
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 = ''
|
||||
|
@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
homepage = "https://github.com/Rafostar/clapper";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
|
||||
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; };
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
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
|
||||
|
|
|
@ -32,7 +32,9 @@ makeSetupHook {
|
|||
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";
|
||||
|
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
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 = [
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchurl
|
||||
, ncurses
|
||||
, zig_0_11
|
||||
, zig
|
||||
, installShellFiles
|
||||
, testers
|
||||
, pie ? stdenv.isDarwin
|
||||
|
@ -10,15 +10,15 @@
|
|||
|
||||
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
|
||||
];
|
||||
|
||||
|
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
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";
|
||||
};
|
||||
})
|
||||
|
|
|
@ -33548,7 +33548,9 @@ with pkgs;
|
|||
|
||||
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 { };
|
||||
|
||||
|
|
Loading…
Reference in New Issue