diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index ce78bda85051..825b0de45b7e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -239,6 +239,296 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; Hercules CI Agent is a specialized build agent for projects built with Nix. See the options and setup. + + + ./hardware/wooting.nix + + + + + ./hardware/uinput.nix + + + + + ./hardware/video/hidpi.nix + + + + + ./hardware/xpadneo.nix + + + + + ./programs/hamster.nix + + + + + ./programs/steam.nix + + + + + ./security/tpm2.nix + + + + + ./services/cluster/k3s/default.nix + + + + + ./services/computing/foldingathome/client.nix + + + + + ./services/computing/torque/mom.nix + + + + + ./services/computing/torque/server.nix + + + + + ./services/desktops/espanso.nix + + + + + ./services/desktops/malcontent.nix + + + + + ./services/development/jupyterhub/default.nix + + + + + ./services/games/teeworlds.nix + + + + + ./services/hardware/xow.nix + + + + + ./services/misc/ankisyncd.nix + + + + + ./services/misc/bazarr.nix + + + + + ./services/misc/matrix-appservice-discord.nix + + + + + ./services/misc/mautrix-telegram.nix + + + + + ./services/misc/pinnwand.nix + + + + + ./services/misc/zigbee2mqtt.nix + + + + + ./services/monitoring/tuptime.nix + + + + + ./services/networking/biboumi.nix + + + + + ./services/networking/blockbook-frontend.nix + + + + + ./services/networking/ncdns.nix + + + + + ./services/networking/ergo.nix + + + + + ./services/networking/go-neb.nix + + + + + ./services/networking/jicofo.nix + + + + + ./services/networking/jitsi-videobridge.nix + + + + + ./services/networking/magic-wormhole-mailbox-server.nix + + + + + ./services/networking/mullvad-vpn.nix + + + + + ./services/networking/nextdns.nix + + + + + ./services/networking/nix-store-gcs-proxy.nix + + + + + ./services/networking/onedrive.nix + + + + + ./services/networking/pixiecore.nix + + + + + ./services/networking/quorum.nix + + + + + ./services/networking/robustirc-bridge.nix + + + + + ./services/networking/smartdns.nix + + + + + ./services/networking/wasabibackend.nix + + + + + ./services/security/privacyidea.nix + + + + + ./services/security/yubikey-agent.nix + + + + + ./services/torrent/rtorrent.nix + + + + + ./services/wayland/cage.nix + + + + + ./services/video/mirakurun.nix + + + + + ./services/web-apps/convos.nix + + + + + ./services/web-apps/engelsystem.nix + + + + + ./services/web-apps/gerrit.nix + + + + + ./services/web-apps/jirafeau.nix + + + + + ./services/web-apps/jitsi-meet.nix + + + + + ./services/web-apps/sogo.nix + + + + + ./services/web-apps/rss-bridge.nix + + + + + ./services/web-servers/molly-brown.nix + + + + + ./services/x11/urserver.nix + + + + + ./system/boot/initrd-openvpn.nix + + + + + ./virtualisation/nixos-containers.nix + + + + + ./virtualisation/oci-containers.nix + + + + + ./virtualisation/podman.nix + + diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index a6fffb76f6e8..c2e25278d7a2 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -76,7 +76,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = "https://nixos.org/channels/nixos-unstable"; + default = "https://nixos.org/channels/nixos-20.09"; description = "Default NixOS channel to which the root user is subscribed."; }; diff --git a/nixos/release.nix b/nixos/release.nix index 1f5c15812695..c329c740b619 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -12,7 +12,7 @@ let version = fileContents ../.version; versionSuffix = - (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; + (if stableBranch then "." else "alpha") + "${toString (nixpkgs.revCount - 242760)}.${nixpkgs.shortRev}"; # Run the tests for each platform. You can run a test by doing # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,