Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes for various bugs introduced by stdenv update in staging #27522

Merged
merged 79 commits into from Jul 23, 2017
Merged

Fixes for various bugs introduced by stdenv update in staging #27522

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
1cfed62
llvm_4: Fix debugVersion
aherrmann Jun 6, 2017
56743ea
calibre: fix html5lib error
calvertvl Jul 10, 2017
8d9740e
dapp: init at v0.5.2
mbrock Jun 15, 2017
63bb133
journalwatch & journalwatch service: init at 1.1.0
florianjacob Jun 18, 2017
0d06192
breeze-icons: generate icon cache
ttuegel Jul 16, 2017
ce6fe1a
bitlbee: Add optional libpurple dependency
Nadrieril Jul 2, 2017
65e38b7
bitlbee service: Add option to load libpurple plugins into bitlbee
Nadrieril Jul 2, 2017
f74a1e6
Keybase updates
np Jul 16, 2017
ff22d73
solvespace: Fix path in desktop entry file
jfrankenau Jul 17, 2017
567b84d
python.pkgs.pytorch: init at 0.1.12
teh Jul 16, 2017
42cdad0
Merge pull request #27290 from calvertvl/fix_calibre_html5lib
FRidh Jul 17, 2017
0e9676f
imagemagick: 6.9.8-10 -> 6.9.9-0
fpletz Jul 17, 2017
cff27d5
imagemagick7: 7.0.6-0 -> 7.0.6-1
fpletz Jul 17, 2017
8253fc2
pants: 1.2.1 -> 1.3.0
copumpkin Jul 17, 2017
0edae74
gst_all_1.gst-plugins-bad: allow building gtksink plugin
jtojnar Jul 1, 2017
e564f16
corebird: fix video playback
jtojnar Jul 17, 2017
f130ecd
coqPackages.compcert: Recent compcert supports 64-bit architectures
jwiegley Jul 17, 2017
28b7d01
Merge pull request #27005 from jtojnar/fix/corebird-gst
FRidh Jul 17, 2017
24a3188
Merge pull request #27445 from dapphub/dapp
FRidh Jul 17, 2017
960978f
elpa-packages: 2017-07-17
mdorman Jul 12, 2017
5a48826
org-packages: 2017-07-17
mdorman Jul 12, 2017
b8213ab
melpa-stable-packages: 2017-07-17
mdorman Jul 12, 2017
58b269f
melpa-packages: 2017-07-17
mdorman Jul 12, 2017
b4ee24d
pants13-pre: remove from pythonPackages
copumpkin Jul 17, 2017
b8d92a7
programs.gnupg: use extraInit instead of interactiveShellInit
globin Jul 17, 2017
04c944c
Merge pull request #27057 from Nadrieril/bitlbee-libpurple
Mic92 Jul 17, 2017
c4783a9
nginx: add gzip_vary to recommended settings
wmertens Jul 17, 2017
b09d036
Strongswan after network-online instead of network
FPtje Jul 17, 2017
90f0c3b
html-xml-utils: 6.9 → 7.1, macOS support
lukateras Jul 17, 2017
ea81107
Merge pull request #27450 from mdorman/emacs-updates
joachifm Jul 17, 2017
de3b94b
Merge pull request #27454 from yegortimoshenko/patch-5
Mic92 Jul 17, 2017
37c599f
Merge pull request #26429 from aherrmann/pr_llvm_4_fix_debug
LnL7 Jul 17, 2017
dd78249
LTS Haskell 8.23
peti Jul 17, 2017
6de60af
hackage-packages.nix: automatic Haskell package set update
peti Jul 17, 2017
47feb45
haskell-hsyslog: update version override
peti Jul 7, 2017
85a70b5
haskell-hledger-iadd: drop obsolete override (the build fails with or…
peti Jul 11, 2017
6793f27
Merge pull request #27436 from np/keybase-update
aristidb Jul 17, 2017
aa7d840
Merge pull request #27441 from jfrankenau/fix-solvespace
joachifm Jul 17, 2017
ac50c4d
vcsh: Patch for Git 2.13.2
ttuegel Jul 17, 2017
7ba1c7a
iprover: 0.8.1 -> 2.5
gebner Jul 17, 2017
9b0ff95
wireguard: allow not storing private keys in world-readable /nix/stor…
aristidb Jul 17, 2017
46ead28
gnome3.gexiv2: 0.10.4 -> 0.10.6
globin Jul 17, 2017
5442484
Update Mozilla Software Releases sub-key.
nbp Jul 10, 2017
63402a1
alacritty: init at 2017-07-08
Mic92 Apr 1, 2017
66af169
rustRegistry: 2017-06-27 -> 2017-07-17
Mic92 Jul 17, 2017
8b47077
qtox: 1.10.2 -> 1.11.0
peterhoeg Jul 17, 2017
cc8e2ae
expat: 2.2.1 -> 2.2.2
rycee Jul 17, 2017
b4387e7
Add cmakeFlags for auto-type and yubikey (#27321)
billksun Jul 17, 2017
d07bf42
nomad: 0.5.5 -> 0.5.6
hectorj Jul 17, 2017
f59e71e
heroku: mark as broken
FRidh Jul 18, 2017
09bae7c
build-fhs-userenv: Propagate $XAUTHORITY
jameysharp Jul 18, 2017
26f85e4
Merge pull request #27410 from florianjacob/journalwatch
Mic92 Jul 18, 2017
e4af2d6
Merge pull request #27462 from jameysharp/patch-1
Mic92 Jul 18, 2017
17642b5
nix: 1.11.12 -> 1.11.13
edolstra Jul 18, 2017
412bfda
Add file with GCE image locations, similar to ec2-amis.nix. Will be u…
rbvermaa Jul 18, 2017
ec313ab
Add file with Azure image locations, similar to ec2-amis.nix. Will be…
rbvermaa Jul 18, 2017
4154279
zfsUnstable: mark as stable with 4.12
Mic92 Jul 18, 2017
638adf2
iproute: 4.11.0 -> 4.12.0
dezgeg Jul 17, 2017
9ea795c
pv: 1.6.0 -> 1.6.6
dezgeg Jul 17, 2017
27e503f
strace: 4.17 -> 4.18
dezgeg Jul 17, 2017
827b0e1
Merge pull request #27458 from ttuegel/bugfix/kde-icon-cache
Jul 18, 2017
7d010ab
mdadm: unset STRIP
ttuegel Jul 19, 2017
c1c314c
openssh: unset LD
ttuegel Jul 19, 2017
baad413
ppp: fix invalid use of substituteInPlace
ttuegel Jul 19, 2017
c25199f
fetchurl: remove unpaired call to `stopNest'
ttuegel Jul 20, 2017
4a0a066
newt: unset CPP
ttuegel Jul 20, 2017
aa11af8
systemd: fix broken source hash
ttuegel Jul 20, 2017
1577646
libunistring: disable parallel building
ttuegel Jul 21, 2017
631f6b3
systemd: unset RANLIB
ttuegel Jul 21, 2017
20321f6
x264: unset AS
ttuegel Jul 21, 2017
b21defa
zfs: fix invalid use of substituteInPlace
ttuegel Jul 21, 2017
5265d55
grub2: unset CPP
ttuegel Jul 21, 2017
fe80044
qemu: unset CPP
ttuegel Jul 21, 2017
9aa4f09
qt4: unset LD
ttuegel Jul 21, 2017
bec5797
syslinux: fix invalid use of substituteInPlace
ttuegel Jul 21, 2017
6a004bf
Merge branch 'master' into bugfix/staging/stdenv
ttuegel Jul 22, 2017
4b14212
nixos/tests/keymap: use SLIM theme from nixos/tests/slim
ttuegel Jul 22, 2017
4f88cef
jam: unset AR
ttuegel Jul 23, 2017
101e099
argyllcms: unset AR
ttuegel Jul 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions pkgs/build-support/fetchurl/builder.sh
View file
Open in desktop
Expand Up @@ -39,7 +39,6 @@ tryDownload() {
curlexit=$?;
fi
done
stopNest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does anyone know why these were unbalanced to begin with?

}


Expand All @@ -51,7 +50,6 @@ finish() {
fi

runHook postFetch
stopNest
exit 0
}

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/libunistring/default.nix
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@ stdenv.mkDerivation rec {

propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;

enableParallelBuilding = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been having trouble building libunistring on openSUSE using nix, which I only solved by using an overlay that disabled tests for that particular library. It always got stuck in the test-lock test with full CPU usage. Does this solve that particular issue? I think I had the same problem with findutils. Let me see if I can recreate the issue on that particular machine.


configureFlags = [
"--with-libiconv-prefix=${libiconv}"
];
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/libraries/newt/default.nix
View file
Open in desktop
Expand Up @@ -16,6 +16,12 @@ stdenv.mkDerivation rec {

NIX_LDFLAGS = "-lncurses";

preConfigure = ''
# If CPP is set explicitly, configure and make will not agree about which
# programs to use at different stages.
unset CPP
'';

crossAttrs = {
makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}";
};
Expand Down
1 change: 1 addition & 0 deletions pkgs/os-specific/linux/mdadm/default.nix
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
makeFlags = [
"NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
"MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
"STRIP="
] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [
"CROSS_COMPILE=${stdenv.cc.prefix}"
];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/systemd/default.nix
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "nixos";
repo = "systemd";
rev = "ba777535a890c2a2b7677dfacc63e12c578b9b3f";
sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rja1lbh4nkl5mcwpa";
sha256 = "1vb45fbqkrgczfwkb0y07ldnwhjqk2sh446hzfkdn8hrwl1lifg5";
};

outputs = [ "out" "lib" "man" "dev" ];
Expand Down
6 changes: 6 additions & 0 deletions pkgs/tools/networking/openssh/default.nix
View file
Open in desktop
Expand Up @@ -60,6 +60,12 @@ stdenv.mkDerivation rec {
++ optional withKerberos kerberos
++ optional hpnSupport autoreconfHook;

preConfigure = ''
# Setting LD causes `configure' and `make' to disagree about which linker
# to use: `configure' wants `gcc', but `make' wants `ld'.
unset LD
'';

# I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building.
configureFlags = [
Expand Down
4 changes: 3 additions & 1 deletion pkgs/tools/networking/ppp/default.nix
View file
Open in desktop
Expand Up @@ -34,7 +34,9 @@ stdenv.mkDerivation rec {
'';

postFixup = ''
substituteInPlace $out/bin/{pon,poff,plog} --replace "/usr/sbin" "$out/bin"
for tgt in pon poff plog; do
substituteInPlace "$out/bin/$tgt" --replace "/usr/sbin" "$out/bin"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know what the underlying error is here (I'll find it if you don't off-hand)? I didn't intend to change the interface of substituteInPlace so I should fix that rather than this package need be changed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK, substituteInPlace has never accepted multiple targets. At least, that is not the documented behavior. I don't know how this ever worked!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whew! :)

done
'';

meta = {
Expand Down