| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-13 |
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42' | Alyssa Ross | 2021-09-13 |
| | | |||
| * | Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44' | Alyssa Ross | 2021-07-23 |
| | | |||
| * | Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916' | Alyssa Ross | 2021-06-23 |
| | | | | | | # Conflicts: # nixpkgs/pkgs/top-level/all-packages.nix | ||
| * | Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17' | Alyssa Ross | 2021-06-10 |
| | | |||
| * | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe' | Alyssa Ross | 2021-01-12 |
| | | |||
| * | treewide: add warning comment to “boot” packages | Matthew Bauer | 2020-11-27 |
| | | | | | | | | | | | | | | | | | | This adds a warning to the top of each “boot” package that reads: Note: this package is used for bootstrapping fetchurl, and thus cannot use fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed here should be included directly in Nixpkgs as files. This makes it clear to maintainer that they may need to treat this package a little differently than others. Importantly, we can’t use fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale hashes, we need to include patches that are subject to changing overtime (for instance, gitweb’s patches contain a version number at the bottom). (cherry picked from commit d0677e6d45c4acf9fdd3f09e77f7201794a45a82) | ||
| * | Merge commit '969cff2691a02b3d7e5468beda26c482d8986644' | Alyssa Ross | 2019-02-24 |
| | | |||
| * | Merge commit '2d2f10475138b7206572dc3ec288184df2be022e' | Alyssa Ross | 2019-02-07 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||