Skip to content

Commit 26acfef

Browse files
hamishmackAuto Update Bot
and
Auto Update Bot
authored
Replace isDragonfly with isDragonFly in nix-tools (#2384)
* Replace isDragonfly with isDragonFly in nix-tools Fixes #2312 * Fix name clash for "nix-tools" * update nix-tools-static.nix * update nix-tools-static.nix --------- Co-authored-by: Auto Update Bot <[email protected]>
1 parent 81adeee commit 26acfef

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
- name: "Check hix -- run github:haskell/cabal/3.10#cabal-install:exe:cabal -- --version"
240240
run: "HIX_DIR=$(mktemp -d) nix run .#hix --accept-flake-config -- run github:haskell/cabal/3.10#cabal-install:exe:cabal --accept-flake-config --override-input haskellNix . -- --version"
241241

242-
nix-tools:
242+
check-nix-tools:
243243
runs-on: [self-hosted, linux]
244244
steps:
245245
- uses: actions/checkout@v4

.github/workflows/upload-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Wait for Hydra Build
1+
name: Update Static Nix Tools
22

33
on:
44
push:

nix-tools-static.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.2/"; in {
1+
pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.5/"; in {
22
aarch64-darwin = pkgs.fetchurl {
33
name = "aarch64-darwin-nix-tools-static";
44
url = "${baseurl}aarch64-darwin-nix-tools-static.zip";
5-
sha256 = "sha256-SlTAgNj3YjZpobl/aIZLI+o8EpxznW5X90UBTtHDwbw=";
5+
sha256 = "sha256-umzS70a8h1pigTzBJdkChEPqIk83NXfi02zIDQIDrzI=";
66
};
77
x86_64-darwin = pkgs.fetchurl {
88
name = "x86_64-darwin-nix-tools-static";
99
url = "${baseurl}x86_64-darwin-nix-tools-static.zip";
10-
sha256 = "sha256-6m2f3DoARyoxR5Fh+87TfVCLkewwhozVLKbUzfXvUxs=";
10+
sha256 = "sha256-O0T0tI+vD5ZuozKvqlfQR93UO6p4P0HyPQDLvhUIChs=";
1111
};
1212
aarch64-linux = pkgs.fetchurl {
1313
name = "aarch64-linux-nix-tools-static";
1414
url = "${baseurl}aarch64-linux-nix-tools-static.zip";
15-
sha256 = "sha256-MX4u23nzjByT9zcSN+HlKOAgQNtYvcuR8iOh54wR41U=";
15+
sha256 = "sha256-J3z5WbEm96k25UyOK3kKRtecQvTQIORRhoROKFSULZI=";
1616
};
1717
x86_64-linux = pkgs.fetchurl {
1818
name = "x86_64-linux-nix-tools-static";
1919
url = "${baseurl}x86_64-linux-nix-tools-static.zip";
20-
sha256 = "sha256-QzTCy7HPY5xN6VFKJcibE1gWLsT4u8OPfJHvDMK3v7M=";
20+
sha256 = "sha256-CKf8Drj1UOwlAg16S4kuyVp25O7al/5YzxwrLawVnwQ=";
2121
};
2222
}

nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ instance {-# OVERLAPS #-} ToNixExpr a => ToNixExpr [a] where
453453
-- condtional statements in .cabal files.
454454
fixSystem :: String -> String
455455
fixSystem "isJavascript" = "isJavaScript"
456+
fixSystem "isDragonfly" = "isDragonFly"
456457
fixSystem s = s
457458

458459
instance ToNixExpr ConfVar where

0 commit comments

Comments
 (0)