public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/staging' into master

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/cryptsetup/default.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, fetchurl, devicemapper, openssl, libuuid, pkgconfig, popt
, enablePython ? false, python ? null
, enablePython ? false, python2 ? null
}:
assert enablePython -> python != null;
assert enablePython -> python2 != null;
stdenv.mkDerivation rec {
name = "cryptsetup-1.7.0";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enablePython "--enable-python";
buildInputs = [ devicemapper openssl libuuid pkgconfig popt ]
++ stdenv.lib.optional enablePython python;
++ stdenv.lib.optional enablePython python2;
meta = {
homepage = https://gitlab.com/cryptsetup/cryptsetup/;

8
pkgs/os-specific/linux/dstat/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pythonPackages }:
{ stdenv, fetchurl, python2Packages }:
stdenv.mkDerivation rec {
name = "dstat-${version}";
@@ -9,12 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "16286z3y2lc9nsq8njzjkv6k2vyxrj9xiixj1k3gnsbvhlhkirj6";
};
buildInputs = with pythonPackages; [ python-wifi wrapPython ];
buildInputs = with python2Packages; [ python-wifi wrapPython ];
pythonPath = with pythonPackages; [ python-wifi ];
pythonPath = with python2Packages; [ python-wifi ];
patchPhase = ''
sed -i -e 's|/usr/bin/env python|${python}/bin/python|' \
sed -i -e 's|/usr/bin/env python|${python2Packages.python.interpreter}|' \
-e "s|/usr/share/dstat|$out/share/dstat|" dstat
'';