diff --git a/flake.lock b/flake.lock index 427e0b0808f0c12e7b47e102f208e29d5aaf982e..da32a368303b6a9e3802fda3da07be55516841da 100644 --- a/flake.lock +++ b/flake.lock @@ -164,16 +164,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1736378864, - "narHash": "sha256-7JSw/0AbjzM9jdkJQILEHKq8hjfTDB1tHJPLDI2oLVo=", + "lastModified": 1748420519, + "narHash": "sha256-uvCFBMBRfz14t22U278+dyhwG49BECt96X0LoDwCBNw=", "ref": "refs/heads/master", - "rev": "b721b3d463b9f796b7652df59de975a362cc7542", - "revCount": 130, + "rev": "4ebc0b80f29afbfcd92047918e523f8d0ed757c1", + "revCount": 131, "type": "git", "url": "https://gitlab.schukai.com/oss/utilities/version.git" }, diff --git a/flake.nix b/flake.nix index 073be1526ea63ebb56aba2af5655b7d4d8f500b8..5bd4b8bd09977459427cbfb7284b1e86e0dc4509 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Monster is a javascript and component library for building fantastic web applications."; inputs = { - nixpkgs = {url = "github:nixos/nixpkgs/nixos-24.11";}; + nixpkgs = {url = "github:nixos/nixpkgs/nixos-25.05";}; flake-utils = {url = "github:numtide/flake-utils";}; commonFlake = { @@ -50,15 +50,15 @@ }) (final: prev: { - version = versionPck; + projectVersion = versionPck; }) (final: prev: { - projectNodeJS = prev.nodejs_23; + projectNodeJS = prev.nodejs_24; }) (final: prev: { - projectCorepack = prev.corepack_23; + projectCorepack = prev.corepack_24; }) ]; }; diff --git a/nix/scripts/release.nix b/nix/scripts/release.nix index fc6e589a46c3a8d0271fa7d377d5bae5d056c102..799bb535357d07793cd787b9e7c093cbe32daf64 100644 --- a/nix/scripts/release.nix +++ b/nix/scripts/release.nix @@ -44,7 +44,7 @@ in ${pkgs'.git}/bin/git fetch --prune --prune-tags echo_step "Bumping version" - gitVersion=$(${pkgs'.version}/bin/version predict --exit-code-if-no-bump) + gitVersion=$(${pkgs'.projectVersion}/bin/version predict --exit-code-if-no-bump) if [ -z "$gitVersion" ]; then echo_ok "There is no version bump." echo_ok "done" diff --git a/nix/scripts/update-changelog.nix b/nix/scripts/update-changelog.nix index 3c43219c2a400532c7e313f0103fd92892381e20..ec18ffb46937125827bfce4f5eb4ee9d5c1ab751 100644 --- a/nix/scripts/update-changelog.nix +++ b/nix/scripts/update-changelog.nix @@ -23,7 +23,7 @@ in exit 1 fi - currentVersion=$(${pkgs'.version}/bin/version print -g) + currentVersion=$(${pkgs'.projectVersion}/bin/version print -g) if [ "$latestDocumentedVersion" = "$currentVersion" ]; then echo_ok "changelog already up to date" else