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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-04-28 06:01:27 +00:00 committed by GitHub
commit a81c54c930
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/video/clapper/default.nix
View File

@ -5,8 +5,6 @@
, gobject-introspection , gobject-introspection
, pkg-config , pkg-config
, ninja , ninja
, wayland
, wayland-protocols
, desktop-file-utils , desktop-file-utils
, makeWrapper , makeWrapper
, shared-mime-info , shared-mime-info
@ -56,8 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
libGL libGL
libadwaita libadwaita
libsoup_3 libsoup_3
wayland
wayland-protocols
libmicrodns libmicrodns
]; ];
@ -65,6 +61,13 @@ stdenv.mkDerivation (finalAttrs: {
patchShebangs --build build-aux/meson/postinstall.py 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; { meta = with lib; {
description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering"; description = "A GNOME media player built using GTK4 toolkit and powered by GStreamer with OpenGL rendering";
longDescription = '' longDescription = ''
@ -73,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
homepage = "https://github.com/Rafostar/clapper"; homepage = "https://github.com/Rafostar/clapper";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ aleksana ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
}) })

4
pkgs/by-name/lm/lmstudio/package.nix
View File

@ -5,10 +5,10 @@
let let
pname = "lmstudio"; pname = "lmstudio";
version = "0.2.18"; version = "0.2.20";
src = fetchurl { src = fetchurl {
url = "https://releases.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage"; 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; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

4
pkgs/by-name/si/simdutf/package.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "simdutf"; pname = "simdutf";
version = "5.2.5"; version = "5.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "simdutf"; owner = "simdutf";
repo = "simdutf"; repo = "simdutf";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-X/mpVmZ9FyN5MOcQRT1CjH5wsirSQ4rqdPE0lM5meT8="; hash = "sha256-fbDQPHoGqbojvhsMOrg/gMMQJ8bODV/P53F05yIHcTQ=";
}; };
# Fix build on darwin # Fix build on darwin

4
pkgs/development/compilers/zig/hook.nix
View File

@ -32,7 +32,9 @@ makeSetupHook {
zig_default_flags = zig_default_flags =
let let
releaseType = 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" "-Doptimize=ReleaseSafe"
else else
"-Drelease-safe=true"; "-Drelease-safe=true";

4
pkgs/development/python-modules/marimo/default.nix
View File

@ -19,14 +19,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "marimo"; pname = "marimo";
version = "0.4.4"; version = "0.4.7";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-M6zvr3F67++UOjBVPVTuCJIRikNK/daV5Aq6x/LTreI="; hash = "sha256-shB7TIllXRja0RNLu+IyvFBQViee4Ypj5KGWh3AlMB4=";
}; };
build-system = [ build-system = [

10
pkgs/tools/misc/ncdu/default.nix
View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, ncurses , ncurses
, zig_0_11 , zig
, installShellFiles , installShellFiles
, testers , testers
, pie ? stdenv.isDarwin , pie ? stdenv.isDarwin
@ -10,15 +10,15 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "ncdu"; pname = "ncdu";
version = "2.3"; version = "2.4";
src = fetchurl { src = fetchurl {
url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz"; url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
hash = "sha256-u84dHHDxJHZxvk6iE12MUs0ppwivXtYs7Np9xqgACjw="; hash = "sha256-Sj0AAjCc9qfOp5GTjayb7N7OTVKdDW3I2RtztOaFVQk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
zig_0_11.hook zig.hook
installShellFiles installShellFiles
]; ];
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://dev.yorhel.nl/ncdu/changes2"; changelog = "https://dev.yorhel.nl/ncdu/changes2";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ pSub rodrgz ]; maintainers = with lib.maintainers; [ pSub rodrgz ];
inherit (zig_0_11.meta) platforms; inherit (zig.meta) platforms;
mainProgram = "ncdu"; mainProgram = "ncdu";
}; };
}) })

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

@ -33548,7 +33548,9 @@ with pkgs;
netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; 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 { }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };