ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-13 16:07:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-09-11 12:01:18 +00:00 committed by GitHub
commit 58b4241dc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 152 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -8617,6 +8617,13 @@
githubId = 71893;
name = "Michael Maclean";
};
mglolenstine = {
email = "mglolenstine@gmail.com";
github = "MGlolenstine";
githubId = 9406770;
matrix = "@mglolenstine:matrix.org";
name = "MGlolenstine";
};
mgregoire = {
email = "gregoire@martinache.net";
github = "M-Gregoire";

49
pkgs/applications/graphics/pizarra/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, fetchFromGitLab
, rustPlatform
, cargo
, pkg-config
, binutils-unwrapped
, gtk3-x11
, atk
, glib
, librsvg
, gdk-pixbuf
, wrapGAppsHook
}:
rustPlatform.buildRustPackage rec {
pname = "pizarra";
version = "1.7.3";
src = fetchFromGitLab {
owner = "categulario";
repo = "pizarra-gtk";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "sha256-XP+P2w6s47JQV4spKeMKe/Ktxid7uokGYH4IEJ5VHSc=";
};
cargoSha256 = "sha256-JQZ/95tRlmsrb0EJaPlE8G0fMSeEgLnDi3pkLjcJz/o=";
nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ];
buildInputs = [ gtk3-x11 atk glib librsvg ];
meta = with lib; {
description = "A simple blackboard written in GTK";
longDescription = ''
A simple endless blackboard.
Contains various features, such as:
- Pencil
- Rectangle
- Ellipse
- Line
- Text
- Grids
'';
homepage = "https://pizarra.categulario.tk/en/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ mglolenstine ];
};
}

4
pkgs/applications/networking/cluster/node-problem-detector/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.11";
version = "0.8.12";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ=";
sha256 = "sha256-FLOkGeGl2tpLCyJxiGubzo+d2fieF/aNfhNJ2nzOtfw=";
};
vendorSha256 = null;

14
pkgs/applications/virtualization/docker/default.nix
View File

@ -243,19 +243,19 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec {
version = "20.10.17";
version = "20.10.18";
rev = "v${version}";
sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8=";
sha256 = "sha256-AyY6xfFEvUv7Kqo3M0gv9/4NoBUDqQyP4ZIcz+oGNys=";
moby-src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = "v${version}";
sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I=";
sha256 = "sha256-c0A66JVvRPFNT/xCTIsW8k3a/EMIl73d/UlCohjmGMk=";
};
runcRev = "v1.1.2";
runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
containerdRev = "v1.6.6";
containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
runcRev = "v1.1.4";
runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA=";
containerdRev = "v1.6.8";
containerdSha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8=";
tiniRev = "v0.19.0";
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};

4
pkgs/development/python-modules/pytest-testmon/default.nix
View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pytest-testmon";
version = "1.3.5";
version = "1.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ncgNO76j2Z3766ojYydUoYZzRoTb2XxhR6FkKFzjyhI=";
hash = "sha256-KcDVOKAuQ5iVKgK3o1Vnc+LUVsI1izTnkOmByiyCJ1E=";
};
buildInputs = [

4
pkgs/development/python-modules/pywlroots/default.nix
View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.20";
version = "0.15.21";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-hHZzMK7ge2Hs7tzHo4LV3rumEoEoL2OODRQRM60Vlz0=";
sha256 = "sha256-1wHV1+xrGFJWLoMIaG5jc01FfC7mV0+ArhPmWS5yG04=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/tatsu/default.nix
View File

@ -5,7 +5,7 @@
buildPythonPackage rec {
pname = "tatsu";
version = "5.8.2";
version = "5.8.3";
# upstream only supports 3.10+
disabled = pythonOlder "3.10";
@ -13,7 +13,7 @@ buildPythonPackage rec {
owner = "neogeny";
repo = "TatSu";
rev = "refs/tags/v${version}";
sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI=";
sha256 = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro=";
};
nativeBuildInputs = [ pytest-runner ];

4
pkgs/development/python-modules/torchmetrics/default.nix
View File

@ -15,7 +15,7 @@
let
pname = "torchmetrics";
version = "0.9.2";
version = "0.9.3";
in
buildPythonPackage {
inherit pname version;
@ -24,7 +24,7 @@ buildPythonPackage {
owner = "PyTorchLightning";
repo = "metrics";
rev = "refs/tags/v${version}";
hash = "sha256-zkdmWxaTPTMyLe7P/zVfgKSYDCec3uh0eqCtahByMlY=";
hash = "sha256-L2p8UftRkuBuRJX4V5+OYkJeJ5pCK3MvfA1OvSfgglY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/zope_dottedname/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "zope.dottedname";
version = "4.3";
version = "5.0";
src = fetchPypi {
inherit pname version;
sha256 = "0cec09844d309550359ac1941abfcd9141e213f67f3c19bb8f90360c40787576";
sha256 = "sha256-mfWDqAKFhqtMIXlGE+QR0BDNCZF/RdqXa9/udI87++w=";
};
meta = with lib; {

6
pkgs/development/tools/kind/default.nix
View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "kind";
version = "0.14.0";
version = "0.15.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "sha256-yCzznSVWuVEkaoj9bo0WOp3Dvl3t1UJ/DwtXv5dp+dQ=";
sha256 = "sha256-IDSWmNWHnTKOl6/N1Mz+OKOkZSBarpuN39CBsSjYhKY=";
};
patches = [
@ -18,7 +18,7 @@ buildGoModule rec {
./kernel-module-path.patch
];
vendorSha256 = "sha256-/UDmTyngydoso9F/iPp5JYlsfi0VNfHfTsxdGDaTK+w=";
vendorSha256 = "sha256-FE1GvNgXkBt2cH4YB3jTsPXp91DSiYlniQLtMwvi384=";
CGO_ENABLED = 0;
GOFLAGS = [ "-trimpath" ];

4
pkgs/os-specific/linux/hdparm/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "hdparm";
version = "9.64";
version = "9.65";
src = fetchurl {
url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz";
sha256 = "sha256-MVuVaVHD/qAnKH3iBDgVNCF8C9Dze0k1h3/i2wyrhZo=";
sha256 = "sha256-0Ukp+RDQYJMucX6TgkJdR8LnFEI1pTcT1VqU995TWks=";
};
preBuild = ''

28
pkgs/servers/sickbeard/patches/override-python-version-check.patch Normal file
View File

@ -0,0 +1,28 @@
From e97f418803c1db9a753fa755a9ee0cf04eabaed3 Mon Sep 17 00:00:00 2001
From: rembo10 <rembo10@users.noreply.github.com>
Date: Sun, 11 Sep 2022 13:00:29 +0530
Subject: [PATCH] Allow running on unsupported Python versions
---
sickgear.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sickgear.py b/sickgear.py
index 9d0440bb..6d65e65d 100755
--- a/sickgear.py
+++ b/sickgear.py
@@ -43,10 +43,7 @@ versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 14)),
((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 14)),
((3, 10, 0), (3, 10, 7))] # inclusive version ranges
if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)):
- print('Python %s.%s.%s detected.' % sys.version_info[:3])
- print('Sorry, SickGear requires a Python version %s' % ', '.join(map(
- lambda r: '%s - %s' % tuple(map(lambda v: str(v).replace(',', '.')[1:-1], r)), versions)))
- sys.exit(1)
+ pass
sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
is_win = 'win' == sys.platform[0:3]
--
2.37.2

14
pkgs/servers/sickbeard/sickgear.nix
View File

@ -1,23 +1,27 @@
{ lib, stdenv, fetchFromGitHub, python3, makeWrapper }:
{ lib, stdenv, fetchFromGitHub, python3, makeWrapper, libarchive }:
let
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);
pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
in stdenv.mkDerivation rec {
pname = "sickgear";
version = "0.25.35";
version = "0.25.40";
src = fetchFromGitHub {
owner = "SickGear";
repo = "SickGear";
rev = "release_${version}";
sha256 = "0hc43wfa256nkjm7bvsr6b7xsyilm1ks4x16kvpprqmj1symlkz3";
sha256 = "sha256-AHV/HSKuVWZFdZdkFp9p7okAcFO40d9OqV20MaHKXaU=";
};
patches = [
./patches/override-python-version-check.patch
];
dontBuild = true;
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ pythonEnv ];
buildInputs = [ pythonEnv libarchive ];
postPatch = ''
substituteInPlace sickgear.py --replace "/usr/bin/env python2" "/usr/bin/env python"

4
pkgs/tools/admin/docker-credential-gcr/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "docker-credential-gcr";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "docker-credential-gcr";
rev = "v${version}";
sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8=";
sha256 = "sha256-SdVAq/i5J21EoCHVrYL0y6zJxlElZRsGoKGJupZN94w=";
};
patches = [

10
pkgs/tools/networking/networkmanager/default.nix
View File

@ -2,7 +2,7 @@
, stdenv
, fetchurl
, substituteAll
, intltool
, gettext
, pkg-config
, fetchpatch
, dbus
@ -24,6 +24,7 @@
, libselinux
, audit
, gobject-introspection
, perl
, modemmanager
, openresolv
, libndp
@ -57,11 +58,11 @@ let
in
stdenv.mkDerivation rec {
pname = "networkmanager";
version = "1.38.4";
version = "1.40.0";
src = fetchurl {
url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU=";
sha256 = "sha256-rufgV7wsyl2rhOQfFfHai3lespB0ewTL7ugiutnp/AM=";
};
outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@ -153,10 +154,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
intltool
gettext
pkg-config
vala
gobject-introspection
perl
elfutils # used to find jansson soname
# Docs
gtk-doc

4
pkgs/tools/networking/networkmanager/fix-install-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/meson.build b/meson.build
index 9675cd8d03..a4562b693c 100644
index 300e71319c..2a9fba7116 100644
--- a/meson.build
+++ b/meson.build
@@ -1005,9 +1005,9 @@ meson.add_install_script(
@@ -996,9 +996,9 @@ meson.add_install_script(
join_paths('tools', 'meson-post-install.sh'),
nm_datadir,
nm_bindir,

30
pkgs/tools/networking/networkmanager/fix-paths.patch
View File

@ -24,10 +24,10 @@ index e23b3a5282..c7246a3b61 100644
ExecStart=@sbindir@/NetworkManager --no-daemon
Restart=on-failure
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 6b854517e5..7a642e76fe 100644
index c51da9ac82..ad67a301ef 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -13605,14 +13605,14 @@ nm_device_start_ip_check(NMDevice *self)
@@ -13879,14 +13879,14 @@ nm_device_start_ip_check(NMDevice *self)
gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
if (gw) {
_nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
@ -45,10 +45,10 @@ index 6b854517e5..7a642e76fe 100644
}
}
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index 2026f98dc3..8ec6978b8e 100644
index 46464a6328..d943d4351a 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -170,7 +170,6 @@ if enable_introspection
@@ -171,7 +171,6 @@ if enable_introspection
input: libnm_core_settings_sources,
output: 'nm-propery-infos-' + info + '.xml',
command: [
@ -56,7 +56,7 @@ index 2026f98dc3..8ec6978b8e 100644
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'),
info,
'@OUTPUT@',
@@ -227,7 +226,6 @@ if enable_introspection
@@ -228,7 +227,6 @@ if enable_introspection
'env',
'GI_TYPELIB_PATH=' + gi_typelib_path,
'LD_LIBRARY_PATH=' + ld_library_path,
@ -78,7 +78,7 @@ index bebc53a851..93710455d5 100644
g_ptr_array_add(argv, (char *) arg1);
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
index e2c0c394bd..1a507aa0d4 100644
index 7ad5bee509..2641dbf637 100644
--- a/src/libnmc-base/nm-vpn-helpers.c
+++ b/src/libnmc-base/nm-vpn-helpers.c
@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
@ -86,13 +86,13 @@ index e2c0c394bd..1a507aa0d4 100644
const char *const *iter;
const char *path;
- const char *const DEFAULT_PATHS[] = {
- "/sbin/",
- "/usr/sbin/",
- "/usr/local/sbin/",
- "/bin/",
- "/usr/bin/",
- "/usr/local/bin/",
- NULL,
- "/sbin/",
- "/usr/sbin/",
- "/usr/local/sbin/",
- "/bin/",
- "/usr/bin/",
- "/usr/local/bin/",
- NULL,
- };
- path = nm_utils_file_search_in_paths("openconnect",
@ -109,10 +109,10 @@ index e2c0c394bd..1a507aa0d4 100644
if (!g_spawn_sync(NULL,
(char **) NM_MAKE_STRV(path, "--authenticate", host),
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
index 8f07ae634e..a1326b3403 100644
index 49314cad2e..6d52624699 100644
--- a/src/libnmc-setting/meson.build
+++ b/src/libnmc-setting/meson.build
@@ -6,7 +6,6 @@ if enable_docs
@@ -7,7 +7,6 @@ if enable_docs
input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
output: 'settings-docs-input.xml',
command: [

6
pkgs/tools/networking/ooniprobe-cli/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "ooniprobe-cli";
version = "3.15.3";
version = "3.16.0";
src = fetchFromGitHub {
owner = "ooni";
repo = "probe-cli";
rev = "v${version}";
hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A=";
hash = "sha256-UMnhisn/1PfNADNB9nN5+Yj2hmXetHiWULjgQPeHLc8=";
};
vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc=";
vendorSha256 = "sha256-eH+PfclxqgffM/pzIkdl7x+6Ie6UPyUpWkJ7+G5eN/E=";
subPackages = [ "cmd/ooniprobe" ];

4
pkgs/tools/package-management/microdnf/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "microdnf";
version = "3.9.0";
version = "3.9.1";
src = fetchFromGitHub {
owner = "rpm-software-management";
repo = pname;
rev = version;
sha256 = "sha256-PDvA25QSju16d83f0UVpUiDU8XDuC2dKRi3LaItFRmk=";
sha256 = "sha256-/6yMHjB9HNEEQuAc8zEvmjjl6wur0jByS1hLz39+rHI=";
};
nativeBuildInputs = [ pkg-config cmake gettext help2man ];

4
pkgs/tools/package-management/micromamba/default.nix
View File

@ -44,13 +44,13 @@ let
in
stdenv.mkDerivation rec {
pname = "micromamba";
version = "0.24.0";
version = "0.25.0";
src = fetchFromGitHub {
owner = "mamba-org";
repo = "mamba";
rev = "micromamba-" + version;
sha256 = "sha256-CszDmt3SElHo1D2sNy2tPhZ43YD3pDjT8+fp2PVk+7Y=";
sha256 = "sha256-aTScTM1jX1WIrAVkAvp37fMa+05teLJnVdyIwtYq7mY=";
};
nativeBuildInputs = [ cmake ];

2
pkgs/top-level/all-packages.nix
View File

@ -30429,6 +30429,8 @@ with pkgs;
piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; };
pizarra = callPackage ../applications/graphics/pizarra { };
plater = libsForQt5.callPackage ../applications/misc/plater { };
plexamp = callPackage ../applications/audio/plexamp { };

1
pkgs/top-level/config.nix
View File

@ -35,6 +35,7 @@ let
warnUndeclaredOptions = mkOption {
description = "Whether to warn when <literal>config</literal> contains an unrecognized attribute.";
type = types.bool;
default = false;
};