diff --git a/flake.lock b/flake.lock index 3db4bb9..05d77c5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1656065134, + "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c", "type": "github" }, "original": { @@ -17,27 +17,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653830209, - "narHash": "sha256-V+HnLKJzvk2HZcLUKt9z2puZ46vLo74chOakxbLfXek=", + "lastModified": 1656265786, + "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3", + "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgsUnstable": { "locked": { - "lastModified": 1653738054, - "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", + "lastModified": 1656250965, + "narHash": "sha256-2IlNf6jxEJiuCrGymqLOLjxk2SIj4HhVIwEb0kvcs24=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", + "rev": "9a17f325397d137ac4d219ecbd5c7f15154422f4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 338bce1..2cf84cf 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ ''; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/pkgs/clightning-plugins/default.nix b/pkgs/clightning-plugins/default.nix index d8eb58e..68187ab 100644 --- a/pkgs/clightning-plugins/default.nix +++ b/pkgs/clightning-plugins/default.nix @@ -22,7 +22,7 @@ let description = "Lightning node exporter for the prometheus timeseries server"; extraPkgs = [ prometheus_client ]; patchRequirements = - "--replace prometheus-client==0.6.0 prometheus-client==0.11.0" + "--replace prometheus-client==0.6.0 prometheus-client==0.13.1" + " --replace pyln-client~=0.9.3 pyln-client~=0.10.1"; }; rebalance = { description = "Keeps your channels balanced"; }; diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 2a4f963..608ac72 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,21 +2,21 @@ pkgs: pkgsUnstable: { inherit (pkgs) - charge-lnd - extra-container; - - inherit (pkgsUnstable) bitcoin bitcoind - btcpayserver + charge-lnd clightning electrs elementsd - hwi - lightning-loop + extra-container lightning-pool lnd - lndconnect + lndconnect; + + inherit (pkgsUnstable) + btcpayserver + hwi + lightning-loop nbxplorer; inherit pkgs pkgsUnstable; diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 92eb376..5f1deab 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "type": "github" }, "original": { @@ -18,11 +18,11 @@ "nixos-org-configurations": { "flake": false, "locked": { - "lastModified": 1653498760, - "narHash": "sha256-KCNAUCcWkTQy/ddrZzYZrtiT3Zg6rLb7QIylUDvKcco=", + "lastModified": 1654268653, + "narHash": "sha256-oTW2IFRAE1juNLE1tJ/mqVeSG1P+XPrm9o2E0irBVKg=", "owner": "NixOS", "repo": "nixos-org-configurations", - "rev": "34b9422847c5b67cbdbe26b89201b3354557f677", + "rev": "8e8668be80e6d3b6f5f602770dca42e6c6f33d50", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1653738462, - "narHash": "sha256-2eOJBUcahP6C7KmsYCM9GyZhGNFGyyUNmn0LNhEVKY4=", + "lastModified": 1654646126, + "narHash": "sha256-GjfJq6tK2IB8aQcXA3UkFa2/hsPYvT/H+KE9Ghse4j4=", "owner": "nixos", "repo": "nixos-search", - "rev": "1bf3ce7c9829d3daedc46a000062d09339936034", + "rev": "74ed61a9152400465f590a1ad2575c2526ee375b", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651726670, - "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "type": "github" }, "original": {