summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge #8363: pure-darwin stdenvVladimír Čunát2015-06-18
|\
| * nixos/nix-serve: Run as a separate user and add a signing key parameterWilliam A. Kennington III2015-06-17
| |
* | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-17
|\|
| * nixos/install-grub: Fix grub1 installationWilliam A. Kennington III2015-06-17
| |
| * Replaces https://github.com/NixOS/nixpkgs/pull/8368rushmorem2015-06-17
| |
| * Revert "Make it possible to boot NixOS from a SCSI Disk on KVM"Rushmore Mushambi2015-06-17
| |
| * Make it possible to boot NixOS from a SCSI Disk on KVMrushmorem2015-06-17
| | | | | | | | | | | | Currently NixOS can't boot from a SCSI disk as a KVM Guest. I found this out while installing it on the new [Linode KVM platform](https://www.linode.com/docs/platform/kvm#custom-kernel-configuration).
| * Installer test: Fix booting from SCSIEelco Dolstra2015-06-17
| | | | | | | | This is required by the GRUB 1 test.
| * Bypass /etc/gdm/Xsession. Closes #8351Luca Bruno2015-06-16
| |
| * Merge pull request #8159 from cransom/dd-agentlethalman2015-06-15
| |\ | | | | | | Allow custom tags to be set for datadog monitoring
| | * Allow custom tags to be set for datadog monitoringCasey Ransom2015-06-15
| | |
| * | Some more type cleanupEelco Dolstra2015-06-15
| | |
| * | types.uniq types.str -> types.strEelco Dolstra2015-06-15
| | |
| * | types.uniq types.int -> types.intEelco Dolstra2015-06-15
| | | | | | | | | | | | types.int already implies uniqueness.
| * | types.uniq types.bool -> types.boolEelco Dolstra2015-06-15
| | |
| * | "types.uniq types.string" -> "types.str"Eelco Dolstra2015-06-15
| | |
* | | Merge branch 'master' into stagingLuca Bruno2015-06-15
|\| |
| * | nixos: move environment.{variables => sessionVariables}.MODULE_DIRBjørn Forsman2015-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves the problem that modprobe does not know about $MODULE_DIR when run via sudo, and instead wrongly tries to read /lib/modules/: $ sudo strace -efile modprobe foo |& grep modules open("/lib/modules/3.14.37/modules.softdep", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.dep.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) open("/lib/modules/3.14.37/modules.alias.bin", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory) Without this patch, one would have to use sudo -E (preserves environment vars). But that option is reserved for sudo users with extra rights (SETENV), so it's not a solution. environment.sessionVariables are set by PAM, so they are included in the environment used by sudo.
| * | Merge pull request #8322 from unaizalakain/masterDomen Kožar2015-06-14
| |\ \ | | | | | | | | The user specified in the conf should run MPD
| | * | The user specified in the conf should run MPDUnai Zalakain2015-06-13
| | | |
| * | | Factor the NixOS channel building code out into its own file, so I can use ↵Dan Peebles2015-06-13
| | | | | | | | | | | | | | | | it elsewhere
| * | | Use the right nix when doing things in our amazoninitDan Peebles2015-06-13
| |/ /
| * | Allow setting mediatomb interfaceOliver Matthews2015-06-13
| | |
| * | Merge branch 'nixos-subdir'Luca Bruno2015-06-13
| |\ \ | | | | | | | | | | | | | | | | Conflicts: nixos/modules/system/boot/loader/grub/grub.nix
| | * | stage-1: mkdir -p /mnt-root, it may be created earlier by some hooksLuca Bruno2015-06-13
| | | |
| | * | nixos/grub: allow customization of the nix store pathLuca Bruno2015-06-13
| | | |
* | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-12
|\| | |
| * | | apache-kafka: Enable overriding the kafka packageShea Levy2015-06-12
| | | |
| * | | Put dysnomia in system environment if Disnix is enabledSander van der Burg2015-06-12
| | | |
| * | | Merge pull request #8182 from ttuegel/openblasThomas Tuegel2015-06-12
| |\ \ \ | | | | | | | | | | Numerical computing overhaul
| | * | | Update release notes about OpenBLASThomas Tuegel2015-06-12
| | | | |
| * | | | Revert "Use nixUnstable by default"Eelco Dolstra2015-06-12
| | | | | | | | | | | | | | | | | | | | This reverts commit 64a41b7a90bd99f532847ef1b6ad3c3c6a2a7120.
| * | | | nixos: set high fs.inotify.max_user_watches when xserver is enabledLuca Bruno2015-06-12
| | | | |
| * | | | Fix: xen-bridge systemd serviceThomas Strobel2015-06-12
| | | | |
| * | | | Link Xen scripts to /etc/xenThomas Strobel2015-06-12
| | | | |
| * | | | Initial attempt at configuring from EC2 userdata (with input from cstrahan). ↵Dan Peebles2015-06-11
| | | | | | | | | | | | | | | | | | | | Now with VM tests!
| * | | | Simple EC2 user-data VM testDan Peebles2015-06-11
| | | | |
| * | | | nixos/pulseaudio: Fix descriptionWilliam A. Kennington III2015-06-11
| | | | |
| * | | | Revert "Drop tests.installer.grub1 as release critical"Eelco Dolstra2015-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1907ca8a2aaa51d3e6910bb086dd75efffa81a6b. See https://github.com/NixOS/nixpkgs/commit/1907ca8a2aaa51d3e6910bb086dd75efffa81a6b#commitcomment-9719007
| * | | | scollector: Change type of collectors to allow proper mergingRickard Nilsson2015-06-11
| | | | |
| * | | | nixos/grub: Support labeling efi bootloaders with independent id'sWilliam A. Kennington III2015-06-10
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2015-06-11
|\| | | |
| * | | | nixos/grub: Prevent module errors and make gfxmode configurableWilliam A. Kennington III2015-06-10
| | | | |
| * | | | pulseaudio: Add a flag for supporting 32-bitWilliam A. Kennington III2015-06-10
| | | | |
| * | | | Merge pull request #8204 from copumpkin/modulesPathDaniel Peebles2015-06-10
| |\ \ \ \ | | | | | | | | | | | | An importable modulesPath, once again
| | * | | | Bring an importable modulesPath back from the dead, in the only way I knowDan Peebles2015-06-08
| | | | | |
| * | | | | Make the boot test release-criticalEelco Dolstra2015-06-10
| | | | | |
| * | | | | Installer test: Remove apparently useless setting of nix.readOnlyStoreEelco Dolstra2015-06-10
| | | | | |
| * | | | | Installer tests: Don't use the ISOEelco Dolstra2015-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have separate tests for checking whether the ISO boots correctly, so it's not necessary to do that here. So now tests/installer.nix just tests nixos-install, from a regular NixOS VM that uses the host's Nix store. This makes running the tests more convenient because we don't have to build a new ISO after every change.
| * | | | | Move stuff to modules/profiles/installation-device.nixEelco Dolstra2015-06-10
| | | | | |