From 6ebdf50b87af7350878d8560683d8d2be5e7bfa1 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Fri, 28 Nov 2025 19:21:31 +0200 Subject: [PATCH 1/6] ranger: update homepage Moved on Nov 3 to a Codeberg Pages instance --- pkgs/by-name/ra/ranger/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index c1bb5db49936..e25575151d41 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication { meta = { description = "File manager with minimalistic curses interface"; - homepage = "https://ranger.github.io/"; + homepage = "https://ranger.fm/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ From b402b8183c3dd78057a628b9bef788b708448053 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Fri, 28 Nov 2025 20:56:36 +0200 Subject: [PATCH 2/6] ranger: remove LC_ALL setting No longer necessary on Darwin --- pkgs/by-name/ra/ranger/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index e25575151d41..5ea3652ecda8 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -27,8 +27,6 @@ python3Packages.buildPythonApplication { hash = "sha256-vn1rAOFB2vq04Y/WAE44iH/b/zamAmvq8putUKwNqR8="; }; - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = with python3Packages; [ pytestCheckHook astroid From cb17493a016e6ceeca3b3725bd0349fecdd8ba69 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 29 Nov 2025 11:46:05 +0200 Subject: [PATCH 3/6] ranger: move non-Python deps into the wrapper args - dropped less, cuz it's already patched in preConfigure - added coreutils and bash for `scope.sh` to work (can't patch or wrap the script itself, because Ranger both uses it internally and installs it in .config/ranger) --- pkgs/by-name/ra/ranger/package.nix | 31 +++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 5ea3652ecda8..05f1efb584d6 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -3,6 +3,8 @@ fetchFromGitHub, python3Packages, file, + coreutils, + bashNonInteractive, less, highlight, w3m, @@ -32,15 +34,26 @@ python3Packages.buildPythonApplication { astroid pylint ]; - propagatedBuildInputs = [ - less - file - ] - ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] - ++ lib.optionals sixelPreviewSupport [ imagemagick ] - ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] - ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] - ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; + propagatedBuildInputs = + [ ] + ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] + ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] + ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] + ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath ( + [ + file + coreutils + bashNonInteractive + ] + ++ lib.optionals sixelPreviewSupport [ imagemagick ] + )) + ]; preConfigure = '' ${lib.optionalString (highlight != null) '' From e457d4aba14142c87b5ec505376b9aa765bcd04e Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 29 Nov 2025 12:06:35 +0200 Subject: [PATCH 4/6] ranger: switch to pyproject format --- pkgs/by-name/ra/ranger/package.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index 05f1efb584d6..c78eed9d0e3c 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { pname = "ranger"; version = "1.9.3-unstable-2025-11-14"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ranger"; @@ -29,18 +29,23 @@ python3Packages.buildPythonApplication { hash = "sha256-vn1rAOFB2vq04Y/WAE44iH/b/zamAmvq8putUKwNqR8="; }; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - astroid - pylint + build-system = with python3Packages; [ + setuptools ]; - propagatedBuildInputs = + + dependencies = [ ] ++ lib.optionals imagePreviewSupport [ python3Packages.pillow ] ++ lib.optionals neoVimSupport [ python3Packages.pynvim ] ++ lib.optionals improvedEncodingDetection [ python3Packages.chardet ] ++ lib.optionals rightToLeftTextSupport [ python3Packages.python-bidi ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + astroid + pylint + ]; + makeWrapperArgs = [ "--prefix" "PATH" From 3be9ae5433207dc22d82ceb4225d50890b2c245a Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 29 Nov 2025 12:14:00 +0200 Subject: [PATCH 5/6] ranger: preConfigure -> postPatch, rearrange a little --- pkgs/by-name/ra/ranger/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index c78eed9d0e3c..f6b6b89f7bdd 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -60,12 +60,7 @@ python3Packages.buildPythonApplication { )) ]; - preConfigure = '' - ${lib.optionalString (highlight != null) '' - sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ - ranger/data/scope.sh - ''} - + postPatch = '' substituteInPlace ranger/__init__.py \ --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin less}/bin/less'" @@ -74,6 +69,10 @@ python3Packages.buildPythonApplication { --replace /usr/share $out/share \ --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" '' + + lib.optionalString (highlight != null) '' + sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \ + ranger/data/scope.sh + '' + lib.optionalString imagePreviewSupport '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m From 11e3087acf7b33ae0d1086ebafcc6b85f4b2fa30 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sat, 29 Nov 2025 12:20:32 +0200 Subject: [PATCH 6/6] ranger: 1.9.{3 - > 4}-unstable-2025-11-14, fix updateScript unstableGitUpdater incorrectly kept 1.9.3 tag, while 1.9.4 has existed for a year now --- pkgs/by-name/ra/ranger/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix index f6b6b89f7bdd..8beaf1154d5c 100644 --- a/pkgs/by-name/ra/ranger/package.nix +++ b/pkgs/by-name/ra/ranger/package.nix @@ -14,12 +14,12 @@ neoVimSupport ? true, improvedEncodingDetection ? true, rightToLeftTextSupport ? false, - unstableGitUpdater, + nix-update-script, }: python3Packages.buildPythonApplication { pname = "ranger"; - version = "1.9.3-unstable-2025-11-14"; + version = "1.9.4-unstable-2025-11-14"; pyproject = true; src = fetchFromGitHub { @@ -82,7 +82,9 @@ python3Packages.buildPythonApplication { --replace "set preview_images false" "set preview_images true" ''; - passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "File manager with minimalistic curses interface";