summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into staginggithub-actions[bot]2023-10-16
|\
| * Merge master into staging-nextgithub-actions[bot]2023-10-16
| |\
| | * nixos/librenms: add nixos testJennifer Graul2023-10-16
| | * nixos/librenms: initJennifer Graul2023-10-16
| | * nixos/tang: create module for tang server (#247037)Jean-François Roche2023-10-16
| | * Merge pull request #261259 from totoroot/google-cloud-bigtable-tool-0.12.0Janik2023-10-16
| | |\
| | | * google-cloud-sql-proxy: rename from cloud-sql-proxyMatthias Thym2023-10-15
| * | | Merge remote-tracking branch 'origin/master' into staging-nextAlyssa Ross2023-10-16
| |\| |
| | * | tests/ferretdb: initJulien Malka2023-10-16
| | * | nixos/ferretdb: initJulien Malka2023-10-16
| | * | nixosTests.buildbot: fix impure evaluationzowoq2023-10-16
| | * | Merge pull request #260687 from mkg20001/lxd-uiMaciej Krüger2023-10-16
| | |\ \
| | | * | nixos/lxd: fix ui.enable descMaciej Krüger2023-10-12
* | | | | Merge staging-next into staginggithub-actions[bot]2023-10-16
|\| | | |
| * | | | Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2023-10-15
| |\| | |
| | * | | nixos/peering-manager: add scheduled tasksYureka2023-10-15
| | * | | Merge pull request #258695 from Majiir/fix-networkd-defaultgatewayMaximilian Bosch2023-10-15
| | |\ \ \
| | | * | | nixos/network-interfaces-systemd: require defaultGateway.interfaceMajiir Paktu2023-10-07
| | | * | | nixos/network-interfaces-systemd: support defaultGateway.interfaceMajiir Paktu2023-10-07
| | | * | | nixos/test-instrumentation: fix unsetting of defaultGatewayMajiir Paktu2023-10-07
| | * | | | nixos/firefox-syncserver: fix and update the docs and options descriptionsVojtěch Káně2023-10-15
| | * | | | Merge pull request #260306 from doronbehar/nixos/syncthing-many-devicesLassulus2023-10-15
| | |\ \ \ \
| | | * | | | nixos/syncthing: get API key for every curl requestDoron Behar2023-10-15
| | | * | | | nixosTests.syncthing-many-devices: initDoron Behar2023-10-15
| | * | | | | nixos/release: fixup evaluation of tested job (firefox)Vladimír Čunát2023-10-15
* | | | | | | Merge staging-next into staginggithub-actions[bot]2023-10-15
|\| | | | | |
| * | | | | | Merge master into staging-nextgithub-actions[bot]2023-10-15
| |\| | | | |
| | * | | | | Merge pull request #259075 from schuelermine/patch/nixos/modules/nano/syntaxH...Artturi2023-10-15
| | |\ \ \ \ \
| | | * | | | | nixos/nano: enable syntaxHighlight by defaultAnselm Schüler2023-10-05
| | | * | | | | nixos/nano: include extra syntax highlight files when syntaxHighlight is trueAnselm Schüler2023-10-05
| | * | | | | | Merge pull request #259918 from kidonng/patch-3Artturi2023-10-15
| | |\ \ \ \ \ \
| | | * | | | | | nixos/system-path: remove nano from defaultPackages descriptionKid2023-10-09
| | * | | | | | | Merge pull request #261074 from erdnaxe/prom-fixesWeijia Wang2023-10-15
| | |\ \ \ \ \ \ \
| | | * | | | | | | nixos/prometheus: fix cross-compilationAlexandre Iooss2023-10-14
| | * | | | | | | | Merge pull request #259619 from Majiir/fix-networkd-dhcpMaximilian Bosch2023-10-14
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | nixos/network-interfaces-systemd: fix DHCP settingMajiir Paktu2023-10-14
* | | | | | | | | | | 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