Radish alpha
r
radicle-explorer
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Patches › ddaa3393
Updated heartwood release and npm deps in flake
Archived did:key:z6MkeyYz...ccbv opened 2 months ago

Updated heartwood to version 1.6.1 and changed npmDepsHash to the value expected by nix.

Activity Changes +116 -38
5 files changed +116 -38 29b952a3 → 7b010ccc
modified flake.lock
@@ -3,11 +3,11 @@
    "advisory-db": {

      "flake": false,

      "locked": {
- 
        "lastModified": 1722017365,
- 
        "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=",
+ 
        "lastModified": 1739520703,
+ 
        "narHash": "sha256-UqR1f9gThWNBCBobWet7T46vTSxkB6dVAdeqNBoF8mc=",

        "owner": "rustsec",

        "repo": "advisory-db",
- 
        "rev": "9d024c07ee8c18609b43436bc865abf46636e250",
+ 
        "rev": "ddccfe8aced779f7b54d27bbe7e122ecb1dda33a",

        "type": "github"

      },

      "original": {
@@ -17,18 +17,12 @@
      }

    },

    "crane": {
- 
      "inputs": {
- 
        "nixpkgs": [
- 
          "heartwood",
- 
          "nixpkgs"
- 
        ]
- 
      },

      "locked": {
- 
        "lastModified": 1722907532,
- 
        "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=",
+ 
        "lastModified": 1739936662,
+ 
        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",

        "owner": "ipetkov",

        "repo": "crane",
- 
        "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c",
+ 
        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",

        "type": "github"

      },

      "original": {
@@ -37,16 +31,32 @@
        "type": "github"

      }

    },
+ 
    "flake-compat": {
+ 
      "flake": false,
+ 
      "locked": {
+ 
        "lastModified": 1696426674,
+ 
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ 
        "owner": "edolstra",
+ 
        "repo": "flake-compat",
+ 
        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ 
        "type": "github"
+ 
      },
+ 
      "original": {
+ 
        "owner": "edolstra",
+ 
        "repo": "flake-compat",
+ 
        "type": "github"
+ 
      }
+ 
    },

    "flake-utils": {

      "inputs": {

        "systems": "systems"

      },

      "locked": {
- 
        "lastModified": 1710146030,
- 
        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ 
        "lastModified": 1731533236,
+ 
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

        "owner": "numtide",

        "repo": "flake-utils",
- 
        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ 
        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

        "type": "github"

      },

      "original": {
@@ -55,41 +65,108 @@
        "type": "github"

      }

    },
+ 
    "git-hooks": {
+ 
      "inputs": {
+ 
        "flake-compat": "flake-compat",
+ 
        "gitignore": "gitignore",
+ 
        "nixpkgs": [
+ 
          "heartwood",
+ 
          "nixpkgs"
+ 
        ]
+ 
      },
+ 
      "locked": {
+ 
        "lastModified": 1742649964,
+ 
        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+ 
        "owner": "cachix",
+ 
        "repo": "git-hooks.nix",
+ 
        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+ 
        "type": "github"
+ 
      },
+ 
      "original": {
+ 
        "owner": "cachix",
+ 
        "repo": "git-hooks.nix",
+ 
        "type": "github"
+ 
      }
+ 
    },
+ 
    "gitignore": {
+ 
      "inputs": {
+ 
        "nixpkgs": [
+ 
          "heartwood",
+ 
          "git-hooks",
+ 
          "nixpkgs"
+ 
        ]
+ 
      },
+ 
      "locked": {
+ 
        "lastModified": 1709087332,
+ 
        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ 
        "owner": "hercules-ci",
+ 
        "repo": "gitignore.nix",
+ 
        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ 
        "type": "github"
+ 
      },
+ 
      "original": {
+ 
        "owner": "hercules-ci",
+ 
        "repo": "gitignore.nix",
+ 
        "type": "github"
+ 
      }
+ 
    },

    "heartwood": {

      "inputs": {

        "advisory-db": "advisory-db",

        "crane": "crane",

        "flake-utils": "flake-utils",
- 
        "nixpkgs": "nixpkgs",
+ 
        "git-hooks": "git-hooks",
+ 
        "nixpkgs": [
+ 
          "heartwood",
+ 
          "nixpkgs-stable"
+ 
        ],
+ 
        "nixpkgs-stable": "nixpkgs-stable",
+ 
        "nixpkgs-unstable": "nixpkgs-unstable",

        "rust-overlay": "rust-overlay"

      },

      "locked": {
- 
        "lastModified": 1725360130,
- 
        "narHash": "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk=",
- 
        "ref": "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v1.0.0",
- 
        "rev": "4218896764901bebeaeac6b7c1eaa2e798320cb1",
- 
        "revCount": 2100,
+ 
        "lastModified": 1768923865,
+ 
        "narHash": "sha256-NWlP943KXUq+RKHF4xVgj70BwI3lVaSPy27wXsAV7h0=",
+ 
        "ref": "refs/tags/releases/1.6.1",
+ 
        "rev": "48582815c27aa5bc23f7a53f9b2ac93469c5ea83",
+ 
        "revCount": 2667,

        "type": "git",

        "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"

      },

      "original": {
- 
        "ref": "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v1.0.0",
+ 
        "ref": "refs/tags/releases/1.6.1",

        "type": "git",

        "url": "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git"

      }

    },
- 
    "nixpkgs": {
+ 
    "nixpkgs-stable": {
+ 
      "locked": {
+ 
        "lastModified": 1754919767,
+ 
        "narHash": "sha256-bc9tjR2ymbmbtYlnOcksjI7tQtDDEEJFGm41t0msXsg=",
+ 
        "owner": "NixOS",
+ 
        "repo": "nixpkgs",
+ 
        "rev": "8c0c41355297485b39d6f6a6d722c8cdfe0257df",
+ 
        "type": "github"
+ 
      },
+ 
      "original": {
+ 
        "owner": "NixOS",
+ 
        "ref": "release-25.05",
+ 
        "repo": "nixpkgs",
+ 
        "type": "github"
+ 
      }
+ 
    },
+ 
    "nixpkgs-unstable": {

      "locked": {
- 
        "lastModified": 1722940684,
- 
        "narHash": "sha256-X8JnSq0ruRWsU4PdYuxV+8W4W66F1lnCcxIZZMWzo4E=",
+ 
        "lastModified": 1754919767,
+ 
        "narHash": "sha256-bc9tjR2ymbmbtYlnOcksjI7tQtDDEEJFGm41t0msXsg=",

        "owner": "NixOS",

        "repo": "nixpkgs",
- 
        "rev": "a3103d68517c6ad262ea27c96fc4a38ad81be7a0",
+ 
        "rev": "8c0c41355297485b39d6f6a6d722c8cdfe0257df",

        "type": "github"

      },

      "original": {

        "owner": "NixOS",
- 
        "ref": "release-24.05",
+ 
        "ref": "release-25.05",

        "repo": "nixpkgs",

        "type": "github"

      }
@@ -115,11 +192,11 @@
        ]

      },

      "locked": {
- 
        "lastModified": 1722910815,
- 
        "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
+ 
        "lastModified": 1760582142,
+ 
        "narHash": "sha256-RSLRjAoS75szOc9fFzRi9/jzPbYsiqPISSLZTloaKtM=",

        "owner": "oxalica",

        "repo": "rust-overlay",
- 
        "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
+ 
        "rev": "9ea094253b9389ba7dd4f18637f66b5824276d1d",

        "type": "github"

      },

      "original": {
modified flake.nix
@@ -4,7 +4,7 @@
    nixpkgs.follows = "heartwood/nixpkgs";

    flake-utils.follows = "heartwood/flake-utils";

    heartwood = {
- 
      url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?ref=refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v1.0.0";
+ 
      url = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?ref=refs/tags/releases/1.6.1";

    };

  };
@@ -76,7 +76,7 @@
          pname = "radicle-explorer";

          version = (builtins.fromJSON (builtins.readFile ./package.json)).version;

          src = ./.;
- 
          npmDepsHash = "sha256-RC+QQXtvXC48uM0oOAFA0ni5AU/l9m8k1LgrxykSu5M=";
+ 
          npmDepsHash = "sha256-nVfFeJXSPO1GVkBkWflARZl2Geyt5ARTn0HVglnPlc0=";

          postPatch = ''

            patchShebangs --build ./scripts

            mkdir -p "public/twemoji"
@@ -90,11 +90,12 @@
            which

            gitMinimal

          ];
+ 
          checkInputs = lib.optionals doCheck [
+ 
            heartwood.packages.${system}.default
+ 
            self.checks.${system}.radicle-httpd
+ 
          ];

          checkPhase = ''

            runHook preCheck
- 
            bins=$(scripts/install-binaries -s)
- 
            mkdir -p "$bins"
- 
            cp -t "$bins" -- ${heartwood.packages.${system}.default}/bin/* ${self.checks.${system}.radicle-httpd}/bin/*

            scripts/check

            {

              npm run test:unit
modified scripts/update-flake
@@ -54,7 +54,7 @@ else
fi



if [ -e "$root/flake.nix" ]; then
- 
  query="ref=refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v$release";
+ 
  query="ref=refs/tags/releases/$release";



  sed -E -e '/url.*git\+https.*'"$rid"'/s|\?.*";|?'"$query"'";|' "$root/flake.nix" >$root/flake.nix.tmp

  mv "$root/flake.nix.tmp" "$root/flake.nix"
modified tests/support/heartwood-release
@@ -1 +1 @@
- 
1.4.0
 

\ No newline at end of file
+ 
1.6.1
 

\ No newline at end of file
modified tests/support/radicle-httpd-release
@@ -1 +1 @@
- 
0.20.0
 

\ No newline at end of file
+ 
0.23.0
 

\ No newline at end of file