Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-03-24 |
| | |||
* | Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33' | Alyssa Ross | 2023-02-08 |
| | |||
* | Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45' | Alyssa Ross | 2022-02-19 |
| | | | | | | | | | | | | | | | | | Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix | ||
* | Merge commit 'a323570a264da96a0b0bcc1c9aa017794acdc752' | Alyssa Ross | 2022-01-07 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | |||
* | Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a' | Alyssa Ross | 2019-08-14 |
| | |||
* | Merge commit '98e3b90b6c8f400ae5438ef868eb992a64b75ce5' | Alyssa Ross | 2019-06-18 |
| | |||
* | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 |