Merge fort-nix/nix-bitcoin#426: update nixpkgs
daeea4012e
tests: remove pkgsUnstable (Jonas Nick)76737ead9f
update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACKdaeea4012e
Tree-SHA512: b8b6e7397de413dd1137207cc1e614c7fca53d477e2484c73781abb824691ab7eee5ad849cd5af5666437cf0753aed4c38f02b6e3502f6a04f7efd401faddf55
This commit is contained in:
commit
2a5d98c4fc
@ -15,8 +15,7 @@ task:
|
||||
# Use the maximum timeout. Needed when rebuilding packages on a channel update.
|
||||
timeout_in: 120m
|
||||
|
||||
matrix:
|
||||
- name: modules_test
|
||||
name: modules_test
|
||||
environment:
|
||||
nixpkgs: nixpkgs
|
||||
container:
|
||||
@ -31,10 +30,6 @@ task:
|
||||
- environment:
|
||||
scenario: netnsRegtest
|
||||
|
||||
- name: pkgs_unstable
|
||||
environment:
|
||||
nixpkgs: nixpkgs-unstable
|
||||
|
||||
# This script is run as root
|
||||
build_script:
|
||||
- echo "sandbox = true" >> /etc/nix/nix.conf
|
||||
|
18
flake.lock
18
flake.lock
@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1634851050,
|
||||
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
|
||||
"lastModified": 1637014545,
|
||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
|
||||
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -17,11 +17,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1636333654,
|
||||
"narHash": "sha256-3wh9PtCzcaJQuZrgZ+ygKfhltkDNNqT6zOzGsRbjZEo=",
|
||||
"lastModified": 1637973395,
|
||||
"narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e74894146a42ba552ebafa19ab2d1df7ccbc1738",
|
||||
"rev": "4f37689c8a219a9d756c5ff38525ad09349f422f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -33,11 +33,11 @@
|
||||
},
|
||||
"nixpkgsUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1636470166,
|
||||
"narHash": "sha256-0tyWSS5rgMtML5p41ZdE5ocuAnRdtOGvdsqQyMUBYAI=",
|
||||
"lastModified": 1638036523,
|
||||
"narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f096b7122ab08e93c8b052c92461ca71b80c0cc8",
|
||||
"rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -79,7 +79,8 @@ in {
|
||||
# electrs only uses the working directory for reading electrs.toml
|
||||
WorkingDirectory = "/run/electrs";
|
||||
ExecStart = ''
|
||||
${config.nix-bitcoin.pkgs.electrs}/bin/electrs -vv \
|
||||
${config.nix-bitcoin.pkgs.electrs}/bin/electrs \
|
||||
--log-filters=INFO \
|
||||
--network=${bitcoind.makeNetworkName "bitcoin" "regtest"} \
|
||||
--db-dir='${cfg.dataDir}' \
|
||||
--daemon-dir='${bitcoind.dataDir}' \
|
||||
|
@ -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)
|
@ -246,10 +246,6 @@ vmTestNixExpr() {
|
||||
EOF
|
||||
}
|
||||
|
||||
pkgsUnstable() {
|
||||
doBuild pkgs-unstable "$scriptDir/pkgs-unstable.nix"
|
||||
}
|
||||
|
||||
# A basic subset of tests to keep the total runtime within
|
||||
# manageable bounds (<4 min on desktop systems).
|
||||
# These are also run on the CI server.
|
||||
@ -257,7 +253,6 @@ basic() {
|
||||
scenario=default buildTest "$@"
|
||||
scenario=netns buildTest "$@"
|
||||
scenario=netnsRegtest buildTest "$@"
|
||||
pkgsUnstable
|
||||
}
|
||||
|
||||
# All tests that only consist of building a nix derivation.
|
||||
|
Loading…
Reference in New Issue
Block a user