From c7047112ab72b5a49722b297b7fd05808dfb5955 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 19 Nov 2024 19:06:32 +0100 Subject: [PATCH] Revert "git-annex: work around corrupted store paths of dependencies" This reverts commit 5e1144c572a133b129d004275e3afde53e248fce. Reason for revert: Due to unrelated set rebuilds on staging/haskell-updates compared to master, we get freshly built store paths of these packages anyways. --- pkgs/development/haskell-modules/configuration-darwin.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index b8511e2af54d..838fad481402 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -454,11 +454,6 @@ self: super: ({ } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isx86_64 { # x86_64-darwin - # Work around store corruption on one of our Hydra builders - # https://github.com/NixOS/nixpkgs/issues/356741 - filepath-bytestring = triggerRebuild 1 super.filepath-bytestring; - magic = triggerRebuild 1 super.magic; - # tests appear to be failing to link or something: # https://hydra.nixos.org/build/174540882/nixlog/9 regex-rure = dontCheck super.regex-rure;