!UNVBThoJtlIiVwiDjU:nixos.org

Staging

332 Members
Staging merges | Find currently open staging-next PRs: https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+sort%3Aupdated-desc+head%3Astaging-next+head%3Astaging-next-21.05+is%3Aopen114 Servers

Load older messages


SenderMessageTime
25 Oct 2021
@janne.hess:helsinki-systems.dedas_j(it's about 🕛 here, just for reference) 21:53:20
@vcunat:matrix.orgVladimír Čunát(Same time-zone for me.)22:04:17
26 Oct 2021
@grahamc:nixos.org@grahamc:nixos.orgchanged room power levels.01:19:47
@mjolnir:nixos.orgNixOS Moderation Bot changed their display name from mjolnir to NixOS Moderation Bot.02:00:15
@mjolnir:nixos.orgNixOS Moderation Bot set a profile picture.02:00:32
@mjolnir:nixos.orgNixOS Moderation Bot changed their profile picture.02:23:47
@mjolnir:nixos.orgNixOS Moderation Bot changed their profile picture.02:33:17
@vcunat:matrix.orgVladimí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
@janne.hess:helsinki-systems.dedas_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
@janne.hess:helsinki-systems.dedas_jthis makes it build from a git checkout08:43:55
@janne.hess:helsinki-systems.dedas_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
@janne.hess:helsinki-systems.dedas_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
@janne.hess:helsinki-systems.dedas_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
@r-burns:matrix.orgRyan BurnsThank you! Gonna bisect on jx with this08:52:04
@janne.hess:helsinki-systems.dedas_j
In reply to @vcunat:matrix.org
Resolved now 🎉
Nice, now it's only not building :D
10:26:08
@vcunat:matrix.orgVladimí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
@janne.hess:helsinki-systems.dedas_jIt looks like restarting wouldn't help really. It's vte not building on aarch64 mostly10:27:51
@vcunat:matrix.orgVladimír ČunátI wanted to restart webkit.10:28:09
@vcunat:matrix.orgVladimír Čunátvte: https://github.com/NixOS/nixpkgs/pull/142731#commitcomment-5871152510:28:29
@vcunat:matrix.orgVladimír ČunátApart from those two parts, there's just the hibernation test in progress, so I'm hopeful.10:29:05
@vcunat:matrix.orgVladimír Čunát * Apart from those two parts, there's just the hibernation test in progress, so I'm feeling hopeful.10:29:12
@janne.hess:helsinki-systems.dedas_j Vladimír Čunát: umm the hibernate test doesn't look good 10:33:32
@janne.hess:helsinki-systems.dedas_jFeels a lot like https://github.com/NixOS/nixpkgs/pull/14274710:33:40
@janne.hess:helsinki-systems.dedas_jimage.png
Download image.png
10:34:03
@janne.hess:helsinki-systems.dedas_jthe big jump is usually a good indicator that the test is stuck10:34:11
@vcunat:matrix.orgVladimír ČunátOn a quick glance it didn't seem very flaky in the past, unless people were restarting it often: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.hibernate.x86_64-linux/all?page=1 (I didn't bother looking into many of the build steps for repeats)10:36:13
@vcunat:matrix.orgVladimír ČunátFor now I can only hope that a few retries can work around such issues 🤷10:46:05
@vcunat:matrix.orgVladimír Čunát * For now I can only hope that a few retries can work around such issues 🤷 EDIT: anyway, this is a wrong channel.10:47:41
@vcunat:matrix.orgVladimír Čunát * For now I can only hope that a few retries can work around such issues 🤷 EDIT: anyway, this is a wrong channel, I'm sorry.10:47:57
@janne.hess:helsinki-systems.dedas_j
In reply to @r-burns:matrix.org
Thank you! Gonna bisect on jx with this
Did you have any luck with the bisect?
20:32:11

There are no newer messages yet.


Back to Room ListRoom Version: 6