about summary refs log tree commit diff
path: root/nixpkgs/lib/generators.nix
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'nixpkgs/nixos-unstable'Alyssa Ross2021-04-12
|
* Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'Alyssa Ross2021-01-12
|
* Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'Alyssa Ross2020-04-06
| | | | | | # Conflicts: # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
* Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'Alyssa Ross2020-04-01
|
* Merge commit '3d085a399c436a41d875801619e8f976b8519196'Alyssa Ross2020-01-26
|
* Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'Alyssa Ross2019-05-24
|
* Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'Alyssa Ross2019-01-07
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199