Commit Graph
100 Commits
Author SHA1 Message Date
Eelco Dolstra 7b539c0629 Fix typo 2018-03-22 13:57:41 +01:00
Eelco Dolstra 7db841512a Remove obsolete /nix/var/nix/{manifests,channel-cache} 2018-03-20 18:26:13 +01:00
Eelco Dolstra 7e44f19fce zstd: Fix install name on macOS
It had an install name '/usr/local/lib/libzstd.1.dylib'.
2018-03-20 13:43:02 +01:00
Eelco Dolstra 1deb779a7a nixUnstable: Point to Nix 2.0 2018-03-07 10:31:09 +01:00
Eelco Dolstra 165b32d386 Revert "makeInitrd: Use closureInfo"
This reverts commit 776a5e6ebf.

Fixes #36268.
2018-03-05 12:49:59 +01:00
Eelco Dolstra 9f4b1ee686 blender: 2.79 -> 2.79a 2018-03-01 19:53:34 +01:00
Eelco Dolstra ceb0a28e8c Don't try hashed mirrors in the installer test 2018-02-27 20:30:06 +01:00
Eelco Dolstra 9fc786c3a4 Create /home with the right permissions
Without this, it will be created with 700 permissions.
2018-02-27 20:28:49 +01:00
Eelco Dolstra 9e8cf40c7e nixos/tests/installer.nix: Don't use a writable store
This is no longer needed.
2018-02-27 20:22:14 +01:00
Eelco Dolstra 84f93dd07a nixos-install: Create /root/.nix-defexpr
This was previously done by nixos-prepare-root.
2018-02-27 20:21:23 +01:00
Eelco Dolstra b14d9e1568 Add jq to the installation media
This is required by closureInfo.
2018-02-27 20:20:37 +01:00
Eelco Dolstra 0867f303bd Add the boot test to release-small.nix 2018-02-27 20:09:07 +01:00
Eelco Dolstra 212dd84dd2 Cleanup 2018-02-27 20:03:12 +01:00
Eelco Dolstra 0d00215880 Cleanup 2018-02-27 19:59:26 +01:00
Eelco Dolstra cc2eeef4ab Fix installing the Nixpkgs channel on the installation media
And test that it got installed correctly.
2018-02-27 19:58:23 +01:00
Eelco Dolstra 776a5e6ebf makeInitrd: Use closureInfo 2018-02-23 16:41:31 +01:00
Eelco Dolstra d12c9911df Merge remote-tracking branch 'origin/master' into nix-2.0 2018-02-22 17:28:51 +01:00
Eelco Dolstra fab12188b8 Doh 2018-02-22 17:26:52 +01:00
Eelco Dolstra bae19ef9f6 Doh 2018-02-22 17:20:59 +01:00
Eelco Dolstra 32af695a22 nix: 1.11.16 -> 2.0 2018-02-22 17:03:27 +01:00
Eelco Dolstra 8d490ca993 libseccomp: Use multiple outputs 2018-02-22 15:15:55 +01:00
Eelco Dolstra f67b2512aa libatomic_ops: Use multiple outputs 2018-02-22 15:15:42 +01:00
Eelco Dolstra 6bc889205a sshd: Remove UsePrivilegeSeparation option
This option is deprecated, see https://www.openssh.com/txt/release-7.5.
2018-02-08 13:32:55 +01:00
Eelco Dolstra 847ea13be3 Doh 2018-02-07 19:47:03 +01:00
Eelco Dolstra 0f5d5970b2 nixos-prepare-root: Remove
This is no longer needed thanks to Nix 2.0 magic.
2018-02-07 19:39:14 +01:00
Eelco Dolstra 9802da517f make-disk-image.nix: Use nixos-install again
Since nixos-install doesn't require any special privileges anymore,
this Just Works. No more need for fakeroot / nixos-prepare-root.
2018-02-07 19:39:13 +01:00
Eelco Dolstra 5d8860b919 nixos-install: Accept --substituters
This is useful in tests where we don't have network access. Passing
--substituters "" prevents wasting time by checking cache.nixos.org.
2018-02-07 19:39:13 +01:00
Eelco Dolstra f64a4af328 Fix comments 2018-02-07 19:32:41 +01:00
Eelco Dolstra e76849dca2 nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca 2018-02-07 19:32:12 +01:00
Eelco Dolstra 598a3f5b30 nixos-install: Create /etc 2018-02-07 19:10:13 +01:00
Eelco Dolstra 6daad9b3c5 nixos-install: Fix --closure 2018-02-07 18:22:05 +01:00
Eelco Dolstra da702a4034 nixos-enter: Don't require root
Of course, you'll get a bunch of warnings from the activation script:

  $ nixos-enter --root /tmp/mnt/
  setting up /etc...
  mount: /dev: permission denied.
  mount: /dev/pts: permission denied.
  mount: /dev/shm: permission denied.
  mount: /sys: permission denied.
  /nix/var/nix/profiles/system/activate: line 74: /proc/sys/kernel/modprobe: Permission denied
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/dbus-daemon-launch-helper': Invalid argument
  NOTE: Under Linux, effective file capabilities must either be empty, or
        exactly match the union of selected permitted and inheritable bits.
  Failed to set capabilities on file `/run/wrappers/wrappers.0pKlU8JsvV/ping' (Operation not permitted)
  chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/unix_chkpwd': Invalid argument

  [root@nixos:/]#
2018-02-07 17:59:04 +01:00
Eelco Dolstra 16bdaf3d03 Remove creation of /dev/{fd,stdin,stdout,stderr}
This is already provided by devtmpfs.
2018-02-07 17:58:21 +01:00
Eelco Dolstra bb030ece3b nixos-enter: Check whether --root denotes a NixOS installation 2018-02-07 17:23:05 +01:00
Eelco Dolstra f0979ca30e nixos-install: Don't require root
E.g.

  nixos-install --root /tmp/mnt/ --no-bootloader --no-root-passwd

now works for non-root users.
2018-02-07 17:20:26 +01:00
Eelco Dolstra df117acab7 ISO images: Initialize the Nix database with correct NAR hashes/sizes
The boot test now runs "nix verify" to ensure that all hashes are
correct.
2018-02-07 16:54:23 +01:00
Eelco Dolstra 5193807750 VM tests: Initialize the Nix database with correct NAR hashes/sizes 2018-02-07 15:49:02 +01:00
Eelco Dolstra cc0caac098 Move creation of /root to the activation script
...so it appears in a new installation before rebooting the system.
2018-02-05 22:12:18 +01:00
Eelco Dolstra c08e4b9102 boost: Don't store absolute path in #line
This causes packages to have boost.dev in their runtime closures, via
assertion messages.

Fixes #34462.
2018-02-05 21:56:43 +01:00
Eelco Dolstra f9e64dbe76 nixos-enter: Don't mount special filesystems
The activation script already does this.
2018-02-05 21:05:02 +01:00
Eelco Dolstra 1346923ffa modprobe activation: Order after specialfs
It requires the existence of /proc.
2018-02-05 21:04:40 +01:00
Eelco Dolstra e88f28965a nixos-install: Make compatible with Nix 2.0
The use of Nix 2.0 significantly simplifies the installer, since we
can just pass a different store URI (--store /mnt) - it's no longer
needed to set up a chroot environment for the build, and to bootstrap
Nix into the chroot.

Also, commands that need to run in the installation (namely boot
loader installation and setting a root password) are now executed
using nixos-enter.

This also removes the need for nixos-prepare-root since any required
initialisation is done by Nix or by the activation script.
2018-02-05 19:50:36 +01:00
Eelco Dolstra 60cb23001a Add a "nixos-enter" command
This factors out the functionality in nixos-install for running a
command inside a NixOS installation (nixos-install --chroot).
2018-02-05 19:41:54 +01:00
Eelco Dolstra 294a4e6ea5 Use nixUnstable as the default temporarily 2018-02-05 13:49:24 +01:00
Eelco Dolstra 700e21d6da nix-daemon.nix: Updates for Nix 2.0
* The environment variables NIX_CONF_DIR, NIX_BUILD_HOOK and
  NIX_REMOTE are no longer needed.

* A /bin/sh (from busybox) is provided by default in sandboxes.

* Various options were renamed.
2018-01-31 22:26:05 +01:00
Eelco Dolstra 75a20284f4 nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731 2018-01-31 22:24:50 +01:00
Eelco Dolstra ef351646ba Revert "Restore "nixUnstable: rename to nix-unstable""
This reverts commit 695027f61c.

We really can't have "nix-env -i nix" *not* upgrade nixUnstable to a
newer nixStable. For instance, it would cause "nix upgrade-nix" to
produce a user environment with collisions.
2018-01-31 22:24:24 +01:00
Eelco Dolstra 6060a6dd22 CODEOWNERS cleanup
I haven't worked on stdenv etc. in a long time.
2018-01-19 18:41:32 +01:00
Eelco Dolstra 77225a5a95 Revert "fetchFromGitHub: Revert to the original version"
This reverts commit 3d5391c256.
2018-01-19 18:32:51 +01:00
Eelco Dolstra 3d5391c256 fetchFromGitHub: Revert to the original version
fetchFromGitHub was intended as a simple wrapper around the common
pattern 'fetchzip { url =
https://github.com/${owner}/${repo}/archive/${rev}.zip"; ... }'. It
was not intended to handle private repositories, submodules, other
sites than github.com (!), etc. In particular, we don't want to use
fetchgit because it's not reproducible.
2018-01-19 15:54:33 +01:00
Eelco Dolstra dddcd10ecc Don't set 'config.xorg = {}'
This makes memoization of Nixpkgs evaluation less effective, since
some Nixpkgs invocations may have 'config = {}' while others may have
'config = { xorg = {}; }'.

Instead set 'config = {}'.
2018-01-11 19:31:05 +01:00
Eelco Dolstra 6bbd67d45a EC2 AMIs: 17.09.2356.cb751f9b1c3 -> 17.09.2681.59661f21be6 2018-01-10 13:16:49 +01:00
Eelco Dolstra 19eb5d6c27 linux: 4.9.74 -> 4.9.75 2018-01-05 16:28:08 +01:00
Eelco Dolstra 1b0f696d10 Fix copy-tarballs.pl 2018-01-04 18:15:20 +01:00
Eelco Dolstra e4beb97b9c brotli: Use multiple outputs 2018-01-02 12:00:39 +01:00
Eelco Dolstra eaf2877cd8 Finance::Quote: 1.38 -> 1.47 2017-12-29 20:56:47 +01:00
Eelco Dolstra 014800706a create-amis.sh: Ass eu-west-3 2017-12-20 16:35:22 +01:00
Eelco Dolstra 3c82e6fc82 Add AMI for eu-west-3 2017-12-20 16:19:33 +01:00
Eelco Dolstra 3430b0e859 aws-sdk-cpp: 1.1.18 -> 1.3.22 2017-12-14 15:53:55 +01:00
Eelco Dolstra e4847b797e Update NixOS 17.09 AMIs
This adds support for c5.* instances.

Fixes #32612.
2017-12-13 23:42:09 +01:00
Eelco Dolstra 875eaf0821 nix: 1.11.15 -> 1.11.16 2017-12-12 17:46:21 +01:00
Eelco Dolstra 2d4fdc1b9e debian: 8.9 -> 8.10 2017-12-12 13:14:17 +01:00
Eelco Dolstra 0e58684c41 nixUnstable: Remove unused dependencies 2017-12-08 16:01:06 +01:00
Eelco Dolstra 5c5223d46b make-tarball.nix: Fix <nixpkgs> check
This was broken by 6bcf194449, which
caused the result of the check to be ignored (since xargs will return
a non-zero exit status if *any* grep doesn't find a match).
2017-12-07 16:00:09 +01:00
Eelco Dolstra 3d5828ebed releaseTools.sourceTarball: Clean up temporary files 2017-11-21 19:45:20 +01:00
Eelco Dolstra 9f74cf3e12 vm: Create /dev/full
https://hydra.nixos.org/build/64519371
2017-11-21 18:25:50 +01:00
Eelco Dolstra 1a7dc1f86b perlPackages::Filelchown: Init at 0.02 2017-11-11 14:13:52 +01:00
Eelco Dolstra ff1d281e55 perlPackages.LWPAuthenOAuth: Init at 1.02 2017-11-11 14:13:48 +01:00
Eelco Dolstra 54da9cc944 Amazon image: Add NVMe support to the initrd
This is required by the new c5.* instance types.

Note that this changes disk names from /dev/xvd* to
/dev/nvme0n*. Amazon Linux has a udev rule that calls a Python script
named "ec2nvme-nsid" to create compatibility symlinks. We could use
that, but it would mean adding Python to the AMI closure...
2017-11-09 17:53:26 +01:00
Eelco Dolstra d2df286df7 nixUnstable: nix-1.12pre5663_c7af84ce -> nix-1.12pre5732_fd10f6f2 2017-11-07 12:25:17 +01:00
Eelco Dolstra 20bb7d5373 krita: 3.2.1 -> 3.3.2 2017-11-05 13:48:19 +01:00
Eelco Dolstra c3255fe8ec fetchzip and friends: Set "name" to "source" by default
This makes them produce the same store paths as builtins.fetchgit,
builtins.fetchTarball etc. See
https://github.com/NixOS/nix/commit/65b5f177b5fbb1b0778ede047a13a3cee9c59cfe.
2017-10-30 17:17:07 +01:00
Eelco Dolstra 8f349a3bf3 Add function closureInfo to replace pathsFromGraph
Unlike pathsFromGraph, on Nix 1.12, this function produces a
registration file containing correct NAR hash/size information.

https://hydra.nixos.org/build/62832723
2017-10-25 15:38:14 +02:00
Eelco Dolstra 5939af52b3 pathsFromGraph: Remove obsolete printManifest feature 2017-10-25 15:38:11 +02:00
Eelco Dolstra db8a4a4ef5 nixUnstable: 1.12pre5619_346aeee1 -> 1.12pre5639_fda7b95c 2017-10-11 14:18:05 +02:00
Eelco Dolstra 67c3eab348 linux: 4.9.53 -> 4.9.54 2017-10-10 12:41:50 +02:00
Eelco Dolstra 9df79de1a1 Enable command-not-found
5a5db609e5 disabled it by default, which
may have been unintentional. mkEnableOption considered harmful.
2017-10-10 12:26:24 +02:00
Eelco Dolstra 30a1b94926 gdb: Remove --with-separate-debug-dir
We don't need this anymore since NixOS now sets $NIX_DEBUG_INFO_DIRS.
2017-10-10 12:05:00 +02:00
Eelco Dolstra ee9a15b323 Set $NIX_DEBUG_INFO_DIRS when environment.enableDebugInfo is enabled
This allows it to co-exist with other debug info directories, such as
the one used by dwarffs
(https://github.com/edolstra/dwarffs/blob/master/module.nix).
2017-10-10 12:04:57 +02:00
Eelco Dolstra 9b3aa19a88 Add NixOS 17.09 AMIs
Fixes #29976.
2017-10-03 16:56:59 +02:00
Eelco Dolstra 6c72efe0ba Don't generate instance-store AMIs
These are obsolete, use EBS AMIs instead.
2017-09-28 17:33:13 +02:00
Eelco Dolstra ba22ad45fe ibus-wrapper: Fix build 2017-09-27 20:28:13 +02:00
Eelco Dolstra 3378dbbeed Revert "Revert "ibus: Move ibus-setup to .dev""
This reverts commit e0771a2410.
2017-09-27 20:28:13 +02:00
Eelco Dolstra 79d547b4bb nix-daemon: Bump the default number of build users
While it's annoying to pollute the user database with a lot of nixbld*
users, 10 users is really too low for many modern systems.
2017-09-27 17:13:16 +02:00
Eelco Dolstra 28299f669a Add even more dev outputs 2017-09-27 12:08:48 +02:00
Eelco Dolstra 65b04b8bef network-manager-applet: Don't depend on webkitgtk by default
This added significant bloat to non-Gnome systems.
2017-09-27 12:08:33 +02:00
Eelco Dolstra af44f99dca ibus: Move ibus-setup to .dev
This removes python3.buildEnv from the runtime closure.
2017-09-26 23:14:39 +02:00
Eelco Dolstra c03326445b firefox: Remove about:buildconfig
Storing the build configuration caused Firefox to retain a dependency
on gcc, glibc.dev and icu4c.dev.

This reduces the size of the firefox closure from 587 to 415 MiB.
2017-09-26 23:14:35 +02:00
Eelco Dolstra 8ccce8de89 Add more dev outputs 2017-09-25 19:52:10 +02:00
Eelco Dolstra cf599d3f99 emacs: Clear the environment while dumping
This reduces the closure size of Emacs from 575 to 279 MiB. Dumping
Emacs had a chance of leaking parts of the environment (such as $PATH)
into the dumped executable. This hopefully fixes it. (It's a bit hard
to tell since the effect is not deterministic.)
2017-09-25 19:38:44 +02:00
Eelco Dolstra 60aaced9a0 Add some dev outputs 2017-09-25 16:05:10 +02:00
Eelco Dolstra b0280f598e postgresql: Add dev output
This reduces the closure size of postgresql.out by 72 MiB.
2017-09-25 16:04:39 +02:00
Eelco Dolstra b790a31204 kdoctools: Move bin stuff to the "out" output
In particular, this moves share/kf5 to the "out" output. This prevents
kdelibs4support from pulling kdoctools.dev into its closure (via
share/kf5/kdoctools/customization/dtd/kdex.dtd, which references
${kdoctools}/share/kf5).

This reduces the closure size of kdelibs4support by 156 MiB.
2017-09-25 16:04:32 +02:00
Eelco Dolstra afc0218ecd blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
2017-09-16 22:45:22 +02:00
Eelco Dolstra bb1c9b027d cudatoolkit: Move libcudart to a separate output
This prevents opensubdiv (and thus blender) from having all of
cudatoolkit in its closure.
2017-09-16 22:45:14 +02:00
Eelco Dolstra 63f3b35204 opencollada: 1.3 -> 1.6.59 2017-09-16 22:44:39 +02:00
Eelco Dolstra 9f740f1f7c openimage: 1.7.12 -> 1.7.17 2017-09-16 22:44:35 +02:00
Eelco Dolstra 6dad1f70ce nix: 1.11.14 -> 1.11.15 2017-09-15 16:38:33 +02:00
Eelco Dolstra b86fd340f0 nixUnstable: 1.12pre5511_c94f3d55 -> 1.12pre5619_346aeee1 2017-09-15 11:27:32 +02:00
Eelco Dolstra e3b562e0e2 blender: 2.78c -> 2.79 2017-09-13 09:54:42 +02:00