From c71b35c6590c00692e5ea4cdcb25999dd8ef89a9 Mon Sep 17 00:00:00 2001 From: o1lo01ol1o Date: Thu, 14 Oct 2021 22:08:51 +0100 Subject: [PATCH 1/2] use backported nixpkgs --- nixpkgs/github.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixpkgs/github.json b/nixpkgs/github.json index 617720b34..4903f7570 100644 --- a/nixpkgs/github.json +++ b/nixpkgs/github.json @@ -1,8 +1,8 @@ { - "owner": "obsidiansystems", + "owner": "BeFunctional", "repo": "nixpkgs", - "branch": "reflex-platform-20.09", + "branch": "reflex-platform-20.09-backport-big-sur", "private": false, - "rev": "198e8aba0d5225765323a8a958ebf7732d8b3ce8", - "sha256": "0ww6v1pm8r5lyxnfvps6hs3pl8v3p78jzs64qgqwihmd4wydxppz" + "rev": "923f60647a7e3280b1b0277fd8572f8c4c86806d", + "sha256": "1jfdxjrxcdmxvf6gczg4klp0sg2825r4751jzwsbbwhx2g0qkljh" } From 118fe99e54279a6d34e2983b00c6dea99017f7f0 Mon Sep 17 00:00:00 2001 From: o1lo01ol1o Date: Fri, 15 Oct 2021 10:08:35 +0100 Subject: [PATCH 2/2] hstore-core tests fail on streamManyFilesToNar with cannot access '/proc/3496/fd': No such file or directory --- haskell-overlays/untriaged.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-overlays/untriaged.nix b/haskell-overlays/untriaged.nix index 3ce22118e..15907edfa 100644 --- a/haskell-overlays/untriaged.nix +++ b/haskell-overlays/untriaged.nix @@ -52,8 +52,8 @@ self: super: { librarySystemDepends = (drv.librarySystemDepends or []) ++ [ nixpkgs.nix ]; testHaskellDepends = (drv.testHaskellDepends or []) ++ [ nixpkgs.nix super.criterion ]; })); - hnix-store-core = - self.callCabal2nix "hnix" (nixpkgs.hackGet ./hnix/hnix-store + "/hnix-store-core") {}; + hnix-store-core = dontCheck + (self.callCabal2nix "hnix" (nixpkgs.hackGet ./hnix/hnix-store + "/hnix-store-core") {}); hnix-store-remote = self.callCabal2nix "hnix" (nixpkgs.hackGet ./hnix/hnix-store + "/hnix-store-remote") {}; data-fix = self.callHackage "data-fix" "0.3.0" {};