24fd1e9bdc
The user's local node configuration directory usually contains a copy of examples/shell.nix. 1. Move the shell implementation from shell.nix to nix-bitcoin/helper/makeShell.nix Because the shell is no longer defined locally in the user's config directory, we can now ship new shell features via nix-bitcoin updates. 2. Simplify examples/nix-bitcoin-release.nix nix-bitcoin-release.nix, as generated via `fetch-release`, now contains a simple fetchTarball statement which can be directly imported. This allows us to get rid of the extra `nix-bitcoin-unpacked` derivation which adds a dependency on the user's local nixpkgs. To keep `fetch-release` as simple as possible for easy auditing, we just fetch and verify a `nar-hash.txt` file that is now uploaded via `push-release.sh`. A migration guide for updating the user's local `shell.nix` is automatically printed when the user starts a new shell after updating nix-bitcoin. This is achieved by throwing an error in `generate-secrets`, which is called on shell startup. This commit is required to deploy the new extensible `generate-secrets` mechanism introduced in the next commit.
29 lines
1.1 KiB
Nix
29 lines
1.1 KiB
Nix
let
|
|
nixpkgsPinned = import ./nixpkgs-pinned.nix;
|
|
in
|
|
# Set default values for use without flakes
|
|
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; }
|
|
, pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }
|
|
}:
|
|
let self = {
|
|
spark-wallet = pkgs.callPackage ./spark-wallet { };
|
|
liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
|
|
joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
|
|
generate-secrets = import ./generate-secrets-deprecated.nix;
|
|
nixops19_09 = pkgs.callPackage ./nixops { };
|
|
krops = import ./krops { };
|
|
netns-exec = pkgs.callPackage ./netns-exec { };
|
|
extra-container = pkgs.callPackage ./extra-container { };
|
|
clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
|
|
clboss = pkgs.callPackage ./clboss { };
|
|
secp256k1 = pkgs.callPackage ./secp256k1 { };
|
|
|
|
nbPython3Packages = (pkgs.python3.override {
|
|
packageOverrides = import ./python-packages self;
|
|
}).pkgs;
|
|
|
|
pinned = import ./pinned.nix pkgs pkgsUnstable;
|
|
|
|
modulesPkgs = self // self.pinned;
|
|
}; in self
|