diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 248453544d..2c3c022684 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -239,7 +239,7 @@ jobs: - name: "Check hix -- run github:haskell/cabal/3.10#cabal-install:exe:cabal -- --version" 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" - nix-tools: + check-nix-tools: runs-on: [self-hosted, linux] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml index a258a30b0f..fd7c804b46 100644 --- a/.github/workflows/upload-artifacts.yml +++ b/.github/workflows/upload-artifacts.yml @@ -1,4 +1,4 @@ -name: Wait for Hydra Build +name: Update Static Nix Tools on: push: diff --git a/nix-tools-static.nix b/nix-tools-static.nix index 5a6b7d8834..500b5bd46b 100644 --- a/nix-tools-static.nix +++ b/nix-tools-static.nix @@ -1,22 +1,22 @@ -pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.2/"; in { +pkgs: let baseurl = "https://github.com/input-output-hk/haskell.nix/releases/download/nix-tools-0.3.5/"; in { aarch64-darwin = pkgs.fetchurl { name = "aarch64-darwin-nix-tools-static"; url = "${baseurl}aarch64-darwin-nix-tools-static.zip"; - sha256 = "sha256-SlTAgNj3YjZpobl/aIZLI+o8EpxznW5X90UBTtHDwbw="; + sha256 = "sha256-umzS70a8h1pigTzBJdkChEPqIk83NXfi02zIDQIDrzI="; }; x86_64-darwin = pkgs.fetchurl { name = "x86_64-darwin-nix-tools-static"; url = "${baseurl}x86_64-darwin-nix-tools-static.zip"; - sha256 = "sha256-6m2f3DoARyoxR5Fh+87TfVCLkewwhozVLKbUzfXvUxs="; + sha256 = "sha256-O0T0tI+vD5ZuozKvqlfQR93UO6p4P0HyPQDLvhUIChs="; }; aarch64-linux = pkgs.fetchurl { name = "aarch64-linux-nix-tools-static"; url = "${baseurl}aarch64-linux-nix-tools-static.zip"; - sha256 = "sha256-MX4u23nzjByT9zcSN+HlKOAgQNtYvcuR8iOh54wR41U="; + sha256 = "sha256-J3z5WbEm96k25UyOK3kKRtecQvTQIORRhoROKFSULZI="; }; x86_64-linux = pkgs.fetchurl { name = "x86_64-linux-nix-tools-static"; url = "${baseurl}x86_64-linux-nix-tools-static.zip"; - sha256 = "sha256-QzTCy7HPY5xN6VFKJcibE1gWLsT4u8OPfJHvDMK3v7M="; + sha256 = "sha256-CKf8Drj1UOwlAg16S4kuyVp25O7al/5YzxwrLawVnwQ="; }; } diff --git a/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs b/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs index a0156f1df4..8f6f8a97ce 100644 --- a/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs +++ b/nix-tools/nix-tools/lib-cabal2nix/Cabal2Nix.hs @@ -453,6 +453,7 @@ instance {-# OVERLAPS #-} ToNixExpr a => ToNixExpr [a] where -- condtional statements in .cabal files. fixSystem :: String -> String fixSystem "isJavascript" = "isJavaScript" +fixSystem "isDragonfly" = "isDragonFly" fixSystem s = s instance ToNixExpr ConfVar where