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

Commits on Oct 30, 2019

  1. pythonPackages.libselinux: init

    @jtojnar
    jtojnar committed Oct 30, 2019
    Copy the full SHA
    688bf9d View commit details

Commits on Oct 31, 2019

  1. Merge pull request #71659 from jtojnar/pyselinux 

    pythonPackages.libselinux: init
    @jtojnar
    jtojnar authored Oct 31, 2019
    Copy the full SHA
    471869c View commit details
Showing with 18 additions and 2 deletions.
  1. +1 −2 pkgs/development/python-modules/blivet/default.nix
  2. +17 −0 pkgs/top-level/python-packages.nix
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/blivet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@

let
pyenable = { enablePython = true; };
selinuxWithPython = libselinux.override pyenable;
cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec {
pname = "blivet";
@@ -31,7 +30,7 @@ in buildPythonPackage rec {
'';

propagatedBuildInputs = [
pykickstart pyparted pyblock pyudev selinuxWithPython.py cryptsetupWithPython
pykickstart pyparted pyblock pyudev libselinux cryptsetupWithPython
six
];

17 changes: 17 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2573,6 +2573,23 @@ in {
inherit (pkgs) libsexy pkgconfig;
};

libselinux = pipe pkgs.libselinux [
toPythonModule

(p: p.overrideAttrs (super: {
meta = super.meta // {
outputsToInstall = [ "py" ];
};
}))

(p: p.override {
enablePython = true;
inherit python;
})

(p: p.py)
];

libsoundtouch = callPackage ../development/python-modules/libsoundtouch { };

libthumbor = callPackage ../development/python-modules/libthumbor { };