joinmarket: fix for NixOS 25.11

Temporarily add nixpkgs-25.05 for joinmarket (see code comment).
This commit is contained in:
Erik Arvstedt
2025-12-24 08:33:48 +01:00
parent 4ba311c425
commit 3b9406a4d2
8 changed files with 51 additions and 15 deletions
+6 -2
View File
@@ -7,6 +7,7 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-25_05.url = "github:NixOS/nixpkgs/nixos-25.05";
flake-utils.url = "github:numtide/flake-utils";
extra-container = {
url = "github:erikarvstedt/extra-container/0.13";
@@ -15,7 +16,7 @@
};
};
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, ... }:
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-25_05, flake-utils, ... }:
let
supportedSystems = [
"x86_64-linux"
@@ -33,8 +34,9 @@
system
, pkgs ? nixpkgs.legacyPackages.${system}
, pkgsUnstable ? nixpkgs-unstable.legacyPackages.${system}
, pkgs-25_05 ? nixpkgs-25_05.legacyPackages.${system}
}:
import ./pkgs { inherit pkgs pkgsUnstable; };
import ./pkgs { inherit pkgs pkgsUnstable pkgs-25_05; };
test = {
inherit (test) scenarios;
@@ -95,6 +97,8 @@
"nixops19_09"
"pinned"
"generate-secrets"
"nbPython3Packages"
"nbPython3PackagesJoinmarket"
]) // {
inherit (import ./examples/qemu-vm/minimal-vm.nix self pkgs system)
# A simple demo VM.