~jack/misc

33761b4f9c52db2c3a71a83c19b7f305e0581375 — Jack Kelly 8 months ago 7774220
Point ergodox nix at common nixpkgs pin
5 files changed, 2 insertions(+), 21 deletions(-)

M ergodox/default.nix
D ergodox/nix/nixpkgs.json
D ergodox/nix/nixpkgs.nix
D ergodox/nix/update.bash
M ergodox/shell.nix
M ergodox/default.nix => ergodox/default.nix +1 -1
@@ 1,4 1,4 @@
{ nixpkgs ? import ./nix/nixpkgs.nix }:
{ nixpkgs ? import ../nix/nixpkgs.nix }:
let
  inherit (nixpkgs) pkgs;


D ergodox/nix/nixpkgs.json => ergodox/nix/nixpkgs.json +0 -7
@@ 1,7 0,0 @@
{
  "url": "https://github.com/NixOS/nixpkgs",
  "rev": "0243f4455bb6b6911ccdf663681ca95430bf235e",
  "date": "2019-11-28T13:56:44+01:00",
  "sha256": "0m3az0r10ccjam9w4gcwbxql7rgdyymm3fwbwhga1dafq1vrrrfm",
  "fetchSubmodules": false
}

D ergodox/nix/nixpkgs.nix => ergodox/nix/nixpkgs.nix +0 -8
@@ 1,8 0,0 @@
let
  nixpkgsJson = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
  nixpkgsFunc = import (builtins.fetchTarball (with nixpkgsJson; {
    url = "${url}/archive/${rev}.tar.gz";
    inherit sha256;
  }));
in
  nixpkgsFunc {}

D ergodox/nix/update.bash => ergodox/nix/update.bash +0 -4
@@ 1,4 0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-prefetch-git

nix-prefetch-git https://github.com/NixOS/nixpkgs > nixpkgs.json

M ergodox/shell.nix => ergodox/shell.nix +1 -1
@@ 1,4 1,4 @@
{ nixpkgs ? import ./nix/nixpkgs.nix }:
{ nixpkgs ? import ../nix/nixpkgs.nix }:
let
  inherit (nixpkgs) pkgs;
in