Xeorg
/
site
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nixpkgs unstable (#157) 

* fixes

* how did this ever work???
This commit is contained in:
Cadey Ratio 2020-05-28 21:19:21 -04:00 committed by GitHub
parent a447d13e2e
commit 7d1be80226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nix/sources.json
View File

@ -24,15 +24,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "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", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs", "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs-channels", "repo": "nixpkgs-channels",
"rev": "48723f48ab92381f0afd50143f38e45cf3080405", "rev": "da60549504f23c7ee03f72e8ce8bef9ccf6f79b7",
"sha256": "0h3b3l867j3ybdgimfn76lw7w6yjhszd5x02pq5827l659ihcf53", "sha256": "0g1vym0zay1cy6h6ci7d4zrs4vrp5zvhsjpbp1lcgw7kaxafc7gf",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"xepkgs": { "xepkgs": {

1
shell.nix
View File

@ -1,7 +1,6 @@
let let
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
pkgs = import sources.nixpkgs { }; pkgs = import sources.nixpkgs { };
niv = (import sources.niv { }).niv;
dhallpkgs = import sources.easy-dhall-nix { inherit pkgs; }; dhallpkgs = import sources.easy-dhall-nix { inherit pkgs; };
dhall-yaml = dhallpkgs.dhall-yaml-simple; dhall-yaml = dhallpkgs.dhall-yaml-simple;
dhall = dhallpkgs.dhall-simple; dhall = dhallpkgs.dhall-simple;

16
site.nix
View File

@ -1,4 +1,4 @@
{ pkgs ? import (import ./nix/sources.nix).nixpkgs }: { pkgs ? import (import ./nix/sources.nix).nixpkgs { } }:
with pkgs; with pkgs;
assert lib.versionAtLeast go.version "1.13"; assert lib.versionAtLeast go.version "1.13";
@ -17,12 +17,12 @@ buildGoPackage rec {
''; '';
postInstall = '' postInstall = ''
cp -rf $src/blog $bin/blog cp -rf $src/blog $out/blog
cp -rf $src/css $bin/css cp -rf $src/css $out/css
cp -rf $src/gallery $bin/gallery cp -rf $src/gallery $out/gallery
cp -rf $src/signalboost.dhall $bin/signalboost.dhall cp -rf $src/signalboost.dhall $out/signalboost.dhall
cp -rf $src/static $bin/static cp -rf $src/static $out/static
cp -rf $src/talks $bin/talks cp -rf $src/talks $out/talks
cp -rf $src/templates $bin/templates cp -rf $src/templates $out/templates
''; '';
} }