summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #166130 from DeterminateSystems/zpool-expandGraham Christensen2022-04-07
|\
| * services.zfs.expandOnBoot: Test that it worksGraham Christensen2022-04-07
| * nixos/zfs: better support auto-expanding partitioned disksGraham Christensen2022-04-07
* | Merge pull request #166602 from talyz/keycloak-17.0.1Kim Lindberger2022-04-07
|\ \ | |/ |/|
| * keycloak: 16.1.0 -> 17.0.1talyz2022-04-01
* | Merge pull request #166894 from CameronNemo/nixos-mod-envoypennae2022-04-07
|\ \
| * | nixos/envoy: initCameron Nemo2022-04-07
* | | Merge remote-tracking branch 'origin/master' into haskell-updatessternenseemann2022-04-07
|\ \ \
| * \ \ Merge pull request #161272 from dmadisetti/masterThiago Kenji Okada2022-04-06
| |\ \ \
| | * | | nixos/grub: added configuration option for entry optionsmadisetti2022-03-31
* | | | | Merge master into haskell-updatesgithub-actions[bot]2022-04-06
|\| | | |
| * | | | Merge pull request #167381 from jonringer/qtile-module-fixespennae2022-04-05
| |\ \ \ \
| | * | | | nixos/qtile: expose package optionJonathan Ringer2022-04-05
| | * | | | nixos/qtile: expose unwrapped package to systemPackagesJonathan Ringer2022-04-05
| * | | | | Merge pull request #165540 from Infinisil/module-args-docsRobert Hensing2022-04-05
| |\ \ \ \ \
| | * | | | | lib/modules: Document _module.argsSilvan Mosberger2022-04-05
* | | | | | | Merge remote-tracking branch 'origin/master' into haskell-updatessternenseemann2022-04-05
|\| | | | | |
| * | | | | | Merge #165406: staging-next 2022-03-23Vladimír Čunát2022-04-05
| |\ \ \ \ \ \
| | * | | | | | nixosTests.installer.*: provide a missing dependencyVladimír Čunát2022-04-05
| | * | | | | | Merge master into staging-nextgithub-actions[bot]2022-04-05
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-04
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-04-04
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-04
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-04-04
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-03
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-03
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2022-04-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-04-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'nixpkgs/master' into staging-nextAlyssa Ross2022-03-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-03-31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into staging-nextsternenseemann2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextFrederik Rietdijk2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into staging-nextJan Tojnar2022-03-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-03-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2022-03-27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master into staging-nextgithub-actions[bot]2022-03-26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \