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: 2eb161072503
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a74a5c9d9237
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 29, 2020

  1. CastXML: refactor to avoid python2 dependency (#101996) 

    Switch pythonPackages.sphinx to python3Packages.sphinx. Should
only affect the build of the man-page.
    @braunse
    braunse authored Oct 29, 2020
    Copy the full SHA
    a74a5c9 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/tools/castxml/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/castxml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, pythonPackages
, python3Packages
, cmake
, llvmPackages
, libffi, libxml2, zlib
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
};

nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ];
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ python3Packages.sphinx ];

clangVersion = lib.getVersion llvmPackages.clang;