diff --git a/docs.nix b/docs.nix index 813a6cb432942fccd96b96ee07313ff84cf885c6..9bb64627870dfee01c6858d5699001cae96045c4 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 2c1c5123da656d34fafe0883b50ef49c578c6c8b..0f163ff67645190787e64fa196663256be36d74c 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 0000000000000000000000000000000000000000..536d913b89ba6a57d8d683381ea1c8f40e026b4f --- /dev/null +++ b/stable2105.nix @@ -0,0 +1 @@ +import (builtins.fetchTarball (builtins.fromJSON (builtins.readFile ./nixpkgs-2105.json)))