about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Rename linuxManualConfig to buildLinuxShea Levy2014-01-21
| | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* Whitespace to force a buildShea Levy2014-01-19
| | | | | | Ugh Signed-off-by: Shea Levy <shea@shealevy.com>
* Merge pull request #1536 from Shados/service-havegedDomen Kožar2014-01-18
|\ | | | | Adds a service for haveged, the entropy daemon
| * Adds a service for haveged, the entropy daemonAlexei Robyn2014-01-17
| | | | | | | | | | | | Includes configuration option for the threshold beneath which to refill the entropy pool - defaults to 1024 bits as this is the number used in other distro's existing service files I looked at.
* | kmscon: Don't re-run systemd-vconsole-setup after boot, and let tty1 wait ↵Shea Levy2014-01-18
| | | | | | | | | | | | for vconsole setup Signed-off-by: Shea Levy <shea@shealevy.com>
* | systemd: Enable specifying extra config files for a unitShea Levy2014-01-18
| | | | | | | | | | | | | | This will allow overriding package-provided units, or overriding only a specific instance of a unit template. Signed-off-by: Shea Levy <shea@shealevy.com>
* | Whitespace to force a rebuildShea Levy2014-01-17
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | Merge branch 'xprofile' of git://github.com/pSub/nixpkgs into masterShea Levy2014-01-17
|\ \ | |/ |/| | | | | | | Allow the user to execute commands at the beginning of the X session. Signed-off-by: Shea Levy <shea@shealevy.com>
| * Allow the user to execute commands at the beginning of the X session.Pascal Wittmann2014-01-02
| | | | | | | | | | | | The difference between xsession and xprofile is that xsession is exec'd and xprofile is sourced. So with xprofile all commands after sourcing will still be exectued. This allows for instance autostarting of applications while configuring the start of a window manager via configuration.nix.
* | Fix environment.etc settingShea Levy2014-01-15
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | Fix typoShea Levy2014-01-15
| | | | | | | | | | | | Thanks to @bennofs for pointing it out Signed-off-by: Shea Levy <shea@shealevy.com>
* | Don't restart kmscon VTs if the unit changesShea Levy2014-01-15
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | Option description formattingShea Levy2014-01-15
| | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | nixos: Split mesa setup from xserver.nixShea Levy2014-01-15
| | | | | | | | | | | | | | With kmscon, it is now possible to have a system without X that still needs the mesa setup in /run/opengl-driver Signed-off-by: Shea Levy <shea@shealevy.com>
* | Add module to use kmscon instead of linux-console for VTsShea Levy2014-01-15
| | | | | | | | | | | | | | | | | | | | This required some changes to systemd unit handling: * Add an option to specify that a unit is just a symlink * Allow specified units to overwrite systemd-provided ones * Have gettys.target require autovt@1.service instead of getty@1.service Signed-off-by: Shea Levy <shea@shealevy.com>
* | Adds kippo SSH honeypotThomas Bereknyei2014-01-14
| |
* | Merge branch 'java'Eelco Dolstra2014-01-13
|\ \
| * | Don't set $TZEelco Dolstra2014-01-06
| | | | | | | | | | | | | | | | | | | | | Now that Java is happy with our /etc/localtime, there is no reason to set $TZ anymore. (See 945849b86fe33474da569b307d7e5880877491b6, 279248f6c562eb88227d22b824c9324683980b96, 1b5e860f65607b4cc7de4b6b5db95460cf144526.) Fixes #1463.
| * | Make /etc/localtime a direct symlink to the zoneinfo fileEelco Dolstra2014-01-06
| | | | | | | | | | | | | | | | | | | | | Some programs (notably the Java Runtime Environment) expect to be able to extract the name of the time zone from the target of the /etc/localtime symlink. That doesn't work if /etc/localtime is a symlink to /etc/static/localtime. So make it a direct symlink.
* | | xfce: add xfce screenshooterJaka Hudoklin2014-01-13
| | |
* | | nixos/cgminer: fix restarts, set uidJaka Hudoklin2014-01-13
| | |
* | | services.postgresql: Hint to use mkForce for authenticationOliver Charles2014-01-11
| | | | | | | | | | | | This fixes #1395
* | | connman-vpn and connman-vpn dbus servise should start after connman serviceRok Garbas2014-01-11
| | |
* | | connman: new packages ConnMan v1.20 and connman-uiMatej Cotman2014-01-11
| | |
* | | gummiboot module: Don't use obsolete environment.nix optionShea Levy2014-01-05
| | | | | | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | | Fix extra kernelDev referenceShea Levy2014-01-05
| | | | | | | | | | | | Signed-off-by: Shea Levy <shea@shealevy.com>
* | | Merge branch 'merge-kernel-builds' into upstream-masterShea Levy2014-01-05
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a second attempt at unifying the generic and manual-config kernel builds (see #412 for the last time). The set of working kernel packages is a superset of those that work on master, and as the only objection last time was the size of the $dev closure and now both $out and $dev combined are 20M smaller than $out on master (see message for ac2035287fbec30d92165fd3839d1bf71b8edd47), this should be unobjectionable. Signed-off-by: Shea Levy <shea@shealevy.com>
| * | Update and fix kernel packages to new kernel buildShea Levy2014-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, this just meant changing kernelDev (now removed from linuxPackagesFor) to kernel.dev. Some packages needed more work (though whether that was because of my changes or because they were already broken, I'm not sure). Specifics: * psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that were already there * blcr builds on 3.4 but not 3.10, as noted in comments that were already there * open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on 3.4 or 3.10 on this branch or on master, so they're marked broken * A version-specific kernelHeaders package was added The following packages were removed: * atheros/madwifi is superceded by official ath*k modules * aufs is no longer used by any of our kernels * broadcom-sta v6 (which was already packaged) replaces broadcom-sta * exmap has not been updated since 2011 and doesn't build * iscis-target has not been updated since 2010 and doesn't build * iwlwifi is part of mainline now and doesn't build * nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build Everything not specifically mentioned above builds successfully on 3.10. I haven't yet tested on 3.4, but will before opening a pull request. Signed-off-by: Shea Levy <shea@shealevy.com>
* | | networkmanager: register PPTP serviceThomas Tuegel2014-01-02
| |/ |/|
* | network-interfaces: Add the ability to create bond devicesWilliam A. Kennington III2013-12-31
|/ | | | | | | | This patch adds support for the creations of new bond devices, aggregate pipes of physical devices for extra throughput or failover. Additionally, add better correction at the startup of a bridge of vlan interface (delete old, stale interfaces).
* Merge pull request #1430 from wkennington/mtuMathijs Kwik2013-12-30
|\ | | | | network-interfaces: Add mtu setting support
| * network-interfaces: Add mtu setting supportWilliam A. Kennington III2013-12-30
| | | | | | | | | | Adds a setting to the network interface configuration for changing the mtu for each specified interface.
* | Merge pull request #1431 from wkennington/vlanMathijs Kwik2013-12-30
|\ \ | | | | | | network-interfaces: Add support for creating vlans
| * | network-interfaces: Add support for creating vlansWilliam A. Kennington III2013-12-29
| |/ | | | | | | | | This patch adds support for vlan creation at machine startup, so that we can adjust interface settings for vlan devices using nix.
* | services.redshift: Start after display-manager.service.Moritz Ulrich2013-12-29
| | | | | | | | Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
* | services.redshift: Enable auto-restart.Moritz Ulrich2013-12-29
|/ | | | | | | | The redshift service stops working after some time (the program exits after some hours/days). It looks like these exits are related to calls to xrandr (for multiple displays) or suspend-to-ram. Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
* Fixed a code typo in the documentationGeorges Dubus2013-12-29
|
* windowManager.xmonad: Make it configurable and extensible.Moritz Ulrich2013-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #1366 The previous windowManager.xmonad option only starts xmonad and doesn't make ghc available. This assumes that the user has GHC with access to the xmonad package in his PATH when using xmonad. Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE} environment variables which define the path to either ghc or xmessage. These are set automatically when using xmonad through windowManager.xmonad. My (or specific: @aristidb and my) changes make it possible to use Xmonad without adding GHC to any profile. This is useful if you want to add a different GHC to your profile. This commit introduces some options: - xmonad.haskellPackages: Controls which Haskell package set & GHC set is used to (re)build Xmonad - xmonad.extraPackages: Function returning a list of additional packages to make available to GHC when rebuilding Xmonad - xmonad.enableContribExtras: Boolean option to build xmonadContrib and xmonadExtras. Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
* Merge x-updatesVladimír Čunát2013-12-25
|\
| * Merge master into x-updatesVladimír Čunát2013-12-23
| |\
| * \ Merge master into x-updatesVladimír Čunát2013-12-21
| |\ \
| * \ \ Merge master into x-updatesVladimír Čunát2013-12-18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix
| * \ \ \ Merge master into x-updatesVladimír Čunát2013-12-10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (simple): pkgs/top-level/all-packages.nix
| * \ \ \ \ Merge branch 'master' into x-updatesVladimír Čunát2013-12-07
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix
| * \ \ \ \ \ Merge master into x-updatesVladimír Čunát2013-12-02
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch master into x-updatesVladimír Čunát2013-11-23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix
| * | | | | | | | xfce4notifyd: minor update, add to the default installationVladimír Čunát2013-11-18
| | | | | | | | |
* | | | | | | | | nixos: don't white-list port 8200 in the firewall when minidlna is enabledPeter Simons2013-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you want minidla to accept connections from the rest of the world, please add networking.firewall.allowedTCPPorts = [ 8200 ]; networking.firewall.allowedUDPPorts = [ 1900 ]; to /etc/nixos/configuration.nix. See <http://lists.science.uu.nl/pipermail/nix-dev/2013-November/011997.html> for the discussion that lead to this.
* | | | | | | | | nixos: don't white-list port 5900 in the firewall when x11vnc is enabledPeter Simons2013-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you want x11vnc to receive TCP connections from the rest of the world, please add networking.firewall.allowedTCPPorts = [ 5900 ]; to /etc/nixos/configuration.nix. See <http://lists.science.uu.nl/pipermail/nix-dev/2013-November/011997.html> for the discussion that lead to this.
* | | | | | | | | nixos: don't white-list port 631 in the firewall when CUPS is enabledPeter Simons2013-12-23
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you want CUPS to receive UDP printer announcements from the rest of the world, please add networking.firewall.allowedUDPPorts = [ 631 ]; to /etc/nixos/configuration.nix. See <http://lists.science.uu.nl/pipermail/nix-dev/2013-November/011997.html> for the discussion that lead to this.