Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: da97ba359e5aac17c2a3eab5fd787b169d72dd05
https://github.com/NixOS/nixpkgs/commit/da97ba359e5aac17c2a3eab5fd787b169d72dd05
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-08 (Fri, 08 Jul 2016)
Changed paths:
M pkgs/os-specific/linux/busybox/default.nix
Log Message:
-----------
busybox: set default keymap path
Commit: 5622226d5b3043d5a6239b4c4f28e64fdbbaaba2
https://github.com/NixOS/nixpkgs/commit/5622226d5b3043d5a6239b4c4f28e64fdbbaaba2
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-08 (Fri, 08 Jul 2016)
Changed paths:
M nixos/modules/tasks/kbd.nix
Log Message:
-----------
kbd service: drop a comment now when we do restart vconsole setup
Commit: 803b1eedd65337e18c54d413f4bbbcbcba772e53
https://github.com/NixOS/nixpkgs/commit/803b1eedd65337e18c54d413f4bbbcbcba772e53
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-08 (Fri, 08 Jul 2016)
Changed paths:
M nixos/modules/config/i18n.nix
M nixos/modules/tasks/kbd.nix
Log Message:
-----------
kbd service: add system-wise console resources
Commit: 9e48baa716f17385b4850377f11e16c33d75cac1
https://github.com/NixOS/nixpkgs/commit/9e48baa716f17385b4850377f11e16c33d75cac1
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-08 (Fri, 08 Jul 2016)
Changed paths:
M nixos/modules/tasks/kbd.nix
Log Message:
-----------
kbd service: add support for early loading of fonts and keymaps
Commit: 6e21246dc471a01fe8e8107292b5067234d20595
https://github.com/NixOS/nixpkgs/commit/6e21246dc471a01fe8e8107292b5067234d20595
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M pkgs/os-specific/linux/plymouth/default.nix
Log Message:
-----------
plymouth: 0.9.0 -> 0.9.2
Use system-wide directories for various resources.
Commit: 90ad879753c476154e65667f8dec12cf5a6c89d4
https://github.com/NixOS/nixpkgs/commit/90ad879753c476154e65667f8dec12cf5a6c89d4
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/initrd-ssh.nix
M nixos/modules/system/boot/stage-1-init.sh
Log Message:
-----------
nixos stage-1: unconditionally mount /dev/pts
Commit: bd0ab027c1c83eb7c26ed50bcf0d77da0c31a1d8
https://github.com/NixOS/nixpkgs/commit/bd0ab027c1c83eb7c26ed50bcf0d77da0c31a1d8
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/stage-1.nix
Log Message:
-----------
nixos stage-1: recursively process binaries and libraries
Commit: e02b5ace0b70341647ac464c1b19c2da14068147
https://github.com/NixOS/nixpkgs/commit/e02b5ace0b70341647ac464c1b19c2da14068147
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/stage-1.nix
Log Message:
-----------
nixos stage-1: guard udevRules from extra references
Commit: 3508918da2e9e18640aa12214a54940f9aa70f49
https://github.com/NixOS/nixpkgs/commit/3508918da2e9e18640aa12214a54940f9aa70f49
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/stage-1.nix
Log Message:
-----------
nixos stage-1: replace udevadm in udevRules
Commit: d3e3e643cbcaf423f9595abd0e791cda51dfdc07
https://github.com/NixOS/nixpkgs/commit/d3e3e643cbcaf423f9595abd0e791cda51dfdc07
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/stage-1-init.sh
Log Message:
-----------
nixos stage-1: set extraUtils variable
Commit: a2d4235fe13292c7dce2e71963d0ed0f9c204436
https://github.com/NixOS/nixpkgs/commit/a2d4235fe13292c7dce2e71963d0ed0f9c204436
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/module-list.nix
A nixos/modules/system/boot/plymouth.nix
Log Message:
-----------
plymouth service: init
Commit: c69c76ca7efecba24aba555c2a03f933997d1fd5
https://github.com/NixOS/nixpkgs/commit/c69c76ca7efecba24aba555c2a03f933997d1fd5
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M nixos/modules/system/boot/luksroot.nix
M nixos/modules/system/boot/stage-1-init.sh
Log Message:
-----------
nixos stage-1: try to quit plymouth if started on failure
Commit: 246ad0159fb22b40b13e4feb2c64e727e4f0a984
https://github.com/NixOS/nixpkgs/commit/246ad0159fb22b40b13e4feb2c64e727e4f0a984
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-12 (Tue, 12 Jul 2016)
Changed paths:
M pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
M pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
Log Message:
-----------
gdm: build with plymouth support
Commit: 0172558e8278eda2f08f9fc02ff831538548ced3
https://github.com/NixOS/nixpkgs/commit/0172558e8278eda2f08f9fc02ff831538548ced3
Author: Alexey Shmalko <[email protected]>
Date: 2016-07-13 (Wed, 13 Jul 2016)
Changed paths:
M pkgs/build-support/buildenv/builder.pl
Log Message:
-----------
buildEnv: build the whole tree of directories to pathsToLink
This patch fixes #16614 and #16741.
The first issue was caused by the fact that both `/share` and
`/share/fish/vendor_completions.d` end in the `pathsToLink`. The
`pkgs/build-support/buildenv/builder.pl` creates `/share`, then links
`/share/fish` under `/share` and then tries to create the directory
`/share/fish/vendor_completions.d` and fails because it already exists.
The simplest way to reproduce the issue is to build the next Nix
expression:
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.fish
pkgs.vim
];
pathsToLink = [
"/share"
"/share/fish/vendor_completions.d"
];
}
```
The second issue is more critical and was caused by the fact findFiles
doesn't recurse deep enough. It stops at first unique directory for the
package (e.g., "/share" or even "/") and later the scripts decides it
shouldn't link it as it doesn't match pathsToLink (e.g., "/share/fish"),
so the result is empty.
The test:
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.fish
pkgs.vim
];
pathsToLink = [
"/share/fish/functions"
];
}
```
or
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.vim
];
pathsToLink = [
"/share"
];
}
```
Commit: 1848bfc92d247feff132f92b5580613eec9419d3
https://github.com/NixOS/nixpkgs/commit/1848bfc92d247feff132f92b5580613eec9419d3
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-13 (Wed, 13 Jul 2016)
Changed paths:
M nixos/modules/module-list.nix
M nixos/modules/system/boot/initrd-ssh.nix
M nixos/modules/system/boot/luksroot.nix
A nixos/modules/system/boot/plymouth.nix
M nixos/modules/system/boot/stage-1-init.sh
M nixos/modules/system/boot/stage-1.nix
M pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
M pkgs/desktops/gnome-3/3.20/core/gdm/default.nix
M pkgs/os-specific/linux/plymouth/default.nix
Log Message:
-----------
Merge branch 'plymouth' into staging
Commit: d9aafc885fe9424689ae30b11736b214be3cf9c2
https://github.com/NixOS/nixpkgs/commit/d9aafc885fe9424689ae30b11736b214be3cf9c2
Author: Nikolay Amiantov <[email protected]>
Date: 2016-07-13 (Wed, 13 Jul 2016)
Changed paths:
M nixos/modules/tasks/kbd.nix
M pkgs/os-specific/linux/busybox/default.nix
Log Message:
-----------
Merge branch 'early-kbd' into staging
Compare: https://github.com/NixOS/nixpkgs/compare/f56a319e3ef1...d9aafc885fe9_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
