summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2015-02-20bridge-utils: align attrname with pkgnameBjørn Forsman3-5/+5
2015-02-20Enhance stage-1/2 scripts for better dealing with squashfsThomas Strobel2-2/+7
2015-02-20Merge pull request #5704 from eduarrrd/nixos-versionPeter Simons2-2/+10
2015-02-20Merge branch 'grub' of git://github.com/ts468/nixpkgsShea Levy1-1/+1
2015-02-20exim: add version 4.85 incl. nixos moduletv3-0/+114
2015-02-19Fix grub 1 installShea Levy1-1/+3
2015-02-19In a test VM it's impossible to connect to itself, so fix thisSander van der Burg1-1/+1
2015-02-19Add options to support signed binary cachesEelco Dolstra1-0/+33
2015-02-19Merge pull request #6452 from rushmorem/update-chronos-portJaka Hudoklin1-1/+1
2015-02-19Add marathon mesos frameworkrushmorem3-0/+60
2015-02-19Update chronos default portrushmorem1-1/+1
2015-02-18Blacklist the nouveau driver on EC2Eelco Dolstra1-0/+4
2015-02-18Merge pull request #6427 from grwlf/vsftpd-portSou Bunnbu1-0/+5
2015-02-18vsftpd.nix: add 'portPromiscuous' optionSergey Mironov1-0/+5
2015-02-17nixos/wpa_supplicant: fix conflicting documentationMathijs Kwik1-3/+7
2015-02-16Merge pull request #5995 from ts468/qemu-vmJames Cook1-19/+70
2015-02-16Fix grubTarget on nodev installsThomas Strobel1-1/+1
2015-02-16Update QEMU Nixos Virtual MachineThomas Strobel1-19/+70
2015-02-16azure: add a job to download ssh host and root keys if they are made availabl...Evgeny Egorochkin1-9/+48
2015-02-16Automatically set nix.nrBuildUsers to at least nix.maxJobsEelco Dolstra1-9/+5
2015-02-16Merge pull request #6357 from NixOS/jobs-vs-usersWout Mertens1-1/+6
2015-02-16Move amazon option out of amazon-image.nix, needed to make ec2.hvm usable fro...Rob Vermaas3-12/+17
2015-02-15/etc/ssl/certs/ca-bundle.crt -> ca-certificates.crtEelco Dolstra1-6/+7
2015-02-15Provide symlinks to ca-bundle.crt for compat with other distrosEelco Dolstra1-12/+20
2015-02-15Sawfish (git): New PackageAndersonTorres2-0/+29
2015-02-15nix-daemon: Sanity check maxJobs vs nrBuildUsersWout Mertens1-1/+6
2015-02-14Merge pull request #5665 from joachifm/dnscrypt-proxy-apparmor-updatesJames Cook1-2/+7
2015-02-13nixos/tests/installer: Add all bootloaders to the storeWilliam A. Kennington III1-2/+6
2015-02-13grub: Don't remove zfs support if contained in the default binaryWilliam A. Kennington III1-2/+3
2015-02-13iwlegacy: Remove since it is already in linux-firmware-nonfreeWilliam A. Kennington III1-1/+0
2015-02-13stage-1-init: fix PID 1 shellHarald van Dijk1-1/+1
2015-02-13Merge pull request #6312 from k0ral/sslhlethalman1-3/+9
2015-02-13Add hid_lenovo to initrd kernel modulesDomen Kožar1-1/+1
2015-02-12Merge pull request #6317 from offlinehacker/nixos/consul/alertsJaka Hudoklin1-0/+46
2015-02-12nixos/tests: Fix installer test by providing a missing dependencyWilliam A. Kennington III1-0/+1
2015-02-12nixos/consul: add consul-alerts serviceJaka Hudoklin1-0/+46
2015-02-12Merge pull request #6222 from offlinehacker/limesurveyJaka Hudoklin1-0/+196
2015-02-12Drop tests.installer.grub1 as release criticalEelco Dolstra1-1/+0
2015-02-12sslh: added libwrap support + improved nixos module.koral1-3/+9
2015-02-11nixos/zfs: Use the git version for kernels unsupported by 0.6.3William A. Kennington III1-1/+2
2015-02-11Revert "Merge pull request #5626 from matthiasbeyer/add-fish_shell_module"Luca Bruno1-115/+0
2015-02-11Revert "Add fish to nixos module list"Luca Bruno1-1/+0
2015-02-11Add fish to nixos module listLuca Bruno1-0/+1
2015-02-11Merge pull request #5626 from matthiasbeyer/add-fish_shell_modulelethalman1-0/+115
2015-02-11gnome3: Set XCURSOR_PATH. Closes #6191Luca Bruno2-0/+5
2015-02-10nixos/tests/jenkins: increase timeout to 6 minutesBjørn Forsman1-1/+1
2015-02-10Merge pull request #6278 from bendlas/cdemulethalman2-0/+50
2015-02-10Move cdemu module into programsHerwig Hochleitner2-3/+3
2015-02-10Merge pull request #6072 from AndersonTorres/window-managerslethalman1-14/+14
2015-02-10Whitespace cleanupHerwig Hochleitner1-8/+8