pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub 45a2d659 55014749
+1
-1
lib/default.nix
+1
-1
lib/default.nix
···
108
108
makeScope makeScopeWithSplicing;
109
109
inherit (self.meta) addMetaAttrs dontDistribute setName updateName
110
110
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
111
-
hiPrioSet getLicenseFromSpdxId;
111
+
hiPrioSet getLicenseFromSpdxId getExe;
112
112
inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
113
113
cleanSource sourceByRegex sourceFilesBySuffices
114
114
commitIdFromGitRepo cleanSourceWith pathHasContext
+14
lib/meta.nix
+14
lib/meta.nix
···
126
126
lib.warn "getLicenseFromSpdxId: No license matches the given SPDX ID: ${licstr}"
127
127
{ shortName = licstr; }
128
128
);
129
+
130
+
/* Get the path to the main program of a derivation with either
131
+
meta.mainProgram or pname or name
132
+
133
+
Type: getExe :: derivation -> string
134
+
135
+
Example:
136
+
getExe pkgs.hello
137
+
=> "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello"
138
+
getExe pkgs.mustache-go
139
+
=> "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache"
140
+
*/
141
+
getExe = x:
142
+
"${lib.getBin x}/bin/${x.meta.mainProgram or (lib.getName x)}";
129
143
}
+2
-2
nixos/modules/tasks/filesystems/xfs.nix
+2
-2
nixos/modules/tasks/filesystems/xfs.nix
···
15
15
16
16
boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
17
17
18
-
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !boot.initrd.systemd.enable)
18
+
boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
19
19
''
20
20
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
21
21
copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/xfs_repair
22
22
'';
23
23
24
24
# Trick just to set 'sh' after the extraUtils nuke-refs.
25
-
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !boot.initrd.systemd.enable)
25
+
boot.initrd.extraUtilsCommandsTest = mkIf (inInitrd && !config.boot.initrd.systemd.enable)
26
26
''
27
27
sed -i -e 's,^#!.*,#!'$out/bin/sh, $out/bin/fsck.xfs
28
28
'';
+1
-1
pkgs/applications/editors/emacs/28.nix
+1
-1
pkgs/applications/editors/emacs/28.nix
+5
-3
pkgs/applications/editors/emacs/generic.nix
+5
-3
pkgs/applications/editors/emacs/generic.nix
···
13
13
, sigtool, jansson, harfbuzz, sqlite, nixosTests
14
14
, dontRecurseIntoAttrs, emacsPackagesFor
15
15
, libgccjit, targetPlatform, makeWrapper # native-comp params
16
+
, fetchFromSavannah
16
17
, systemd ? null
17
18
, withX ? !stdenv.isDarwin
18
19
, withNS ? stdenv.isDarwin
···
23
24
, withSQLite3 ? false
24
25
, withCsrc ? true
25
26
, withWebP ? false
26
-
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
27
+
, srcRepo ? true, autoreconfHook ? null, texinfo ? null
27
28
, siteStart ? ./site-start.el
28
29
, nativeComp ? false
29
30
, withAthena ? false
···
59
60
60
61
patches = patches fetchpatch;
61
62
62
-
src = fetchurl {
63
-
url = "mirror://gnu/emacs/${name}.tar.xz";
63
+
src = fetchFromSavannah {
64
+
repo = "emacs";
65
+
rev = version;
64
66
inherit sha256;
65
67
};
66
68
+2
-2
pkgs/applications/science/robotics/mavproxy/default.nix
+2
-2
pkgs/applications/science/robotics/mavproxy/default.nix
···
3
3
4
4
buildPythonApplication rec {
5
5
pname = "MAVProxy";
6
-
version = "1.8.48";
6
+
version = "1.8.49";
7
7
8
8
src = fetchPypi {
9
9
inherit pname version;
10
-
sha256 = "sha256-BigJdAz52D8hg2bQs7tngFqnITut/wENGZ0+gLlAeoY=";
10
+
sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ=";
11
11
};
12
12
13
13
postPatch = ''
+2
-2
pkgs/applications/version-management/git-and-tools/gh/default.nix
+2
-2
pkgs/applications/version-management/git-and-tools/gh/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "gh";
5
-
version = "2.8.0";
5
+
version = "2.9.0";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "cli";
9
9
repo = "cli";
10
10
rev = "v${version}";
11
-
sha256 = "sha256-oPLnc3Fv8oGbfQMujcVIwKJrQ3vCV9yIB4rUtjeVOV0=";
11
+
sha256 = "sha256-k8td9YKtlkit3YzpAncocZE7+Cl8v9ZNyPD4ZysCFRI=";
12
12
};
13
13
14
14
vendorSha256 = "sha256-YLkNua0Pz0gVIYnWOzOlV5RuLBaoZ4l7l1Pf4QIfUVQ=";
+2
-2
pkgs/development/libraries/openfst/default.nix
+2
-2
pkgs/development/libraries/openfst/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "openfst";
5
-
version = "1.8.1";
5
+
version = "1.8.2";
6
6
7
7
src = fetchurl {
8
8
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
9
-
sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A=";
9
+
sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I=";
10
10
};
11
11
12
12
configureFlags = [
+3
-3
pkgs/development/python-modules/hahomematic/default.nix
+3
-3
pkgs/development/python-modules/hahomematic/default.nix
···
14
14
15
15
buildPythonPackage rec {
16
16
pname = "hahomematic";
17
-
version = "1.1.5";
18
-
format = "setuptools";
17
+
version = "1.2.0";
18
+
format = "pyproject";
19
19
20
20
disabled = pythonOlder "3.9";
21
21
···
23
23
owner = "danielperna84";
24
24
repo = pname;
25
25
rev = "refs/tags/${version}";
26
-
sha256 = "sha256-wuoc+A+KoqH/OdZ7/Rj/RZjgRLMU1WrRFqlS3TzJL4I=";
26
+
sha256 = "sha256-qHJld5vn2UNb9xBIn0gHteJ9Yn1EBoKhnNflWLaZI8I=";
27
27
};
28
28
29
29
propagatedBuildInputs = [
+2
-2
pkgs/development/python-modules/mailchecker/default.nix
+2
-2
pkgs/development/python-modules/mailchecker/default.nix
···
6
6
7
7
buildPythonPackage rec {
8
8
pname = "mailchecker";
9
-
version = "4.1.15";
9
+
version = "4.1.16";
10
10
format = "setuptools";
11
11
12
12
disabled = pythonOlder "3.7";
13
13
14
14
src = fetchPypi {
15
15
inherit pname version;
16
-
hash = "sha256-DOtLJKNvmj5dlveZX9sScfJZa3SY7GH7xfZHhIsybVQ=";
16
+
hash = "sha256-A+lh+BggMSJ/PIcYMfX3u/YlKVqhG5IxbrHPb1U6Ll4=";
17
17
};
18
18
19
19
# Module has no tests
+2
-2
pkgs/development/python-modules/marshmallow-dataclass/default.nix
+2
-2
pkgs/development/python-modules/marshmallow-dataclass/default.nix
···
12
12
13
13
buildPythonPackage rec {
14
14
pname = "marshmallow-dataclass";
15
-
version = "8.5.5";
15
+
version = "8.5.6";
16
16
format = "setuptools";
17
17
18
18
disabled = pythonOlder "3.6";
···
21
21
owner = "lovasoa";
22
22
repo = "marshmallow_dataclass";
23
23
rev = "v${version}";
24
-
sha256 = "sha256-sozq+L3pa9iprAWtQd/L+LCfTWfDue04WzQ/fbM0mps=";
24
+
sha256 = "sha256-wUjgIjpN+c26yhlz3XzMOcKwTt/MDCiCLh7yGdy42jk=";
25
25
};
26
26
27
27
propagatedBuildInputs = [
+40
pkgs/development/python-modules/peaqevcore/default.nix
+40
pkgs/development/python-modules/peaqevcore/default.nix
···
1
+
{ lib
2
+
, buildPythonPackage
3
+
, fetchPypi
4
+
, pythonOlder
5
+
}:
6
+
7
+
buildPythonPackage rec {
8
+
pname = "peaqevcore";
9
+
version = "0.0.16";
10
+
format = "setuptools";
11
+
12
+
disabled = pythonOlder "3.7";
13
+
14
+
src = fetchPypi {
15
+
inherit pname version;
16
+
hash = "sha256-VYJzypRiVOF4FrvglAp2NWMUNxZx2Fq1Pw7lx0xbVFw=";
17
+
};
18
+
19
+
postPatch = ''
20
+
substituteInPlace setup.py \
21
+
--replace "datetime" "" \
22
+
--replace "statistics" "" \
23
+
--replace "pytest" ""
24
+
'';
25
+
26
+
# Tests are not shipped and source is not tagged
27
+
# https://github.com/elden1337/peaqev-core/issues/4
28
+
doCheck = false;
29
+
30
+
pythonImportsCheck = [
31
+
"peaqevcore"
32
+
];
33
+
34
+
meta = with lib; {
35
+
description = "Library for interacting with Peaqev car charging";
36
+
homepage = "https://github.com/elden1337/peaqev-core";
37
+
license = with licenses; [ mit ];
38
+
maintainers = with maintainers; [ fab ];
39
+
};
40
+
}
+2
-2
pkgs/development/python-modules/policyuniverse/default.nix
+2
-2
pkgs/development/python-modules/policyuniverse/default.nix
···
6
6
7
7
buildPythonPackage rec {
8
8
pname = "policyuniverse";
9
-
version = "1.5.0.20220421";
9
+
version = "1.5.0.20220426";
10
10
disabled = pythonOlder "3.7";
11
11
12
12
src = fetchPypi {
13
13
inherit pname version;
14
-
sha256 = "sha256-1rY77cIxqVcde+AYE6qfRgZzB8vb3yiQ3Bj+P0o1zFM=";
14
+
sha256 = "sha256-lOis0JE0XI43KsuGgpG20iBRPttVJvRS225PInu7EUM=";
15
15
};
16
16
17
17
# Tests are not shipped and there are no GitHub tags
+3
-3
pkgs/development/python-modules/pyfritzhome/default.nix
+3
-3
pkgs/development/python-modules/pyfritzhome/default.nix
···
9
9
10
10
buildPythonPackage rec {
11
11
pname = "pyfritzhome";
12
-
version = "0.6.4";
12
+
version = "0.6.5";
13
13
format = "setuptools";
14
14
15
-
disabled = pythonOlder "3.5";
15
+
disabled = pythonOlder "3.6";
16
16
17
17
src = fetchFromGitHub {
18
18
owner = "hthiery";
19
19
repo = "python-fritzhome";
20
20
rev = version;
21
-
sha256 = "sha256-JCaB3E8KCfncwnTKIb0shB2qYpsKwBkrPZdC5lAJ1KQ=";
21
+
hash = "sha256-0wfC4lQeTghN2uDUO8Rn2+G8BYOh2UfCZBDJmTw6Lb0=";
22
22
};
23
23
24
24
propagatedBuildInputs = [
+11
-13
pkgs/development/python-modules/pytest-aiohttp/default.nix
+11
-13
pkgs/development/python-modules/pytest-aiohttp/default.nix
···
1
1
{ lib
2
2
, buildPythonPackage
3
3
, fetchPypi
4
-
, fetchpatch
5
4
, setuptools-scm
6
5
, aiohttp
7
6
, pytest
···
11
10
12
11
buildPythonPackage rec {
13
12
pname = "pytest-aiohttp";
14
-
version = "1.0.3";
13
+
version = "1.0.4";
14
+
15
+
format = "setuptools";
15
16
16
17
src = fetchPypi {
17
18
inherit pname version;
18
-
hash = "sha256-DI/rSNyOuAhw4rFTrK9iu7zCB5d+vLdDZf/P4WrcnxU=";
19
+
sha256 = "39ff3a0d15484c01d1436cbedad575c6eafbf0f57cdf76fb94994c97b5b8c5a4";
19
20
};
20
21
21
-
patches = [
22
-
# https://github.com/aio-libs/pytest-aiohttp/pull/26
23
-
(fetchpatch {
24
-
name = "fix-tests-with-pytest-asyncio-0.18.0.patch";
25
-
url = "https://github.com/aio-libs/pytest-aiohttp/commit/97152c2dfdd368f799ec6bcb5fc315736a726f53.patch";
26
-
hash = "sha256-g7MTyCKUHnufOfrbhVV58WtfbGt1uXx8F7U9U+EaXfg=";
27
-
})
28
-
];
29
-
30
22
nativeBuildInputs = [
31
23
setuptools-scm
32
24
];
33
25
26
+
SETUPTOOLS_SCM_PRETEND_VERSION = version;
27
+
28
+
buildInputs = [
29
+
pytest
30
+
];
31
+
34
32
propagatedBuildInputs = [
35
33
aiohttp
36
-
pytest
37
34
pytest-asyncio
38
35
];
39
36
···
43
40
44
41
meta = with lib; {
45
42
homepage = "https://github.com/aio-libs/pytest-aiohttp/";
43
+
changelog = "https://github.com/aio-libs/pytest-aiohttp/blob/v${version}/CHANGES.rst";
46
44
description = "Pytest plugin for aiohttp support";
47
45
license = licenses.asl20;
48
46
maintainers = with maintainers; [ dotlambda ];
+1
pkgs/development/python-modules/pytorch-metric-learning/default.nix
+1
pkgs/development/python-modules/pytorch-metric-learning/default.nix
+4
-4
pkgs/misc/tpm2-pkcs11/default.nix
+4
-4
pkgs/misc/tpm2-pkcs11/default.nix
···
1
1
{ stdenv, lib, fetchFromGitHub, substituteAll
2
2
, pkg-config, autoreconfHook, autoconf-archive, makeWrapper, patchelf
3
-
, tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python37, glibc, libyaml
3
+
, tpm2-tss, tpm2-tools, opensc, openssl, sqlite, python3, glibc, libyaml
4
4
, abrmdSupport ? true, tpm2-abrmd ? null
5
5
}:
6
6
7
7
stdenv.mkDerivation rec {
8
8
pname = "tpm2-pkcs11";
9
-
version = "1.7.0";
9
+
version = "1.8.0";
10
10
11
11
src = fetchFromGitHub {
12
12
owner = "tpm2-software";
13
13
repo = pname;
14
14
rev = version;
15
-
sha256 = "sha256-Z9w6mIFen8Lf1l59XrMtR/Je2BZZycsOLxKS0VS4r4c=";
15
+
sha256 = "sha256-f5wi0nIM071yaQCwPkY1agKc7OEQa/IxHJc4V2i0Q9I=";
16
16
};
17
17
18
18
patches = lib.singleton (
···
33
33
];
34
34
buildInputs = [
35
35
tpm2-tss tpm2-tools opensc openssl sqlite libyaml
36
-
(python37.withPackages (ps: [ ps.pyyaml ps.cryptography ps.pyasn1-modules ]))
36
+
(python3.withPackages (ps: [ ps.pyyaml ps.cryptography ps.pyasn1-modules ps.tpm2-pytss ]))
37
37
];
38
38
39
39
outputs = [ "out" "bin" "dev" ];
+3
-3
pkgs/tools/admin/trivy/default.nix
+3
-3
pkgs/tools/admin/trivy/default.nix
···
5
5
6
6
buildGoModule rec {
7
7
pname = "trivy";
8
-
version = "0.26.0";
8
+
version = "0.27.0";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "aquasecurity";
12
12
repo = pname;
13
13
rev = "v${version}";
14
-
sha256 = "sha256-Se42a9Q76LsMk6b04P2C2sWSZ2UgfnQrpJUC2gwdCwY=";
14
+
sha256 = "sha256-EBvsyGODqF1FM4/HaecAC9f77Nl6aU3EXGDhxYYBm1A=";
15
15
};
16
16
17
-
vendorSha256 = "sha256-y/7KhDx6p+n6nvFHWcvGbvOWsXvvL81jOgfjxsL/JDg=";
17
+
vendorSha256 = "sha256-p8w1eJPOYM/fxNknGDumdDPUiluqYTNs8iYJ1o09NWo=";
18
18
19
19
excludedPackages = "misc";
20
20
+5
-5
pkgs/tools/backup/duply/default.nix
+5
-5
pkgs/tools/backup/duply/default.nix
···
1
-
{ lib, stdenv, fetchurl, coreutils, python2, duplicity, gawk, gnupg, bash
1
+
{ lib, stdenv, fetchurl, coreutils, python3, duplicity, gawk, gnupg, bash
2
2
, gnugrep, txt2man, makeWrapper, which
3
3
}:
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "duply";
7
-
version = "2.3.1";
7
+
version = "2.4";
8
8
9
9
src = fetchurl {
10
-
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.3.x/duply_${version}.tgz";
11
-
sha256 = "149hb9bk7hm5h3aqf19k37d0i2jf0viaqmpq2997i48qp3agji7h";
10
+
url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz";
11
+
hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg=";
12
12
};
13
13
14
14
nativeBuildInputs = [ makeWrapper ];
···
21
21
mkdir -p "$out/share/man/man1"
22
22
install -vD duply "$out/bin"
23
23
wrapProgram "$out/bin/duply" --set PATH \
24
-
${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
24
+
${lib.makeBinPath [ coreutils python3 duplicity gawk gnupg bash gnugrep txt2man which ]}
25
25
"$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
26
26
'';
27
27
+2
-2
pkgs/tools/misc/snapper/default.nix
+2
-2
pkgs/tools/misc/snapper/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub
2
2
, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
3
3
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
4
-
, lvm2, pam, python2, util-linux, json_c, nixosTests
4
+
, lvm2, pam, util-linux, json_c, nixosTests
5
5
, ncurses }:
6
6
7
7
stdenv.mkDerivation rec {
···
21
21
];
22
22
buildInputs = [
23
23
acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
24
-
lvm2 pam python2 util-linux json_c ncurses
24
+
lvm2 pam util-linux json_c ncurses
25
25
];
26
26
27
27
passthru.tests.snapper = nixosTests.snapper;
+2
-2
pkgs/tools/package-management/nix-eval-jobs/default.nix
+2
-2
pkgs/tools/package-management/nix-eval-jobs/default.nix
···
11
11
}:
12
12
stdenv.mkDerivation rec {
13
13
pname = "nix-eval-jobs";
14
-
version = "0.0.5";
14
+
version = "0.0.6";
15
15
src = fetchFromGitHub {
16
16
owner = "nix-community";
17
17
repo = pname;
18
18
rev = "v${version}";
19
-
hash = "sha256-3/F9q6MRebTltJzuhIukHrxgUyd5pi34IzaklfdvKe4=";
19
+
hash = "sha256-NCUVRiZqg9JgS+hlAczvPDb0M5uIwyyqhdKe5K1P360=";
20
20
};
21
21
buildInputs = [
22
22
boost
+2
pkgs/top-level/python-packages.nix
+2
pkgs/top-level/python-packages.nix
···
6128
6128
6129
6129
pdoc3 = callPackage ../development/python-modules/pdoc3 { };
6130
6130
6131
+
peaqevcore = callPackage ../development/python-modules/peaqevcore { };
6132
+
6131
6133
pebble = callPackage ../development/python-modules/pebble { };
6132
6134
6133
6135
pecan = callPackage ../development/python-modules/pecan { };