| 25 Oct 2021 |
 Ryan Burns | the bootstrap script has too many dang dependencies to work during stdenv bootstrap | 21:26:18 |
| Ryan Burns | and fwiw peertube fails to build on my machine too | 21:26:53 |
 Vladimír Čunát | Oh, right, I forgot this autotools risk. | 21:27:05 |
| Vladimír Čunát | But perhaps it will suffice to replace coreutils only in the final build. | 21:28:15 |
| Vladimír Čunát | ... in which case the bootstrapping problems shouldn't apply. | 21:28:37 |
| Vladimír Čunát | (and moreover the bisection would be way faster) | 21:29:01 |
 das_j | I'll try to take a look at building coreutils from a git checkout without being part of stdenv tomorrow | 21:52:56 |
| das_j | (it's about 🕛 here, just for reference) | 21:53:20 |
| Vladimír Čunát | (Same time-zone for me.) | 22:04:17 |
| 26 Oct 2021 |
|  @grahamc:nixos.orgchanged room power levels. | 01:19:47 |
|  NixOS Moderation Bot changed their display name from mjolnir to NixOS Moderation Bot. | 02:00:15 |
| NixOS Moderation Bot set a profile picture. | 02:00:32 |
| NixOS Moderation Bot changed their profile picture. | 02:23:47 |
| NixOS Moderation Bot changed their profile picture. | 02:33:17 |
| Vladimír Čunát | In reply to @vcunat:matrix.org
And there are other matters like master not evaluating on Hydra for days. Resolved now 🎉 | 07:41:22 |
| das_j | diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 16f3e4c721f..1a170a1946c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,5 +1,6 @@
{ stdenv, lib, buildPackages
, autoreconfHook, bison, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
+, gperf
, aclSupport ? stdenv.isLinux, acl ? null
, attrSupport ? stdenv.isLinux, attr ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
@@ -24,10 +25,7 @@ stdenv.mkDerivation (rec {
pname = "coreutils";
version = "9.0";
- src = fetchurl {
- url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=";
- };
+ src = lib.cleanSource /tmp/coreutils;
patches = [ ./fix-chmod-exit-code.patch ]
++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
@@ -83,9 +81,14 @@ stdenv.mkDerivation (rec {
sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh
'');
+ preAutoreconf = ''
+ sed -i '/rsync/d' bootstrap.conf
+ ./bootstrap --no-git --skip-po --gnulib-srcdir=$PWD/gnulib
+ '';
+
outputs = [ "out" "info" ];
- nativeBuildInputs = [ perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin
+ nativeBuildInputs = [ bison gperf texinfo perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin
++ optionals stdenv.hostPlatform.isCygwin [ texinfo ]; # due to patch
configureFlags = [ "--with-packager=https://NixOS.org" ]
++ optional (singleBinary != false)
@@ -109,14 +112,7 @@ stdenv.mkDerivation (rec {
# TODO(@Ericson2314): Investigate whether Darwin could benefit too
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
- # The tests are known broken on Cygwin
- # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
- # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
- # and {Open,Free}BSD.
- # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
- doCheck = stdenv.hostPlatform == stdenv.buildPlatform
- && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
- && !stdenv.isAarch32;
+ doCheck = false;
# Prevents attempts of running 'help2man' on cross-built binaries.
PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
| 08:43:47 |
| das_j | this makes it build from a git checkout | 08:43:55 |
| das_j | but you need to do a recursive git clone (or do the submodule stuff by hand) or it won't find the embedded gunlib | 08:44:20 |
| das_j | * but you need to do a recursive git clone (or do the submodule stuff by hand) or it won't find the embedded gnulib | 08:44:22 |
| das_j | * diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 16f3e4c721f..1a170a1946c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,5 +1,6 @@
{ stdenv, lib, buildPackages
, autoreconfHook, bison, texinfo, fetchurl, perl, xz, libiconv, gmp ? null
+, gperf
, aclSupport ? stdenv.isLinux, acl ? null
, attrSupport ? stdenv.isLinux, attr ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
@@ -24,10 +25,7 @@ stdenv.mkDerivation (rec {
pname = "coreutils";
version = "9.0";
- src = fetchurl {
- url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
- sha256 = "sha256-zjCs30pBvFuzDdlV6eqnX6IWtOPesIiJ7TJDPHs7l84=";
- };
+ src = lib.cleanSource /tmp/coreutils;
patches = [ ./fix-chmod-exit-code.patch ]
++ optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch
@@ -83,9 +81,14 @@ stdenv.mkDerivation (rec {
sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh
'');
+ preAutoreconf = ''
+ sed -i '/rsync/d' bootstrap.conf
+ ./bootstrap --no-git --skip-po --gnulib-srcdir=$PWD/gnulib
+ '';
+
outputs = [ "out" "info" ];
- nativeBuildInputs = [ perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin
+ nativeBuildInputs = [ bison gperf texinfo perl xz.bin autoreconfHook ] # autoreconfHook is due to patch, normally only needed for cygwin
++ optionals stdenv.hostPlatform.isCygwin [ texinfo ]; # due to patch
configureFlags = [ "--with-packager=https://NixOS.org" ]
++ optional (singleBinary != false)
@@ -109,14 +112,7 @@ stdenv.mkDerivation (rec {
# TODO(@Ericson2314): Investigate whether Darwin could benefit too
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
- # The tests are known broken on Cygwin
- # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
- # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
- # and {Open,Free}BSD.
- # With non-standard storeDir: https://github.com/NixOS/nix/issues/512
- doCheck = stdenv.hostPlatform == stdenv.buildPlatform
- && (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
- && !stdenv.isAarch32;
+ doCheck = false;
# Prevents attempts of running 'help2man' on cross-built binaries.
PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
| 08:44:33 |
| Ryan Burns | Thank you! Gonna bisect on jx with this | 08:52:04 |
| das_j | In reply to @vcunat:matrix.org
Resolved now 🎉 Nice, now it's only not building :D | 10:26:08 |
| Vladimír Čunát | In reply to @janne.hess:helsinki-systems.de
Nice, now it's only not building :D And restarting individual jobs doesn't work, so it won't be that easy to make the channel update. | 10:27:16 |
| das_j | It looks like restarting wouldn't help really. It's vte not building on aarch64 mostly | 10:27:51 |
| Vladimír Čunát | I wanted to restart webkit. | 10:28:09 |
| Vladimír Čunát | vte: https://github.com/NixOS/nixpkgs/pull/142731#commitcomment-58711525 | 10:28:29 |
| Vladimír Čunát | Apart from those two parts, there's just the hibernation test in progress, so I'm hopeful. | 10:29:05 |
| Vladimír Čunát | * Apart from those two parts, there's just the hibernation test in progress, so I'm feeling hopeful. | 10:29:12 |
| das_j | Vladimír Čunát: umm the hibernate test doesn't look good | 10:33:32 |
| das_j | Feels a lot like https://github.com/NixOS/nixpkgs/pull/142747 | 10:33:40 |
