diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json deleted file mode 100644 index c6c7707172b3..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json +++ /dev/null @@ -1,142 +0,0 @@ -{ - "name": "atomic-calendar-revive", - "version": "10.0.0", - "description": "Calendar Card for Home Assistant", - "main": "atomic-calendar-revive.js", - "scripts": { - "lint": "eslint src/*.ts | more ", - "lintindex": "eslint src/index.ts | more", - "lintindexfix": "eslint src/index.ts --fix", - "lintfixall": "eslint src/*.ts --fix", - "linteditor": "eslint src/index-editor.ts", - "babel": "babel dist/index.js --out-file dist/atomic-calendar-revive.js", - "rollup": "rollup -c", - "start": "rollup -c --watch --bundleConfigAsCjs", - "build": "rollup -c --bundleConfigAsCjs", - "watch": "rollup -c rollup-dev.config.mjs --bundleConfigAsCjs", - "commit": "cz" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/totaldebug/atomic-calendar-revive.git" - }, - "author": "Steven Marks", - "license": "ISC", - "devDependencies": { - "@babel/cli": "^7.24.7", - "@babel/core": "^7.24.7", - "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.24.7", - "@babel/plugin-transform-template-literals": "^7.24.7", - "@babel/preset-env": "^7.24.7", - "@rollup/plugin-babel": "^6.0.4", - "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-eslint": "^9.0.5", - "@rollup/plugin-json": "^6.1.0", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-terser": "^0.4.4", - "@semantic-release/changelog": "^6.0.3", - "@semantic-release/exec": "^6.0.3", - "@semantic-release/git": "^10.0.1", - "@typescript-eslint/eslint-plugin": "^7.13.1", - "@typescript-eslint/parser": "^7.13.1", - "babel-preset-minify": "^0.5.2", - "commitizen": "^4.3.0", - "conventional-changelog-conventionalcommits": "^8.0.0", - "cz-conventional-changelog": "^3.3.0", - "eslint": "^9.5.0", - "eslint-config-prettier": "^9.1.0", - "eslint-import-resolver-typescript": "^3.6.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-prettier": "^5.1.3", - "prettier": "^3.3.2", - "rollup": "^4.18.0", - "rollup-plugin-serve": "^2.0.3", - "rollup-plugin-typescript2": "^0.36.0", - "semantic-release": "^24.0.0" - }, - "dependencies": { - "@formatjs/icu-messageformat-parser": "^2.7.8", - "@lit-labs/scoped-registry-mixin": "^1.0.3", - "@lit/reactive-element": "2.0.4", - "@material/mwc-formfield": "^0.27.0", - "@material/mwc-icon-button": "^0.27.0", - "@material/mwc-linear-progress": "^0.27.0", - "@material/mwc-list": "^0.27.0", - "@material/mwc-menu": "^0.27.0", - "@material/mwc-notched-outline": "^0.27.0", - "@material/mwc-ripple": "^0.27.0", - "@material/mwc-select": "^0.27.0", - "@material/mwc-switch": "^0.27.0", - "@material/mwc-textfield": "^0.27.0", - "@mdi/js": "^7.4.47", - "@webcomponents/webcomponentsjs": "^2.8.0", - "dayjs": "^1.11.11", - "home-assistant-js-websocket": "^9.4.0", - "lit": "^3.1.4", - "memoize-one": "^6.0.0", - "npm": "^10.8.1", - "typescript": "^5.5.2" - }, - "resolutions": { - "lit": "^3.0.2", - "@lit/reactive-element": "2.0.1" - }, - "bugs": { - "url": "https://github.com/totaldebug/atomic-calendar-revive/issues" - }, - "homepage": "https://github.com/totaldebug/atomic-calendar-revive#readme", - "config": { - "commitizen": { - "path": "./node_modules/cz-conventional-changelog" - } - }, - "release": { - "plugins": [ - [ - "@semantic-release/commit-analyzer", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/npm", - { - "npmPublish": false - } - ], - [ - "@semantic-release/exec", - { - "prepareCmd": "yarn run build" - } - ], - [ - "@semantic-release/git", - { - "assets": [ - "package.json" - ], - "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ], - [ - "@semantic-release/github", - { - "assets": [ - { - "path": "dist/atomic-calendar-revive.js" - } - ] - } - ], - "@semantic-release/changelog" - ] - } -} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix index f2d4262a8595..8f71dcce88bf 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.nix @@ -1,56 +1,53 @@ { lib, - mkYarnPackage, + stdenv, fetchYarnDeps, fetchFromGitHub, + yarnBuildHook, + yarnConfigHook, + nodejs, + nix-update-script, }: -mkYarnPackage rec { +stdenv.mkDerivation (finalAttrs: { pname = "atomic-calendar-revive"; version = "10.0.0"; src = fetchFromGitHub { owner = "totaldebug"; repo = "atomic-calendar-revive"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-TaxvxAUcewQH0IMJ0/VjW4+T6squ1tuZIFGn3PE3jhU="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { - name = "${pname}-yarn-offline-cache"; - yarnLock = src + "/yarn.lock"; + inherit (finalAttrs) src; hash = "sha256-d3lk3mwgaWMPFl/EDUWH/tUlAC7OfhNycOLbi1GzkfM="; }; - buildPhase = '' - runHook preBuild - - yarn run build - - runHook postBuild - ''; + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; installPhase = '' runHook preInstall mkdir $out - cp ./deps/atomic-calendar-revive/dist/atomic-calendar-revive.js $out + cp ./dist/atomic-calendar-revive.js $out runHook postInstall ''; - doDist = false; + passthru.updateScript = nix-update-script { }; - passthru.updateScript = ./update.sh; - - meta = with lib; { - changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${src.rev}"; + meta = { + changelog = "https://github.com/totaldebug/atomic-calendar-revive/releases/tag/v${finalAttrs.version}"; description = "Advanced calendar card for Home Assistant Lovelace"; homepage = "https://github.com/totaldebug/atomic-calendar-revive"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh b/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh deleted file mode 100755 index e3841f2a2feb..000000000000 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update git jq -# shellcheck shell=bash - -ROOT=$(git rev-parse --show-toplevel) -ATTR=home-assistant-custom-lovelace-modules.atomic-calendar-revive - -cd "$ROOT" || exit 1 - -# get current version in nixpkgs -CURRENT_VERSION=$(nix eval -f ./default.nix --raw "$ATTR") - -# get latest release tag -LATEST_RELEASE=$(curl https://api.github.com/repos/totaldebug/atomic-calendar-revive/releases | jq "[.[] | select(.prerelease == false)][0].tag_name") - -# strip version prefix -LATEST_VERSION=${LATEST_RELEASE//"v"} - -# strip quotes -LATEST_VERSION=${LATEST_VERSION%\"} -LATEST_VERSION=${LATEST_VERSION#\"} - -if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; -then - echo Already on latest version - exit 0 -fi - -echo "Updating to ${LATEST_VERSION}" - -PKGDIR=$(dirname "$0") - -# change to package directory -cd "$PKGDIR" || exit 1 - -# update package.json -echo "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" -curl -o ./package.json "https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/v${LATEST_VERSION}/package.json" - -# update package -cd "$ROOT" || exit 1 -nix-update --version "$LATEST_VERSION" "$ATTR"