Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf681cff573d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e163a369c7af
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 2, 2020

  1. libxml2,libxslt: fix pythonSupport=false override

    @veprbl
    veprbl committed Apr 2, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eliottness Eliott Bouhana
    GPG key ID: 5C4DC5A45005B771
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b6187aa View commit details

Commits on Apr 5, 2020

  1. Merge pull request #83737 from veprbl/pr/libxslt_override_fix 

    libxml2,libxslt: fix pythonSupport=false override
    @veprbl
    veprbl authored Apr 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e163a36 View commit details
Showing with 1 addition and 3 deletions.
  1. +1 −3 pkgs/development/libraries/libxslt/default.nix
4 changes: 1 addition & 3 deletions pkgs/development/libraries/libxslt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,6 @@
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:

assert pythonSupport -> python != null;
assert pythonSupport -> libxml2.pythonSupport;

with stdenv.lib;

stdenv.mkDerivation rec {
@@ -53,5 +50,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = platforms.all;
maintainers = [ maintainers.eelco ];
broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert
};
}