fort-nix/nix-bitcoin
1
1
Fork 0
mirror of https://github.com/fort-nix/nix-bitcoin.git synced 2024-10-04 03:07:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
2baff274c4 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 2baff274c4

Tree-SHA512: 511b9e8f11db497a8de50a4af019d44d592eeb0bcc5582380fb4162e2c7c1a617bc59b302e5869d887c8c13f491be62f44f89a13e62ec0aff9c273e5a433cedb
This commit is contained in:
Jonas Nick 2024-09-16 07:25:45 +00:00
commit 548f17d868
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
7 changed files with 208 additions and 27 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": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"lastModified": 1726062281,
"narHash": "sha256-PyFVySdGj3enKqm8RQuo4v1KLJLmNLOq2yYOHsI6e2Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"rev": "e65aa8301ba4f0ab8cb98f944c14aa9da07394f8",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1724395761,
"narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=",
"lastModified": 1726206720,
"narHash": "sha256-tI7141IHDABMNgz4iXDo8agCp0SeTLbaIZ2DRndwcmk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c",
"rev": "673d99f1406cb09b8eb6feab4743ebdf70046557",
"type": "github"
},
"original": {

10
pkgs/pinned.nix
View File

@ -4,22 +4,22 @@ pkgs: pkgsUnstable:
inherit (pkgs)
bitcoin
bitcoind
btcpayserver
charge-lnd
clightning
electrs
elementsd
extra-container
hwi
lightning-loop
lightning-pool
lndconnect
nbxplorer;
lndconnect;
inherit (pkgsUnstable)
btcpayserver
clboss
clightning
fulcrum
lnd;
lnd
nbxplorer;
inherit pkgs pkgsUnstable;
}

5
pkgs/python-packages/default.nix
View File

@ -6,7 +6,6 @@ rec {
in
{
txzmq = callPackage ./txzmq {};
pyln-client = clightningPkg ./pyln-client;
pyln-proto = clightningPkg ./pyln-proto;
pyln-bolt7 = clightningPkg ./pyln-bolt7;
@ -25,6 +24,10 @@ rec {
# autobahn 20.12.3, required by joinmarketclient
autobahn = callPackage ./specific-versions/autobahn.nix {};
# coincurve 20, required by pyln-proto.
coincurve = callPackage ./specific-versions/coincurve_20 {};
# scikit-build-core 0_10, required by coincurve.
scikit-build-core = callPackage ./specific-versions/scikit-build-core_0_10 {};
};
nbPython3Packages = (python3.override {

6
pkgs/python-packages/pyln-proto/default.nix
View File

@ -29,10 +29,4 @@ buildPythonPackage rec {
checkInputs = [ pytestCheckHook ];
postUnpack = "sourceRoot=$sourceRoot/contrib/pyln-proto";
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'coincurve = "^18"' 'coincurve = "^19"' \
--replace-fail 'cryptography = "^41"' 'cryptography = "^42"' \
'';
}

87
pkgs/python-packages/specific-versions/coincurve_20/default.nix Normal file
View File

@ -0,0 +1,87 @@
# Copied from nixpkgs revision 673d99f1406cb09b8eb6feab4743ebdf70046557
{
lib,
buildPythonPackage,
fetchFromGitHub,
# build-system
cmake,
hatchling,
ninja,
pkg-config,
setuptools,
scikit-build-core,
# dependencies
asn1crypto,
cffi,
secp256k1,
# checks
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "coincurve";
version = "20.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ofek";
repo = "coincurve";
rev = "refs/tags/v${version}";
hash = "sha256-NKx/iLuzFEu1UBuwa14x55Ab3laVAKEtX6dtoWi0dOg=";
};
postPatch = ''
# don't try to load .dll files
cp -r --no-preserve=mode ${secp256k1.src} libsecp256k1
patchShebangs secp256k1/autogen.sh
'';
build-system = [
hatchling
cffi
cmake
ninja
pkg-config
setuptools
scikit-build-core
];
dontUseCmakeConfigure = true;
env.COINCURVE_IGNORE_SYSTEM_LIB = "OFF";
buildInputs = [ secp256k1 ];
dependencies = [
asn1crypto
cffi
];
preCheck = ''
# https://github.com/ofek/coincurve/blob/master/tox.ini#L20-L22=
rm -rf coincurve
# don't run benchmark tests
rm tests/test_bench.py
'';
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "coincurve" ];
meta = with lib; {
description = "Cross-platform bindings for libsecp256k1";
homepage = "https://github.com/ofek/coincurve";
license = with licenses; [
asl20
mit
];
maintainers = [ ];
};
}

97
pkgs/python-packages/specific-versions/scikit-build-core_0_10/default.nix Normal file
View File

@ -0,0 +1,97 @@
# Copied from nixpkgs revision 673d99f1406cb09b8eb6feab4743ebdf70046557
{
lib,
buildPythonPackage,
fetchFromGitHub,
pythonOlder,
# build-system
hatch-vcs,
hatchling,
cmake,
ninja,
# dependencies
packaging,
pathspec,
exceptiongroup,
# tests
build,
cattrs,
numpy,
pybind11,
pytest-subprocess,
pytestCheckHook,
setuptools,
tomli,
virtualenv,
wheel,
}:
buildPythonPackage rec {
pname = "scikit-build-core";
version = "0.10.5";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-build";
repo = "scikit-build-core";
rev = "refs/tags/v${version}";
hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0=";
};
postPatch = lib.optionalString (pythonOlder "3.11") ''
substituteInPlace pyproject.toml \
--replace-fail '"error",' '"error", "ignore::UserWarning",'
'';
build-system = [
hatch-vcs
hatchling
];
dependencies =
[
packaging
pathspec
]
++ lib.optionals (pythonOlder "3.11") [
exceptiongroup
tomli
];
nativeCheckInputs = [
build
cattrs
cmake
ninja
numpy
pybind11
pytest-subprocess
pytestCheckHook
setuptools
virtualenv
wheel
];
# cmake is only used for tests
dontUseCmakeConfigure = true;
pytestFlagsArray = [ "-m 'not isolated and not network'" ];
disabledTestPaths = [
# store permissions issue in Nix:
"tests/test_editable.py"
];
pythonImportsCheck = [ "scikit_build_core" ];
meta = with lib; {
description = "Next generation Python CMake adaptor and Python API for plugins";
homepage = "https://github.com/scikit-build/scikit-build-core";
changelog = "https://github.com/scikit-build/scikit-build-core/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ veprbl ];
};
}

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

@ -21,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1722643042,
"narHash": "sha256-bW2O/ZKSs2k2pf7r6IHMi7RKHL0JVhiKV9WfyrMO8CQ=",
"lastModified": 1725609162,
"narHash": "sha256-5DqMqrei9SIkmiibU2yYaeZ/uzMFguUjAa3hxIp6l3s=",
"owner": "NixOS",
"repo": "infra",
"rev": "66da5cfddb8c67b5e2f0b5bba62899f1f82eec42",
"rev": "a7802cab46dae02a8e7e942cfbca41d46220da74",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1723413203,
"narHash": "sha256-IbtEvGqCHY2UdP6EqD4Bc7jCrpqva1DVRUgggTTowYg=",
"lastModified": 1725982115,
"narHash": "sha256-bTwyWn0do8RCzZZOSdXhBDBE/TECEfKFglTM6mYHSo4=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "0e318111ee9d44fc40552d5aa95a6fd4026401c5",
"rev": "d56ef06c2e9f2b28916592979c96e917ebe5db14",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1723175592,
"narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"type": "github"
},
"original": {