Skip to content

Commit

Permalink
Bump Nix.
Browse files Browse the repository at this point in the history
  • Loading branch information
athas committed Aug 15, 2024
1 parent 2da001d commit dc08c73
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1",
"sha256": "0yaww493m6zlfhjh9xwh7vi1iqwkdw9s4dq6xsj2wcfwwpmg0lym",
"rev": "0f1874526206d8a2d6f0a3925618cc45ac83049f",
"sha256": "0fab3015jdy6dsrjcsa8ipsl4pr7cizg8bs3ff2dawxfgrgizyqp",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a39290dfdf0a769a3fda56b61fdf40f7d9db7ea1.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/0f1874526206d8a2d6f0a3925618cc45ac83049f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}
25 changes: 14 additions & 11 deletions shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
let
sources = import ./nix/sources.nix;
pkgs = import sources.nixpkgs {};
python = pkgs.python311Packages;
haskell = pkgs.haskell.packages.ghc96;
in
pkgs.stdenv.mkDerivation {
name = "futhark";
Expand All @@ -14,10 +16,10 @@ pkgs.stdenv.mkDerivation {
file
git
parallel
haskell.compiler.ghc94
haskell.ghc
ormolu
haskell.packages.ghc94.weeder
#haskell.packages.ghc94.haskell-language-server
haskell.weeder
haskell.haskell-language-server
haskellPackages.graphmod
haskellPackages.apply-refact
xdot
Expand All @@ -29,14 +31,15 @@ pkgs.stdenv.mkDerivation {
ghcid
niv
ispc
python3Packages.mypy
python3Packages.black
python3Packages.numpy
python3Packages.pyopencl
python3Packages.matplotlib
python3Packages.jsonschema
python3Packages.sphinx
python3Packages.sphinxcontrib-bibtex
python.python
python.mypy
python.black
python.numpy
python.pyopencl
python.matplotlib
python.jsonschema
python.sphinx
python.sphinxcontrib-bibtex
imagemagick # needed for literate tests
]
++ lib.optionals (stdenv.isLinux)
Expand Down

0 comments on commit dc08c73

Please sign in to comment.