about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/compression/nx2elf
Commit message (Collapse)AuthorAge
* Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'Alyssa Ross2022-03-11
| | | | | | | | | | Conflicts: nixpkgs/nixos/modules/programs/ssh.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/data/fonts/noto-fonts/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix
* Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'Alyssa Ross2021-06-10