nix: update for nixpkgs 25.11

This commit is contained in:
The MMGen Project 2025-12-08 14:56:19 +00:00
commit 0db0f29d82
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
7 changed files with 14 additions and 28 deletions

View file

@ -1 +1 @@
16.1.dev20 16.1.dev21

View file

@ -104,9 +104,7 @@ class MMGenRegtest(MMGenObject):
@property @property
async def miner_wif(self): async def miner_wif(self):
if not hasattr(self, '_miner_wif'): if not hasattr(self, '_miner_wif'):
self._miner_wif = ( self._miner_wif = self.bdb_miner_wif if self.bdb_wallet else None
self.bdb_miner_wif if self.bdb_wallet else
await self.rpc_call('dumpprivkey', (await self.miner_addr), wallet='miner'))
return self._miner_wif return self._miner_wif
def create_hdseed_wif(self): def create_hdseed_wif(self):

View file

@ -1,7 +1,7 @@
{ add_pkgs_path }: { add_pkgs_path }:
let let
dfl_nixpkgs = import ./nixpkgs-25.05.nix {}; dfl_nixpkgs = import ./nixpkgs-25.11.nix {};
dfl_python = pkgs.python313; dfl_python = pkgs.python313;
null_pkgs = { null_pkgs = {
system-packages = {}; system-packages = {};

View file

@ -1,9 +0,0 @@
import (
fetchGit {
url = "https://github.com/NixOS/nixpkgs.git";
# url = /path/to/repo/nixpkgs-25.05.git;
ref = "release-25.05";
rev = "11cb3517b3af6af300dd6c055aeda73c9bf52c48"; # refs/tags/25.05
shallow = true;
}
)

9
nix/nixpkgs-25.11.nix Normal file
View file

@ -0,0 +1,9 @@
import (
fetchGit {
url = "https://github.com/NixOS/nixpkgs.git";
# url = /path/to/repo/nixpkgs-25.11.git;
ref = "release-25.11";
rev = "52de6ea1db373aac4aec2ca926638db524ea7acf";
shallow = true;
}
)

View file

@ -1,20 +1,8 @@
{ {
lib, lib,
pkgs,
}: }:
let
# cargo and rustc packages from 25.05 are out of date,
# so fetch them from a more recent commit:
pinnedPkgs = fetchGit {
url = "https://github.com/NixOS/nixpkgs.git";
# url = /path/to/repo/nixpkgs-fe8997.git;
rev = "fe89979ad5e8fd233ae0aac0e7e56f465945ae70";
shallow = true;
};
pkgs = import pinnedPkgs {};
in
pkgs.rustPlatform.buildRustPackage rec { pkgs.rustPlatform.buildRustPackage rec {
pname = "reth"; pname = "reth";
version = "1.9.3"; version = "1.9.3";

View file

@ -8,7 +8,7 @@
rec { rec {
### Set nixpkgs globally for the MMGen environment. ### Set nixpkgs globally for the MMGen environment.
### If you set it, make sure to uncomment the python variable assignment below. ### If you set it, make sure to uncomment the python variable assignment below.
# pkgs = import (bdir + /nixpkgs-25.05.nix) {}; # pkgs = import (bdir + /nixpkgs-25.11.nix) {};
### Set python version globally for the MMGen environment. ### Set python version globally for the MMGen environment.
### Must be set if pkgs is set. ### Must be set if pkgs is set.