greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#434: update nixpkgs{,-unstable}

Browse Source 
1f45f7351e update nixpkgs{,-unstable} (Jonas Nick)
53a9f136b9 lib: allow syscall `get_mempolicy` in default seccomp filter (Erik Arvstedt)
a2c01e5a56 update-flake: fix attribute path of pinned (Jonas Nick)
bb9f0b54ca spark-wallet: use HTTPS instead of SSH for Github (nixbitcoin)
906b7f83ff rtl: 0.11.2 -> 0.12.0 (nixbitcoin)
2a7630e6f4 cl-rest: 0.6.0 -> 0.6.1 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 1f45f7351e

Tree-SHA512: e96bb396558417c36c7dfcc8ac3f3a6b09b2453627d7c454bf948813c7a7fc82475d8579d485492c48aad44de4fd0ddd00dc73fc588f4e69b1eaae45bd6d040a
This commit is contained in:
Jonas Nick 2022-01-02 13:48:40 +00:00
commit 4d0e196a90
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
11 changed files with 1663 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock
View File

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1638887115, "lastModified": 1640887906,
"narHash": "sha256-emjtIeqyJ84Eb3X7APJruTrwcfnHQKs55XGljj62prs=", "narHash": "sha256-Eupk1UlNicCD2UNZuEKt6yhE6kFWAxXM/HyziOjG9CA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1bd4bbd49bef217a3d1adea43498270d6e779d65", "rev": "8a053bc2255659c5ca52706b9e12e76a8f50dbdd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1638910453, "lastModified": 1641016545,
"narHash": "sha256-fofA4tsAAdNgE+9Py0VsVbyX2ZQkgV+CVqQKGBA/dLE=", "narHash": "sha256-JMNwvnBzG0RjGG3eH27Y5/GlJ9ryeCdGJfqGbqxnmZY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f225322e3bea8638304adfcf415cd11de99f2208", "rev": "6f05cfdb1e78d36c0337516df674560e4b51c79b",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
helper/update-flake.nix
View File

@ -11,7 +11,7 @@ in rec {
# A pinned pkg is added to `stable` if the stable and unstable pkg versions # A pinned pkg is added to `stable` if the stable and unstable pkg versions
# are identical. # are identical.
versions = let versions = let
pinned = flake.nbPkgs.x86_64-linux.pinned; pinned = flake.legacyPackages.x86_64-linux.nbPkgs.pinned;
pinnedPkgs = lib.filterAttrs (n: v: lib.isDerivation v) pinned; pinnedPkgs = lib.filterAttrs (n: v: lib.isDerivation v) pinned;
stable = pinned.pkgs; stable = pinned.pkgs;
unstable = pinned.pkgsUnstable; unstable = pinned.pkgsUnstable;

2
pkgs/cl-rest/generate.sh
View File

@ -5,7 +5,7 @@ set -euo pipefail
TMPDIR="$(mktemp -d -p /tmp)" TMPDIR="$(mktemp -d -p /tmp)"
trap "rm -rf $TMPDIR" EXIT trap "rm -rf $TMPDIR" EXIT
version="0.6.0" version="0.6.1"
repo=https://github.com/Ride-The-Lightning/c-lightning-REST repo=https://github.com/Ride-The-Lightning/c-lightning-REST
# Fetch and verify source tarball # Fetch and verify source tarball

4
pkgs/cl-rest/node-packages.nix
View File

@ -1279,8 +1279,8 @@ let
packageName = "c-lightning-rest"; packageName = "c-lightning-rest";
version = "0.6.0"; version = "0.6.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v0.6.0.tar.gz"; url = "https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v0.6.1.tar.gz";
hash = "sha256-f8wxULhPdk6OmUdC0P+qRRHgUpZOcb3djkwUIFMf2qE="; hash = "sha256-4IaNeuuIf2hOVWpjEwFzQgY97B7ON4AoRBKReDGvvf0=";
}; };
dependencies = [ dependencies = [
sources."accepts-1.3.7" sources."accepts-1.3.7"

2
pkgs/lib.nix
View File

@ -33,7 +33,7 @@ let self = {
# @system-service whitelist and docker seccomp blacklist (except for "clone" # @system-service whitelist and docker seccomp blacklist (except for "clone"
# which is a core requirement for systemd services) # which is a core requirement for systemd services)
# @system-service is defined in src/shared/seccomp-util.c (systemd source) # @system-service is defined in src/shared/seccomp-util.c (systemd source)
SystemCallFilter = [ "@system-service" "~add_key clone3 get_mempolicy kcmp keyctl mbind move_pages name_to_handle_at personality process_vm_readv process_vm_writev request_key set_mempolicy setns unshare userfaultfd" ]; SystemCallFilter = [ "@system-service" "~add_key clone3 kcmp keyctl mbind move_pages name_to_handle_at personality process_vm_readv process_vm_writev request_key set_mempolicy setns unshare userfaultfd" ];
SystemCallArchitectures = "native"; SystemCallArchitectures = "native";
}; };

6
pkgs/pinned.nix
View File

@ -7,15 +7,15 @@ pkgs: pkgsUnstable:
charge-lnd charge-lnd
clightning clightning
electrs electrs
elementsd
extra-container extra-container
hwi hwi
lightning-loop
lightning-pool
lndconnect; lndconnect;
inherit (pkgsUnstable) inherit (pkgsUnstable)
btcpayserver btcpayserver
elementsd
lightning-loop
lightning-pool
lnd lnd
nbxplorer; nbxplorer;

2
pkgs/rtl/generate.sh
View File

@ -5,7 +5,7 @@ set -euo pipefail
TMPDIR="$(mktemp -d -p /tmp)" TMPDIR="$(mktemp -d -p /tmp)"
trap "rm -rf $TMPDIR" EXIT trap "rm -rf $TMPDIR" EXIT
version="0.11.2" version="0.12.0"
repo=https://github.com/Ride-The-Lightning/RTL repo=https://github.com/Ride-The-Lightning/RTL
# Fetch and verify source tarball # Fetch and verify source tarball

2180
pkgs/rtl/node-packages.nix
View File

File diff suppressed because it is too large Load Diff

11
pkgs/spark-wallet/generate.sh
View File

@ -46,4 +46,13 @@ fetchurl {
hash = "$hash"; hash = "$hash";
}; };
EOF EOF
sed -i "s|src = .*/src;|src = ${fetchurl//$'\n'/\\n}|" node-packages.nix
sed -i "
# Use the verified package src
s|src = .*/src;|src = ${fetchurl//$'\n'/\\n}|
# github: use HTTPS instead of SSH, which requires user authentication
s|git+ssh://git@|https://|
s|ssh://git@|https://|
s|\.git#|#|
" node-packages.nix

12
pkgs/spark-wallet/node-packages.nix
View File

@ -1579,12 +1579,12 @@ let
sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
}; };
}; };
"proxy-agent-git+ssh://git@github.com/shesek/node-proxy-agent.git#0d916427f586e41a1a4485db88509218017f9696" = { "proxy-agent-https://github.com/shesek/node-proxy-agent#0d916427f586e41a1a4485db88509218017f9696" = {
name = "proxy-agent"; name = "proxy-agent";
packageName = "proxy-agent"; packageName = "proxy-agent";
version = "3.1.1"; version = "3.1.1";
src = fetchgit { src = fetchgit {
url = "ssh://git@github.com/shesek/node-proxy-agent.git"; url = "https://github.com/shesek/node-proxy-agent.git";
rev = "0d916427f586e41a1a4485db88509218017f9696"; rev = "0d916427f586e41a1a4485db88509218017f9696";
sha256 = "9582aafb90887f3a600806240c0f71fd09ef2b8805a37281894b56e717a35d98"; sha256 = "9582aafb90887f3a600806240c0f71fd09ef2b8805a37281894b56e717a35d98";
}; };
@ -2030,12 +2030,12 @@ let
sha512 = "OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg=="; sha512 = "OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==";
}; };
}; };
"superagent-proxy-git+ssh://git@github.com/shesek/superagent-proxy.git#b512f8bbcf1baa196058922ee3b6cfe45375ebc9" = { "superagent-proxy-https://github.com/shesek/superagent-proxy#b512f8bbcf1baa196058922ee3b6cfe45375ebc9" = {
name = "superagent-proxy"; name = "superagent-proxy";
packageName = "superagent-proxy"; packageName = "superagent-proxy";
version = "2.0.0"; version = "2.0.0";
src = fetchgit { src = fetchgit {
url = "ssh://git@github.com/shesek/superagent-proxy.git"; url = "https://github.com/shesek/superagent-proxy.git";
rev = "b512f8bbcf1baa196058922ee3b6cfe45375ebc9"; rev = "b512f8bbcf1baa196058922ee3b6cfe45375ebc9";
sha256 = "ca984f1f2dc7cfed2aa301de1daf4305c359e89276d897fffa92e7c80850d03c"; sha256 = "ca984f1f2dc7cfed2aa301de1daf4305c359e89276d897fffa92e7c80850d03c";
}; };
@ -2459,7 +2459,7 @@ let
sources."prelude-ls-1.1.2" sources."prelude-ls-1.1.2"
sources."process-nextick-args-2.0.1" sources."process-nextick-args-2.0.1"
sources."proxy-addr-2.0.5" sources."proxy-addr-2.0.5"
(sources."proxy-agent-git+ssh://git@github.com/shesek/node-proxy-agent.git#0d916427f586e41a1a4485db88509218017f9696" // { (sources."proxy-agent-https://github.com/shesek/node-proxy-agent#0d916427f586e41a1a4485db88509218017f9696" // {
dependencies = [ dependencies = [
sources."debug-4.1.1" sources."debug-4.1.1"
sources."ms-2.1.2" sources."ms-2.1.2"
@ -2533,7 +2533,7 @@ let
sources."semver-7.3.2" sources."semver-7.3.2"
]; ];
}) })
(sources."superagent-proxy-git+ssh://git@github.com/shesek/superagent-proxy.git#b512f8bbcf1baa196058922ee3b6cfe45375ebc9" // { (sources."superagent-proxy-https://github.com/shesek/superagent-proxy#b512f8bbcf1baa196058922ee3b6cfe45375ebc9" // {
dependencies = [ dependencies = [
sources."debug-3.2.6" sources."debug-3.2.6"
sources."ms-2.1.2" sources."ms-2.1.2"

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

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1638831015, "lastModified": 1640965022,
"narHash": "sha256-WmCsa6gSY01Yt0wminCbNV8Mn+4iU1OEF5r3YUh6SVs=", "narHash": "sha256-PByGLFoP+VaZWKCI8KFc4EC15AWvF91Bjlpr/vvdusM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "fa5fe2a61c36ed90506af75c19bfaf2f9d537d87", "rev": "078c68764be9ef0eb51339b28f37f0d91cd8275b",
"type": "github" "type": "github"
}, },
"original": { "original": {