| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
In 8d76eff, @Ericson2314 changed the representation of the value that
`findInputs` generated from a whitespace-separated bunch strings to an
actual array of strings.
Expressions that *consume* that value, however, also needed to be
changed to iterate over all the contents of the array, else they would
only select the first value, which turns out to be somewhat limiting.
Fixes #27873
|
| |\ |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
As described in https://github.com/NixOS/nixpkgs/issues/18461, MacOS no
longer accepts dylibs which only reexport other dylibs, because their
symbol tables are empty. To get around this, we define an object file
with a single "private extern" symbol, which hopefully won't clobber
anything.
|
| | | |
|
| | |
| |
| |
| |
| | |
Probably best to override Haskell packages set, or anything else
linking a lot of libraries, with this.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The image json is not exactly the same as the layer json, therefore I
changed the implementation to use the `baseJson` which doesn’t include
layer specific details like `id`, `size` or the checksum of the layer.
Also the `history` entry was missing in the image json. I’m not totally
sure if this field is required, but a I got an error from a docker
registry when I’ve tried to receive the distribution manifest of an
image without those `history` entry:
GET: `http://<registry-host>/v2/<imageName>/manifests/<imageTag>`
```json
{
"errors": [
{
"code": "MANIFEST_INVALID",
"message": "manifest invalid",
"detail": {}
}
]
}
```
I’ve also used a while loop to iterate over all layers which should make
sure that the order of the layers is correct. Previously `find` was
used and I’m not sure if the order was always correct.
|
| | |
| |
| |
| |
| |
| |
| |
| | |
If the base image has been built with nixpkgs.dockerTools, the image
configuration and manifest are readonly so we first need to change
their permissions before removing them.
Fix #27632.
|
| |\ \ |
|
| | |\ \ |
|
| | |\ \ \ |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
pkgs/build-support/cc-wrapper/default.nix
pkgs/build-support/gcc-wrapper-old/builder.sh
pkgs/build-support/trivial-builders.nix
pkgs/desktops/kde-4.14/kde-package/default.nix
pkgs/development/compilers/openjdk-darwin/8.nix
pkgs/development/compilers/openjdk-darwin/default.nix
pkgs/development/compilers/openjdk/7.nix
pkgs/development/compilers/openjdk/8.nix
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
pkgs/development/compilers/zulu/default.nix
pkgs/development/haskell-modules/generic-builder.nix
pkgs/misc/misc.nix
pkgs/stdenv/generic/builder.sh
pkgs/stdenv/generic/setup.sh
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is a temporary measure until this impurity is removed from Nix.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This eliminates the slow lookup of whether we've already seen an rpath
/ library path entry.
Issue #27609.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There is still a O(n) pattern match in ld-wrapper, so we should
probably rewrite that code to use associative arrays.
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fixes #27406.
Commit 5d4efb2c816d2143f29cad8153faad1686557b2a added an assertion to `stopNest'
which requires it be correctly paired with `startNest'. `fetchurl' calls
`stopNest', but never calls `startNest'; the former calls are removed.
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | | |
buildenv: read propagated-user-env-packages line-by-line
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Since 3cb745d5a69018829ac15f7d5a508135f6bda123, the format of
propagated-user-env-packages has changed and propagated packages have not been
included by buildenv, including in the system environment.
The buildenv builder is modified to read propagated-user-env-packages
line-by-line, instead of expecting all packages on one line.
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | | |
cc-wrapper: Always export environment variables for binutils
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
While this requires newer bash, stdenv's setup.sh now does across the
board anyways. This way is more concise.
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Before, this only happened when cross compiling.
|
| | |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Besides deduplicating overlapping logic, clear warning messages were
added for:
- No glob/path for dynamic linker provided (use default glob)
- Glob did not expand to anything (don't append flag)
- glob expanded to multiple things (take first, like before)
|
| |\ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|/ /
|/| | | | | | | | | |
fetchbower: handle packages with slashes in their name
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Packages from github repos have slashes in their name. Nix store names
shouldn't have slashes.
Fixes rvl/bower2nix#13
|
| | |_|_|_|_|_|_|/ /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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.
|
| | |_|_|_|_|_|_|/
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
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";
})
];
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is required to push images to the Docker registry v2.
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Elements in images tar.gz generated by docker don't start by './'.
|
| | | | | | | | |
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | | |
Fix #27632.
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The docker loading (docker 1.12.6) of an image with uppercase in the
name fails with the following message:
invalid reference format: repository name must be lowercase
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.
This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123.
[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | | |
https://github.com/obsidiansystems/nixpkgs
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Paired with @Ericson2314
|
| | |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The `DISPLAY` environment variable is propagated into chroots built with
`buildFHSUserEnv`, but currently the `XAUTHORITY` variable is not. When
the latter is set, its value is usually necessary in order to connect to
the X server identified by the former.
This matters for users running gdm3, for example, who have `XAUTHORITY`
set to something like `/run/user/1000/gdm/Xauthority` instead of the X
default of `~/.Xauthority`, which doesn't exist in that setup.
Fixes #21532.
|
| |\ \ \ \
| |_|_|/
|/| | | |
docker-tools: set user/group when creating a pure layer
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | | |
make-autostartitem: Use the right path for storing the desktop files
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The freedesktop specification says that the autostart folder is located at $XDG_CONFIG_DIRS/autostart.
Nixos defines XDG_CONFIG_DIRS as /etc/xdg. So we need to copy the desktop files into the right folder
with make-startupitem.
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge staging. It includes fixes for cc-wrapper parsing speed and
some other minor things.
http://hydra.nixos.org/eval/1375094
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.
Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.
Two misc notes:
- `propagated-user-env-packages` also needed to be adjusted as
sometimes it is copied to/from the propagated input files.
- `local fd` should ensure that file descriptors aren't clobbered
during recursion.
|
| |/ / / / |
|