From 8524db6577b7b1fb7a308b2200b06670a154b028 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Wed, 3 Mar 2021 18:30:02 +0100
Subject: [PATCH] Migrate to nom-build

---
 home-manager/roles/laptop.nix | 4 ++--
 home-manager/roles/zsh/zshrc  | 2 +-
 lib/update-system.nix         | 2 +-
 nix/sources.json              | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home-manager/roles/laptop.nix b/home-manager/roles/laptop.nix
index 45f4d844..a3d0076e 100644
--- a/home-manager/roles/laptop.nix
+++ b/home-manager/roles/laptop.nix
@@ -37,9 +37,9 @@ in {
         say "Building ~/.modes for apollo"
         nixPath <- myNixPath "${configPath}"
         setEnv "WITH_SECRETS" "false"
-        nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom
+        nom_build nixPath (params ++ remoteBuildParams)
         setEnv "WITH_SECRETS" "true"
-        nix_build nixPath params &!> StdOut |> nom
+        nom_build nixPath params
         activate_mode
     '';
     quickUpdateMode = pkgs.writeHaskellScript {
diff --git a/home-manager/roles/zsh/zshrc b/home-manager/roles/zsh/zshrc
index 622a88ed..3e70a002 100644
--- a/home-manager/roles/zsh/zshrc
+++ b/home-manager/roles/zsh/zshrc
@@ -9,7 +9,7 @@ mkdir -p /var/run/user/$UID/tmp/downloads
 setopt prompt_subst
 autoload -U colors && colors # Enable colors in prompt
 
-alias nix-build-remote="nix-build --builders '@/etc/nix/machines' --max-jobs 0"
+alias nom-build-remote="nom-build --builders '@/etc/nix/machines' --max-jobs 0"
 alias nixpkgs-review-pr-remote='nixpkgs-review pr --build-args "--builders @/etc/nix/machines --max-jobs 0"'
 alias nixpkgs-review-rev-remote='nixpkgs-review rev --build-args "--builders @/etc/nix/machines --max-jobs 0"'
 alias cat=bat
diff --git a/lib/update-system.nix b/lib/update-system.nix
index 3a1d2b45..ae31e025 100644
--- a/lib/update-system.nix
+++ b/lib/update-system.nix
@@ -9,7 +9,7 @@ in {
         paths <- myNixPath "${configPath}"
         args <- getArgs
         setEnv "WITH_SECRETS" "false"
-        nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom
+        nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
         setEnv "WITH_SECRETS" "true"
         nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
   '';
diff --git a/nix/sources.json b/nix/sources.json
index b5cbd69a..4f6fdc63 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -93,10 +93,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f",
-        "sha256": "0cmgzih3qgh9zkwzqznbljhglr767b41psjjhyk4a8nva4sc59sq",
+        "rev": "a2b0ea6865b2346ceb015259c76e111dcca039c5",
+        "sha256": "12dgwajv3w94p13scj68c24v01p055k9hcpcsn7w9i8fys72s99d",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/e9f8cddbcd2167cf8eecb7ee6637d1e078018b4f.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/a2b0ea6865b2346ceb015259c76e111dcca039c5.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "obelisk": {