Merge master into staging-next

This commit is contained in:
github-actions[bot] 2023-03-05 18:01:28 +00:00 committed by GitHub
commit cb98531909
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 133 additions and 67 deletions

View file

@ -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 = {

View file

@ -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;

View file

@ -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 = ''

View file

@ -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";

View file

@ -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 ];

View file

@ -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 ];
};
}

View file

@ -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 = [

View file

@ -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";

View file

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.3.0";
version = "2023.3.1";
components = {
"3_day_blinds" = ps: with ps; [
];

View file

@ -247,7 +247,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";
@ -263,7 +263,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
@ -271,7 +271,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; [

View file

@ -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

View file

@ -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 = [

View file

@ -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 ];

View file

@ -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";

View file

@ -37,7 +37,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=";
})
];

View file

@ -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;
};
}

View file

@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/jovanlanik/gtklock";
license = licenses.gpl3;
maintainers = with maintainers; [ dit7ya ];
platforms = platforms.linux;
};
}

View file

@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/DorianRudolph/sirula";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ twitchyliquid64 ];
platforms = platforms.linux;
};
}

View file

@ -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;
};
}

View file

@ -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;
};
}

View file

@ -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;
};
}

View file

@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://gitlab.com/hyask/swaysome";
license = licenses.mit;
maintainers = with maintainers; [ esclear ];
platforms = platforms.linux;
};
}

View file

@ -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;
};
}

View file

@ -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;
};
}

View file

@ -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 ];
};
}

View file

@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ primeos ];
platforms = platforms.unix;
platforms = platforms.linux;
};
}

View file

@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ artturin ];
mainProgram = "xclip";
platforms = platforms.linux;
};
}

View file

@ -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

View file

@ -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;
};
}

View file

@ -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;
};
}

View file

@ -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 ];
};
}

View file

@ -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;
};
}

View file

@ -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 ];
};
}

View file

@ -19678,6 +19678,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;
};