diff --git a/.github/workflows/build-compare-dnas-integrity.yaml b/.github/workflows/build-compare-dnas-integrity.yaml index 1eb5149..620181b 100644 --- a/.github/workflows/build-compare-dnas-integrity.yaml +++ b/.github/workflows/build-compare-dnas-integrity.yaml @@ -11,7 +11,7 @@ jobs: build-and-cache: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-13] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build-scaffold-remote-zome.yml b/.github/workflows/build-scaffold-remote-zome.yml index e61d6dd..c323f26 100644 --- a/.github/workflows/build-scaffold-remote-zome.yml +++ b/.github/workflows/build-scaffold-remote-zome.yml @@ -11,7 +11,7 @@ jobs: build-and-cache: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-13] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml b/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml index 106e2cf..c7bf7bd 100644 --- a/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml +++ b/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml @@ -11,7 +11,7 @@ jobs: build-sync-npm-git-dependencies-with-nix: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-13] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/build-zome-wasm-hash.yaml b/.github/workflows/build-zome-wasm-hash.yaml index 82870d6..3643409 100644 --- a/.github/workflows/build-zome-wasm-hash.yaml +++ b/.github/workflows/build-zome-wasm-hash.yaml @@ -11,7 +11,7 @@ jobs: build-and-cache: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest, macos-13] runs-on: ${{ matrix.os }} diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock index c332a92..e9e4548 100644 --- a/nix/fixtures/module-repo/flake.lock +++ b/nix/fixtures/module-repo/flake.lock @@ -31,20 +31,12 @@ } }, "crane_3": { - "inputs": { - "nixpkgs": [ - "profiles", - "hc-infra", - "holonix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -54,19 +46,12 @@ } }, "crane_4": { - "inputs": { - "nixpkgs": [ - "profiles", - "holonix", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1724537630, - "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "lastModified": 1725125250, + "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", "owner": "ipetkov", "repo": "crane", - "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", "type": "github" }, "original": { @@ -116,11 +101,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -134,11 +119,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "type": "github" }, "original": { @@ -169,7 +154,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-DEUzRSTN7He5SJHelXIfOuweBIihVJAzXQQ4hyWch6g=", + "narHash": "sha256-iaI8tZsppKOHcr0Ej9uiusxOMTn06xihzHidy37xXnU=", "path": "./../../..", "type": "path" }, @@ -193,6 +178,7 @@ "holonix", "nixpkgs" ], + "pnpmnixpkgs": "pnpmnixpkgs_2", "rust-overlay": [ "profiles", "hc-infra", @@ -201,11 +187,11 @@ ] }, "locked": { - "lastModified": 1725282556, - "narHash": "sha256-B0DFFCS3UWDpHutqJpQz/IUmnTjITnJbVEZTKD321pw=", + "lastModified": 1727352230, + "narHash": "sha256-dTAIZFNBkC2SlwkS9nhzPRcOx2qm7l7DNVb8PvXEJRc=", "owner": "holochain-open-dev", "repo": "infrastructure", - "rev": "83ee6861e965d15211145484c44ce22bb12fd071", + "rev": "6bbf25f8b10988514a5281c0706776c65c2d8fd0", "type": "github" }, "original": { @@ -482,11 +468,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1724935136, - "narHash": "sha256-TAxGCtBJXv/B6gdBD/TNisuRAs7tC9ati89DZr73ddo=", + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", "owner": "holochain", "repo": "holonix", - "rev": "f1a543d4188adbe6ff1cd9229120d5fe3cb96103", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", "type": "github" }, "original": { @@ -508,11 +494,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1724935136, - "narHash": "sha256-TAxGCtBJXv/B6gdBD/TNisuRAs7tC9ati89DZr73ddo=", + "lastModified": 1727194089, + "narHash": "sha256-+KmoByZhktCuJHNqYiZYedvSwhjgzLev0F0NcKNHgMY=", "owner": "holochain", "repo": "holonix", - "rev": "f1a543d4188adbe6ff1cd9229120d5fe3cb96103", + "rev": "0aeff9984ab60ea70df3812be605a5f455f0489b", "type": "github" }, "original": { @@ -632,26 +618,26 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "lastModified": 1725233747, + "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, "nixpkgs_2": { @@ -718,6 +704,22 @@ "type": "github" } }, + "pnpmnixpkgs_2": { + "locked": { + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "profiles": { "inputs": { "hc-infra": "hc-infra_2", @@ -729,11 +731,11 @@ ] }, "locked": { - "lastModified": 1725282695, - "narHash": "sha256-ZtozbZ0D6Z0vUlz7FzBkuNf5/7JE1syZ0CuRi/75bas=", + "lastModified": 1727357160, + "narHash": "sha256-4/7Ux6rILEFyfoWfohVF3unqClTs6BJRZefEkNUVjvI=", "owner": "holochain-open-dev", "repo": "profiles", - "rev": "6000dc6c04194429f2768517670366c411c4a03a", + "rev": "43e97c82887cc3eb91ef92c9ab01b93529693b68", "type": "github" }, "original": { @@ -807,11 +809,11 @@ ] }, "locked": { - "lastModified": 1724898214, - "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=", + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", "type": "github" }, "original": { @@ -829,11 +831,11 @@ ] }, "locked": { - "lastModified": 1724898214, - "narHash": "sha256-4yMO9+Lsr3zqTf4clAGGag/bfNTmc/ITOXbJQcOEok4=", + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0bc2c784e3a6ce30a2ab1b9f47325ccbed13039f", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", "type": "github" }, "original": {