commit bea3e9676498339a464929fa64fb8d21da285a3e
parent c726d092958d1ac70e2eab4576a123c2a296b515
Author: Özgür Kesim <oec@codeblau.de>
Date: Tue, 15 Sep 2026 10:52:09 +0200
flake: build against exchange v1.6.16 and donau v1.6.9
Diffstat:
| M | flake.lock | | | 271 | +++++++++++-------------------------------------------------------------------- |
| M | flake.nix | | | 24 | +++++++++++++++++++----- |
2 files changed, 55 insertions(+), 240 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -2,202 +2,78 @@
"nodes": {
"donau": {
"inputs": {
- "exchange": "exchange",
- "gnunet": "gnunet_2",
- "nixpkgs": "nixpkgs_4",
- "systems": "systems_4"
+ "exchange": [
+ "exchange"
+ ],
+ "gnunet": [
+ "gnunet"
+ ],
+ "nixpkgs": "nixpkgs",
+ "systems": "systems"
},
"locked": {
- "lastModified": 1784381703,
- "narHash": "sha256-kIlXKB2C6xro/tVZ/T1hhRyw9cc0JJEuon2zlLNnKSk=",
- "ref": "refs/tags/v1.6.4",
- "rev": "8a104e499fe55877382b7777c600f145cc3a0e41",
- "revCount": 1136,
+ "lastModified": 1788914489,
+ "narHash": "sha256-Xk7HdweFFEDhTiofHwfUBmvglODWFPONiDQqEnbtkjM=",
+ "ref": "refs/tags/v1.6.9",
+ "rev": "debd0d841a12c140ef1875292877338f93abc9c6",
+ "revCount": 1199,
"submodules": true,
"type": "git",
"url": "https://git.gnunet.org/donau"
},
"original": {
- "ref": "refs/tags/v1.6.4",
+ "ref": "refs/tags/v1.6.9",
"type": "git",
"url": "https://git.gnunet.org/donau"
}
},
"exchange": {
"inputs": {
- "gnunet": "gnunet",
+ "gnunet": [
+ "gnunet"
+ ],
"nixpkgs": "nixpkgs_2",
"systems": "systems_2"
},
"locked": {
- "lastModified": 1781618942,
- "narHash": "sha256-yRKtW+Q8nZtnBB4L5ewOT9dFaMFOofUNoNidgsyI9AU=",
- "ref": "refs/heads/master",
- "rev": "b542c0c40c30e1ddd9b0528e913cceed8eef9c56",
- "revCount": 10032,
+ "lastModified": 1789053884,
+ "narHash": "sha256-ICCgH7hzgQegZNLcAKnODDJG+NomWY0ZXxHfx6+YNH0=",
+ "ref": "refs/tags/v1.6.16",
+ "rev": "b8a2b654c8c171fb8e72ce46fc8d8fc7b9490d11",
+ "revCount": 10479,
"submodules": true,
"type": "git",
"url": "https://git.gnunet.org/exchange"
},
"original": {
- "rev": "b542c0c40c30e1ddd9b0528e913cceed8eef9c56",
- "type": "git",
- "url": "https://git.gnunet.org/exchange"
- }
- },
- "exchange_2": {
- "inputs": {
- "gnunet": "gnunet_3",
- "nixpkgs": "nixpkgs_6",
- "systems": "systems_6"
- },
- "locked": {
- "lastModified": 1784369137,
- "narHash": "sha256-q2oJjeTaTA3FRnz0YLrTgOa94zKFiliNgJve1QrAiSQ=",
- "ref": "refs/tags/v1.6.7-dev.3",
- "rev": "2949329f5793f948cb2c5aa6fe9d083aee1d9bd7",
- "revCount": 10203,
- "submodules": true,
- "type": "git",
- "url": "https://git.gnunet.org/exchange"
- },
- "original": {
- "ref": "refs/tags/v1.6.7-dev.3",
+ "ref": "refs/tags/v1.6.16",
"type": "git",
"url": "https://git.gnunet.org/exchange"
}
},
"gnunet": {
"inputs": {
- "nixpkgs": "nixpkgs",
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1781611204,
- "narHash": "sha256-4uCu+3Cdi1ck9J7LT72INcrm3coIkP7Gh9k0COAr91g=",
- "ref": "refs/heads/master",
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "revCount": 33248,
- "submodules": true,
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- },
- "original": {
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- }
- },
- "gnunet_2": {
- "inputs": {
"nixpkgs": "nixpkgs_3",
"systems": "systems_3"
},
"locked": {
- "lastModified": 1781611204,
- "narHash": "sha256-4uCu+3Cdi1ck9J7LT72INcrm3coIkP7Gh9k0COAr91g=",
- "ref": "refs/heads/master",
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "revCount": 33248,
- "submodules": true,
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- },
- "original": {
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- }
- },
- "gnunet_3": {
- "inputs": {
- "nixpkgs": "nixpkgs_5",
- "systems": "systems_5"
- },
- "locked": {
- "lastModified": 1781611204,
- "narHash": "sha256-4uCu+3Cdi1ck9J7LT72INcrm3coIkP7Gh9k0COAr91g=",
- "ref": "refs/heads/master",
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "revCount": 33248,
+ "lastModified": 1788997268,
+ "narHash": "sha256-GvoFg+UGF+ZV4K8tD+8ccodM1uWmlLWvw1dwoJQ3tys=",
+ "ref": "refs/tags/v0.29.1",
+ "rev": "346358e26d4dcc2dc4f51bef5d52dca29c7d8165",
+ "revCount": 33476,
"submodules": true,
"type": "git",
"url": "https://git.gnunet.org/gnunet"
},
"original": {
- "rev": "e8e7504b7ab43f7dffa25f273ff228069d8d6dd4",
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- }
- },
- "gnunet_4": {
- "inputs": {
- "nixpkgs": "nixpkgs_7",
- "systems": "systems_7"
- },
- "locked": {
- "lastModified": 1784299477,
- "narHash": "sha256-eOsDOOFH04EQzJo6JSJONiYQYK3KBnm99hNzJsDmegs=",
- "ref": "refs/tags/v0.28.0",
- "rev": "021f904c70e7e57098b8bacbaf578c465b29f792",
- "revCount": 33285,
- "submodules": true,
- "type": "git",
- "url": "https://git.gnunet.org/gnunet"
- },
- "original": {
- "ref": "refs/tags/v0.28.0",
+ "ref": "refs/tags/v0.29.1",
"type": "git",
"url": "https://git.gnunet.org/gnunet"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1780734595,
- "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "release-26.05",
- "type": "indirect"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1781616846,
- "narHash": "sha256-pujkSXZ/LvNu0sObeK09KfS0lV/YoeWKZ5hwuY265Cs=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "1d92060175b76bf5b7d8a1d5d1d924e31ef76ff8",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "release-26.05",
- "type": "indirect"
- }
- },
- "nixpkgs_3": {
- "locked": {
- "lastModified": 1780734595,
- "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "release-26.05",
- "type": "indirect"
- }
- },
- "nixpkgs_4": {
- "locked": {
"lastModified": 1781616846,
"narHash": "sha256-pujkSXZ/LvNu0sObeK09KfS0lV/YoeWKZ5hwuY265Cs=",
"owner": "NixOS",
@@ -211,22 +87,7 @@
"type": "indirect"
}
},
- "nixpkgs_5": {
- "locked": {
- "lastModified": 1780734595,
- "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "release-26.05",
- "type": "indirect"
- }
- },
- "nixpkgs_6": {
+ "nixpkgs_2": {
"locked": {
"lastModified": 1781616846,
"narHash": "sha256-pujkSXZ/LvNu0sObeK09KfS0lV/YoeWKZ5hwuY265Cs=",
@@ -241,7 +102,7 @@
"type": "indirect"
}
},
- "nixpkgs_7": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1780734595,
"narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
@@ -256,7 +117,7 @@
"type": "indirect"
}
},
- "nixpkgs_8": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1781616846,
"narHash": "sha256-pujkSXZ/LvNu0sObeK09KfS0lV/YoeWKZ5hwuY265Cs=",
@@ -274,10 +135,10 @@
"root": {
"inputs": {
"donau": "donau",
- "exchange": "exchange_2",
- "gnunet": "gnunet_4",
- "nixpkgs": "nixpkgs_8",
- "systems": "systems_8"
+ "exchange": "exchange",
+ "gnunet": "gnunet",
+ "nixpkgs": "nixpkgs_4",
+ "systems": "systems_4"
}
},
"systems": {
@@ -339,66 +200,6 @@
"repo": "default",
"type": "github"
}
- },
- "systems_5": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_6": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_7": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_8": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
@@ -23,9 +23,15 @@
inputs = {
nixpkgs.url = "nixpkgs/release-26.05";
systems.url = "github:nix-systems/default";
- gnunet.url = "git+https://git.gnunet.org/gnunet?ref=refs/tags/v0.28.0";
- exchange.url = "git+https://git.gnunet.org/exchange?ref=refs/tags/v1.6.7-dev.3";
- donau.url = "git+https://git.gnunet.org/donau?ref=refs/tags/v1.6.4";
+ gnunet.url = "git+https://git.gnunet.org/gnunet?ref=refs/tags/v0.29.1";
+ exchange.url = "git+https://git.gnunet.org/exchange?ref=refs/tags/v1.6.16";
+ # exchange v1.6.16 needs GNUNET_CRYPTO_eddsa_verify_raw, which its own
+ # GNUnet pin (v0.28.0) does not provide.
+ exchange.inputs.gnunet.follows = "gnunet";
+ # merchant needs DONAU_setup(), available since donau v1.6.7
+ donau.url = "git+https://git.gnunet.org/donau?ref=refs/tags/v1.6.9";
+ donau.inputs.gnunet.follows = "gnunet";
+ donau.inputs.exchange.follows = "exchange";
self.submodules = true;
};
@@ -45,6 +51,11 @@
gnunetpkgs = gnunet.packages.${system};
exchangepkgs = exchange.packages.${system};
donaupkgs = donau.packages.${system};
+ # donau's doc/prebuilt submodule lags behind its doc/meson.build,
+ # so build it without the documentation.
+ donaupkg = donaupkgs.donau.overrideAttrs (old: {
+ mesonFlags = (old.mesonFlags or []) ++ [ "-Ddisable-doc=true" ];
+ });
in {
merchant = pkgs.stdenv.mkDerivation {
name = "merchant";
@@ -77,7 +88,7 @@
pkgs.qrencode
gnunetpkgs.gnunet
exchangepkgs.exchange
- donaupkgs.donau
+ donaupkg
];
preConfigure = ''
patchShebangs --build contrib/check-prebuilt
@@ -96,6 +107,9 @@
gnunetpkgs = gnunet.packages.${system};
exchangepkgs = exchange.packages.${system};
donaupkgs = donau.packages.${system};
+ donaupkg = donaupkgs.donau.overrideAttrs (old: {
+ mesonFlags = (old.mesonFlags or []) ++ [ "-Ddisable-doc=true" ];
+ });
in
{
default = pkgs.mkShell {
@@ -122,7 +136,7 @@
pkgs.pdftk
pkgs.qrencode
exchangepkgs.exchange
- donaupkgs.donau
+ donaupkg
];
shellHook = ''
