alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

pythonPackages.rpm: rpm for specific python version

Browse source 
rpm provides a Python module that is used by certain packages. We need
to override pkgs.rpm to get a correct version.
This commit is contained in:
Frederik Rietdijk 2016-12-01 16:39:51 +01:00
parent 74276caf19
commit 19ca20c91f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/misc/diffoscope/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
, enableBloat ? false , enableBloat ? false
}: }:
@ -29,9 +29,9 @@ pythonPackages.buildPythonApplication rec {
# Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
# Also these libraries: python3-guestfs # Also these libraries: python3-guestfs
# FIXME: move xxd into a separate package so we don't have to pull in all of vim. # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz
] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
doCheck = false; # Calls 'mknod' in squashfs tests, which needs root doCheck = false; # Calls 'mknod' in squashfs tests, which needs root

1
pkgs/top-level/all-packages.nix
View file

@ -1430,7 +1430,6 @@ in
diffoscope = callPackage ../tools/misc/diffoscope { diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk7; jdk = jdk7;
pythonPackages = python3Packages; pythonPackages = python3Packages;
rpm = rpm.override { python = python3; };
}; };
diffstat = callPackage ../tools/text/diffstat { }; diffstat = callPackage ../tools/text/diffstat { };

2
pkgs/top-level/python-packages.nix
View file

@ -22454,6 +22454,8 @@ in {
}); });
rpm = (pkgs.rpm.override{inherit python;});
rpy2 = buildPythonPackage rec { rpy2 = buildPythonPackage rec {
name = "rpy2-2.8.2"; name = "rpy2-2.8.2";
disabled = isPyPy; disabled = isPyPy;