Merge pull request #728 from reflex-frp/nixpkgs-20.09

Nixpkgs 20.09
reflex-frp · Sep 12, 2021 · d5a4db5 · d5a4db5
2 parents 52e00a0 + f689b0b
commit d5a4db5
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 102 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,6 +2,11 @@
 
 This project's release branch is `master`. This log is written from the perspective of the release branch: when changes hit `master`, they are considered released.
 
+# Unreleased
+
+* Bump
+  * Nixpkgs to 20.09
+
 ## v0.8.0.3
 
 * Fix pure Nix evaluation.

diff --git a/android/defaults/deps.nix b/android/defaults/deps.nix
@@ -484,7 +484,15 @@
     version = "26.4.2";
     repo = "https://maven.google.com/";
     jarSha256 = "7e8e000f063f42f10ca209f51a48b332db1c4d3ac30979cc49c1877ef9e4b7f1";
-    pomSha256 = null;
+    pomSha256 = "1qxr3kv73c0zbf7cgw5dh6alb7j2a3akmxdgb9jp4x3y0510jdwz";
+    aarSha256 = null; }
+
+  { artifactId = "groovy-all";
+    groupId = "org.codehaus.groovy";
+    version = "2.4.15";
+    repo = "https://repo1.maven.org/maven2/";
+    jarSha256 = "1w2siawsbap3aqvp06jynw7ki79majc4k2ci4ds5ds422zkw9mji";
+    pomSha256 = "0yinfr31ybi8c8h0ppf62gqpghrm5a72w71jc82sjz6vgdfm63gw";
     aarSha256 = null; }
 
   { artifactId = "lint-gradle-api";
@@ -703,6 +711,14 @@
     pomSha256 = "477bdf6579ecc9cc8f99a565203f6244914f289d87e7efbdf96243fa58f9df4c";
     aarSha256 = null; }
 
+  { artifactId = "error_prone_annotations";
+    groupId = "com.google.errorprone";
+    version = "2.1.3";
+    repo = "https://repo1.maven.org/maven2/";
+    jarSha256 = "1y3zzjqxckrn39z5d4724lwhkb9fx94i0kb3gkhsjgf18yak5l03";
+    pomSha256 = "1x9pfan53fjf9sg2lrwi6g2dvs2b99x8d7ka7in9kciw74fbi34m";
+    aarSha256 = null; }
+
   { artifactId = "error_prone_annotations";
     groupId = "com.google.errorprone";
     version = "2.2.0";
@@ -711,6 +727,14 @@
     pomSha256 = "5e0258ea1ba4e51a133742680bc22448f7ab214be4073e8619f645ef1be42dd5";
     aarSha256 = null; }
 
+  { artifactId = "error_prone_parent";
+    groupId = "com.google.errorprone";
+    version = "2.1.3";
+    repo = "https://repo1.maven.org/maven2/";
+    jarSha256 = null;
+    pomSha256 = "16r3zfxxcz6ldykibcs7r7qbvwc81dw7msg03nawx7rql4b2canm";
+    aarSha256 = null; }
+
   { artifactId = "error_prone_parent";
     groupId = "com.google.errorprone";
     version = "2.2.0";

diff --git a/android/impl.nix b/android/impl.nix
@@ -14,7 +14,7 @@ let overrideAndroidCabal = package: overrideCabal package (drv: {
         substitute ${./deploy.sh} $out/bin/deploy \
           --subst-var-by coreutils ${nixpkgs.coreutils} \
           --subst-var-by adb ${androidenv.androidPkgs_9_0.platform-tools} \
-          --subst-var-by java ${nixpkgs.openjdk12} \
+          --subst-var-by java ${nixpkgs.openjdk11} \
           --subst-var-by out $out
         chmod +x "$out/bin/deploy"
       '';

diff --git a/default.nix b/default.nix
@@ -401,7 +401,6 @@ in let this = rec {
       cabal-install
       ghcid
       hasktags
-      hdevtools
       hlint
       stylish-haskell # Recent stylish-haskell only builds with AMP in place
       reflex-ghci

diff --git a/haskell-overlays/android/default.nix b/haskell-overlays/android/default.nix
@@ -35,11 +35,4 @@ self: super: {
   jsaddle-webkitgtk = null;
   jsaddle-webkit2gtk = null;
 
-  # This should not be necessary. Happy is a native build input, but
-  # Nixpkgs splices it to the android version. Haskell splicing
-  # appears to be broken! /cc @ericson2314
-  haskell-src-exts = haskellLib.overrideCabal super.haskell-src-exts ({
-    libraryToolDepends = [ nixpkgs.buildPackages.haskell.packages.ghc844.happy ];
-  });
-
 }
diff --git a/haskell-overlays/any-8.6.nix b/haskell-overlays/any-8.6.nix
@@ -2,8 +2,6 @@
 with haskellLib;
 self: super: {
   cabal-macosx = dontCheck super.cabal-macosx;
-  enclosed-exceptions = dontCheck super.enclosed-exceptions; # see https://github.com/jcristovao/enclosed-exceptions/issues/12
   haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
   haddock-api-ghcjs = dontCheck super.haddock-api-ghcjs;
-  algebraic-graphs = doJailbreak super.algebraic-graphs;
 }
diff --git a/haskell-overlays/ghcjs.nix b/haskell-overlays/ghcjs.nix
@@ -30,6 +30,8 @@ self: super: {
   };
 
   ghcjs-base = doJailbreak (dontCheck (self.callCabal2nix "ghcjs-base" self._dep.ghcjsBaseSrc {}));
+  # ghcjs-base needs an older version than nixpkgs provides.
+  primitive = self.callHackage "primitive" "0.6.4.0" {};
 
   ghc = if !(lib.versionAtLeast super.ghc.ghcVersion "8.2") then super.ghc else super.ghc.overrideAttrs (_: {
     # TODO: I don't think this is needed except for maybe the fast-weak patch, but doing this to preserve hashes.

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
@@ -20,7 +20,17 @@ let
 
   inherit (nixpkgs) stdenv;
   # Older chromium for reflex-dom-core test suite
-  nixpkgs_oldChromium = import ../../nixpkgs-old-chromium { inherit (nixpkgs.stdenv.buildPlatform) system; };
+  nixpkgs_oldChromium = import ../../nixpkgs-old-chromium {
+    inherit (nixpkgs.stdenv.buildPlatform) system;
+    overlays = [ (self: super: {
+      # Disable tests for p11-kit, a dependency of chromium
+      # They fail on non-NixOS systems
+      # https://github.com/NixOS/nixpkgs/issues/96715
+      p11-kit = super.p11-kit.overrideAttrs (oldAttrs: {
+        doCheck = false;
+      });
+    })];
+  };
 in
 {
   _dep = super._dep or {} // thunkSet ./dep;
@@ -104,7 +114,7 @@ in
   ## Terminal / Conventional OS
   ##
 
-  reflex-vty = self.callHackage "reflex-vty" "0.1.4.1" {};
+  reflex-vty = self.callCabal2nix "reflex-vty" self._dep.reflex-vty {};
   reflex-process = self.callHackage "reflex-process" "0.3.1.0" {};
   reflex-fsnotify = self.callHackage "reflex-fsnotify" "0.2.1.2" {};
 

diff --git a/haskell-overlays/reflex-packages/dep/reflex-dom/github.json b/haskell-overlays/reflex-packages/dep/reflex-dom/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex-dom",
-  "branch": "release/0.6.2.0",
+  "branch": "master",
   "private": false,
-  "rev": "6a7782a61e90e7369a8278441eb47f702bb7c63b",
-  "sha256": "13y2h9cqhll55qgk7x33wnz88822irkdxych1c0fbw20jghhp96h"
+  "rev": "112e626ce8dc97d17c8aa9092727fb824b6f9fba",
+  "sha256": "12bggm7p69fq3pc0s5wfwg6rvp207lny24xxsx72xyynz1b8ym3l"
 }
diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/default.nix
@@ -0,0 +1,2 @@
+# DO NOT HAND-EDIT THIS FILE
+import (import ./thunk.nix)
diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/github.json b/haskell-overlays/reflex-packages/dep/reflex-vty/github.json
@@ -0,0 +1,8 @@
+{
+  "owner": "reflex-frp",
+  "repo": "reflex-vty",
+  "branch": "release/0.1.4",
+  "private": false,
+  "rev": "f33af489a1a9f5b8ea8bf9fca008a34f2fdf3759",
+  "sha256": "0xi1bm1migyb6fk9dqbdgnj9b1mp1ifaqjafgqsi60s0m167hi66"
+}
diff --git a/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix b/haskell-overlays/reflex-packages/dep/reflex-vty/thunk.nix
@@ -0,0 +1,9 @@
+# DO NOT HAND-EDIT THIS FILE
+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
+  if !fetchSubmodules && !private then builtins.fetchTarball {
+    url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
+  } else (import <nixpkgs> {}).fetchFromGitHub {
+    inherit owner repo rev sha256 fetchSubmodules private;
+  };
+  json = builtins.fromJSON (builtins.readFile ./github.json);
+in fetch json
diff --git a/haskell-overlays/reflex-packages/dep/reflex/github.json b/haskell-overlays/reflex-packages/dep/reflex/github.json
@@ -1,8 +1,8 @@
 {
   "owner": "reflex-frp",
   "repo": "reflex",
-  "branch": "release/0.8.1.0",
+  "branch": "master",
   "private": false,
-  "rev": "0bc631fbab0563afee650c4fdbd1e223298fb022",
-  "sha256": "1rqjbnmlxdyvv06x93frhhh8f3jiy1flmfxzabh18v462z17k210"
+  "rev": "86ab4e2b3c41ef521ca1e90e403c0b126ac70f64",
+  "sha256": "0xpyh7kql3a3yvanm4g7a3jab13llnpmc00ri3zv4w9jafydxm5a"
 }
diff --git a/haskell-overlays/text-jsstring/hashable.patch b/haskell-overlays/text-jsstring/hashable.patch
@@ -1,17 +1,18 @@
 diff --git a/Data/Hashable/Class.hs b/Data/Hashable/Class.hs
-index 93470db..f641d40 100644
+index cc9fb87..bdf9cb1 100644
 --- a/Data/Hashable/Class.hs
 +++ b/Data/Hashable/Class.hs
-@@ -1,5 +1,8 @@
- {-# LANGUAGE BangPatterns, CPP, ForeignFunctionInterface, MagicHash,
-              ScopedTypeVariables, UnliftedFFITypes #-}
+@@ -2,6 +2,9 @@
+              ScopedTypeVariables, UnliftedFFITypes, DeriveDataTypeable,
+              DefaultSignatures, FlexibleContexts, TypeFamilies,
+              MultiParamTypeClasses #-}
 +#ifdef __GHCJS__
 +{-# LANGUAGE JavaScriptFFI, UnboxedTuples, GHCForeignImportPrim #-}
 +#endif
 
- #if __GLASGOW_HASKELL__ < 710
- {-# LANGUAGE DeriveDataTypeable #-}
-@@ -75,7 +78,9 @@ import Data.Int (Int8, Int16, Int32, Int64)
+ #if __GLASGOW_HASKELL__ >= 801
+ {-# LANGUAGE PolyKinds #-} -- For TypeRep instances
+@@ -69,7 +72,9 @@ import Data.Int (Int8, Int16, Int32, Int64)
  import Data.List (foldl')
  import Data.Ratio (Ratio, denominator, numerator)
  import qualified Data.Text as T
@@ -21,7 +22,7 @@ index 93470db..f641d40 100644
  import qualified Data.Text.Internal as T
  import qualified Data.Text.Lazy as TL
  import Data.Version (Version(..))
-@@ -90,6 +95,9 @@ import GHC.Prim (ThreadId#)
+@@ -84,6 +89,9 @@ import GHC.Prim (ThreadId#)
  import System.IO.Unsafe (unsafeDupablePerformIO)
  import System.Mem.StableName
  import Data.Unique (Unique, hashUnique)
@@ -31,7 +32,7 @@ index 93470db..f641d40 100644
 
  -- As we use qualified F.Foldable, we don't get warnings with newer base
  import qualified Data.Foldable as F
-@@ -156,7 +164,11 @@ import qualified Data.ByteString.Short.Internal as BSI
+@@ -146,7 +154,11 @@ import qualified Data.ByteString.Short.Internal as BSI
  #  define MIN_VERSION_integer_gmp_1_0_0
  # endif
 
@@ -43,7 +44,7 @@ index 93470db..f641d40 100644
  import GHC.Integer.GMP.Internals (Integer(..))
  # if defined(MIN_VERSION_integer_gmp_1_0_0)
  import GHC.Exts (sizeofByteArray#)
-@@ -629,9 +641,15 @@ instance Hashable BSI.ShortByteString where
+@@ -639,9 +651,15 @@ instance Hashable BSI.ShortByteString where
  #endif
 
  instance Hashable T.Text where
@@ -59,7 +60,7 @@ index 93470db..f641d40 100644
 
  instance Hashable TL.Text where
      hashWithSalt = TL.foldlChunks hashWithSalt
-@@ -829,6 +847,12 @@ instance Hashable a => Hashable (Option a) where
+@@ -851,6 +869,12 @@ instance Hashable a => Hashable (Option a) where
      hashWithSalt p (Option a) = hashWithSalt p a
  #endif
 
@@ -72,22 +73,16 @@ index 93470db..f641d40 100644
  -- instances for @Data.Functor.{Product,Sum,Compose}@, present
  -- in base-4.9 and onward.
  #if MIN_VERSION_base(4,9,0)
-@@ -917,4 +941,3 @@ instance Show1 Hashed where
-   liftShowsPrec sp _ d (Hashed a _) = showsUnaryWith sp "hashed" d a
- #endif
-
--
 diff --git a/hashable.cabal b/hashable.cabal
-index 74f6512..4182f38 100644
+index e19d056..e442956 100644
 --- a/hashable.cabal
 +++ b/hashable.cabal
-@@ -51,6 +51,9 @@ Library
-   Build-depends:     base >= 4.4 && < 4.12,
-                      bytestring >= 0.9 && < 0.11,
-                      deepseq >= 1.3 && < 1.5
-+
+@@ -57,6 +57,8 @@ Library
+                    , text       >= 0.12     && < 1.3
+                    , ghc-prim
+
 +  if impl(ghcjs)
 +    Build-depends:   ghcjs-base
-   if impl(ghc)
-     Build-depends:   ghc-prim,
-                      text >= 0.11.0.5
+   if flag(integer-gmp)
+     Build-depends:   integer-gmp >= 0.4 && < 1.1
+   else
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# DO NOT HAND-EDIT THIS FILE
		import (import ./thunk.nix)