about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/misc/vimpager
Commit message (Collapse)AuthorAge
* Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgsAlyssa Ross2023-08-13
| | | | | | | | | | | Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
* Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'Alyssa Ross2022-02-19
| | | | | | | | | | | | | | | | | Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
* Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'Alyssa Ross2021-09-27
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
* Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'Alyssa Ross2021-01-26
|
* Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'Alyssa Ross2020-01-11
|
* Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'Alyssa Ross2019-09-28
|
* Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'Alyssa Ross2019-09-16
|
* Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'Alyssa Ross2019-09-16
|
* Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'Alyssa Ross2019-04-14