Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update nix-tools-static.nix #2268

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

update nix-tools-static.nix #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0bb2cb5
update nix-tools-static.nix
Oct 24, 2024
16c20d8
Bump Cabal-syntax-json
andreabedini Oct 31, 2024
e6faa83
Revert "update nix-tools-static.nix"
hamishmack Nov 8, 2024
f173def
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Nov 8, 2024
2c6d942
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Nov 11, 2024
9595772
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Dec 11, 2024
f563837
Use latest haskellNix and Cabal-syntax-json in nix-tools
hamishmack Dec 11, 2024
985efa8
Use GHC 9.6.6
hamishmack Dec 11, 2024
c608fd3
Merge remote-tracking branch 'origin/master' into static-nix-tools
hamishmack Dec 11, 2024
7ce0cbc
Try to fix waiting for hydra
hamishmack Dec 12, 2024
6679442
update nix-tools-static.nix
Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/upload-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Wait for nix-tools meta job
uses: input-output-hk/actions/wait-for-hydra@angerman/support-prs
with:
status: 'ci/hydra-build:nix-tools'
check: 'ci/hydra-build:nix-tools'

- name: "Pull nix-tools"
run: |
Expand Down
10 changes: 5 additions & 5 deletions nix-tools-static.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.6/"; in {
pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.2.9/"; in {
aarch64-darwin = pkgs.fetchurl {
name = "aarch64-darwin-nix-tools-static";
url = "${baseurl}aarch64-darwin-nix-tools-static.zip";
sha256 = "sha256-9WpTIWlpUvG3pI+tcbAMh6sMH0QO/coZrxDYWD43iq0=";
sha256 = "sha256-cXfdL4jgKYetMoOkNAis6dj7Fyy1llxNgKQtRJTwjhQ=";
};
x86_64-darwin = pkgs.fetchurl {
name = "x86_64-darwin-nix-tools-static";
url = "${baseurl}x86_64-darwin-nix-tools-static.zip";
sha256 = "sha256-UUr9bo2OpLPsvHRSeO2B6DKVDVTsHepRlTqN6UZoZ2M=";
sha256 = "sha256-D4Dpiigr2IfsSIFqVEt1syBVCQbPdP7bX5fnhFCGZe0=";
};
aarch64-linux = pkgs.fetchurl {
name = "aarch64-linux-nix-tools-static";
url = "${baseurl}aarch64-linux-nix-tools-static.zip";
sha256 = "sha256-96s6RXN8st0JK0eYSOkTJvnlTxYVdE81+ZUGJEsC46A=";
sha256 = "sha256-nVaz5VXhB5ZBT46FucisZCRrE+B1MlONO+4CEWKpwPY=";
};
x86_64-linux = pkgs.fetchurl {
name = "x86_64-linux-nix-tools-static";
url = "${baseurl}x86_64-linux-nix-tools-static.zip";
sha256 = "sha256-LMFVUKNycjVFBb3ChZsPbRNgab50zOHl7nMBrDdeTrQ=";
sha256 = "sha256-W0ZCDTV800dhMY/HgAeiyWnCW7f1kqFadYo6R6GadqI=";
};
}
6 changes: 3 additions & 3 deletions nix-tools/cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
index-state: 2024-10-15T20:31:31Z
index-state: 2024-12-10T00:00:00Z

packages: nix-tools

Expand Down Expand Up @@ -36,5 +36,5 @@ source-repository-package
source-repository-package
type: git
location: https://github.com/andreabedini/Cabal-syntax-json.git
tag: b7192832f730d9181a013ef7c77f2ad0b30cca43
--sha256: sha256-Yw2HQOCmjOvfKHi3xWbSniAZfyrshOvsgmUbqFmDDpU=
tag: c6c01db076117c309f8ec2e0b8f58b105479f391
--sha256: sha256-Vj66Sdeq3lizcZxSBJ8QQhPVJ7QDXRdpvDX65RF51oY=
30 changes: 15 additions & 15 deletions nix-tools/flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion nix-tools/static/project.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ let

static-nix-tools-project = pkgs.haskell-nix.project' {

compiler-nix-name = "ghc928";
compiler-nix-name = "ghc966";

src = ../.;

Expand Down