summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into staginggithub-actions[bot]2023-10-14
|\
| * Merge master into staging-nextgithub-actions[bot]2023-10-14
| |\
| | * Merge pull request #260975 from Artturin/x11xkbArtturi2023-10-14
| | |\
| | | * nixos/x11: don't use a submodule for xkb optionsArtturin2023-10-14
| * | | Merge branch 'master' into staging-nextWeijia Wang2023-10-14
| |\| |
| | * | Merge pull request #260185 from vcunat/p/firefox-no-testsMartin Weinelt2023-10-14
| | |\ \
| | | * | nixos/release: don't block on firefox testsVladimír Čunát2023-10-10
| | * | | Merge pull request #259658 from Majiir/fix-networkd-wakeonlanMaximilian Bosch2023-10-14
| | |\ \ \
| | | * | | refactor: combine scripted and networkd WakeOnLan configMajiir Paktu2023-10-07
| | | * | | nixos/network-interfaces-systemd: fix WakeOnLanMajiir Paktu2023-10-07
* | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-14
|\| | | | |
| * | | | | Merge master into staging-nextgithub-actions[bot]2023-10-14
| |\| | | |
| | * | | | Merge pull request #256598 from adamcstephens/net/warn-multiple-netMaximilian Bosch2023-10-14
| | |\ \ \ \
| | | * | | | nixos/networking: warn when both networkd and dhcpcd can collideAdam Stephens2023-09-21
| | * | | | | Merge branch 'master' into shellconfigVladimir Pouzanov2023-10-14
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | nixos/users-groups: escape hatch for enabling a shell system-wideVladimir Pouzanov2023-09-27
* | | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-14
|\| | | | | |
| * | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #260764 from MatthewCash/fix/xdg-base-pamArtturi2023-10-14
| | |\ \ \ \ \
| | | * | | | | nixos/user-groups: fix environment.profiles using parameter expansionMatthew_Cash2023-10-12
* | | | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-14
|\| | | | | | |
| * | | | | | | Merge branch 'master' into staging-nextWeijia Wang2023-10-14
| |\| | | | | |
| | * | | | | | Merge pull request #259792 from Luflosi/kubo-test-improvementsFabián Heredia Montiel2023-10-13
| | |\ \ \ \ \ \
| | | * | | | | | nixos/tests/kubo: various improvementsLuflosi2023-10-10
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-13
|\| | | | | | |
| * | | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-13
| |\| | | | | |
| | * | | | | | Merge pull request #242371 from jfly/add-openvpn3-systemd-resolved-supportJanik2023-10-13
| | |\ \ \ \ \ \
| | | * | | | | | nixos/openvpn3: Add support for systemd-resolvedJeremy Fleischman2023-10-13
| | * | | | | | | Merge pull request #258571 from thiagokokada/nixos-rebuild-system-runThiago Kenji Okada2023-10-13
| | |\ \ \ \ \ \ \
| | | * | | | | | | release-notes: document nixos-rebuild changesThiago Kenji Okada2023-10-04
| | * | | | | | | | Merge pull request #260479 from bobby285271/upd/xfce-testBobby Rong2023-10-13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | nixosTests.xfce: Extend the testBobby Rong2023-10-13
| | * | | | | | | | | Merge pull request #260702 from NixOS/projecteur/add-nixos-modulePol Dellaiera2023-10-13
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | nixos/module: add `projecteur`Pol Dellaiera2023-10-12
| | * | | | | | | | | | Merge pull request #259967 from Ma27/nextcloud-cleanupsMaximilian Bosch2023-10-13
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | nixos/nextcloud: update / clean up the nginx configurationMaximilian Bosch2023-10-09
| | | * | | | | | | | | | nixos/nextcloud: drop enableBrokenCiphersForSSEMaximilian Bosch2023-10-09
| | | * | | | | | | | | | nextcloud25: removeMaximilian Bosch2023-10-07
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/staging-next' into stagingAlyssa Ross2023-10-13
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-13
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #260589 from adamcstephens/lxd/udev-triggerMaciej Krüger2023-10-13
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | nixos/lxc-container: enable udev-trigger for nested containersAdam Stephens2023-10-12
* | | | | | | | | | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-13
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-13
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #260600 from Artturin/llvmaddnoteforremovalofextendArtturi2023-10-13
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | llvmPackages: add the removal of `extend` to release-notesArtturin2023-10-12
| | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #258616 from ctron/add-trunk-ngNick Cao2023-10-12
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | trunk-ng: init at 0.17.8Jens Reimann2023-10-12
| * | | | | | | | | | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-13
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | nixos/x11: create xkb option by defaultArtturin2023-10-13
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | |