about summary refs log tree commit diff
path: root/users/grfn
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-06-02T20·32+0200
committertazjin <mail@tazj.in>2021-06-05T16·54+0000
commitb4ae6893e4e9d6c809e83a1934a8feea5d6adf5b (patch)
treed18365d6474d7794bb40ede5477ac1fd66c1a80b /users/grfn
parent4e90a38875f51f9f264e0355c6084083b768e7e7 (diff)
chore(3p/nixpkgs): Bump channels to 2021-06-05 r/2648
Includes the following depot changes & fixes:

* stable moves to NixOS 21.05
* stable isn't used anymore (but we'll keep the mechanism)
* haskell overlay's `random` override is removed (YAY!)
* grfn/iso: Switch to regular kernel rather than
  latest kernel, as latest kernel is currently marked as broken due to zfs
* grfn/home: Use julia_16-bin temporarily
  julia 1.5 (current julia-stable, source built release in nixpkgs)
  doesn't pass its own test suite. Julia 1.6 doesn't have a source built
  package in nixpkgs yet, so julia_16-bin appears to be the only working
  julia derivation currently.
* tazjin/tverskoy: Use zfs unstable, as stable zfs doesn't work with the
  latest kernel

Co-Authored-By: Griffin Smith <grfn@gws.fyi>
Co-Authored-By: sterni <sternenseemann@systemli.org>
Change-Id: I6f2e3d9f75077e4755de6bde9104d44b584cbe4c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3174
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn')
-rw-r--r--users/grfn/system/home/modules/development.nix4
-rw-r--r--users/grfn/system/system/iso.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index a79f5b98755f..6ad44abf053c 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -76,7 +76,9 @@ with lib;
 
     nodePackages.prettier
   ] ++ optionals (stdenv.isLinux) [
-    julia-stable
+    # TODO(grfn): replace with stable again once the current julia debacle
+    # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
+    julia_16-bin
     valgrind
   ];
 
diff --git a/users/grfn/system/system/iso.nix b/users/grfn/system/system/iso.nix
index 256aee6a5e3a..4adccebfb8a2 100644
--- a/users/grfn/system/system/iso.nix
+++ b/users/grfn/system/system/iso.nix
@@ -3,7 +3,7 @@
 let
   configuration = { ... }: {
     imports = [
-      "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+      "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
       "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
     ];