bump haskell.nix (#289)

* Build shell on CI

* Bump nix-install-action

* Bump haskell.nix

* Use IOHK cache

* Fixes

* Update freeze file

* Fix OSX hash
This commit is contained in:
Joachim Breitner authored and GitHub committed 2023-07-14 22:54:27 +02:00
1 parent e1ab8f9fe1
commit 2bebbc48ba
6 files changed
+50 -43

No files matched your search

+4
View File
@@ -27,6 +27,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
with:
extra_nix_config: |
trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
substituters = https://hydra.iohk.io https://cache.nixos.org/
- name: "Cachix: tttool"
uses: cachix/cachix-action@v12
with:
+1 -1
View File
@@ -1,7 +1,7 @@
packages: .
-- same as nix
with-compiler: ghc-9.2.4
with-compiler: ghc-9.2.8
source-repository-package
type: git
+33 -30
View File
@@ -1,32 +1,34 @@
-- Run nix-shell -A check-cabal-freeze default.nix to update this file
constraints: any.HPDF ==1.4.10,
any.JuicyPixels ==3.3.7,
any.OneTuple ==0.3.1,
any.QuickCheck ==2.14.2,
any.OneTuple ==0.4.1.1,
any.QuickCheck ==2.14.3,
any.StateVar ==1.2.2,
any.aeson ==2.1.1.0,
any.ansi-terminal ==0.11.3,
any.aeson ==2.1.2.1,
any.ansi-terminal ==1.0,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
any.array ==0.5.4.0,
any.assoc ==1.0.2,
any.assoc ==1.1,
any.attoparsec ==0.14.4,
any.base ==4.16.3.0,
any.base-compat ==0.12.2,
any.base-compat-batteries ==0.12.2,
any.base-orphans ==0.8.7,
any.base ==4.16.4.0,
any.base-compat ==0.13.0,
any.base-compat-batteries ==0.13.0,
any.base-orphans ==0.9.0,
any.base64-bytestring ==1.2.1.0,
any.bifunctors ==5.5.13,
any.bifunctors ==5.6.1,
any.binary ==0.8.9.0,
any.bitvec ==1.1.3.0,
any.bitvec ==1.1.4.0,
any.blaze-builder ==0.4.2.2,
any.blaze-markup ==0.8.2.8,
any.blaze-svg ==0.3.6.1,
any.bytestring ==0.11.3.1,
any.blaze-svg ==0.3.7,
any.bytestring ==0.11.4.0,
any.colour ==2.3.6,
any.comonad ==5.0.8,
any.conduit ==1.3.4.3,
any.conduit ==1.3.5,
any.containers ==0.6.5.1,
any.contravariant ==1.5.5,
any.data-array-byte ==0.1.0.1,
any.data-fix ==0.3.2,
any.deepseq ==1.4.6.1,
any.directory ==1.3.6.2,
@@ -36,14 +38,15 @@ constraints: any.HPDF ==1.4.10,
any.exceptions ==0.10.4,
any.executable-path ==0.0.3.1,
any.filepath ==1.4.2.2,
any.generically ==0.1,
any.ghc-bignum ==1.2,
any.ghc-boot-th ==9.2.4,
any.foldable1-classes-compat ==0.1,
any.generically ==0.1.1,
any.ghc-bignum ==1.3,
any.ghc-boot-th ==9.2.8,
any.ghc-prim ==0.8.0,
any.hashable ==1.3.5.0,
any.hashable ==1.4.2.0,
any.haskeline ==0.8.2,
any.indexed-traversable ==0.1.2,
any.indexed-traversable-instances ==0.1.1.1,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.integer-logarithms ==1.0.3.1,
any.libyaml ==0.1.2,
any.mono-traversable ==1.0.15.3,
@@ -52,37 +55,37 @@ constraints: any.HPDF ==1.4.10,
any.optparse-applicative ==0.16.1.0,
any.parsec ==3.1.15.0,
any.pretty ==1.1.3.6,
any.primitive ==0.7.4.0,
any.process ==1.6.13.2,
any.primitive ==0.8.0.0,
any.process ==1.6.16.0,
any.random ==1.1,
any.resourcet ==1.3.0,
any.rts ==1.0.2,
any.safe ==0.3.19,
any.scientific ==0.3.7.0,
any.semialign ==1.2.0.1,
any.semigroupoids ==5.3.7,
any.semialign ==1.3,
any.semigroupoids ==6.0.0.1,
any.split ==0.2.3.5,
any.splitmix ==0.1.0.4,
any.spool ==0.1,
any.stm ==2.5.0.2,
any.strict ==0.4.0.1,
any.tagged ==0.8.6.1,
any.strict ==0.5,
any.tagged ==0.8.7,
any.template-haskell ==2.18.0.0,
any.terminfo ==0.4.1.5,
any.text ==1.2.5.0,
any.text-short ==0.1.5,
any.th-abstraction ==0.4.5.0,
any.these ==1.1.1.1,
any.th-abstraction ==0.5.0.0,
any.these ==1.2,
any.time ==1.11.1.1,
any.time-compat ==1.9.6.1,
any.transformers ==0.5.6.2,
any.transformers-compat ==0.7.2,
any.unix ==2.7.2.2,
any.unliftio-core ==0.2.0.1,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
any.uuid-types ==1.0.5,
any.vector ==0.12.3.1,
any.vector-algorithms ==0.9.0.1,
any.witherable ==0.4.2,
any.yaml ==0.11.8.0,
any.yaml ==0.11.11.2,
any.zlib ==0.6.3.0
+7 -7
View File
@@ -34,8 +34,8 @@ let
];
# Pinning the input to the constraint solver
compiler-nix-name = "ghc924";
index-state = "2022-11-04T00:00:00Z";
compiler-nix-name = "ghc928";
index-state = "2023-07-14T00:00:00Z";
plan-sha256 = sha256;
inherit checkMaterialization;
@@ -83,15 +83,15 @@ let
in rec {
shell = tttool-shell pkgs
"1i97b1n9jpn94218ixdg27ysq3ncizm3v6d3ivl5l63qc2010cbr";
"12fm0i61zhah9yrkf0lmpybrcl0q91gb3krib12zz6qg5fx0lbw7";
linux-exe = tttool-exe pkgs
"1i97b1n9jpn94218ixdg27ysq3ncizm3v6d3ivl5l63qc2010cbr";
"12fm0i61zhah9yrkf0lmpybrcl0q91gb3krib12zz6qg5fx0lbw7";
windows-exe = tttool-exe pkgs.pkgsCross.mingwW64
"0y2ri2ww7d39dgqxmjz9m00ybmxcpr624cafhq1zdhmizyknirzj";
"1x16mjjx4wnzksmpi4jg6ykvfvdshrhp58gciy9lfslavy9clf3a";
static-exe = tttool-exe pkgs.pkgsCross.musl64
"1i97b1n9jpn94218ixdg27ysq3ncizm3v6d3ivl5l63qc2010cbr";
"12fm0i61zhah9yrkf0lmpybrcl0q91gb3krib12zz6qg5fx0lbw7";
osx-exe = tttool-exe pkgs-osx
"1i97b1n9jpn94218ixdg27ysq3ncizm3v6d3ivl5l63qc2010cbr";
"12fm0i61zhah9yrkf0lmpybrcl0q91gb3krib12zz6qg5fx0lbw7";
osx-exe-bundle = osx-bundler pkgs-osx osx-exe;
static-files = sourceByRegex ./. [
+3 -3
View File
@@ -5,10 +5,10 @@
"homepage": "https://input-output-hk.github.io/haskell.nix",
"owner": "input-output-hk",
"repo": "haskell.nix",
"rev": "76292760f14ed5514670f0c226091babb6529218",
"sha256": "00iyixg65v5xmdr5lggsp7rvbvlbf0p9066dp5fhan61zmkq77yv",
"rev": "1ad94aea985af89856fcad0386a5a99a28c70218",
"sha256": "03v40kv1xnphf62a2k2dz2m4d1s2br5p63m3nfw5g8r0nf72xr3d",
"type": "tarball",
"url": "https://github.com/input-output-hk/haskell.nix/archive/76292760f14ed5514670f0c226091babb6529218.tar.gz",
"url": "https://github.com/input-output-hk/haskell.nix/archive/1ad94aea985af89856fcad0386a5a99a28c70218.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
+2 -2
View File
@@ -52,8 +52,8 @@ executable tttool
build-depends: containers >= 0.4 && <0.7
build-depends: directory >= 1.2 && < 1.4
build-depends: executable-path == 0.0.*
build-depends: filepath == 1.3.* || == 1.4.*
build-depends: hashable == 1.3.*
build-depends: filepath >= 1.3
build-depends: hashable >= 1.3
build-depends: haskeline == 0.8.*
build-depends: HPDF >= 1.4.10 && < 1.5
build-depends: JuicyPixels >= 3.2.5 && < 3.4