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

Commits on Jan 10, 2020

  1. libselinux: fix build 

    Building libselinux 2.9 with python 3.8 causes several linker failures[1].
As this breaks several packages on staging and the glibc-230 integration
jobset[2], this should be fine as workaround.

This change can be reverted when updating to libselinux 3.0, ArchLinux
already has `libselinux` 3.0 with python 3.8[3].

[1] https://hydra.nixos.org/build/109960000
[2] https://hydra.nixos.org/eval/1564244
[3] https://aur.archlinux.org/cgit/aur.git/commit/?h=libselinux&id=f717bef8131622ad8545f4bdffe7bafdc35e9808
    @Ma27
    Ma27 committed Jan 10, 2020
    Copy the full SHA
    780fb56 View commit details

  2. python3.pkgs.libselinux: doesn't build w/python38

    @Ma27
    Ma27 committed Jan 10, 2020
    Copy the full SHA
    5dfd3c4 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 pkgs/top-level/all-packages.nix
  2. +1 −0 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -16652,7 +16652,7 @@ in
keyutils = callPackage ../os-specific/linux/keyutils { };

libselinux = callPackage ../os-specific/linux/libselinux {
python = python3;
python = python37;
};

libsemanage = callPackage ../os-specific/linux/libsemanage {
1 change: 1 addition & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2761,6 +2761,7 @@ in {
(p: p.overrideAttrs (super: {
meta = super.meta // {
outputsToInstall = [ "py" ];
broken = (super.meta.broken or false) || pythonAtLeast "3.8";
};
}))