diff --git a/ChangeLog.md b/ChangeLog.md index e14065c..af5d060 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,7 +2,7 @@ ## 0.3.1.1 -* Upgrade readme example to use reflex-vty 0.2 +* Update readme example to use reflex-vty 0.2 ## 0.3.1.0 diff --git a/reflex-platform/default.nix b/nixpkgs/default.nix similarity index 100% rename from reflex-platform/default.nix rename to nixpkgs/default.nix diff --git a/nixpkgs/github.json b/nixpkgs/github.json new file mode 100644 index 0000000..5a109e1 --- /dev/null +++ b/nixpkgs/github.json @@ -0,0 +1,8 @@ +{ + "owner": "NixOS", + "repo": "nixpkgs", + "branch": "nixos-20.09", + "private": false, + "rev": "068984c00e0d4e54b6684d98f6ac47c92dcb642e", + "sha256": "00j4xv4lhhqwry7jd67brnws4pwb8vn660n43pvxpkalbpxszwfg" +} diff --git a/reflex-platform/thunk.nix b/nixpkgs/thunk.nix similarity index 100% rename from reflex-platform/thunk.nix rename to nixpkgs/thunk.nix diff --git a/reflex-platform/github.json b/reflex-platform/github.json deleted file mode 100644 index c91db26..0000000 --- a/reflex-platform/github.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "owner": "reflex-frp", - "repo": "reflex-platform", - "branch": "aa/reflex-vty-0.2", - "private": false, - "rev": "2f3d763a885e50f932a3b4544b3f1a7fc8e9315a", - "sha256": "1x3v6hh110fjc7pmmrblvdydf565xh1lw0hr8ph7k38v426jb6wk" -} diff --git a/release.nix b/release.nix index 3825b74..48b214f 100644 --- a/release.nix +++ b/release.nix @@ -1,28 +1,54 @@ -{ reflex-platform-fun ? import ./reflex-platform +{ pkgs ? import ./nixpkgs {} , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] }: - let - native-reflex-platform = reflex-platform-fun {}; - inherit (native-reflex-platform.nixpkgs) lib; + inherit (pkgs) lib; + sharedOverrides = self: super: { + reflex-vty = self.callHackageDirect { + pkg = "reflex-vty"; + ver = "0.2.0.0"; + sha256 = "1vb38qx1a6l28i4wd1g48qqmymlzivq7lwmxbywjs0b36ynsnfk8"; + } {}; + reflex = self.callHackageDirect { + pkg = "reflex"; + ver = "0.8.1.1"; + sha256 = "1sdakz8rgdhvrcq004926dmbwlmhmv7wsw9h7f8klnvdsydm7dh7"; + } {}; + patch = self.callHackageDirect { + pkg = "patch"; + ver = "0.0.4.0"; + sha256 = "1x1rbi51r5gvbkg96884c2py7in4n0ijh5ins8ya3b5kga32siq4"; + } {}; + }; + + ghcs = { + ghc865 = pkgs.haskell.packages.ghc865.override { + overrides = self: super: sharedOverrides self super // { + ghc-lib-parser = self.callHackageDirect { + pkg = "ghc-lib-parser"; + ver = "8.8.4.20210620"; + sha256 = "17y7f5h1mrfyblaz0ipws04a4z11vnwkfvzzk8mkyrkz4am1a8fp"; + } {}; + ghc-lib-parser-ex = self.callHackageDirect { + pkg = "ghc-lib-parser-ex"; + ver = "8.8.5.8"; + sha256 = "1avdm9fzgk59xzq5xv5rlnncq4vgqsf3jyf46889cf7gcfb40aff"; + } {}; + hlint = self.callHackageDirect { + pkg = "hlint"; + ver = "2.2.11"; + sha256 = "0v4axmqb3zwzznyvhiqbr50k23ah63sd9gsmi5sa2p97hch8kwx1"; + } {}; - perPlatform = lib.genAttrs supportedSystems (system: let - reflex-platform = reflex-platform-fun { - inherit system; + }; + }; + ghc884 = pkgs.haskell.packages.ghc884.override { + overrides = sharedOverrides; + }; + ghc8104 = pkgs.haskell.packages.ghc8104.override { + overrides = sharedOverrides; }; - src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ - "release.nix" - ".git" - "dist" - "dist-newstyle" - "cabal.haskell-ci" - "cabal.project" - ".travis.yml" - ])) ./.; - in reflex-platform.ghc.callCabal2nix "reflex-process" src {}); + }; +in + lib.mapAttrs (_: ghc: ghc.callCabal2nix "reflex-process" ./. {}) ghcs -in perPlatform // { - cache = native-reflex-platform.pinBuildInputs - "reflex-process-everywhere" - (builtins.attrValues perPlatform); -}