about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2021-02-04Merge branch 'staging-next' into stagingJan Tojnar1-4/+6
2021-02-03Revert "nixos/kernel.nix: ensure same kernel is used"Ben Wolsieffer1-4/+6
2021-02-04Merge staging-next into staginggithub-actions[bot]4-0/+14
2021-02-03nixos/top-level: add specialisation.<name>.configuration typeFritz Otlinghaus1-0/+1
2021-02-03nixos/oauth2_proxy: add extraConfig typeScriptkiddi1-0/+1
2021-02-03nixos/resilio: add sharedFolders typeFritz Otlinghaus1-0/+1
2021-02-03Merge pull request #110512 from neosimsim/agda-dont-install-EverythingAnderson Torres1-0/+7
2021-02-03Merge pull request #110501 from neosimsim/agda-ghc-ieee754Anderson Torres1-0/+4
2021-02-03Merge staging-next into staginggithub-actions[bot]2-34/+0
2021-02-03scala: Replace VM test with installCheckPhaseTim Steinbach2-34/+0
2021-02-03Merge staging-next into staginggithub-actions[bot]2-10/+11
2021-02-03zfs: fix invalid package referencesJörg Thalheim1-3/+3
2021-02-03nixos/zfs: fix reference to awkJörg Thalheim1-1/+1
2021-02-03nixos/pykms: fix launcherPeter Hoeg1-6/+7
2021-02-03Merge staging-next into staginggithub-actions[bot]2-0/+179
2021-02-02Merge pull request #109414 from rgrunbla/galeneSandro2-0/+179
2021-02-02Merge branch 'staging-next' into stagingJan Tojnar2-2/+6
2021-02-02Merge pull request #111153 from helsinki-systems/hadoopSandro1-0/+4
2021-02-02Merge #111495: nixosTests.installer: Increase memory for the VMVladimír Čunát1-2/+2
2021-02-02Merge staging-next into staginggithub-actions[bot]3-54/+60
2021-02-02Merge pull request #111591 from Mic92/zfs-kubeJörg Thalheim3-54/+60
2021-02-02Merge staging-next into staginggithub-actions[bot]1-0/+3
2021-02-01Merge pull request #111435 from helsinki-systems/sabnzbdSandro1-0/+3
2021-02-01Merge staging-next into staginggithub-actions[bot]7-5/+86
2021-02-01Merge pull request #111583 from mikroskeem/more-docker-fixesRobert Hensing1-0/+1
2021-02-01Merge pull request #111505 from lopsided98/buildbot-python-packages-typeJörg Thalheim1-2/+2
2021-02-01nixos/lxd: refactor to use zfs.package/enabled propertyJörg Thalheim2-19/+7
2021-02-01nixos/kubernetes: add zfs to pathJörg Thalheim1-1/+11
2021-02-01nixos/zfs: expose enabled optionJörg Thalheim1-6/+12
2021-02-01nixos/zfs: expose zfs package as readonly attributeJörg Thalheim1-28/+30
2021-02-01Revert "nixos/hoogle: add type"Fritz Otlinghaus1-1/+0
2021-02-01Merge pull request #111519 from siraben/xdg-utils-namingJan Tojnar1-1/+1
2021-02-01docker: fix socket activation raceMark Vainomaa1-0/+1
2021-02-01Revert "nixos/xmonad: add haskellPackages type"Fritz Otlinghaus1-1/+0
2021-02-01nixos/hddtemp: add support for HDD/SSD temperature montoringPeter Hoeg2-0/+82
2021-02-01Merge staging-next into staginggithub-actions[bot]5-0/+265
2021-02-01Merge pull request #111422 from helsinki-systems/mysqlBackupSandro1-0/+4
2021-02-01Merge pull request #111427 from helsinki-systems/postgresqlSandro1-0/+3
2021-02-01nixos/bee-clef: init at 0.4.7Attila Lendvai2-0/+108
2021-02-01nixos/bee: init at 0.4.2Attila Lendvai2-0/+150
2021-02-01treewide: xdg_utils -> xdg-utilsBen Siraphob1-1/+1
2021-02-01Merge staging-next into staginggithub-actions[bot]1-1/+1
2021-01-31nixos/buildbot: fix type for pythonPackagesBen Wolsieffer1-1/+1
2021-01-31nixos/buildbot: add lopsided98 as maintainerBen Wolsieffer1-1/+1
2021-01-31nixosTests.installer: Increase memory allocated to the VMAnders Kaseorg1-2/+2
2021-01-31Merge staging-next into staginggithub-actions[bot]31-5/+125
2021-01-31nginx module: fix typo in proxyWebsockets descriptionLuflosi1-1/+1
2021-01-31Merge pull request #111438 from helsinki-systems/synergySandro1-0/+5
2021-01-31nixos/tests: add kernel-latest-ath-user-regdVincent Haupert2-0/+18
2021-01-31Merge pull request #111461 from helsinki-systems/xenSandro1-1/+4