From 8a3e411236d314279fa55924cf961589c46b54cb Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sun, 11 Dec 2022 21:26:44 +0100 Subject: [PATCH] Update dependencies --- flake.lock | 42 ++++++------- patches/205387.patch | 147 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 21 deletions(-) create mode 100644 patches/205387.patch diff --git a/flake.lock b/flake.lock index 8ac35bd0..b869c13e 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ ] }, "locked": { - "lastModified": 1670593849, - "narHash": "sha256-COmZqtK0q1wXpC2iEbsizDIu+QRlCoP05lH4RtdP5O0=", + "lastModified": 1670687442, + "narHash": "sha256-RHOkHxq0AIVswFmIPVjsURffarxWoZYl2QyFx9OU5eA=", "owner": "accentor", "repo": "flake", - "rev": "7f9ad963d55ae24ed0bc8d18356375abbdc69199", + "rev": "93224d21292dbae2be1eed196cffc65a44f5ca1d", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1670590967, - "narHash": "sha256-bgm9SbYdkxFl4iEXCVqqx8Q02wiOPvIFH6+ZGuOhXPs=", + "lastModified": 1670770064, + "narHash": "sha256-bm2qIl/8J45GRnWpfYkdA/L1WBZul6+KCkVGvdK4SZY=", "owner": "accentor", "repo": "api", - "rev": "da8ea01eecb9f892e462f06cbfae5e3f8f48b27f", + "rev": "9aada6d84a659f96f2d1253a930285b57197eabf", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1670596915, - "narHash": "sha256-EdxDeeRaSwriwqA9w2h4HaJAG/BC1wEnLft0KIJ92DY=", + "lastModified": 1670770310, + "narHash": "sha256-io6BnE65FBAoD9Z+ue6iRtvSdYZ2wsfrsCTVRmHw6SE=", "owner": "accentor", "repo": "web", - "rev": "e5945cb010658e68df230d9693b21de5be106db5", + "rev": "9ba31e21a128bc6f0bbfeca27a9da2b5b85a7e2b", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1670666916, - "narHash": "sha256-B8m9HPJNvmEOjGSmqxWhePKh7i0sy4Q63jQqpliGwcY=", + "lastModified": 1670782654, + "narHash": "sha256-kmkRRGA5RWmNtKt41hglN8xyo7EX5qSzWfe2YW1A+JM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "67b8eb822dbb8e51d45f6b0663b4442b1601ffda", + "rev": "9fe20594a0dce5fdba2f683d2c4cba3371ce7581", "type": "github" }, "original": { @@ -231,11 +231,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1670507980, - "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", + "lastModified": 1670597555, + "narHash": "sha256-/k939P2S2246G6K5fyvC0U2IWvULhb4ZJg9K7ZxsX+k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2787fc7d1e51404678614bf0fe92fc296746eec0", + "rev": "2dea0f4c2d6e4603f54b2c56c22367e77869490c", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1670646657, - "narHash": "sha256-T5DjvmZ4jvUedK9e9NADrYIe85fxIMTwj2QHTdJxxXQ=", + "lastModified": 1670779394, + "narHash": "sha256-Ofto34JMmbUK3sFoO7aR+fed71IC1RFqQKpWQpyV0b4=", "owner": "nix-community", "repo": "NUR", - "rev": "6b370298b8e08bcc7a7a490d54517bd699708cd8", + "rev": "16a52ef00d1c4a060fd69a503e5607f227ce9c10", "type": "github" }, "original": { @@ -306,11 +306,11 @@ ] }, "locked": { - "lastModified": 1670593100, - "narHash": "sha256-XJBlbdxfH2f/PiaqADKeOTmx1r0mitzRv/QO+wI8st4=", + "lastModified": 1670690712, + "narHash": "sha256-Jf08BHwjBSySU2k37l6m4pJqAnqFVAMgqOfv7zV5H5U=", "owner": "chvp", "repo": "tetris", - "rev": "1e3bdafd67eacfbd0b1680c1acdf8d25c61b53d2", + "rev": "9b25d75754cf8efdd5662b363dbf23ba47a96ca4", "type": "github" }, "original": { diff --git a/patches/205387.patch b/patches/205387.patch new file mode 100644 index 00000000..389b590d --- /dev/null +++ b/patches/205387.patch @@ -0,0 +1,147 @@ +From 4fabafb699bc4fa91594fce7fd7eaf57c7fcdede Mon Sep 17 00:00:00 2001 +From: "Travis A. Everett" +Date: Fri, 9 Dec 2022 17:11:59 -0600 +Subject: [PATCH] resholve: fold in python package deps + +Protects resholve and dependents from breakages as py27 support is +removed (or rots). +--- + pkgs/development/misc/resholve/default.nix | 1 + + pkgs/development/misc/resholve/deps.nix | 65 ++++++++++++++++++++- + pkgs/development/misc/resholve/oildev.nix | 4 +- + pkgs/development/misc/resholve/resholve.nix | 3 +- + 4 files changed, 69 insertions(+), 4 deletions(-) + +diff --git a/pkgs/development/misc/resholve/default.nix b/pkgs/development/misc/resholve/default.nix +index 3e901070a2e2b..34dd36a212434 100644 +--- a/pkgs/development/misc/resholve/default.nix ++++ b/pkgs/development/misc/resholve/default.nix +@@ -22,6 +22,7 @@ rec { + resholve = callPackage ./resholve.nix { + inherit (source) rSrc version; + inherit (deps.oil) oildev; ++ inherit (deps) configargparse; + inherit resholve-utils; + }; + # funcs to validate and phrase invocations of resholve +diff --git a/pkgs/development/misc/resholve/deps.nix b/pkgs/development/misc/resholve/deps.nix +index 43882c20cf6c3..ef0ebaa670c15 100644 +--- a/pkgs/development/misc/resholve/deps.nix ++++ b/pkgs/development/misc/resholve/deps.nix +@@ -1,4 +1,6 @@ +-{ callPackage ++{ lib ++, callPackage ++, fetchFromGitHub + , python27 + , ... + }: +@@ -15,5 +17,64 @@ + + rec { + # binlore = callPackage ./binlore.nix { }; +- oil = callPackage ./oildev.nix { inherit python27; }; ++ oil = callPackage ./oildev.nix { ++ inherit python27; ++ inherit six; ++ inherit typing; ++ }; ++ configargparse = python27.pkgs.buildPythonPackage rec { ++ pname = "configargparse"; ++ version = "1.5.3"; ++ ++ src = fetchFromGitHub { ++ owner = "bw2"; ++ repo = "ConfigArgParse"; ++ rev = "v${version}"; ++ sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; ++ }; ++ ++ doCheck = false; ++ ++ pythonImportsCheck = [ "configargparse" ]; ++ ++ meta = with lib; { ++ description = "A drop-in replacement for argparse"; ++ homepage = "https://github.com/bw2/ConfigArgParse"; ++ license = licenses.mit; ++ }; ++ }; ++ six = python27.pkgs.buildPythonPackage rec { ++ pname = "six"; ++ version = "1.16.0"; ++ ++ src = python27.pkgs.fetchPypi { ++ inherit pname version; ++ sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; ++ }; ++ ++ doCheck = false; ++ ++ meta = { ++ description = "A Python 2 and 3 compatibility library"; ++ homepage = "https://pypi.python.org/pypi/six/"; ++ license = lib.licenses.mit; ++ }; ++ }; ++ typing = python27.pkgs.buildPythonPackage rec { ++ pname = "typing"; ++ version = "3.10.0.0"; ++ ++ src = python27.pkgs.fetchPypi { ++ inherit pname version; ++ sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; ++ }; ++ ++ doCheck = false; ++ ++ meta = with lib; { ++ description = "Backport of typing module to Python versions older than 3.5"; ++ homepage = "https://docs.python.org/3/library/typing.html"; ++ license = licenses.psfl; ++ }; ++ }; + } +diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix +index 854cbb2a00562..d9659513996d9 100644 +--- a/pkgs/development/misc/resholve/oildev.nix ++++ b/pkgs/development/misc/resholve/oildev.nix +@@ -13,6 +13,8 @@ + , cmark + , file + , glibcLocales ++, six ++, typing + }: + + rec { +@@ -95,7 +97,7 @@ rec { + + nativeBuildInputs = [ re2c file makeWrapper ]; + +- propagatedBuildInputs = with python27.pkgs; [ six typing ]; ++ propagatedBuildInputs = [ six typing ]; + + doCheck = true; + +diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix +index 6a71962fd4c5b..d0ed5105ae4cd 100644 +--- a/pkgs/development/misc/resholve/resholve.nix ++++ b/pkgs/development/misc/resholve/resholve.nix +@@ -6,6 +6,7 @@ + , rSrc + , version + , oildev ++, configargparse + , binlore + , resholve-utils + }: +@@ -19,7 +20,7 @@ python27.pkgs.buildPythonApplication { + + propagatedBuildInputs = [ + oildev +- python27.pkgs.configargparse ++ configargparse + ]; + + postPatch = ''