Commit Graph
100 Commits
Author SHA1 Message Date
Eelco Dolstra 9c53116d49 Revert "nixos: set nixos in nixPath"
This reverts commit 67c8c49177.

'nix run nixos.firefox' is *not* supposed to work - the Nix 2.x
interface attempts to standardize on nixpkgs.*, to get rid of the
nixos/nixpkgs confusion that existed with the channels interface. So
let's not bring that confusion back.
2018-09-24 10:42:01 +02:00
Eelco Dolstra 20c22eb6c5 Merge pull request #47091 from r-ryantm/auto-update/apr
apr: 1.6.3 -> 1.6.5
2018-09-21 12:02:54 +02:00
Eelco Dolstra 869f615ff4 nix: 2.1.1 -> 2.1.2 2018-09-20 00:17:45 +02:00
Eelco Dolstra 1510f324a3 nix: 2.1 -> 2.1.1 2018-09-06 01:12:03 +02:00
Eelco Dolstra b4dd956bb1 Merge pull request #46101 from oxij/pkg/nix-options
nix: fix a tiny option bug, make AWS support optional
2018-09-05 19:57:21 +02:00
Eelco Dolstra b06ad6199f nix.perl-bindings: Fix build 2018-09-03 17:35:39 +02:00
Eelco Dolstra eac06ed070 Manual: Random indentation fixes 2018-09-03 17:13:46 +02:00
Eelco Dolstra 347638ccfe nix: 2.0.4 -> 2.1 2018-09-03 01:37:55 +02:00
Eelco Dolstra c251ec691a virtualization.growPartition -> virtualisation.growPartition
There never was a 'virtualization.growPartition'. This got messed up
in eddf30cc93.

Issue #36590.
2018-08-28 14:24:39 +02:00
Eelco Dolstra beaa0984c6 ilmbase, openexr: 2.2.1 -> 2.3.0 2018-08-24 11:18:02 +02:00
Eelco Dolstra 8ea7ad67fd opencolorio: 1.0.9 -> 1.1.0 2018-08-24 11:17:55 +02:00
Eelco Dolstra df567566b9 Merge pull request #45551 from r-ryantm/auto-update/opensubdiv
opensubdiv: 3.3.2 -> 3.3.3
2018-08-24 11:17:11 +02:00
Eelco Dolstra 4c6aa54f86 nixUnstable: Include a copy of libboost_context
This shaves 47 MiB off the closure size. (libboost_context.so is only
19 KiB.)
2018-08-22 13:22:19 +02:00
Eelco Dolstra c26c7f931a nixUnstable: 2.1pre6338_45bcf541 -> 2.1pre6377_954d1f4d 2018-08-22 13:22:18 +02:00
Eelco Dolstra 490ca6aa8a nix-repl: Remove
This package is obsolete.
2018-08-10 21:48:47 +02:00
Eelco Dolstra f1c978aca0 Revert "aliases: add nixos-rebuild"
This reverts commit 0b124c1e91. We
should really stop adding things that are not packages to
all-packages.nix. For example, having nixos-rebuild.nix in
all-packages.nix causes 'nix-env -qa' to evaluate a NixOS
configuration, which obviously is not good for performance. (We should
probably also remove the 'nixos' attribute from all-packages.nix, but
at least that's a function so nix-env will ignore it.)
2018-08-10 21:45:07 +02:00
Eelco Dolstra 4d1332e507 nixos/modules/misc/version.nix: Don't spam the user with vague warnings 2018-08-10 21:39:36 +02:00
Eelco Dolstra fde7296a47 bintools-wrapper: propagated-build-inputs -> propagated-user-env-packages 2018-08-09 13:07:14 +02:00
Eelco Dolstra fa41297209 Revert "cc-wrapper: propagate man and info to propagated-build-inputs"
This reverts commit 28ad0703f3.
2018-08-09 12:58:16 +02:00
Eelco Dolstra c981787db9 Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"
This reverts commit 02c09e0171.
2018-08-09 12:57:38 +02:00
Eelco Dolstra 7bc2778ebb nixUnstable: 2.1pre6148_a4aac7f -> 2.1pre6338_45bcf541 2018-07-31 21:17:10 +02:00
Eelco Dolstra 14b5d5e93e Revert "release/metrics: drop requiredSystemFeatures"
This reverts commit 1d0caa7b03. Thanks
to @vcunat we have a 'benchmark' machine again!
2018-07-30 10:46:20 +02:00
Eelco Dolstra c9ea04b57f EC2 AMIs: 18.03.131792.becbe4dbe16 -> 18.03.132946.1caae7247b8 2018-07-24 21:19:14 +02:00
Eelco Dolstra b240822cfa create-amis.sh: Change directory for AMIs 2018-07-24 21:19:14 +02:00
Eelco Dolstra c93123afb6 Merge pull request #42937 from gavinrogers/init_holochain
holochain-go: init at 0.1.0-alpha
2018-07-11 17:46:30 +02:00
Eelco Dolstra 92609ec9ae pciutils: 3.5.6 -> 3.6.0 2018-07-09 13:12:59 +02:00
Eelco Dolstra 6978f710da Merge branch 'master' of git://github.com/NixOS/nixpkgs 2018-07-09 12:35:36 +02:00
Eelco Dolstra 323fe3a305 rustc: Disable tests for now 2018-07-09 12:35:01 +02:00
Eelco Dolstra 07933800fb Merge branch 'rustc' of https://github.com/Mic92/nixpkgs 2018-07-09 11:10:12 +02:00
Eelco Dolstra 8d4068d9d1 pkgs/top-level/release.nix: Don't require Darwin to be supported 2018-07-04 17:53:02 +02:00
Eelco Dolstra 67d0a57ef9 pkgs/top-level/release.nix.nix: Use fetchGit if possible 2018-07-04 17:20:54 +02:00
Eelco Dolstra f11f7c1fc0 Merge pull request #43005 from r-ryantm/auto-update/harfbuzz-icu
harfbuzz-icu: 1.8.0 -> 1.8.1
2018-07-04 09:46:13 +02:00
Eelco Dolstra 772eef9168 boost: Disable Python / Numpy support by default
We can't have a C++ library pulling in Numpy and its gazillion
dependencies by default.
2018-07-01 19:13:57 +02:00
Eelco Dolstra a73a941eb4 Merge pull request #42522 from r-ryantm/auto-update/aws-sdk-cpp
aws-sdk-cpp: 1.4.65 -> 1.4.70
2018-06-25 08:24:27 +02:00
Eelco Dolstra bf1c28e978 PULL_REQUEST_TEMPLATE.md: Ask for closure size impact 2018-06-21 18:52:26 +02:00
Eelco Dolstra a63cf9a2db Merge pull request #42035 from r-ryantm/auto-update/aws-sdk-cpp
aws-sdk-cpp: 1.4.60 -> 1.4.65
2018-06-14 22:05:16 +02:00
Eelco Dolstra 47b85dc5ab nix: 2.0.3 -> 2.0.4 2018-05-31 11:31:04 +02:00
Eelco Dolstra 0eea0209cf nix: 2.0.2 -> 2.0.3 2018-05-30 11:47:09 +02:00
Eelco Dolstra 8e7f0bc862 youtube-dl: Disable phantomjs support by default
This caused a massive increase in closure size (217 -> 530 MiB).
2018-05-12 21:46:58 +02:00
Eelco Dolstra 9d0b6b9dfc nix: 2.0.1 -> 2.0.2 2018-05-04 13:28:36 +02:00
Eelco Dolstra 03b36522e7 nix: 2.0 -> 2.0.1 2018-04-20 23:37:18 +02:00
Eelco Dolstra 8787c131ed vmTools: Add crc32c_generic to the initrd
This is necessary due to a e2fsprogs update
(e6114781b0fad5345a2430fac3587d618273bda2) that causes mke2fs to
enable a feature (metadata_csum) that depends on crc32c.

https://hydra.nixos.org/build/72636785
2018-04-10 14:31:05 +02:00
Eelco Dolstra 0236a947d0 mkdir -> install -d
Fixes #38421.
2018-04-04 13:04:35 +02:00
Eelco Dolstra 854e069107 blender: Optionally enable numpy support
This is required by some included addons (such as ANT landscape). Note
that we can't use -DWITH_PYTHON_INSTALL_NUMPY=ON because it's
conditional on -DWITH_PYTHON_INSTALL=ON.
2018-03-30 22:03:40 +02:00
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