Merge pull request #204023 from abathur/resholve_enable_python27
resholve: add usable (overridden) python27
This commit is contained in:
commit
176ed1927d
|
@ -1,8 +1,19 @@
|
|||
{ callPackage
|
||||
{ lib
|
||||
, pkgsBuildHost
|
||||
, system
|
||||
, ...
|
||||
}:
|
||||
|
||||
let
|
||||
pkgs = import ../../../.. {
|
||||
inherit system;
|
||||
# Allow python27 with known security issues only for resholve,
|
||||
# see issue #201859 for the reasoning
|
||||
# In resholve case this should not be a security issue,
|
||||
# since it will only be used during build, not runtime
|
||||
config.permittedInsecurePackages = [ pkgsBuildHost.python27.name ];
|
||||
};
|
||||
callPackage = lib.callPackageWith pkgs;
|
||||
source = callPackage ./source.nix { };
|
||||
deps = callPackage ./deps.nix { };
|
||||
in
|
||||
|
|
3
pkgs/development/misc/resholve/deps.nix
generated
3
pkgs/development/misc/resholve/deps.nix
generated
|
@ -1,4 +1,5 @@
|
|||
{ callPackage
|
||||
, python27
|
||||
, ...
|
||||
}:
|
||||
|
||||
|
@ -14,5 +15,5 @@
|
|||
|
||||
rec {
|
||||
# binlore = callPackage ./binlore.nix { };
|
||||
oil = callPackage ./oildev.nix { };
|
||||
oil = callPackage ./oildev.nix { inherit python27; };
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, python27Packages
|
||||
, python27
|
||||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
|
@ -32,7 +32,7 @@ rec {
|
|||
'';
|
||||
};
|
||||
|
||||
py-yajl = python27Packages.buildPythonPackage rec {
|
||||
py-yajl = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "oil-pyyajl-unstable";
|
||||
version = "2019-12-05";
|
||||
src = fetchFromGitHub {
|
||||
|
@ -51,7 +51,7 @@ rec {
|
|||
(or accepting all of the patches we need to do so).
|
||||
This creates one without disturbing upstream too much.
|
||||
*/
|
||||
oildev = python27Packages.buildPythonPackage rec {
|
||||
oildev = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "oildev-unstable";
|
||||
version = "2021-07-14";
|
||||
|
||||
|
@ -95,7 +95,7 @@ rec {
|
|||
|
||||
nativeBuildInputs = [ re2c file makeWrapper ];
|
||||
|
||||
propagatedBuildInputs = with python27Packages; [ six typing ];
|
||||
propagatedBuildInputs = with python27.pkgs; [ six typing ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, callPackage
|
||||
, python27Packages
|
||||
, python27
|
||||
, installShellFiles
|
||||
, rSrc
|
||||
, version
|
||||
|
@ -10,7 +10,7 @@
|
|||
, resholve-utils
|
||||
}:
|
||||
|
||||
python27Packages.buildPythonApplication {
|
||||
python27.pkgs.buildPythonApplication {
|
||||
pname = "resholve";
|
||||
inherit version;
|
||||
src = rSrc;
|
||||
|
@ -19,7 +19,7 @@ python27Packages.buildPythonApplication {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
oildev
|
||||
python27Packages.configargparse
|
||||
python27.pkgs.configargparse
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -40,7 +40,7 @@ python27Packages.buildPythonApplication {
|
|||
|
||||
passthru = {
|
||||
inherit (resholve-utils) mkDerivation phraseSolution writeScript writeScriptBin;
|
||||
tests = callPackage ./test.nix { inherit rSrc binlore; };
|
||||
tests = callPackage ./test.nix { inherit rSrc binlore python27; };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -1300,12 +1300,6 @@ mapAliases ({
|
|||
redis-desktop-manager = throw "'redis-desktop-manager' has been renamed to/replaced by 'resp-app'"; # Added 2022-11-10
|
||||
redshift-wlr = throw "redshift-wlr has been replaced by gammastep"; # Added 2021-12-25
|
||||
reicast = throw "reicast has been removed from nixpkgs as it is unmaintained, please use flycast instead"; # Added 2022-03-07
|
||||
|
||||
# 3 resholve aliases below added 2022-04-08; drop after 2022-11-30?
|
||||
resholvePackage = throw "resholvePackage has been renamed to resholve.mkDerivation";
|
||||
resholveScript = throw "resholveScript has been renamed to resholve.writeScript";
|
||||
resholveScriptBin = throw "resholveScriptBin has been renamed to resholve.writeScriptBin";
|
||||
|
||||
residualvm = throw "residualvm was merged to scummvm code in 2018-06-15; consider using scummvm"; # Added 2021-11-27
|
||||
retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19
|
||||
retroshare06 = retroshare;
|
||||
|
|
Loading…
Reference in a new issue