Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable-small' | Alyssa Ross | 2024-05-07 |
| | | | | | | | 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 '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 commit 'a343533bccc62400e8a9560423486a3b6c11a23b' | Alyssa Ross | 2024-03-22 |
| | |||
* | Merge commit 'e3474e1d1e53' | Alyssa Ross | 2024-02-26 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-02-20 |
| | |||
* | 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 | 2024-01-20 |
| | | | | | Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix | ||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-07 |
| | |||
* | Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2024-01-06 |
| | | | | | Conflicts: 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 | Alyssa Ross | 2023-12-07 |
| | |||
* | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-12-01 |
| | |||
* | 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-small' of https://github.com/NixOS/nixpkgs into ↵ | Alyssa Ross | 2023-11-16 |
| | | | | HEAD | ||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD | Alyssa Ross | 2023-11-05 |
| | |||
* | Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD | Alyssa Ross | 2023-10-31 |
| | |||
* | 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-09-15 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-12 |
| | |||
* | Merge https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-09-01 |
| | |||
* | Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs | Alyssa Ross | 2023-08-26 |
| | | | | | | Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/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 '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 '1737f98af6667560e3e4f930312f9b5002649d04' | Alyssa Ross | 2021-09-27 |
| | | | | | | | | Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch | ||
* | Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42' | Alyssa Ross | 2021-09-13 |
| | |||
* | Merge commit '87807e64a5ef5206b745a40af118c7be8db73681' | Alyssa Ross | 2021-07-23 |
| | |||
* | Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997' | Alyssa Ross | 2021-06-22 |
| | | | | | | | | | # Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix | ||
* | Merge remote-tracking branch 'nixpkgs/nixos-unstable' | Alyssa Ross | 2021-04-12 |
| | |||
* | nixpkgs: merge nixos-unstable | Alyssa Ross | 2021-02-16 |
| | |||
* | 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 '683c68232e91f76386db979c461d8fbe2a018782' | Alyssa Ross | 2020-05-12 |
| | |||
* | Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975' | Alyssa Ross | 2020-04-27 |
| | |||
* | Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73' | Alyssa Ross | 2020-04-01 |
| | |||
* | Merge commit '3d085a399c436a41d875801619e8f976b8519196' | Alyssa Ross | 2020-01-26 |
| | |||
* | Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f' | Alyssa Ross | 2020-01-22 |
| | |||
* | Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f' | Alyssa Ross | 2020-01-11 |
| | |||
* | 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 '8d1510abfb592339e13ce8f6db6f29c1f8b72924' | Alyssa Ross | 2019-09-16 |
| | |||
* | Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a' | Alyssa Ross | 2019-08-14 |
| | |||
* | Merge commit '1036dc664169b32613ec11b58cc1740c7511a340' | Alyssa Ross | 2019-08-14 |
| | |||
* | Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d' | Alyssa Ross | 2019-08-14 |
| | | | | v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix | ||
* | Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5' | Alyssa Ross | 2019-06-19 |
| |