Merge fort-nix/nix-bitcoin#489: Update nixpkgs & joinmarket: 0.9.5 -> 0.9.6

cb295d1a16 joinmarket: 0.9.5 -> 0.9.6 (nixbitcoin)
568d728e5c joinmarket: put python-packages in alphabetical order (nixbitcoin)
a3ff1351d9 update nixpkgs (Jonas Nick)
636d508b50 spark-wallet: use nodejs 14 instead of 12 since latter is EOL (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK cb295d1a16

Tree-SHA512: ca124de4d393c3828454599e4d3d3357560a6ae902c569b3edabf395cd6f5d50d8904db9f078f02b70cd0b67d013a263d238e9bc36ba34bc1bb7d9d9fd02a7e9
This commit is contained in:
Jonas Nick 2022-06-04 07:56:07 +00:00
commit 043ef53cb9
No known key found for this signature in database
GPG key ID: 4861DBF262123605
10 changed files with 72 additions and 38 deletions

View file

@ -18,11 +18,11 @@
"nixos-org-configurations": {
"flake": false,
"locked": {
"lastModified": 1651495498,
"narHash": "sha256-u/WU4G+DBJp7L8UO7UMLcor7QHfHp8P6pKwDPhBz504=",
"lastModified": 1653498760,
"narHash": "sha256-KCNAUCcWkTQy/ddrZzYZrtiT3Zg6rLb7QIylUDvKcco=",
"owner": "NixOS",
"repo": "nixos-org-configurations",
"rev": "2a65c35c03163f0ecbe0f86f4bd56aaf5c4f4dd0",
"rev": "34b9422847c5b67cbdbe26b89201b3354557f677",
"type": "github"
},
"original": {
@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1652295804,
"narHash": "sha256-VzvA5YxzPsn4t2tFLgj+QavsdO2YpH/1d3xrZ/18VdQ=",
"lastModified": 1653738462,
"narHash": "sha256-2eOJBUcahP6C7KmsYCM9GyZhGNFGyyUNmn0LNhEVKY4=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "3b41f2dcfd3448efea38f241c5229ac4948e51a7",
"rev": "1bf3ce7c9829d3daedc46a000062d09339936034",
"type": "github"
},
"original": {