diff --git a/nix-os/shell.nix b/nix-os/shell.nix index 3c6833a..73476af 100644 --- a/nix-os/shell.nix +++ b/nix-os/shell.nix @@ -1,22 +1,6 @@ { config, pkgs, unstablePkgs, lib, ... }: let - rangerGit = pkgs.ranger.overrideAttrs (old: { - version = "git"; - src = pkgs.fetchFromGitHub { - owner = "ranger"; - repo = "ranger"; - rev = "c7777d558d5b69843b21f986e9af1af311c83887"; - hash = "sha256-DTVoEfc4dAaBTDLFujvWIYj5KHL89YknUiinIs9Rkeg="; - }; - propagatedBuildInputs = with pkgs.python3Packages; [ - # required for test suite, it's being ran during package build for some reason - flake8 - pylint - pytest - setuptools - ] ++ old.propagatedBuildInputs; - }); aliasDrag = pkgs.writeScriptBin "drag" '' ${pkgs.ripdrag}/bin/ripdrag -Axd $@ ''; @@ -29,7 +13,7 @@ in config = { environment.systemPackages = ( with pkgs; [ aliasDrag - rangerGit + ranger-git ripgrep kitty zoxide diff --git a/pkgs/by-name/ra/ranger-git/package.nix b/pkgs/by-name/ra/ranger-git/package.nix new file mode 100644 index 0000000..b63b800 --- /dev/null +++ b/pkgs/by-name/ra/ranger-git/package.nix @@ -0,0 +1,23 @@ +{ + ranger, + + fetchFromGitHub, + python3Packages, +}: + +ranger.overrideAttrs (selfAttrs: superAttrs: { + version = "git"; + src = fetchFromGitHub { + owner = "ranger"; + repo = "ranger"; + rev = "c7777d558d5b69843b21f986e9af1af311c83887"; + hash = "sha256-DTVoEfc4dAaBTDLFujvWIYj5KHL89YknUiinIs9Rkeg="; + }; + propagatedBuildInputs = with python3Packages; [ + # required for test suite, it's being ran during package build for some reason + flake8 + pylint + pytest + setuptools + ] ++ superAttrs.propagatedBuildInputs; +})