Commit Graph
100 Commits
Author SHA1 Message Date
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
Eelco Dolstra bcd382f032 tribler: 7.0.0-beta -> 7.0.0-rc2
Also, fix the xcb plugin error
(https://github.com/NixOS/nixpkgs/issues/24256) and add service-identity which is a required dependency now.
2017-09-10 12:07:24 +02:00
Eelco Dolstra 79c9adce65 nifskope: Fix build
https://hydra.nixos.org/build/60608938
2017-09-10 10:56:35 +02:00
Eelco Dolstra 0061fae2e6 genericBuild: Communicate the current build phase to Nix
This allows the progress bar to show e.g.

  [1/9/59 built] building bison-3.0.4 (configurePhase): checking for strdup... yes
2017-09-07 22:24:27 +02:00
Eelco Dolstra 6b3cef2246 Remove tracePhases
This has not been used in a long time.
2017-09-07 22:15:37 +02:00
Eelco Dolstra ec8d41f08c Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
This reverts commit 0a944b345e, reversing
changes made to 61733ed6cc.

I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
Eelco Dolstra 24646266bb Set ownership of CODEOWNERS 2017-09-07 12:19:54 +02:00
Eelco Dolstra adb8a0a7e1 Change owner of stdenv and lib 2017-09-07 12:17:36 +02:00
Eelco Dolstra a602e1aa70 pythonPackages.libarchive-c: Disable failing test
https://github.com/NixOS/nixpkgs/commit/f9f9749fd2a7b75bea9660a60634965de98bac88#commitcomment-24028305
(cherry picked from commit 22d4630e683b9e0fddf34fdc276fc08014e4ae61)
2017-09-07 09:28:03 +02:00
Eelco Dolstra 79954b9d1f nix: 1.11.13 -> 1.11.14 2017-08-31 11:00:09 +02:00
Eelco Dolstra 9eb901b70d Merge remote-tracking branch 'origin/gcc-6' into staging 2017-08-14 11:38:00 +02:00
Eelco Dolstra 9bcee1051a strigi: Build on gcc 6
https://hydra.nixos.org/build/56882669
2017-07-31 11:09:33 +02:00
Eelco Dolstra cc9bfd2cf8 elfutils: Respect $NIX_DEBUG_INFO_DIRS
This makes eu-stack and eu-addr2line do the right thing in a
nix-shell (if the appropriate debug outputs are present).
2017-07-28 16:38:26 +02:00
Eelco Dolstra 340bd1ed2e elfutils: 0.168 -> 0.169 2017-07-28 16:38:26 +02:00
Eelco Dolstra 5c5b71df5e Add a setup hook to fill NIX_DEBUG_INFO_DIRS
This setup hook is propagated by gdb. Thus, a typical use is:

  $ nix-shell -p gdb nix nix.debug sqlite.debug ...

and gdb will be able find the debug symbols of nix etc. automatically.
2017-07-28 16:38:26 +02:00
Eelco Dolstra 5b09152898 gdb: Look for .build-id files in NIX_DEBUG_INFO_DIRS
This allows us to provide a setup hook that makes debug outputs
findable by gdb.
2017-07-28 16:38:22 +02:00
Eelco Dolstra 63d7b6ee29 makeImageFromDebDist: Add extraDebs arguments
This allows adding packages that are not part of the distribution, e.g.g

  extraDebs = [
    (pkgs.fetchurl {
      name = "openjdk.deb";
      url = http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u111-b14-3~14.04.1_amd64.deb;
      sha256 = "1n5ibpkx9pjmc4nr052rls1yqbq7ckav2rabixjhd4yxbyhjl0ap";
    })
  ];
2017-07-27 20:34:24 +02:00
Eelco Dolstra a7c8f5e419 debian: 8.8 -> 8.9 2017-07-26 20:02:17 +02:00
Eelco Dolstra 61764cbba4 Revert "docbook-xsl: Install dbtoepub"
This reverts commit 4e32f5bda3.

IMHO, it's not desirable to make docbook-xsl (and by extension a
gazillion packages that depend on it) pull in Ruby. (For example, I
just noticed that wget depends on ruby now...)
2017-07-26 11:35:03 +02:00
Eelco Dolstra 47821f1cf0 cc-wrapper: More quadratic performance fixes
This eliminates the slow lookup of whether we've already seen an rpath
/ library path entry.

Issue #27609.
2017-07-25 18:46:49 +02:00
Eelco Dolstra 70d4d22806 cc-wrapper: Add a "man" output
... and propagate cc.man from there.
2017-07-25 16:12:58 +02:00
Eelco Dolstra b9c403c531 stdenvLinux: Remove bootstrapTools from closure
The "expand-response-params" program had an unnecessary reference to
bootstrapTools, bloating the closure from 205 to 314 MiB.
2017-07-25 14:21:17 +02:00
Eelco Dolstra ecaef62bd9 cdrdao: Fix build on gcc 6
http://hydra.nixos.org/build/56889707
2017-07-25 12:01:38 +02:00
Eelco Dolstra dac08b2a98 clucene-core: Fix build on gcc 6
http://hydra.nixos.org/build/56895322
2017-07-25 11:55:50 +02:00
Eelco Dolstra d65e528a37 Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-24 18:27:24 +02:00
Eelco Dolstra aa4a92d2df cc-wrapper/ld-wrapper: Minor speedup in string concatenation
There is still a O(n) pattern match in ld-wrapper, so we should
probably rewrite that code to use associative arrays.
2017-07-24 14:48:26 +02:00
Eelco Dolstra 6669a3b477 stdenv: Remove log nesting
Nix/Hydra no longer support pretty printing of logs, so this is no
longer useful.
2017-07-24 14:30:46 +02:00
Eelco Dolstra 9f345ce2c7 gnumake41: Remove unused version 2017-07-24 14:27:12 +02:00
Eelco Dolstra 8cfe77444b gnumake40: Remove unused version 2017-07-24 14:27:11 +02:00
Eelco Dolstra 969d7b0451 gnumake380: Remove
This hasn't been used in a long time.
2017-07-24 14:27:11 +02:00
Eelco Dolstra 91dc811566 diffoscope: Move all required tools into pythonPath
Alternative fix for #27534 that prevents the use of a double wrapper
(creating even uglier script names than usual, like
..diffoscope-wrapped-wrapped).

This was my bad in 96d7f35e96.
2017-07-21 15:15:12 +02:00
Eelco Dolstra 3e68facc72 Revert "diffoscope: wrap executable and include tools in PATH"
This reverts commit 23ad77b998.

Double wrapper scripts considered harmful.
2017-07-21 15:15:04 +02:00
Eelco Dolstra 8a31137441 nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55 2017-07-21 12:52:57 +02:00
Eelco Dolstra a13802b2c8 Merge remote-tracking branch 'origin/master' into gcc-6 2017-07-21 11:05:58 +02:00
Eelco Dolstra 17642b5fd0 nix: 1.11.12 -> 1.11.13 2017-07-18 10:54:01 +02:00
Eelco Dolstra 40cf34aaae nix: 1.11.11 -> 1.11.12 2017-07-13 16:37:11 +02:00
Eelco Dolstra 88d9d2de5b Use LLVM 4 on all platforms 2017-07-12 19:08:56 +02:00
Eelco Dolstra 222c2b34d9 apr-util: 1.5.4 -> 1.6.0 2017-07-12 16:43:03 +02:00
Eelco Dolstra 770b2b6912 apr: 1.5.2 -> 1.6.2 2017-07-12 16:43:02 +02:00
Eelco Dolstra 7b52b0c067 youtube-dl: 2017.06.18 -> 2017.07.09 2017-07-09 21:23:13 +02:00
Eelco Dolstra 8fc5beb855 httpd: 2.4.25 -> 2.4.26
CVE-2017-3167, CVE-2017-3169, CVE-2017-7659, CVE-2017-7668,  CVE-2017-7679
2017-07-07 17:24:13 +02:00
Eelco Dolstra 707703185d nixos-rebuild: Respect empty NIX_REMOTE
Fixes #11384.

Note: in Nix 1.12, you can set NIX_REMOTE to "local" to avoid
ambiguity.
2017-07-07 11:58:10 +02:00
Eelco Dolstra 942422a646 Merge branch 'glibc' of https://github.com/rnhmjoj/nixpkgs into staging 2017-07-06 15:14:57 +02:00
Eelco Dolstra c23dcd72a0 Enable some more debug info 2017-07-05 16:04:54 +02:00
Eelco Dolstra 07176ed6f1 gcc: 6.3.0 -> 6.4.0 2017-07-04 18:39:18 +02:00