Fix eval time warnings

input-output-hk · Jul 6, 2020 · 74935bc · 74935bc
1 parent 10055a1
commit 74935bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ci.nix b/ci.nix
@@ -14,10 +14,10 @@
   };
   compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: _:
     (import ./default.nix { inherit checkMaterialization; }).nixpkgsArgs) ({
-    ghc865 = {};
+#    ghc865 = {};
   } // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2003") {
     ghc883 = {};
-    ghc8101 = {};
+#    ghc8101 = {};
   });
   systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
     # I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -55,7 +55,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
         } // pkgs.lib.optionalAttrs (ifdLevel >= 1) {
           iserv-proxy = pkgs.ghc-extra-packages."${compiler-nix-name}".iserv-proxy.components.exes.iserv-proxy;
         } // pkgs.lib.optionalAttrs (ifdLevel >= 3) {
-          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; }).components.exes.hello;
+          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; inherit compiler-nix-name; }).components.exes.hello;
         });
       }
       //
@@ -81,7 +81,7 @@ dimension "Nixpkgs version" nixpkgsVersions (nixpkgsName: nixpkgs-pin:
           remote-iserv = pkgs.ghc-extra-packages."${compiler-nix-name}".remote-iserv.components.exes.remote-iserv;
           iserv-proxy = pkgs.ghc-extra-packages."${compiler-nix-name}".iserv-proxy.components.exes.iserv-proxy;
         } // pkgs.lib.optionalAttrs (ifdLevel >= 3) {
-          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; }).components.exes.hello;
+          hello = (pkgs.haskell-nix.hackage-package { name = "hello"; version = "1.0.0.2"; inherit compiler-nix-name; }).components.exes.hello;
         })
       )
     )

diff --git a/lib/cabal-licenses.nix b/lib/cabal-licenses.nix
@@ -12,6 +12,7 @@ lib: with lib.licenses;
   "AGPL-3.0-only"     = agpl3;
   "AGPL-3.0-or-later" = agpl3Plus;
   "Apache-2.0"        = asl20;
+  "GPL-2.0-or-later AND BSD-3-Clause" = [gpl2Plus bsd3];
   # Generic
   LicenseRef-Apache = "Apache";
   LicenseRef-GPL = "GPL";