Try to provide reproducible environments.

Haskell needed updates. This doesn't handle the OCaml and Scala implementations properly.
athas · May 15, 2022 · a1fbf0d · a1fbf0d
1 parent 549f4b6
commit a1fbf0d
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 12 deletions.
diff --git a/fsharp/shell.nix b/fsharp/shell.nix
@@ -1,4 +1,7 @@
-with import <nixpkgs> {};
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
 stdenv.mkDerivation {
     name = "ray";
     buildInputs = [ dotnet-sdk_3 gnumake ];

diff --git a/futhark/shell.nix b/futhark/shell.nix
@@ -1,4 +1,7 @@
-with import <nixpkgs> {};
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
 stdenv.mkDerivation {
     name = "ray";
     buildInputs = [ futhark ocl-icd opencl-headers ];

diff --git a/haskell/Image.hs b/haskell/Image.hs
@@ -1,9 +1,9 @@
-{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric, DeriveAnyClass, DataKinds #-}
 module Image (mkImage, writeImage) where
 
 import Data.Massiv.Array as A
 import Data.Massiv.Array.IO
 
-mkImage :: Int -> Int -> (Int -> Int -> Pixel SRGB Word8) -> Image S SRGB Word8
+mkImage :: Int -> Int -> (Int -> Int -> Pixel (SRGB 'NonLinear) Word8) -> Image S (SRGB 'NonLinear) Word8
 mkImage height width pixel =
   makeArrayR S Par (Sz2 height width) (\(i :. j) -> pixel i j)
diff --git a/haskell/Raytracing.hs b/haskell/Raytracing.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE Strict #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE DataKinds #-}
 module Raytracing
   ( Pos, Dir, Camera, mkCamera
   , Sphere(..), sphereAABB
@@ -180,10 +181,10 @@ traceRay objs width height cam =
               ray = getRay cam u v
           in rayColour objs ray 0
 
-colourToPixel :: Colour -> Pixel SRGB Word8
+colourToPixel :: Colour -> Pixel (SRGB 'NonLinear) Word8
 colourToPixel (Vec3 r g b) = toPixel8 $ PixelSRGB r g b
 
-render :: Objs -> Int -> Int -> Camera -> Image S SRGB Word8
+render :: Objs -> Int -> Int -> Camera -> Image S (SRGB 'NonLinear) Word8
 render objs height width cam =
   mkImage height width $ \j i ->
   colourToPixel $ traceRay objs width height cam j i
diff --git a/haskell/cabal.project b/haskell/cabal.project
@@ -1,2 +1,2 @@
 packages: .
-index-state: 2020-04-13T13:47:47Z
+index-state: 2022-05-15T08:27:37Z
diff --git a/haskell/shell.nix b/haskell/shell.nix
@@ -1,6 +1,8 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-with nixpkgs;
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
 stdenv.mkDerivation {
   name = "ray";
-  buildInputs = [ zlib zlib.out pkgconfig haskell.compiler.ghc883 cabal-install ];
+  buildInputs = [ zlib zlib.out pkgconfig ghc cabal-install ];
 }
diff --git a/ispc/shell.nix b/ispc/shell.nix
@@ -0,0 +1,8 @@
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
+stdenv.mkDerivation {
+  name = "ray";
+  buildInputs = [ ispc ];
+}
diff --git a/ocaml/shell.nix b/ocaml/shell.nix
@@ -0,0 +1,9 @@
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
+stdenv.mkDerivation {
+  name = "ray";
+  # FIXME: this is not enough.  See README.md.
+  buildInputs = [ opam ];
+}
diff --git a/rust/shell.nix b/rust/shell.nix
@@ -0,0 +1,8 @@
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
+stdenv.mkDerivation {
+  name = "ray";
+  buildInputs = [ cargo rustc ];
+}
diff --git a/scala/shell.nix b/scala/shell.nix
@@ -1,5 +1,7 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-with nixpkgs;
+with import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/820177eded91f3908cfc72dfee00e831ea3d0060.zip";
+  sha256 = "1yqx5zy154f8057inwjp2ranizgilvpblqq31cy7nryrwj2apics";
+}) {};
 stdenv.mkDerivation {
   name = "ray";
   buildInputs = [ sbt gnumake ];