Skip to content

Commit

Permalink
9.6 main development version (IntersectMBO#5645)
Browse files Browse the repository at this point in the history
* Switch to 9.6 as main development version, drop 9.2

* Remove 9.2 test output

* Try this

* Update iogx

* Bump haskell.nix

* Bump hackage

* Update iogx

* Disable reinstallable lib:ghc when cross-compiling

* Manually updat iohk-nix

the iohk-nix pin in iogx is too old.
On windows we must use a statically linked blst, as our linker
technically the one forwarding to the system linker chokes on the .dll.

---------

Co-authored-by: Moritz Angermann <[email protected]>
  • Loading branch information
michaelpj and angerman authored Nov 24, 2023
1 parent b923816 commit d59a047
Show file tree
Hide file tree
Showing 707 changed files with 139 additions and 28,429 deletions.
4 changes: 1 addition & 3 deletions CONTRIBUTING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ Supported versions older than the primary development version are deprecated, an

At the moment, our supported GHC versions are:
- 8.10 (deprecated)
- 9.2 (primary)
- 9.6
- 9.6 (primary)

=== Plugin support

Expand All @@ -223,7 +222,6 @@ The plugin and its dependents should be marked as unbuildable with cabal conditi
This makes cabal behave reasonably well (it will ignore them and not try and fail to build them).

We currently support the plugin on:
- 9.2
- 9.6

=== Per-version tooling
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ This updates versions and version bounds, and assembles the changelogs.open a PR
+
[source,bash]
-------------
nix build .#hydraJobs.x86_64-linux.musl64.ghc92.pir
mv ./result/bin/pir ./pir-x86_64-linux-ghc928
nix build .#hydraJobs.x86_64-linux.musl64.ghc96.pir
mv ./result/bin/pir ./pir-x86_64-linux-ghc96
nix build .#hydraJobs.x86_64-linux.musl64.ghc92.uplc
mv ./result/bin/uplc ./uplc-x86_64-linux-ghc928
nix build .#hydraJobs.x86_64-linux.musl64.ghc96.uplc
mv ./result/bin/uplc ./uplc-x86_64-linux-ghc96
-------------
7. Open a PR in the https://github.com/input-output-hk/cardano-haskell-packages[CHaP repository] for publishing the new version. Run `./scripts/add-from-github.sh "https://github.com/input-output-hk/plutus" COMMIT-SHA LIST-OF-UPDATED-PACKAGES` (see https://github.com/input-output-hk/cardano-haskell-packages#-from-github[the README on CHaP]). Example: https://github.com/input-output-hk/cardano-haskell-packages/pull/394.
- If issues are found, create a release branch `release/x.y.z`, fix the issues on master, backport the fixes to `release/x.y.z`, tag `x.y.z.0-rc2`, and go to step 4.
Expand Down
6 changes: 6 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ if impl(ghc < 9.0) || os(windows)
-- won't actually build it.
allow-older: plutus-cert:base

-- Recently introduced flag to be clever and use SIMD instructions.
-- We don't need this and it causes problems in a few settings including
-- cross-compilation.
package bitvec
flags: -simd

-- See the note on nix/agda-packages.nix for why this is here.
-- (NOTE this will change to ieee754 in newer versions of nixpkgs).
extra-packages: ieee, filemanip
Expand Down
2 changes: 1 addition & 1 deletion doc/read-the-docs-site/plutus-doc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ common lang

common ghc-version-support
-- See the section on GHC versions in CONTRIBUTING
if impl(ghc <9.2)
if impl(ghc <9.6)
buildable: False

executable doc-doctests
Expand Down
112 changes: 82 additions & 30 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
inputs.CHaP.follows = "CHaP";
inputs.haskell-nix.follows = "haskell-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.iohk-nix.follows = "iohk-nix";
};

nixpkgs.follows = "haskell-nix/nixpkgs";
Expand All @@ -28,6 +29,7 @@
url = "github:input-output-hk/haskell.nix";
inputs.hackage.follows = "hackage";
};
iohk-nix.url = "github:input-output-hk/iohk-nix";
};


Expand Down
4 changes: 2 additions & 2 deletions nix/agda-project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
pkgs.haskell-nix.hackage-project {
name = "Agda";

version = "2.6.2.2";
version = "2.6.4";

compiler-nix-name = "ghc92";
compiler-nix-name = "ghc96";

cabalProjectLocal = ''
extra-packages: ieee754, filemanip
Expand Down
4 changes: 2 additions & 2 deletions nix/agda-with-stdlib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ let
# Need a newer version for 2.6.2 compatibility
stdlib = repoRoot.nix.agda-packages.standard-library.overrideAttrs (oldAtts: rec {

version = "1.7";
version = "1.7.3";

src = pkgs.fetchFromGitHub {
repo = "agda-stdlib";
owner = "agda";
rev = "v${version}";
sha256 = "14h3jprm6924g9576v25axn9v6xnip354hvpzlcqsc5qqyj7zzjs";
sha256 = "sha256-vtL6VPvTXhl/mepulUm8SYyTjnGsqno4RHDmTIy22Xg=";
};
# This is preConfigure is copied from more recent nixpkgs that also
# uses version 1.7 of standard-library. Old nixpkgs (that used 1.4)
Expand Down
Loading

0 comments on commit d59a047

Please sign in to comment.