Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 9 days |
| | | | | | | | Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix | ||
* | Merge commit 'e3474e1d1e53' | Alyssa Ross | 2024-02-26 |
| | |||
* | 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 branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-15 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-19 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/top-level/perl-packages.nix | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | |||
* | Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8' | Alyssa Ross | 2023-10-20 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
* | 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 branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-06-16 |
| | | | | | | | | | | | | | | | | | | | | | | Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix 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/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix | ||
* | 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 'b3c692172e5b5241b028a98e1977f9fb12eeaf42' | Alyssa Ross | 2021-09-13 |
| | |||
* | Merge commit 'b09661d41fb93562fd53f31574dbf781b130ac44' | Alyssa Ross | 2021-07-23 |
| | |||
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | |||
* | Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e' | Alyssa Ross | 2021-01-26 |
| | |||
* | Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248' | Alyssa Ross | 2021-01-15 |
| | |||
* | Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe' | Alyssa Ross | 2021-01-12 |
| | |||
* | Merge commit '9480bae337095fd24f61380bce3174fdfe926a00' | Alyssa Ross | 2020-07-13 |
| | | | | | | This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first. | ||
* | Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66' | Alyssa Ross | 2020-05-18 |
| | |||
* | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | |||
* | Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73' | Alyssa Ross | 2020-04-01 |
| | |||
* | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | |||
* | Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a' | Alyssa Ross | 2019-08-14 |
| | |||
* | Merge commit '1036dc664169b32613ec11b58cc1740c7511a340' | Alyssa Ross | 2019-08-14 |
| | |||
* | Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5' | Alyssa Ross | 2019-06-19 |
| | |||
* | Merge commit 'a1dd419c1ffacea87eba066a2bb332e03cb68f66' | Alyssa Ross | 2019-06-18 |
| | |||
* | Merge commit '650a295621b27c4ebe0fa64a63fd25323e64deb3' | Alyssa Ross | 2019-05-24 |
| | |||
* | Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed' | Alyssa Ross | 2019-05-17 |
| | |||
* | Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af' | Alyssa Ross | 2019-05-07 |
| | |||
* | Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821' | Alyssa Ross | 2019-04-27 |
| | |||
* | Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967' | Alyssa Ross | 2019-03-11 |
| | |||
* | Merge commit '36f316007494c388df1fec434c1e658542e3c3cc' | Alyssa Ross | 2019-02-18 |
| | |||
* | Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199' | Alyssa Ross | 2019-01-07 |
git-subtree-dir: nixpkgs git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199 |