diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/tools/misc/neofetch/default.nix | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/neofetch/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/neofetch/default.nix | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 77af8d5d788b..806655ffe9f7 100644 --- a/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -4,13 +4,13 @@ stdenvNoCC.mkDerivation rec { pname = "neofetch"; - version = "unstable-2020-11-26"; + version = "unstable-2021-12-10"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; - rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f"; - sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE="; + rev = "ccd5d9f52609bbdcd5d8fa78c4fdb0f12954125f"; + sha256 = "sha256-9MoX6ykqvd2iB0VrZCfhSyhtztMpBTukeKejfAWYW1w="; }; patches = [ @@ -19,8 +19,22 @@ stdenvNoCC.mkDerivation rec { sha256 = "1fapdg9z79f0j3vw7fgi72b54aw4brn42bjsj48brbvg3ixsciph"; name = "avoid_overwriting_gio_extra_modules_env_var.patch"; }) + # https://github.com/dylanaraps/neofetch/pull/2114 + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/c4eb4ec7783bb94cca0dbdc96db45a4d965956d2.patch"; + sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs="; + name = "update_old_nixos_logo.patch"; + }) + # https://github.com/dylanaraps/neofetch/pull/2157 + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/de253afcf41bab441dc58d34cae654040cab7451.patch"; + sha256 = "sha256-3i7WnCWNfsRjbenTULmKHft5o/o176imzforNmuoJwo="; + name = "improve_detect_nixos_version.patch"; + }) ]; + outputs = [ "out" "man" ]; + strictDeps = true; buildInputs = [ bash ]; nativeBuildInputs = [ makeWrapper ]; |