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

Merge fort-nix/nix-bitcoin#426: update nixpkgs

Browse Source 
daeea4012e tests: remove pkgsUnstable (Jonas Nick)
76737ead9f update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK daeea4012e

Tree-SHA512: b8b6e7397de413dd1137207cc1e614c7fca53d477e2484c73781abb824691ab7eee5ad849cd5af5666437cf0753aed4c38f02b6e3502f6a04f7efd401faddf55
This commit is contained in:
Jonas Nick 2021-11-28 20:44:41 +00:00
commit 2a5d98c4fc
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.cirrus.yml
View File

@ -15,25 +15,20 @@ task:
# Use the maximum timeout. Needed when rebuilding packages on a channel update. # Use the maximum timeout. Needed when rebuilding packages on a channel update.
timeout_in: 120m timeout_in: 120m
name: modules_test
environment:
nixpkgs: nixpkgs
container:
# A maximum of 16 CPUs is shared among all concurrent tasks.
# https://cirrus-ci.org/faq/#are-there-any-limits
cpu: 4
matrix: matrix:
- name: modules_test - environment:
environment: scenario: default
nixpkgs: nixpkgs - environment:
container: scenario: netns
# A maximum of 16 CPUs is shared among all concurrent tasks. - environment:
# https://cirrus-ci.org/faq/#are-there-any-limits scenario: netnsRegtest
cpu: 4
matrix:
- environment:
scenario: default
- environment:
scenario: netns
- environment:
scenario: netnsRegtest
- name: pkgs_unstable
environment:
nixpkgs: nixpkgs-unstable
# This script is run as root # This script is run as root
build_script: build_script:

18
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1634851050, "lastModified": 1637014545,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1636333654, "lastModified": 1637973395,
"narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=", "narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738", "rev": "4f37689c8a219a9d756c5ff38525ad09349f422f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,11 +33,11 @@
}, },
"nixpkgsUnstable": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1636470166, "lastModified": 1638036523,
"narHash": "sha256-0tyWSS5rgMtML5p41ZdE5ocuAnRdtOGvdsqQyMUBYAI=", "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f096b7122ab08e93c8b052c92461ca71b80c0cc8", "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
modules/electrs.nix
View File

@ -79,7 +79,8 @@ in {
# electrs only uses the working directory for reading electrs.toml # electrs only uses the working directory for reading electrs.toml
WorkingDirectory = "/run/electrs"; WorkingDirectory = "/run/electrs";
ExecStart = '' ExecStart = ''
${config.nix-bitcoin.pkgs.electrs}/bin/electrs -vv \ ${config.nix-bitcoin.pkgs.electrs}/bin/electrs \
--log-filters=INFO \
--network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \ --network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \
--db-dir='${cfg.dataDir}' \ --db-dir='${cfg.dataDir}' \
--daemon-dir='${bitcoind.dataDir}' \ --daemon-dir='${bitcoind.dataDir}' \

12
test/pkgs-unstable.nix
View File

@ -1,12 +0,0 @@
let
pinned = import ../pkgs/nixpkgs-pinned.nix;
pkgs = import pinned.nixpkgs-unstable {};
nbPkgs = import ../pkgs { inherit pkgs; };
pkgsUnstable = with nbPkgs; [
# Disabled because joinmarket dependencies currently don't build on on unstable.
# joinmarket
rtl
cl-rest
];
in
pkgs.writeText "pkgs-unstable" (pkgs.lib.concatMapStringsSep "\n" toString pkgsUnstable)

5
test/run-tests.sh
View File

@ -246,10 +246,6 @@ vmTestNixExpr() {
EOF EOF
} }
pkgsUnstable() {
doBuild pkgs-unstable "$scriptDir/pkgs-unstable.nix"
}
# A basic subset of tests to keep the total runtime within # A basic subset of tests to keep the total runtime within
# manageable bounds (<4 min on desktop systems). # manageable bounds (<4 min on desktop systems).
# These are also run on the CI server. # These are also run on the CI server.
@ -257,7 +253,6 @@ basic() {
scenario=default buildTest "$@" scenario=default buildTest "$@"
scenario=netns buildTest "$@" scenario=netns buildTest "$@"
scenario=netnsRegtest buildTest "$@" scenario=netnsRegtest buildTest "$@"
pkgsUnstable
} }
# All tests that only consist of building a nix derivation. # All tests that only consist of building a nix derivation.