diff options
| author | Ben Sima <ben@bsima.me> | 2021-06-10 08:14:16 -0400 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2021-11-26 13:47:35 -0500 |
| commit | 72a7aaa39e7552970f466e712e1f7ef91aeb03c8 (patch) | |
| tree | 8b8d501d28a9c1d56a0150d8129ff6324f196ad9 /Biz/Bild/Deps | |
| parent | 0ff0a23c8c7425b0d56b95e318c2087e74cb6605 (diff) | |
Upgrade to nixos-21.05
Getting me closer to the latest GHC. This release also includes my own packages
that I submitted some time ago.
GHCJS is not present in 21.05 for some reason, but I think it's back in master,
so I might do another upgrade soon, but for now I just disabled my GHCJS
support. I'm not really using it anyway.
I also had to bring it string-quote, update nixos-mailserver, and a few other
things.
Diffstat (limited to 'Biz/Bild/Deps')
| -rw-r--r-- | Biz/Bild/Deps/Haskell.nix | 1 | ||||
| -rw-r--r-- | Biz/Bild/Deps/guile-opengl.nix | 3 | ||||
| -rw-r--r-- | Biz/Bild/Deps/inspekt3d.nix | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix index 4fd2d85..d2e6557 100644 --- a/Biz/Bild/Deps/Haskell.nix +++ b/Biz/Bild/Deps/Haskell.nix @@ -53,7 +53,6 @@ with hpkgs; servant-server split stm - string-quote stripe-haskell tasty tasty-hunit diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Biz/Bild/Deps/guile-opengl.nix index d334430..34019d5 100644 --- a/Biz/Bild/Deps/guile-opengl.nix +++ b/Biz/Bild/Deps/guile-opengl.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , pkgconfig , guile @@ -29,7 +30,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig guile libGL libGLU freeglut ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Guile bindings for the OpenGL graphics API"; homepage = "https://www.gnu.org/software/guile-opengl/"; license = licenses.gpl3Plus; diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix index 2d76b0d..1093165 100644 --- a/Biz/Bild/Deps/inspekt3d.nix +++ b/Biz/Bild/Deps/inspekt3d.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , autoreconfHook , pkgconfig @@ -30,7 +31,7 @@ stdenv.mkDerivation { GUILE_AUTO_COMPILE = 0; preConfigure = "./bootstrap"; - meta = with stdenv.lib; { + meta = with lib; { description = "Lightweight 3D viewer for Libfive written in Guile Scheme"; homepage = "https://gitlab.com/kavalogic-inc/inspekt3d"; license = licenses.gpl3; |