| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge commit 'd8fe5e6c' | Alyssa Ross | 2024-04-10 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix | ||
| * | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-24 |
| | | |||
| * | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-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 '99665eb45f58d959d2cb9e49ddb960c79d596f33' | Alyssa Ross | 2023-02-08 |
| | | |||
| * | Merge commit '93883402a445ad467320925a0a5dbe43a949f25b' | Alyssa Ross | 2022-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 'b09661d41fb93562fd53f31574dbf781b130ac44' | Alyssa Ross | 2021-07-23 |
| | | |||
| * | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | | |||
| * | gcc.arch: refactor, move tables under lib/ | volth | 2020-11-27 |
| | | | | | (cherry picked from commit cf7b63df5b9efdef4e8e1b3261d7040199f7e671) | ||
| * | platform.gcc.arch: support for AMD CPUs | volth | 2020-11-27 |
| | | | | | (cherry picked from commit 463db72e631e0bd4a835796324eb1981071c6ee4) | ||
| * | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | | |||
| * | Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704' | Alyssa Ross | 2019-09-28 |
| | | |||
| * | Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065' | Alyssa Ross | 2019-09-16 |
| | | |||
| * | Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef' | Alyssa Ross | 2019-09-16 |
| | | |||
| * | Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d' | Alyssa Ross | 2019-08-14 |
| | | | | | v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix | ||
| * | Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed' | Alyssa Ross | 2019-05-17 |
| | | |||
| * | Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af' | Alyssa Ross | 2019-05-07 |
| | | |||
| * | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
| git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 | |||