diff options
59 files changed, 706 insertions, 264 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 838426afa04..7da839ee482 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -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 diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f56bc5285b9..ec418c56335 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -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 diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 2311bd0da68..ae55f77b0cc 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -44,6 +44,11 @@ </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> and <link linkend="opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, have been added to the <literal>openssh</literal> module. If you have <literal>AuthorizedKeysCommand</literal> @@ -483,9 +488,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> diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index e9f42d2b9b5..3693ff32233 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -33,6 +33,10 @@ rustPlatform.buildRustPackage rec { EOF ''; + buildPhase = '' + make build + ''; + installPhase = '' make install PREFIX="${placeholder "out"}" ''; diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix index 6bb86c016ba..1ff449eab0c 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ]; + 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. diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 795ce841ffb..468dd0c4b1a 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -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"; @@ -162,6 +169,7 @@ stdenv.mkDerivation (args // { ''; buildPhase = with builtins; args.buildPhase or '' + ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preBuild ( @@ -177,22 +185,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; @@ -202,13 +217,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\)" \ diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 65614b9480e..dfea7f6c8ef 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -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; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 4857b587847..0546ad9bac1 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -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; diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix index 4cf507fbf5c..a050be7c2bf 100644 --- a/pkgs/development/compilers/rust/rls/default.nix +++ b/pkgs/development/compilers/rust/rls/default.nix @@ -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 diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index f8ed0bce2e0..66a18f40ad4 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -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"; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index cc43a7d2f85..9690dfac2f2 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -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"; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 696be2136ec..db86b67835e 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -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; diff --git a/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch b/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch new file mode 100644 index 00000000000..9c085657ac9 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/profile-task.patch @@ -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 diff --git a/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch new file mode 100644 index 00000000000..39d5587379c --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.5/profile-task.patch @@ -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 diff --git a/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch b/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch new file mode 100644 index 00000000000..df55da3a413 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.6/profile-task.patch @@ -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 diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 32fc6536862..ee77185cde6 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -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) [ diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a3ba72a27b2..b05f989714a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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 // { diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix index bcd6070831b..3ac8293986d 100644 --- a/pkgs/development/libraries/audio/libgme/default.nix +++ b/pkgs/development/libraries/audio/libgme/default.nix @@ -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)" + ''; } diff --git a/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch b/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch new file mode 100644 index 00000000000..75d874b93d0 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch @@ -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; + } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 0429c7295fb..36b6bea61cd 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -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; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 8cc2ce00871..22d38a080ca 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -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; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 118adc61623..d1917de37d6 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -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; diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 090c6a2fff3..fd2ed39e34a 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e170e4931b8..1e49a72096a 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -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 diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 123c2f2f067..078b68aab11 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -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"; diff --git a/pkgs/development/libraries/libssh2/CVE-2019-17498.patch b/pkgs/development/libraries/libssh2/CVE-2019-17498.patch new file mode 100644 index 00000000000..8681c3ef609 --- /dev/null +++ b/pkgs/development/libraries/libssh2/CVE-2019-17498.patch @@ -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, diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 5cc0232e17d..8ce9c814df0 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -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; { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aa70e9e5a54..e46f3fb1488 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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: @@ -79,7 +81,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 +105,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 +144,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 +169,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 +187,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 diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 5251c680361..d083a256cd1 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index e038bb7f66d..ee430f800dd 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 6c5d526d523..d39b91355b9 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -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 = [ diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 3f3503bb2ba..2b0cf978d43 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -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"; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index c4bcda0110a..248ef55cce8 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -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"; diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 23075abd6f2..6e1182647c2 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -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"; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index f0b8a5dd560..3d5afd52abd 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -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 = [ diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 04c469204d7..a22009ac9db 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -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 diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix index 4c8086def33..9953868df5f 100644 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 69fe73eb342..692daa7b2f3 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -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 '' diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 4855663ebc7..8ce8150cbd4 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -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; [ ]; }; } diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index faf2cee2b00..06d02520b20 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -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 ]; }; } diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 8b8cce2f824..37f39c44967 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -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; [ ]; }; } diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 62a871fda09..0c9bac97320 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 0f4a3542086..5d7bb4a6d69 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -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 ]; diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index af72dc6b8a5..138c24ebbe3 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.46.0"; + version = "4.46.1"; src = fetchPypi { inherit pname version; - sha256 = "4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e"; + sha256 = "cd140979c2bebd2311dfb14781d8f19bd5a9debb92dcab9f6ef899c987fcf71f"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index f6a001e488c..7702df423bb 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -18,7 +18,7 @@ let basename = "gdb-${version}"; - version = "9.1"; + version = "9.2"; in assert pythonSupport -> python3 != null; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9"; + sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; postPatch = if stdenv.isDarwin then '' diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 4bf637c0eba..fbe49dc68b2 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Don't run the native `strip' when cross-compiling. This breaks at least - # with `.a' files for MinGW. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; longDescription = '' diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index de755ec17ff..ae6ad80cdd9 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - preBuild = "pushd crates/rust-analyzer"; - # Do not checking other crates in checkPhase. - preInstall = "popd"; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch index c914634f579..dd31260302c 100644 --- a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -1,18 +1,5 @@ -From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 -From: Chris Liddell <chris.liddell@artifex.com> -Date: Mon, 27 Apr 2020 11:04:57 +0100 -Subject: [PATCH] Bug 702364: Fix missing echogs dependencies - -Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c -to fix parallel build ---- - contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- - 1 file changed, 143 insertions(+), 138 deletions(-) - -diff --git a/contrib/contrib.mak b/contrib/contrib.mak -index 5411ae902..7dd9822a9 100644 ---- a/contrib/contrib.mak -+++ b/contrib/contrib.mak +--- a/contrib/contrib.mak 2020-03-19 09:21:42.000000000 +0100 ++++ b/contrib/contrib.mak 2020-05-14 13:41:03.202258445 +0200 @@ -22,6 +22,10 @@ CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) CONTRIBSRC=$(CONTRIBDIR)$(D) @@ -24,7 +11,7 @@ index 5411ae902..7dd9822a9 100644 ###### --------------------------- Catalog -------------------------- ###### # The following drivers are user-contributed, and maintained (if at all) by -@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ +@@ -185,19 +189,19 @@ $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ @@ -48,7 +35,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bjccolor $(bjc_) -@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) +@@ -208,25 +212,25 @@ # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) # Printer: HP 670 $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -78,7 +65,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ -@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -244,7 +248,8 @@ # Author: Matthew Gelhaus (mgelhaus@proaxis.com) # Printer: HP 880c @@ -88,7 +75,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) -@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) +@@ -255,7 +260,7 @@ # Author: Rene Harsch (rene@harsch.net) # Printer: HP 970Cxi $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ @@ -97,7 +84,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ -@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h +@@ -268,7 +273,7 @@ ### NOTE: Same as chp2200 (some PJL and CRD changes). $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -106,7 +93,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) -@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +@@ -277,7 +282,7 @@ ### NOTE: Depends on the presence of the cdj850 section. $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ @@ -115,7 +102,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) -@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +@@ -288,11 +293,11 @@ GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ @@ -129,7 +116,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)samsunggdi $(GDIMONO) $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ -@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -306,17 +311,17 @@ hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ @@ -150,7 +137,7 @@ index 5411ae902..7dd9822a9 100644 $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c -@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) +@@ -327,37 +332,37 @@ # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) # Printer: DEC LN03 $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ @@ -194,7 +181,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)la75plus $(ln03_) $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ -@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) +@@ -380,233 +385,233 @@ $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ @@ -228,7 +215,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)alc8600 $(escv_) $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ -@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)alc9100 $(escv_) $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ @@ -242,7 +230,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp8000c $(escv_) $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ -@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)lp8200c $(escv_) $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ @@ -261,7 +250,8 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp8800c $(escv_) $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ -@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) $(SETPDEV) $(DD)lp9000c $(escv_) $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ @@ -481,7 +471,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lex2050 $(lex2050_) $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ -@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ +@@ -623,7 +628,7 @@ $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ @@ -490,7 +480,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lxm3200 $(lxm3200_) -@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ +@@ -649,13 +654,13 @@ $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ @@ -506,7 +496,7 @@ index 5411ae902..7dd9822a9 100644 $(SETDEV) $(DD)lips4v $(lipsv_) $(ADDMOD) $(DD)lips4v -include $(GLD)vector -@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ +@@ -668,11 +673,11 @@ ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ @@ -520,7 +510,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bjc880j $(lipsr_) -@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +@@ -681,15 +686,15 @@ md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ @@ -539,7 +529,7 @@ index 5411ae902..7dd9822a9 100644 $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c -@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +@@ -697,7 +702,7 @@ oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ @@ -548,7 +538,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)oki4w $(oki4w_) # Author: Ivan Schreter (ivan@shadow.sk) -@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ +@@ -720,11 +725,11 @@ $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ @@ -562,7 +552,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)oprp $(opvp_) -@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ +@@ -901,78 +906,78 @@ # The generic pcl3 device with selectable subdevices $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ @@ -665,7 +655,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)hpdj1120c $(pcl3_) #------------------------------------------------------------------------------ -@@ -985,7 +990,7 @@ pcl3-install: +@@ -1009,7 +1014,7 @@ xes_=$(DEVOBJ)gdevxes.$(OBJ) $(DD)xes.dev : $(xes_) $(DD)page.dev \ @@ -674,7 +664,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)xes $(xes_) # Author: Peter Flass (flass@lbdrscs.bitnet) -@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) +@@ -1029,16 +1034,16 @@ pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) @@ -695,7 +685,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)pr1000_4 $(pr201_) $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ -@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1049,7 +1054,7 @@ jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) @@ -704,7 +694,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)jj100 $(jj100_) $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ -@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1061,11 +1066,11 @@ bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)bj10v.dev : $(bj10v_) \ @@ -718,7 +708,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)bj10vh $(bj10v_) # Uncomment the following line if you are using MS-DOS on PC9801 series. -@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ +@@ -1080,7 +1085,7 @@ dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ @@ -727,7 +717,7 @@ index 5411ae902..7dd9822a9 100644 $(SETDEV) $(DD)dmprt $(dmprt_) $(ADDMOD) $(DD)dmprt -ps dmp_init -@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp +@@ -1110,19 +1115,19 @@ $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ @@ -751,7 +741,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)mj8000c $(mj700v2c_) ### ----------------- The Fujitsu FMPR printer device ----------------- ### -@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +@@ -1130,7 +1135,7 @@ fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ @@ -760,7 +750,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)fmpr $(fmpr_) $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ -@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1142,7 +1147,7 @@ fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ @@ -769,7 +759,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)fmlbp $(fmlbp_) $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ -@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1159,7 +1164,7 @@ ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ @@ -778,7 +768,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)ml600 $(ml6_) $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ -@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1172,11 +1177,11 @@ lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ @@ -792,7 +782,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lbp320 $(lbp3x0_) $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) -@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1191,7 +1196,7 @@ $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ @@ -801,7 +791,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)npdl $(npdl_) ### ------- EPSON ESC/Page printer device ----------------- ### -@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1203,11 +1208,11 @@ $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ @@ -815,7 +805,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)lp2000 $(escpage_) ### --- The RICOH RPDL language printer device ------ ### -@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ +@@ -1218,7 +1223,7 @@ $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ @@ -824,21 +814,7 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)rpdl $(rpdl_) ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### -@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ - # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c - # - #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100f $(rpdl_) - # - #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - # $(SETPDEV2) $(DD)nx100v $(rpdl_) - - ### ------------ The ALPS Micro Dry printer devices ------------ ### -@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +@@ -1240,15 +1245,15 @@ alps_=$(DEVOBJ)gdevalps.$(OBJ) $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ @@ -857,6 +833,3 @@ index 5411ae902..7dd9822a9 100644 $(SETPDEV) $(DD)md1xMono $(alps_) $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ --- -2.26.2 - diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 7f6766cf462..a1059559187 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -10,8 +10,8 @@ assert cupsSupport -> cups != null; let version = "9.${ver_min}"; - ver_min = "50"; - sha512 = "3p46kzn6kh7z4qqnqydmmvdlgzy5730z3yyvyxv6i4yb22mgihzrwqmhmvfn3b7lypwf6fdkkndarzv7ly3zndqpyvg89x436sms7iw"; + ver_min = "52"; + sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc"; fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -47,11 +47,6 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff - (fetchpatch { - name = "CVE-2019-14869.patch"; - url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; - sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; - }) # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, # Remove on update to version > 9.52 ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 46312a637da..3ac79464ac4 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "14j6n1bc09xhq8lxs40vfsx8bb8lx12a07ga4rsxl8vfrqjhwnqv"; + sha256 = "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d239455ad34..148a2c83c8a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -720,6 +720,7 @@ let PSI = whenAtLeast "4.20" yes; MODVERSIONS = whenOlder "4.9" yes; + MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 23aa893362b..a9b60cbb2e2 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -24,8 +24,8 @@ index 8331832c7a..bedb97115d 100644 systemduserconfdir=${sysconfdir}/systemd/user -systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system -systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators systemdusergeneratordir=${prefix}/lib/systemd/user-generators systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8ba7e9c96cf..2b440f78e99 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -182,41 +182,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.21"; + version = "9.5.22"; psqlSchema = "9.5"; - sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby"; + sha256 = "03v4d4nr9f86y0i1j5jmvfan5w8y4ga1mar59lhcnj3jl5q58ma8"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.17"; + version = "9.6.18"; psqlSchema = "9.6"; - sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn"; + sha256 = "16crr2a1sl97aiacqzd0bk56yl1abq6blc0c6qpx5rl5ny1c4zji"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.12"; + version = "10.13"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq"; + sha256 = "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.7"; + version = "11.8"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij"; + sha256 = "1qksqyayxmnccmbapg3ajsw9pjgqva0inxjhx64rqd6ckhrg9wpa"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.2"; + version = "12.3"; psqlSchema = "12"; - sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd"; + sha256 = "0hfg3n7rlz96579cj3z1dh2idl15rh3wfvn8jl31jj4h2yk69vcl"; this = self.postgresql_12; inherit self; }; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb42fdbaff4..f919fb92ed1 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -51,14 +51,16 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ - --replace ":-zstdcat" ":-$out/bin/zstdcat" + --replace ":-zstdcat" ":-$bin/bin/zstdcat" substituteInPlace ../programs/zstdless \ - --replace "zstdcat" "$out/bin/zstdcat" + --replace "zstdcat" "$bin/bin/zstdcat" ''; # Don't duplicate the library code in runtime closures. postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a''; + outputs = [ "bin" "dev" "man" "out" ]; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 5c73ee945c7..5a6dafae298 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.6"; + version = "5.6.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1"; + sha256 = "1nwnvjdnr9fjj2q2p2vpjabfdhcrwykgj9knjcsqy0c7p1bgbk2h"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index c6e8b4803cc..96ef0eef8c5 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -2,7 +2,9 @@ , lib , fetchFromGitHub , rustPlatform -, Security }: +, rust +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-deb"; @@ -19,6 +21,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; + checkType = "debug"; + + preCheck = '' + substituteInPlace tests/command.rs \ + --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/debug" + ''; + meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; homepage = "https://github.com/mmstick/cargo-deb"; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index c8a55d3f397..29229bff002 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -12,6 +12,8 @@ buildRustPackage rec { sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; + patches = [ ./fix-tests.patch ]; + cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/tools/security/ripasso/fix-tests.patch new file mode 100644 index 00000000000..433ff933b1f --- /dev/null +++ b/pkgs/tools/security/ripasso/fix-tests.patch @@ -0,0 +1,35 @@ +diff --git a/src/pass/test.rs b/src/pass/test.rs +index c980a2f..2e6c8cc 100644 +--- a/src/pass/test.rs ++++ b/src/pass/test.rs +@@ -56,6 +56,7 @@ fn populate_password_list_small_repo() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -84,6 +85,7 @@ fn populate_password_list_repo_with_deleted_files() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -112,6 +114,7 @@ fn populate_password_list_directory_without_git() { + base_path.pop(); + base_path.pop(); + base_path.pop(); ++ base_path.pop(); + base_path.push("testres"); + + let mut password_dir: PathBuf = base_path.clone(); +@@ -149,4 +152,4 @@ fn parse_signing_keys_empty() { + let result = PasswordStore::parse_signing_keys(&None).unwrap(); + + assert_eq!(result.len(), 0); +-} +\ No newline at end of file ++} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18717d5e1ae..37749de497b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7902,7 +7902,11 @@ in zssh = callPackage ../tools/networking/zssh { }; - zstd = callPackage ../tools/compression/zstd { }; + zstd = callPackage ../tools/compression/zstd { + cmake = cmake.override { + libarchive = libarchive.override { zstd = null; }; + }; + }; zsync = callPackage ../tools/compression/zsync { }; @@ -9644,7 +9648,7 @@ in # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md python = python2; python2 = python27; - python3 = python37; + python3 = python38; pypy = pypy2; pypy2 = pypy27; pypy3 = pypy36; |