Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c438ce12a858
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07b8ab4ff791
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 18, 2020

  1. python2.pkgs.nixpart0: use correct libselinux bindings 

    Sine 56e5572 libselinux in pkgs defaults to Python 3 so let's use the one from python.pkgs to make sure it matches.
    @jtojnar
    jtojnar committed Jan 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    infinisil Silvan Mosberger
    GPG key ID: 9424360B4B85C9E7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    07b8ab4 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/tools/filesystems/nixpart/0.4/blivet.nix
  2. +2 −2 pkgs/tools/filesystems/nixpart/0.4/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ buildPythonApplication rec {
'';

propagatedBuildInputs = [
pykickstart pyparted pyblock libselinux.py cryptsetup
pykickstart pyparted pyblock libselinux cryptsetup
] ++ stdenv.lib.optional useNixUdev systemd;

# tests are currently _heavily_ broken upstream
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/nixpart/0.4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchurl, python, buildPythonApplication
, libselinux
# Propagated to blivet
, useNixUdev ? true
# Needed by NixOps
@@ -10,10 +11,9 @@
let
blivet = import ./blivet.nix {
inherit stdenv fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev;
inherit (pkgs) lsof utillinux systemd;
libselinux = pkgs.libselinux.override { enablePython = true; };
};

cryptsetup = import ./cryptsetup.nix {