From 7efa5a81d9a8a4f195c5c56b6fbf56348203bebd Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 28 Jun 2021 16:03:01 -0400
Subject: [PATCH] build docs with newer nixos
no reason to keep carrying out custom graphviz package or build all this old
junk just for the docs
---
docs.nix | 16 ++--------------
shell.nix | 2 +-
stable2105.nix | 1 +
3 files changed, 4 insertions(+), 15 deletions(-)
create mode 100644 stable2105.nix
diff --git a/docs.nix b/docs.nix
index 813a6cb4..9bb64627 100644
--- a/docs.nix
+++ b/docs.nix
@@ -1,14 +1,2 @@
-{ pkgs ? import <nixpkgs> { } }:
-let
- # NixOS 19.03 packaged graphviz has trouble rendering our architecture
- # overview. Latest from upstream does alright, though. Use that.
- make-graphviz = (import (pkgs.path + /pkgs/tools/graphics/graphviz/base.nix) {
- rev = "b29d8e369011b832f72e0d250a05a0a15dcb5daa";
- sha256 = "1w61filywn9cif2nryf6vd34mxxbvv25q34fd34am1rx70bk08ps";
- version = "b29d8e369011b832f72e0d250a05a0a15dcb5daa";
- });
- graphviz = (pkgs.callPackage make-graphviz { }).overrideAttrs (old: {
- patches = [];
- });
-in
- pkgs.callPackage ./privatestorageio.nix { inherit graphviz; }
+{ pkgs ? import ./stable2105.nix { } }:
+pkgs.callPackage ./privatestorageio.nix { }
diff --git a/shell.nix b/shell.nix
index 2c1c5123..0f163ff6 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,6 @@
let
nixpkgs = import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs.json))) { };
- stable2105 = import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-2105.json))) { };
+ stable2105 = import ./stable2105.nix { };
in
{ pkgs ? nixpkgs }:
pkgs.mkShell {
diff --git a/stable2105.nix b/stable2105.nix
new file mode 100644
index 00000000..536d913b
--- /dev/null
+++ b/stable2105.nix
@@ -0,0 +1 @@
+import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-2105.json)))
--
GitLab