From 7d1be8022686e7440b99aaae39a09009a4eb9268 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Thu, 28 May 2020 21:19:21 -0400
Subject: [PATCH] Nixpkgs unstable (#157)

* fixes

* how did this ever work???
---
 nix/sources.json |  8 ++++----
 shell.nix        |  1 -
 site.nix         | 16 ++++++++--------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json
index 0959570..670fcbd 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -24,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-20.03",
+        "branch": "nixpkgs-unstable",
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs-channels",
-        "rev": "48723f48ab92381f0afd50143f38e45cf3080405",
-        "sha256": "0h3b3l867j3ybdgimfn76lw7w6yjhszd5x02pq5827l659ihcf53",
+        "rev": "da60549504f23c7ee03f72e8ce8bef9ccf6f79b7",
+        "sha256": "0g1vym0zay1cy6h6ci7d4zrs4vrp5zvhsjpbp1lcgw7kaxafc7gf",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/48723f48ab92381f0afd50143f38e45cf3080405.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs-channels/archive/da60549504f23c7ee03f72e8ce8bef9ccf6f79b7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "xepkgs": {
diff --git a/shell.nix b/shell.nix
index 6c94f39..2b7dbab 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,6 @@
 let
   sources = import ./nix/sources.nix;
   pkgs = import sources.nixpkgs { };
-  niv = (import sources.niv { }).niv;
   dhallpkgs = import sources.easy-dhall-nix { inherit pkgs; };
   dhall-yaml = dhallpkgs.dhall-yaml-simple;
   dhall = dhallpkgs.dhall-simple;
diff --git a/site.nix b/site.nix
index aabe7be..4dcaa2c 100644
--- a/site.nix
+++ b/site.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import (import ./nix/sources.nix).nixpkgs }:
+{ pkgs ? import (import ./nix/sources.nix).nixpkgs { } }:
 with pkgs;
 
 assert lib.versionAtLeast go.version "1.13";
@@ -17,12 +17,12 @@ buildGoPackage rec {
   '';
 
   postInstall = ''
-    cp -rf $src/blog $bin/blog
-    cp -rf $src/css $bin/css
-    cp -rf $src/gallery $bin/gallery
-    cp -rf $src/signalboost.dhall $bin/signalboost.dhall
-    cp -rf $src/static $bin/static
-    cp -rf $src/talks $bin/talks
-    cp -rf $src/templates $bin/templates
+    cp -rf $src/blog $out/blog
+    cp -rf $src/css $out/css
+    cp -rf $src/gallery $out/gallery
+    cp -rf $src/signalboost.dhall $out/signalboost.dhall
+    cp -rf $src/static $out/static
+    cp -rf $src/talks $out/talks
+    cp -rf $src/templates $out/templates
   '';
 }