fix pipelines

Author: jbgi

default.nix

@@ -101,10 +101,10 @@ let
     hlint = upstreamedDeprecation "hlint" pkgsDefault.hlint;
     openapi-spec-validator = upstreamedDeprecation "openapi-spec-validator" pkgsDefault.python37Packages.openapi-spec-validator;
     cardano-repo-tool = pkgsDefault.callPackage ./pkgs/cardano-repo-tool.nix {
-      haskell = pkgsDefault.haskell-nix;
+      haskell = nix-tools.default-haskell-nix;
     };
     stylish-haskell = pkgsDefault.callPackage ./pkgs/stylish-haskell.nix {
-      haskell = pkgsDefault.haskell-nix;
+      haskell = nix-tools.default-haskell-nix;
     };
 
     # Check scripts
@@ -118,15 +118,15 @@ let
 
   nix-tools = let pkgs = import defaultSources.nixpkgs (import defaultSources."haskell.nix");
     in rec {
-
+    default-haskell-nix = pkgs.haskell-nix;
     # Programs for generating nix haskell package sets from cabal and
     # stack.yaml files.
-    package = nixToolsDeprecation pkgs.haskell-nix.nix-tools;
+    package = nixToolsDeprecation default-haskell-nix.nix-tools;
     # A different haskell infrastructure
     haskell = _: nixToolsDeprecation (commonLib.getPkg {}).haskell-nix;
     # Script to invoke nix-tools stack-to-nix on a repo.
     regenerateStackPackages = pkgs.callPackage ./nix-tools-regenerate.nix {
-      nix-tools = pkgs.haskell-nix.nix-tools;
+      nix-tools = default-haskell-nix.nix-tools;
     };
     # default and release templates that abstract
     # over the details for CI.

skeleton/.buildkite/bench.sh

@@ -8,7 +8,7 @@ total_time=total-time.txt
 
 echo "--- Build"
 # TODO: remove sourcesOverride
-nix-build -A benchmarks.iohk-skeleton.iohk-skeleton-bench --arg sourcesOverride '{ iohk-nix = ../..; }'
+nix-build -A benchmarks.iohk-skeleton.iohk-skeleton-bench --arg sourcesOverride '{ iohk-nix = ../.; }'
 bench=./result/bin/iohk-skeleton-bench
 
 echo "+++ Run benchmark"

skeleton/default.nix

@@ -30,7 +30,8 @@ let
   haskellPackages = pkgs.haskellNixPackages;
 
 in {
-  inherit pkgs commonLib src haskellPackages;
+  inherit pkgs haskellPackages;
+  inherit (pkgs) commonLib;
   inherit (haskellPackages.iohk-skeleton.identifier) version;
 
   # Grab the executable component of our package.

skeleton/nix/haskell.nix

@@ -85,6 +85,13 @@ let
 
         # split data output for ekg to reduce closure size
         packages.ekg.components.library.enableSeparateDataOutput = true;
+
+        # some packages are missing identifier.name:
+        packages.Win32.package.identifier.name = "Win32";
+        packages.cryptonite-openssl.package.identifier.name = "cryptonite-openssl";
+        packages.file-embed-lzma.package.identifier.name = "file-embed-lzma";
+        packages.singletons.package.identifier.name = "singletons";
+        packages.terminfo.package.identifier.name = "terminfo";
       }
 
       # Allow reinstallation of Win32