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

use pinned nixpkgs

This commit is contained in:
Cadey Ratio 2020-02-13 02:42:12 +00:00
parent d2728952c7
commit 4caae46230
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -3,4 +3,4 @@
let let
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
pkgs = import sources.nixpkgs { }; pkgs = import sources.nixpkgs { };
in pkgs.callPackage ./site.nix { pkgs = pkgs; } in pkgs.callPackage ./site.nix { inherit pkgs; }

14
nix/sources.json
View File

@ -12,15 +12,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": "master", "branch": "nixpkgs-unstable",
"description": "Nix Packages collection", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": null, "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs-channels",
"rev": "48704fbd4fc4dc9660ab04f938048b4894ecb140", "rev": "cc1ae9f21b9e0ce998e706a3de1bad0b5259f22d",
"sha256": "1yghh74jw93air3jwljiyl79iypl9rgr4x4aag0f2jyq73vhzf8p", "sha256": "0zjafww05h50ncapw51b5qxgbv9prjyag0j22jnfc3kcs5xr4ap0",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/48704fbd4fc4dc9660ab04f938048b4894ecb140.tar.gz", "url": "https://github.com/NixOS/nixpkgs-channels/archive/cc1ae9f21b9e0ce998e706a3de1bad0b5259f22d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"vgo2nix": { "vgo2nix": {

3
shell.nix
View File

@ -1,6 +1,7 @@
let let
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
niv = (import sources.niv { }).niv;
pkgs = import sources.nixpkgs { }; pkgs = import sources.nixpkgs { };
xepkgs = import sources.xepkgs { }; xepkgs = import sources.xepkgs { };
vgo2nix = import sources.vgo2nix { }; vgo2nix = import sources.vgo2nix { };
in pkgs.mkShell { buildInputs = [ pkgs.go pkgs.niv xepkgs.gopls vgo2nix ]; } in pkgs.mkShell { buildInputs = [ pkgs.go xepkgs.gopls niv vgo2nix ]; }

5
site.nix
View File

@ -1,4 +1,4 @@
{ pkgs ? import <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";
@ -8,10 +8,9 @@ buildGoPackage rec {
version = "latest"; version = "latest";
goPackagePath = "christine.website"; goPackagePath = "christine.website";
src = ./.; src = ./.;
nativeBuildInputs = [ makeWrapper ];
goDeps = ./deps.nix; goDeps = ./deps.nix;
allowGoReference = false; allowGoReference = false;
preBuild = '' preBuild = ''
export CGO_ENABLED=0 export CGO_ENABLED=0
buildFlagsArray+=(-pkgdir "$TMPDIR") buildFlagsArray+=(-pkgdir "$TMPDIR")