From 3341300ca71af9f8242a5e9e08ebe4dffb3dd5fc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 11 Jan 2023 00:41:02 +0100 Subject: [PATCH 01/15] pdisk: Fix duplicated id parameter in patch URL --- pkgs/tools/system/pdisk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/pdisk/default.nix b/pkgs/tools/system/pdisk/default.nix index 87fc683063c7..e9c4d162dc8c 100644 --- a/pkgs/tools/system/pdisk/default.nix +++ b/pkgs/tools/system/pdisk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }) # Replace removed sys_nerr and sys_errlist with strerror (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/linux_strerror.patch?h=pdisk&id=d0c930ea8bcac008bbd0ade1811133a625caea54"; sha256 = "sha256-HGJIS+vTn6456KtaETutIgTPPBm2C9OHf1anG8yaJPo="; }) ]; From 991a22a7d0aa93784370407fb2657f20f52c6dd3 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 17 Jan 2023 12:10:41 +0100 Subject: [PATCH 02/15] licenses: Remove unnecessary archive.org link for APSL-1.0 SPDX has a copy of it, and the url gets overridden with the spdx.org one anyway. --- lib/licenses.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 52956e52afa6..6919859d6cb4 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -81,7 +81,6 @@ in mkLicense lset) ({ apsl10 = { spdxId = "APSL-1.0"; fullName = "Apple Public Source License 1.0"; - url = "https://web.archive.org/web/20040701000000*/http://www.opensource.apple.com/apsl/1.0.txt"; }; apsl20 = { From 8da8a5640b8740b1632642fd146c11aa42d2b48c Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Wed, 1 Mar 2023 20:03:17 +0900 Subject: [PATCH 03/15] geeqie: 1.7.2 -> 2.0.1 (take 2) the version number was updated without the hash previously, so geeqie has not actually been updated since 1.7.2 Build system changed from configure to meson in 2.0, and our meson flags have auto_features=enable so we enable here a lot of features that were previously automatically disabled by configure. It might make sense to disable some back, or provide options like other packages do. --- pkgs/applications/graphics/geeqie/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 7d9a039a5b03..ee466865ef02 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool +{ lib, stdenv, fetchFromGitHub, pkg-config, meson, ninja, xxd, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida +, libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler +, gspell, libtiff, libwebp , wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: @@ -12,31 +14,26 @@ stdenv.mkDerivation rec { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-O+yz/uNxueR+naEJG8EZ+k/JutRjJ5wwbB9DYb8YNLw="; + sha256 = "sha256-0GOX77vZ4KZkvwnR1vlv52tlbR+ciwl3ycxbOIcDOqU="; }; - patches = [ - # Do not build the changelog as this requires markdown. - (fetchpatch { - name = "geeqie-1.4-goodbye-changelog.patch"; - url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; - sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; - }) - ]; - postPatch = '' patchShebangs . + # libtiff detection is broken and looks for liblibtiff... + # fixed upstream, to remove for 2.1 + substituteInPlace meson.build --replace 'libtiff' 'tiff' ''; - preConfigure = "./autogen.sh"; - nativeBuildInputs = - [ pkg-config autoconf automake gettext intltool + [ pkg-config gettext intltool wrapGAppsHook doxygen + meson ninja xxd ]; buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida + libarchive djvulibre libheif openjpeg libjxl libraw lua5_3 poppler + gspell libtiff libwebp ]; postInstall = '' From 7da77056fbb460b0c6b720000d35a2679676cdcb Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 28 Feb 2023 20:02:41 +0000 Subject: [PATCH 04/15] tmuxPlugins: init catppuccin theme at e2561de --- pkgs/misc/tmux-plugins/default.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 08fc063765e4..91726891d235 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -90,6 +90,27 @@ in rec { }; }; + catppuccin = mkTmuxPlugin { + pluginName = "catppuccin"; + version = "unstable-2022-12-14"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "tmux"; + rev = "e2561decc2a4e77a0f8b7c05caf8d4f2af9714b3"; + sha256 = "sha256-6UmFGkUDoIe8k+FrzdzsKrDHHMNfkjAk0yyc+HV199M="; + }; + postInstall = '' + sed -i -e 's|''${PLUGIN_DIR}/catppuccin-selected-theme.tmuxtheme|''${TMUX_TMPDIR}/catppuccin-selected-theme.tmuxtheme|g' $target/catppuccin.tmux + ''; + meta = with lib; { + homepage = "https://github.com/catppuccin/tmux"; + description = "Soothing pastel theme for Tmux!"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ jnsgruk ]; + }; + }; + continuum = mkTmuxPlugin { pluginName = "continuum"; version = "unstable-2022-01-25"; From bc74359cc7531114d26191f67ef889c2fb43217a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Mar 2023 21:48:03 +0000 Subject: [PATCH 05/15] effitask: 1.4.1 -> 1.4.2 --- pkgs/applications/misc/effitask/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index f237998f53a6..a380a06741e7 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "effitask"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sanpii"; repo = pname; rev = version; - sha256 = "sha256-nZn+mINIqAnaCKZCiywG8/BOPx6TlSe0rKV/8gcW/B4="; + sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ="; }; - cargoSha256 = "sha256-aCjZRJNsxx75ghK0N95Q9w0h5H5mW9/77j/fumDrvyM="; + cargoHash = "sha256-ScqDNfWMFT8a1HOPjpw4J8EBrVSusIkOYReYeArZvZ8="; nativeBuildInputs = [ pkg-config ]; From f1953063d59a1b568218b87647f99a5cc4441242 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 4 Mar 2023 21:25:39 +0200 Subject: [PATCH 06/15] bemenu: enable strictDeps fixes cross remove useless nulls add scdoc to build man page --- pkgs/applications/misc/bemenu/default.nix | 30 +++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index ced6a70a2468..abd2962e1387 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,14 +1,10 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config -, ncursesSupport ? true, ncurses ? null -, waylandSupport ? true, wayland ? null, wayland-protocols ? null -, x11Support ? true, xorg ? null +, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, ncursesSupport ? true, ncurses +, waylandSupport ? true, wayland, wayland-protocols, wayland-scanner +, x11Support ? true, xorg }: -assert ncursesSupport -> ncurses != null; -assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; -assert x11Support -> xorg != null; - stdenv.mkDerivation rec { pname = "bemenu"; version = "0.6.14"; @@ -20,14 +16,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-bMnnuT+LNNKphmvVcD1aaNZxasSGOEcAveC4stCieG8="; }; - nativeBuildInputs = [ pkg-config pcre ]; - - makeFlags = ["PREFIX=$(out)"]; - - buildFlags = ["clients"] - ++ lib.optional ncursesSupport "curses" - ++ lib.optional waylandSupport "wayland" - ++ lib.optional x11Support "x11"; + strictDeps = true; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals waylandSupport [ wayland-scanner ]; buildInputs = with lib; [ cairo @@ -42,6 +33,13 @@ stdenv.mkDerivation rec { xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; + makeFlags = ["PREFIX=$(out)"]; + + buildFlags = ["clients"] + ++ lib.optional ncursesSupport "curses" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; From 75e0f2cee79341574a514e4aa023e9a489fa2b1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Mar 2023 02:15:15 +0000 Subject: [PATCH 07/15] home-assistant: 2023.3.0 -> 2023.3.1 https://github.com/home-assistant/core/releases/tag/2023.3.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 96f3cf7d8c5d..d5b6df288359 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.3.0"; + version = "2023.3.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 28fc40315f58..89d6ead49068 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -263,7 +263,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.3.0"; + hassVersion = "2023.3.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -279,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-JxTvAUKZj59jL1czTBzPD7+6x1K7xGGGwZAO8f8dkzg="; + hash = "sha256-FvdMNtiLJ6p9I6aEeICukx9mykGGMoONGNdM/I4u/eY="; }; # Secondary source is git for tests @@ -287,7 +287,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-azH9CnHIY0iOLaF3Iqy+uJ6TuftUs1j4RcpXyRQrQws="; + hash = "sha256-2usXU1a/QKEIaeg8JFBf/4ID2nzZLoGsfK7KXreKEBE="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9bdbed311a46..6c7329d20707 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230301.0"; + version = "20230302.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-2hxP2Wyjkvlje/RnZBtou3Y81d16SYBeAm+JX8hWct4="; + hash = "sha256-G+XexUc5yvADjbXBgg97FB03Al3zR9WTb4cuVBBrSuI="; }; # there is nothing to strip in this package From 19892c48c7c3b5958433ac8235be1eec2f0b8840 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Mar 2023 07:58:03 +0000 Subject: [PATCH 08/15] ytfzf: 2.5.4 -> 2.5.5 --- pkgs/tools/misc/ytfzf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index cf3133b9b03f..74711a0dac0d 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-AouOckRrPdIzwfn6s7GXu3U9PrihcyPpt6Xb41dq1zg="; + hash = "sha256-2GpCO8U1QZQy+0DQzzqc1Ba+PRj1Ns0lNHupzKYCkVY="; }; nativeBuildInputs = [ makeWrapper ]; From 32b51c198f9ac8c504ebb42ecfa62a3cf1884703 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 5 Mar 2023 10:30:57 +0800 Subject: [PATCH 09/15] eigenmath: init at unstable-2023-03-05 --- .../science/math/eigenmath/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/science/math/eigenmath/default.nix diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix new file mode 100644 index 000000000000..ddeba369366e --- /dev/null +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "eigenmath"; + version = "unstable-2023-03-05"; + + src = fetchFromGitHub { + owner = "georgeweigt"; + repo = pname; + rev = "633d5b0b2f2b87b6377bc4f715604f79b17aab66"; + hash = "sha256-5LOSyfeGavWesAR7jqd37Z845iyNstr/cJdQiWHlIPg="; + }; + + patches = [ + # treewide: use $(CC) instead of hardcoding gcc + # https://github.com/georgeweigt/eigenmath/pull/18 + (fetchpatch { + url = "https://github.com/georgeweigt/eigenmath/commit/70551b3624ea25911f6de608c9ee9833885ab0b8.patch"; + hash = "sha256-g2crXOlC5SM1vAq87Vg/2zWMvx9DPFWEPaTrrPbcDZ0="; + }) + ]; + + installPhase = '' + runHook preInstall + install -Dm555 eigenmath "$out/bin/eigenmath" + runHook postInstall + ''; + + meta = with lib;{ + description = "Computer algebra system written in C"; + homepage = "https://georgeweigt.github.io"; + license = licenses.bsd2; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090f5a4123cb..4fdc3b9a4b61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19673,6 +19673,8 @@ with pkgs; eigen2 = callPackage ../development/libraries/eigen/2.0.nix {}; + eigenmath = callPackage ../applications/science/math/eigenmath { }; + vapoursynth = callPackage ../development/libraries/vapoursynth { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; From d3c7ef80efd7d059a9e1c96ffd5d059c459243ac Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 5 Mar 2023 14:59:54 +0200 Subject: [PATCH 10/15] pkgs/tools/wayland: mark all linux only on non-linux they all fail various variations of meson.build:26:0: ERROR: Dependency "wayland-client" not found, tried pkgconfig and framework fatal error: 'wayland-util.h' file not found --- pkgs/tools/wayland/gnome-randr/default.nix | 7 ++++--- pkgs/tools/wayland/gtklock/default.nix | 1 + pkgs/tools/wayland/sirula/default.nix | 1 + pkgs/tools/wayland/sov/default.nix | 1 + pkgs/tools/wayland/swayimg/default.nix | 2 +- pkgs/tools/wayland/swayr/default.nix | 1 + pkgs/tools/wayland/swaysome/default.nix | 1 + pkgs/tools/wayland/swaytools/default.nix | 1 + pkgs/tools/wayland/wayland-proxy-virtwl/default.nix | 7 ++++--- pkgs/tools/wayland/wdomirror/default.nix | 2 +- pkgs/tools/wayland/wev/default.nix | 3 ++- pkgs/tools/wayland/wl-clipboard-x11/default.nix | 1 + pkgs/tools/wayland/wlogout/default.nix | 2 +- pkgs/tools/wayland/wlr-randr/default.nix | 2 +- pkgs/tools/wayland/wlrctl/default.nix | 2 +- pkgs/tools/wayland/wlsunset/default.nix | 2 +- pkgs/tools/wayland/wob/default.nix | 2 +- pkgs/tools/wayland/wshowkeys/default.nix | 2 +- 18 files changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/wayland/gnome-randr/default.nix b/pkgs/tools/wayland/gnome-randr/default.nix index 9c88130f27b2..130b29f8412d 100644 --- a/pkgs/tools/wayland/gnome-randr/default.nix +++ b/pkgs/tools/wayland/gnome-randr/default.nix @@ -24,10 +24,11 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - meta = { + meta = with lib; { description = "An xrandr-like CLI for configuring displays on GNOME/Wayland, on distros that don't support `wlr-randr`"; homepage = "https://github.com/maxwellainatchi/gnome-randr-rust"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.roberth ]; + license = licenses.mit; + maintainers = [ maintainers.roberth ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 642faf410055..6ec80f484daf 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jovanlanik/gtklock"; license = licenses.gpl3; maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/sirula/default.nix b/pkgs/tools/wayland/sirula/default.nix index 2426e50c0666..c190c232fdae 100644 --- a/pkgs/tools/wayland/sirula/default.nix +++ b/pkgs/tools/wayland/sirula/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/DorianRudolph/sirula"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ twitchyliquid64 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index fae8652a828a..b9b139c7a1f9 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/milgra/sov"; license = with licenses; [ mit ]; maintainers = with maintainers; [ travisdavis-ops ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swayimg/default.nix b/pkgs/tools/wayland/swayimg/default.nix index f3ba661e91f5..353a7be97e15 100644 --- a/pkgs/tools/wayland/swayimg/default.nix +++ b/pkgs/tools/wayland/swayimg/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 789ca9a3216e..58c6258dfbb4 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.sr.ht/~tsdh/swayr"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ artturin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 2b47767b5da4..a05dccd75adb 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/hyask/swaysome"; license = licenses.mit; maintainers = with maintainers; [ esclear ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/swaytools/default.nix b/pkgs/tools/wayland/swaytools/default.nix index e4584436c4eb..a5cde9f7f0cc 100644 --- a/pkgs/tools/wayland/swaytools/default.nix +++ b/pkgs/tools/wayland/swaytools/default.nix @@ -18,5 +18,6 @@ buildPythonApplication rec { description = "Collection of simple tools for sway (and i3)"; license = licenses.gpl3Only; maintainers = with maintainers; [ atila ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix index 7943457d3815..47b59353af86 100644 --- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -40,10 +40,11 @@ ocamlPackages.buildDunePackage rec { doCheck = true; - meta = { + meta = with lib; { homepage = "https://github.com/talex5/wayland-virtwl-proxy"; description = "Proxy Wayland connections across a VM boundary"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.sternenseemann ]; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix index 10facbca50c1..486bed320c58 100644 --- a/pkgs/tools/wayland/wdomirror/default.nix +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { description = "Mirrors an output of a wlroots compositor to a window"; homepage = "https://github.com/progandy/wdomirror"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ jpas ]; }; } diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index 51b763d6dfe6..e450de2f2dcf 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix index daa040c5cb5a..0c127f751dff 100644 --- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix +++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ artturin ]; mainProgram = "xclip"; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index 7f9935b6c3c5..de150c3af309 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "A wayland based logout menu"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } # TODO: shell completions diff --git a/pkgs/tools/wayland/wlr-randr/default.nix b/pkgs/tools/wayland/wlr-randr/default.nix index 637876e0a3dd..b6f69992fec0 100644 --- a/pkgs/tools/wayland/wlr-randr/default.nix +++ b/pkgs/tools/wayland/wlr-randr/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~emersion/wlr-randr"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wlrctl/default.nix b/pkgs/tools/wayland/wlrctl/default.nix index 3915e3a18a0e..4b093a65cd1f 100644 --- a/pkgs/tools/wayland/wlrctl/default.nix +++ b/pkgs/tools/wayland/wlrctl/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://git.sr.ht/~brocellous/wlrctl"; license = licenses.mit; maintainers = with maintainers; [ puffnfresh artturin ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index dcff3dff9cb4..5ddce9d36327 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://sr.ht/~kennylevinsen/wlsunset/"; changelog = "https://git.sr.ht/~kennylevinsen/wlsunset/refs/${version}"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/wayland/wob/default.nix b/pkgs/tools/wayland/wob/default.nix index bb03399f55fb..32fad72384f9 100644 --- a/pkgs/tools/wayland/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ primeos ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix index 3ce14b543879..268dbd8ddbc9 100644 --- a/pkgs/tools/wayland/wshowkeys/default.nix +++ b/pkgs/tools/wayland/wshowkeys/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only mit ]; # Some portions of the code are taken from Sway which is MIT licensed. # TODO: gpl3Only or gpl3Plus (ask upstream)? - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ primeos berbiche ]; }; } From 6e457dd0dd4df6d2a754c279104819f088484380 Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Sun, 5 Mar 2023 21:19:15 +0800 Subject: [PATCH 11/15] go-musicfox: 3.7.0 -> 3.7.2 --- pkgs/applications/audio/go-musicfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index e08400220790..66f2a1a02d12 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -10,13 +10,13 @@ # gcc only supports objc on darwin buildGoModule.override { stdenv = clangStdenv; } rec { pname = "go-musicfox"; - version = "3.7.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "anhoder"; repo = pname; rev = "v${version}"; - hash = "sha256-IXB5eOXVtoe21WbQa9x5SKcgUpgyjVx48998vdccMPM="; + hash = "sha256-Wc9HFvBSLQA7jT+LJj+tyHzRbszhR2XD1/3C+SdrAGA="; }; deleteVendor = true; From 4c83fc333508181da66ee70637f33a48cbfdc852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 5 Mar 2023 11:01:29 -0300 Subject: [PATCH 12/15] vopono: 0.10.4 -> 0.10.5 --- pkgs/tools/networking/vopono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index 09f7366ff36f..896366eb54ce 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.4"; + version = "0.10.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-a9u8Ywxrdo4FFggotL8L5o5eDDu+MtcMVBG+jInXDVs="; + hash = "sha256-iA445u0Xht7kg3jScb6OvYwji3PmE+WpeKCN+Mk7Dzo="; }; - cargoHash = "sha256-oT74oj/6rKB1cuRiHnbc9QVUZQcDvvb4KZf09XuctNM="; + cargoHash = "sha256-Y2sw2avmxUY1lHaYt/UX/Nz2BaCFQQ8dmetsVK4eCYc="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From 0d7eb0601b1ca787d0a53be3f11e877c1e06ca86 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Mar 2023 05:22:43 +0100 Subject: [PATCH 13/15] python310Packages.homeassistant-stubs: 2023.3.0 -> 2023.3.1 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.3.1 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 4c8e026b7f11..4e31078381ff 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.3.0"; + version = "2023.3.1"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-svFp3MYj+DIwCT9+/G+lYPRwxGMtJbJQuBD5e+5r0Z4="; + hash = "sha256-WMuQgoWwri4nfKkZ8cW5o6S6G3PbHqlUxC9wyJSZhxQ="; }; nativeBuildInputs = [ From 107a2f3e9ba6140172a7ccef19c407faaf9be443 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Mar 2023 20:02:31 +0100 Subject: [PATCH 14/15] python310Packages.home-assistant-chip-core: Fix aarch64-linux hash --- .../python-modules/home-assistant-chip-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index ebf7a9163875..a16e5c78c652 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-hNaGE2s/oFFAVCWu50IeeaFTlOSByJJAKvBgX1iDrVE="; + hash = "sha256-e3OIpTGPMj+YSx/pqzGi5paUAIpDhI94prhHL3DkM18="; }; "x86_64-linux" = { name = "x86_64"; From e2019d196bb8b3ed18cf5d06644390f9e09c2945 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 5 Mar 2023 19:56:16 +0200 Subject: [PATCH 15/15] python3Packages.jaxopt: Fix alias-free eval --- pkgs/development/python-modules/jaxopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix index 09a1ff66f263..b89d08b16da1 100644 --- a/pkgs/development/python-modules/jaxopt/default.nix +++ b/pkgs/development/python-modules/jaxopt/default.nix @@ -11,7 +11,7 @@ , numpy , optax , scipy -, scikitlearn +, scikit-learn }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook cvxpy optax - scikitlearn + scikit-learn ]; pythonImportsCheck = [