Unverified Commit bb6e37f4 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

nix: skip failing test on aarch64-darwin 

Patch applied to all nixVersions.* as multiple of them
seem to suffer from this issue.

The nixpkgs-unstable channel is on a week old commit now.
This issue doesn't seem worth such a long delay.
parent d17f8ac3

pkgs/tools/package-management/nix/default.nix

+28 −20
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ let 
  ];

  teams = [ lib.teams.nix ];



  # FIXME: https://github.com/NixOS/nixpkgs/issues/476794

  patches_common = lib.optional (stdenv.system == "aarch64-darwin") ./patches/skip-nix-shell.patch;

in

lib.makeExtensible (

  self:
@@ -136,7 +138,7 @@ lib.makeExtensible ( 
        version = "2.28.5";

        hash = "sha256-oIfAHxO+BCtHXJXLHBnsKkGl1Pw+Uuq1PwNxl+lZ+Oc=";

        self_attribute_name = "nix_2_28";

        patches = [

        patches = patches_common ++ [

          (fetchpatch2 {

            name = "nix-2.28-14764-mdbook-0.5-support.patch";

            url = "https://github.com/NixOS/nix/commit/5a64138e862fe364e751c5c286e8db8c466aaee7.patch";
@@ -157,13 +159,16 @@ lib.makeExtensible ( 
            hash = "sha256-kBuwzMgIE9Tmve0Rpp+q+YCsE2mw9d62M/950ViWeJ0=";

          };

        }).appendPatches

          [

          (

            patches_common

            ++ [

              (fetchpatch2 {

                name = "nix-2.30-14695-mdbook-0.5-support.patch";

                url = "https://github.com/NixOS/nix/commit/5cbd7856de0a9c13351f98e32a1e26d0854d87fd.patch";

                hash = "sha256-w8WQfWxMtprDLoZUhrCm4zr6xZXKhoIirq3la0Y7/wU=";

              })

          ];

            ]

          );



      nix_2_30 = addTests "nix_2_30" self.nixComponents_2_30.nix-everything;
@@ -180,7 +185,8 @@ lib.makeExtensible ( 
          };

        }).appendPatches

          (

            [

            patches_common

            ++ [

              (fetchpatch2 {

                name = "nix-2.31-14692-mdbook-0.5-support.patch";

                url = "https://github.com/NixOS/nix/commit/a4f5f365090980a6eeb2ef483e49c04bdefd71a8.patch";
@@ -198,7 +204,8 @@ lib.makeExtensible ( 


      nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;



      nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec {

      nixComponents_2_32 =

        (nixDependencies.callPackage ./modular/packages.nix rec {

          version = "2.32.5";

          inherit (self.nix_2_31.meta) maintainers teams;

          otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
@@ -208,7 +215,8 @@ lib.makeExtensible ( 
            tag = version;

            hash = "sha256-vnlVgJ5VXn2LVvdzf1HUZeGq0pqa6vII11C8u5Q/YgM=";

          };

      };

        }).appendPatches

          patches_common;



      nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything;

pkgs/tools/package-management/nix/patches/skip-nix-shell.patch

0 → 100644
+5 −0
Original line number Diff line number Diff line 
--- a/tests/functional/meson.build

+++ b/tests/functional/meson.build

@@ -90 +90 @@ suites = [

-      'nix-shell.sh',

+      #'nix-shell.sh',