fort-nix/nix-bitcoin
1
1
Fork 0
mirror of https://github.com/fort-nix/nix-bitcoin.git synced 2024-11-22 13:14:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#704: Update nixpkgs

Browse Source 
47e57821f6 update nixpkgs (Jonas Nick)
2bb70e84be update-flake.sh: support 2.18.2 (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 47e57821f6

Tree-SHA512: 67290afde0bc7fb1df89f9afd59136fd5e6c0434cd8a9f3373f17cca70f334b43c9a7193f149c0a7f8eaf8d5cdc463de17b5b5b5b1e58338d28dfe34dbf9bb8d
This commit is contained in:
Jonas Nick 2024-05-24 18:56:43 +00:00
commit e21a687b7b
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
4 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -43,11 +43,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714782413,
"narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=",
"lastModified": 1716361217,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "651b4702e27a388f0f18e1b970534162dec09aff",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1714809261,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=",
"lastModified": 1716451822,
"narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450",
"rev": "3305b2b25e4ae4baee872346eae133cf6f611783",
"type": "github"
},
"original": {

8
helper/update-flake.sh
View File

@ -39,13 +39,13 @@ if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then
exit 1
fi
# Support Nix >2.18
# Support Nix >=2.19
{
versionGreaterThan() {
[[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) ]]
versionGreaterThanOrEqual() {
[[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) || $1 == "$2" ]]
}
nixVersion=$(nix --version | cut -d\ -f 3)
if versionGreaterThan "$nixVersion" 2.18; then
if versionGreaterThanOrEqual "$nixVersion" 2.19; then
# https://nixos.org/manual/nix/stable/release-notes/rl-2.19#:~:text=nix%20flake%20update
nixUpdateArg=--flake
else

2
pkgs/pinned.nix
View File

@ -3,7 +3,6 @@ pkgs: pkgsUnstable:
{
inherit (pkgs)
charge-lnd
electrs
extra-container
lightning-loop
lightning-pool
@ -14,6 +13,7 @@ pkgs: pkgsUnstable:
bitcoind
btcpayserver
clightning
electrs
elementsd
fulcrum
hwi

42
test/nixos-search/flake.lock
View File

@ -1,12 +1,15 @@
{
"nodes": {
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
@ -18,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1709405783,
"narHash": "sha256-qZ1lM5kTiqQT/jbhim0CxYaEqlfJKTQvytyaBflkDnM=",
"lastModified": 1714782417,
"narHash": "sha256-AhnsgqwOvK7Ftv1Sw9uzJGxov0cx9ygSjcKQSAWbiPg=",
"owner": "NixOS",
"repo": "infra",
"rev": "1261d183ad0c1cf036853087be306e7c792e0cdd",
"rev": "0b39213973d7a4bab9f710dadb8ea1b14d206627",
"type": "github"
},
"original": {
@ -39,11 +42,11 @@
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1714664183,
"narHash": "sha256-qceVzCWtdfEvfNgAnhf+X4CfaEJ3XjC1bBVvX3dTH1I=",
"lastModified": 1715356306,
"narHash": "sha256-PRGw/1gCYDsLVXFwSGfOWe9vJhiQ7lE0XHpKXLDcsRw=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "0c6625918268410ed0f62731b865284536bf91ce",
"rev": "1242aebd1438548fa1e3699824599337cce4cd32",
"type": "github"
},
"original": {
@ -54,11 +57,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1680213900,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"lastModified": 1714635257,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"type": "github"
},
"original": {
@ -87,6 +90,21 @@
"inputs": {
"nixos-search": "nixos-search"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",