diff --git a/nix/fixtures/service-repo/dna/dna.nix b/nix/fixtures/service-repo/dna/dna.nix index 0e978fd..b53a375 100644 --- a/nix/fixtures/service-repo/dna/dna.nix +++ b/nix/fixtures/service-repo/dna/dna.nix @@ -6,7 +6,7 @@ dnaManifest = ./dna.yaml; holochain = inputs'.holochain; zomes = { my_zome = inputs'.module.packages.my_zome; }; - matchingIntegrityDna = inputs'.previousDnaVersion.packages.my_dna; + # matchingIntegrityDna = inputs'.previousDnaVersion.packages.my_dna; }; }; } diff --git a/nix/fixtures/service-repo/dna/dna.yaml b/nix/fixtures/service-repo/dna/dna.yaml index e7a82d3..b05d458 100644 --- a/nix/fixtures/service-repo/dna/dna.yaml +++ b/nix/fixtures/service-repo/dna/dna.yaml @@ -8,7 +8,7 @@ integrity: zomes: - name: my_zome dylib: ~ - dependencies: [] + dependencies: ~ hash: ~ coordinator: zomes: [] diff --git a/nix/fixtures/service-repo/flake.lock b/nix/fixtures/service-repo/flake.lock index 823998f..4f18a53 100644 --- a/nix/fixtures/service-repo/flake.lock +++ b/nix/fixtures/service-repo/flake.lock @@ -547,16 +547,16 @@ "cargo-rdme": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "lastModified": 1718044745, + "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", "owner": "orium", "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "rev": "22d756971037ad4c7953db882c5b96a662364f15", "type": "github" }, "original": { "owner": "orium", - "ref": "v1.1.0", + "ref": "v1.4.4", "repo": "cargo-rdme", "type": "github" } @@ -734,16 +734,16 @@ "cargo-rdme_2": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "lastModified": 1718044745, + "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", "owner": "orium", "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "rev": "22d756971037ad4c7953db882c5b96a662364f15", "type": "github" }, "original": { "owner": "orium", - "ref": "v1.1.0", + "ref": "v1.4.4", "repo": "cargo-rdme", "type": "github" } @@ -955,16 +955,16 @@ "cargo-rdme_31": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "lastModified": 1718044745, + "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", "owner": "orium", "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "rev": "22d756971037ad4c7953db882c5b96a662364f15", "type": "github" }, "original": { "owner": "orium", - "ref": "v1.1.0", + "ref": "v1.4.4", "repo": "cargo-rdme", "type": "github" } @@ -972,16 +972,16 @@ "cargo-rdme_32": { "flake": false, "locked": { - "lastModified": 1675118998, - "narHash": "sha256-lrYWqu3h88fr8gG3Yo5GbFGYaq5/1Os7UtM+Af0Bg4k=", + "lastModified": 1718044745, + "narHash": "sha256-Oa667BTz/PdxZmhGSP+qfPcUbORlk7nP5OrCJyYqVQg=", "owner": "orium", "repo": "cargo-rdme", - "rev": "f9dbb6bccc078f4869f45ae270a2890ac9a75877", + "rev": "22d756971037ad4c7953db882c5b96a662364f15", "type": "github" }, "original": { "owner": "orium", - "ref": "v1.1.0", + "ref": "v1.4.4", "repo": "cargo-rdme", "type": "github" } @@ -1812,25 +1812,6 @@ } }, "crane_38": { - "inputs": { - "nixpkgs": "nixpkgs_38" - }, - "locked": { - "lastModified": 1716569590, - "narHash": "sha256-5eDbq8TuXFGGO3mqJFzhUbt5zHVTf5zilQoyW5jnJwo=", - "owner": "ipetkov", - "repo": "crane", - "rev": "109987da061a1bf452f435f1653c47511587d919", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "rev": "109987da061a1bf452f435f1653c47511587d919", - "type": "github" - } - }, - "crane_39": { "inputs": { "nixpkgs": [ "profiles", @@ -1853,10 +1834,10 @@ "type": "github" } }, - "crane_4": { + "crane_39": { "inputs": { "nixpkgs": [ - "module", + "profiles", "holochain", "nixpkgs" ] @@ -1875,10 +1856,10 @@ "type": "github" } }, - "crane_40": { + "crane_4": { "inputs": { "nixpkgs": [ - "profiles", + "module", "holochain", "nixpkgs" ] @@ -4110,7 +4091,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-kkqg1ZXh9CvQ+DIWtZybAo9hwltwo4stZ4NpxrbOKoM=", + "narHash": "sha256-rj4IP4Y7aKz6TOdjOweeMTzhMHK+q6tCVEBFXKtjltU=", "path": "./../../..", "type": "path" }, @@ -4352,7 +4333,12 @@ }, "hc-infra_16": { "inputs": { - "crane": "crane_38", + "crane": [ + "profiles", + "hc-infra", + "holochain", + "crane" + ], "holochain": "holochain_60", "nixpkgs": [ "profiles", @@ -4369,11 +4355,11 @@ "versions": "versions_30" }, "locked": { - "lastModified": 1723030638, - "narHash": "sha256-ytgtp/WLFaCXX34iHm0lM+Ir14HkhfbYJS4DfGZehu0=", + "lastModified": 1724137876, + "narHash": "sha256-Tjm0z1j2UuSvEsbJuWqggA1FDwfVpqUBlAkJJEzsUtY=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "aec0628186d9256168e923a2516f466a85edd475", + "rev": "1939bd301ba38f9fc7d8f4ae6489b0269f74bbe2", "type": "github" }, "original": { @@ -4407,7 +4393,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-MV4hTR+5LlSWPdnQ/B/22DnxFY62Y4kIytrxx2e/s7A=", + "narHash": "sha256-1He13loGAKSlsnGTK3Aw9VPURN77JbLw1J9JMQp0O8M=", "path": "./../../..", "type": "path" }, @@ -4712,11 +4698,11 @@ ] }, "locked": { - "lastModified": 1723734385, - "narHash": "sha256-h+0z4bE+fl8ACUFv+g8RupFhfKrvSv3bn5hgmNiX4gg=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "ee1652fb6fae33fc09b5ba60a0c2c6adccfbd40a", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -5618,11 +5604,11 @@ ] }, "locked": { - "lastModified": 1723734385, - "narHash": "sha256-h+0z4bE+fl8ACUFv+g8RupFhfKrvSv3bn5hgmNiX4gg=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "ee1652fb6fae33fc09b5ba60a0c2c6adccfbd40a", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -6936,7 +6922,7 @@ "inputs": { "cargo-chef": "cargo-chef_31", "cargo-rdme": "cargo-rdme_31", - "crane": "crane_39", + "crane": "crane_38", "crate2nix": "crate2nix_31", "empty": "empty_31", "flake-compat": "flake-compat_31", @@ -6960,7 +6946,7 @@ "empty" ], "nix-filter": "nix-filter_31", - "nixpkgs": "nixpkgs_39", + "nixpkgs": "nixpkgs_38", "pre-commit-hooks-nix": "pre-commit-hooks-nix_31", "repo-git": "repo-git_31", "rust-overlay": "rust-overlay_31", @@ -6977,11 +6963,11 @@ ] }, "locked": { - "lastModified": 1722928122, - "narHash": "sha256-j4xEmCLK7dVEaIezmiWAKdwmMLLp/nLN9BzWL4r5FCE=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "4efd39839ecd8e21c1194a58da6b71e50d8a54cc", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -7011,7 +6997,7 @@ "inputs": { "cargo-chef": "cargo-chef_32", "cargo-rdme": "cargo-rdme_32", - "crane": "crane_40", + "crane": "crane_39", "crate2nix": "crate2nix_32", "empty": "empty_32", "flake-compat": "flake-compat_32", @@ -7032,7 +7018,7 @@ "empty" ], "nix-filter": "nix-filter_32", - "nixpkgs": "nixpkgs_40", + "nixpkgs": "nixpkgs_39", "pre-commit-hooks-nix": "pre-commit-hooks-nix_32", "repo-git": "repo-git_32", "rust-overlay": "rust-overlay_32", @@ -7047,11 +7033,11 @@ ] }, "locked": { - "lastModified": 1723135147, - "narHash": "sha256-GTUHEYZ1fMIYHGPUvTgj24+bur52Alpf9FSxaQhDZxc=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "a2a282094620d2cb964bd3d803242ba944d9ec2c", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -8334,7 +8320,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-ORozrlYWWQQ0LCr/bikkjfWn8vFTAa23ppnga5YFYN0=", + "narHash": "sha256-u+lNqinWBxxmvLFfyvpmzR7QyfmwFfvAgZmUK0UuLsw=", "path": "./../module-repo", "type": "path" }, @@ -8900,11 +8886,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -9451,11 +9437,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -9755,27 +9741,26 @@ }, "nixpkgs_38": { "locked": { - "lastModified": 1714656196, - "narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94035b482d181af0a0f8f77823a790b256b7c3cc", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "nixpkgs_39": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -9799,21 +9784,6 @@ "type": "indirect" } }, - "nixpkgs_40": { - "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1714656196, @@ -10707,11 +10677,11 @@ "versions": "versions_31" }, "locked": { - "lastModified": 1723201842, - "narHash": "sha256-g4fFarrxkuX25g6RXGXorECw5LY2PEWV+1P+iXr1uXs=", + "lastModified": 1724147726, + "narHash": "sha256-MIew0ILKKIEMZ5E72ditFOTSHZ0988JR4wkRCOGMxUw=", "owner": "holochain-open-dev", "repo": "profiles", - "rev": "112ac7c452d5a5c775a07a072c0ee14cb81c41ed", + "rev": "46b707ea5ec74758be454851befae76412f43fae", "type": "github" }, "original": { @@ -11128,11 +11098,11 @@ ] }, "locked": { - "lastModified": 1723343015, - "narHash": "sha256-oS8Qhpo71B/6OOsuVBFJbems7RKD/5e3TN2AdXhwMjg=", + "lastModified": 1723947704, + "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed4fe9af3814694d59c572649e881a6aa6eba533", + "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", "type": "github" }, "original": { @@ -11393,11 +11363,11 @@ ] }, "locked": { - "lastModified": 1723343015, - "narHash": "sha256-oS8Qhpo71B/6OOsuVBFJbems7RKD/5e3TN2AdXhwMjg=", + "lastModified": 1723947704, + "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed4fe9af3814694d59c572649e881a6aa6eba533", + "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", "type": "github" }, "original": { @@ -11714,11 +11684,11 @@ ] }, "locked": { - "lastModified": 1722738111, - "narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", + "lastModified": 1723947704, + "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", + "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", "type": "github" }, "original": { @@ -11736,11 +11706,11 @@ ] }, "locked": { - "lastModified": 1722738111, - "narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", + "lastModified": 1723947704, + "narHash": "sha256-TcVf66N2NgGhxORFytzgqWcg0XJ+kk8uNLNsTRI5sYM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", + "rev": "456e78a55feade2c3bc6d7bc0bf5e710c9d86120", "type": "github" }, "original": { @@ -11890,11 +11860,11 @@ "scaffolding": { "flake": false, "locked": { - "lastModified": 1722862548, - "narHash": "sha256-8FXBPbL2qXiDAhQbbPehRDuauEUb9V3Uc7K4YjC0ev4=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", "repo": "scaffolding", - "rev": "fc557aa8164d23c5638faa5fe5ed99d30e8404b7", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { @@ -12281,11 +12251,11 @@ "scaffolding_30": { "flake": false, "locked": { - "lastModified": 1722862548, - "narHash": "sha256-8FXBPbL2qXiDAhQbbPehRDuauEUb9V3Uc7K4YjC0ev4=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", "repo": "scaffolding", - "rev": "fc557aa8164d23c5638faa5fe5ed99d30e8404b7", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { @@ -12298,11 +12268,11 @@ "scaffolding_31": { "flake": false, "locked": { - "lastModified": 1722862548, - "narHash": "sha256-8FXBPbL2qXiDAhQbbPehRDuauEUb9V3Uc7K4YjC0ev4=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", "repo": "scaffolding", - "rev": "fc557aa8164d23c5638faa5fe5ed99d30e8404b7", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { @@ -12315,11 +12285,11 @@ "scaffolding_32": { "flake": false, "locked": { - "lastModified": 1722862548, - "narHash": "sha256-8FXBPbL2qXiDAhQbbPehRDuauEUb9V3Uc7K4YjC0ev4=", + "lastModified": 1724073530, + "narHash": "sha256-PUM8otA5F5s8ZHxhjupn7R+RZAjh2rueYIFwu3UkK44=", "owner": "holochain", "repo": "scaffolding", - "rev": "fc557aa8164d23c5638faa5fe5ed99d30e8404b7", + "rev": "8a6d1dab0f1668c2781a46d93a5ad638fcf25598", "type": "github" }, "original": { @@ -12440,11 +12410,11 @@ }, "locked": { "dir": "versions/0_3", - "lastModified": 1723734385, - "narHash": "sha256-h+0z4bE+fl8ACUFv+g8RupFhfKrvSv3bn5hgmNiX4gg=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "ee1652fb6fae33fc09b5ba60a0c2c6adccfbd40a", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -12969,11 +12939,11 @@ }, "locked": { "dir": "versions/0_3", - "lastModified": 1722928122, - "narHash": "sha256-j4xEmCLK7dVEaIezmiWAKdwmMLLp/nLN9BzWL4r5FCE=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "4efd39839ecd8e21c1194a58da6b71e50d8a54cc", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -12992,11 +12962,11 @@ }, "locked": { "dir": "versions/0_3", - "lastModified": 1723135147, - "narHash": "sha256-GTUHEYZ1fMIYHGPUvTgj24+bur52Alpf9FSxaQhDZxc=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "a2a282094620d2cb964bd3d803242ba944d9ec2c", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { @@ -13015,11 +12985,11 @@ }, "locked": { "dir": "versions/0_3", - "lastModified": 1723734385, - "narHash": "sha256-h+0z4bE+fl8ACUFv+g8RupFhfKrvSv3bn5hgmNiX4gg=", + "lastModified": 1724089376, + "narHash": "sha256-xzGG6Sy1j219Nyz99bsoBLonlOsXUlfzvQlpqKGmQkw=", "owner": "holochain", "repo": "holochain", - "rev": "ee1652fb6fae33fc09b5ba60a0c2c6adccfbd40a", + "rev": "7c6fcde85abd2553f557253b88a45b9245583948", "type": "github" }, "original": { diff --git a/nix/import-yaml.nix b/nix/import-yaml.nix index aa6a62e..2bec291 100644 --- a/nix/import-yaml.nix +++ b/nix/import-yaml.nix @@ -33,19 +33,23 @@ let m3 = l.match ''([[:space:]]*-[[:space:]]+)(.*)'' line; # m3Key = l.match ''(.*): (.*)'' line; isListEntry = m3 != null; - toValue = value: if value == "[]" then [] else (if value == "~" then null else (let - m4 = l.match ''"(.*)"'' value; + toValue = value: let + trimmedValue = lib.strings.trim value; + in + if trimmedValue == "[]" then [] + else (if trimmedValue == "~" then null else (let + m4 = l.match ''"(.*)"'' trimmedValue; in if m4 != null then l.elemAt m4 0 else - (if (l.match ''[0-9]+'' value) != null then - lib.toInt value + (if (l.match ''[0-9]+'' trimmedValue) != null then + lib.toInt trimmedValue else ( if l.match "^[\ \t]*$" value != null then null else ( - if value == "true" then true - else if value == "false" then false + if trimmedValue == "true" then true + else if trimmedValue == "false" then false else value ) )) @@ -53,7 +57,7 @@ let ); in if m3 != null - then rec { + then { inherit isListEntry; indent = (l.stringLength (l.elemAt m3 0)) / 2; key =