JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into staging-next

Browse Source 
This commit has already been partially rebuilt in
https://hydra.nixos.org/eval/1592635
In particular, the severe security fix for gnutls is contained.
This commit is contained in:
Vladimír Čunát 2020-06-10 16:15:47 +02:00
commit 34d58cb839
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
152 changed files with 972 additions and 529 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/languages-frameworks/python.section.md
View File

@ -643,7 +643,7 @@ and in this case the `python38` interpreter is automatically used.
Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
respectively `python27`, `python35`, `python36`, `python37` and `python38`. The
aliases `python2` and `python3` correspond to respectively `python27` and
`python37`. The default interpreter, `python`, maps to `python2`. The PyPy
`python38`. The default interpreter, `python`, maps to `python2`. The PyPy
interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`.
The Nix expressions for the interpreters can be found in

66
doc/languages-frameworks/rust.section.md
View File

@ -75,6 +75,72 @@ pkgs.rustPlatform.buildRustPackage {
}
```
### Running package tests
When using `buildRustPackage`, the `checkPhase` is enabled by default and runs
`cargo test` on the package to build. To make sure that we don't compile the
sources twice and to actually test the artifacts that will be used at runtime,
the tests will be ran in the `release` mode by default.
However, in some cases the test-suite of a package doesn't work properly in the
`release` mode. For these situations, the mode for `checkPhase` can be changed like
so:
```nix
rustPlatform.buildRustPackage {
/* ... */
checkType = "debug";
}
```
Please note that the code will be compiled twice here: once in `release` mode
for the `buildPhase`, and again in `debug` mode for the `checkPhase`.
#### Tests relying on the structure of the `target/` directory
Some tests may rely on the structure of the `target/` directory. Those tests
are likely to fail because we use `cargo --target` during the build. This means that
the artifacts
[are stored in `target/<architecture>/release/`](https://doc.rust-lang.org/cargo/guide/build-cache.html),
rather than in `target/release/`.
This can only be worked around by patching the affected tests accordingly.
#### Disabling package-tests
In some instances, it may be necessary to disable testing altogether (with `doCheck = false;`):
* If no tests exist -- the `checkPhase` should be explicitly disabled to skip
unnecessary build steps to speed up the build.
* If tests are highly impure (e.g. due to network usage).
There will obviously be some corner-cases not listed above where it's sensible to disable tests.
The above are just guidelines, and exceptions may be granted on a case-by-case basis.
However, please check if it's possible to disable a problematic subset of the
test suite and leave a comment explaining your reasoning.
### Building a package in `debug` mode
By default, `buildRustPackage` will use `release` mode for builds. If a package
should be built in `debug` mode, it can be configured like so:
```nix
rustPlatform.buildRustPackage {
/* ... */
buildType = "debug";
}
```
In this scenario, the `checkPhase` will be ran in `debug` mode as well.
### Custom `build`/`install`-procedures
Some packages may use custom scripts for building/installing, e.g. with a `Makefile`.
In these cases, it's recommended to override the `buildPhase`/`installPhase`/`checkPhase`.
Otherwise, some steps may fail because of the modified directory structure of `target/`.
### Building a crate with an absent or out-of-date Cargo.lock file
`buildRustPackage` needs a `Cargo.lock` file to get all dependencies in the

23
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -42,6 +42,11 @@
PHP now defaults to PHP 7.4, updated from 7.3.
</para>
</listitem>
<listitem>
<para>
Python 3 now defaults to Python 3.8 instead of 3.7.
</para>
</listitem>
<listitem>
<para>
Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
@ -486,9 +491,21 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
</para>
</listitem>
<listitem>
<para>
The default output of <literal>buildGoPackage</literal> is now <literal>$out</literal> instead of <literal>$bin</literal>.
</para>
<para>
The default output of <literal>buildGoPackage</literal> is now <literal>$out</literal> instead of <literal>$bin</literal>.
</para>
</listitem>
<listitem>
<para>
Packages built using <literal>buildRustPackage</literal> now use <literal>release</literal>
mode for the <literal>checkPhase</literal> by default.
</para>
<para>
Please note that Rust packages utilizing a custom build/install procedure
(e.g. by using a <filename>Makefile</filename>) or test suites that rely on the
structure of the <filename>target/</filename> directory may break due to those assumptions.
For further information, please read the Rust section in the Nixpkgs manual.
</para>
</listitem>
<listitem>
<para>

4
pkgs/applications/editors/neovim/gnvim/default.nix
View File

@ -33,6 +33,10 @@ rustPlatform.buildRustPackage rec {
EOF
'';
buildPhase = ''
make build
'';
installPhase = ''
make install PREFIX="${placeholder "out"}"
'';

16
pkgs/applications/networking/nym/default.nix
View File

@ -24,8 +24,20 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ openssl ];
# tests disabled until a release with https://github.com/nymtech/nym/pull/260 is available
doCheck = false;
checkType = "debug";
/*
Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net.
Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net.
*/
preCheck = ''
export LD_PRELOAD=${libredirect.overrideAttrs (drv: {
postPatch = "sed -i -e /unsetenv/d libredirect.c";
})}/lib/libredirect.so
export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"}
'';
postCheck = "unset NIX_REDIRECTS LD_PRELOAD";
passthru.updateScript = ./update.sh;

9
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.26.2";
version = "2.27.0";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@ -33,7 +33,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd";
sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk";
};
outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";
@ -286,13 +286,14 @@ stdenv.mkDerivation {
mv t/{,skip-}$test.sh || true
else
sed -i t/$test.sh \
-e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}"
-e "/^\s*test_expect_.*$pattern/,/^\s*' *\$/{s/^/: #/}"
fi
}
# Shared permissions are forbidden in sandbox builds.
disable_test t0001-init shared
disable_test t1301-shared-repo
disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository'
# Our patched gettext never fallbacks
disable_test t0201-gettext-fallbacks
@ -343,6 +344,6 @@ stdenv.mkDerivation {
'';
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ];
maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ];
};
}

50
pkgs/build-support/rust/default.nix
View File

@ -28,6 +28,13 @@
, meta ? {}
, target ? null
, cargoVendorDir ? null
, checkType ? buildType
# Needed to `pushd`/`popd` into a subdir of a tarball if this subdir
# contains a Cargo.toml, but isn't part of a workspace (which is e.g. the
# case for `rustfmt`/etc from the `rust-sources).
# Otherwise, everything from the tarball would've been built/tested.
, buildAndTestSubdir ? null
, ... } @ args:
assert cargoVendorDir == null -> cargoSha256 != "unset";
@ -163,6 +170,7 @@ stdenv.mkDerivation (args // {
'';
buildPhase = with builtins; args.buildPhase or ''
${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
runHook preBuild
(
@ -178,22 +186,29 @@ stdenv.mkDerivation (args // {
--frozen ${concatStringsSep " " cargoBuildFlags}
)
# rename the output dir to a architecture independent one
mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
for target in "''${targets[@]}"; do
rm -rf "$target/../../${buildType}"
ln -srf "$target" "$target/../../"
done
runHook postBuild
${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"}
# This needs to be done after postBuild: packages like `cargo` do a pushd/popd in
# the pre/postBuild-hooks that need to be taken into account before gathering
# all binaries to install.
bins=$(find $releaseDir \
-maxdepth 1 \
-type f \
-executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \))
'';
checkPhase = args.checkPhase or ''
checkPhase = args.checkPhase or (let
argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen";
in ''
${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
runHook preCheck
echo "Running cargo cargo test -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck
'';
${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"}
'');
doCheck = args.doCheck or true;
@ -203,13 +218,16 @@ stdenv.mkDerivation (args // {
installPhase = args.installPhase or ''
runHook preInstall
# rename the output dir to a architecture independent one
mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
for target in "''${targets[@]}"; do
rm -rf "$target/../../${buildType}"
ln -srf "$target" "$target/../../"
done
mkdir -p $out/bin $out/lib
find $releaseDir \
-maxdepth 1 \
-type f \
-executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) \
-print0 | xargs -r -0 cp -t $out/bin
xargs -r cp -t $out/bin <<< $bins
find $releaseDir \
-maxdepth 1 \
-regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \

3
pkgs/development/compilers/rust/cargo.nix
View File

@ -9,8 +9,7 @@ rustPlatform.buildRustPackage {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/cargo";
postBuild = "popd";
buildAndTestSubdir = "src/tools/cargo";
passthru.rustc = rustc;

3
pkgs/development/compilers/rust/clippy.nix
View File

@ -5,8 +5,7 @@ rustPlatform.buildRustPackage {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/clippy";
postBuild = "popd";
buildAndTestSubdir = "src/tools/clippy";
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;

5
pkgs/development/compilers/rust/rls/default.nix
View File

@ -10,8 +10,9 @@ rustPlatform.buildRustPackage {
dontUpdateAutotoolsGnuConfigScripts = true;
cargoVendorDir = "vendor";
buildAndTestSubdir = "src/tools/rls";
preBuild = ''
pushd src/tools/rls
# client tests are flaky
rm tests/client.rs
'';
@ -28,8 +29,6 @@ rustPlatform.buildRustPackage {
doCheck = true;
preInstall = "popd";
doInstallCheck = true;
installCheckPhase = ''
$out/bin/rls --version

9
pkgs/development/compilers/rust/rustfmt.nix
View File

@ -6,8 +6,7 @@ rustPlatform.buildRustPackage rec {
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
cargoVendorDir = "vendor";
preBuild = "pushd src/tools/rustfmt";
preInstall = "popd";
buildAndTestSubdir = "src/tools/rustfmt";
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
@ -17,12 +16,6 @@ rustPlatform.buildRustPackage rec {
# As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler
RUSTC_BOOTSTRAP = 1;
# we run tests in debug mode so tests look for a debug build of
# rustfmt. Anyway this adds nearly no compilation time.
preCheck = ''
cargo build
'';
meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines";
homepage = "https://github.com/rust-lang-nursery/rustfmt";

16
pkgs/development/interpreters/perl/default.nix
View File

@ -170,11 +170,11 @@ let
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
} // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
crossVersion = "1.3.2"; # Mar 21, 2020
crossVersion = "1.3.4"; # Jun 2, 2020
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
sha256 = "1283crdjsyi45mgdiak4jmy907mqn09frxzxp21b18hvxmfn4smq";
sha256 = "15wvlafhpsh9h66s3vazhx46hf8ik75473acrvf6722ijd1wpz45";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@ -194,23 +194,23 @@ in {
perl528 = common {
perl = pkgs.perl528;
buildPerl = buildPackages.perl528;
version = "5.28.2";
sha256 = "1iynpsxdym4h76kgndmn3ykvwxhqz444xvaz8z2irsxkvmnlb5da";
version = "5.28.3";
sha256 = "052if351m81yhaab429i1kv77v9b15qm0g48kr6y2yjrc7bc3jdg";
};
# Maint version
perl530 = common {
perl = pkgs.perl530;
buildPerl = buildPackages.perl530;
version = "5.30.2";
sha256 = "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6";
version = "5.30.3";
sha256 = "0vs0wwwlw47sswxaflkk4hw0y45cmc7arxx788kwpbminy5lrq1j";
};
# the latest Devel version
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
version = "5.31.10";
sha256 = "1gvv5zs54gzb947x7ryjkaalm9rbqf8l8hwjwdm9lbfgkpg07kny";
version = "5.32.0-RC0";
sha256 = "02i6n1xa4j0ksp014yy8q0j7scjcy5mr0yd4iash2ryrrfv5yw5k";
};
}

10
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -12,6 +12,7 @@
, zlib
, self
, configd, coreutils
, autoreconfHook
, python-setup-hook
# Some proprietary libs assume UCS2 unicode, especially on darwin :(
, ucsEncoding ? 4
@ -85,6 +86,9 @@ let
# backported in debian since 2013.
# https://bugs.python.org/issue13146
./atomic_pyc.patch
# Backport from CPython 3.8 of a good list of tests to run for PGO.
./profile-task.patch
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [
@ -135,6 +139,7 @@ let
'';
configureFlags = [
"--enable-optimizations"
"--enable-shared"
"--with-threads"
"--enable-unicode=ucs${toString ucsEncoding}"
@ -182,8 +187,9 @@ let
++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
++ optional (stdenv.isDarwin && configd != null) configd;
nativeBuildInputs =
optionals (stdenv.hostPlatform != stdenv.buildPlatform)
[ buildPackages.stdenv.cc buildPackages.python ];
[ autoreconfHook ]
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)
[ buildPackages.stdenv.cc buildPackages.python ];
mkPaths = paths: {
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;

21
pkgs/development/interpreters/python/cpython/2.7/profile-task.patch Normal file
View File

@ -0,0 +1,21 @@
Backport from CPython 3.8 of a good list of tests to run for PGO.
Upstream commit:
https://github.com/python/cpython/commit/4e16a4a31
Upstream discussion:
https://bugs.python.org/issue36044
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 00fdd21ce..713dc1e53 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -259,7 +259,7 @@ TCLTK_LIBS=
# The task to run while instrumented when building the profile-opt target.
# We exclude unittests with -x that take a rediculious amount of time to
# run in the instrumented training build or do not provide much value.
-PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing test_subprocess
+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c
# report files for gcov / lcov coverage report
COVERAGE_INFO= $(abs_builddir)/coverage.info

21
pkgs/development/interpreters/python/cpython/3.5/profile-task.patch Normal file
View File

@ -0,0 +1,21 @@
Backport from CPython 3.8 of a good list of tests to run for PGO.
Upstream commit:
https://github.com/python/cpython/commit/4e16a4a31
Upstream discussion:
https://bugs.python.org/issue36044
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 00fdd21ce..713dc1e53 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -259,7 +259,7 @@ TCLTK_LIBS=
# The task to run while instrumented when building the profile-opt target.
# We exclude unittests with -x that take a rediculious amount of time to
# run in the instrumented training build or do not provide much value.
-PROFILE_TASK=-m test.regrtest --pgo -x test_asyncore test_gdb test_multiprocessing_fork test_multiprocessing_forkserver test_multiprocessing_main_handling test_multiprocessing_spawn test_subprocess
+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c
# report files for gcov / lcov coverage report
COVERAGE_INFO= $(abs_builddir)/coverage.info

21
pkgs/development/interpreters/python/cpython/3.6/profile-task.patch Normal file
View File

@ -0,0 +1,21 @@
Backport from CPython 3.8 of a good list of tests to run for PGO.
Upstream commit:
https://github.com/python/cpython/commit/4e16a4a31
Upstream discussion:
https://bugs.python.org/issue36044
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 00fdd21ce..713dc1e53 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -259,7 +259,7 @@ TCLTK_LIBS=
# The task to run while instrumented when building the profile-opt target.
# We exclude unittests with -x that take a rediculious amount of time to
# run in the instrumented training build or do not provide much value.
-PROFILE_TASK=-m test.regrtest --pgo
+PROFILE_TASK=-m test.regrtest --pgo test_array test_base64 test_binascii test_binop test_bisect test_bytes test_bz2 test_cmath test_codecs test_collections test_complex test_dataclasses test_datetime test_decimal test_difflib test_embed test_float test_fstring test_functools test_generators test_hashlib test_heapq test_int test_itertools test_json test_long test_lzma test_math test_memoryview test_operator test_ordered_dict test_pickle test_pprint test_re test_set test_sqlite test_statistics test_struct test_tabnanny test_time test_unicode test_xml_etree test_xml_etree_c
# report files for gcov / lcov coverage report
COVERAGE_INFO= $(abs_builddir)/coverage.info

17
pkgs/development/interpreters/python/cpython/default.nix
View File

@ -12,6 +12,7 @@
, zlib
, self
, configd
, autoreconfHook
, python-setup-hook
, nukeReferences
# For the Python package set
@ -30,6 +31,7 @@
, stripBytecode ? false
, includeSiteCustomize ? true
, static ? false
, enableOptimizations ? true
}:
assert x11Support -> tcl != null
@ -53,6 +55,7 @@ let
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
nativeBuildInputs = [
autoreconfHook
nukeReferences
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
buildPackages.stdenv.cc
@ -110,6 +113,14 @@ in with passthru; stdenv.mkDerivation {
] ++ optionals (isPy37 || isPy38 || isPy39) [
# Fix darwin build https://bugs.python.org/issue34027
./3.7/darwin-libutil.patch
] ++ optionals (pythonOlder "3.8") [
# Backport from CPython 3.8 of a good list of tests to run for PGO.
(
if isPy36 || isPy37 then
./3.6/profile-task.patch
else
./3.5/profile-task.patch
)
] ++ optionals (isPy3k && hasDistutilsCxxPatch) [
# Fix for http://bugs.python.org/issue1222585
# Upstream distutils is calling C compiler to compile C++ code, which
@ -142,10 +153,14 @@ in with passthru; stdenv.mkDerivation {
configureFlags = [
"--enable-shared"
"--with-threads"
"--without-ensurepip"
"--with-system-expat"
"--with-system-ffi"
] ++ optionals enableOptimizations [
"--enable-optimizations"
] ++ optionals (pythonOlder "3.7") [
# This is unconditionally true starting in CPython 3.7.
"--with-threads"
] ++ optionals (sqlite != null && isPy3k) [
"--enable-loadable-sqlite-extensions"
] ++ optionals (openssl != null) [

3
pkgs/development/interpreters/python/default.nix
View File

@ -129,7 +129,7 @@ in {
};
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (python37.override {
python3Minimal = (python38.override {
self = python3Minimal;
pythonForBuild = pkgs.buildPackages.python3Minimal;
# strip down that python version as much as possible
@ -146,6 +146,7 @@ in {
rebuildBytecode = false;
stripBytecode = true;
includeSiteCustomize = false;
enableOptimizations = false;
}).overrideAttrs(old: {
pname = "python3-minimal";
meta = old.meta // {

3
pkgs/development/interpreters/python/hooks/pip-build-hook.sh
View File

@ -24,7 +24,8 @@ pipShellHook() {
export PATH="$tmp_path/bin:$PATH"
export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
mkdir -p "$tmp_path/@pythonSitePackages@"
@pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2
@pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" \
--no-build-isolation >&2
fi
runHook postShellHook

3
pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
View File

@ -29,7 +29,8 @@ setuptoolsShellHook() {
export PATH="$tmp_path/bin:$PATH"
export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH"
mkdir -p "$tmp_path/@pythonSitePackages@"
eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path >&2"
eval "@pythonInterpreter@ -m pip install -e . --prefix $tmp_path \
--no-build-isolation >&2"
fi
runHook postShellHook

12
pkgs/development/libraries/audio/libgme/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, cmake }:
{ stdenv, fetchFromBitbucket, cmake, removeReferencesTo }:
let
version = "0.6.3";
in stdenv.mkDerivation {
@ -21,4 +21,14 @@ in stdenv.mkDerivation {
};
buildInputs = [ cmake ];
nativeBuildInputs = [ removeReferencesTo ];
# It used to reference it, in the past, but thanks to the postFixup hook, now
# it doesn't.
disallowedReferences = [ stdenv.cc.cc ];
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
remove-references-to -t ${stdenv.cc.cc} "$(readlink -f $out/lib/libgme.so)"
'';
}

4
pkgs/development/libraries/dbus/default.nix
View File

@ -20,11 +20,11 @@ assert enableSystemd -> systemd != null;
stdenv.mkDerivation rec {
pname = "dbus";
version = "1.12.16";
version = "1.12.18";
src = fetchurl {
url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
sha256 = "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl";
sha256 = "01jkm6shm76bl3cflmnn37dv6nkph0w1akbqpklyac02hiq4vkv4";
};
patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;

62
pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch Normal file
View File

@ -0,0 +1,62 @@
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 19 Feb 2020 16:21:46 +0000 (+0100)
Subject: Fix use-after-free in glob when expanding ~user (bug 25414)
X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=commitdiff_plain;h=da97c6b88eb03fb834e92964b0895c2ac8d61f63;hp=dd34bce38c822b67fcc42e73969bf6699d6874b6
Fix use-after-free in glob when expanding ~user (bug 25414)
The value of `end_name' points into the value of `dirname', thus don't
deallocate the latter before the last use of the former.
(cherry picked from commit ddc650e9b3dc916eab417ce9f79e67337b05035c)
---
diff --git a/posix/glob.c b/posix/glob.c
index e73e35c510..c6cbd0eb43 100644
--- a/posix/glob.c
+++ b/posix/glob.c
@@ -827,31 +827,32 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
{
size_t home_len = strlen (p->pw_dir);
size_t rest_len = end_name == NULL ? 0 : strlen (end_name);
- char *d;
+ char *d, *newp;
+ bool use_alloca = glob_use_alloca (alloca_used,
+ home_len + rest_len + 1);
- if (__glibc_unlikely (malloc_dirname))
- free (dirname);
- malloc_dirname = 0;
-
- if (glob_use_alloca (alloca_used, home_len + rest_len + 1))
- dirname = alloca_account (home_len + rest_len + 1,
- alloca_used);
+ if (use_alloca)
+ newp = alloca_account (home_len + rest_len + 1, alloca_used);
else
{
- dirname = malloc (home_len + rest_len + 1);
- if (dirname == NULL)
+ newp = malloc (home_len + rest_len + 1);
+ if (newp == NULL)
{
scratch_buffer_free (&pwtmpbuf);
retval = GLOB_NOSPACE;
goto out;
}
- malloc_dirname = 1;
}
- d = mempcpy (dirname, p->pw_dir, home_len);
+ d = mempcpy (newp, p->pw_dir, home_len);
if (end_name != NULL)
d = mempcpy (d, end_name, rest_len);
*d = '\0';
+ if (__glibc_unlikely (malloc_dirname))
+ free (dirname);
+ dirname = newp;
+ malloc_dirname = !use_alloca;
+
dirlen = home_len + rest_len;
dirname_modified = 1;
}

4
pkgs/development/libraries/glibc/common.nix
View File

@ -106,10 +106,10 @@ stdenv.mkDerivation ({
url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
})
]
++ lib.optionals stdenv.isx86_64 [
./fix-x64-abi.patch
./2.27-CVE-2019-19126.patch
./2.30-cve-2020-1752.patch
]
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;

4
pkgs/development/libraries/gnutls/default.nix
View File

@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
version = "3.6.13";
version = "3.6.14";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# https://hydra.nixos.org/build/2962084/nixlog/1/raw .
@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j";
sha256 = "0qwxsfizynly0ns537vnhnlm5lh03la4vbsmz675n0n7vqd7ac2n";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];

11
pkgs/development/libraries/jbig2dec/default.nix
View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, python3, autoconf }:
{ stdenv, fetchurl, python3, autoreconfHook }:
stdenv.mkDerivation rec {
name = "jbig2dec-0.17";
pname = "jbig2dec";
version = "0.18";
src = fetchurl {
url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/${name}.tar.gz";
sha256 = "0wpvslmwazia3z8gyk343kbq6yj47pxr4x5yjvx332v309qssazp";
url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz";
sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy";
};
postPatch = ''
patchShebangs test_jbig2dec.py
'';
buildInputs = [ autoconf ];
buildInputs = [ autoreconfHook ];
checkInputs = [ python3 ];
doCheck = true;

4
pkgs/development/libraries/libarchive/default.nix
View File

@ -1,6 +1,6 @@
{
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd,
# Optional but increases closure only negligibly.
xarSupport ? true,
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ]
++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2;

47
pkgs/development/libraries/libexif/default.nix
View File

@ -1,45 +1,24 @@
{ stdenv, fetchurl, fetchpatch, gettext }:
{ stdenv, fetchFromGitHub, autoreconfHook, gettext }:
stdenv.mkDerivation rec {
name = "libexif-0.6.21";
pname = "libexif";
version = "0.6.22";
src = fetchurl {
url = "mirror://sourceforge/libexif/${name}.tar.bz2";
sha256 = "06nlsibr3ylfwp28w8f5466l6drgrnydgxrm4jmxzrmk5svaxk8n";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release";
sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1";
};
patches = [
(fetchpatch {
name = "CVE-2017-7544.patch";
url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch";
sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd";
})
(fetchpatch {
name = "CVE-2018-20030-1.patch";
url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch";
sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3";
})
(fetchpatch {
name = "CVE-2018-20030-2.patch";
url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch";
sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx";
excludes = [ "NEWS" ];
})
(fetchpatch {
name = "CVE-2019-9278.patch";
url = "https://github.com/libexif/libexif/commit/75aa73267fdb1e0ebfbc00369e7312bac43d0566.patch";
sha256 = "10ikg33mips5zq9as7l9xqnyzbg1wwr4sw17517nzf4hafjpasrj";
})
];
nativeBuildInputs = [ autoreconfHook gettext ];
buildInputs = [ gettext ];
meta = {
meta = with stdenv.lib; {
homepage = "https://libexif.github.io/";
description = "A library to read and manipulate EXIF data in digital photographs";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.erictapen ];
license = licenses.lgpl21;
platforms = platforms.unix;
maintainers = with maintainers; [ erictapen ];
};
}

17
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch
{ stdenv, lib, buildPackages, fetchurl, gettext
, genPosixLockObjOnly ? false
}: let
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@ -17,25 +17,14 @@
};
in stdenv.mkDerivation (rec {
pname = "libgpg-error";
version = "1.36";
version = "1.38";
src = fetchurl {
url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q";
};
# Remove gawk buildfix on > 1.36
patches = [
(fetchpatch {
url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1";
sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq";
})
];
postPatch = ''
# Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration
sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h

4
pkgs/development/libraries/libheif/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "libheif";
version = "1.6.2";
version = "1.7.0";
outputs = [ "bin" "out" "dev" "man" ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
sha256 = "0ngbzban585hsgs6fb6fkhccc91kxn1n59qvqjp8bw41l24i3nr2";
sha256 = "0alri5h486ck9b5z6wwrmlpzydhz58l223z3zxkizqrzxlllhr6p";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];

6
pkgs/development/libraries/libpcap/default.nix
View File

@ -22,12 +22,14 @@ stdenv.mkDerivation rec {
"ac_cv_linux_vers=2"
];
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace configure --replace " -arch i386" ""
'';
postInstall = ''
rm -f $out/lib/libpcap.a
'';
meta = with stdenv.lib; {
homepage = "https://www.tcpdump.org";
description = "Packet Capture Library";

210
pkgs/development/libraries/libssh2/CVE-2019-17498.patch Normal file
View File

@ -0,0 +1,210 @@
From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Thu, 29 Aug 2019 15:14:19 -0700
Subject: [PATCH 1/5] packet.c: improve parsing of packets
file: packet.c
notes:
Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST
---
src/packet.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/packet.c b/src/packet.c
index 38ab62944..ac69768cd 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
case SSH_MSG_DEBUG:
if(datalen >= 2) {
int always_display = data[1];
-
+
if(datalen >= 6) {
- message_len = _libssh2_ntohu32(data + 2);
-
- if(message_len <= (datalen - 10)) {
- /* 6 = packet_type(1) + display(1) + message_len(4) */
- message = (char *) data + 6;
- language_len = _libssh2_ntohu32(data + 6 +
- message_len);
-
- if(language_len <= (datalen - 10 - message_len))
- language = (char *) data + 10 + message_len;
- }
+ struct string_buf buf;
+ buf.data = (unsigned char *)data;
+ buf.dataptr = buf.data;
+ buf.len = datalen;
+ buf.dataptr += 2; /* advance past type & always display */
+
+ _libssh2_get_string(&buf, &message, &message_len);
+ _libssh2_get_string(&buf, &language, &language_len);
}
if(session->ssh_msg_debug) {
- LIBSSH2_DEBUG(session, always_display, message,
- message_len, language, language_len);
+ LIBSSH2_DEBUG(session, always_display,
+ (const char *)message,
+ message_len, (const char *)language,
+ language_len);
}
}
+
/*
* _libssh2_debug will actually truncate this for us so
* that it's not an inordinate about of data
@@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
uint32_t len = 0;
unsigned char want_reply = 0;
len = _libssh2_ntohu32(data + 1);
- if(datalen >= (6 + len)) {
+ if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) {
want_reply = data[5 + len];
_libssh2_debug(session,
LIBSSH2_TRACE_CONN,
From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Thu, 29 Aug 2019 15:15:33 -0700
Subject: [PATCH 2/5] stray whitespace
---
src/packet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packet.c b/src/packet.c
index ac69768cd..8908b2c5a 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
case SSH_MSG_DEBUG:
if(datalen >= 2) {
int always_display = data[1];
-
+
if(datalen >= 6) {
struct string_buf buf;
buf.data = (unsigned char *)data;
From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Thu, 29 Aug 2019 15:24:22 -0700
Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT
SSH_MSG_DISCONNECT now also uses _libssh2_get API.
---
src/packet.c | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/src/packet.c b/src/packet.c
index 8908b2c5a..97f0cdd4b 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
size_t datalen, int macstate)
{
int rc = 0;
- char *message = NULL;
- char *language = NULL;
+ unsigned char *message = NULL;
+ unsigned char *language = NULL;
size_t message_len = 0;
size_t language_len = 0;
LIBSSH2_CHANNEL *channelp = NULL;
@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
case SSH_MSG_DISCONNECT:
if(datalen >= 5) {
- size_t reason = _libssh2_ntohu32(data + 1);
+ uint32_t reason = 0;
+ struct string_buf buf;
+ buf.data = (unsigned char *)data;
+ buf.dataptr = buf.data;
+ buf.len = datalen;
+ buf.dataptr++; /* advance past type */
- if(datalen >= 9) {
- message_len = _libssh2_ntohu32(data + 5);
+ _libssh2_get_u32(&buf, &reason);
+ _libssh2_get_string(&buf, &message, &message_len);
+ _libssh2_get_string(&buf, &language, &language_len);
- if(message_len < datalen-13) {
- /* 9 = packet_type(1) + reason(4) + message_len(4) */
- message = (char *) data + 9;
-
- language_len =
- _libssh2_ntohu32(data + 9 + message_len);
- language = (char *) data + 9 + message_len + 4;
-
- if(language_len > (datalen-13-message_len)) {
- /* bad input, clear info */
- language = message = NULL;
- language_len = message_len = 0;
- }
- }
- else
- /* bad size, clear it */
- message_len = 0;
- }
if(session->ssh_msg_disconnect) {
- LIBSSH2_DISCONNECT(session, reason, message,
- message_len, language, language_len);
+ LIBSSH2_DISCONNECT(session, reason, (const char *)message,
+ message_len, (const char *)language,
+ language_len);
}
+
_libssh2_debug(session, LIBSSH2_TRACE_TRANS,
"Disconnect(%d): %s(%s)", reason,
message, language);
From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Thu, 29 Aug 2019 15:26:32 -0700
Subject: [PATCH 4/5] fixed stray (
bad paste
---
src/packet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packet.c b/src/packet.c
index 97f0cdd4b..bd4c39e46 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
uint32_t len = 0;
unsigned char want_reply = 0;
len = _libssh2_ntohu32(data + 1);
- if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) {
+ if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) {
want_reply = data[5 + len];
_libssh2_debug(session,
LIBSSH2_TRACE_CONN,
From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001
From: Will Cosgrove <will@panic.com>
Date: Thu, 29 Aug 2019 15:29:00 -0700
Subject: [PATCH 5/5] added additional parentheses for clarity
---
src/packet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/packet.c b/src/packet.c
index bd4c39e46..2e01bfc5d 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,
uint32_t len = 0;
unsigned char want_reply = 0;
len = _libssh2_ntohu32(data + 1);
- if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) {
+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) {
want_reply = data[5 + len];
_libssh2_debug(session,
LIBSSH2_TRACE_CONN,

8
pkgs/development/libraries/libssh2/default.nix
View File

@ -15,12 +15,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
patches = [
# not able to use fetchpatch here: infinite recursion
(fetchurl {
name = "CVE-2019-17498.patch";
url = "https://github.com/libssh2/libssh2/pull/402.patch";
sha256 = "1n9s2mcz5dkw0xpm3c5x4hzj8bar4i6z0pr1rmqjplhfg888vdvc";
})
# Not able to use fetchpatch here: infinite recursion
./CVE-2019-17498.patch
];
meta = with stdenv.lib; {

46
pkgs/development/libraries/mesa/default.nix
View File

@ -11,6 +11,8 @@
, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ]
, OpenGL, Xplugin
, withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light
, enableGalliumNine ? stdenv.isLinux
, enableOSMesa ? stdenv.isLinux
}:
/** Packaging design:
@ -27,7 +29,9 @@
with stdenv.lib;
let
version = "20.0.2";
# Release calendar: https://www.mesa3d.org/release-calendar.html
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
version = "20.0.7"; # Update only to the final (last planned) release (i.e. X.Y.MAX)?
branch = versions.major version;
in
@ -37,12 +41,12 @@ stdenv.mkDerivation {
src = fetchurl {
urls = [
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "0vz8k07d23qdwy67fnna9y0ynnni0m8lgswcmdm60l4mcv5z2m5a";
sha256 = "0y517qpdg6v6dsdgzb365p03m30511sbyh8pq0mcvhvjwy7javpy";
};
prePatch = "patchShebangs .";
@ -79,7 +83,7 @@ stdenv.mkDerivation {
"find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')"
'';
outputs = [ "out" "dev" "drivers" "osmesa" ];
outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa";
# TODO: Figure out how to enable opencl without having a runtime dependency on clang
mesonFlags = [
@ -103,10 +107,10 @@ stdenv.mkDerivation {
"-Domx-libs-path=${placeholder "drivers"}/lib/bellagio"
"-Dva-libs-path=${placeholder "drivers"}/lib/dri"
"-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d"
"-Dgallium-nine=${if enableGalliumNine then "true" else "false"}" # Direct3D in Wine
"-Dosmesa=${if enableOSMesa then "gallium" else "none"}" # used by wine
] ++ optionals stdenv.isLinux [
"-Dglvnd=true"
"-Dosmesa=gallium" # used by wine
"-Dgallium-nine=true" # Direct3D in Wine
];
buildInputs = with xorg; [
@ -142,17 +146,17 @@ stdenv.mkDerivation {
'' + optionalString stdenv.isLinux ''
mkdir -p $drivers/lib
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
mv -t $drivers/lib \
$out/lib/libxatracker* \
$out/lib/libvulkan_*
if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then
# move gallium-related stuff to $drivers, so $out doesn't depend on LLVM
mv -t $drivers/lib \
$out/lib/libxatracker* \
$out/lib/libvulkan_*
fi
# Move other drivers to a separate output
mv $out/lib/lib*_mesa* $drivers/lib
# move libOSMesa to $osmesa, as it's relatively big
mkdir -p $osmesa/lib
mv -t $osmesa/lib/ $out/lib/libOSMesa*
if [ -n "$(shopt -s nullglob; echo "$out"/lib/lib*_mesa*)" ]; then
# Move other drivers to a separate output
mv $out/lib/lib*_mesa* $drivers/lib
fi
# move vendor files
mv $out/share/ $drivers/
@ -167,6 +171,10 @@ stdenv.mkDerivation {
for js in $drivers/share/vulkan/icd.d/*.json; do
substituteInPlace "$js" --replace "$out" "$drivers"
done
'' + lib.optionalString enableOSMesa ''
# move libOSMesa to $osmesa, as it's relatively big
mkdir -p $osmesa/lib
mv -t $osmesa/lib/ $out/lib/libOSMesa*
'';
# TODO:
@ -181,7 +189,9 @@ stdenv.mkDerivation {
# Update search path used by pkg-config
for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do
substituteInPlace "$pc" --replace $out $drivers
if [ -f "$pc" ]; then
substituteInPlace "$pc" --replace $out $drivers
fi
done
# add RPATH so the drivers can find the moved libgallium and libdricore9
@ -215,6 +225,6 @@ stdenv.mkDerivation {
changelog = "https://www.mesa3d.org/relnotes/${version}.html";
license = licenses.mit; # X11 variant, in most files
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ vcunat ];
maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :)
};
}

4
pkgs/development/libraries/nss/default.nix
View File

@ -5,7 +5,7 @@ let
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.52";
version = "3.52.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha";
sha256 = "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/development/libraries/openh264/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openh264";
version = "2.1.0";
version = "2.1.1";
src = fetchFromGitHub {
owner = "cisco";
repo = pname;
rev = "v${version}";
sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi";
sha256 = "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s";
};
nativeBuildInputs = [ nasm ];

4
pkgs/development/libraries/pcre2/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "pcre2";
version = "10.34";
version = "10.35";
src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
sha256 = "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l";
sha256 = "04s6kmk9qdd4rjz477h547j4bx7hfz0yalpvrm381rqc5ghaijww";
};
configureFlags = [

4
pkgs/development/libraries/readline/6.3.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation {
in
import ./readline-6.3-patches.nix patch);
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {
description = "Library for interactive line editing";

4
pkgs/development/libraries/readline/7.0.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
]
++ upstreamPatches;
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {
description = "Library for interactive line editing";

4
pkgs/development/libraries/readline/8.0.nix
View File

@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
]
++ upstreamPatches;
# Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null;
meta = with stdenv.lib; {
description = "Library for interactive line editing";

4
pkgs/development/libraries/sqlite/analyzer.nix
View File

@ -6,11 +6,11 @@ in
stdenv.mkDerivation rec {
pname = "sqlite-analyzer";
version = "3.31.1";
version = "3.32.2";
src = assert version == sqlite.version; fetchurl {
url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
sha256 = "0n7f3w59gr80s6k4l5a9bp2s97dlfapfbhb3qdhak6axhn127p7j";
sha256 = "1jqhs896cvp9l399mjpbv1x2qbfvq875l1vrgnl3zc4ffdjxs9z0";
};
nativeBuildInputs = [ unzip ];

4
pkgs/development/libraries/sqlite/default.nix
View File

@ -10,12 +10,12 @@ in
stdenv.mkDerivation rec {
pname = "sqlite";
version = "3.31.1";
version = "3.32.2";
# NB! Make sure to update analyzer.nix src (in the same directory).
src = fetchurl {
url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32";
sha256 = "1130bcd70s2vlsq0d638pb5qrw9kwqvjswnp2dfypghx9hjz3gid";
};
outputs = [ "bin" "dev" "out" ];

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

@ -26,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
version = "0.29.14";
version = "0.29.19";
src = fetchPypi {
inherit pname version;
sha256 = "e4d6bb8703d0319eb04b7319b12ea41580df44fd84d83ccda13ea463c6801414";
sha256 = "0n2j87nka8cs772qc60d0c7lrpvsw0y8p3qzvhrsi3nmq1yqmycp";
};
nativeBuildInputs = [

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

@ -1,13 +1,13 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
buildPythonPackage rec {
version = "3.1.2";
version = "3.1.3";
pname = "GitPython";
disabled = isPy27; # no longer supported
src = fetchPypi {
inherit pname version;
sha256 = "864a47472548f3ba716ca202e034c1900f197c0fb3a08f641c20c3cafd15ed94";
sha256 = "e107af4d873daed64648b4f4beb89f89f0cfbe3ef558fc7821ed2331c2f8da1a";
};
patches = [

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "JPype1";
version = "0.7.4";
version = "0.7.5";
src = fetchPypi {
inherit pname version;
sha256 = "92f24b0fe11e90b57343494ce38699043d9e6828a22a99dddbcf99c0adb4c1f7";
sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf";
};
checkInputs = [

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "Mako";
version = "1.1.2";
version = "1.1.3";
src = fetchPypi {
inherit pname version;
sha256 = "3139c5d64aa5d175dbafb95027057128b5fbd05a40c53999f3905ceb53366d9d";
sha256 = "8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27";
};
checkInputs = [ markupsafe nose mock ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "aioharmony";
version = "0.2.1";
version = "0.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "8c8f6e3b776e4e7eba5a1d2ae739aac6a1dd558a7f15951c34ffe0ee28f7f538";
sha256 = "445323810978454ba3b32be53ba6b43cf9948586de3f9734b8743b55858b3cc7";
};
disabled = !isPy3k;

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "aiolifx";
version = "0.6.7";
version = "0.6.8";
src = fetchPypi {
inherit pname version;
sha256 = "cf53c9faea6eee25a466e73eef1753b82a75c7497648149c19c15342df2678f2";
sha256 = "9f9055bc2a9a72c5eab17e0ce5522edecd6de07e21cf347bf0cffabdabe5570e";
};
# tests are not implemented

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "aioresponses";
version = "0.6.3";
version = "0.6.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv";
sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f";
};
nativeBuildInputs = [

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

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "appdirs";
version = "1.4.3";
version = "1.4.4";
src = fetchPypi {
inherit pname version;
sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92";
sha256 = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41";
};
meta = {

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "atlassian-python-api";
version = "1.15.7";
version = "1.15.9";
src = fetchPypi {
inherit pname version;
sha256 = "b54cce1ca4bea838a949b4362410b1d717597951e5b7efbfa34ce89bc5df805e";
sha256 = "c6a3125ee68ecf4d11947497c1f891b6436df9d8453f8865cabf595813504cc1";
};
checkInputs = [ pytestrunner pytest ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "autopep8";
version = "1.5.2";
version = "1.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm";
sha256 = "60fd8c4341bab59963dafd5d2a566e94f547e660b9b396f772afe67d8481dbf0";
};
propagatedBuildInputs = [ pycodestyle ];

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "awkward1";
version = "0.2.19";
version = "0.2.22";
src = fetchPypi {
inherit pname version;
sha256 = "23446eacdf52cad1fb0b5bb0f2ed16c1ae8bb5a282d667ad37ab69494e1ef27f";
sha256 = "c64a8ad0204743d49cf2f8775f92d9c23dd9d7eb6996a61f4a9de57a53d429f9";
};
nativeBuildInputs = [ cmake ];

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

@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.5.1";
version = "1.5.2";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3";
sha256 = "6f3bd0402d41ee9be03637d74f34a7db279d00cb9c6386b0597cbbac16ee8f4e";
};
propagatedBuildInputs = [ ];

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

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "bleak";
version = "0.6.2";
version = "0.6.4";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0";
sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c";
};
postPatch = ''

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "block-io";
version = "1.1.10";
version = "1.1.13";
src = fetchPypi {
inherit pname version;
sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723";
sha256 = "a45e31361d17ce272a0d563a689d6b87b65cc16e9348f8cd3a6460c93359b1bd";
};
propagatedBuildInputs = [

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

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "boto3";
version = "1.13.6"; # N.B: if you change this, change botocore too
version = "1.13.23"; # N.B: if you change this, change botocore too
src = fetchPypi {
inherit pname version;
sha256 = "f1ac7eb23ff8b1d7e314123668ff1e93b874dd396ac5424adc443d68bd8a6fbf";
sha256 = "bcaa88b2f81b88741c47da52f3414c876236700441df87b6198f860e6a200d6f";
};
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "botocore";
version = "1.16.6"; # N.B: if you change this, change boto3 and awscli to a matching version
version = "1.16.23"; # N.B: if you change this, change boto3 and awscli to a matching version
src = fetchPypi {
inherit pname version;
sha256 = "b9c8e0aa07770b7b371d586db41eef46e70bfc4ab47f7a1ee1acd4e9c811c6c9";
sha256 = "5831068c9b49b4c91b0733e0ec784a7733d8732359d73c67a07a0b0868433cae";
};
propagatedBuildInputs = [

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "bugsnag";
version = "3.6.0";
version = "3.6.1";
src = fetchPypi {
inherit pname version;
sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37";
sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9";
};
propagatedBuildInputs = [ six webob ];

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

@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "python-can";
version = "3.3.2";
version = "3.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "5fefb5c1e7e7f07faefc02c6eac79f9b58376f007048a04d8e7f325d48ec6b2e";
sha256 = "ecd69cf6b2f0235345ebe607a15325cf1384c85b24ffbe1d68c3754357f87488";
};
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;

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

@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "CNVkit";
version = "0.9.6";
version = "0.9.7";
src = fetchPypi {
inherit pname version;
sha256 = "1hj8c98s538i0hg5mrz4bw4v07qmcl51rhxq611rj2nglnc9r25y";
sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a";
};
propagatedBuildInputs = [

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

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "coverage";
version = "4.5.4";
version = "5.1";
src = fetchPypi {
inherit pname version;
sha256 = "e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c";
sha256 = "0ll0hr8g3szbxa4al6khhzi6l92a3vwyldj0085whl44s55gq2zr";
};
# No tests in archive

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "croniter";
version = "0.3.31";
version = "0.3.32";
src = fetchPypi {
inherit pname version;
sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149";
sha256 = "0d5bf45f12861c1b718c51bd6e2ab056da94e651bf22900658421cdde0ff7088";
};
propagatedBuildInputs = [

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "django-mailman3";
version = "1.3.2";
version = "1.3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1vq5qa136h4rz4hjznnk6y8l443i41yh4w4wxg20f9b059xrsld1";
sha256 = "1q9ciy2yawgvbha5kwlzwdmdqvas287dc0i60ygp2799jnfr5dr6";
};
propagatedBuildInputs = [

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "django-modelcluster";
version = "5.0.1";
version = "5.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "1fk7fh30i0fzi0hjd841vxh25iryvgp4lirmxfpq428w4nq7p1bg";
sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa";
};
disabled = pythonOlder "3.5";

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "dnslib";
version = "0.9.12";
version = "0.9.13";
src = fetchPypi {
inherit pname version;
sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19";
sha256 = "a0fed3e139c12ee4884b19bcde1d4a170745bcabb6026397876e3236ce38b9db";
};
checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh";

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

@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "doc8";
version = "0.8.0";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "2df89f9c1a5abfb98ab55d0175fed633cae0cf45025b8b1e0ee5ea772be28543";
sha256 = "4d1df12598807cf08ffa9a1d5ef42d229ee0de42519da01b768ff27211082c12";
};
buildInputs = [ pbr ];

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "docker";
version = "4.2.0";
version = "4.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx";
sha256 = "380a20d38fbfaa872e96ee4d0d23ad9beb0f9ed57ff1c30653cbeb0c9c0964f2";
};
nativeBuildInputs = lib.optional isPy27 mock;

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

@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }:
buildPythonPackage rec {
version = "0.0.17";
version = "0.0.18";
pname = "dockerfile-parse";
src = fetchPypi {
inherit pname version;
sha256 = "a69d4ed44c4a890c16437327009ae59ec3a3afeb1abc3819d0c1b14a46099220";
sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db";
};
postPatch = ''

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "elasticsearch-dsl";
version = "7.2.0";
version = "7.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "19q91srlcvfrk5rnk18c0mzvki9l893g7rqgymfg0p8abb9c05a0";
sha256 = "1e345535164cb684de4b825e1d0daf81b75554b30d3905446584a9e4af0cc3e7";
};
propagatedBuildInputs = [ elasticsearch python-dateutil six ]

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

@ -7,11 +7,11 @@
buildPythonPackage (rec {
pname = "elasticsearch";
version = "7.7.0";
version = "7.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "1fm6lalyiy4ayj0mp400dvy629j2av5cqww72w4cg8bqifb83pim";
sha256 = "9bfcb2bd137d6d7ca123e252b9d7261cfe4f7723f7b749a99c52b47766cf387c";
};
# Check is disabled because running them destroy the content of the local cluster!

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "Eve";
version = "1.1";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv";
sha256 = "dbb409c481ffd5100a5ab13177f6ef6284257e33ac8e5090cd50e42533607ebd";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Flask-SQLAlchemy";
version = "2.4.1";
version = "2.4.3";
src = fetchPypi {
inherit pname version;
sha256 = "6974785d913666587949f7c2946f7001e4fa2cb2d19f4e69ead02e4b8f50b33d";
sha256 = "0b656fbf87c5f24109d859bafa791d29751fabbda2302b606881ae5485b557a5";
};
propagatedBuildInputs = [ flask sqlalchemy ];

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "GeoAlchemy2";
version = "0.8.0";
version = "0.8.3";
src = fetchPypi {
inherit pname version;
sha256 = "0kqxm9imqjbhjj5imvf2kl57di454xmnnsr3i0cs66ibq90nx5m8";
sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9";
};
propagatedBuildInputs = [ sqlalchemy shapely ];

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
version = "0.30.1";
version = "0.30.2";
src = fetchPypi {
inherit pname version;
sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg";
sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f";
};
checkInputs = [ pytest mock ];

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

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "google-resumable-media";
version = "0.5.0";
version = "0.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a";
sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773";
};
checkInputs = [ pytest mock ];

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

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "greenlet";
version = "0.4.15";
version = "0.4.16";
disabled = isPyPy; # builtin for pypy
src = fetchPypi {
inherit pname version;
sha256 = "9416443e219356e3c31f1f918a91badf2e37acf297e2fa13d24d1cc2380f8fbc";
sha256 = "6e06eac722676797e8fce4adb8ad3dc57a1bb3adfb0dd3fdf8306c055a38456c";
};
propagatedBuildInputs = [ six ];

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

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "hsaudiotag3k";
version = "1.1.3";
version = "1.1.3.post1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0bv5k5594byr2bmhh77xv10fkdpckcmxg3w380yp30aqf83rcsx3";
sha256 = "ef60e9210d4727e82f0095a686cb07b676d055918f0c59c5bfa8598da03e59d1";
};
# no tests

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "httplib2";
version = "0.17.3";
version = "0.17.4";
src = fetchPypi {
inherit pname version;
sha256 = "39dd15a333f67bfb70798faa9de8a6e99c819da6ad82b77f9a259a5c7b1225a2";
sha256 = "1e9340ecf0187a621bdcfb407c32e04e8e09fc6ab28b050efa38f20eae0e975f";
};
# Needs setting up

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "hvac";
version = "0.10.1";
version = "0.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "1fcd2psvkfsqy45iygm59rzhb7qkbgv3c1dk3x3jvhy6a1ls4kkq";
sha256 = "391b558a465d1919a2862926ab9a7c6bef1f2ac2c46daf8dd5115080c42978e4";
};
propagatedBuildInputs = [ requests six ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "identify";
version = "1.4.16";
version = "1.4.19";
src = fetchPypi {
inherit pname version;
sha256 = "19zk3qmcf0afbcbfnj7cmmgr47pxhjqwa1bfdc3fp60yy10kvbgr";
sha256 = "249ebc7e2066d6393d27c1b1be3b70433f824a120b1d8274d362f1eb419e3b52";
};
# Tests not included in PyPI tarball

6
pkgs/development/python-modules/importlib-metadata/default.nix
View File

@ -13,12 +13,12 @@
buildPythonPackage rec {
pname = "importlib-metadata";
version = "1.5.0";
version = "1.6.0";
src = fetchPypi {
pname = "importlib_metadata";
inherit version;
sha256 = "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86";
sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l";
};
nativeBuildInputs = [ setuptools_scm ];
@ -26,7 +26,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zipp ]
++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ];
checkInputs = [ importlib-resources packaging ];
doCheck = false; # Cyclic dependencies.
# removing test_main.py - it requires 'pyflakefs'
# and adding `pyflakefs` to `checkInputs` causes infinite recursion.

14
pkgs/development/python-modules/importlib-resources/default.nix
View File

@ -1,24 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pathlib2
, setuptools_scm
, toml
, importlib-metadata
, typing
, isPy3k
, singledispatch
, pythonOlder
, python
}:
buildPythonPackage rec {
pname = "importlib_resources";
version = "1.0.2";
version = "1.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078";
sha256 = "1jilyxyb2z7hzcjhx1ddni52mq00i728wqh8f5k4469yhdkdz1vg";
};
nativeBuildInputs = [ setuptools_scm toml ];
propagatedBuildInputs = [
] ++ lib.optional (!isPy3k) pathlib2
importlib-metadata
] ++ lib.optional (pythonOlder "3.4") singledispatch
++ lib.optional (pythonOlder "3.5") typing
;

2
pkgs/development/python-modules/ipython/7.9.nix
View File

@ -64,6 +64,6 @@ buildPythonPackage rec {
description = "IPython: Productive Interactive Computing";
homepage = "http://ipython.org/";
license = licenses.bsd3;
maintainers = with maintainers; [ bjornfor fridh ];
maintainers = with maintainers; [ bjornfor ];
};
}

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

@ -22,12 +22,12 @@
buildPythonPackage rec {
pname = "ipython";
version = "7.14.0";
version = "7.15.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "f0126781d0f959da852fb3089e170ed807388e986a8dd4e6ac44855845b0fb1c";
sha256 = "0ef1433879816a960cd3ae1ae1dc82c64732ca75cec8dab5a4e29783fb571d0e";
};
prePatch = lib.optionalString stdenv.isDarwin ''

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

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "isbnlib";
version = "3.10.1";
version = "3.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "1ky5ynb8p580y2x3vpib6yrvdjgjb0wpqmdfnq5pqi3qzjyzsqra";
sha256 = "2295c01465fe19776b1f9432fd99fd24e61230d146ded2752e0d980ef6f4101f";
};
checkInputs = [

2
pkgs/development/python-modules/jupyter_client/5.nix
View File

@ -34,6 +34,6 @@ buildPythonPackage rec {
description = "Jupyter protocol implementation and client libraries";
homepage = "https://jupyter.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
maintainers = with lib.maintainers; [ ];
};
}

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

@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "jupyterlab";
version = "2.1.2";
version = "2.1.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "380c29d674f6dcf8e380615334c7813bb4feb7bbb6222baf1d4c9f8318f4b104";
sha256 = "7b5bd4a05330a01c8522ee7f1cda5cb2e0d96412d9e1e879a19b3afb63d4ac69";
};
propagatedBuildInputs = [ jupyterlab_server notebook ];

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

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "jupyterlab_server";
version = "1.1.3";
version = "1.1.5";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "17eac20af10167abebbeca72e7e390b9c19a400b8fffa158b5cfdcac344253d4";
sha256 = "3398e401b95da868bc96bdaa44fa61252bf3e68fc9dd1645bd93293cce095f6c";
};
checkInputs = [ requests pytest ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Keras_Preprocessing";
version = "1.1.0";
version = "1.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "1r98nm4k1svsqjyaqkfk23i31bl1kcfcyp7094yyj3c43phfp3as";
sha256 = "add82567c50c8bc648c14195bf544a5ce7c1f76761536956c3d2978970179ef3";
};
propagatedBuildInputs = [

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "kombu";
version = "4.6.8";
version = "4.6.10";
src = fetchPypi {
inherit pname version;
sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d";
sha256 = "437b9cdea193cc2ed0b8044c85fd0f126bb3615ca2f4d4a35b39de7cacfa3c1a";
};
postPatch = ''

8
pkgs/development/python-modules/mailmanclient/default.nix
View File

@ -2,20 +2,16 @@
buildPythonPackage rec {
pname = "mailmanclient";
version = "3.3.0";
version = "3.3.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "c8736cbe152ae1bd58b46ccfbcafb6a1e301513530772e7fda89f91d1e5c1ae9";
sha256 = "0pjgzpvhdb6ql8asb20xr8d01m646zpghmcp9fmscks0n1k4di4g";
};
propagatedBuildInputs = [ six httplib2 requests ];
# no tests with Pypi tar ball, checkPhase removes setup.py which invalidates import check
doCheck = false;
pythonImportsCheck = [ "mailmanclient" ];
meta = with stdenv.lib; {
homepage = "https://www.gnu.org/software/mailman/";
description = "REST client for driving Mailman 3";

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.5.0";
version = "0.5.1";
src = fetchPypi {
inherit pname version;
sha256 = "0hcm2hwryfr6js33zcl2k95wbjrgcj89pi90lka0hjw9vs9bmdz6";
sha256 = "a8dcf86c3562c1c6c25247b0a1a16f95d821bc8b3805141787c0b9ed8a2b4ca9";
};
propagatedBuildInputs = [

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "meinheld";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "447de7189e4dc9c1f425aa1b9c8210aab492fda4d86f73a24059264e7d8b0134";
sha256 = "008c76937ac2117cc69e032dc69cea9f85fc605de9bac1417f447c41c16a56d6";
};
propagatedBuildInputs = [ greenlet ];

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "msgpack-numpy";
version = "0.4.5";
version = "0.4.6.post0";
src = fetchPypi {
inherit pname version;
sha256 = "0z3ls52iamqv6fbn1ljnd5nnnzaiakczciry5c3vym5r77wgc9mg";
sha256 = "dfcb0c9cb5850e656344ac464a260e7b8b9b1c62d77c2e1d3d9ef15a88f1df6b";
};
buildInputs = [

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

@ -8,11 +8,11 @@
buildPythonPackage rec {
pname = "multidict";
version = "4.7.5";
version = "4.7.6";
src = fetchPypi {
inherit pname version;
sha256 = "aee283c49601fa4c13adc64c09c978838a7e812f85377ae130a24d7198c0331e";
sha256 = "fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430";
};
checkInputs = [ pytest pytestrunner pytestcov ];

2
pkgs/development/python-modules/nbformat/2.nix
View File

@ -36,6 +36,6 @@ buildPythonPackage rec {
description = "The Jupyter Notebook format";
homepage = "https://jupyter.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh globin ];
maintainers = with lib.maintainers; [ globin ];
};
}

2
pkgs/development/python-modules/notebook/2.nix
View File

@ -71,6 +71,6 @@ buildPythonPackage rec {
description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
homepage = "https://jupyter.org/";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
maintainers = with lib.maintainers; [ ];
};
}

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

@ -35,13 +35,13 @@ let
};
in buildPythonPackage rec {
pname = "numpy";
version = "1.18.4";
version = "1.18.5";
format = "pyproject.toml";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "bbcc85aaf4cd84ba057decaead058f43191cc0e30d6bc5d44fe336dc3d3f4509";
sha256 = "34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b";
};
nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];

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

@ -30,11 +30,11 @@ let
in buildPythonPackage rec {
pname = "pandas";
version = "1.0.3";
version = "1.0.4";
src = fetchPypi {
inherit pname version;
sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j";
sha256 = "b35d625282baa7b51e82e52622c300a1ca9f786711b2af7cbe64f1e6831f4126";
};
checkInputs = [ pytest glibcLocales moto hypothesis ];

Some files were not shown because too many files have changed in this diff Show More