From 19ca20c91f56b47b194039781145f0cba9a2ddc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 1 Dec 2016 16:39:51 +0100 Subject: [PATCH] pythonPackages.rpm: rpm for specific python version rpm provides a Python module that is used by certain packages. We need to override pkgs.rpm to get a correct version. --- pkgs/tools/misc/diffoscope/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 4d5eabfebc9..c6eb7c8b018 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils , 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 }: @@ -29,9 +29,9 @@ pythonPackages.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # 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 - 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 ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69790130efc..564e52777f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1430,7 +1430,6 @@ in diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk7; pythonPackages = python3Packages; - rpm = rpm.override { python = python3; }; }; diffstat = callPackage ../tools/text/diffstat { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eaa75fb69d..06bad487f8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22454,6 +22454,8 @@ in { }); + rpm = (pkgs.rpm.override{inherit python;}); + rpy2 = buildPythonPackage rec { name = "rpy2-2.8.2"; disabled = isPyPy;