Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-06-16 06:01:20 +00:00 committed by GitHub
commit ee08b3ce28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 143 additions and 29 deletions

View File

@ -11858,6 +11858,12 @@
github = "simarra";
githubId = 14372987;
};
simoneruffini = {
email = "simone.ruffini@tutanota.com";
github = "simoneruffini";
githubId = 50401154;
name = "Simone Ruffini";
};
simonchatts = {
email = "code@chatts.net";
github = "simonchatts";

View File

@ -25,7 +25,7 @@ buildGoModule rec {
subPackages = [ "." ];
preBuild = ''
go generate ./commands
GOARCH= go generate ./commands
'';
postBuild = ''

View File

@ -16,15 +16,16 @@
, libsndfile
, pango
, perl
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "e16";
version = "1.0.24";
version = "1.0.25";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz";
sha256 = "1anmwfjyynwl0ylkyksa7bnsqzf58l1yccjzp3kbwq6nw1gs7dbv";
hash = "sha256-rUtDaBa4vvC3gO7QSkFrphWuVOmbtkH+pRujQDaUOek=";
};
nativeBuildInputs = [
@ -52,6 +53,12 @@ stdenv.mkDerivation rec {
substituteInPlace scripts/e_gen_menu --replace "/usr/local:" "/run/current-system/sw:/usr/local:"
'';
passthru.updateScript = gitUpdater {
inherit pname version;
url = "https://git.enlightenment.org/e16/e16";
rev-prefix = "v";
};
meta = with lib; {
homepage = "https://www.enlightenment.org/e16";
description = "Enlightenment DR16 window manager";

View File

@ -2,8 +2,6 @@
, stdenv
, fetchFromGitHub
, nix-update-script
, appstream
, desktop-file-utils
, meson
, ninja
, pkg-config
@ -25,18 +23,16 @@
stdenv.mkDerivation rec {
pname = "elementary-tasks";
version = "6.2.0";
version = "6.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "tasks";
rev = version;
sha256 = "sha256-eHaWXntLkk5G+cR5uFwWsIvbSPsbrvpglYBh91ta/M0=";
sha256 = "sha256-kW36bKA0uzW98Xl2bjbTkcfLm4SeQR8VB2FyKOqfPnM=";
};
nativeBuildInputs = [
appstream
desktop-file-utils
meson
ninja
pkg-config

View File

@ -11,23 +11,21 @@
, libgee
, libhandy
, granite
, gettext
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "switchboard";
version = "6.0.1";
version = "6.0.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M=";
sha256 = "sha256-2c+anQ17lrdFy+cbjoYY94EFxYUcS+4mZrwbrLohfUg=";
};
nativeBuildInputs = [
gettext
meson
ninja
pkg-config

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, meson
, ninja
, pkg-config
@ -50,6 +51,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "GTK notification server for Pantheon";
homepage = "https://github.com/elementary/notifications";

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, nix-update-script
, meson
, ninja
, pkg-config
@ -57,6 +58,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Settings daemon for Pantheon";
homepage = "https://github.com/elementary/settings-daemon";

View File

@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "3.0.1";
version = "3.0.2";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-0DcX2w2omPdOmBD6WpG2Li1ERPSI0i9qOINdO/kVrUI=";
sha256 = "sha256-3oVkZcLvaFIYTQi/1ZwMoBkEhls3OiezgwNKxrQSjrY=";
};
propagatedBuildInputs = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-redis";
version = "4.2.6";
version = "4.2.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-1q3HcYXPQLMAgWdnpkwO6e4LIdwXTo5cI7foPUMYnLg=";
sha256 = "sha256-7s5XPo39USOPrh34TTYCM1+8vTuosGQIHMD/jsHwWKE=";
};
# Module doesn't have tests

View File

@ -16,15 +16,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.22.3";
version = "1.23.0";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Ode/kbf2aHgSh+k7ZK0aoVqUTPzfLtWkSF2saP/DG0k=";
sha256 = "sha256-nPVghkLtXhd2/TeBeNDtA1ucgiqzZWmtxXf9bCrFh44=";
};
cargoSha256 = "sha256-YNJbT+88YDWDv/ydz9sZQ/QddjB+ggK57/6LzKN+zNE=";
cargoSha256 = "sha256-bCk6zgsfyI5Nk0AHPyr29KzgltobxfD6b72N0ZaQyOU=";
postPatch = ''
# upstream uses lld on aarch64-darwin for faster builds

View File

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.43.1";
version = "0.44.1";
shas = {
x86_64-linux = "sha256-xsKV3/MXwQExON5Bq1qRUShPV0wXEtUHB/DTVjVyWfQ=";
aarch64-linux = "sha256-wBtpDG4GxSR4jeAZjclNqVDankWBmxf0cH0LKM4smjM=";
x86_64-darwin = "sha256-BGrbwRoPUcSIW4Q3PF8p6vjkTKGLISBxLjOXDWcSjag=";
aarch64-darwin = "sha256-4OyQPQPIQ94TanY1hxRTdcWZi5didvyLupLfQ516YL4=";
x86_64-linux = "sha256-8aBjN9ukbH+lr3YPdngXxSjPjutBgWv4hEdhYmcvtO4=";
aarch64-linux = "sha256-h0mxzeA/wB+/zNz0ZKjSBH7lpYrCLRdTgeDGwZypuXE=";
x86_64-darwin = "sha256-4YXYHhYwCBnb1clxW1ziccHMWsUcGz8Rr8/anCvI1lY=";
aarch64-darwin = "sha256-3sBeL+YJB1HaEhM76GfABvN/6iWeST7Z6lVu3X8sRjk=";
};
}

View File

@ -17,7 +17,7 @@ let
, platformCanUseHDCPBlob ? false # set this to true if the platform is able to use hdcp.bin
, extraMakeFlags ? []
, extraMeta ? {}
, version ? "2.6"
, version ? "2.7"
, ... } @ args:
# delete hdcp.bin if either: the platform is thought to
@ -33,7 +33,7 @@ let
owner = "ARM-software";
repo = "arm-trusted-firmware";
rev = "v${version}";
sha256 = "sha256-qT9DdTvMcUrvRzgmVf2qmKB+Rb1WOB4p1rM+fsewGcg=";
sha256 = "sha256-WDJMMIWZHNqxxAKeHiZDxtPjfsfQAWsbYv+0o0PiJQs=";
};
patches = lib.optionals deleteHDCPBlobBeforeBuild [

View File

@ -0,0 +1,41 @@
{ stdenv
, lib
, fetchFromGitLab
, runtimeShell
, makeWrapper
}:
stdenv.mkDerivation {
pname = "dt-shell-color-scripts";
version = "unstable-2022-02-22";
src = fetchFromGitLab {
owner = "dwt1";
repo = "shell-color-scripts";
rev = "fcd013ea2e1ff80e01adbcea9d0eaf9c73db94c0";
sha256 = "sha256-bd3NBf99rCiADUKQb6fzCBDaKBmYaZHcO4qokm/39do=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
patchShebangs ./colorscript.sh
patchShebangs ./colorscripts
mkdir -p $out/bin
mkdir -p $out/opt/shell-color-scripts/
cp -r colorscripts $out/opt/shell-color-scripts/colorscripts
chmod +x colorscript.sh
cp colorscript.sh $out/bin/colorscript
substituteInPlace $out/bin/colorscript \
--replace "/opt/shell-color-scripts/colorscripts" "$out/opt/shell-color-scripts/colorscripts"
runHook postInstall
'';
meta = with lib; {
description = "A collection of shell color scripts collected by dt (Derek Taylor)";
homepage = "https://gitlab.com/dwt1/shell-color-scripts";
license = with licenses; [ mit ];
maintainers = with maintainers; [ drzoidberg ];
};
}

View File

@ -3,15 +3,16 @@
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "vtm";
version = "0.6.0";
version = "0.7.6";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${version}";
sha256 = "sha256-Z6PSx7TwarQx0Mc3fSRPwV7yIPJK3xtW4k0LJ6RPYRY=";
sha256 = "sha256-YAS/HcgtA4Ms8EB7RRCg6ElBL4aI/FqXjqymHy/voRs=";
};
nativeBuildInputs = [ cmake ];

View File

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, wayland
, libinput
, libyamlcpp
}:
stdenv.mkDerivation rec {
pname = "way-displays";
version = "1.5.3";
src = fetchFromGitHub {
owner = "alex-courtis";
repo = "way-displays";
rev = "${version}";
sha256 = "sha256-5A0qZRpWw3Deo9cGqGULpQMoPCVh85cWE/wJ5XSbVJk=";
};
postPatch = ''
substituteInPlace src/cfg.cpp --replace "\"/etc" "\"$out/etc"
'';
strictDeps = true;
nativeBuildInputs = [
pkg-config
wayland
];
buildInputs = [
wayland
libyamlcpp
libinput
];
makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC="];
meta = with lib; {
homepage = "https://github.com/alex-courtis/way-displays";
description = "Auto Manage Your Wayland Displays";
license = licenses.mit;
maintainers = with maintainers; [ simoneruffini ];
platforms = platforms.linux;
};
}

View File

@ -3135,6 +3135,8 @@ with pkgs;
wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { };
way-displays = callPackage ../tools/wayland/way-displays { };
wev = callPackage ../tools/wayland/wev { };
wdomirror = callPackage ../tools/wayland/wdomirror { };
@ -3406,6 +3408,8 @@ with pkgs;
dtools = callPackage ../development/tools/dtools { };
dt-shell-color-scripts = callPackage ../tools/misc/dt-shell-color-scripts { };
dtrx = callPackage ../tools/compression/dtrx { };
dua = callPackage ../tools/misc/dua {