Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-09-26 06:01:27 +00:00
committed by GitHub
29 changed files with 322 additions and 49 deletions
+2 -1
View File
@@ -112,7 +112,8 @@ let
'';
# See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
postPatch = ''
# linux only because of https://github.com/NixOS/nixpkgs/issues/138729
postPatch = lib.optionalString stdenv.isLinux ''
# this is a fix for "save as root" functionality
packed="resources/app/node_modules.asar"
unpacked="resources/app/node_modules"
+4 -4
View File
@@ -1,12 +1,12 @@
{ lib, fetchurl, python2Packages }:
{ lib, fetchurl, python3Packages }:
python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "menumaker";
version = "0.99.12";
version = "0.99.13";
src = fetchurl {
url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3";
sha256 = "sha256-JBXs5hnt1snbnB1hi7q7HBI7rNp0OoalLeIM0uJCdkE=";
};
format = "other";
+1 -1
View File
@@ -9,7 +9,7 @@ buildGoPackage rec {
goDeps = ./deps.nix;
preConfigure = ''
for i in $(find . -type f);do
for i in *.go **/*.go; do
substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go
done
substituteInPlace Makefile --replace mop/cmd mop/mop
@@ -0,0 +1,10 @@
{ invalidateFetcherByDrvHash, fetchFirefoxAddon, ... }:
{
simple = invalidateFetcherByDrvHash fetchFirefoxAddon {
name = "image-search-options";
# Chosen because its only 147KB
url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg=";
};
}
@@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
patches = [
./plugins-dir.patch
# https://github.com/elementary/gala/pull/1259
# https://github.com/NixOS/nixpkgs/issues/139404
# Remove this patch when it is included in a new release
# of gala OR when we no longer use mutter 3.38 for pantheon
./fix-session-crash-when-taking-screenshots.patch
];
postPatch = ''
@@ -0,0 +1,50 @@
From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 25 Sep 2021 23:21:01 +0800
Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38
---
src/ScreenshotManager.vala | 5 ++---
vapi/mutter-clutter.vapi | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
index 3ffb0123..388fee1a 100644
--- a/src/ScreenshotManager.vala
+++ b/src/ScreenshotManager.vala
@@ -354,12 +354,11 @@ namespace Gala {
paint_flags |= Clutter.PaintFlag.FORCE_CURSORS;
}
- unowned var data = image.get_data ();
if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) {
wm.stage.paint_to_buffer (
{x, y, width, height},
scale,
- ref data,
+ image.get_data (),
image.get_stride (),
Cogl.PixelFormat.BGRA_8888_PRE,
paint_flags
@@ -368,7 +367,7 @@ namespace Gala {
wm.stage.paint_to_buffer (
{x, y, width, height},
scale,
- ref data,
+ image.get_data (),
image.get_stride (),
Cogl.PixelFormat.ARGB_8888_PRE,
paint_flags
diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi
index 5b778cb2..95de24be 100644
--- a/vapi/mutter-clutter.vapi
+++ b/vapi/mutter-clutter.vapi
@@ -7336,7 +7336,7 @@ namespace Clutter {
[Version (since = "1.2")]
public bool get_use_alpha ();
#if HAS_MUTTER338
- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
+ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
#else
[Version (since = "0.4")]
@@ -109,8 +109,7 @@ in stdenv.mkDerivation {
inherit passthru;
meta = {
# The emscripten is broken on darwin
platforms = lib.platforms.linux;
platforms = with lib.platforms; linux ++ darwin;
# Hydra limits jobs to only outputting 1 gigabyte worth of files.
# GHCJS outputs over 3 gigabytes.
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
makeFlags = [ "INSTALLPREFIX=$(out)" ];
postFixup = ''
chmod +x $out/lib/*
'';
meta = with lib; {
homepage = "http://miniupnp.free.fr/libnatpmp.html";
description = "NAT-PMP client";
@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
}:
buildPythonPackage rec {
pname = "asynccmd";
version = "0.2.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "valentinmk";
repo = pname;
rev = version;
sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h";
};
patches = [
# Deprecation of asyncio.Task.all_tasks(), https://github.com/valentinmk/asynccmd/pull/2
(fetchpatch {
name = "deprecation-python-38.patch";
url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch";
sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf";
})
];
# Tests are outdated
doCheck = false;
pythonImportsCheck = [ "asynccmd" ];
meta = with lib; {
description = "Asyncio implementation of Cmd Python library";
homepage = "https://github.com/valentinmk/asynccmd";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
}
@@ -0,0 +1,60 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, poetry-core
, requests-mock
, pythonOlder
, pytest-asyncio
, pytestCheckHook
, python-dateutil
, requests
}:
buildPythonPackage rec {
pname = "flipr-api";
version = "1.4.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "cnico";
repo = pname;
rev = version;
sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
python-dateutil
requests
];
checkInputs = [
requests-mock
pytest-asyncio
pytestCheckHook
];
patches = [
# Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4
(fetchpatch {
name = "switch-to-poetry-core.patch";
url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch";
sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6";
})
];
pythonImportsCheck = [ "flipr_api" ];
meta = with lib; {
description = "Python client for Flipr API";
homepage = "https://github.com/cnico/flipr-api";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-core";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.core";
inherit version;
sha256 = "1kd5wda7nqcmrwy6b42nqgz570y99yjw3m6a1kxr8ag3859fwga5";
sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI=";
};
# pyroute2 sub-modules have no tests
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-ethtool";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.ethtool";
inherit version;
sha256 = "04wxx2nn3rdsjcmck7fidzfdc42gpsjva2jc8p7a987b0j58r17s";
sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-ipdb";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.ipdb";
inherit version;
sha256 = "0r4xq7h39qac309lpl7haaa4rqf6qzsypkgnsiran3w9jgr1hg75";
sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-ipset";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.ipset";
inherit version;
sha256 = "sha256-V6aUGYv4PGhxHoEjgNuqoRbd6ftqirO/ofNDQEACTy8=";
sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-ndb";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.ndb";
inherit version;
sha256 = "0q3py2n6w7nhdxi4l6vx8xpxh5if6hav4lcl5nwk8c4pgcrfd4vn";
sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nftables";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.nftables";
inherit version;
sha256 = "0mj897h86ifk4ncms71nz6qrrfzfq8hd81198vf1hm41wppgyxn1";
sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-nslink";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.nslink";
inherit version;
sha256 = "0iz4vrv05x678ihhl2wdppxda82fxrq3d3sh7mka0pyb66a8mrik";
sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4=";
};
propagatedBuildInputs = [
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "pyroute2-protocols";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
pname = "pyroute2.protocols";
inherit version;
sha256 = "0gb5r1msd14fhalfknhmg67l2hm802r4771i1srgl4rix1sk0yw8";
sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84=";
};
propagatedBuildInputs = [
@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "pyroute2";
version = "0.6.4";
version = "0.6.5";
src = fetchPypi {
inherit pname version;
sha256 = "560b48a751b1150056ba553c89a31d563cc18ae2675b3793666adcaeb4fabfda";
sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw=";
};
propagatedBuildInputs = [
@@ -0,0 +1,46 @@
{ lib
, aiohttp
, aioresponses
, asynccmd
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pyspcwebgw";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "mbrrg";
repo = pname;
rev = "v${version}";
sha256 = "0pc25myjc2adqcx2lbns9kw0gy17x1qjgicmfj46n6fn0c786p9v";
};
propagatedBuildInputs = [
asynccmd
aiohttp
];
checkInputs = [
aioresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pyspcwebgw" ];
meta = with lib; {
description = "Python module for the SPC Web Gateway REST API";
homepage = "https://github.com/mbrrg/pyspcwebgw";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "streamlabswater";
version = "0.3.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = "stream-python";
rev = "v${version}";
sha256 = "1lh1i1ksic9yhxnwc7mqm5qla98x85dfwj846kwldwam0vcrqlk7";
};
propagatedBuildInputs = [
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "streamlabswater" ];
meta = with lib; {
description = "Python library for the StreamLabs API";
homepage = "https://github.com/streamlabswater/stream-python";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -1,7 +1,7 @@
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome
, python2Packages }:
{ lib, fetchurl, pkg-config, libxml2, libxslt, intltool, gnome
, python3Packages, fetchpatch, bash }:
python2Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "gnome-doc-utils";
version = "0.20.10";
@@ -12,28 +12,31 @@ python2Packages.buildPythonApplication rec {
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
};
patches = [
# https://bugzilla.redhat.com/show_bug.cgi?id=438638
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.14.0-package.patch";
sha256 = "sha256-V2L2/30NoHY/wj3+dsombxveWRSUJb2YByOKtEgVx/0=";
})
# python3 support
(fetchpatch {
url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.20.10-python3.patch";
sha256 = "sha256-niH/Yx5H44rsRgkCZS8LWLFB9ZvuInt75zugzoVUhH0=";
})
];
nativeBuildInputs = [ intltool pkg-config libxslt.dev ];
buildInputs = [ libxslt ];
buildInputs = [ libxml2 libxslt bash ];
propagatedBuildInputs = [ python3Packages.libxml2 ];
configureFlags = [ "--disable-scrollkeeper" ];
preBuild = ''
substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""'
'';
propagatedBuildInputs = [ libxml2Python ];
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
};
};
postFixup = ''
# Do not propagate Python
rm $out/nix-support/propagated-build-inputs
'';
meta = with lib; {
description = "Collection of documentation utilities for the GNOME project";
homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils";
@@ -272,7 +272,7 @@
"flexit" = ps: with ps; [ pymodbus ];
"flic" = ps: with ps; [ pyflic ];
"flick_electric" = ps: with ps; [ pyflick ];
"flipr" = ps: with ps; [ ]; # missing inputs: flipr-api
"flipr" = ps: with ps; [ flipr-api ];
"flo" = ps: with ps; [ aioflo ];
"flock" = ps: with ps; [ ];
"flume" = ps: with ps; [ pyflume ];
@@ -806,7 +806,7 @@
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
"spaceapi" = ps: with ps; [ aiohttp-cors ];
"spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
"spc" = ps: with ps; [ pyspcwebgw ];
"speedtestdotnet" = ps: with ps; [ speedtest-cli ];
"spider" = ps: with ps; [ spiderpy ];
"splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk
@@ -824,7 +824,7 @@
"stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
"stream" = ps: with ps; [ aiohttp-cors av ];
"streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater
"streamlabswater" = ps: with ps; [ streamlabswater ];
"stt" = ps: with ps; [ aiohttp-cors ];
"subaru" = ps: with ps; [ subarulink ];
"suez_water" = ps: with ps; [ ]; # missing inputs: pysuez
+2
View File
@@ -362,6 +362,7 @@ in with py.pkgs; buildPythonApplication rec {
"fireservicerota"
"firmata"
"flick_electric"
"flipr"
"flo"
"flume"
"flunearyou"
@@ -631,6 +632,7 @@ in with py.pkgs; buildPythonApplication rec {
# "sonos"
"soundtouch"
"spaceapi"
"spc"
"speedtestdotnet"
"spider"
"spotify"
+2 -2
View File
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "tailscale";
version = "1.14.3";
version = "1.14.4";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-IXnkKKyjnktGjz3Osi2qYnrcDHC3Xfcr1oku/P0s0xk=";
sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8=";
};
nativeBuildInputs = [ makeWrapper ];
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p0" ];
postPatch = ''
# Drop blanket -Werror to avoid build failure on fresh toolchains
# like gcc-11.
substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' '
cd squashfs-tools
'';
+2 -2
View File
@@ -6,11 +6,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "github-backup";
version = "0.40.0";
version = "0.40.1";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-HgNOTi4z1wbRdeVFjGVbpuxd9/o9aWWYd8/ykiVF8Ks=";
sha256 = "sha256-Qrj0+4WXlW0UgG2xV/P8e0QgUG3VurY4HIAiiUF3LW8=";
};
makeWrapperArgs = [
+4 -1
View File
@@ -510,7 +510,10 @@ with pkgs;
fetchhg = callPackage ../build-support/fetchhg { };
fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {};
fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { }
// {
tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { };
};
# `fetchurl' downloads a file from the network.
fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform
+8
View File
@@ -619,6 +619,8 @@ in {
async-lru = callPackage ../development/python-modules/async-lru { };
asynccmd = callPackage ../development/python-modules/asynccmd { };
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
@@ -2737,6 +2739,8 @@ in {
flickrapi = callPackage ../development/python-modules/flickrapi { };
flipr-api = callPackage ../development/python-modules/flipr-api { };
flit = callPackage ../development/python-modules/flit { };
flit-core = callPackage ../development/python-modules/flit-core { };
@@ -6905,6 +6909,8 @@ in {
pysparse = callPackage ../development/python-modules/pysparse { };
pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { };
pyspf = callPackage ../development/python-modules/pyspf { };
pyspice = callPackage ../development/python-modules/pyspice { };
@@ -8683,6 +8689,8 @@ in {
streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };
streamlabswater = callPackage ../development/python-modules/streamlabswater { };
streamz = callPackage ../development/python-modules/streamz { };
strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { };