From e1b03a0e51f300482daa309006aa621888d10d72 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 25 Apr 2024 19:41:15 +0800 Subject: [PATCH 1/8] zig.hook: support zig 0.12 --- pkgs/development/compilers/zig/hook.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix index 0c099a4c0d11..e01309b258b1 100644 --- a/pkgs/development/compilers/zig/hook.nix +++ b/pkgs/development/compilers/zig/hook.nix @@ -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"; From 30b52132413423a39a4ab62c043e8d41a17d425a Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sat, 27 Apr 2024 19:05:08 +0800 Subject: [PATCH 2/8] ncdu: 2.3 -> 2.4 --- pkgs/tools/misc/ncdu/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 47a1365b5367..d4bdbeacc929 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -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"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 889d9b3cd0cf..0ca4efd7de75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33595,7 +33595,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 { }; From f271733dc4798aec3ddac21ed6a883560c900e77 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 27 Apr 2024 22:20:18 +0800 Subject: [PATCH 3/8] clapper: add clappersink to gstreamer plugin path This fixes https://github.com/NixOS/nixpkgs/pull/306548#issuecomment-2080680392. The gstreamer plugin provided in this package is also used by itself. --- pkgs/applications/video/clapper/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 97285e6e1415..876bb7a20733 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -65,6 +65,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 = '' From 1412917c0b745b46a04a5f4d5a4ca4d6f4678b6d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 27 Apr 2024 22:27:30 +0800 Subject: [PATCH 4/8] clapper: remove unused wayland dependencies --- pkgs/applications/video/clapper/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 876bb7a20733..2d63e21fda90 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -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 ]; From e89f066f019405f2c9ba378480b79b8a8e1282cc Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 27 Apr 2024 22:29:26 +0800 Subject: [PATCH 5/8] clapper: add aleksana to maintainers --- pkgs/applications/video/clapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 2d63e21fda90..b638bc3afd7d 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -76,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; }; }) From dbe09e6eef4b26cde1f4aa3c3e68a2da68283aac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 20:57:39 +0000 Subject: [PATCH 6/8] python311Packages.marimo: 0.4.4 -> 0.4.7 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index b082da997d04..47ee0ed04f8c 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -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 = [ From f8d93302775a80d6286837f56625d8ff26724b9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 27 Apr 2024 23:27:09 +0000 Subject: [PATCH 7/8] lmstudio: 0.2.18 -> 0.2.20 --- pkgs/by-name/lm/lmstudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index e8bfd547ab5a..f9325e5b800d 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -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; }; From 594ebbc7565e0f936405c7281c4aef21ecdf0405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 03:38:55 +0000 Subject: [PATCH 8/8] simdutf: 5.2.5 -> 5.2.6 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index f523ebe50da5..734081ea5b47 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -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