index
:
nixlib
this commit
master
sixos
Alyssa's collection of Nix expressions
Alyssa Ross
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
nixpkgs
/
nixos
/
maintainers
Commit message (
Collapse
)
Author
Age
*
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Alyssa Ross
2020-04-27
|
*
Merge commit 'ae6bdcc53584aaf20211ce1814bea97ece08a248'
Alyssa Ross
2020-04-06
|
|
|
|
|
|
# Conflicts: # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
*
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Alyssa Ross
2020-04-01
|
*
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Alyssa Ross
2020-01-11
|
*
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Alyssa Ross
2019-09-16
|
*
Merge remote-tracking branch 'channels/nixos-unstable'
Alyssa Ross
2019-08-22
|
*
Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3'
Alyssa Ross
2019-05-24
|
*
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Alyssa Ross
2019-03-16
|
*
Merge commit '1233c8d9e9bc463899ed6a8cf0232e6bf36475ee'
Alyssa Ross
2019-02-26
|
*
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Alyssa Ross
2019-02-24
|
*
Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'
Alyssa Ross
2019-01-07
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199