BLD Update haskell.nix (includes LTS-19.19)

This includes the version of conduit-algorithm needed
ngless-toolkit · Aug 16, 2022 · 1076e15 · 1076e15
1 parent 2c5a66a
commit 1076e15
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/build-scripts/ngless-static-embed-dependencies.nix b/build-scripts/ngless-static-embed-dependencies.nix
@@ -3,8 +3,8 @@ let
   sources = {
     haskellNix = builtins.fetchTarball {
         name = "haskell-nix-snap";
-        url = "https://github.com/input-output-hk/haskell.nix/archive/fbd32c9c441fbd35a85049978bffb4b2eff2f04b.tar.gz";
-        sha256 = "0ihjyf7k47z71zznrs1453vi7kl2p82da18wngjmnr7rjap1vjyi";
+        url = "https://github.com/input-output-hk/haskell.nix/archive/17e5f35d56c57b20ba2397010fcd4032fb6acc2b.tar.gz";
+        sha256 = "0b3pwrib289bhidv1q27k6k53zwyahdffi2ynww19qnviqwlm21a";
     };
   };
 
@@ -24,7 +24,7 @@ let
 in pkgs.haskell-nix.stackProject {
   name = "NGLess";
   src = (import ./sources-with-static-dependencies.nix) ;
-  stack-sha256 = "1acr6d1qdih192fkbwncc85874v27x848c4iqwfbvg68lcs4973j";
+  stack-sha256 = "13ms75px2iyfydc91nyr521cw8fadhwic1xn1vn9kqnksf2zaglz";
   materialized = ./sources-with-static-dependencies.materialized;
   inherit checkMaterialization;
 }

diff --git a/build-scripts/release.materialized/NGLess.nix b/build-scripts/release.materialized/NGLess.nix
@@ -30,6 +30,10 @@
         "README.md"
         "ChangeLog"
         "NGLess/Interpretation/Count/RefSeqInfoVector.h"
+        "test_samples/sample.sam.gz"
+        "test_samples/data_set_repeated.fq"
+        "test_samples/very_short.gtf"
+        "Makefile"
         ];
       extraTmpFiles = [];
       extraDocFiles = [];

diff --git a/build-scripts/release.materialized/default.nix b/build-scripts/release.materialized/default.nix
@@ -6,7 +6,7 @@
         int-interval-map = ./.stack-to-nix.cache.0;
         };
       };
-  resolver = "lts-19.4";
+  resolver = "lts-19.19";
   modules = [
     ({ lib, ... }:
       { packages = {}; })

diff --git a/build-scripts/sources-with-static-dependencies.materialized/NGLess.nix b/build-scripts/sources-with-static-dependencies.materialized/NGLess.nix
@@ -30,6 +30,10 @@
         "README.md"
         "ChangeLog"
         "NGLess/Interpretation/Count/RefSeqInfoVector.h"
+        "test_samples/sample.sam.gz"
+        "test_samples/data_set_repeated.fq"
+        "test_samples/very_short.gtf"
+        "Makefile"
         ];
       extraTmpFiles = [];
       extraDocFiles = [];

diff --git a/build-scripts/sources-with-static-dependencies.materialized/default.nix b/build-scripts/sources-with-static-dependencies.materialized/default.nix
@@ -6,7 +6,7 @@
         int-interval-map = ./.stack-to-nix.cache.0;
         };
       };
-  resolver = "lts-19.4";
+  resolver = "lts-19.19";
   modules = [
     ({ lib, ... }:
       { packages = {}; })

diff --git a/build-scripts/sources-with-static-dependencies.nix b/build-scripts/sources-with-static-dependencies.nix
@@ -3,8 +3,8 @@ let
   sources = {
     haskellNix = builtins.fetchTarball {
         name = "haskell-nix-snap";
-        url = "https://github.com/input-output-hk/haskell.nix/archive/fbd32c9c441fbd35a85049978bffb4b2eff2f04b.tar.gz";
-        sha256 = "0ihjyf7k47z71zznrs1453vi7kl2p82da18wngjmnr7rjap1vjyi";
+        url = "https://github.com/input-output-hk/haskell.nix/archive/17e5f35d56c57b20ba2397010fcd4032fb6acc2b.tar.gz";
+        sha256 = "0b3pwrib289bhidv1q27k6k53zwyahdffi2ynww19qnviqwlm21a";
     };
   };
 

diff --git a/release.nix b/release.nix
@@ -3,8 +3,8 @@ let
   sources = {
     haskellNix = builtins.fetchTarball {
       name = "haskell-nix-snap";
-      url = "https://github.com/input-output-hk/haskell.nix/archive/fbd32c9c441fbd35a85049978bffb4b2eff2f04b.tar.gz";
-      sha256 = "0ihjyf7k47z71zznrs1453vi7kl2p82da18wngjmnr7rjap1vjyi";
+      url = "https://github.com/input-output-hk/haskell.nix/archive/17e5f35d56c57b20ba2397010fcd4032fb6acc2b.tar.gz";
+      sha256 = "0b3pwrib289bhidv1q27k6k53zwyahdffi2ynww19qnviqwlm21a";
     };
   };
 
@@ -31,8 +31,8 @@ in pkgs.haskell-nix.stackProject {
     # ignore paths that change frequently, but do not contribute to the result
     filter = path: type: let baseName = baseNameOf (toString path); in !(pkgs.lib.elem baseName ignoredPaths);
   };
-  stack-sha256 = "06l7xh0yza5p7bhyahq0ija1spcbmwr99cv33r4si8cm4y0xi217";
   materialized = ./build-scripts/release.materialized;
+  stack-sha256 = "0lpv5h8zzvmdamw0sxxnqaj919b3wl4b3zmc3d1z38ckpgpxi16b";
   inherit checkMaterialization;
 }
 
diff --git a/stack.yaml b/stack.yaml
@@ -1,11 +1,10 @@
 # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
 
-resolver: lts-19.4
+resolver: lts-19.19
 compiler-check: newer-minor
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps:
-  - conduit-algorithms-0.0.13.0
   - git: "https://github.com/ngless-toolkit/interval-to-int"
     commit: "78289f6b48d41f7cc48169520ec9b77b050a0029"