b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-05-07 12:01:55 +00:00 committed by GitHub
parent 3d1b7b0dc5 a714337bb2
commit bbe9795596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 201 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
maintainers/maintainer-list.nix
View file

@ -513,6 +513,17 @@
github = "alexnortung";
githubId = 1552267;
};
alexshpilkin = {
email = "ashpilkin@gmail.com";
github = "alexshpilkin";
githubId = 1010468;
keys = [{
longkeyid = "rsa4096/0x73E9AA114B3A894B";
fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B";
}];
matrix = "@alexshpilkin:matrix.org";
name = "Alexander Shpilkin";
};
alexvorobiev = {
email = "alexander.vorobiev@gmail.com";
github = "alexvorobiev";

4
pkgs/applications/misc/1password-gui/beta.nix
View file

@ -42,11 +42,11 @@ let
in stdenv.mkDerivation rec {
pname = "1password";
version = "8.7.0-49.BETA";
version = "8.8.0-11.BETA";
src = fetchurl {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4=";
sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo=";
};
nativeBuildInputs = [ makeWrapper ];

4
pkgs/applications/misc/1password-gui/default.nix
View file

@ -42,11 +42,11 @@ let
in stdenv.mkDerivation rec {
pname = "1password";
version = "8.6.1";
version = "8.7.0";
src = fetchurl {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
sha256 = "sha256-CbSx1UJAvNrA1gTQyi6r8NgjwQ7H+tqWU9t3TUNrDMg=";
sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg=";
};
nativeBuildInputs = [ makeWrapper ];

18
pkgs/applications/misc/catclock/default.nix
View file

@ -1,14 +1,15 @@
{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }:
{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif
, withAudioTracking ? false, libpulseaudio, aubio }:
stdenv.mkDerivation {
pname = "catclock";
version = "unstable-2015-10-04";
version = "unstable-2021-11-15";
src = fetchFromGitHub {
owner = "BarkyTheDog";
repo = "catclock";
rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac";
sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63";
rev = "b2f277974b5a80667647303cabf8a89d6d6a4290";
sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi";
};
preInstall = ''
@ -17,14 +18,15 @@ stdenv.mkDerivation {
cp xclock.man $out/share/man/man1/xclock.1
'';
makeFlags = [
"DESTINATION=$(out)/bin/"
];
makeFlags = [ "DESTINATION=$(out)/bin/" ]
++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1";
buildInputs = [ xlibsWrapper motif ];
buildInputs = [ xlibsWrapper motif ]
++ lib.optionals withAudioTracking [ libpulseaudio aubio ];
meta = with lib; {
homepage = "http://codefromabove.com/2014/05/catclock/";
description = "Analog / Digital / Cat clock for X";
license = with licenses; mit;
maintainers = with maintainers; [ ramkromberg ];
mainProgram = "xclock";

5
pkgs/applications/networking/mailreaders/notmuch/default.nix
View file

@ -79,6 +79,11 @@ stdenv.mkDerivation rec {
in ''
mkdir -p test/test-databases
ln -s ${test-database} test/test-databases/database-v1.tar.xz
''
# TODO: restore after resolved upstream
# https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html
+ ''
rm test/T355-smime.sh
'';
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");

4
pkgs/applications/video/ffmpeg-normalize/default.nix
View file

@ -7,11 +7,11 @@
buildPythonApplication rec {
pname = "ffmpeg-normalize";
version = "1.22.10";
version = "1.23.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-F058lCuIxH0lqJlPrWIznu2Ks2w+KXrTnJD7CmYSZFU=";
sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI=";
};
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];

4
pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix
View file

@ -2,11 +2,11 @@
buildKodiAddon rec {
pname = "inputstreamhelper";
namespace = "script.module.inputstreamhelper";
version = "0.5.8+matrix.1";
version = "0.5.10+matrix.1";
src = fetchzip {
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk=";
sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4=";
};
passthru = {

4
pkgs/build-support/setup-hooks/make-binary-wrapper.sh
View file

@ -33,8 +33,7 @@ assertExecutable() {
# To troubleshoot a binary wrapper after you compiled it,
# use the `strings` command or open the binary file in a text editor.
makeWrapper() {
local NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK
unset NIX_CFLAGS_COMPILE NIX_CFLAGS_LINK
local NIX_CFLAGS_COMPILE= NIX_CFLAGS_LINK=
local original="$1"
local wrapper="$2"
shift 2
@ -46,6 +45,7 @@ makeWrapper() {
makeDocumentedCWrapper "$original" "$@" | \
@CC@ \
-Wall -Werror -Wpedantic \
-Wno-overlength-strings \
-Os \
-x c \
-o "$wrapper" -

2
pkgs/desktops/gnome/apps/cheese/default.nix
View file

@ -80,8 +80,6 @@ stdenv.mkDerivation rec {
pipewire # PipeWire provides a gstreamer plugin for using PipeWire for video
];
NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py

2
pkgs/desktops/gnome/apps/gnome-maps/default.nix
View file

@ -69,8 +69,6 @@ stdenv.mkDerivation rec {
webkitgtk
];
NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py

2
pkgs/desktops/gnome/apps/gnome-music/default.nix
View file

@ -76,8 +76,6 @@ python3.pkgs.buildPythonApplication rec {
gst-plugins-ugly
]);
NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
pythonPath = with python3.pkgs; [
pycairo
dbus-python

4
pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
version = "42.0";
version = "42.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8=";
sha256 = "LYjv61d+2viqrkMcd5um5uuWHuvd8FzKLsyhqgTbekA=";
};
patches = [

6
pkgs/desktops/gnome/core/gnome-shell/default.nix
View file

@ -67,13 +67,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
version = "42.0";
version = "42.1";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ=";
sha256 = "9e6KYVj6EiYnQScmy4gATn4tBGrcMiFQViROWbdAY+o=";
};
patches = [
@ -175,8 +175,6 @@ stdenv.mkDerivation rec {
pythonEnv
];
NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
mesonFlags = [
"-Dgtk_doc=true"
];

4
pkgs/desktops/gnome/core/mutter/default.nix
View file

@ -47,13 +47,13 @@
let self = stdenv.mkDerivation rec {
pname = "mutter";
version = "42.0";
version = "42.1";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU=";
sha256 = "cZQhi/7EW5o+/avOb4RQ7Uw5dyIaHqQBTC5Fii/poVQ=";
};
patches = [

2
pkgs/desktops/gnome/core/totem/default.nix
View file

@ -77,8 +77,6 @@ stdenv.mkDerivation rec {
xvfb-run
];
NIX_CFLAGS_COMPILE = "-Wno-error=overlength-strings";
mesonFlags = [
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"

5
pkgs/development/compilers/gcc/11/default.nix
View file

@ -56,7 +56,8 @@ let majorVersion = "11";
# updated version is not available. Keep aarch64-darwin on 11.2.0 so the
# large body of packages which depend on gfortran are still functional
# until GCC 12 is the default.
version = if (stdenv.isDarwin && stdenv.isAarch64) then
# On x86_64-darwin, building libgcc suffers from some different issues with 11.3.0.
version = if stdenv.isDarwin then
"${majorVersion}.2.0" else "${majorVersion}.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -96,7 +97,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
sha256 = if (stdenv.isDarwin && stdenv.isAarch64)
sha256 = if stdenv.isDarwin
then "sha256-0I7cU2tUw3KhAQ/2YZ3SdMDxYDqkkhK6IPeqLNo2+os="
else "sha256-tHzygYaR9bHiHfK7OMeV+sLPvWQO3i0KXhyJ4zijrDk=";
};

4
pkgs/development/interpreters/clojure/babashka.nix
View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec {
pname = "babashka";
version = "0.8.1";
version = "0.8.2";
src = fetchurl {
url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM=";
sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8=";
};
executable = "bb";

8
pkgs/development/libraries/gmime/3.nix
View file

@ -2,12 +2,12 @@
, vala }:
stdenv.mkDerivation rec {
version = "3.2.7";
version = "3.2.11";
pname = "gmime";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia";
src = fetchurl { # https://github.com/jstedfast/gmime/releases
url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz";
sha256 = "5e023855a215b427645b400f5e55cf19cfd229f971317007e03e7bae72569bf8";
};
outputs = [ "out" "dev" ];

13
pkgs/development/python-modules/async-lru/default.nix
View file

@ -8,15 +8,15 @@
buildPythonPackage rec {
pname = "async-lru";
version = "unstable-2022-02-03";
version = "1.0.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "aio-libs";
repo = "async-lru";
rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc";
hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU=";
rev = "v${version}";
hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM=";
};
postPatch = ''
@ -32,13 +32,6 @@ buildPythonPackage rec {
"--asyncio-mode=strict"
];
disabledTests = [
# https://github.com/aio-libs/async-lru/issues/341
"test_alru_cache_deco"
"test_alru_cache_fn_called"
"test_close"
];
pythonImportsCheck = [ "async_lru" ];
meta = with lib; {

2
pkgs/development/python-modules/contexttimer/default.nix
View file

@ -25,7 +25,7 @@ buildPythonPackage rec {
})
];
pythonImportCheck = [ "contexttimer" ];
pythonImportsCheck = [ "contexttimer" ];
checkInputs = [ mock ];

48
pkgs/development/python-modules/hatch-vcs/default.nix Normal file
View file

@ -0,0 +1,48 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
, pythonOlder
, git
, hatchling
, setuptools-scm
}:
buildPythonPackage rec {
pname = "hatch-vcs";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "hatch_vcs";
inherit version;
sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
hatchling
setuptools-scm
];
checkInputs = [
git
pytestCheckHook
];
pythonImportsCheck = [
"hatch_vcs"
];
meta = with lib; {
description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions";
homepage = "https://github.com/ofek/hatch-vcs";
license = licenses.mit;
maintainers = with maintainers; [ cpcloud ];
};
}

4
pkgs/development/python-modules/imap-tools/default.nix
View file

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.54.0";
version = "0.55.0";
disabled = isPy27;
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE=";
hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw=";
};
checkInputs = [

4
pkgs/development/python-modules/mypy-boto3-s3/default.nix
View file

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "mypy-boto3-s3";
version = "1.22.6";
version = "1.22.8";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4=";
hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk=";
};
propagatedBuildInputs = [

32
pkgs/development/python-modules/py-nextbusnext/default.nix Normal file
View file

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "py-nextbusnext";
version = "0.1.5";
format = "setuptools";
src = fetchFromGitHub {
owner = "ViViDboarder";
repo = "py_nextbus";
rev = "v${version}";
hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI=";
};
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "py_nextbus" ];
meta = {
description = "Minimalistic Python client for the NextBus public API";
homepage = "https://github.com/ViViDboarder/py_nextbus";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}

4
pkgs/development/python-modules/pyicu/default.nix
View file

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "PyICU";
version = "2.8.1";
version = "2.9";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-8LlUmof4e6fEE/E2edE3Jx4LN/HzmwEJrOOCV9TRSNY=";
sha256 = "sha256-PCnWzmVUYVcReho0ejA+zfzxp1ke1nn8iM3vQQiEWHg=";
};
nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config

4
pkgs/development/python-modules/trimesh/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.11.2";
version = "3.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI=";
sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU=";
};
propagatedBuildInputs = [ numpy ];

6
pkgs/development/python-modules/yte/default.nix
View file

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "yte";
version = "1.2.2";
version = "1.2.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,8 +18,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "koesterlab";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc=";
rev = "refs/tags/v${version}";
sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo=";
};
nativeBuildInputs = [

4
pkgs/development/tools/misc/uncrustify/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "uncrustify";
version = "0.74.0";
version = "0.75.0";
src = fetchFromGitHub {
owner = "uncrustify";
repo = "uncrustify";
rev = "uncrustify-${version}";
sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd";
sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg=";
};
nativeBuildInputs = [ cmake python3 ];

2
pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix
View file

@ -55,7 +55,7 @@ stdenv.mkDerivation {
description = "facetimehd calibration";
homepage = "https://support.apple.com/kb/DL1837";
license = licenses.unfree;
maintainers = with maintainers; [ womfoo grahamc ];
maintainers = with maintainers; [ alexshpilkin womfoo grahamc ];
platforms = [ "i686-linux" "x86_64-linux" ];
};

4
pkgs/servers/home-assistant/component-packages.nix
View file

@ -1753,7 +1753,8 @@
nexia
];
"nextbus" = ps: with ps; [
]; # missing inputs: py_nextbusnext
py-nextbusnext
];
"nextcloud" = ps: with ps; [
nextcloudmonitor
];
@ -3501,6 +3502,7 @@
"netgear"
"network"
"nexia"
"nextbus"
"nightscout"
"nina"
"no_ip"

1
pkgs/test/make-binary-wrapper/default.nix
View file

@ -44,6 +44,7 @@ let
"invalid-env"
"prefix"
"suffix"
"overlength-strings"
];
f = name: lib.nameValuePair name (makeGoldenTest name);
in builtins.listToAttrs (builtins.map f names);

25
pkgs/test/make-binary-wrapper/overlength-strings.c Normal file
View file

File diff suppressed because one or more lines are too long

1
pkgs/test/make-binary-wrapper/overlength-strings.cmdline Normal file
View file

File diff suppressed because one or more lines are too long

3
pkgs/test/make-binary-wrapper/overlength-strings.env Normal file
View file

File diff suppressed because one or more lines are too long

14
pkgs/top-level/perl-packages.nix
View file

@ -18989,6 +18989,20 @@ let
};
};
POSIXAtFork = buildPerlPackage {
pname = "POSIX-AtFork";
version = "0.04";
src = fetchurl {
url = "mirror://cpan/authors//id/N/NI/NIKOLAS/POSIX-AtFork-0.04.tar.gz";
sha256 = "sha256-wuIpOobUhxRLyPe6COfEt2sRsOTf3EGAmEXTDvoH5g4=";
};
buildInputs = [ TestSharedFork ];
meta = {
description = "Hook registrations at fork(2)";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
POSIXstrftimeCompiler = buildPerlModule {
pname = "POSIX-strftime-Compiler";
version = "0.44";

2
pkgs/top-level/python-aliases.nix
View file

@ -108,7 +108,7 @@ mapAliases ({
pytestrunner = pytest-runner; # added 2021-01-04
python-igraph = igraph; # added 2021-11-11
python-lz4 = lz4; # added 2018-06-01
python-magic = python-magic; # added 2022-05-07
python_magic = python-magic; # added 2022-05-07
python_mimeparse = python-mimeparse; # added 2021-10-31
python-subunit = subunit; # added 2021-09-10
pytest_xdist = pytest-xdist; # added 2021-01-04

4
pkgs/top-level/python-packages.nix
View file

@ -3793,6 +3793,8 @@ in {
hatchling = callPackage ../development/python-modules/hatchling { };
hatch-vcs = callPackage ../development/python-modules/hatch-vcs { };
haversine = callPackage ../development/python-modules/haversine { };
hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
@ -6372,6 +6374,8 @@ in {
proxy_tools = callPackage ../development/python-modules/proxy_tools { };
py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { };
pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { };
pyatag = callPackage ../development/python-modules/pyatag { };