Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
d8aac1a80f
|
|
@ -11,7 +11,6 @@ rec {
|
|||
isi686 = { cpu = cpuTypes.i686; };
|
||||
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
|
||||
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
|
||||
isPowerPC = { cpu = cpuTypes.powerpc; };
|
||||
isPower = { cpu = { family = "power"; }; };
|
||||
isPower64 = { cpu = { family = "power"; bits = 64; }; };
|
||||
isx86 = { cpu = { family = "x86"; }; };
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
</section>
|
||||
<section xml:id="sec-release-22.11-incompatibilities">
|
||||
<title>Backward Incompatibilities</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>isCompatible</literal> predicate checking CPU
|
||||
|
|
@ -69,6 +69,21 @@
|
|||
compatible</emphasis>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>isPowerPC</literal> predicate, found on
|
||||
<literal>platform</literal> attrsets
|
||||
(<literal>hostPlatform</literal>,
|
||||
<literal>buildPlatform</literal>,
|
||||
<literal>targetPlatform</literal>, etc) has been removed in
|
||||
order to reduce confusion. The predicate was was defined such
|
||||
that it matches only the 32-bit big-endian members of the
|
||||
POWER/PowerPC family, despite having a name which would imply
|
||||
a broader set of systems. If you were using this predicate,
|
||||
you can replace <literal>foo.isPowerPC</literal> with
|
||||
<literal>(with foo; isPower && is32bit && isBigEndian)</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-notable-changes">
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
`lib.systems.parse.isCompatible` still exists, but has changed semantically:
|
||||
Architectures with differing endianness modes are *no longer considered compatible*.
|
||||
|
||||
- The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.
|
||||
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Other Notable Changes {#sec-release-22.11-notable-changes}
|
||||
|
|
|
|||
|
|
@ -479,7 +479,7 @@ in
|
|||
+ lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86"
|
||||
# Untested but should also reduce size for these platforms
|
||||
+ lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm"
|
||||
+ lib.optionalString (isPowerPC) "-Xbcj powerpc"
|
||||
+ lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc"
|
||||
+ lib.optionalString (isSparc) "-Xbcj sparc";
|
||||
description = ''
|
||||
Compression settings to use for the squashfs nix store.
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pygobject3
|
||||
pyxdg
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pycairo
|
||||
pexpect
|
||||
];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
, pyshp
|
||||
, fonttools
|
||||
, pyyaml
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, vobject
|
||||
, tabulate
|
||||
, wcwidth
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonApplication rec {
|
|||
pyyaml
|
||||
#namestand
|
||||
#datapackage
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
#tabula
|
||||
vobject
|
||||
tabulate
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ let
|
|||
./patches/m102-fix-dawn_version_generator-failure.patch
|
||||
];
|
||||
|
||||
postPatch = optionalString (chromiumVersionAtLeast "102") ''
|
||||
postPatch = ''
|
||||
# Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
|
||||
substituteInPlace BUILD.gn \
|
||||
--replace '"//infra/orchestrator:orchestrator_all",' ""
|
||||
|
|
@ -174,7 +174,6 @@ let
|
|||
substituteInPlace build/config/compiler/BUILD.gn \
|
||||
--replace '"-Xclang",' "" \
|
||||
--replace '"-no-opaque-pointers",' ""
|
||||
'' + ''
|
||||
# remove unused third-party
|
||||
for lib in ${toString gnSystemLibraries}; do
|
||||
if [ -d "third_party/$lib" ]; then
|
||||
|
|
@ -194,7 +193,7 @@ let
|
|||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
|
||||
fi
|
||||
chmod -x third_party/webgpu-cts/src/tools/run_deno
|
||||
${lib.optionalString (chromiumVersionAtLeast "102") "chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno"}
|
||||
chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno
|
||||
|
||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
|
||||
|
|
|
|||
|
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "101.0.4951.64",
|
||||
"sha256": "1xyqm32y9v1hn8ji6qfw6maynqgg3266j58dq4x4aqsm2gj9cn4w",
|
||||
"sha256bin64": "14ijrj7h2y72ppyysz6jv40c01lbnan7z69cl24asch2zjlgwv8v",
|
||||
"version": "102.0.5005.61",
|
||||
"sha256": "07vbi3gn9g4n04b2qi2hm34r122snrqaifa46yk3pyh1d79rfdqs",
|
||||
"sha256bin64": "100n8k3d9k5bq58irc36ig6m5m0lxggffyk4crqqqcib2anqd0zv",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-03-14",
|
||||
"version": "2022-04-14",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
||||
"rev": "fd9f2036f26d83f9fcfe93042fb952e5a7fe2167",
|
||||
"sha256": "0b5xs0chcv3hfhy71rycsmgxnqbm375a333hwav8929k9cbi5p9h"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "101.0.4951.64-1",
|
||||
"sha256": "0k7w6xvjf1yzyak9ywvcdw762d8zbx6d8haz35q87jz0mxfn2mr3"
|
||||
"rev": "102.0.5005.61-1",
|
||||
"sha256": "1hlyi6k894blkkqmqsizx72bag2vj6wlpza0fvi8db5wp6i5b58g"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, # Incompatible licenses, LGPLv3 - GPLv2
|
||||
enableGuile ? false, guile ? null
|
||||
, enablePython ? false, python ? null
|
||||
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
|
||||
, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
|
||||
# re-add javascript support when upstream supports modern spidermonkey
|
||||
}:
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
|
|||
numpy
|
||||
ocrmypdf
|
||||
pathvalidate
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pikepdf
|
||||
pillow
|
||||
pluggy
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qalculate-gtk";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-itYNKcdWYMoqlvZ7CYJ6WMv7rS/y1SVdt3O7ahkjPOk=";
|
||||
sha256 = "sha256-SphruQ/b8z5S/wKb9yhbEy9/pwiY+frZltdIYj0CJBM=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ runCommand "${firmware.name}-xz" {} ''
|
|||
(cd ${firmware} && find lib/firmware -type d -print0) |
|
||||
(cd $out && xargs -0 mkdir -v --)
|
||||
(cd ${firmware} && find lib/firmware -type f -print0) |
|
||||
(cd $out && xargs -0tP "$NIX_BUILD_CORES" -n1 \
|
||||
(cd $out && xargs -0rtP "$NIX_BUILD_CORES" -n1 \
|
||||
sh -c 'xz -9c -T1 -C crc32 --lzma2=dict=2MiB "${firmware}/$1" > "$1.xz"' --)
|
||||
(cd ${firmware} && find lib/firmware -type l) | while read link; do
|
||||
target="$(readlink "${firmware}/$link")"
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@ let
|
|||
|
||||
# Decouples flutter derivation from dart derivation,
|
||||
# use specific dart version to not need to bump dart derivation when bumping flutter.
|
||||
dartVersion = "2.16.1";
|
||||
dartVersion = "2.16.2";
|
||||
dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
|
||||
dartForFlutter = dart.override {
|
||||
version = dartVersion;
|
||||
sources = {
|
||||
"${dartVersion}-x86_64-linux" = fetchurl {
|
||||
url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
|
||||
sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk=";
|
||||
sha256 = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
|
||||
};
|
||||
};
|
||||
};
|
||||
in {
|
||||
mkFlutter = mkFlutter;
|
||||
inherit mkFlutter;
|
||||
stable = mkFlutter rec {
|
||||
inherit version;
|
||||
dart = dartForFlutter;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc)
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
libffi ? null
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc
|
||||
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
, elfutils # for DWARF support
|
||||
|
||||
, useLLVM ? !(stdenv.targetPlatform.isx86
|
||||
|| stdenv.targetPlatform.isPowerPC
|
||||
|| stdenv.targetPlatform.isPower
|
||||
|| stdenv.targetPlatform.isSparc
|
||||
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
|
||||
, # LLVM is conceptually a run-time-only depedendency, but for
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ let
|
|||
x11deps = [ libX11 xorgproto ];
|
||||
inherit (lib) optionals;
|
||||
|
||||
baseOcamlBranch = "4.07";
|
||||
baseOcamlBranch = "4.11";
|
||||
baseOcamlVersion = "${baseOcamlBranch}.1";
|
||||
metaocamlPatch = "107";
|
||||
metaocamlPatch = "111";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-${baseOcamlBranch}/ocaml-${baseOcamlVersion}.tar.gz";
|
||||
sha256 = "1x4sln131mcspisr22qc304590rvg720rbl7g2i4xiymgvhkpm1a";
|
||||
sha256 = "sha256-3Yi2OFvZLgrZInMuKMxoyHd4QXcOoAPCC9FS9dtEFc4=";
|
||||
};
|
||||
|
||||
metaocaml = fetchurl {
|
||||
url = "http://okmij.org/ftp/ML/ber-metaocaml-107.tar.gz";
|
||||
sha256 = "0xy6n0yj1f53pk612zfmn49pn04bd75qa40xgmr0w0lzx6dqsfmm";
|
||||
url = "http://okmij.org/ftp/ML/ber-metaocaml-${metaocamlPatch}.tar.gz";
|
||||
sha256 = "sha256-hDb0w0ZCm0hCz8jktZKmr/7gPSfBoKPT/cc7sPjt0yE=";
|
||||
};
|
||||
|
||||
x11env = buildEnv { name = "x11env"; paths = x11deps; };
|
||||
|
|
@ -33,11 +33,7 @@ stdenv.mkDerivation rec {
|
|||
x11inc = "${x11env}/include";
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = optionals useX11
|
||||
[ "-x11lib" x11lib
|
||||
"-x11include" x11inc
|
||||
"-flambda"
|
||||
];
|
||||
configureFlags = optionals useX11 [ "--enable-flambda" ];
|
||||
|
||||
dontStrip = true;
|
||||
buildInputs = [ ncurses ] ++ optionals useX11 x11deps;
|
||||
|
|
@ -48,8 +44,8 @@ stdenv.mkDerivation rec {
|
|||
# used SIGSTKSZ as the size of a statically-allocated array. This
|
||||
# patch is also applied by the ocaml/4.07.nix expression.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ocaml/ocaml/commit/00b8c4d503732343d5d01761ad09650fe50ff3a0.patch";
|
||||
sha256 = "sha256:02cfya5ff5szx0fsl5x8ax76jyrla9zmf3qxavf3adhwq5ssrfcv";
|
||||
url = "https://github.com/ocaml/ocaml/commit/dd28ac0cf4365bd0ea1bcc374cbc5e95a6f39bea.patch";
|
||||
sha256 = "sha256-OmyovAu+8sgg3n5YD29Cytx3u/9PO2ofMsmrwiKUxks=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libqalculate";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "libqalculate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-y9GNf2xR3bZ8Pj99Y8qSBbK+hQEkg/+xOzUdyFI5HLw=";
|
||||
sha256 = "sha256-mIzHizoDsdSVcepWACeVkCTgt4gxd99WKXrrGi+qASo=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-4fB0IIKZNNU7MfHRhdjNhP7RQMWcvfqawj2P01LIPa0=";
|
||||
sha256 = "sha256-V9wQXXPeoplxVcFDIhQcJFnKkewwDEaoQfTsQ7IyjOU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, jbig2enc
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, pikepdf
|
||||
, pillow
|
||||
, pluggy
|
||||
|
|
@ -63,7 +63,7 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [
|
||||
coloredlogs
|
||||
img2pdf
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pikepdf
|
||||
pillow
|
||||
pluggy
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfminer_six";
|
||||
version = "20220506";
|
||||
pname = "pdfminer-six";
|
||||
version = "20220524";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pdfminer";
|
||||
repo = "pdfminer.six";
|
||||
rev = version;
|
||||
sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA=";
|
||||
sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ charset-normalizer cryptography ];
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytestCheckHook }:
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, pdfminer-six, chardet, pytestCheckHook }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdfx";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
--replace "pdfminer.six==20201018" "pdfminer.six"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pdfminer chardet ];
|
||||
propagatedBuildInputs = [ pdfminer-six chardet ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,27 @@
|
|||
{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, cacert
|
||||
, cached-property
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, libgit2
|
||||
, pycparser
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygit2";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-72R5w7YZKCUxawVjNtt36/9ueEmusfu4i3YAGsM3uck=";
|
||||
hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk=";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
@ -19,14 +34,21 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
cached-property
|
||||
] ++ lib.optional (!isPyPy) cffi;
|
||||
pycparser
|
||||
] ++ lib.optional (!isPyPy) [
|
||||
cffi
|
||||
];
|
||||
|
||||
propagatedNativeBuildInputs = lib.optional (!isPyPy) cffi;
|
||||
propagatedNativeBuildInputs = lib.optional (!isPyPy) [
|
||||
cffi
|
||||
];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# disable tests that require networking
|
||||
# Disable tests that require networking
|
||||
"test/test_repository.py"
|
||||
"test/test_credentials.py"
|
||||
"test/test_submodule.py"
|
||||
|
|
@ -44,10 +66,14 @@ buildPythonPackage rec {
|
|||
# https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pygit2"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A set of Python bindings to the libgit2 shared library";
|
||||
homepage = "https://pypi.python.org/pypi/pygit2";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://github.com/libgit2/pygit2";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "trimesh";
|
||||
version = "3.12.3";
|
||||
version = "3.12.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MrvfSC6Uz/EJXQ3F5jAbWR0YJYRjqjwO7SIe0AUSOfA=";
|
||||
sha256 = "sha256-lAbeCTjEUsNnjhJZNHs4ir8V0bJZUnBIGYYEXV80wyg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, setuptools-scm
|
||||
, attrs
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, commoncode
|
||||
, plugincode
|
||||
, binaryornot
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
commoncode
|
||||
plugincode
|
||||
binaryornot
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, lxml
|
||||
, mechanize
|
||||
, nose
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, pillow
|
||||
, prettytable
|
||||
, pyqt5
|
||||
|
|
@ -54,7 +54,7 @@ buildPythonPackage rec {
|
|||
libyaml
|
||||
lxml
|
||||
mechanize
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pillow
|
||||
prettytable
|
||||
pyqt5
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, lxml
|
||||
, mechanize
|
||||
, nose
|
||||
, pdfminer
|
||||
, pdfminer-six
|
||||
, pillow
|
||||
, prettytable
|
||||
, pyqt5
|
||||
|
|
@ -57,7 +57,7 @@ buildPythonPackage rec {
|
|||
libyaml
|
||||
lxml
|
||||
mechanize
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pillow
|
||||
prettytable
|
||||
pyqt5
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "go-task";
|
||||
version = "3.12.0";
|
||||
version = "3.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "task";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-FArt9w4nZJW/Kql3Y2rr/IVz+SnWCS2lzNMWF6TN0Bg=";
|
||||
sha256 = "sha256-N/xx5gATuLrHcWnMXgFMmz3wbFtaHsiPfDaNhdTbk5c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.45.2";
|
||||
version = "1.46.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Mr45nJbpyzxo0ZPwx22JW2WrjyjI9FPpl+gZ7NIc6WQ=";
|
||||
sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pcbKg1ePN8pObS9EzP3QYjtaty27L9sroKUs/qEPtJo=";
|
||||
vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
flex bison python rsync
|
||||
];
|
||||
|
||||
extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
|
||||
extraIncludeDirs = lib.optional (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"];
|
||||
|
||||
inherit patches;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
mkIf (stdenv.hostPlatform.isAarch32 ||
|
||||
stdenv.hostPlatform.isAarch64 ||
|
||||
stdenv.hostPlatform.isx86_64 ||
|
||||
(stdenv.hostPlatform.isPowerPC && stdenv.hostPlatform.is64bit) ||
|
||||
(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) ||
|
||||
(stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit));
|
||||
|
||||
options = {
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ commonOptions = packageSettings: rec { # attributes common to both builds
|
|||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_CONFIG=mysql_release"
|
||||
"-DMANUFACTURER=NixOS.org"
|
||||
"-DMANUFACTURER=nixos.org"
|
||||
"-DDEFAULT_CHARSET=utf8mb4"
|
||||
"-DDEFAULT_COLLATION=utf8mb4_unicode_ci"
|
||||
"-DSECURITY_HARDENED=ON"
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ python3Packages.buildPythonApplication rec {
|
|||
++ lib.optionals enableBloat ([
|
||||
abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
|
||||
hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
|
||||
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ]));
|
||||
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ]));
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
inherit (lib.versions) majorMinor;
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "2.6";
|
||||
version = "2.7";
|
||||
pname = "ferm";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz";
|
||||
sha256 = "sha256-aJVBRl58Bzy9YEyc0Y8RPDHAtBuxJhRyalmxfkQFiIU=";
|
||||
sha256 = "sha256-wA2RDVOU5pZ1YI617g9QTVz9pB6ZCi2akbqsbfk+P5I=";
|
||||
};
|
||||
|
||||
# perl is used at build time to gather the ferm version.
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ffuf";
|
||||
version = "1.4.1";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m+L78fVsqntD7JfgWS9foUJUhIVr+CtJ6K8etsLuNzw=";
|
||||
sha256 = "sha256-dqABifXA104NCPdrWhB79cZQloJrqwJ45rlh+M/lRrs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-szT08rIozAuliOmge5RFX4NeVrJ2pCVyfotrHuvc0UU=";
|
||||
|
|
|
|||
|
|
@ -6,15 +6,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "2.0.152";
|
||||
version = "2.0.155";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "armosec";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hibXmA2JerfnkGiSnBUCMHGPm4Tefnsl/x2VAS5z0Fo=";
|
||||
hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0=";
|
||||
};
|
||||
vendorSha256 = "sha256-HfsQfoz1n3FEd2eVBBz3Za2jYCSrozXpL34Z8CgQsTA=";
|
||||
vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
@ -37,7 +37,17 @@ buildGoModule rec {
|
|||
go list ./... | grep -v httphandler
|
||||
}
|
||||
|
||||
rm core/pkg/resourcehandler/{repositoryscanner,urlloader}_test.go
|
||||
# remove tests that use networking
|
||||
rm core/pkg/resourcehandler/urlloader_test.go
|
||||
|
||||
# remove tests that use networking
|
||||
substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \
|
||||
--replace "TestScanRepository" "SkipScanRepository" \
|
||||
--replace "TestGit" "SkipGit"
|
||||
|
||||
# without networking the branch context can't be fetched and is empty
|
||||
substituteInPlace core/cautils/scaninfo_test.go \
|
||||
--replace 'assert.Equal(t, "master", ctx.RepoContextMetadata.Branch)' 'assert.Equal(t, "", ctx.RepoContextMetadata.Branch)'
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.13.2";
|
||||
version = "5.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2HADEp1nDkIl56e5oxY6bC+lRWanQwjlCChm0aI0N9Q=";
|
||||
sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc=";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with python3.pkgs; [
|
||||
chardet
|
||||
dateparser
|
||||
pdfminer
|
||||
pdfminer-six
|
||||
pillow
|
||||
pyyaml
|
||||
unidecode
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ let
|
|||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-banner-add=/NixOS.org"
|
||||
"--with-banner-add=/nixos.org"
|
||||
"--disable-missing" "--disable-native-texlive-build"
|
||||
"--enable-shared" # "--enable-cxx-runtime-hack" # static runtime
|
||||
"--enable-tex-synctex"
|
||||
|
|
|
|||
|
|
@ -9283,7 +9283,7 @@ with pkgs;
|
|||
|
||||
pdftoipe = callPackage ../tools/graphics/pdftoipe { };
|
||||
|
||||
pdfminer = with python3Packages; toPythonApplication pdfminer;
|
||||
pdfminer = with python3Packages; toPythonApplication pdfminer-six;
|
||||
|
||||
pdf-quench = callPackage ../applications/misc/pdf-quench { };
|
||||
|
||||
|
|
|
|||
|
|
@ -97,6 +97,7 @@ mapAliases ({
|
|||
pam = python-pam; # added 2020-09-07.
|
||||
PasteDeploy = pastedeploy; # added 2021-10-07
|
||||
pathpy = path; # added 2022-04-12
|
||||
pdfminer = pdfminer-six; # added 2022-05-25
|
||||
pep257 = pydocstyle; # added 2022-04-12
|
||||
postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
|
||||
powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
|
||||
|
|
|
|||
|
|
@ -6256,7 +6256,7 @@ in {
|
|||
|
||||
pdfkit = callPackage ../development/python-modules/pdfkit { };
|
||||
|
||||
pdfminer = callPackage ../development/python-modules/pdfminer_six { };
|
||||
pdfminer-six = callPackage ../development/python-modules/pdfminer-six { };
|
||||
|
||||
pdfposter = callPackage ../development/python-modules/pdfposter { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue