Update to lts-23

hasktorch · Feb 2, 2025 · deb1b6c · deb1b6c
1 parent 64187fb
commit deb1b6c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/.github/workflows/nix-linux.yml b/.github/workflows/nix-linux.yml
@@ -4,9 +4,12 @@ on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - uses: cachix/install-nix-action@v30
+    - uses: cachix/cachix-action@v15
+      with:
+        name: hasktorch
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: nix build .
diff --git a/.github/workflows/nix-macos.yml b/.github/workflows/nix-macos.yml
@@ -0,0 +1,15 @@
+name: nix-macos
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cachix/install-nix-action@v30
+    - uses: cachix/cachix-action@v15
+      with:
+        name: hasktorch
+        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
+    - run: nix build .
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,7 +4,7 @@
   };
   inputs = {
     utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:junjihashimoto/nixpkgs?rev=5c77923028d8ec6c54dc9820e44bced372c68f3d";
+    nixpkgs.url = "github:nixos/nixpkgs?rev=01d7c7caba0f021e986f7e46fae3c8e41265a145";
   };
 
   outputs = { self, nixpkgs, utils  }:
@@ -14,6 +14,9 @@
           inherit system;
           config.allowUnfree = true;
           config.cudaSupport = system == "x86_64-linux";
+          # config.ihaskell.packages = pkgs: with pkgs; [
+          #   hasktorch
+          # ];
         };
         ghcWithHasktorch = pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [
           hasktorch
@@ -26,6 +29,7 @@
             ghcWithHasktorch
             cabal-install
             stack
+            # ihaskell
           ];
           shellHook = ''
             source ${git}/share/bash-completion/completions/git-prompt.sh