diff options
| author | Christine Dodrill <me@christine.website> | 2020-05-28 21:19:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 21:19:21 -0400 |
| commit | 7d1be8022686e7440b99aaae39a09009a4eb9268 (patch) | |
| tree | ce7e4f36e2c6ba8774985e7931f5a24b1a55a6ae | |
| parent | a447d13e2e190ba8f22c01e820d545ab3f17fa03 (diff) | |
| download | xesite-7d1be8022686e7440b99aaae39a09009a4eb9268.tar.xz xesite-7d1be8022686e7440b99aaae39a09009a4eb9268.zip | |
Nixpkgs unstable (#157)
* fixes
* how did this ever work???
| -rw-r--r-- | nix/sources.json | 8 | ||||
| -rw-r--r-- | shell.nix | 1 | ||||
| -rw-r--r-- | 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": { @@ -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; @@ -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 ''; } |